diff --git a/.eslintignore.errorfiles b/.eslintignore.errorfiles
index 9973cfb120..1faffbbdf7 100644
--- a/.eslintignore.errorfiles
+++ b/.eslintignore.errorfiles
@@ -6,25 +6,20 @@ src/components/structures/RoomView.js
 src/components/structures/ScrollPanel.js
 src/components/structures/SearchBox.js
 src/components/structures/UploadBar.js
-src/components/views/avatars/BaseAvatar.js
 src/components/views/avatars/MemberAvatar.js
 src/components/views/create_room/RoomAlias.js
 src/components/views/dialogs/SetPasswordDialog.js
-src/components/views/dialogs/UnknownDeviceDialog.js
 src/components/views/elements/AddressSelector.js
 src/components/views/elements/DirectorySearchBox.js
 src/components/views/elements/MemberEventListSummary.js
 src/components/views/elements/UserSelector.js
-src/components/views/globals/MatrixToolbar.js
 src/components/views/globals/NewVersionBar.js
-src/components/views/globals/UpdateCheckBar.js
 src/components/views/messages/MFileBody.js
 src/components/views/messages/TextualBody.js
 src/components/views/room_settings/ColorSettings.js
 src/components/views/rooms/Autocomplete.js
 src/components/views/rooms/AuxPanel.js
 src/components/views/rooms/LinkPreviewWidget.js
-src/components/views/rooms/MemberDeviceInfo.js
 src/components/views/rooms/MemberInfo.js
 src/components/views/rooms/MemberList.js
 src/components/views/rooms/RoomList.js
diff --git a/.eslintrc.js b/.eslintrc.js
index 6a0576c58a..fc82e75ce2 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,121 +1,34 @@
-const path = require('path');
-
-// get the path of the js-sdk so we can extend the config
-// eslint supports loading extended configs by module,
-// but only if they come from a module that starts with eslint-config-
-// So we load the filename directly (and it could be in node_modules/
-// or or ../node_modules/ etc)
-//
-// We add a `..` to the end because the js-sdk lives out of lib/, but the eslint
-// config is at the project root.
-const matrixJsSdkPath = path.join(path.dirname(require.resolve('matrix-js-sdk')), '..');
-
 module.exports = {
+    extends: ["matrix-org", "matrix-org/react-legacy"],
     parser: "babel-eslint",
-    extends: [matrixJsSdkPath + "/.eslintrc.js"],
-    plugins: [
-      "react",
-      "react-hooks",
-      "flowtype",
-      "babel"
-    ],
+
+    env: {
+        browser: true,
+        node: true,
+    },
     globals: {
         LANGUAGES_FILE: "readonly",
     },
-    env: {
-        es6: true,
-    },
-    parserOptions: {
-        ecmaFeatures: {
-            jsx: true,
-            legacyDecorators: true,
-        }
-    },
     rules: {
-        // eslint's built in no-invalid-this rule breaks with class properties
-        "no-invalid-this": "off",
-        // so we replace it with a version that is class property aware
-        "babel/no-invalid-this": "error",
-
-        // We appear to follow this most of the time, so let's enforce it instead
-        // of occasionally following it (or catching it in review)
-        "keyword-spacing": "error",
-
-        /** react **/
-        // This just uses the react plugin to help eslint known when
-        // variables have been used in JSX
-        "react/jsx-uses-vars": "error",
-        // Don't mark React as unused if we're using JSX
-        "react/jsx-uses-react": "error",
-
-        // bind or arrow function in props causes performance issues
-        // (but we currently use them in some places)
-        // It's disabled here, but we should using it sparingly.
-        "react/jsx-no-bind": "off",
-        "react/jsx-key": ["error"],
-
-        // Components in JSX should always be defined.
-        "react/jsx-no-undef": "error",
-
-        // Assert no spacing in JSX curly brackets
-        // <Element prop={ consideredError} prop={notConsideredError} />
-        //
-        // https://github.com/yannickcr/eslint-plugin-react/blob/HEAD/docs/rules/jsx-curly-spacing.md
-        //
-        // Disabled for now - if anything we'd like to *enforce* spacing in JSX
-        // curly brackets for legibility, but in practice it's not clear that the
-        // consistency particularly improves legibility here. --Matthew
-        //
-        // "react/jsx-curly-spacing": ["error", {"when": "never", "children": {"when": "always"}}],
-
-        // Assert spacing before self-closing JSX tags, and no spacing before or
-        // after the closing slash, and no spacing after the opening bracket of
-        // the opening tag or closing tag.
-        //
-        // https://github.com/yannickcr/eslint-plugin-react/blob/HEAD/docs/rules/jsx-tag-spacing.md
-        "react/jsx-tag-spacing": ["error"],
-
-        /** flowtype **/
-        "flowtype/require-parameter-type": ["warn", {
-            "excludeArrowFunctions": true,
-        }],
-        "flowtype/define-flow-type": "warn",
-        "flowtype/require-return-type": ["warn",
-            "always",
-            {
-              "annotateUndefined": "never",
-              "excludeArrowFunctions": true,
-            }
-        ],
-        "flowtype/space-after-type-colon": ["warn", "always"],
-        "flowtype/space-before-type-colon": ["warn", "never"],
-
-        /*
-         * things that are errors in the js-sdk config that the current
-         * code does not adhere to, turned down to warn
-         */
-        "max-len": ["warn", {
-            // apparently people believe the length limit shouldn't apply
-            // to JSX.
-            ignorePattern: '^\\s*<',
-            ignoreComments: true,
-            ignoreRegExpLiterals: true,
-            code: 120,
-        }],
-        "valid-jsdoc": ["warn"],
-        "new-cap": ["warn"],
-        "key-spacing": ["warn"],
-        "prefer-const": ["warn"],
-
-        // crashes currently: https://github.com/eslint/eslint/issues/6274
-        "generator-star-spacing": "off",
-
-        "react-hooks/rules-of-hooks": "error",
-        "react-hooks/exhaustive-deps": "warn",
+        // Things we do that break the ideal style
+        "no-constant-condition": "off",
+        "prefer-promise-reject-errors": "off",
+        "no-async-promise-executor": "off",
+        "quotes": "off",
+        "indent": "off",
     },
-    settings: {
-        flowtype: {
-            onlyFilesWithFlowAnnotation: true
+
+    overrides: [{
+        "files": ["src/**/*.{ts, tsx}"],
+        "extends": ["matrix-org/ts"],
+        "rules": {
+            // We disable this while we're transitioning
+            "@typescript-eslint/no-explicit-any": "off",
+            // We'd rather not do this but we do
+            "@typescript-eslint/ban-ts-comment": "off",
+
+            "quotes": "off",
+            "no-extra-boolean-cast": "off",
         },
-    },
+    }],
 };
diff --git a/.stylelintrc.js b/.stylelintrc.js
index 1690f2186f..313102ea83 100644
--- a/.stylelintrc.js
+++ b/.stylelintrc.js
@@ -17,7 +17,7 @@ module.exports = {
         "at-rule-no-unknown": null,
         "no-descending-specificity": null,
         "scss/at-rule-no-unknown": [true, {
-            // https://github.com/vector-im/riot-web/issues/10544
+            // https://github.com/vector-im/element-web/issues/10544
             "ignoreAtRules": ["define-mixin"],
         }],
     }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6f25f1858..29cbb040f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,1712 @@
+Changes in [3.2.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.2.0) (2020-08-17)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.2.0-rc.1...v3.2.0)
+
+ * Upgrade to JS SDK 8.1.0
+ * [Release] Fix corner rounding on images not always affecting right side
+   [\#5122](https://github.com/matrix-org/matrix-react-sdk/pull/5122)
+ * [Release] Message Action Bar watch for event send changes
+   [\#5116](https://github.com/matrix-org/matrix-react-sdk/pull/5116)
+ * Fix /op slash command to release
+   [\#5114](https://github.com/matrix-org/matrix-react-sdk/pull/5114)
+ * Fix action bar safe area regression
+   [\#5112](https://github.com/matrix-org/matrix-react-sdk/pull/5112)
+
+Changes in [3.2.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.2.0-rc.1) (2020-08-13)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.1.0...v3.2.0-rc.1)
+
+ * Upgrade to JS SDK 8.1.0-rc.1
+ * Update from Weblate
+   [\#5105](https://github.com/matrix-org/matrix-react-sdk/pull/5105)
+ * padding the timeline so that its scrollbar has its own space from the
+   resizer
+   [\#5103](https://github.com/matrix-org/matrix-react-sdk/pull/5103)
+ * Try to close notification on all platforms which support it, not just
+   electron
+   [\#5102](https://github.com/matrix-org/matrix-react-sdk/pull/5102)
+ * Fix exception when stripping replies from an event with a non-string body
+   [\#5101](https://github.com/matrix-org/matrix-react-sdk/pull/5101)
+ * Quick win session 24/07/2020
+   [\#5056](https://github.com/matrix-org/matrix-react-sdk/pull/5056)
+ * Remove rebranding toast
+   [\#5100](https://github.com/matrix-org/matrix-react-sdk/pull/5100)
+ * Generate previews for rooms when the option changes
+   [\#5098](https://github.com/matrix-org/matrix-react-sdk/pull/5098)
+ * Fix Bridge Settings tab
+   [\#5095](https://github.com/matrix-org/matrix-react-sdk/pull/5095)
+ * get screen type from app prop
+   [\#5081](https://github.com/matrix-org/matrix-react-sdk/pull/5081)
+ * Update rageshake app name
+   [\#5093](https://github.com/matrix-org/matrix-react-sdk/pull/5093)
+ * Factor out Iconized Context menu for reusability
+   [\#5085](https://github.com/matrix-org/matrix-react-sdk/pull/5085)
+ * Decouple Audible notifications from Desktop notifications
+   [\#5088](https://github.com/matrix-org/matrix-react-sdk/pull/5088)
+ * Make the room sublist show more/less buttons treeitems
+   [\#5087](https://github.com/matrix-org/matrix-react-sdk/pull/5087)
+ * Share and debug master cross-signing key
+   [\#5092](https://github.com/matrix-org/matrix-react-sdk/pull/5092)
+ * Create Map comparison utilities and convert Hooks to Typescript
+   [\#5086](https://github.com/matrix-org/matrix-react-sdk/pull/5086)
+ * Fix room list scrolling in Safari
+   [\#5090](https://github.com/matrix-org/matrix-react-sdk/pull/5090)
+ * Replace Riot with Element in docs and comments
+   [\#5083](https://github.com/matrix-org/matrix-react-sdk/pull/5083)
+ * When the room view isn't active don't highlight it in room list
+   [\#5027](https://github.com/matrix-org/matrix-react-sdk/pull/5027)
+ * remove emoji icons in autocomplete/reply by designer request
+   [\#5073](https://github.com/matrix-org/matrix-react-sdk/pull/5073)
+ * Add title and icon to empty state of file and notification panel
+   [\#5079](https://github.com/matrix-org/matrix-react-sdk/pull/5079)
+ * Mass redact ignore room creation events
+   [\#5045](https://github.com/matrix-org/matrix-react-sdk/pull/5045)
+ * Replace all chevrons with a single icon
+   [\#5067](https://github.com/matrix-org/matrix-react-sdk/pull/5067)
+ * Replace i18n generation script with something matching our project
+   [\#5077](https://github.com/matrix-org/matrix-react-sdk/pull/5077)
+ * Handle tag changes in sticky room updates
+   [\#5078](https://github.com/matrix-org/matrix-react-sdk/pull/5078)
+ * Remove leftover bits of TSLint
+   [\#5075](https://github.com/matrix-org/matrix-react-sdk/pull/5075)
+ * Clean up documentation of Whenable + fix other code concerns
+   [\#5076](https://github.com/matrix-org/matrix-react-sdk/pull/5076)
+ * Center the jump down/up icon, looks misaligned
+   [\#5074](https://github.com/matrix-org/matrix-react-sdk/pull/5074)
+ * [WIP] Support a new settings structure
+   [\#5058](https://github.com/matrix-org/matrix-react-sdk/pull/5058)
+ * Convert SettingsStore to TypeScript
+   [\#5062](https://github.com/matrix-org/matrix-react-sdk/pull/5062)
+
+Changes in [3.1.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.1.0) (2020-08-05)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.1.0-rc.1...v3.1.0)
+
+ * Upgrade JS SDK to 8.0.1
+ * Fix room list scrolling in Safari
+   [\#5091](https://github.com/matrix-org/matrix-react-sdk/pull/5091)
+ * Add null guard in InviteDialog
+   [\#5084](https://github.com/matrix-org/matrix-react-sdk/pull/5084)
+ * Add null guard in InviteDialog
+   [\#5082](https://github.com/matrix-org/matrix-react-sdk/pull/5082)
+ * Handle tag changes in sticky room updates
+   [\#5080](https://github.com/matrix-org/matrix-react-sdk/pull/5080)
+
+Changes in [3.1.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.1.0-rc.1) (2020-07-31)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.0.0...v3.1.0-rc.1)
+
+ * Upgrade JS SDK to 8.0.1-rc.1
+ * Update from Weblate
+   [\#5071](https://github.com/matrix-org/matrix-react-sdk/pull/5071)
+ * Add local echo for notifications in the new room list
+   [\#5065](https://github.com/matrix-org/matrix-react-sdk/pull/5065)
+ * Fix various small regressions in the room list's behaviour
+   [\#5070](https://github.com/matrix-org/matrix-react-sdk/pull/5070)
+ * Remove redundant lint dependencies
+   [\#5059](https://github.com/matrix-org/matrix-react-sdk/pull/5059)
+ * Fix key backup warning on soft logout page
+   [\#5069](https://github.com/matrix-org/matrix-react-sdk/pull/5069)
+ * Bump elliptic from 6.5.2 to 6.5.3
+   [\#5066](https://github.com/matrix-org/matrix-react-sdk/pull/5066)
+ * Fix crash on logging in again after soft logout
+   [\#5068](https://github.com/matrix-org/matrix-react-sdk/pull/5068)
+ * Convert right_panel to TS
+   [\#5036](https://github.com/matrix-org/matrix-react-sdk/pull/5036)
+ * Remove all unreferenced images
+   [\#5063](https://github.com/matrix-org/matrix-react-sdk/pull/5063)
+ * Provide nicer error for no known servers error when accepting an invite
+   [\#5061](https://github.com/matrix-org/matrix-react-sdk/pull/5061)
+ * add logging for keytar/pickle key
+   [\#5057](https://github.com/matrix-org/matrix-react-sdk/pull/5057)
+ * Don't speak the outgoing message if it is in the Sending state.
+   [\#4075](https://github.com/matrix-org/matrix-react-sdk/pull/4075)
+ * Remove poorly contrasted "dark style" heading in Room Preview Bar
+   [\#5052](https://github.com/matrix-org/matrix-react-sdk/pull/5052)
+ * Fix Query Matcher regression with certain unhomoglyph'd characters
+   [\#5050](https://github.com/matrix-org/matrix-react-sdk/pull/5050)
+ * Fix handlebar interaction
+   [\#4989](https://github.com/matrix-org/matrix-react-sdk/pull/4989)
+ * Minor improvements to filtering performance
+   [\#5054](https://github.com/matrix-org/matrix-react-sdk/pull/5054)
+ * Fix TextWithTooltip "leaking" tooltip wrappers
+   [\#5055](https://github.com/matrix-org/matrix-react-sdk/pull/5055)
+
+Changes in [3.0.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.0.0) (2020-07-27)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.10.1...v3.0.0)
+
+BREAKING CHANGES
+---
+
+ * The room list components have been replaced as part of this release, so the list, tiles, and other associated components now use a different prop / state contract.
+
+
+All Changes
+---
+
+ * Upgrade to JS SDK 8.0.0
+ * Update from Weblate
+   [\#5053](https://github.com/matrix-org/matrix-react-sdk/pull/5053)
+ * RoomList listen to notificationState updates for bolding
+   [\#5051](https://github.com/matrix-org/matrix-react-sdk/pull/5051)
+ * Ensure notification badges stop listening when they unmount
+   [\#5049](https://github.com/matrix-org/matrix-react-sdk/pull/5049)
+ * Improve RoomTile performance
+   [\#5048](https://github.com/matrix-org/matrix-react-sdk/pull/5048)
+ * Reward users for using stable ordering in their room list
+   [\#5047](https://github.com/matrix-org/matrix-react-sdk/pull/5047)
+ * Fix autocomplete suggesting a different thing mid-composition
+   [\#5030](https://github.com/matrix-org/matrix-react-sdk/pull/5030)
+ * Put low priority xor toggle back in the room list context menu
+   [\#5026](https://github.com/matrix-org/matrix-react-sdk/pull/5026)
+ * Fix autocompletion of Community IDs
+   [\#5040](https://github.com/matrix-org/matrix-react-sdk/pull/5040)
+ * Use OpenType tabular numbers in timestamps
+   [\#5042](https://github.com/matrix-org/matrix-react-sdk/pull/5042)
+ * Update packages to modern versions
+   [\#5046](https://github.com/matrix-org/matrix-react-sdk/pull/5046)
+ * Add dismiss button to rebrand toast
+   [\#5044](https://github.com/matrix-org/matrix-react-sdk/pull/5044)
+ * Fix Firefox composer regression exception
+   [\#5039](https://github.com/matrix-org/matrix-react-sdk/pull/5039)
+ * Fix BaseAvatar wrongly using Buttons when it needs not
+   [\#5037](https://github.com/matrix-org/matrix-react-sdk/pull/5037)
+ * Performance improvements round 2: Maps, freezing, dispatching, and flexbox
+   obliteration
+   [\#5038](https://github.com/matrix-org/matrix-react-sdk/pull/5038)
+ * Mixed bag of performance improvements: ScrollPanel and notifications
+   [\#5034](https://github.com/matrix-org/matrix-react-sdk/pull/5034)
+ * Update message previews
+   [\#5025](https://github.com/matrix-org/matrix-react-sdk/pull/5025)
+ * Translate create room buttons
+   [\#5035](https://github.com/matrix-org/matrix-react-sdk/pull/5035)
+ * Escape single quotes in composer placeholder
+   [\#5033](https://github.com/matrix-org/matrix-react-sdk/pull/5033)
+ * Don't hammer on the layout engine with avatar updates for the background
+   [\#5032](https://github.com/matrix-org/matrix-react-sdk/pull/5032)
+ * Ensure incremental updates to the ImportanceAlgorithm trigger A-Z order
+   [\#5031](https://github.com/matrix-org/matrix-react-sdk/pull/5031)
+ * don't syntax highlight languages that begin with "_"
+   [\#5029](https://github.com/matrix-org/matrix-react-sdk/pull/5029)
+ * Convert Modal to TypeScript
+   [\#4956](https://github.com/matrix-org/matrix-react-sdk/pull/4956)
+ * Use new eslint dependency and remove tslint
+   [\#4815](https://github.com/matrix-org/matrix-react-sdk/pull/4815)
+ * Support custom tags in the room list again
+   [\#5024](https://github.com/matrix-org/matrix-react-sdk/pull/5024)
+ * Fix the tag panel context menu
+   [\#5028](https://github.com/matrix-org/matrix-react-sdk/pull/5028)
+ * Tag Watcher don't create new filter if not needed, confuses references
+   [\#5021](https://github.com/matrix-org/matrix-react-sdk/pull/5021)
+ * Convert editor to TypeScript
+   [\#4978](https://github.com/matrix-org/matrix-react-sdk/pull/4978)
+ * Query Matcher use unhomoglyph for a little bit more leniency
+   [\#4977](https://github.com/matrix-org/matrix-react-sdk/pull/4977)
+ * Fix Breadcrumbs2 ending up with 2 tabIndexes on Firefox
+   [\#5017](https://github.com/matrix-org/matrix-react-sdk/pull/5017)
+ * Add min-width to floating Jitsi
+   [\#5023](https://github.com/matrix-org/matrix-react-sdk/pull/5023)
+ * Update crypto event icon to match rest of app styling
+   [\#5020](https://github.com/matrix-org/matrix-react-sdk/pull/5020)
+ * Fix Reactions Row Button vertical misalignment due to forced height
+   [\#5019](https://github.com/matrix-org/matrix-react-sdk/pull/5019)
+ * Use mouseleave instead of mouseout for hover events. Fix tooltip flicker
+   [\#5016](https://github.com/matrix-org/matrix-react-sdk/pull/5016)
+ * Fix slash commands null guard
+   [\#5015](https://github.com/matrix-org/matrix-react-sdk/pull/5015)
+ * Fix field tooltips
+   [\#5014](https://github.com/matrix-org/matrix-react-sdk/pull/5014)
+ * Fix community right panel button regression
+   [\#5022](https://github.com/matrix-org/matrix-react-sdk/pull/5022)
+ * [BREAKING] Remove the old room list
+   [\#5013](https://github.com/matrix-org/matrix-react-sdk/pull/5013)
+ * ellipse senders for images and videos
+   [\#4990](https://github.com/matrix-org/matrix-react-sdk/pull/4990)
+ * Sprinkle and consolidate some tooltips
+   [\#5012](https://github.com/matrix-org/matrix-react-sdk/pull/5012)
+ * Hopefully make cancel dialog a bit less weird
+   [\#4833](https://github.com/matrix-org/matrix-react-sdk/pull/4833)
+ * Fix emoji filterString
+   [\#5011](https://github.com/matrix-org/matrix-react-sdk/pull/5011)
+ * Fix size call for devtools state events
+   [\#5008](https://github.com/matrix-org/matrix-react-sdk/pull/5008)
+ * Fix `this` context in _setupHomeserverManagers for IntegrationManagers
+   [\#5010](https://github.com/matrix-org/matrix-react-sdk/pull/5010)
+ * Sync recently used reactions list across sessions
+   [\#4993](https://github.com/matrix-org/matrix-react-sdk/pull/4993)
+ * Null guard no e2ee for UserInfo
+   [\#5009](https://github.com/matrix-org/matrix-react-sdk/pull/5009)
+ * stop Inter from clobbering Twemoji
+   [\#5007](https://github.com/matrix-org/matrix-react-sdk/pull/5007)
+ * use a proper HTML sanitizer to strip <mx-reply>, rather than a regexp
+   [\#5006](https://github.com/matrix-org/matrix-react-sdk/pull/5006)
+ * Convert room list log setting to a real setting
+   [\#5005](https://github.com/matrix-org/matrix-react-sdk/pull/5005)
+ * Bump lodash from 4.17.15 to 4.17.19 in /test/end-to-end-tests
+   [\#5003](https://github.com/matrix-org/matrix-react-sdk/pull/5003)
+ * Bump lodash from 4.17.15 to 4.17.19
+   [\#5004](https://github.com/matrix-org/matrix-react-sdk/pull/5004)
+ * Convert devtools dialog to use new room state format
+   [\#4936](https://github.com/matrix-org/matrix-react-sdk/pull/4936)
+ * Update checkbox
+   [\#5000](https://github.com/matrix-org/matrix-react-sdk/pull/5000)
+ * Increase width for country code dropdown
+   [\#5001](https://github.com/matrix-org/matrix-react-sdk/pull/5001)
+
+Changes in [2.10.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.10.1) (2020-07-16)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.10.0...v2.10.1)
+
+ * Post-launch Element Web polish
+   [\#5002](https://github.com/matrix-org/matrix-react-sdk/pull/5002)
+ * Move e2e icon
+   [\#4992](https://github.com/matrix-org/matrix-react-sdk/pull/4992)
+ * Wire up new room list breadcrumbs as an ARIA Toolbar
+   [\#4976](https://github.com/matrix-org/matrix-react-sdk/pull/4976)
+ * Fix Room Tile Icon to not ignore DMs in other tags
+   [\#4999](https://github.com/matrix-org/matrix-react-sdk/pull/4999)
+ * Fix filtering by community not showing DM rooms with community members
+   [\#4997](https://github.com/matrix-org/matrix-react-sdk/pull/4997)
+ * Fix enter in new room list filter breaking things
+   [\#4996](https://github.com/matrix-org/matrix-react-sdk/pull/4996)
+ * Notify left panel of resizing when it is collapsed&expanded
+   [\#4995](https://github.com/matrix-org/matrix-react-sdk/pull/4995)
+ * When removing a filter condition, try recalculate in case it wasn't last
+   [\#4994](https://github.com/matrix-org/matrix-react-sdk/pull/4994)
+ * Create a generic ARIA toolbar component
+   [\#4975](https://github.com/matrix-org/matrix-react-sdk/pull/4975)
+ * Fix /op Slash Command
+   [\#4604](https://github.com/matrix-org/matrix-react-sdk/pull/4604)
+ * Fix copy button in share dialog
+   [\#4998](https://github.com/matrix-org/matrix-react-sdk/pull/4998)
+ * Add tooltip to Room Tile Icon
+   [\#4987](https://github.com/matrix-org/matrix-react-sdk/pull/4987)
+ * Fix names jumping on hover in irc layout
+   [\#4991](https://github.com/matrix-org/matrix-react-sdk/pull/4991)
+ * check that encryptionInfo.sender is set
+   [\#4988](https://github.com/matrix-org/matrix-react-sdk/pull/4988)
+ * Update help link
+   [\#4986](https://github.com/matrix-org/matrix-react-sdk/pull/4986)
+ * Update cover photo link
+   [\#4985](https://github.com/matrix-org/matrix-react-sdk/pull/4985)
+
+Changes in [2.10.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.10.0) (2020-07-15)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.9.0...v2.10.0)
+
+ * Incorporate new toasts into end-to-end tests
+   [\#4983](https://github.com/matrix-org/matrix-react-sdk/pull/4983)
+ * Fix TS lint errors
+   [\#4982](https://github.com/matrix-org/matrix-react-sdk/pull/4982)
+ * Fix js lint errors after rebrand merge
+   [\#4981](https://github.com/matrix-org/matrix-react-sdk/pull/4981)
+ * Fix style lint
+   [\#4980](https://github.com/matrix-org/matrix-react-sdk/pull/4980)
+ * Fix alignment of login/syncing spinner
+   [\#4979](https://github.com/matrix-org/matrix-react-sdk/pull/4979)
+ * De labs font-scaling
+   [\#4899](https://github.com/matrix-org/matrix-react-sdk/pull/4899)
+ * Remove debug logging from new room list
+   [\#4972](https://github.com/matrix-org/matrix-react-sdk/pull/4972)
+ * Tweak sticky header hiding to avoid pop
+   [\#4974](https://github.com/matrix-org/matrix-react-sdk/pull/4974)
+ * Fix show-all keyboard focus regression
+   [\#4973](https://github.com/matrix-org/matrix-react-sdk/pull/4973)
+ * Clean up TODOs, comments, and imports in the new room list
+   [\#4970](https://github.com/matrix-org/matrix-react-sdk/pull/4970)
+ * Make EffectiveMembership utils generic
+   [\#4971](https://github.com/matrix-org/matrix-react-sdk/pull/4971)
+ * Update sticky headers when breadcrumbs pop in or out
+   [\#4969](https://github.com/matrix-org/matrix-react-sdk/pull/4969)
+ * Fix show less button occluding the last tile
+   [\#4967](https://github.com/matrix-org/matrix-react-sdk/pull/4967)
+ * Ensure breadcrumbs don't keep turning themselves back on
+   [\#4968](https://github.com/matrix-org/matrix-react-sdk/pull/4968)
+ * Update top vs. bottom sticky styles separately
+   [\#4966](https://github.com/matrix-org/matrix-react-sdk/pull/4966)
+ * Ensure RoomListStore2 gets reset when the client becomes invalidated
+   [\#4965](https://github.com/matrix-org/matrix-react-sdk/pull/4965)
+ * Add fade to show more button on room list
+   [\#4963](https://github.com/matrix-org/matrix-react-sdk/pull/4963)
+ * Fix extra room tiles being rendered on smaller sublists
+   [\#4964](https://github.com/matrix-org/matrix-react-sdk/pull/4964)
+ * Ensure tag changes (leaving rooms) causes rooms to move between lists
+   [\#4962](https://github.com/matrix-org/matrix-react-sdk/pull/4962)
+ * Fix badges for font size 20
+   [\#4958](https://github.com/matrix-org/matrix-react-sdk/pull/4958)
+ * Fix default sorting mechanics for new room list
+   [\#4960](https://github.com/matrix-org/matrix-react-sdk/pull/4960)
+ * Fix room sub list header collapse/jump interactions on bottom-most sublist
+   [\#4961](https://github.com/matrix-org/matrix-react-sdk/pull/4961)
+ * Fix room tile context menu for Historical rooms
+   [\#4959](https://github.com/matrix-org/matrix-react-sdk/pull/4959)
+ * "ignore"/"unignore" commands: validate user ID
+   [\#4895](https://github.com/matrix-org/matrix-react-sdk/pull/4895)
+ * Stop classname from overwritting baseavatar's
+   [\#4957](https://github.com/matrix-org/matrix-react-sdk/pull/4957)
+ * Remove redundant scroll-margins and fix RoomTile wrongly scrolling
+   [\#4952](https://github.com/matrix-org/matrix-react-sdk/pull/4952)
+ * Fix RoomAvatar viewAvatarOnClick to work on actual avatars instead of
+   default ones
+   [\#4953](https://github.com/matrix-org/matrix-react-sdk/pull/4953)
+ * Be consistent with the at-room pill avatar configurability
+   [\#4955](https://github.com/matrix-org/matrix-react-sdk/pull/4955)
+ * Room List v2 Enter in the filter field should select the first result
+   [\#4954](https://github.com/matrix-org/matrix-react-sdk/pull/4954)
+ * Enable the new room list by default
+   [\#4919](https://github.com/matrix-org/matrix-react-sdk/pull/4919)
+ * Convert ImportanceAlgorithm over to using NotificationColor instead
+   [\#4949](https://github.com/matrix-org/matrix-react-sdk/pull/4949)
+ * Internalize algorithm updates in the new room list store
+   [\#4951](https://github.com/matrix-org/matrix-react-sdk/pull/4951)
+ * Remove now-dead code from sublist resizing
+   [\#4950](https://github.com/matrix-org/matrix-react-sdk/pull/4950)
+ * Ensure triggered updates get fired for filters in the new room list
+   [\#4948](https://github.com/matrix-org/matrix-react-sdk/pull/4948)
+ * Handle off-cycle filtering updates in the new room list
+   [\#4947](https://github.com/matrix-org/matrix-react-sdk/pull/4947)
+ * Make the show more button do a clean cut on the room list while transparent
+   [\#4941](https://github.com/matrix-org/matrix-react-sdk/pull/4941)
+ * Stop safari from aggressively shrinking flex items
+   [\#4945](https://github.com/matrix-org/matrix-react-sdk/pull/4945)
+ * Fix search padding
+   [\#4946](https://github.com/matrix-org/matrix-react-sdk/pull/4946)
+ * Reduce event loop load caused by duplicate calculations in the new room list
+   [\#4943](https://github.com/matrix-org/matrix-react-sdk/pull/4943)
+ * Add an option to disable room list logging, and improve logging
+   [\#4944](https://github.com/matrix-org/matrix-react-sdk/pull/4944)
+ * Scroll fade for breadcrumbs
+   [\#4942](https://github.com/matrix-org/matrix-react-sdk/pull/4942)
+ * Auto expand room list on search
+   [\#4927](https://github.com/matrix-org/matrix-react-sdk/pull/4927)
+ * Fix rough badge alignment for community invite tiles again
+   [\#4939](https://github.com/matrix-org/matrix-react-sdk/pull/4939)
+ * Improve safety of new rooms in the room list
+   [\#4940](https://github.com/matrix-org/matrix-react-sdk/pull/4940)
+ * Don't destroy room notification states when replacing them
+   [\#4938](https://github.com/matrix-org/matrix-react-sdk/pull/4938)
+ * Move irc layout option to advanced
+   [\#4937](https://github.com/matrix-org/matrix-react-sdk/pull/4937)
+ * Potential solution to supporting transparent 'show more' buttons
+   [\#4932](https://github.com/matrix-org/matrix-react-sdk/pull/4932)
+ * Improve performance and stability in sticky headers for new room list
+   [\#4931](https://github.com/matrix-org/matrix-react-sdk/pull/4931)
+ * Move and improve notification state handling
+   [\#4935](https://github.com/matrix-org/matrix-react-sdk/pull/4935)
+ * Move list layout management to its own store
+   [\#4934](https://github.com/matrix-org/matrix-react-sdk/pull/4934)
+ * Noop first breadcrumb
+   [\#4933](https://github.com/matrix-org/matrix-react-sdk/pull/4933)
+ * Highlight "Jump to Bottom" badge when appropriate
+   [\#4892](https://github.com/matrix-org/matrix-react-sdk/pull/4892)
+ * Don't render the context menu within its trigger otherwise unhandled clicks
+   bubble
+   [\#4930](https://github.com/matrix-org/matrix-react-sdk/pull/4930)
+ * Protect rooms from getting lost due to complex transitions
+   [\#4929](https://github.com/matrix-org/matrix-react-sdk/pull/4929)
+ * Hide archive button
+   [\#4928](https://github.com/matrix-org/matrix-react-sdk/pull/4928)
+ * Enable options to favourite and low priority rooms
+   [\#4920](https://github.com/matrix-org/matrix-react-sdk/pull/4920)
+ * Move voip previews to bottom right corner
+   [\#4904](https://github.com/matrix-org/matrix-react-sdk/pull/4904)
+ * Focus room filter on openSearch
+   [\#4923](https://github.com/matrix-org/matrix-react-sdk/pull/4923)
+ * Swap out the resizer lib for something more stable in the new room list
+   [\#4924](https://github.com/matrix-org/matrix-react-sdk/pull/4924)
+ * Add wrapper to room list so sticky headers don't need a background
+   [\#4912](https://github.com/matrix-org/matrix-react-sdk/pull/4912)
+ * New room list view_room show_room_tile support
+   [\#4908](https://github.com/matrix-org/matrix-react-sdk/pull/4908)
+ * Convert Context Menu to TypeScript
+   [\#4871](https://github.com/matrix-org/matrix-react-sdk/pull/4871)
+ * Use html innerText for org.matrix.custom.html m.room.message room list
+   previews
+   [\#4925](https://github.com/matrix-org/matrix-react-sdk/pull/4925)
+ * Fix MELS summary of 3pid invite revocations
+   [\#4913](https://github.com/matrix-org/matrix-react-sdk/pull/4913)
+ * Fix sticky headers being left on display:none if they change too quickly
+   [\#4926](https://github.com/matrix-org/matrix-react-sdk/pull/4926)
+ * Fix gaps under resize handle
+   [\#4922](https://github.com/matrix-org/matrix-react-sdk/pull/4922)
+ * Fix DM handling in new room list
+   [\#4921](https://github.com/matrix-org/matrix-react-sdk/pull/4921)
+ * Respect and fix understanding of legacy options in new room list
+   [\#4918](https://github.com/matrix-org/matrix-react-sdk/pull/4918)
+ * Ensure DMs are not lost in the new room list, and clean up tag logging
+   [\#4916](https://github.com/matrix-org/matrix-react-sdk/pull/4916)
+ * Mute "Unknown room caused setting update" spam
+   [\#4915](https://github.com/matrix-org/matrix-react-sdk/pull/4915)
+ * Remove comment claiming encrypted rooms are handled incorrectly in the new
+   room list
+   [\#4917](https://github.com/matrix-org/matrix-react-sdk/pull/4917)
+ * Try using requestAnimationFrame if available for sticky headers
+   [\#4914](https://github.com/matrix-org/matrix-react-sdk/pull/4914)
+ * Show more/Show less keep focus in a relevant place
+   [\#4911](https://github.com/matrix-org/matrix-react-sdk/pull/4911)
+ * Change orange to our orange and do some lints
+   [\#4910](https://github.com/matrix-org/matrix-react-sdk/pull/4910)
+ * New Room List implement view_room_delta for keyboard shortcuts
+   [\#4900](https://github.com/matrix-org/matrix-react-sdk/pull/4900)
+ * New Room List accessibility
+   [\#4896](https://github.com/matrix-org/matrix-react-sdk/pull/4896)
+ * Improve room safety in the new room list
+   [\#4905](https://github.com/matrix-org/matrix-react-sdk/pull/4905)
+ * Fix a number of issues with the new room list's invites
+   [\#4906](https://github.com/matrix-org/matrix-react-sdk/pull/4906)
+ * Decrease default visible rooms down to 5
+   [\#4907](https://github.com/matrix-org/matrix-react-sdk/pull/4907)
+ * swap order of context menu buttons so it does not jump when muted
+   [\#4909](https://github.com/matrix-org/matrix-react-sdk/pull/4909)
+ * Fix some room list sticky header instabilities
+   [\#4901](https://github.com/matrix-org/matrix-react-sdk/pull/4901)
+ * null-guard against groups with a null name in new Room List
+   [\#4903](https://github.com/matrix-org/matrix-react-sdk/pull/4903)
+ * Allow vertical scrolling on the new room list breadcrumbs
+   [\#4902](https://github.com/matrix-org/matrix-react-sdk/pull/4902)
+ * Convert things to Typescript, including languageHandler
+   [\#4883](https://github.com/matrix-org/matrix-react-sdk/pull/4883)
+ * Fix minor issues with the badges in the new room list
+   [\#4894](https://github.com/matrix-org/matrix-react-sdk/pull/4894)
+ * Radio button outline fixes including for new room list context menu
+   [\#4893](https://github.com/matrix-org/matrix-react-sdk/pull/4893)
+ * First step towards a11y in the new room list
+   [\#4882](https://github.com/matrix-org/matrix-react-sdk/pull/4882)
+ * Fix theme selector clicks bubbling out and causing context menu to float
+   away
+   [\#4891](https://github.com/matrix-org/matrix-react-sdk/pull/4891)
+ * Revert "Remove a bunch of noisy logging from the room list"
+   [\#4890](https://github.com/matrix-org/matrix-react-sdk/pull/4890)
+ * Remove duplicate compact settings, handle device level updates
+   [\#4888](https://github.com/matrix-org/matrix-react-sdk/pull/4888)
+ * fix notifications icons some more
+   [\#4887](https://github.com/matrix-org/matrix-react-sdk/pull/4887)
+ * Remove a bunch of noisy logging from the room list
+   [\#4886](https://github.com/matrix-org/matrix-react-sdk/pull/4886)
+ * Fix bell icon mismatch on room tile between hover and context menu
+   [\#4884](https://github.com/matrix-org/matrix-react-sdk/pull/4884)
+ * Add a null guard for message event previews
+   [\#4885](https://github.com/matrix-org/matrix-react-sdk/pull/4885)
+ * Enable the new room list by default and trigger an initial render
+   [\#4881](https://github.com/matrix-org/matrix-react-sdk/pull/4881)
+ * Fix selection states of room tiles in the new room list
+   [\#4879](https://github.com/matrix-org/matrix-react-sdk/pull/4879)
+ * Update mute icon behaviour for new room list designs
+   [\#4876](https://github.com/matrix-org/matrix-react-sdk/pull/4876)
+ * Fix alignment of avatars on community invites
+   [\#4878](https://github.com/matrix-org/matrix-react-sdk/pull/4878)
+ * Don't include empty badge container in minimized view
+   [\#4880](https://github.com/matrix-org/matrix-react-sdk/pull/4880)
+ * Fix alignment of dot badges in new room list
+   [\#4877](https://github.com/matrix-org/matrix-react-sdk/pull/4877)
+ * Reorganize and match new room list badges to old list behaviour
+   [\#4861](https://github.com/matrix-org/matrix-react-sdk/pull/4861)
+ * Implement breadcrumb notifications and scrolling
+   [\#4862](https://github.com/matrix-org/matrix-react-sdk/pull/4862)
+ * Add click-to-jump on badge in the room sublist header
+   [\#4875](https://github.com/matrix-org/matrix-react-sdk/pull/4875)
+ * Room List v2 context menu interactions
+   [\#4870](https://github.com/matrix-org/matrix-react-sdk/pull/4870)
+ * Wedge community invites into the new room list
+   [\#4874](https://github.com/matrix-org/matrix-react-sdk/pull/4874)
+ * Check whether crypto is enabled in room recovery reminder
+   [\#4873](https://github.com/matrix-org/matrix-react-sdk/pull/4873)
+ * Fix room list 2's room tile wrapping wrongly
+   [\#4872](https://github.com/matrix-org/matrix-react-sdk/pull/4872)
+ * Hide scrollbar without pixel jumping
+   [\#4863](https://github.com/matrix-org/matrix-react-sdk/pull/4863)
+ * Room Tile context menu, notifications, indicator and placement
+   [\#4858](https://github.com/matrix-org/matrix-react-sdk/pull/4858)
+ * Improve resizing interactions in the new room list
+   [\#4865](https://github.com/matrix-org/matrix-react-sdk/pull/4865)
+ * Disable use of account-level ordering options in new room list
+   [\#4866](https://github.com/matrix-org/matrix-react-sdk/pull/4866)
+ * Remove context menu on invites in new room list
+   [\#4867](https://github.com/matrix-org/matrix-react-sdk/pull/4867)
+ * Fix reaction event crashes in message previews
+   [\#4868](https://github.com/matrix-org/matrix-react-sdk/pull/4868)
+
+Changes in [2.9.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.9.0) (2020-07-03)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.9.0-rc.1...v2.9.0)
+
+ * Upgrade to JS SDK 7.1.0
+ * Remove duplicate compact settings, handle device level updates
+   [\#4889](https://github.com/matrix-org/matrix-react-sdk/pull/4889)
+
+Changes in [2.9.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.9.0-rc.1) (2020-07-01)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.8.1...v2.9.0-rc.1)
+
+ * Upgrade to JS SDK 7.1.0-rc.1
+ * Update from Weblate
+   [\#4869](https://github.com/matrix-org/matrix-react-sdk/pull/4869)
+ * Fix a number of proliferation issues in the new room list
+   [\#4828](https://github.com/matrix-org/matrix-react-sdk/pull/4828)
+ * Fix jumping to read marker for events without tiles
+   [\#4860](https://github.com/matrix-org/matrix-react-sdk/pull/4860)
+ * De-duplicate rooms from the room autocomplete provider
+   [\#4859](https://github.com/matrix-org/matrix-react-sdk/pull/4859)
+ * Add file upload button to recovery key input
+   [\#4847](https://github.com/matrix-org/matrix-react-sdk/pull/4847)
+ * Implement new design on security setup & login
+   [\#4831](https://github.com/matrix-org/matrix-react-sdk/pull/4831)
+ * Fix /join slash command via servers including room id as a via
+   [\#4856](https://github.com/matrix-org/matrix-react-sdk/pull/4856)
+ * Add Generic Expiring Toast and timing hooks
+   [\#4855](https://github.com/matrix-org/matrix-react-sdk/pull/4855)
+ * Fix Room Custom Sounds regression and make ProgressBar relevant again
+   [\#4846](https://github.com/matrix-org/matrix-react-sdk/pull/4846)
+ * Including start_sso and start_cas in redirect loop prevention
+   [\#4854](https://github.com/matrix-org/matrix-react-sdk/pull/4854)
+ * Clean up TODO comments for new room list
+   [\#4850](https://github.com/matrix-org/matrix-react-sdk/pull/4850)
+ * Show timestamp of redaction on hover
+   [\#4622](https://github.com/matrix-org/matrix-react-sdk/pull/4622)
+ * Remove the DM button from new room tiles
+   [\#4849](https://github.com/matrix-org/matrix-react-sdk/pull/4849)
+ * Hide room list show less button if it would do nothing
+   [\#4848](https://github.com/matrix-org/matrix-react-sdk/pull/4848)
+ * Improve message preview copy in new room list
+   [\#4823](https://github.com/matrix-org/matrix-react-sdk/pull/4823)
+ * Allow the tag panel to be disabled in the new room list
+   [\#4844](https://github.com/matrix-org/matrix-react-sdk/pull/4844)
+ * Make the whole user row clickable in the new room list
+   [\#4843](https://github.com/matrix-org/matrix-react-sdk/pull/4843)
+ * Add a new spinner design behind a labs flag
+   [\#4842](https://github.com/matrix-org/matrix-react-sdk/pull/4842)
+ * ts-ignore because something is made of fail
+   [\#4845](https://github.com/matrix-org/matrix-react-sdk/pull/4845)
+ * Fix Welcome.html CAS and SSO URLs not working
+   [\#4838](https://github.com/matrix-org/matrix-react-sdk/pull/4838)
+ * More small tweaks in preparation for Notifications rework
+   [\#4835](https://github.com/matrix-org/matrix-react-sdk/pull/4835)
+ * Iterate on the new room list resize handle
+   [\#4840](https://github.com/matrix-org/matrix-react-sdk/pull/4840)
+ * Update sublists for new hover states
+   [\#4837](https://github.com/matrix-org/matrix-react-sdk/pull/4837)
+ * Tweak parts of the new room list design
+   [\#4839](https://github.com/matrix-org/matrix-react-sdk/pull/4839)
+ * Implement new resize handle for dogfooding
+   [\#4836](https://github.com/matrix-org/matrix-react-sdk/pull/4836)
+ * Hide app badge count for hidden upgraded rooms (non-highlight)
+   [\#4834](https://github.com/matrix-org/matrix-react-sdk/pull/4834)
+ * Move compact modern layout checkbox to 'advanced'
+   [\#4822](https://github.com/matrix-org/matrix-react-sdk/pull/4822)
+ * Allow the user to resize the new sublists to 1 tile
+   [\#4825](https://github.com/matrix-org/matrix-react-sdk/pull/4825)
+ * Make LoggedInView a real component because it uses shouldComponentUpdate
+   [\#4832](https://github.com/matrix-org/matrix-react-sdk/pull/4832)
+ * Small tweaks in preparation for Notifications rework
+   [\#4829](https://github.com/matrix-org/matrix-react-sdk/pull/4829)
+ * Remove extraneous debug from the new left panel
+   [\#4826](https://github.com/matrix-org/matrix-react-sdk/pull/4826)
+ * Fix icons in the new user menu not showing up
+   [\#4824](https://github.com/matrix-org/matrix-react-sdk/pull/4824)
+ * Fix sticky room disappearing/jumping in search results
+   [\#4817](https://github.com/matrix-org/matrix-react-sdk/pull/4817)
+ * Show cross-signing / secret storage reset button in more cases
+   [\#4821](https://github.com/matrix-org/matrix-react-sdk/pull/4821)
+ * Use theme-capable icons in the user menu
+   [\#4819](https://github.com/matrix-org/matrix-react-sdk/pull/4819)
+ * Font support in custom themes
+   [\#4814](https://github.com/matrix-org/matrix-react-sdk/pull/4814)
+ * Decrease margin between new sublists
+   [\#4816](https://github.com/matrix-org/matrix-react-sdk/pull/4816)
+ * Update profile information in User Menu and truncate where needed
+   [\#4818](https://github.com/matrix-org/matrix-react-sdk/pull/4818)
+ * Fix MessageActionBar in irc layout
+   [\#4802](https://github.com/matrix-org/matrix-react-sdk/pull/4802)
+ * Mark messages with a black shield if the megolm session isn't trusted
+   [\#4797](https://github.com/matrix-org/matrix-react-sdk/pull/4797)
+ * Custom font selection
+   [\#4761](https://github.com/matrix-org/matrix-react-sdk/pull/4761)
+ * Use the correct timeline reference for message previews
+   [\#4812](https://github.com/matrix-org/matrix-react-sdk/pull/4812)
+ * Fix read receipt handling in the new room list
+   [\#4811](https://github.com/matrix-org/matrix-react-sdk/pull/4811)
+ * Improve unread/badge states in new room list (mk II)
+   [\#4805](https://github.com/matrix-org/matrix-react-sdk/pull/4805)
+ * Only fire setting changes for changed settings
+   [\#4803](https://github.com/matrix-org/matrix-react-sdk/pull/4803)
+ * Trigger room-specific watchers whenever a higher level change happens
+   [\#4804](https://github.com/matrix-org/matrix-react-sdk/pull/4804)
+ * Have the theme switcher set the device-level theme to match settings
+   [\#4810](https://github.com/matrix-org/matrix-react-sdk/pull/4810)
+ * Fix layout of minimized view for new room list
+   [\#4808](https://github.com/matrix-org/matrix-react-sdk/pull/4808)
+ * Fix sticky headers over/under extending themselves in the new room list
+   [\#4809](https://github.com/matrix-org/matrix-react-sdk/pull/4809)
+ * Update read receipt remainder for internal font size change
+   [\#4806](https://github.com/matrix-org/matrix-react-sdk/pull/4806)
+ * Fix some appearance tab crash and implement style nits
+   [\#4801](https://github.com/matrix-org/matrix-react-sdk/pull/4801)
+ * Add message preview for font slider
+   [\#4770](https://github.com/matrix-org/matrix-react-sdk/pull/4770)
+ * Add layout options to the appearance tab
+   [\#4773](https://github.com/matrix-org/matrix-react-sdk/pull/4773)
+ * Update from Weblate
+   [\#4800](https://github.com/matrix-org/matrix-react-sdk/pull/4800)
+ * Support accounts with cross signing but no SSSS
+   [\#4717](https://github.com/matrix-org/matrix-react-sdk/pull/4717)
+ * Look for existing verification requests after login
+   [\#4762](https://github.com/matrix-org/matrix-react-sdk/pull/4762)
+ * Add a checkpoint to index newly encrypted rooms.
+   [\#4611](https://github.com/matrix-org/matrix-react-sdk/pull/4611)
+ * Add support to paginate search results when using Seshat.
+   [\#4705](https://github.com/matrix-org/matrix-react-sdk/pull/4705)
+ * User versions in the event index.
+   [\#4788](https://github.com/matrix-org/matrix-react-sdk/pull/4788)
+ * Fix crash when filtering new room list too fast
+   [\#4796](https://github.com/matrix-org/matrix-react-sdk/pull/4796)
+ * hide search results from unknown rooms
+   [\#4795](https://github.com/matrix-org/matrix-react-sdk/pull/4795)
+ * Mark the new room list as ready for general testing
+   [\#4794](https://github.com/matrix-org/matrix-react-sdk/pull/4794)
+ * Extend QueryMatcher's sorting heuristic
+   [\#4784](https://github.com/matrix-org/matrix-react-sdk/pull/4784)
+ * Lint ts semicolons (aka. The great semicolon migration)
+   [\#4791](https://github.com/matrix-org/matrix-react-sdk/pull/4791)
+ * Revert "Use recovery keys over passphrases"
+   [\#4790](https://github.com/matrix-org/matrix-react-sdk/pull/4790)
+ * Clear `top` when not sticking headers to the top
+   [\#4783](https://github.com/matrix-org/matrix-react-sdk/pull/4783)
+ * Don't show a 'show less' button when it's impossible to collapse
+   [\#4785](https://github.com/matrix-org/matrix-react-sdk/pull/4785)
+ * Fix show less/more button occluding the list automatically
+   [\#4786](https://github.com/matrix-org/matrix-react-sdk/pull/4786)
+ * Improve room switching in the new room list
+   [\#4787](https://github.com/matrix-org/matrix-react-sdk/pull/4787)
+ * Remove labs option to cache 'passphrase'
+   [\#4789](https://github.com/matrix-org/matrix-react-sdk/pull/4789)
+ * Remove escape backslashes in non-Markdown messages
+   [\#4694](https://github.com/matrix-org/matrix-react-sdk/pull/4694)
+
+Changes in [2.8.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.8.1) (2020-06-29)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.8.0...v2.8.1)
+
+ * Support accounts with cross signing but no SSSS
+   [\#4852](https://github.com/matrix-org/matrix-react-sdk/pull/4852)
+
+Changes in [2.8.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.8.0) (2020-06-23)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.8.0-rc.1...v2.8.0)
+
+ * Upgrade to JS SDK 7.0.0
+ * Update read receipt remainder for internal font size change
+   [\#4807](https://github.com/matrix-org/matrix-react-sdk/pull/4807)
+ * Revert "Use recovery keys over passphrases"
+   [\#4793](https://github.com/matrix-org/matrix-react-sdk/pull/4793)
+
+Changes in [2.8.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.8.0-rc.1) (2020-06-17)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.7.2...v2.8.0-rc.1)
+
+ * Upgrade to JS SDK 7.0.0-rc.1
+ * Fix Styled Checkbox and Radio Button disabled state
+   [\#4778](https://github.com/matrix-org/matrix-react-sdk/pull/4778)
+ * clean up and fix the isMasterRuleEnabled logic
+   [\#4782](https://github.com/matrix-org/matrix-react-sdk/pull/4782)
+ * Fix case-sensitivity of /me to match rest of slash commands
+   [\#4763](https://github.com/matrix-org/matrix-react-sdk/pull/4763)
+ * Add a 'show less' button to the new room list
+   [\#4765](https://github.com/matrix-org/matrix-react-sdk/pull/4765)
+ * Update from Weblate
+   [\#4781](https://github.com/matrix-org/matrix-react-sdk/pull/4781)
+ * Sticky and collapsing headers for new room list
+   [\#4758](https://github.com/matrix-org/matrix-react-sdk/pull/4758)
+ * Make the room list labs setting reload on change
+   [\#4780](https://github.com/matrix-org/matrix-react-sdk/pull/4780)
+ * Handle/hide old rooms in the room list
+   [\#4767](https://github.com/matrix-org/matrix-react-sdk/pull/4767)
+ *  Add some media queries to improve UI on mobile (#3991)
+   [\#4656](https://github.com/matrix-org/matrix-react-sdk/pull/4656)
+ * Match fuzzy filtering a bit more reliably in the new room list
+   [\#4769](https://github.com/matrix-org/matrix-react-sdk/pull/4769)
+ * Improve Field ts definitions some more
+   [\#4777](https://github.com/matrix-org/matrix-react-sdk/pull/4777)
+ * Fix alignment of checkboxes in new room list's context menu
+   [\#4776](https://github.com/matrix-org/matrix-react-sdk/pull/4776)
+ * Fix Field ts def, fix LocalEchoWrapper and NotificationsEnabledController
+   [\#4775](https://github.com/matrix-org/matrix-react-sdk/pull/4775)
+ * Add presence indicators and globes to new room list
+   [\#4774](https://github.com/matrix-org/matrix-react-sdk/pull/4774)
+ * Include the sticky room when filtering in the new room list
+   [\#4772](https://github.com/matrix-org/matrix-react-sdk/pull/4772)
+ * Add a home button to the new room list menu when available
+   [\#4771](https://github.com/matrix-org/matrix-react-sdk/pull/4771)
+ * use group layout for search results
+   [\#4764](https://github.com/matrix-org/matrix-react-sdk/pull/4764)
+ * Fix m.id.phone spec compliance
+   [\#4757](https://github.com/matrix-org/matrix-react-sdk/pull/4757)
+ * User Info default power levels for ban/kick/redact to 50 as per spec
+   [\#4759](https://github.com/matrix-org/matrix-react-sdk/pull/4759)
+ * Match new room list's text search to old room list
+   [\#4768](https://github.com/matrix-org/matrix-react-sdk/pull/4768)
+ * Fix ordering of recent rooms in the new room list
+   [\#4766](https://github.com/matrix-org/matrix-react-sdk/pull/4766)
+ * Change theme selector to use new styled radio buttons
+   [\#4731](https://github.com/matrix-org/matrix-react-sdk/pull/4731)
+ * Use recovery keys over passphrases
+   [\#4686](https://github.com/matrix-org/matrix-react-sdk/pull/4686)
+ * Update from Weblate
+   [\#4760](https://github.com/matrix-org/matrix-react-sdk/pull/4760)
+ * Initial dark theme support for new room list
+   [\#4756](https://github.com/matrix-org/matrix-react-sdk/pull/4756)
+ * Support per-list options and algorithms on the new room list
+   [\#4754](https://github.com/matrix-org/matrix-react-sdk/pull/4754)
+ * Send read marker updates immediately after moving visually
+   [\#4755](https://github.com/matrix-org/matrix-react-sdk/pull/4755)
+ * Add a minimized view to the new room list
+   [\#4753](https://github.com/matrix-org/matrix-react-sdk/pull/4753)
+ * Fix e2e icon alignment in irc-layout
+   [\#4752](https://github.com/matrix-org/matrix-react-sdk/pull/4752)
+ * Add some resource leak protection to new room list badges
+   [\#4750](https://github.com/matrix-org/matrix-react-sdk/pull/4750)
+ * Fix read-receipt alignment
+   [\#4747](https://github.com/matrix-org/matrix-react-sdk/pull/4747)
+ * Show message previews on the new room list tiles
+   [\#4751](https://github.com/matrix-org/matrix-react-sdk/pull/4751)
+ * Fix various layout concerns with the new room list
+   [\#4749](https://github.com/matrix-org/matrix-react-sdk/pull/4749)
+ * Prioritize text on the clipboard over file
+   [\#4748](https://github.com/matrix-org/matrix-react-sdk/pull/4748)
+ * Move Settings flag to ts
+   [\#4729](https://github.com/matrix-org/matrix-react-sdk/pull/4729)
+ * Add a context menu to rooms in the new room list
+   [\#4743](https://github.com/matrix-org/matrix-react-sdk/pull/4743)
+ * Add hover states and basic context menu to new room list
+   [\#4742](https://github.com/matrix-org/matrix-react-sdk/pull/4742)
+ * Update resize handle for new designs in new room list
+   [\#4741](https://github.com/matrix-org/matrix-react-sdk/pull/4741)
+ * Improve general stability in the new room list
+   [\#4740](https://github.com/matrix-org/matrix-react-sdk/pull/4740)
+ * Reimplement breadcrumbs for new room list
+   [\#4735](https://github.com/matrix-org/matrix-react-sdk/pull/4735)
+ * Add styled radio buttons
+   [\#4744](https://github.com/matrix-org/matrix-react-sdk/pull/4744)
+ * Hide checkbox tick on dark backgrounds
+   [\#4730](https://github.com/matrix-org/matrix-react-sdk/pull/4730)
+ * Make checkboxes a11y friendly
+   [\#4746](https://github.com/matrix-org/matrix-react-sdk/pull/4746)
+ * EventIndex: Store and restore the encryption info for encrypted events.
+   [\#4738](https://github.com/matrix-org/matrix-react-sdk/pull/4738)
+ * Use IDestroyable instead of IDisposable
+   [\#4739](https://github.com/matrix-org/matrix-react-sdk/pull/4739)
+ * Add/improve badge counts in new room list
+   [\#4734](https://github.com/matrix-org/matrix-react-sdk/pull/4734)
+ * Convert FormattingUtils to TypeScript and add badge utility function
+   [\#4732](https://github.com/matrix-org/matrix-react-sdk/pull/4732)
+ * Add filtering and exploring to the new room list
+   [\#4736](https://github.com/matrix-org/matrix-react-sdk/pull/4736)
+ * Support prioritized room list filters
+   [\#4737](https://github.com/matrix-org/matrix-react-sdk/pull/4737)
+ * Clean up font scaling appearance
+   [\#4733](https://github.com/matrix-org/matrix-react-sdk/pull/4733)
+ * Add user menu to new room list
+   [\#4722](https://github.com/matrix-org/matrix-react-sdk/pull/4722)
+ * New room list basic styling and layout
+   [\#4711](https://github.com/matrix-org/matrix-react-sdk/pull/4711)
+ * Fix read receipt overlap
+   [\#4727](https://github.com/matrix-org/matrix-react-sdk/pull/4727)
+ * Load correct default font size
+   [\#4726](https://github.com/matrix-org/matrix-react-sdk/pull/4726)
+ * send state of lowBandwidth in rageshakes
+   [\#4724](https://github.com/matrix-org/matrix-react-sdk/pull/4724)
+ * Change internal font size from from 15 to 10
+   [\#4725](https://github.com/matrix-org/matrix-react-sdk/pull/4725)
+ * Upgrade deps
+   [\#4723](https://github.com/matrix-org/matrix-react-sdk/pull/4723)
+ * Ensure active Jitsi conference is closed on widget pop-out
+   [\#4444](https://github.com/matrix-org/matrix-react-sdk/pull/4444)
+ * Introduce sticky rooms to the new room list
+   [\#4720](https://github.com/matrix-org/matrix-react-sdk/pull/4720)
+ * Handle remaining cases for room updates in new room list
+   [\#4721](https://github.com/matrix-org/matrix-react-sdk/pull/4721)
+ * Allow searching the emoji picker using other emoji
+   [\#4719](https://github.com/matrix-org/matrix-react-sdk/pull/4719)
+ * New room list scrolling and resizing
+   [\#4697](https://github.com/matrix-org/matrix-react-sdk/pull/4697)
+ * Don't show FormatBar if composer is empty
+   [\#4696](https://github.com/matrix-org/matrix-react-sdk/pull/4696)
+ * Split the left panel into new and old for new room list designs
+   [\#4687](https://github.com/matrix-org/matrix-react-sdk/pull/4687)
+ * Fix compact layout regression
+   [\#4712](https://github.com/matrix-org/matrix-react-sdk/pull/4712)
+ * fix emoji in safari
+   [\#4710](https://github.com/matrix-org/matrix-react-sdk/pull/4710)
+ * Fix not being able to dismiss new login toasts
+   [\#4709](https://github.com/matrix-org/matrix-react-sdk/pull/4709)
+ * Fix exceptions from Tooltip
+   [\#4708](https://github.com/matrix-org/matrix-react-sdk/pull/4708)
+ * Stop removing variation selector from quick reactions
+   [\#4707](https://github.com/matrix-org/matrix-react-sdk/pull/4707)
+ * Tidy up continuation algorithm and make it work for hidden profile changes
+   [\#4704](https://github.com/matrix-org/matrix-react-sdk/pull/4704)
+ * Profile settings should never show a disambiguated display name
+   [\#4699](https://github.com/matrix-org/matrix-react-sdk/pull/4699)
+ * Prevent (double) 4S bootstrap from RestoreKeyBackupDialog
+   [\#4701](https://github.com/matrix-org/matrix-react-sdk/pull/4701)
+ * Stop checkbox styling bleeding through room address selector
+   [\#4691](https://github.com/matrix-org/matrix-react-sdk/pull/4691)
+ * Center HeaderButtons
+   [\#4695](https://github.com/matrix-org/matrix-react-sdk/pull/4695)
+ * Add .well-known option to control default e2ee behaviour
+   [\#4605](https://github.com/matrix-org/matrix-react-sdk/pull/4605)
+ * Add max-width to right and left panels
+   [\#4692](https://github.com/matrix-org/matrix-react-sdk/pull/4692)
+ * Fix login loop where the sso flow returns to `#/login`
+   [\#4685](https://github.com/matrix-org/matrix-react-sdk/pull/4685)
+ * Don't clear MAU toasts when a successful sync comes in
+   [\#4690](https://github.com/matrix-org/matrix-react-sdk/pull/4690)
+ * Add initial filtering support to new room list
+   [\#4681](https://github.com/matrix-org/matrix-react-sdk/pull/4681)
+ * Bubble up a decline-to-render of verification events to outside wrapper
+   [\#4664](https://github.com/matrix-org/matrix-react-sdk/pull/4664)
+ * upgrade to twemoji 13.0.0
+   [\#4672](https://github.com/matrix-org/matrix-react-sdk/pull/4672)
+ * Apply FocusLock to ImageView to capture Escape handling
+   [\#4666](https://github.com/matrix-org/matrix-react-sdk/pull/4666)
+ * Fix the 'complete security' screen
+   [\#4689](https://github.com/matrix-org/matrix-react-sdk/pull/4689)
+ * add null-guard for Autocomplete containerRef
+   [\#4688](https://github.com/matrix-org/matrix-react-sdk/pull/4688)
+ * Remove legacy codepaths for Unknown Device Error (UDE/UDD) handling
+   [\#4660](https://github.com/matrix-org/matrix-react-sdk/pull/4660)
+ * Remove feature_cross_signing
+   [\#4655](https://github.com/matrix-org/matrix-react-sdk/pull/4655)
+ * Autocomplete: use scrollIntoView for auto-scroll to fix it
+   [\#4670](https://github.com/matrix-org/matrix-react-sdk/pull/4670)
+
+Changes in [2.7.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.7.2) (2020-06-16)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.7.1...v2.7.2)
+
+ * Upgrade to JS SDK 6.2.2
+
+Changes in [2.7.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.7.1) (2020-06-05)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.7.0...v2.7.1)
+
+ * Upgrade to JS SDK 6.2.1
+ * Fix exceptions from Tooltip
+   [\#4716](https://github.com/matrix-org/matrix-react-sdk/pull/4716)
+ * Fix not being able to dismiss new login toasts
+   [\#4715](https://github.com/matrix-org/matrix-react-sdk/pull/4715)
+ * Fix compact layout regression
+   [\#4714](https://github.com/matrix-org/matrix-react-sdk/pull/4714)
+
+Changes in [2.7.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.7.0) (2020-06-04)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.7.0-rc.2...v2.7.0)
+
+ * Upgrade to JS SDK 6.2.0
+ * Prevent (double) 4S bootstrap from RestoreKeyBackupDialog
+   [\#4703](https://github.com/matrix-org/matrix-react-sdk/pull/4703)
+ * Fix checkbox bleed
+   [\#4702](https://github.com/matrix-org/matrix-react-sdk/pull/4702)
+ * Fix login loop where the sso flow returns to `#/login` to release
+   [\#4693](https://github.com/matrix-org/matrix-react-sdk/pull/4693)
+
+Changes in [2.7.0-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.7.0-rc.2) (2020-06-02)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.7.0-rc.1...v2.7.0-rc.2)
+
+ * Rewire the Sticker button to be an Emoji Picker
+   [\#3747](https://github.com/matrix-org/matrix-react-sdk/pull/3747)
+
+Changes in [2.7.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.7.0-rc.1) (2020-06-02)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.6.1...v2.7.0-rc.1)
+
+ * Upgrade to JS SDK 6.2.0-rc.1
+ * Update from Weblate
+   [\#4683](https://github.com/matrix-org/matrix-react-sdk/pull/4683)
+ * Make auth argument in the register request compliant with r0.6.0
+   [\#4347](https://github.com/matrix-org/matrix-react-sdk/pull/4347)
+ * Revert "Prevent PersistedElements overflowing scrolled areas"
+   [\#4682](https://github.com/matrix-org/matrix-react-sdk/pull/4682)
+ * Remove unused TagPanelButtons
+   [\#4680](https://github.com/matrix-org/matrix-react-sdk/pull/4680)
+ * Pass roomId to IRCTimelineProfileResizer
+   [\#4679](https://github.com/matrix-org/matrix-react-sdk/pull/4679)
+ * Remove logging to console for irc name resize
+   [\#4678](https://github.com/matrix-org/matrix-react-sdk/pull/4678)
+ * Use arrow functions instead of binding `this`
+   [\#4677](https://github.com/matrix-org/matrix-react-sdk/pull/4677)
+ * Increase specificity of compact layout selectors
+   [\#4675](https://github.com/matrix-org/matrix-react-sdk/pull/4675)
+ * Create and use stylised checkboxes
+   [\#4665](https://github.com/matrix-org/matrix-react-sdk/pull/4665)
+ * useIRCLayout moved to props
+   [\#4676](https://github.com/matrix-org/matrix-react-sdk/pull/4676)
+ * Fix paste image to upload
+   [\#4674](https://github.com/matrix-org/matrix-react-sdk/pull/4674)
+ * Fix FilePanel and NotificationsPanel regression
+   [\#4647](https://github.com/matrix-org/matrix-react-sdk/pull/4647)
+ * Allow deferring of Update Toast until the next morning
+   [\#4669](https://github.com/matrix-org/matrix-react-sdk/pull/4669)
+ * Give contextual feedback for manual update check instead of banner
+   [\#4668](https://github.com/matrix-org/matrix-react-sdk/pull/4668)
+ * Dialog wrap title instead of taking same space as the close/cancel button
+   [\#4659](https://github.com/matrix-org/matrix-react-sdk/pull/4659)
+ * Update Modular hosting link
+   [\#4627](https://github.com/matrix-org/matrix-react-sdk/pull/4627)
+ * Fix field placeholder regression
+   [\#4663](https://github.com/matrix-org/matrix-react-sdk/pull/4663)
+ * Fix/document a number of UIA oddities
+   [\#4667](https://github.com/matrix-org/matrix-react-sdk/pull/4667)
+ * Stop copy icon repeating weirdly
+   [\#4662](https://github.com/matrix-org/matrix-react-sdk/pull/4662)
+ * Try and fix the Notifier race
+   [\#4661](https://github.com/matrix-org/matrix-react-sdk/pull/4661)
+ * set the client's pickle key if the platform can store one
+   [\#4657](https://github.com/matrix-org/matrix-react-sdk/pull/4657)
+ * Migrate Banners to Toasts
+   [\#4624](https://github.com/matrix-org/matrix-react-sdk/pull/4624)
+ * Move Appearance tab to ts
+   [\#4658](https://github.com/matrix-org/matrix-react-sdk/pull/4658)
+ * Fix room alias lookup vs peeking race condition
+   [\#4606](https://github.com/matrix-org/matrix-react-sdk/pull/4606)
+ * Fix encryption icon miss-alignment
+   [\#4651](https://github.com/matrix-org/matrix-react-sdk/pull/4651)
+ * Fix sublist sizing regression
+   [\#4649](https://github.com/matrix-org/matrix-react-sdk/pull/4649)
+ * Fix lines overflowing room list width
+   [\#4650](https://github.com/matrix-org/matrix-react-sdk/pull/4650)
+ * Remove the keyshare dialog
+   [\#4648](https://github.com/matrix-org/matrix-react-sdk/pull/4648)
+ * Update badge counts in new room list as needed
+   [\#4654](https://github.com/matrix-org/matrix-react-sdk/pull/4654)
+ * EventIndex: Handle invalid m.room.redaction events correctly.
+   [\#4653](https://github.com/matrix-org/matrix-react-sdk/pull/4653)
+ * EventIndex: Print out the checkpoint if there was an error during a crawl
+   [\#4652](https://github.com/matrix-org/matrix-react-sdk/pull/4652)
+ * Move Field to Typescript
+   [\#4635](https://github.com/matrix-org/matrix-react-sdk/pull/4635)
+ * Use connection error to detect network problem
+   [\#4646](https://github.com/matrix-org/matrix-react-sdk/pull/4646)
+ * Revert default font size to 15px
+   [\#4641](https://github.com/matrix-org/matrix-react-sdk/pull/4641)
+ * Add logging when room join fails
+   [\#4645](https://github.com/matrix-org/matrix-react-sdk/pull/4645)
+ * Remove EncryptedEventDialog
+   [\#4644](https://github.com/matrix-org/matrix-react-sdk/pull/4644)
+ * Migrate Toasts to Typescript and to granular priority system
+   [\#4618](https://github.com/matrix-org/matrix-react-sdk/pull/4618)
+ * Update Crypto Store Too New copy
+   [\#4632](https://github.com/matrix-org/matrix-react-sdk/pull/4632)
+ * MemberAvatar should not have its own letter fallback, it should use
+   BaseAvatar
+   [\#4643](https://github.com/matrix-org/matrix-react-sdk/pull/4643)
+ * Fix media upload issues with abort and status bar
+   [\#4630](https://github.com/matrix-org/matrix-react-sdk/pull/4630)
+ * fix viewGroup to actually show the group if possible
+   [\#4633](https://github.com/matrix-org/matrix-react-sdk/pull/4633)
+ * Update confirm passphrase copy
+   [\#4634](https://github.com/matrix-org/matrix-react-sdk/pull/4634)
+ * Improve accessibility of the emoji picker
+   [\#4636](https://github.com/matrix-org/matrix-react-sdk/pull/4636)
+ * Fix Emoji Picker footer being too small if text overflows
+   [\#4631](https://github.com/matrix-org/matrix-react-sdk/pull/4631)
+ * Improve style of toasts to match Figma
+   [\#4613](https://github.com/matrix-org/matrix-react-sdk/pull/4613)
+ * Iterate toast count indicator more logically
+   [\#4620](https://github.com/matrix-org/matrix-react-sdk/pull/4620)
+ * Fix reacting to redactions
+   [\#4626](https://github.com/matrix-org/matrix-react-sdk/pull/4626)
+ * Fix sentMessageAndIsAlone by dispatching `message_sent` more consistently
+   [\#4628](https://github.com/matrix-org/matrix-react-sdk/pull/4628)
+ * Update from Weblate
+   [\#4640](https://github.com/matrix-org/matrix-react-sdk/pull/4640)
+ * Replace `alias` with `address` in copy for consistency
+   [\#4402](https://github.com/matrix-org/matrix-react-sdk/pull/4402)
+ * Convert MatrixClientPeg to TypeScript
+   [\#4638](https://github.com/matrix-org/matrix-react-sdk/pull/4638)
+ * Fix BaseAvatar wrongly retrying urls
+   [\#4629](https://github.com/matrix-org/matrix-react-sdk/pull/4629)
+ * Fix event highlights not being updated to reflect edits
+   [\#4637](https://github.com/matrix-org/matrix-react-sdk/pull/4637)
+ * Calculate badges in the new room list more reliably
+   [\#4625](https://github.com/matrix-org/matrix-react-sdk/pull/4625)
+ * Transition BaseAvatar to hooks
+   [\#4101](https://github.com/matrix-org/matrix-react-sdk/pull/4101)
+ * Convert BasePlatform and BaseEventIndexManager to Typescript
+   [\#4614](https://github.com/matrix-org/matrix-react-sdk/pull/4614)
+ * Fix: Tag_DM is not defined
+   [\#4619](https://github.com/matrix-org/matrix-react-sdk/pull/4619)
+ * Fix visibility of message timestamps
+   [\#4615](https://github.com/matrix-org/matrix-react-sdk/pull/4615)
+ * Rewrite the room list store
+   [\#4253](https://github.com/matrix-org/matrix-react-sdk/pull/4253)
+ * Update code style to mention switch statements
+   [\#4610](https://github.com/matrix-org/matrix-react-sdk/pull/4610)
+ * Fix key backup restore with SSSS
+   [\#4612](https://github.com/matrix-org/matrix-react-sdk/pull/4612)
+ * Handle null tokens in the crawler loop.
+   [\#4608](https://github.com/matrix-org/matrix-react-sdk/pull/4608)
+ * Font scaling settings and slider
+   [\#4424](https://github.com/matrix-org/matrix-react-sdk/pull/4424)
+ * Prevent PersistedElements overflowing scrolled areas
+   [\#4494](https://github.com/matrix-org/matrix-react-sdk/pull/4494)
+ * IRC ui layout
+   [\#4531](https://github.com/matrix-org/matrix-react-sdk/pull/4531)
+ * Remove SSSS key upgrade check from rageshake
+   [\#4607](https://github.com/matrix-org/matrix-react-sdk/pull/4607)
+ * Label the create room button better than "Add room"
+   [\#4603](https://github.com/matrix-org/matrix-react-sdk/pull/4603)
+ * Convert the dispatcher to TypeScript
+   [\#4593](https://github.com/matrix-org/matrix-react-sdk/pull/4593)
+ * Consolidate password/passphrase fields into a component & add dynamic colour
+   to progress
+   [\#4599](https://github.com/matrix-org/matrix-react-sdk/pull/4599)
+ * UserView, show Welcome page in the mid panel instead of empty space
+   [\#4590](https://github.com/matrix-org/matrix-react-sdk/pull/4590)
+ * Update from Weblate
+   [\#4601](https://github.com/matrix-org/matrix-react-sdk/pull/4601)
+ * Make email auth component fail better if server claims email isn't validated
+   [\#4600](https://github.com/matrix-org/matrix-react-sdk/pull/4600)
+ * Add new keyboard shortcuts for jump to unread and upload file
+   [\#4588](https://github.com/matrix-org/matrix-react-sdk/pull/4588)
+ * accept and linkify local domains like those from mDNS
+   [\#4594](https://github.com/matrix-org/matrix-react-sdk/pull/4594)
+ * Revert "ImageView make clicking off it easier"
+   [\#4586](https://github.com/matrix-org/matrix-react-sdk/pull/4586)
+ * wrap node-qrcode in a React FC and use it for ShareDialog
+   [\#4394](https://github.com/matrix-org/matrix-react-sdk/pull/4394)
+ * Pass screenAfterLogin through SSO in the callback url
+   [\#4585](https://github.com/matrix-org/matrix-react-sdk/pull/4585)
+ * Remove debugging that causes email addresses to load forever
+   [\#4597](https://github.com/matrix-org/matrix-react-sdk/pull/4597)
+
+Changes in [2.6.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.6.1) (2020-05-22)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.6.0...v2.6.1)
+
+ * Fix key backup restore with SSSS
+   [\#4617](https://github.com/matrix-org/matrix-react-sdk/pull/4617)
+ * Remove SSSS key upgrade check from rageshake
+   [\#4616](https://github.com/matrix-org/matrix-react-sdk/pull/4616)
+
+Changes in [2.6.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.6.0) (2020-05-19)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.6.0-rc.1...v2.6.0)
+
+ * Upgrade to JS SDK 6.1.0
+ * Revert "ImageView make clicking off it easier"
+   [\#4602](https://github.com/matrix-org/matrix-react-sdk/pull/4602)
+ * Remove debugging that causes email addresses to load forever (to release)
+   [\#4598](https://github.com/matrix-org/matrix-react-sdk/pull/4598)
+
+Changes in [2.6.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.6.0-rc.1) (2020-05-14)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.5.0...v2.6.0-rc.1)
+
+ * Upgrade to JS SDK 6.1.0-rc.1
+ * Update from Weblate
+   [\#4596](https://github.com/matrix-org/matrix-react-sdk/pull/4596)
+ * Fix message edits dialog being wrong and sometimes crashing
+   [\#4595](https://github.com/matrix-org/matrix-react-sdk/pull/4595)
+ * Acquire a new session before enacting deactivation
+   [\#4584](https://github.com/matrix-org/matrix-react-sdk/pull/4584)
+ * Remove UI for upgrading 4S to symmetric encryption
+   [\#4581](https://github.com/matrix-org/matrix-react-sdk/pull/4581)
+ * Add copy to SSO prompts during cross-signing setup
+   [\#4555](https://github.com/matrix-org/matrix-react-sdk/pull/4555)
+ * Re-fix OpenID requests from widgets
+   [\#4592](https://github.com/matrix-org/matrix-react-sdk/pull/4592)
+ * Fix persistent widgets on desktop / http
+   [\#4591](https://github.com/matrix-org/matrix-react-sdk/pull/4591)
+ * Updated link and added:Yarn two is not yet used.
+   [\#4589](https://github.com/matrix-org/matrix-react-sdk/pull/4589)
+ * Fix topic dialog not supporting escape as it didn't have a "Close"
+   [\#4578](https://github.com/matrix-org/matrix-react-sdk/pull/4578)
+ * Default to public room when creating room from room directory
+   [\#4579](https://github.com/matrix-org/matrix-react-sdk/pull/4579)
+ * Replace png flags and add Kosovo to country code dropdown
+   [\#4576](https://github.com/matrix-org/matrix-react-sdk/pull/4576)
+ * Rename `trash (custom).svg` as electron doesn't like paths with spaces
+   [\#4583](https://github.com/matrix-org/matrix-react-sdk/pull/4583)
+ * Fix sign in / up links on previewed rooms
+   [\#4582](https://github.com/matrix-org/matrix-react-sdk/pull/4582)
+ * Avoid soft crash if unknown device in verification
+   [\#4580](https://github.com/matrix-org/matrix-react-sdk/pull/4580)
+ * Add slash commands /query and /msg to match IRC
+   [\#4568](https://github.com/matrix-org/matrix-react-sdk/pull/4568)
+ * Send cross-signing debug booleans over rageshake
+   [\#4570](https://github.com/matrix-org/matrix-react-sdk/pull/4570)
+ * Prompt user to specify an alternate server if theirs has registration off
+   [\#4575](https://github.com/matrix-org/matrix-react-sdk/pull/4575)
+ * Don't try and redact redactions for "Remove recent messages"
+   [\#4573](https://github.com/matrix-org/matrix-react-sdk/pull/4573)
+ * View Source should target the replacing event rather than the root one
+   [\#4571](https://github.com/matrix-org/matrix-react-sdk/pull/4571)
+ * Fix passphrase reset in key backup restore dialog
+   [\#4569](https://github.com/matrix-org/matrix-react-sdk/pull/4569)
+ * Ensure key backup gets dealt with correctly during secret storage reset
+   [\#4556](https://github.com/matrix-org/matrix-react-sdk/pull/4556)
+ * Fix crash for broken invites
+   [\#4565](https://github.com/matrix-org/matrix-react-sdk/pull/4565)
+ * Fix rageshake with no matrix client
+   [\#4572](https://github.com/matrix-org/matrix-react-sdk/pull/4572)
+ * Update from Weblate
+   [\#4567](https://github.com/matrix-org/matrix-react-sdk/pull/4567)
+ * Bring back UnknownBody for UISIs
+   [\#4564](https://github.com/matrix-org/matrix-react-sdk/pull/4564)
+ * clear tag panel selection if the community selected is left
+   [\#4559](https://github.com/matrix-org/matrix-react-sdk/pull/4559)
+ * Close ImageView when redacting
+   [\#4560](https://github.com/matrix-org/matrix-react-sdk/pull/4560)
+ * Redesign redactions
+   [\#4484](https://github.com/matrix-org/matrix-react-sdk/pull/4484)
+ * Don't try to reload profile information when closing the user panel
+   [\#4547](https://github.com/matrix-org/matrix-react-sdk/pull/4547)
+ * Fix right panel hiding when viewing room member
+   [\#4558](https://github.com/matrix-org/matrix-react-sdk/pull/4558)
+ * Don't erase password confirm on registration error
+   [\#4540](https://github.com/matrix-org/matrix-react-sdk/pull/4540)
+ * Add a loading state for email addresses/phone numbers in settings
+   [\#4557](https://github.com/matrix-org/matrix-react-sdk/pull/4557)
+ * set the meta tag for theme-color to the same theme css background
+   [\#4554](https://github.com/matrix-org/matrix-react-sdk/pull/4554)
+ * Update Invite Dialog copy to include email addresses
+   [\#4497](https://github.com/matrix-org/matrix-react-sdk/pull/4497)
+ * Fix slider toggle regression.
+   [\#4546](https://github.com/matrix-org/matrix-react-sdk/pull/4546)
+ * Fix a crash where a name could unexpectedly be an empty list
+   [\#4552](https://github.com/matrix-org/matrix-react-sdk/pull/4552)
+ * Solves communities can be dragged from context menu
+   [\#4492](https://github.com/matrix-org/matrix-react-sdk/pull/4492)
+ * Remove prefixes for composer avatar urls
+   [\#4553](https://github.com/matrix-org/matrix-react-sdk/pull/4553)
+ * Fix reply RR spacing getting doubled
+   [\#4541](https://github.com/matrix-org/matrix-react-sdk/pull/4541)
+ * Differentiate copy for own untrusted device dialog
+   [\#4549](https://github.com/matrix-org/matrix-react-sdk/pull/4549)
+ * EventIndex: Reduce the logging the event index is producing.
+   [\#4548](https://github.com/matrix-org/matrix-react-sdk/pull/4548)
+ * Increase rageshake size limit to 5mb
+   [\#4543](https://github.com/matrix-org/matrix-react-sdk/pull/4543)
+ * Update from Weblate
+   [\#4542](https://github.com/matrix-org/matrix-react-sdk/pull/4542)
+ * Guard against race when waiting for cross-signing to be ready
+   [\#4539](https://github.com/matrix-org/matrix-react-sdk/pull/4539)
+ * Wait for user to be verified in e2e setup
+   [\#4537](https://github.com/matrix-org/matrix-react-sdk/pull/4537)
+ * Convert MatrixChat to a TypeScript class
+   [\#4462](https://github.com/matrix-org/matrix-react-sdk/pull/4462)
+ * Mark room as read when escape is pressed
+   [\#4271](https://github.com/matrix-org/matrix-react-sdk/pull/4271)
+ * Only show key backup reminder when confirmed by server to be missing
+   [\#4534](https://github.com/matrix-org/matrix-react-sdk/pull/4534)
+ * Add device name to unverified session toast
+   [\#4535](https://github.com/matrix-org/matrix-react-sdk/pull/4535)
+ * Show progress when loading keys
+   [\#4507](https://github.com/matrix-org/matrix-react-sdk/pull/4507)
+ * Fix device verification toasts not disappearing
+   [\#4532](https://github.com/matrix-org/matrix-react-sdk/pull/4532)
+ * Update toast copy again
+   [\#4529](https://github.com/matrix-org/matrix-react-sdk/pull/4529)
+ * Re-apply theme after login
+   [\#4518](https://github.com/matrix-org/matrix-react-sdk/pull/4518)
+ * Reduce maximum width of toasts & allow multiple lines
+   [\#4525](https://github.com/matrix-org/matrix-react-sdk/pull/4525)
+ * Treat sessions that are there when we log in as old
+   [\#4524](https://github.com/matrix-org/matrix-react-sdk/pull/4524)
+ * Allow resetting storage from the access dialog
+   [\#4521](https://github.com/matrix-org/matrix-react-sdk/pull/4521)
+ * Update (bulk) unverified device toast copy
+   [\#4522](https://github.com/matrix-org/matrix-react-sdk/pull/4522)
+ * Make new device toasts appear above review toasts
+   [\#4519](https://github.com/matrix-org/matrix-react-sdk/pull/4519)
+ * Separate toasts for existing & new device verification
+   [\#4511](https://github.com/matrix-org/matrix-react-sdk/pull/4511)
+ * Slightly darker toggle off bg color
+   [\#4477](https://github.com/matrix-org/matrix-react-sdk/pull/4477)
+ * Fix pill vertical align
+   [\#4514](https://github.com/matrix-org/matrix-react-sdk/pull/4514)
+ * Fix set up encryption toast to use "set up" as action
+   [\#4502](https://github.com/matrix-org/matrix-react-sdk/pull/4502)
+ * Don't enable e2ee when inviting a 3pid
+   [\#4509](https://github.com/matrix-org/matrix-react-sdk/pull/4509)
+ * Fix internal link styling in Security Settings
+   [\#4510](https://github.com/matrix-org/matrix-react-sdk/pull/4510)
+ * Small custom theming fixes
+   [\#4508](https://github.com/matrix-org/matrix-react-sdk/pull/4508)
+ * Fix scaling issues
+   [\#4355](https://github.com/matrix-org/matrix-react-sdk/pull/4355)
+ * Aggregate device verify toasts
+   [\#4506](https://github.com/matrix-org/matrix-react-sdk/pull/4506)
+ * Support setting username and avatar colors in custom themes
+   [\#4503](https://github.com/matrix-org/matrix-react-sdk/pull/4503)
+ * only clear on continuations where the clear isn't done by SenderProfile
+   [\#4501](https://github.com/matrix-org/matrix-react-sdk/pull/4501)
+ * cap width of editable item list item to leave space for its X button
+   [\#4495](https://github.com/matrix-org/matrix-react-sdk/pull/4495)
+ * Add a link from settings / devices to your user profile
+   [\#4498](https://github.com/matrix-org/matrix-react-sdk/pull/4498)
+ * Update from Weblate
+   [\#4496](https://github.com/matrix-org/matrix-react-sdk/pull/4496)
+ * Make icon change in SetupEncryptionDialog
+   [\#4485](https://github.com/matrix-org/matrix-react-sdk/pull/4485)
+ * Remove invite only padlocks feature flag
+   [\#4487](https://github.com/matrix-org/matrix-react-sdk/pull/4487)
+ * Fix incorrect toast if security setup skipped
+   [\#4486](https://github.com/matrix-org/matrix-react-sdk/pull/4486)
+ * Revert "Update emojibase for fixed emoji codepoints and Emoji 13 support"
+   [\#4482](https://github.com/matrix-org/matrix-react-sdk/pull/4482)
+ * Fix widget URL templating (again)
+   [\#4481](https://github.com/matrix-org/matrix-react-sdk/pull/4481)
+ * Fix recovery link on login verification flow
+   [\#4479](https://github.com/matrix-org/matrix-react-sdk/pull/4479)
+ * Make avatars in pills occupy the entire space using cropping
+   [\#4476](https://github.com/matrix-org/matrix-react-sdk/pull/4476)
+ * Use WidgetType more often to avoid breaking new sticker pickers
+   [\#4458](https://github.com/matrix-org/matrix-react-sdk/pull/4458)
+ * Update logging for unmanaged widgets, and add TODO comments for other areas
+   [\#4460](https://github.com/matrix-org/matrix-react-sdk/pull/4460)
+ * Fix OpenID requests from widgets
+   [\#4459](https://github.com/matrix-org/matrix-react-sdk/pull/4459)
+ * Take encrypted message search out of labs
+   [\#4467](https://github.com/matrix-org/matrix-react-sdk/pull/4467)
+ * Fix BigEmoji for replies
+   [\#4475](https://github.com/matrix-org/matrix-react-sdk/pull/4475)
+ * Update login security copy and design to match Figma
+   [\#4472](https://github.com/matrix-org/matrix-react-sdk/pull/4472)
+ * Fix i18n of SSO UIA copy in Deactivate Account Dialog
+   [\#4471](https://github.com/matrix-org/matrix-react-sdk/pull/4471)
+ * Assert type of domNode as HTMLElement to fix build
+   [\#4470](https://github.com/matrix-org/matrix-react-sdk/pull/4470)
+ * Unignored in settings
+   [\#4466](https://github.com/matrix-org/matrix-react-sdk/pull/4466)
+ * Skip auth flow test for signing upload when password present
+   [\#4464](https://github.com/matrix-org/matrix-react-sdk/pull/4464)
+ * If user cannot set email during registration don't tell them to
+   [\#4461](https://github.com/matrix-org/matrix-react-sdk/pull/4461)
+ * Fix post-ts autocomplete, it is not null
+   [\#4463](https://github.com/matrix-org/matrix-react-sdk/pull/4463)
+ * Convert autocomplete stuff to TypeScript
+   [\#4452](https://github.com/matrix-org/matrix-react-sdk/pull/4452)
+ * Add a back button to the devtools verifications panel
+   [\#4455](https://github.com/matrix-org/matrix-react-sdk/pull/4455)
+ * Fix: wait until cross-signing keys are fetched to show verify button
+   [\#4456](https://github.com/matrix-org/matrix-react-sdk/pull/4456)
+ * Handle load error in create secret storage dialog
+   [\#4451](https://github.com/matrix-org/matrix-react-sdk/pull/4451)
+ * Allow iframes and Jitsi URLs in /addwidget
+   [\#4382](https://github.com/matrix-org/matrix-react-sdk/pull/4382)
+ * Support m.jitsi-typed widgets as Jitsi widgets
+   [\#4379](https://github.com/matrix-org/matrix-react-sdk/pull/4379)
+ * Don't recheck DeviceListener until after initial sync is finished
+   [\#4450](https://github.com/matrix-org/matrix-react-sdk/pull/4450)
+ * Fix CSS class in ButtonPlaceholder
+   [\#4449](https://github.com/matrix-org/matrix-react-sdk/pull/4449)
+ * Password Login make sure tab takes user to password field
+   [\#4441](https://github.com/matrix-org/matrix-react-sdk/pull/4441)
+ * Network Dropdown fix things not scrolling properly
+   [\#4439](https://github.com/matrix-org/matrix-react-sdk/pull/4439)
+ * ImageView make clicking off it easier
+   [\#4448](https://github.com/matrix-org/matrix-react-sdk/pull/4448)
+ * Add slash command to send a rageshake
+   [\#4443](https://github.com/matrix-org/matrix-react-sdk/pull/4443)
+ * EventIndex: Filter out events that don't have a propper content value.
+   [\#4446](https://github.com/matrix-org/matrix-react-sdk/pull/4446)
+ * Revert "Fix Filepanel scroll position state lost when room is changed"
+   [\#4445](https://github.com/matrix-org/matrix-react-sdk/pull/4445)
+ * Update seshat copy to remove trailing full stop
+   [\#4442](https://github.com/matrix-org/matrix-react-sdk/pull/4442)
+ * Fix Filepanel scroll position state lost when room is changed
+   [\#4388](https://github.com/matrix-org/matrix-react-sdk/pull/4388)
+ * Fix end-to-end tests for end-to-end encryption verification
+   [\#4436](https://github.com/matrix-org/matrix-react-sdk/pull/4436)
+ * Don't explode if the e2e test directory exists when crashing
+   [\#4437](https://github.com/matrix-org/matrix-react-sdk/pull/4437)
+ * Bump https-proxy-agent from 2.2.1 to 2.2.4 in /test/end-to-end-tests
+   [\#4430](https://github.com/matrix-org/matrix-react-sdk/pull/4430)
+ * Minor updates to e2e test instructions on Windows
+   [\#4432](https://github.com/matrix-org/matrix-react-sdk/pull/4432)
+ * Fix typo
+   [\#4435](https://github.com/matrix-org/matrix-react-sdk/pull/4435)
+ * Catch errors sooner so users can recover more easily
+   [\#4122](https://github.com/matrix-org/matrix-react-sdk/pull/4122)
+ * Rageshake: remind user of unsupported browser and send modernizr report
+   [\#4381](https://github.com/matrix-org/matrix-react-sdk/pull/4381)
+ * Design tweaks for DM Room Tiles
+   [\#4338](https://github.com/matrix-org/matrix-react-sdk/pull/4338)
+ * Don't break spills over multiple lines, ellipsis them at max-1-line
+   [\#4434](https://github.com/matrix-org/matrix-react-sdk/pull/4434)
+ * Turn the end-to-end tests back on and fix the lazy-loading tests
+   [\#4433](https://github.com/matrix-org/matrix-react-sdk/pull/4433)
+ * Fix key backup debug panel
+   [\#4431](https://github.com/matrix-org/matrix-react-sdk/pull/4431)
+ * Convert cross-signing feature flag to setting
+   [\#4416](https://github.com/matrix-org/matrix-react-sdk/pull/4416)
+ * Make RoomPublishSetting import-skinnable
+   [\#4428](https://github.com/matrix-org/matrix-react-sdk/pull/4428)
+ * Iterate cross-signing copy
+   [\#4425](https://github.com/matrix-org/matrix-react-sdk/pull/4425)
+ * Fix: ensure twemoji font is loaded when showing SAS emojis
+   [\#4422](https://github.com/matrix-org/matrix-react-sdk/pull/4422)
+ * Revert "Fix: load Twemoji before login so complete security gets the right
+   emojis during SAS"
+   [\#4421](https://github.com/matrix-org/matrix-react-sdk/pull/4421)
+ * Fix: load Twemoji before login so complete security gets the right emojis
+   during SAS
+   [\#4419](https://github.com/matrix-org/matrix-react-sdk/pull/4419)
+ * consolidate and fix copy to clipboard
+   [\#4410](https://github.com/matrix-org/matrix-react-sdk/pull/4410)
+ * Fix Message Context Menu options not displaying: block
+   [\#4418](https://github.com/matrix-org/matrix-react-sdk/pull/4418)
+ * Fix pills being broken by unescaped characters
+   [\#4411](https://github.com/matrix-org/matrix-react-sdk/pull/4411)
+
+Changes in [2.5.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.5.0) (2020-05-05)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.5.0-rc.6...v2.5.0)
+
+ * Upgrade to JS SDK 6.0.0
+ * EventIndex: Reduce the logging the event index is producing.
+   [\#4551](https://github.com/matrix-org/matrix-react-sdk/pull/4551)
+ *  Differentiate copy for own untrusted device dialog
+   [\#4550](https://github.com/matrix-org/matrix-react-sdk/pull/4550)
+ * More detailed progress for key backup progress
+   [\#4545](https://github.com/matrix-org/matrix-react-sdk/pull/4545)
+ *  Increase rageshake size limit to 5mb
+   [\#4544](https://github.com/matrix-org/matrix-react-sdk/pull/4544)
+
+Changes in [2.5.0-rc.6](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.5.0-rc.6) (2020-05-01)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.5.0-rc.5...v2.5.0-rc.6)
+
+ * Upgrade to JS SDK 6.0.0-rc.2
+ * Wait for user to be verified in e2e setup
+   [\#4538](https://github.com/matrix-org/matrix-react-sdk/pull/4538)
+ * Add device name to unverified session toast
+   [\#4536](https://github.com/matrix-org/matrix-react-sdk/pull/4536)
+
+Changes in [2.5.0-rc.5](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.5.0-rc.5) (2020-04-30)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.5.0-rc.4...v2.5.0-rc.5)
+
+ * Upgrade to JS SDK 6.0.0-rc.1
+ * Fix device verification toasts not disappearing
+   [\#4533](https://github.com/matrix-org/matrix-react-sdk/pull/4533)
+ * Allow resetting storage from the access dialog
+   [\#4526](https://github.com/matrix-org/matrix-react-sdk/pull/4526)
+ * Update toast copy again
+   [\#4530](https://github.com/matrix-org/matrix-react-sdk/pull/4530)
+ * Reduce maximum width of toasts & allow multiple lines
+   [\#4528](https://github.com/matrix-org/matrix-react-sdk/pull/4528)
+ * Treat sessions that are there when we log in as old
+   [\#4527](https://github.com/matrix-org/matrix-react-sdk/pull/4527)
+ * Update (bulk) unverified device toast copy
+   [\#4523](https://github.com/matrix-org/matrix-react-sdk/pull/4523)
+ * Make new device toasts appear above review toasts
+   [\#4520](https://github.com/matrix-org/matrix-react-sdk/pull/4520)
+ * Separate toasts for existing & new device verification
+   [\#4517](https://github.com/matrix-org/matrix-react-sdk/pull/4517)
+ * Aggregate device verify toasts
+   [\#4516](https://github.com/matrix-org/matrix-react-sdk/pull/4516)
+ * Fix set up encryption toast to use "set up" as action
+   [\#4515](https://github.com/matrix-org/matrix-react-sdk/pull/4515)
+ * Fix internal link styling in Security Settings
+   [\#4512](https://github.com/matrix-org/matrix-react-sdk/pull/4512)
+ *  Don't enable e2ee when inviting a 3pid
+   [\#4513](https://github.com/matrix-org/matrix-react-sdk/pull/4513)
+ * only clear on continuations where the clear isn't done by SenderProfile
+   [\#4505](https://github.com/matrix-org/matrix-react-sdk/pull/4505)
+ * cap width of editable item list item to leave space for its X button
+   [\#4504](https://github.com/matrix-org/matrix-react-sdk/pull/4504)
+ * Add a link from settings / devices to your user profile
+   [\#4499](https://github.com/matrix-org/matrix-react-sdk/pull/4499)
+ * Make icon change in SetupEncryptionDialog
+   [\#4490](https://github.com/matrix-org/matrix-react-sdk/pull/4490)
+ * Remove invite only padlocks feature flag for release
+   [\#4488](https://github.com/matrix-org/matrix-react-sdk/pull/4488)
+ * Fix incorrect toast if security setup skipped
+   [\#4489](https://github.com/matrix-org/matrix-react-sdk/pull/4489)
+ * Revert "Update emojibase for fixed emoji codepoints and Emoji 13 support"
+   [\#4483](https://github.com/matrix-org/matrix-react-sdk/pull/4483)
+ * Fix recovery link on login verification flow
+   [\#4480](https://github.com/matrix-org/matrix-react-sdk/pull/4480)
+
+Changes in [2.5.0-rc.4](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.5.0-rc.4) (2020-04-23)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.5.0-rc.3...v2.5.0-rc.4)
+
+ * Upgrade to JS SDK 5.3.1-rc.4
+ * Take encrypted message search out of labs for release
+   [\#4468](https://github.com/matrix-org/matrix-react-sdk/pull/4468)
+ * Update login security copy and design to match Figma [to release]
+   [\#4474](https://github.com/matrix-org/matrix-react-sdk/pull/4474)
+ * Fix i18n of SSO UIA copy in Deactivate Account Dialog on release
+   [\#4473](https://github.com/matrix-org/matrix-react-sdk/pull/4473)
+ * Skip auth flow test for signing upload when password present
+   [\#4465](https://github.com/matrix-org/matrix-react-sdk/pull/4465)
+ * Fix: wait until cross-signing keys are fetched to show verify button
+   [\#4457](https://github.com/matrix-org/matrix-react-sdk/pull/4457)
+ * Handle load error in create secret storage dialog
+   [\#4454](https://github.com/matrix-org/matrix-react-sdk/pull/4454)
+ * Don't recheck DeviceListener until after initial sync is finished
+   [\#4450](https://github.com/matrix-org/matrix-react-sdk/pull/4450)
+ * EventIndex: Filter out events that don't have a propper content value.
+   [\#4447](https://github.com/matrix-org/matrix-react-sdk/pull/4447)
+
+Changes in [2.5.0-rc.3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.5.0-rc.3) (2020-04-17)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.5.0-rc.2...v2.5.0-rc.3)
+
+ * Upgrade to JS SDK 5.3.1-rc.3
+
+Changes in [2.5.0-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.5.0-rc.2) (2020-04-16)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.5.0-rc.1...v2.5.0-rc.2)
+
+ * Upgrade to JS SDK 5.3.1-rc.2
+ * [Release] Convert cross-signing flag to a setting
+   [\#4429](https://github.com/matrix-org/matrix-react-sdk/pull/4429)
+ * Iterate cross-signing copy
+   [\#4426](https://github.com/matrix-org/matrix-react-sdk/pull/4426)
+ * Fix: ensure twemoji font is loaded when showing SAS emojis
+   [\#4423](https://github.com/matrix-org/matrix-react-sdk/pull/4423)
+
+Changes in [2.5.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.5.0-rc.1) (2020-04-15)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.4.0-rc.1...v2.5.0-rc.1)
+
+ * Upgrade to JS SDK 5.3.1-rc.1
+ * null-guard MatrixClientPeg in RoomViewStore
+   [\#4415](https://github.com/matrix-org/matrix-react-sdk/pull/4415)
+ * Fix: prevent spurious notifications from indexer
+   [\#4414](https://github.com/matrix-org/matrix-react-sdk/pull/4414)
+ * Login block on initialSync with spinners
+   [\#4413](https://github.com/matrix-org/matrix-react-sdk/pull/4413)
+ * Allow network dropdown to be scrollable and fix context menu padding calc
+   [\#4408](https://github.com/matrix-org/matrix-react-sdk/pull/4408)
+ * Remove end-to-end message info option when cross-signing is used
+   [\#4412](https://github.com/matrix-org/matrix-react-sdk/pull/4412)
+ * Minimize widgets by default
+   [\#4378](https://github.com/matrix-org/matrix-react-sdk/pull/4378)
+ * Add comments to highlight where we'll need m.widget support
+   [\#4380](https://github.com/matrix-org/matrix-react-sdk/pull/4380)
+ * Fix: dont try to enable 4S if cross-signing is disabled
+   [\#4407](https://github.com/matrix-org/matrix-react-sdk/pull/4407)
+ * Fix: don't confuse user with spinner during complete security step
+   [\#4406](https://github.com/matrix-org/matrix-react-sdk/pull/4406)
+ *  Fix: avoid potential crash during certain verification paths
+   [\#4405](https://github.com/matrix-org/matrix-react-sdk/pull/4405)
+ * Add riot-desktop shortcuts for forward/back matching browsers&slack
+   [\#4392](https://github.com/matrix-org/matrix-react-sdk/pull/4392)
+ * Convert LoggedInView to an ES6 PureComponent Class & TypeScript
+   [\#4398](https://github.com/matrix-org/matrix-react-sdk/pull/4398)
+ * Fix width of MVideoBody in FilePanel
+   [\#4396](https://github.com/matrix-org/matrix-react-sdk/pull/4396)
+ * Remove unused react-addons-css-transition-group
+   [\#4397](https://github.com/matrix-org/matrix-react-sdk/pull/4397)
+ * Fix emoji tooltip flickering
+   [\#4395](https://github.com/matrix-org/matrix-react-sdk/pull/4395)
+ * Pass along key backup for bootstrap
+   [\#4374](https://github.com/matrix-org/matrix-react-sdk/pull/4374)
+ * Fix create room dialog e2ee private room setting
+   [\#4403](https://github.com/matrix-org/matrix-react-sdk/pull/4403)
+ * Sort emoji by shortcodes for autocomplete primarily for :-1 and :+1
+   [\#4391](https://github.com/matrix-org/matrix-react-sdk/pull/4391)
+ * Fix invalid commands when figuring out whether to set isTyping
+   [\#4390](https://github.com/matrix-org/matrix-react-sdk/pull/4390)
+ * op/deop return error if trying to affect an unknown user
+   [\#4389](https://github.com/matrix-org/matrix-react-sdk/pull/4389)
+ * Composer pills respect showPillAvatar setting
+   [\#4384](https://github.com/matrix-org/matrix-react-sdk/pull/4384)
+ * Only send typing notification when composing commands which send messages
+   [\#4385](https://github.com/matrix-org/matrix-react-sdk/pull/4385)
+ * Reverse order of they match/they don't match buttons
+   [\#4386](https://github.com/matrix-org/matrix-react-sdk/pull/4386)
+ * Use singular text on 'delete sessions' button for SSO
+   [\#4383](https://github.com/matrix-org/matrix-react-sdk/pull/4383)
+ * Pass widget data through from sticker picker
+   [\#4377](https://github.com/matrix-org/matrix-react-sdk/pull/4377)
+ * Obliterate widgets when they are minimized
+   [\#4376](https://github.com/matrix-org/matrix-react-sdk/pull/4376)
+ * Fix image thumbnail width when read receipts are hidden
+   [\#4370](https://github.com/matrix-org/matrix-react-sdk/pull/4370)
+ * Add toggle for e2ee when creating private room
+   [\#4362](https://github.com/matrix-org/matrix-react-sdk/pull/4362)
+ * Fix logging for failed searches
+   [\#4372](https://github.com/matrix-org/matrix-react-sdk/pull/4372)
+ * Ensure UI is updated when cross-signing gets disabled
+   [\#4369](https://github.com/matrix-org/matrix-react-sdk/pull/4369)
+ * Retry the request for the master key from SSSS on login
+   [\#4371](https://github.com/matrix-org/matrix-react-sdk/pull/4371)
+ * Upgrade deps
+   [\#4365](https://github.com/matrix-org/matrix-react-sdk/pull/4365)
+ * App load tweaks, i18n and localStorage
+   [\#4367](https://github.com/matrix-org/matrix-react-sdk/pull/4367)
+ * Fix encoding of widget arguments
+   [\#4366](https://github.com/matrix-org/matrix-react-sdk/pull/4366)
+
+Changes in [2.4.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.4.0-rc.1) (2020-04-08)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.3.1...v2.4.0-rc.1)
+
+ * Upgrade to JS SDK to 5.3.0-rc.1
+ * EventIndex: Log if we had all events in a checkpoint but are continuing.
+   [\#4363](https://github.com/matrix-org/matrix-react-sdk/pull/4363)
+ * Update from Weblate
+   [\#4364](https://github.com/matrix-org/matrix-react-sdk/pull/4364)
+ * Support deactivating your account with SSO
+   [\#4356](https://github.com/matrix-org/matrix-react-sdk/pull/4356)
+ * Add debug status for cached backup key format
+   [\#4359](https://github.com/matrix-org/matrix-react-sdk/pull/4359)
+ * Fix composer placeholder not updating
+   [\#4361](https://github.com/matrix-org/matrix-react-sdk/pull/4361)
+ * Fix sas verification buttons to match figma
+   [\#4358](https://github.com/matrix-org/matrix-react-sdk/pull/4358)
+ * Don't show fallback text for verification requests
+   [\#4345](https://github.com/matrix-org/matrix-react-sdk/pull/4345)
+ * Fix share dialog correctly
+   [\#4360](https://github.com/matrix-org/matrix-react-sdk/pull/4360)
+ * Use singular copy when only deleting one device
+   [\#4357](https://github.com/matrix-org/matrix-react-sdk/pull/4357)
+ * Deem m.sticker events as actionable for reacting
+   [\#4288](https://github.com/matrix-org/matrix-react-sdk/pull/4288)
+ * Don't show spinner over encryption setup dialogs
+   [\#4354](https://github.com/matrix-org/matrix-react-sdk/pull/4354)
+ * Support Jitsi information from client .well-known
+   [\#4348](https://github.com/matrix-org/matrix-react-sdk/pull/4348)
+ * Add new default home page fallback
+   [\#4350](https://github.com/matrix-org/matrix-react-sdk/pull/4350)
+ * Check more account data in toast listener
+   [\#4351](https://github.com/matrix-org/matrix-react-sdk/pull/4351)
+ * Don't try to send presence updates until the client is started
+   [\#4353](https://github.com/matrix-org/matrix-react-sdk/pull/4353)
+ * Fix copy button on code blocks when there is no code tag just pre
+   [\#4352](https://github.com/matrix-org/matrix-react-sdk/pull/4352)
+ * Clear sessionStorage on sign out
+   [\#4346](https://github.com/matrix-org/matrix-react-sdk/pull/4346)
+ * Re-request room keys after auth
+   [\#4341](https://github.com/matrix-org/matrix-react-sdk/pull/4341)
+ * Update emojibase for fixed emoji codepoints and Emoji 13 support
+   [\#4344](https://github.com/matrix-org/matrix-react-sdk/pull/4344)
+ * App load order tweaks for code splitting
+   [\#4343](https://github.com/matrix-org/matrix-react-sdk/pull/4343)
+ * Fix alignment of e2e icon in userinfo and expose full displayname in title
+   [\#4312](https://github.com/matrix-org/matrix-react-sdk/pull/4312)
+ * Adjust copy & UX for self-verification
+   [\#4342](https://github.com/matrix-org/matrix-react-sdk/pull/4342)
+ * QR code reciprocation
+   [\#4334](https://github.com/matrix-org/matrix-react-sdk/pull/4334)
+ * Fix Hangul typing does not work properly
+   [\#4339](https://github.com/matrix-org/matrix-react-sdk/pull/4339)
+ * Fix: dismiss setup encryption toast if cross-signing is ready
+   [\#4336](https://github.com/matrix-org/matrix-react-sdk/pull/4336)
+ * Fix read marker visibility for grouped events
+   [\#4340](https://github.com/matrix-org/matrix-react-sdk/pull/4340)
+ * Make all 'font-size's and 'line-height's rem
+   [\#4305](https://github.com/matrix-org/matrix-react-sdk/pull/4305)
+ * Fix spurious extra devices on registration
+   [\#4337](https://github.com/matrix-org/matrix-react-sdk/pull/4337)
+ * Fix the edit messager composer
+   [\#4333](https://github.com/matrix-org/matrix-react-sdk/pull/4333)
+ * Fix Room Settings Dialog Notifications tab icon
+   [\#4321](https://github.com/matrix-org/matrix-react-sdk/pull/4321)
+ * Fix various cases of React warnings by silencing them
+   [\#4331](https://github.com/matrix-org/matrix-react-sdk/pull/4331)
+ * Only apply padding to standard textual buttons (kind buttons)
+   [\#4332](https://github.com/matrix-org/matrix-react-sdk/pull/4332)
+ * Use console.log in place of console.warn for less warnings
+   [\#4330](https://github.com/matrix-org/matrix-react-sdk/pull/4330)
+ * Revert componentDidMount changes on breadcrumbs
+   [\#4329](https://github.com/matrix-org/matrix-react-sdk/pull/4329)
+ * Use new method for checking secret storage key
+   [\#4309](https://github.com/matrix-org/matrix-react-sdk/pull/4309)
+ * Label and use UNSAFE_componentWillMount to minimize warnings
+   [\#4315](https://github.com/matrix-org/matrix-react-sdk/pull/4315)
+ * Fix a number of minor code quality issues
+   [\#4314](https://github.com/matrix-org/matrix-react-sdk/pull/4314)
+ * Use componentDidMount in place of componentWillMount where possible
+   [\#4313](https://github.com/matrix-org/matrix-react-sdk/pull/4313)
+ * EventIndex: Mark the initial checkpoints for a full crawl.
+   [\#4325](https://github.com/matrix-org/matrix-react-sdk/pull/4325)
+ * Fix UserInfo e2e buttons to match Figma
+   [\#4320](https://github.com/matrix-org/matrix-react-sdk/pull/4320)
+ * Only auto-scroll to RoomTile when clicking on RoomTile or via shortcuts
+   [\#4316](https://github.com/matrix-org/matrix-react-sdk/pull/4316)
+ * Support SSO for interactive authentication
+   [\#4292](https://github.com/matrix-org/matrix-react-sdk/pull/4292)
+ * Fix /invite Slash Command
+   [\#4328](https://github.com/matrix-org/matrix-react-sdk/pull/4328)
+ * Fix jitsi popout URL
+   [\#4326](https://github.com/matrix-org/matrix-react-sdk/pull/4326)
+ * Use our own jitsi widget for the popout URL
+   [\#4323](https://github.com/matrix-org/matrix-react-sdk/pull/4323)
+ * Fix popout support for jitsi widgets
+   [\#4319](https://github.com/matrix-org/matrix-react-sdk/pull/4319)
+ * Fix: legacy verify user throwing error
+   [\#4318](https://github.com/matrix-org/matrix-react-sdk/pull/4318)
+ * Document settingDefaults
+   [\#3046](https://github.com/matrix-org/matrix-react-sdk/pull/3046)
+ * Fix Ctrl+/ for Finnish keyboard where it includes Shift
+   [\#4317](https://github.com/matrix-org/matrix-react-sdk/pull/4317)
+ * Rework SlashCommands to better expose aliases
+   [\#4302](https://github.com/matrix-org/matrix-react-sdk/pull/4302)
+ * Fix EventListSummary when RR rendering is disabled
+   [\#4311](https://github.com/matrix-org/matrix-react-sdk/pull/4311)
+ * Update link to css location.
+   [\#4299](https://github.com/matrix-org/matrix-react-sdk/pull/4299)
+ * Fix peeking keeping two timeline update mechanisms in play
+   [\#4310](https://github.com/matrix-org/matrix-react-sdk/pull/4310)
+ * Pass new secret storage key to bootstrap path
+   [\#4308](https://github.com/matrix-org/matrix-react-sdk/pull/4308)
+ * Show red shield for users that become unverified
+   [\#4303](https://github.com/matrix-org/matrix-react-sdk/pull/4303)
+ * Accessibility fixed for Event List Summary and Composer Format Bar
+   [\#4295](https://github.com/matrix-org/matrix-react-sdk/pull/4295)
+ * Support $riot: Templates for SSO/CAS urls in the welcome.html page
+   [\#4279](https://github.com/matrix-org/matrix-react-sdk/pull/4279)
+ * Added the /html command
+   [\#4296](https://github.com/matrix-org/matrix-react-sdk/pull/4296)
+ * EventIndex: Better logging on how many events are added.
+   [\#4301](https://github.com/matrix-org/matrix-react-sdk/pull/4301)
+ * Field: mark id as optional in propTypes
+   [\#4307](https://github.com/matrix-org/matrix-react-sdk/pull/4307)
+ * Fix view community link icon contrast
+   [\#4254](https://github.com/matrix-org/matrix-react-sdk/pull/4254)
+ * Remove underscore from Jitsi conference names
+   [\#4304](https://github.com/matrix-org/matrix-react-sdk/pull/4304)
+ * Refactor shield display logic; changed rules for DMs
+   [\#4290](https://github.com/matrix-org/matrix-react-sdk/pull/4290)
+ * Fix: bring back global thin scrollbars
+   [\#4300](https://github.com/matrix-org/matrix-react-sdk/pull/4300)
+ * Keyboard shortcuts: Escape cancel reply and fix Ctrl+K
+   [\#4297](https://github.com/matrix-org/matrix-react-sdk/pull/4297)
+ * Field: make id optional, generate one if not provided
+   [\#4298](https://github.com/matrix-org/matrix-react-sdk/pull/4298)
+ * Fix ugly scrollbars in TabbedView (settings), emojipicker and widgets
+   [\#4293](https://github.com/matrix-org/matrix-react-sdk/pull/4293)
+ * Rename secret storage force-reset variable to avoid confusion
+   [\#4274](https://github.com/matrix-org/matrix-react-sdk/pull/4274)
+ * Fix: can't dismiss unverified session toast when encryption hasn't been
+   upgraded
+   [\#4291](https://github.com/matrix-org/matrix-react-sdk/pull/4291)
+ * Blank out UserInfo avatar when changing between members
+   [\#4289](https://github.com/matrix-org/matrix-react-sdk/pull/4289)
+ * Add cancel button to verification panel
+   [\#4283](https://github.com/matrix-org/matrix-react-sdk/pull/4283)
+ * Show ongoing verification request straight away when navigating to member
+   [\#4284](https://github.com/matrix-org/matrix-react-sdk/pull/4284)
+ * Fix: allow scrolling while window is not focused & remove scrollbar hack
+   [\#4276](https://github.com/matrix-org/matrix-react-sdk/pull/4276)
+ * Show whether backup key is cached
+   [\#4287](https://github.com/matrix-org/matrix-react-sdk/pull/4287)
+ * Rename unverified session toast
+   [\#4285](https://github.com/matrix-org/matrix-react-sdk/pull/4285)
+ * Fix: pick last active DM for verification request
+   [\#4286](https://github.com/matrix-org/matrix-react-sdk/pull/4286)
+ * Fix formatBar not hidden after highlight and backspacing some text
+   [\#4269](https://github.com/matrix-org/matrix-react-sdk/pull/4269)
+
 Changes in [2.3.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.3.1) (2020-04-01)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.3.0...v2.3.1)
diff --git a/README.md b/README.md
index 69aafeb724..e468d272d0 100644
--- a/README.md
+++ b/README.md
@@ -11,14 +11,14 @@ a 'skin'. A skin provides:
  * The containing application
  * Zero or more 'modules' containing non-UI functionality
 
-As of Aug 2018, the only skin that exists is `vector-im/riot-web`; it and
+As of Aug 2018, the only skin that exists is `vector-im/element-web`; it and
 `matrix-org/matrix-react-sdk` should effectively
 be considered as a single project (for instance, matrix-react-sdk bugs
-are currently filed against vector-im/riot-web rather than this project).
+are currently filed against vector-im/element-web rather than this project).
 
 Translation Status
 ==================
-[![Translation status](https://translate.riot.im/widgets/riot-web/-/multi-auto.svg)](https://translate.riot.im/engage/riot-web/?utm_source=widget)
+[![Translation status](https://translate.riot.im/widgets/element-web/-/multi-auto.svg)](https://translate.riot.im/engage/element-web/?utm_source=widget)
 
 Developer Guide
 ===============
@@ -41,10 +41,10 @@ https://github.com/matrix-org/matrix-react-sdk/blob/master/code_style.md
 
 Code should be committed as follows:
  * All new components: https://github.com/matrix-org/matrix-react-sdk/tree/master/src/components
- * Riot-specific components: https://github.com/vector-im/riot-web/tree/master/src/components
+ * Element-specific components: https://github.com/vector-im/element-web/tree/master/src/components
    * In practice, `matrix-react-sdk` is still evolving so fast that the maintenance
-     burden of customising and overriding these components for Riot can seriously
-     impede development.  So right now, there should be very few (if any) customisations for Riot.
+     burden of customising and overriding these components for Element can seriously
+     impede development.  So right now, there should be very few (if any) customisations for Element.
  * CSS: https://github.com/matrix-org/matrix-react-sdk/tree/master/res/css
  * Theme specific CSS & resources: https://github.com/matrix-org/matrix-react-sdk/tree/master/res/themes
 
@@ -71,7 +71,7 @@ practices that anyone working with the SDK needs to be be aware of and uphold:
 
   * The view's CSS file MUST have the same name (e.g. view/rooms/MessageTile.css).
     CSS for matrix-react-sdk currently resides in
-    https://github.com/vector-im/riot-web/tree/master/src/skins/vector/css/matrix-react-sdk.
+    https://github.com/vector-im/element-web/tree/master/src/skins/vector/css/matrix-react-sdk.
 
   * Per-view CSS is optional - it could choose to inherit all its styling from
     the context of the rest of the app, although this is unusual for any but
@@ -125,7 +125,7 @@ from it.
 Github Issues
 =============
 
-All issues should be filed under https://github.com/vector-im/riot-web/issues
+All issues should be filed under https://github.com/vector-im/element-web/issues
 for now.
 
 Development
@@ -133,8 +133,10 @@ Development
 
 Ensure you have the latest LTS version of Node.js installed.
 
-Using `yarn` instead of `npm` is recommended. Please see the Yarn [install
-guide](https://yarnpkg.com/docs/install/) if you do not have it already.
+Using `yarn` instead of `npm` is recommended. Please see the Yarn 1 [install
+guide](https://classic.yarnpkg.com/docs/install) if you do not have it
+already. This project has not yet been migrated to Yarn 2, so please ensure
+`yarn --version` shows a version from the 1.x series.
 
 `matrix-react-sdk` depends on `matrix-js-sdk`. To make use of changes in the
 latter and to ensure tests run against the develop branch of `matrix-js-sdk`,
@@ -172,5 +174,5 @@ yarn test
 
 ## End-to-End tests
 
-Make sure you've got your Riot development server running (by doing `yarn start` in riot-web), and then in this project, run `yarn run e2etests`.
+Make sure you've got your Element development server running (by doing `yarn start` in element-web), and then in this project, run `yarn run e2etests`.
 See `test/end-to-end-tests/README.md` for more information.
diff --git a/code_style.md b/code_style.md
index 3ad0d38873..fe04d2cc3d 100644
--- a/code_style.md
+++ b/code_style.md
@@ -4,7 +4,7 @@ Matrix JavaScript/ECMAScript Style Guide
 The intention of this guide is to make Matrix's JavaScript codebase clean,
 consistent with other popular JavaScript styles and consistent with the rest of
 the Matrix codebase. For reference, the Matrix Python style guide can be found
-at https://github.com/matrix-org/synapse/blob/master/docs/code_style.rst
+at https://github.com/matrix-org/synapse/blob/master/docs/code_style.md
 
 This document reflects how we would like Matrix JavaScript code to look, with
 acknowledgement that a significant amount of code is written to older
@@ -17,7 +17,7 @@ writing in modern ECMAScript and using a transpile step to generate the file
 that applications can then include. There are significant benefits in being
 able to use modern ECMAScript, although the tooling for doing so can be awkward
 for library code, especially with regard to translating source maps and line
-number throgh from the original code to the final application.
+number through from the original code to the final application.
 
 General Style
 -------------
@@ -151,6 +151,7 @@ General Style
   Don't set things to undefined. Reserve that value to mean "not yet set to anything."
   Boolean objects are verboten.
 - Use JSDoc
+- Use switch-case statements where there are 5 or more branches running against the same variable.
 
 ECMAScript
 ----------
diff --git a/docs/ciderEditor.md b/docs/ciderEditor.md
index 00033b5b8c..f522dc2fc4 100644
--- a/docs/ciderEditor.md
+++ b/docs/ciderEditor.md
@@ -1,6 +1,6 @@
 # The CIDER (Contenteditable-Input-Diff-Error-Reconcile) editor
 
-The CIDER editor is a custom editor written for Riot.
+The CIDER editor is a custom editor written for Element.
 Most of the code can be found in the `/editor/` directory of the `matrix-react-sdk` project.
 It is used to power the composer main composer (both to send and edit messages), and might be used for other usecases where autocomplete is desired (invite box, ...).
 
diff --git a/docs/img/RoomListStore2.png b/docs/img/RoomListStore2.png
new file mode 100644
index 0000000000..9952d1c910
Binary files /dev/null and b/docs/img/RoomListStore2.png differ
diff --git a/docs/jitsi.md b/docs/jitsi.md
index 779ef79d3a..2b63ce0f72 100644
--- a/docs/jitsi.md
+++ b/docs/jitsi.md
@@ -25,7 +25,7 @@ which takes several parameters:
   be null.
 
 The react-sdk will assume that `jitsi.html` is at the path of wherever it is currently
-being served. For example, `https://riot.im/develop/jitsi.html` or `vector://webapp/jitsi.html`.
+being served. For example, `https://develop.element.io/jitsi.html` or `vector://webapp/jitsi.html`.
 
 The `jitsi.html` wrapper can use the react-sdk's `WidgetApi` to communicate, making
 it easier to actually implement the feature.
diff --git a/docs/local-echo-dev.md b/docs/local-echo-dev.md
new file mode 100644
index 0000000000..e4725a9b07
--- /dev/null
+++ b/docs/local-echo-dev.md
@@ -0,0 +1,39 @@
+# Local echo (developer docs)
+
+The React SDK provides some local echo functionality to allow for components to do something
+quickly and fall back when it fails. This is all available in the `local-echo` directory within
+`stores`.
+
+Echo is handled in EchoChambers, with `GenericEchoChamber` being the base implementation for all
+chambers. The `EchoChamber` class is provided as semantic access to a `GenericEchoChamber`
+implementation, such as the `RoomEchoChamber` (which handles echoable details of a room).
+
+Anything that can be locally echoed will be provided by the `GenericEchoChamber` implementation.
+The echo chamber will also need to deal with external changes, and has full control over whether
+or not something has successfully been echoed. 
+
+An `EchoContext` is provided to echo chambers (usually with a matching type: `RoomEchoContext`
+gets provided to a `RoomEchoChamber` for example) with details about their intended area of
+effect, as well as manage `EchoTransaction`s. An `EchoTransaction` is simply a unit of work that
+needs to be locally echoed.
+
+The `EchoStore` manages echo chamber instances, builds contexts, and is generally less semantically
+accessible than the `EchoChamber` class. For separation of concerns, and to try and keep things
+tidy, this is an intentional design decision.
+
+**Note**: The local echo stack uses a "whenable" pattern, which is similar to thenables and 
+`EventEmitter`. Whenables are ways of actioning a changing condition without having to deal
+with listeners being torn down. Once the reference count of the Whenable causes garbage collection,
+the Whenable's listeners will also be torn down. This is accelerated by the `IDestroyable` interface
+usage.
+
+## Audit functionality
+
+The UI supports a "Server isn't responding" dialog which includes a partial audit log-like
+structure to it. This is partially the reason for added complexity of `EchoTransaction`s
+and `EchoContext`s - this information feeds the UI states which then provide direct retry
+mechanisms.
+
+The `EchoStore` is responsible for ensuring that the appropriate non-urgent toast (lower left)
+is set up, where the dialog then drives through the contexts and transactions.
+
diff --git a/docs/room-list-store.md b/docs/room-list-store.md
new file mode 100644
index 0000000000..fa849e2505
--- /dev/null
+++ b/docs/room-list-store.md
@@ -0,0 +1,151 @@
+# Room list sorting
+
+It's so complicated it needs its own README.
+
+![](img/RoomListStore2.png)
+
+Legend:
+* Orange = External event.
+* Purple = Deterministic flow. 
+* Green = Algorithm definition.
+* Red = Exit condition/point.
+* Blue = Process definition.
+
+## Algorithms involved
+
+There's two main kinds of algorithms involved in the room list store: list ordering and tag sorting.
+Throughout the code an intentional decision has been made to call them the List Algorithm and Sorting
+Algorithm respectively. The list algorithm determines the primary ordering of a given tag whereas the
+tag sorting defines how rooms within that tag get sorted, at the discretion of the list ordering.
+
+Behaviour of the overall room list (sticky rooms, etc) are determined by the generically-named Algorithm
+class. Here is where much of the coordination from the room list store is done to figure out which list
+algorithm to call, instead of having all the logic in the room list store itself.
+
+
+Tag sorting is effectively the comparator supplied to the list algorithm. This gives the list algorithm
+the power to decide when and how to apply the tag sorting, if at all. For example, the importance algorithm, 
+later described in this document, heavily uses the list ordering behaviour to break the tag into categories. 
+Each category then gets sorted by the appropriate tag sorting algorithm.
+
+### Tag sorting algorithm: Alphabetical
+
+When used, rooms in a given tag will be sorted alphabetically, where the alphabet's order is a problem
+for the browser. All we do is a simple string comparison and expect the browser to return something
+useful.
+
+### Tag sorting algorithm: Manual
+
+Manual sorting makes use of the `order` property present on all tags for a room, per the 
+[Matrix specification](https://matrix.org/docs/spec/client_server/r0.6.0#room-tagging). Smaller values
+of `order` cause rooms to appear closer to the top of the list.
+
+### Tag sorting algorithm: Recent
+
+Rooms get ordered by the timestamp of the most recent useful message. Usefulness is yet another algorithm
+in the room list system which determines whether an event type is capable of bubbling up in the room list.
+Normally events like room messages, stickers, and room security changes will be considered useful enough
+to cause a shift in time.
+
+Note that this is reliant on the event timestamps of the most recent message. Because Matrix is eventually
+consistent this means that from time to time a room might plummet or skyrocket across the tag due to the
+timestamp contained within the event (generated server-side by the sender's server).
+
+### List ordering algorithm: Natural
+
+This is the easiest of the algorithms to understand because it does essentially nothing. It imposes no
+behavioural changes over the tag sorting algorithm and is by far the simplest way to order a room list.
+Historically, it's been the only option in Element and extremely common in most chat applications due to
+its relative deterministic behaviour.
+
+### List ordering algorithm: Importance
+
+On the other end of the spectrum, this is the most complicated algorithm which exists. There's major
+behavioural changes, and the tag sorting algorithm gets selectively applied depending on circumstances.
+
+Each tag which is not manually ordered gets split into 4 sections or "categories". Manually ordered tags
+simply get the manual sorting algorithm applied to them with no further involvement from the importance
+algorithm. There are 4 categories: Red, Grey, Bold, and Idle. Each has their own definition based off
+relative (perceived) importance to the user:
+
+* **Red**: The room has unread mentions waiting for the user.
+* **Grey**: The room has unread notifications waiting for the user. Notifications are simply unread
+  messages which cause a push notification or badge count. Typically, this is the default as rooms get
+  set to 'All Messages'.
+* **Bold**: The room has unread messages waiting for the user. Essentially this is a grey room without
+  a badge/notification count (or 'Mentions Only'/'Muted').
+* **Idle**: No useful (see definition of useful above) activity has occurred in the room since the user 
+  last read it.
+
+Conveniently, each tag gets ordered by those categories as presented: red rooms appear above grey, grey
+above bold, etc.
+
+Once the algorithm has determined which rooms belong in which categories, the tag sorting algorithm
+gets applied to each category in a sub-list fashion. This should result in the red rooms (for example)
+being sorted alphabetically amongst each other as well as the grey rooms sorted amongst each other, but 
+collectively the tag will be sorted into categories with red being at the top.
+
+## Sticky rooms
+
+When the user visits a room, that room becomes 'sticky' in the list, regardless of ordering algorithm.
+From a code perspective, the underlying algorithm is not aware of a sticky room and instead the base class
+manages which room is sticky. This is to ensure that all algorithms handle it the same.
+
+The sticky flag is simply to say it will not move higher or lower down the list while it is active. For
+example, if using the importance algorithm, the room would naturally become idle once viewed and thus
+would normally fly down the list out of sight. The sticky room concept instead holds it in place, never
+letting it fly down until the user moves to another room.
+
+Only one room can be sticky at a time. Room updates around the sticky room will still hold the sticky
+room in place. The best example of this is the importance algorithm: if the user has 3 red rooms and
+selects the middle room, they will see exactly one room above their selection at all times. If they
+receive another notification which causes the room to move into the topmost position, the room that was
+above the sticky room will move underneath to allow for the new room to take the top slot, maintaining
+the sticky room's position.
+
+Though only applicable to the importance algorithm, the sticky room is not aware of category boundaries 
+and thus the user can see a shift in what kinds of rooms move around their selection. An example would 
+be the user having 4 red rooms, the user selecting the third room (leaving 2 above it), and then having 
+the rooms above it read on another device. This would result in 1 red room and 1 other kind of room 
+above the sticky room as it will try to maintain 2 rooms above the sticky room.
+
+An exception for the sticky room placement is when there's suddenly not enough rooms to maintain the placement
+exactly. This typically happens if the user selects a room and leaves enough rooms where it cannot maintain
+the N required rooms above the sticky room. In this case, the sticky room will simply decrease N as needed.
+The N value will never increase while selection remains unchanged: adding a bunch of rooms after having 
+put the sticky room in a position where it's had to decrease N will not increase N.
+
+## Responsibilities of the store
+
+The store is responsible for the ordering, upkeep, and tracking of all rooms. The room list component simply gets 
+an object containing the tags it needs to worry about and the rooms within. The room list component will 
+decide which tags need rendering (as it commonly filters out empty tags in most cases), and will deal with 
+all kinds of filtering.
+
+## Filtering
+
+Filters are provided to the store as condition classes, which are then passed along to the algorithm
+implementations. The implementations then get to decide how to actually filter the rooms, however in
+practice the base `Algorithm` class deals with the filtering in a more optimized/generic way.
+
+The results of filters get cached to avoid needlessly iterating over potentially thousands of rooms,
+as the old room list store does. When a filter condition changes, it emits an update which (in this
+case) the `Algorithm` class will pick up and act accordingly. Typically, this also means filtering a 
+minor subset where possible to avoid over-iterating rooms.
+
+All filter conditions are considered "stable" by the consumers, meaning that the consumer does not
+expect a change in the condition unless the condition says it has changed. This is intentional to
+maintain the caching behaviour described above.
+
+## Class breakdowns
+
+The `RoomListStore` is the major coordinator of various algorithm implementations, which take care 
+of the various `ListAlgorithm` and `SortingAlgorithm` options. The `Algorithm` class is responsible 
+for figuring out which tags get which rooms, as Matrix specifies them as a reverse map: tags get 
+defined on rooms and are not defined as a collection of rooms (unlike how they are presented to the 
+user). Various list-specific utilities are also included, though they are expected to move somewhere 
+more general when needed. For example, the `membership` utilities could easily be moved elsewhere 
+as needed.
+
+The various bits throughout the room list store should also have jsdoc of some kind to help describe
+what they do and how they work.
diff --git a/docs/scrolling.md b/docs/scrolling.md
index 71329e5c32..a5232359a7 100644
--- a/docs/scrolling.md
+++ b/docs/scrolling.md
@@ -13,7 +13,7 @@ ScrollPanel supports a mode to prevent it shrinking. This is used to prevent a j
 
 BACAT scrolling implements a different way of restoring the scroll position in the timeline while tiles out of view are changing height or tiles are being added or removed. It was added in https://github.com/matrix-org/matrix-react-sdk/pull/2842.
 
-The motivation for the changes is having noticed that setting scrollTop while scrolling tends to not work well, with it interrupting ongoing scrolling and also querying scrollTop reporting outdated values and consecutive scroll adjustments cancelling each out previous ones. This seems to be worse on macOS than other platforms, presumably because of a higher resolution in scroll events there. Also see https://github.com/vector-im/riot-web/issues/528. The BACAT approach allows to only have to change the scroll offset when adding or removing tiles.
+The motivation for the changes is having noticed that setting scrollTop while scrolling tends to not work well, with it interrupting ongoing scrolling and also querying scrollTop reporting outdated values and consecutive scroll adjustments cancelling each out previous ones. This seems to be worse on macOS than other platforms, presumably because of a higher resolution in scroll events there. Also see https://github.com/vector-im/element-web/issues/528. The BACAT approach allows to only have to change the scroll offset when adding or removing tiles.
 
 The approach taken instead is to vertically align the timeline tiles to the bottom of the scroll container (using flexbox) and give the timeline inside the scroll container an explicit height, initially set to a multiple of the PAGE_SIZE (400px at time of writing) as needed by the content. When scrolled up, we can compensate for anything that grew below the viewport by changing the height of the timeline to maintain what's currently visible in the viewport without adjusting the scrollTop and hence without jumping.
 
diff --git a/docs/settings.md b/docs/settings.md
index 46e4a68fdb..4172c72c15 100644
--- a/docs/settings.md
+++ b/docs/settings.md
@@ -9,7 +9,7 @@ of dealing with the different levels and exposes easy to use getters and setters
 ## Levels
 
 Granular Settings rely on a series of known levels in order to use the correct value for the scenario. These levels, in 
-order of prioirty, are:
+order of priority, are:
 * `device` - The current user's device
 * `room-device` - The current user's device, but only when in a specific room
 * `room-account` - The current user's account, but only when in a specific room
@@ -25,33 +25,10 @@ that room administrators cannot force account-only settings upon participants.
 ## Settings
 
 Settings are the different options a user may set or experience in the application. These are pre-defined in 
-`src/settings/Settings.js` under the `SETTINGS` constant and have the following minimum requirements:
-```
-// The ID is used to reference the setting throughout the application. This must be unique.
-"theSettingId": {
-  // The levels this setting supports is required. In `src/settings/Settings.js` there are various pre-set arrays
-  // for this option - they should be used where possible to avoid copy/pasting arrays across settings.
-  supportedLevels: [...],
+`src/settings/Settings.ts` under the `SETTINGS` constant, and match the `ISetting` interface as defined there.
 
-  // The default for this setting serves two purposes: It provides a value if the setting is not defined at other
-  // levels, and it serves to demonstrate the expected type to other developers. The value isn't enforced, but it
-  // should be respected throughout the code. The default may be any data type.
-  default: false,
-
-  // The display name has two notations: string and object. The object notation allows for different translatable
-  // strings to be used for different levels, while the string notation represents the string for all levels.
-
-  displayName: _td("Change something"), // effectively `displayName: { "default": _td("Change something") }`
-  displayName: {
-    "room": _td("Change something for participants of this room"),
-
-    // Note: the default will be used if the level requested (such as `device`) does not have a string defined here.
-    "default": _td("Change something"),
-  }
-}
-```
-
-Settings that support the config level can be set in the config file under the `settingDefaults` key (note that some settings, like the "theme" setting, are special cased in the config file):
+Settings that support the config level can be set in the config file under the `settingDefaults` key (note that some 
+settings, like the "theme" setting, are special cased in the config file):
 ```json
 {
   ...
@@ -119,38 +96,29 @@ for you. If a display name cannot be found, it will return `null`.
 
 ## Features
 
-Occasionally some parts of the application may be undergoing testing and are not quite production ready. These are 
-commonly known to be behind a "labs flag". Features behind lab flags must go through the granular settings system, and 
-look and act very much normal settings. The exception is that they must supply `isFeature: true` as part of the setting 
-definition and should go through the helper functions on `SettingsStore`.
+Feature flags are just like regular settings with some underlying semantics for how they are meant to be used. Usually
+a feature flag is used when a portion of the application is under development or not ready for full release yet, such
+as new functionality or experimental ideas. In these cases, the feature name *should* be named with the `feature_*`
+convention and must be tagged with `isFeature: true` in the setting definition. By doing so, the feature will automatically
+appear in the "labs" section of the user's settings.
 
-Although features have levels and a default value, the calculation of those options is blocked by the feature's state. 
-A feature's state is determined from the `SdkConfig` and is a little complex. If `enableLabs` (a legacy flag) is `true` 
-then the feature's state is `labs`, if it is `false`, the state is `disable`. If `enableLabs` is not set then the state 
-is determined from the `features` config, such as in the following:
+Features can be controlled at the config level using the following structure:
 ```json
 "features": {
-    "feature_lazyloading": "labs"
+  "feature_lazyloading": true
 }
 ```
-In this example, `feature_lazyloading` is in the `labs` state. It may also be in the `enable` or `disable` state with a 
-similar approach. If the state is invalid, the feature is in the `disable` state. A feature's levels are only calculated 
-if it is in the `labs` state, therefore the default only applies in that scenario. If the state is `enable`, the feature 
-is always-on.
 
-Once a feature flag has served its purpose, it is generally recommended to remove it and the associated feature flag 
-checks. This would enable the feature implicitly as it is part of the application now.
+When `true`, the user will see the feature as enabled. Similarly, when `false` the user will see the feature as disabled.
+The user will only be able to change/see these states if `showLabsSettings: true` is in the config.
 
 ### Determining if a feature is enabled
 
-A simple call to `SettingsStore.isFeatureEnabled` will tell you if the feature is enabled. This will perform all the 
-required calculations to determine if the feature is enabled based upon the configuration and user selection.
+Call `SettingsStore.getValue()` as you would for any other setting.
 
 ### Enabling a feature
 
-Features can only be enabled if the feature is in the `labs` state, otherwise this is a no-op. To find the current set 
-of features in the `labs` state, call `SettingsStore.getLabsFeatures`. To set the value, call 
-`SettingsStore.setFeatureEnabled`. 
+Call `SettingsStore.setValue("feature_name", null, SettingLevel.DEVICE, true)`.
 
 
 ## Setting controllers
@@ -162,7 +130,7 @@ kept up to date with the setting where it is otherwise not possible. An example
 they can only be considered enabled if the platform supports notifications, and enabling notifications requires 
 additional steps to actually enable notifications.
 
-For more information, see `src/settings/controllers/SettingController.js`.
+For more information, see `src/settings/controllers/SettingController.ts`.
 
 
 ## Local echo
@@ -222,7 +190,7 @@ The `SettingsStore` uses the hardcoded `LEVEL_ORDER` constant to ensure that it
 The array is checked from left to right, simulating the behaviour of overriding values from the higher levels. Each 
 level should be defined in this array, including `default`.
 
-Handlers (`src/settings/handlers/SettingsHandler.js`) represent a single level and are responsible for getting and 
+Handlers (`src/settings/handlers/SettingsHandler.ts`) represent a single level and are responsible for getting and 
 setting values at that level. Handlers also provide additional information to the `SettingsStore` such as if the level 
 is supported or if the current user may set values at the level. The `SettingsStore` will use the handler to enforce 
 checks and manipulate settings. Handlers are also responsible for dealing with migration patterns or legacy settings for 
@@ -230,7 +198,7 @@ their level (for example, a setting being renamed or using a different key from
 Handlers are provided to the `SettingsStore` via the `LEVEL_HANDLERS` constant. `SettingsStore` will optimize lookups by 
 only considering handlers that are supported on the platform.
 
-Local echo is achieved through `src/settings/handlers/LocalEchoWrapper.js` which acts as a wrapper around a given 
+Local echo is achieved through `src/settings/handlers/LocalEchoWrapper.ts` which acts as a wrapper around a given 
 handler. This is automatically applied to all defined `LEVEL_HANDLERS` and proxies the calls to the wrapped handler 
 where possible. The echo is achieved by a simple object cache stored within the class itself. The cache is invalidated 
 immediately upon the proxied save call succeeding or failing.
@@ -240,20 +208,7 @@ Controllers are notified of changes by the `SettingsStore`, and are given the op
 
 ### Features
 
-Features automatically get considered as `disabled` if they are not listed in the `SdkConfig` or `enableLabs` is 
-false/not set. Features are always checked against the configuration before going through the level order as they have 
-the option of being forced-on or forced-off for the application. This is done by the `features` section and looks 
-something like this:
- 
-```
-"features": {
-  "feature_groups": "enable",
-  "feature_pinning": "disable", // the default
-  "feature_presence": "labs"
-}
-```
-
-If `enableLabs` is true in the configuration, the default for features becomes `"labs"`.
+See above for feature reference.
 
 ### Watchers
 
diff --git a/docs/usercontent.md b/docs/usercontent.md
index e54851dd0d..db0e34e5fa 100644
--- a/docs/usercontent.md
+++ b/docs/usercontent.md
@@ -5,9 +5,9 @@ letting the browser and user interact with the resulting data may be dangerous,
 previously `usercontent.riot.im` was used to act as a sandbox on a different origin to close the attack surface,
 it is now possible to do by using a combination of a sandboxed iframe and some code written into the app which consumes this SDK.
 
-Usercontent is an iframe sandbox target for allowing a user to safely download a decrypted attachment from a sandboxed origin where it cannot be used to XSS your riot session out from under you.
+Usercontent is an iframe sandbox target for allowing a user to safely download a decrypted attachment from a sandboxed origin where it cannot be used to XSS your Element session out from under you.
 
-Its function is to create an Object URL for the user/browser to use but bound to an origin different to that of the riot instance to protect against XSS.
+Its function is to create an Object URL for the user/browser to use but bound to an origin different to that of the Element instance to protect against XSS.
 
 It exposes a function over a postMessage API, when sent an object with the matching fields to render a download link with the Object URL:
 
@@ -24,4 +24,4 @@ It exposes a function over a postMessage API, when sent an object with the match
 
 If only imgSrc, imgStyle and style are passed then just update the existing link without overwriting other things about it.
 
-It is expected that this target be available at `usercontent/` relative to the root of the app, this can be seen in riot-web's webpack config.
+It is expected that this target be available at `usercontent/` relative to the root of the app, this can be seen in element-web's webpack config.
diff --git a/package.json b/package.json
index 67907c0d98..ab71f68b08 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "2.3.1",
+  "version": "3.2.0",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {
@@ -45,118 +45,135 @@
     "start": "echo THIS IS FOR LEGACY PURPOSES ONLY. && yarn start:all",
     "start:all": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n build,reskindex \"yarn start:build\" \"yarn reskindex:watch\"",
     "start:build": "babel src -w -s -d lib --verbose --extensions \".ts,.js\"",
-    "lint": "yarn lint:types && yarn lint:ts && yarn lint:js && yarn lint:style",
+    "lint": "yarn lint:types && yarn lint:js && yarn lint:style",
     "lint:js": "eslint --max-warnings 0 --ignore-path .eslintignore.errorfiles src test",
-    "lint:ts": "tslint --project ./tsconfig.json -t stylish",
     "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"
   },
   "dependencies": {
-    "@babel/runtime": "^7.8.3",
-    "blueimp-canvas-to-blob": "^3.5.0",
+    "@babel/runtime": "^7.10.5",
+    "await-lock": "^2.0.1",
+    "blueimp-canvas-to-blob": "^3.27.0",
     "browser-encrypt-attachment": "^0.3.0",
     "browser-request": "^0.3.3",
-    "classnames": "^2.1.2",
-    "commonmark": "^0.28.1",
-    "counterpart": "^0.18.0",
-    "create-react-class": "^15.6.0",
-    "diff-dom": "^4.1.3",
-    "diff-match-patch": "^1.0.4",
-    "emojibase-data": "^4.0.2",
-    "emojibase-regex": "^3.0.0",
+    "classnames": "^2.2.6",
+    "commonmark": "^0.29.1",
+    "counterpart": "^0.18.6",
+    "create-react-class": "^15.6.3",
+    "diff-dom": "^4.1.6",
+    "diff-match-patch": "^1.0.5",
+    "emojibase-data": "^5.0.1",
+    "emojibase-regex": "^4.0.1",
     "escape-html": "^1.0.3",
-    "file-saver": "^1.3.3",
-    "filesize": "3.5.6",
+    "file-saver": "^1.3.8",
+    "filesize": "3.6.1",
     "flux": "2.1.1",
-    "focus-visible": "^5.0.2",
-    "fuse.js": "^2.2.0",
-    "gfm.css": "^1.1.1",
+    "focus-visible": "^5.1.0",
+    "fuse.js": "^2.7.4",
+    "gfm.css": "^1.1.2",
     "glob-to-regexp": "^0.4.1",
-    "highlight.js": "^9.15.8",
-    "html-entities": "^1.2.1",
+    "highlight.js": "^10.1.2",
+    "html-entities": "^1.3.1",
     "is-ip": "^2.0.0",
-    "linkifyjs": "^2.1.6",
-    "lodash": "^4.17.14",
+    "linkifyjs": "^2.1.9",
+    "lodash": "^4.17.19",
     "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
-    "minimist": "^1.2.0",
-    "pako": "^1.0.5",
+    "minimist": "^1.2.5",
+    "pako": "^1.0.11",
     "parse5": "^5.1.1",
     "png-chunks-extract": "^1.0.0",
     "project-name-generator": "^2.1.7",
-    "prop-types": "^15.5.8",
+    "prop-types": "^15.7.2",
     "qrcode": "^1.4.4",
-    "qrcode-react": "^0.1.16",
-    "qs": "^6.6.0",
-    "react": "^16.9.0",
+    "qs": "^6.9.4",
+    "re-resizable": "^6.5.4",
+    "react": "^16.13.1",
     "react-beautiful-dnd": "^4.0.1",
-    "react-dom": "^16.9.0",
-    "react-focus-lock": "^2.2.1",
-    "resize-observer-polyfill": "^1.5.0",
-    "sanitize-html": "^1.18.4",
-    "text-encoding-utf-8": "^1.0.1",
+    "react-dom": "^16.13.1",
+    "react-focus-lock": "^2.4.1",
+    "react-transition-group": "^4.4.1",
+    "resize-observer-polyfill": "^1.5.1",
+    "sanitize-html": "^1.27.1",
+    "tar-js": "^0.3.0",
+    "text-encoding-utf-8": "^1.0.2",
     "url": "^0.11.0",
     "velocity-animate": "^1.5.2",
-    "what-input": "^5.2.6",
+    "what-input": "^5.2.10",
     "zxcvbn": "^4.4.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.7.5",
-    "@babel/core": "^7.7.5",
-    "@babel/plugin-proposal-class-properties": "^7.7.4",
-    "@babel/plugin-proposal-decorators": "^7.7.4",
-    "@babel/plugin-proposal-export-default-from": "^7.7.4",
-    "@babel/plugin-proposal-numeric-separator": "^7.7.4",
-    "@babel/plugin-proposal-object-rest-spread": "^7.7.4",
-    "@babel/plugin-transform-flow-comments": "^7.7.4",
-    "@babel/plugin-transform-runtime": "^7.8.3",
-    "@babel/preset-env": "^7.7.6",
-    "@babel/preset-flow": "^7.7.4",
-    "@babel/preset-react": "^7.7.4",
-    "@babel/preset-typescript": "^7.7.4",
-    "@babel/register": "^7.7.4",
-    "@peculiar/webcrypto": "^1.0.22",
+    "@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.2",
     "@types/classnames": "^2.2.10",
+    "@types/counterpart": "^0.18.1",
+    "@types/flux": "^3.1.9",
+    "@types/linkifyjs": "^2.1.3",
+    "@types/lodash": "^4.14.158",
     "@types/modernizr": "^3.5.3",
-    "@types/react": "16.9",
-    "babel-eslint": "^10.0.3",
+    "@types/node": "^12.12.51",
+    "@types/pako": "^1.0.1",
+    "@types/qrcode": "^1.3.4",
+    "@types/react": "^16.9",
+    "@types/react-dom": "^16.9.8",
+    "@types/react-transition-group": "^4.4.0",
+    "@types/sanitize-html": "^1.23.3",
+    "@types/zxcvbn": "^4.4.0",
+    "@typescript-eslint/eslint-plugin": "^3.7.0",
+    "@typescript-eslint/parser": "^3.7.0",
+    "babel-eslint": "^10.1.0",
     "babel-jest": "^24.9.0",
-    "chokidar": "^3.3.1",
-    "concurrently": "^4.0.1",
-    "enzyme": "^3.10.0",
-    "enzyme-adapter-react-16": "^1.15.1",
-    "eslint": "^5.12.0",
-    "eslint-config-google": "^0.7.1",
-    "eslint-plugin-babel": "^5.2.1",
-    "eslint-plugin-flowtype": "^2.30.0",
-    "eslint-plugin-jest": "^23.0.4",
-    "eslint-plugin-react": "^7.7.0",
-    "eslint-plugin-react-hooks": "^2.0.1",
-    "estree-walker": "^0.5.0",
+    "chokidar": "^3.4.1",
+    "concurrently": "^4.1.2",
+    "enzyme": "^3.11.0",
+    "enzyme-adapter-react-16": "^1.15.2",
+    "eslint": "7.5.0",
+    "eslint-config-matrix-org": "^0.1.2",
+    "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",
     "file-loader": "^3.0.1",
-    "flow-parser": "^0.57.3",
-    "glob": "^5.0.14",
+    "glob": "^5.0.15",
     "jest": "^24.9.0",
+    "jest-canvas-mock": "^2.2.0",
     "lolex": "^5.1.2",
     "matrix-mock-request": "^1.2.3",
     "matrix-react-test-utils": "^0.2.2",
-    "react-test-renderer": "^16.9.0",
-    "rimraf": "^2.4.3",
-    "source-map-loader": "^0.2.3",
+    "react-test-renderer": "^16.13.1",
+    "rimraf": "^2.7.1",
+    "source-map-loader": "^0.2.4",
     "stylelint": "^9.10.1",
-    "stylelint-config-standard": "^18.2.0",
-    "stylelint-scss": "^3.9.0",
-    "tslint": "^5.20.1",
-    "typescript": "^3.7.3",
-    "walk": "^2.3.9",
-    "webpack": "^4.20.2",
-    "webpack-cli": "^3.1.1"
+    "stylelint-config-standard": "^18.3.0",
+    "stylelint-scss": "^3.18.0",
+    "typescript": "^3.9.7",
+    "walk": "^2.3.14",
+    "webpack": "^4.43.0",
+    "webpack-cli": "^3.3.12"
   },
   "jest": {
     "testMatch": [
       "<rootDir>/test/**/*-test.js"
     ],
+    "setupFiles": [
+      "jest-canvas-mock"
+    ],
     "setupFilesAfterEnv": [
       "<rootDir>/test/setupTests.js"
     ],
diff --git a/res/css/_common.scss b/res/css/_common.scss
index 03442ca510..a22d77f3d3 100644
--- a/res/css/_common.scss
+++ b/res/css/_common.scss
@@ -19,7 +19,7 @@ limitations under the License.
 @import "./_font-sizes.scss";
 
 :root {
-    font-size: 15px;
+    font-size: 10px;
 }
 
 html {
@@ -38,7 +38,7 @@ body {
     margin: 0px;
 
     // needed to match the designs correctly on macOS
-    // see https://github.com/vector-im/riot-web/issues/11425
+    // see https://github.com/vector-im/element-web/issues/11425
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
 }
@@ -160,9 +160,8 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
         background-color: transparent;
         color: $input-darker-fg-color;
         border-radius: 4px;
-        border: 1px solid $dialog-close-fg-color;
-        // these things should probably not be defined
-        // globally
+        border: 1px solid rgba($primary-fg-color, .1);
+        // these things should probably not be defined globally
         margin: 9px;
         flex: 0 0 auto;
     }
@@ -175,7 +174,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
     :not(.mx_textinput):not(.mx_Field):not(.mx_no_textinput) > input[type=text]::placeholder,
     :not(.mx_textinput):not(.mx_Field):not(.mx_no_textinput) > input[type=search]::placeholder,
     .mx_textinput input::placeholder {
-        color: $roomsublist-label-fg-color;
+        color: rgba($input-darker-fg-color, .75);
     }
 }
 
@@ -227,7 +226,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
 }
 
 #mx_theme_tertiaryAccentColor {
-    color: $roomsublist-label-bg-color;
+    color: $tertiary-accent-color;
 }
 
 /* Expected z-indexes for dialogs:
@@ -264,7 +263,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
     padding: 25px 30px 30px 30px;
     max-height: 80%;
     box-shadow: 2px 15px 30px 0 $dialog-shadow-color;
-    border-radius: 4px;
+    border-radius: 8px;
     overflow-y: auto;
 }
 
@@ -319,7 +318,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
 }
 
 .mx_Dialog_titleImage {
-    vertical-align: middle;
+    vertical-align: sub;
     width: 25px;
     height: 25px;
     margin-left: -2px;
@@ -335,6 +334,9 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
 .mx_Dialog_header.mx_Dialog_headerWithButton > .mx_Dialog_title {
     text-align: center;
 }
+.mx_Dialog_header.mx_Dialog_headerWithCancel > .mx_Dialog_title {
+    margin-right: 20px; // leave space for the 'X' cancel button
+}
 
 .mx_Dialog_title.danger {
     color: $warning-color;
@@ -425,12 +427,16 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
     border-radius: 8px;
     padding: 0px;
     box-shadow: none;
+
+    /* Don't show scroll-bars on spinner dialogs */
+    overflow-x: hidden;
+    overflow-y: hidden;
 }
 
 // TODO: Review mx_GeneralButton usage to see if it can use a different class
 // These classes were brought in from the old UserSettings and are included here to avoid
 // breaking the app.
-// Ref: https://github.com/vector-im/riot-web/issues/8420
+// Ref: https://github.com/vector-im/element-web/issues/8420
 .mx_GeneralButton {
     @mixin mx_DialogButton;
     display: inline;
@@ -578,3 +584,36 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
     // So it fits in the space provided by the page
     max-width: 120px;
 }
+
+@define-mixin ProgressBarColour $colour {
+    color: $colour;
+    &::-moz-progress-bar {
+        background-color: $colour;
+    }
+    &::-webkit-progress-value {
+        background-color: $colour;
+    }
+}
+
+@define-mixin ProgressBarBorderRadius $radius {
+    border-radius: $radius;
+    &::-moz-progress-bar {
+        border-radius: $radius;
+    }
+    &::-webkit-progress-bar,
+    &::-webkit-progress-value {
+        border-radius: $radius;
+    }
+}
+
+@define-mixin unreal-focus {
+    outline-width: 2px;
+    outline-style: solid;
+    outline-color: Highlight;
+
+    /* WebKit gets its native focus styles. */
+    @media (-webkit-min-device-pixel-ratio: 0) {
+        outline-color: -webkit-focus-ring-color;
+        outline-style: auto;
+    }
+}
diff --git a/res/css/_components.scss b/res/css/_components.scss
index 0ba2b609e8..aedb5c1334 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -1,6 +1,7 @@
 // autogenerated by rethemendex.sh
 @import "./_common.scss";
 @import "./_font-sizes.scss";
+@import "./_font-weights.scss";
 @import "./structures/_AutoHideScrollbar.scss";
 @import "./structures/_CompatibilityPage.scss";
 @import "./structures/_ContextualMenu.scss";
@@ -15,19 +16,20 @@
 @import "./structures/_MainSplit.scss";
 @import "./structures/_MatrixChat.scss";
 @import "./structures/_MyGroups.scss";
+@import "./structures/_NonUrgentToastContainer.scss";
 @import "./structures/_NotificationPanel.scss";
 @import "./structures/_RightPanel.scss";
 @import "./structures/_RoomDirectory.scss";
+@import "./structures/_RoomSearch.scss";
 @import "./structures/_RoomStatusBar.scss";
-@import "./structures/_RoomSubList.scss";
 @import "./structures/_RoomView.scss";
 @import "./structures/_ScrollPanel.scss";
 @import "./structures/_SearchBox.scss";
 @import "./structures/_TabbedView.scss";
 @import "./structures/_TagPanel.scss";
 @import "./structures/_ToastContainer.scss";
-@import "./structures/_TopLeftMenuButton.scss";
 @import "./structures/_UploadBar.scss";
+@import "./structures/_UserMenu.scss";
 @import "./structures/_ViewSource.scss";
 @import "./structures/auth/_CompleteSecurity.scss";
 @import "./structures/auth/_Login.scss";
@@ -41,11 +43,15 @@
 @import "./views/auth/_CountryDropdown.scss";
 @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/context_menus/_IconizedContextMenu.scss";
 @import "./views/context_menus/_MessageContextMenu.scss";
 @import "./views/context_menus/_RoomTileContextMenu.scss";
 @import "./views/context_menus/_StatusMessageContextMenu.scss";
@@ -54,15 +60,14 @@
 @import "./views/context_menus/_WidgetContextMenu.scss";
 @import "./views/dialogs/_AddressPickerDialog.scss";
 @import "./views/dialogs/_Analytics.scss";
+@import "./views/dialogs/_BugReportDialog.scss";
 @import "./views/dialogs/_ChangelogDialog.scss";
 @import "./views/dialogs/_ChatCreateOrReuseChatDialog.scss";
 @import "./views/dialogs/_ConfirmUserActionDialog.scss";
 @import "./views/dialogs/_CreateGroupDialog.scss";
 @import "./views/dialogs/_CreateRoomDialog.scss";
 @import "./views/dialogs/_DeactivateAccountDialog.scss";
-@import "./views/dialogs/_DeviceVerifyDialog.scss";
 @import "./views/dialogs/_DevtoolsDialog.scss";
-@import "./views/dialogs/_EncryptedEventDialog.scss";
 @import "./views/dialogs/_GroupAddressPicker.scss";
 @import "./views/dialogs/_IncomingSasDialog.scss";
 @import "./views/dialogs/_InviteDialog.scss";
@@ -73,6 +78,7 @@
 @import "./views/dialogs/_RoomSettingsDialogBridges.scss";
 @import "./views/dialogs/_RoomUpgradeDialog.scss";
 @import "./views/dialogs/_RoomUpgradeWarningDialog.scss";
+@import "./views/dialogs/_ServerOfflineDialog.scss";
 @import "./views/dialogs/_SetEmailDialog.scss";
 @import "./views/dialogs/_SetMxIdDialog.scss";
 @import "./views/dialogs/_SetPasswordDialog.scss";
@@ -81,7 +87,6 @@
 @import "./views/dialogs/_SlashCommandHelpDialog.scss";
 @import "./views/dialogs/_TabbedIntegrationManagerDialog.scss";
 @import "./views/dialogs/_TermsDialog.scss";
-@import "./views/dialogs/_UnknownDeviceDialog.scss";
 @import "./views/dialogs/_UploadConfirmDialog.scss";
 @import "./views/dialogs/_UserSettingsDialog.scss";
 @import "./views/dialogs/_WidgetOpenIDPermissionsDialog.scss";
@@ -104,16 +109,19 @@
 @import "./views/elements/_IconButton.scss";
 @import "./views/elements/_ImageView.scss";
 @import "./views/elements/_InlineSpinner.scss";
-@import "./views/elements/_InteractiveTooltip.scss";
 @import "./views/elements/_ManageIntegsButton.scss";
 @import "./views/elements/_PowerSelector.scss";
 @import "./views/elements/_ProgressBar.scss";
+@import "./views/elements/_QRCode.scss";
 @import "./views/elements/_ReplyThread.scss";
 @import "./views/elements/_ResizeHandle.scss";
 @import "./views/elements/_RichText.scss";
 @import "./views/elements/_RoleButton.scss";
 @import "./views/elements/_RoomAliasField.scss";
+@import "./views/elements/_Slider.scss";
 @import "./views/elements/_Spinner.scss";
+@import "./views/elements/_StyledCheckbox.scss";
+@import "./views/elements/_StyledRadioButton.scss";
 @import "./views/elements/_SyntaxHighlight.scss";
 @import "./views/elements/_TextWithTooltip.scss";
 @import "./views/elements/_ToggleSwitch.scss";
@@ -121,7 +129,6 @@
 @import "./views/elements/_TooltipButton.scss";
 @import "./views/elements/_Validation.scss";
 @import "./views/emojipicker/_EmojiPicker.scss";
-@import "./views/globals/_MatrixToolbar.scss";
 @import "./views/groups/_GroupPublicityToggle.scss";
 @import "./views/groups/_GroupRoomList.scss";
 @import "./views/groups/_GroupUserSettings.scss";
@@ -139,7 +146,7 @@
 @import "./views/messages/_MjolnirBody.scss";
 @import "./views/messages/_ReactionsRow.scss";
 @import "./views/messages/_ReactionsRowButton.scss";
-@import "./views/messages/_ReactionsRowButtonTooltip.scss";
+@import "./views/messages/_RedactedBody.scss";
 @import "./views/messages/_RoomAvatarEvent.scss";
 @import "./views/messages/_SenderProfile.scss";
 @import "./views/messages/_TextualEvent.scss";
@@ -159,31 +166,31 @@
 @import "./views/rooms/_EditMessageComposer.scss";
 @import "./views/rooms/_EntityTile.scss";
 @import "./views/rooms/_EventTile.scss";
-@import "./views/rooms/_InviteOnlyIcon.scss";
+@import "./views/rooms/_GroupLayout.scss";
+@import "./views/rooms/_IRCLayout.scss";
 @import "./views/rooms/_JumpToBottomButton.scss";
 @import "./views/rooms/_LinkPreviewWidget.scss";
-@import "./views/rooms/_MemberDeviceInfo.scss";
 @import "./views/rooms/_MemberInfo.scss";
 @import "./views/rooms/_MemberList.scss";
 @import "./views/rooms/_MessageComposer.scss";
 @import "./views/rooms/_MessageComposerFormatBar.scss";
+@import "./views/rooms/_NotificationBadge.scss";
 @import "./views/rooms/_PinnedEventTile.scss";
 @import "./views/rooms/_PinnedEventsPanel.scss";
 @import "./views/rooms/_PresenceLabel.scss";
 @import "./views/rooms/_ReplyPreview.scss";
 @import "./views/rooms/_RoomBreadcrumbs.scss";
-@import "./views/rooms/_RoomDropTarget.scss";
 @import "./views/rooms/_RoomHeader.scss";
 @import "./views/rooms/_RoomList.scss";
 @import "./views/rooms/_RoomPreviewBar.scss";
 @import "./views/rooms/_RoomRecoveryReminder.scss";
+@import "./views/rooms/_RoomSublist.scss";
 @import "./views/rooms/_RoomTile.scss";
 @import "./views/rooms/_RoomUpgradeWarningBar.scss";
 @import "./views/rooms/_SearchBar.scss";
 @import "./views/rooms/_SendMessageComposer.scss";
 @import "./views/rooms/_Stickers.scss";
 @import "./views/rooms/_TopUnreadMessagesBar.scss";
-@import "./views/rooms/_UserOnlineDot.scss";
 @import "./views/rooms/_WhoIsTypingTile.scss";
 @import "./views/settings/_AvatarSetting.scss";
 @import "./views/settings/_CrossSigningPanel.scss";
@@ -197,10 +204,12 @@
 @import "./views/settings/_ProfileSettings.scss";
 @import "./views/settings/_SetIdServer.scss";
 @import "./views/settings/_SetIntegrationManager.scss";
+@import "./views/settings/_UpdateCheckButton.scss";
 @import "./views/settings/tabs/_SettingsTab.scss";
 @import "./views/settings/tabs/room/_GeneralRoomSettingsTab.scss";
 @import "./views/settings/tabs/room/_RolesRoomSettingsTab.scss";
 @import "./views/settings/tabs/room/_SecurityRoomSettingsTab.scss";
+@import "./views/settings/tabs/user/_AppearanceUserSettingsTab.scss";
 @import "./views/settings/tabs/user/_GeneralUserSettingsTab.scss";
 @import "./views/settings/tabs/user/_HelpUserSettingsTab.scss";
 @import "./views/settings/tabs/user/_MjolnirUserSettingsTab.scss";
@@ -209,7 +218,8 @@
 @import "./views/settings/tabs/user/_SecurityUserSettingsTab.scss";
 @import "./views/settings/tabs/user/_VoiceUserSettingsTab.scss";
 @import "./views/terms/_InlineTermsAgreement.scss";
+@import "./views/toasts/_NonUrgentEchoFailureToast.scss";
 @import "./views/verification/_VerificationShowSas.scss";
+@import "./views/voip/_CallContainer.scss";
 @import "./views/voip/_CallView.scss";
-@import "./views/voip/_IncomingCallbox.scss";
 @import "./views/voip/_VideoView.scss";
diff --git a/res/css/_font-sizes.scss b/res/css/_font-sizes.scss
index 5cd19ce620..caa3a452b0 100644
--- a/res/css/_font-sizes.scss
+++ b/res/css/_font-sizes.scss
@@ -14,58 +14,60 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-$font-1px: 0.067rem;
-$font-2px: 0.133rem;
-$font-3px: 0.200rem;
-$font-4px: 0.267rem;
-$font-5px: 0.333rem;
-$font-6px: 0.400rem;
-$font-7px: 0.467rem;
-$font-8px: 0.533rem;
-$font-9px: 0.600rem;
-$font-10px: 0.667rem;
-$font-10-4px: 0.693rem;
-$font-11px: 0.733rem;
-$font-12px: 0.800rem;
-$font-13px: 0.867rem;
-$font-14px: 0.933rem;
-$font-15px: 1.000rem;
-$font-16px: 1.067rem;
-$font-17px: 1.133rem;
-$font-18px: 1.200rem;
-$font-19px: 1.267rem;
-$font-20px: 1.333rem;
-$font-21px: 1.400rem;
-$font-22px: 1.467rem;
-$font-23px: 1.533rem;
-$font-24px: 1.600rem;
-$font-25px: 1.667rem;
-$font-26px: 1.733rem;
-$font-27px: 1.800rem;
-$font-28px: 1.867rem;
-$font-29px: 1.933rem;
-$font-30px: 2.000rem;
-$font-31px: 2.067rem;
-$font-32px: 2.133rem;
-$font-33px: 2.200rem;
-$font-34px: 2.267rem;
-$font-35px: 2.333rem;
-$font-36px: 2.400rem;
-$font-37px: 2.467rem;
-$font-38px: 2.533rem;
-$font-39px: 2.600rem;
-$font-40px: 2.667rem;
-$font-41px: 2.733rem;
-$font-42px: 2.800rem;
-$font-43px: 2.867rem;
-$font-44px: 2.933rem;
-$font-45px: 3.000rem;
-$font-46px: 3.067rem;
-$font-47px: 3.133rem;
-$font-48px: 3.200rem;
-$font-49px: 3.267rem;
-$font-50px: 3.333rem;
-$font-51px: 3.400rem;
-$font-52px: 3.467rem;
-$font-88px: 5.887rem;
-$font-400px: 26.667rem;
+$font-1px: 0.1rem;
+$font-1-5px: 0.15rem;
+$font-2px: 0.2rem;
+$font-3px: 0.3rem;
+$font-4px: 0.4rem;
+$font-5px: 0.5rem;
+$font-6px: 0.6rem;
+$font-7px: 0.7rem;
+$font-8px: 0.8rem;
+$font-9px: 0.9rem;
+$font-10px: 1.0rem;
+$font-10-4px: 1.04rem;
+$font-11px: 1.1rem;
+$font-12px: 1.2rem;
+$font-13px: 1.3rem;
+$font-14px: 1.4rem;
+$font-15px: 1.5rem;
+$font-16px: 1.6rem;
+$font-17px: 1.7rem;
+$font-18px: 1.8rem;
+$font-19px: 1.9rem;
+$font-20px: 2.0rem;
+$font-21px: 2.1rem;
+$font-22px: 2.2rem;
+$font-23px: 2.3rem;
+$font-24px: 2.4rem;
+$font-25px: 2.5rem;
+$font-26px: 2.6rem;
+$font-27px: 2.7rem;
+$font-28px: 2.8rem;
+$font-29px: 2.9rem;
+$font-30px: 3.0rem;
+$font-31px: 3.1rem;
+$font-32px: 3.2rem;
+$font-33px: 3.3rem;
+$font-34px: 3.4rem;
+$font-35px: 3.5rem;
+$font-36px: 3.6rem;
+$font-37px: 3.7rem;
+$font-38px: 3.8rem;
+$font-39px: 3.9rem;
+$font-40px: 4.0rem;
+$font-41px: 4.1rem;
+$font-42px: 4.2rem;
+$font-43px: 4.3rem;
+$font-44px: 4.4rem;
+$font-45px: 4.5rem;
+$font-46px: 4.6rem;
+$font-47px: 4.7rem;
+$font-48px: 4.8rem;
+$font-49px: 4.9rem;
+$font-50px: 5.0rem;
+$font-51px: 5.1rem;
+$font-52px: 5.2rem;
+$font-78px: 7.8rem;
+$font-88px: 8.8rem;
+$font-400px: 40rem;
diff --git a/res/css/_font-weights.scss b/res/css/_font-weights.scss
new file mode 100644
index 0000000000..3e2b19d516
--- /dev/null
+++ b/res/css/_font-weights.scss
@@ -0,0 +1,17 @@
+/*
+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.
+*/
+
+$font-semi-bold: 600;
diff --git a/res/css/structures/_ContextualMenu.scss b/res/css/structures/_ContextualMenu.scss
index 61070a0541..658033339a 100644
--- a/res/css/structures/_ContextualMenu.scss
+++ b/res/css/structures/_ContextualMenu.scss
@@ -31,7 +31,7 @@ limitations under the License.
 }
 
 .mx_ContextualMenu {
-    border-radius: 4px;
+    border-radius: 8px;
     box-shadow: 4px 4px 12px 0 $menu-box-shadow-color;
     background-color: $menu-bg-color;
     color: $primary-fg-color;
diff --git a/res/css/structures/_CustomRoomTagPanel.scss b/res/css/structures/_CustomRoomTagPanel.scss
index 1fb18ec41e..3feb2565be 100644
--- a/res/css/structures/_CustomRoomTagPanel.scss
+++ b/res/css/structures/_CustomRoomTagPanel.scss
@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// TODO: Update design for custom tags to match new designs
+
 .mx_LeftPanel_tagPanelContainer {
     display: flex;
     flex-direction: column;
@@ -50,7 +52,7 @@ limitations under the License.
     background-color: $accent-color-alt;
     width: 5px;
     position: absolute;
-    left: -15px;
+    left: -9px;
     border-radius: 0 3px 3px 0;
-    top: 2px; // 10 [padding-top] - (56 - 40)/2
+    top: 5px; // just feels right (see comment above about designs needing to be updated)
 }
diff --git a/res/css/structures/_FilePanel.scss b/res/css/structures/_FilePanel.scss
index 859ee28035..21b30d804a 100644
--- a/res/css/structures/_FilePanel.scss
+++ b/res/css/structures/_FilePanel.scss
@@ -41,13 +41,19 @@ limitations under the License.
 
 .mx_FilePanel .mx_EventTile {
     word-break: break-word;
+    margin-top: 32px;
 }
 
 .mx_FilePanel .mx_EventTile .mx_MImageBody {
     margin-right: 0px;
 }
 
+.mx_FilePanel .mx_EventTile .mx_MFileBody {
+    line-height: 2.4rem;
+}
+
 .mx_FilePanel .mx_EventTile .mx_MFileBody_download {
+    padding-top: 8px;
     display: flex;
     font-size: $font-14px;
     color: $event-timestamp-color;
@@ -60,7 +66,7 @@ limitations under the License.
 
 .mx_FilePanel .mx_EventTile .mx_MImageBody_size {
     flex: 1 0 0;
-    font-size: $font-11px;
+    font-size: $font-14px;
     text-align: right;
     white-space: nowrap;
 }
@@ -80,7 +86,7 @@ limitations under the License.
     flex: 1 1 auto;
     line-height: initial;
     padding: 0px;
-    font-size: $font-11px;
+    font-size: $font-14px;
     opacity: 1.0;
     color: $event-timestamp-color;
 }
@@ -90,7 +96,7 @@ limitations under the License.
     text-align: right;
     visibility: visible;
     position: initial;
-    font-size: $font-11px;
+    font-size: $font-14px;
     opacity: 1.0;
     color: $event-timestamp-color;
 }
@@ -109,3 +115,7 @@ limitations under the License.
 .mx_FilePanel .mx_EventTile:hover .mx_EventTile_line {
     background-color: $primary-bg-color;
 }
+
+.mx_FilePanel_empty::before {
+    mask-image: url('$(res)/img/element-icons/room/files.svg');
+}
diff --git a/res/css/structures/_GroupView.scss b/res/css/structures/_GroupView.scss
index ed0cf121a4..2350d9f28a 100644
--- a/res/css/structures/_GroupView.scss
+++ b/res/css/structures/_GroupView.scss
@@ -29,12 +29,12 @@ limitations under the License.
     align-items: center;
     display: flex;
     padding-bottom: 10px;
+    padding-left: 19px;
 }
 
 .mx_GroupView_header_view {
     border-bottom: 1px solid $primary-hairline-color;
     padding-bottom: 0px;
-    padding-left: 19px;
     padding-right: 8px;
 }
 
@@ -63,11 +63,11 @@ limitations under the License.
 }
 
 .mx_GroupHeader_editButton::before {
-    mask-image: url('$(res)/img/feather-customised/settings.svg');
+    mask-image: url('$(res)/img/element-icons/settings.svg');
 }
 
 .mx_GroupHeader_shareButton::before {
-    mask-image: url('$(res)/img/icons-share.svg');
+    mask-image: url('$(res)/img/element-icons/room/share.svg');
 }
 
 .mx_GroupView_hostingSignup img {
@@ -182,6 +182,7 @@ limitations under the License.
 
 .mx_GroupView_body {
     flex-grow: 1;
+    margin: 0 24px;
 }
 
 .mx_GroupView_rooms {
@@ -250,6 +251,7 @@ limitations under the License.
 .mx_GroupView_membershipSubSection {
     justify-content: space-between;
     display: flex;
+    padding-bottom: 8px;
 }
 
 .mx_GroupView_membershipSubSection .mx_Spinner {
diff --git a/res/css/structures/_HeaderButtons.scss b/res/css/structures/_HeaderButtons.scss
index eef7653b24..9ef40e9d6a 100644
--- a/res/css/structures/_HeaderButtons.scss
+++ b/res/css/structures/_HeaderButtons.scss
@@ -22,7 +22,7 @@ limitations under the License.
     content: "";
     background-color: $header-divider-color;
     opacity: 0.5;
-    margin: 0 15px;
+    margin: 6px 8px;
     border-radius: 1px;
     width: 1px;
 }
diff --git a/res/css/structures/_HomePage.scss b/res/css/structures/_HomePage.scss
index 0160cf368b..04527bff48 100644
--- a/res/css/structures/_HomePage.scss
+++ b/res/css/structures/_HomePage.scss
@@ -72,7 +72,7 @@ limitations under the License.
 
             &:hover {
                 color: $accent-color;
-                background: rgba(#03b381, 0.06);
+                background: rgba($accent-color, 0.06);
 
                 &::before {
                     background-color: $accent-color;
diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss
index 7d57425f6f..5112d07c46 100644
--- a/res/css/structures/_LeftPanel.scss
+++ b/res/css/structures/_LeftPanel.scss
@@ -1,6 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2018 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,163 +14,182 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_LeftPanel_container {
-    display: flex;
-    /* LeftPanel 260px */
-    min-width: 260px;
-    flex: 0 0 auto;
-}
-
-.mx_LeftPanel_container.collapsed {
-    min-width: unset;
-    /* Collapsed LeftPanel 50px */
-    flex: 0 0 50px;
-}
-
-.mx_LeftPanel_container.collapsed.mx_LeftPanel_container_hasTagPanel {
-    /* TagPanel 70px + Collapsed LeftPanel 50px */
-    flex: 0 0 120px;
-}
-
-.mx_LeftPanel_tagPanelContainer {
-    flex: 0 0 70px;
-    height: 100%;
-}
-
-.mx_LeftPanel_hideButton {
-    position: absolute;
-    top: 10px;
-    right: 0px;
-    padding: 8px;
-    cursor: pointer;
-}
+$tagPanelWidth: 56px; // only applies in this file, used for calculations
 
 .mx_LeftPanel {
-    flex: 1;
-    overflow-x: hidden;
-    display: flex;
-    flex-direction: column;
-    min-height: 0;
-}
+    background-color: $roomlist-bg-color;
+    min-width: 260px;
+    max-width: 50%;
 
-.mx_LeftPanel .mx_AppTile_mini {
-    height: 132px;
-}
-
-.mx_LeftPanel .mx_RoomList_scrollbar {
-    order: 1;
-
-    flex: 1 1 0;
-
-    overflow-y: auto;
-    z-index: 6;
-}
-
-.mx_LeftPanel .mx_BottomLeftMenu {
-    order: 3;
-
-    border-top: 1px solid $panel-divider-color;
-    margin-left: 16px; /* gutter */
-    margin-right: 16px; /* gutter */
-    flex: 0 0 60px;
-    z-index: 1;
-}
-
-.mx_LeftPanel_container.collapsed .mx_BottomLeftMenu {
-    flex: 0 0 160px;
-    margin-bottom: 9px;
-}
-
-.mx_LeftPanel .mx_BottomLeftMenu_options {
-    margin-top: 18px;
-}
-
-.mx_BottomLeftMenu_options object {
-    pointer-events: none;
-}
-
-.mx_BottomLeftMenu_options > div {
-    display: inline-block;
-}
-
-.mx_BottomLeftMenu_options .mx_RoleButton {
-    margin-left: 0px;
-    margin-right: 10px;
-    height: 30px;
-}
-
-.mx_BottomLeftMenu_options .mx_BottomLeftMenu_settings {
-    float: right;
-}
-
-.mx_BottomLeftMenu_options .mx_BottomLeftMenu_settings .mx_RoleButton {
-    margin-right: 0px;
-}
-
-.mx_LeftPanel_container.collapsed .mx_BottomLeftMenu_settings {
-    float: none;
-}
-
-.mx_MatrixChat_useCompactLayout {
-    .mx_LeftPanel .mx_BottomLeftMenu {
-        flex: 0 0 50px;
-    }
-
-    .mx_LeftPanel_container.collapsed .mx_BottomLeftMenu {
-        flex: 0 0 160px;
-    }
-
-    .mx_LeftPanel .mx_BottomLeftMenu_options {
-        margin-top: 12px;
-    }
-}
-
-.mx_LeftPanel_exploreAndFilterRow {
+    // Create a row-based flexbox for the TagPanel and the room list
     display: flex;
 
-    .mx_SearchBox {
-        flex: 1 1 0;
-        min-width: 0;
-        margin: 4px 9px 1px 9px;
-    }
-}
+    .mx_LeftPanel_tagPanelContainer {
+        flex-grow: 0;
+        flex-shrink: 0;
+        flex-basis: $tagPanelWidth;
+        height: 100%;
 
-.mx_LeftPanel_explore {
-    flex: 0 0 50%;
-    overflow: hidden;
-    transition: flex-basis 0.2s;
-    box-sizing: border-box;
+        // Create another flexbox so the TagPanel fills the container
+        display: flex;
 
-    &.mx_LeftPanel_explore_hidden {
-        flex-basis: 0;
+        // TagPanel handles its own CSS
     }
 
-    .mx_AccessibleButton {
-        font-size: $font-14px;
-        margin: 4px 0 1px 9px;
-        padding: 9px;
-        padding-left: 42px;
-        font-weight: 600;
-        color: $notice-secondary-color;
-        position: relative;
-        border-radius: 4px;
+    &:not(.mx_LeftPanel_hasTagPanel) {
+        .mx_LeftPanel_roomListContainer {
+            width: 100%;
+        }
+    }
 
-        &:hover {
-            background-color: $primary-bg-color;
+    // 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% - $tagPanelWidth);
+        background-color: $roomlist-bg-color;
+
+        // Create another flexbox (this time a column) for the room list components
+        display: flex;
+        flex-direction: column;
+
+        .mx_LeftPanel_userHeader {
+            /* 12px top, 12px sides, 20px bottom (using 13px bottom to account
+             * for internal whitespace in the breadcrumbs)
+             */
+            padding: 12px;
+            flex-shrink: 0; // to convince safari's layout engine the flexbox is fine
+
+            // Create another flexbox column for the rows to stack within
+            display: flex;
+            flex-direction: column;
         }
 
-        &::before {
-            cursor: pointer;
-            mask: url('$(res)/img/explore.svg');
-            mask-repeat: no-repeat;
-            mask-position: center center;
-            content: "";
-            left: 14px;
-            top: 10px;
-            width: 16px;
-            height: 16px;
-            background-color: $notice-secondary-color;
-            position: absolute;
+        .mx_LeftPanel_breadcrumbsContainer {
+            overflow-y: hidden;
+            overflow-x: scroll;
+            margin: 12px 12px 0 12px;
+            flex: 0 0 auto;
+            // Create yet another flexbox, this time within the row, to ensure items stay
+            // aligned correctly. This is also a row-based flexbox.
+            display: flex;
+            align-items: center;
+
+            &.mx_IndicatorScrollbar_leftOverflow {
+                mask-image: linear-gradient(90deg, transparent, black 5%);
+            }
+
+            &.mx_IndicatorScrollbar_rightOverflow {
+                mask-image: linear-gradient(90deg, black, black 95%, transparent);
+            }
+
+            &.mx_IndicatorScrollbar_rightOverflow.mx_IndicatorScrollbar_leftOverflow {
+                mask-image: linear-gradient(90deg, transparent, black 5%, black 95%, transparent);
+            }
+        }
+
+        .mx_LeftPanel_filterContainer {
+            margin-left: 12px;
+            margin-right: 12px;
+
+            flex-shrink: 0; // to convince safari's layout engine the flexbox is fine
+
+            // Create a flexbox to organize the inputs
+            display: flex;
+            align-items: center;
+
+            .mx_RoomSearch_focused, .mx_RoomSearch_hasQuery {
+                & + .mx_LeftPanel_exploreButton {
+                    // Cheaty way to return the occupied space to the filter input
+                    flex-basis: 0;
+                    margin: 0;
+                    width: 0;
+
+                    // Don't forget to hide the masked ::before icon,
+                    // using display:none or visibility:hidden would break accessibility
+                    &::before {
+                        content: none;
+                    }
+                }
+            }
+
+            .mx_LeftPanel_exploreButton {
+                width: 32px;
+                height: 32px;
+                border-radius: 8px;
+                background-color: $roomlist-button-bg-color;
+                position: relative;
+                margin-left: 8px;
+
+                &::before {
+                    content: '';
+                    position: absolute;
+                    top: 8px;
+                    left: 8px;
+                    width: 16px;
+                    height: 16px;
+                    mask-image: url('$(res)/img/element-icons/roomlist/explore.svg');
+                    mask-position: center;
+                    mask-size: contain;
+                    mask-repeat: no-repeat;
+                    background: $secondary-fg-color;
+                }
+            }
+        }
+
+        .mx_LeftPanel_roomListFilterCount {
+            font-size: $font-13px;
+            font-weight: $font-semi-bold;
+            margin-left: 12px;
+            margin-top: 14px;
+            margin-bottom: -4px; // to counteract the normal roomListWrapper margin-top
+        }
+
+        .mx_LeftPanel_roomListWrapper {
+            overflow: hidden;
+            margin-top: 10px; // so we're not up against the search/filter
+            flex: 1 0 0; // needed in Safari to properly set flex-basis
+
+            &.mx_LeftPanel_roomListWrapper_stickyBottom {
+                padding-bottom: 32px;
+            }
+
+            &.mx_LeftPanel_roomListWrapper_stickyTop {
+                padding-top: 32px;
+            }
+        }
+
+        .mx_LeftPanel_actualRoomListContainer {
+            position: relative; // for sticky headers
+            height: 100%; // ensure scrolling still works
+        }
+    }
+
+    // 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_hasTagPanel {
+            width: calc(68px + $tagPanelWidth) !important;
+        }
+        &:not(.mx_LeftPanel_hasTagPanel) {
+            width: 68px !important;
+        }
+
+        .mx_LeftPanel_roomListContainer {
+            width: 68px;
+
+            .mx_LeftPanel_filterContainer {
+                // Organize the flexbox into a centered column layout
+                flex-direction: column;
+                justify-content: center;
+
+                .mx_LeftPanel_exploreButton {
+                    margin-left: 0;
+                    margin-top: 8px;
+                    background-color: transparent;
+                }
+            }
         }
     }
 }
diff --git a/res/css/structures/_MainSplit.scss b/res/css/structures/_MainSplit.scss
index 25e1153fce..dc62cb8218 100644
--- a/res/css/structures/_MainSplit.scss
+++ b/res/css/structures/_MainSplit.scss
@@ -21,8 +21,22 @@ limitations under the License.
     height: 100%;
 }
 
-// move hit area 5px to the right so it doesn't overlap with the timeline scrollbar
-.mx_MainSplit > .mx_ResizeHandle.mx_ResizeHandle_horizontal {
-    margin: 0 -10px 0 0;
-    padding: 0 10px 0 0;
+.mx_MainSplit > .mx_RightPanel_ResizeWrapper {
+    padding: 5px;
+    // margin left to not allow the handle to not encroach on the space for the scrollbar
+    margin-left: 8px;
+
+    &:hover .mx_RightPanel_ResizeHandle {
+        // Need to use important to override element style attributes
+        // set by re-resizable
+        top: 50% !important;
+        transform: translate(0, -50%);
+
+        height: 64px !important; // to match width of the ones on roomlist
+        width: 4px !important;
+        border-radius: 4px !important;
+
+        background-color: $primary-fg-color;
+        opacity: 0.8;
+    }
 }
diff --git a/res/css/structures/_MatrixChat.scss b/res/css/structures/_MatrixChat.scss
index c5a5d50068..f4e46a8e94 100644
--- a/res/css/structures/_MatrixChat.scss
+++ b/res/css/structures/_MatrixChat.scss
@@ -41,10 +41,6 @@ limitations under the License.
     height: 40px;
 }
 
-.mx_MatrixChat_toolbarShowing {
-    height: auto;
-}
-
 .mx_MatrixChat {
     width: 100%;
     height: 100%;
@@ -70,15 +66,36 @@ limitations under the License.
 }
 
 /* not the left panel, and not the resize handle, so the roomview/groupview/... */
-.mx_MatrixChat > :not(.mx_LeftPanel_container):not(.mx_ResizeHandle) {
+.mx_MatrixChat > :not(.mx_LeftPanel):not(.mx_ResizeHandle) {
     background-color: $primary-bg-color;
 
     flex: 1 1 0;
     min-width: 0;
 
-    /* To fix https://github.com/vector-im/riot-web/issues/3298 where Safari
+    /* To fix https://github.com/vector-im/element-web/issues/3298 where Safari
        needed height 100% all the way down to the HomePage. Height does not
        have to be auto, empirically.
     */
     height: 100%;
 }
+
+.mx_MatrixChat > .mx_LeftPanel2:hover + .mx_ResizeHandle_horizontal,
+.mx_MatrixChat > .mx_ResizeHandle_horizontal:hover {
+    position: relative;
+
+    &::before {
+        position: absolute;
+        left: 6px;
+        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;
+    }
+}
diff --git a/res/css/structures/_NonUrgentToastContainer.scss b/res/css/structures/_NonUrgentToastContainer.scss
new file mode 100644
index 0000000000..826a812406
--- /dev/null
+++ b/res/css/structures/_NonUrgentToastContainer.scss
@@ -0,0 +1,35 @@
+/*
+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_NonUrgentToastContainer {
+    position: absolute;
+    bottom: 30px;
+    left: 28px;
+    z-index: 101; // same level as other toasts
+
+    .mx_NonUrgentToastContainer_toast {
+        padding: 10px 12px;
+        border-radius: 8px;
+        width: 320px;
+        font-size: $font-13px;
+        margin-top: 8px;
+
+        // We don't use variables on the colours because we want it to be the same
+        // in all themes.
+        background-color: #17191c;
+        color: #fff;
+    }
+}
diff --git a/res/css/structures/_NotificationPanel.scss b/res/css/structures/_NotificationPanel.scss
index 44205b1f01..715a94fe2c 100644
--- a/res/css/structures/_NotificationPanel.scss
+++ b/res/css/structures/_NotificationPanel.scss
@@ -63,6 +63,10 @@ limitations under the License.
     padding-left: 32px;
     padding-top: 8px;
     position: relative;
+
+    a {
+        display: flex;
+    }
 }
 
 .mx_NotificationPanel .mx_EventTile_roomName a,
@@ -95,3 +99,7 @@ limitations under the License.
 .mx_NotificationPanel .mx_EventTile_content {
     margin-right: 0px;
 }
+
+.mx_NotificationPanel_empty::before {
+    mask-image: url('$(res)/img/element-icons/notifications.svg');
+}
diff --git a/res/css/structures/_RightPanel.scss b/res/css/structures/_RightPanel.scss
index 10878322e3..c7c0d6fac4 100644
--- a/res/css/structures/_RightPanel.scss
+++ b/res/css/structures/_RightPanel.scss
@@ -19,9 +19,16 @@ limitations under the License.
     overflow-x: hidden;
     flex: 0 0 auto;
     position: relative;
-    min-width: 264px;
     display: flex;
     flex-direction: column;
+    border-radius: 8px;
+    padding: 4px 0;
+    box-sizing: border-box;
+    height: 100%;
+
+    .mx_RoomView_MessageList {
+        padding: 14px 18px; // top and bottom is 4px smaller to balance with the padding set above
+    }
 }
 
 .mx_RightPanel_header {
@@ -43,56 +50,67 @@ limitations under the License.
 .mx_RightPanel_headerButton {
     cursor: pointer;
     flex: 0 0 auto;
-    vertical-align: top;
-    margin-left: 5px;
-    margin-right: 5px;
-    text-align: center;
-    border-bottom: 2px solid transparent;
-    height: 20px;
-    width: 20px;
+    margin-left: 1px;
+    margin-right: 1px;
+    height: 32px;
+    width: 32px;
     position: relative;
+    border-radius: 100%;
 
     &::before {
         content: '';
         position: absolute;
-        top: 0;
-        left: 0;
-        height: 20px;
-        width: 20px;
-        background-color: $rightpanel-button-color;
+        top: 4px; // center with parent of 32px
+        left: 4px; // center with parent of 32px
+        height: 24px;
+        width: 24px;
+        background-color: $icon-button-color;
         mask-repeat: no-repeat;
         mask-size: contain;
     }
 }
 
 .mx_RightPanel_membersButton::before {
-    mask-image: url('$(res)/img/feather-customised/user.svg');
+    mask-image: url('$(res)/img/element-icons/room/members.svg');
+    mask-position: center;
 }
 
 .mx_RightPanel_filesButton::before {
-    mask-image: url('$(res)/img/feather-customised/files.svg');
+    mask-image: url('$(res)/img/element-icons/room/files.svg');
+    mask-position: center;
 }
 
 .mx_RightPanel_notifsButton::before {
-    mask-image: url('$(res)/img/feather-customised/notifications.svg');
+    mask-image: url('$(res)/img/element-icons/notifications.svg');
+    mask-position: center;
 }
 
 .mx_RightPanel_groupMembersButton::before {
-    mask-image: url('$(res)/img/icons-people.svg');
+    mask-image: url('$(res)/img/element-icons/community-members.svg');
+    mask-position: center;
 }
 
 .mx_RightPanel_roomsButton::before {
-    mask-image: url('$(res)/img/icons-room-nobg.svg');
+    mask-image: url('$(res)/img/element-icons/community-rooms.svg');
+    mask-position: center;
 }
 
-.mx_RightPanel_headerButton_highlight::after {
-    content: '';
-    position: absolute;
-    bottom: -6px;
-    left: 0;
-    right: 0;
-    height: 2px;
-    background-color: $button-bg-color;
+.mx_RightPanel_headerButton_highlight {
+    background: rgba($accent-color, 0.25);
+    // make the icon the accent color too
+    &::before {
+        background-color: $accent-color !important;
+    }
+}
+
+.mx_RightPanel_headerButton:not(.mx_RightPanel_headerButton_highlight) {
+    &:hover {
+        background: rgba($accent-color, 0.1);
+
+        &::before {
+            background-color: $accent-color;
+        }
+    }
 }
 
 .mx_RightPanel_headerButton_badge {
@@ -126,3 +144,28 @@ limitations under the License.
     order: 2;
     margin: auto;
 }
+
+.mx_RightPanel_empty {
+    margin-right: -42px;
+
+    h2 {
+        font-weight: 700;
+        margin: 16px 0;
+    }
+
+    h2, p {
+        font-size: $font-14px;
+    }
+
+    &::before {
+        content: '';
+        display: block;
+        margin: 11px auto 29px auto;
+        height: 42px;
+        width: 42px;
+        background-color: $rightpanel-button-color;
+        mask-repeat: no-repeat;
+        mask-size: contain;
+        mask-position: center;
+    }
+}
diff --git a/res/css/structures/_RoomSearch.scss b/res/css/structures/_RoomSearch.scss
new file mode 100644
index 0000000000..c33a3c0ff9
--- /dev/null
+++ b/res/css/structures/_RoomSearch.scss
@@ -0,0 +1,94 @@
+/*
+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.
+*/
+
+// Note: this component expects to be contained within a flexbox
+.mx_RoomSearch {
+    flex: 1;
+    border-radius: 8px;
+    background-color: $roomlist-button-bg-color;
+    // keep border thickness consistent to prevent movement
+    border: 1px solid transparent;
+    height: 28px;
+    padding: 2px;
+
+    // Create a flexbox for the icons (easier to manage)
+    display: flex;
+    align-items: center;
+
+    .mx_RoomSearch_icon {
+        width: 16px;
+        height: 16px;
+        mask: url('$(res)/img/element-icons/roomlist/search.svg');
+        mask-repeat: no-repeat;
+        background-color: $secondary-fg-color;
+        margin-left: 7px;
+    }
+
+    .mx_RoomSearch_input {
+        border: none !important; // !important to override default app-wide styles
+        flex: 1 !important; // !important to override default app-wide styles
+        color: $primary-fg-color !important; // !important to override default app-wide styles
+        padding: 0;
+        height: 100%;
+        width: 100%;
+        font-size: $font-12px;
+        line-height: $font-16px;
+
+        &:not(.mx_RoomSearch_inputExpanded)::placeholder {
+            color: $tertiary-fg-color !important; // !important to override default app-wide styles
+        }
+    }
+
+    &.mx_RoomSearch_hasQuery {
+        border-color: $secondary-fg-color;
+    }
+
+    &.mx_RoomSearch_focused {
+        box-shadow: 0 0 4px 4px rgba(0, 132, 255, 0.5);
+        border-color: transparent;
+    }
+
+    &.mx_RoomSearch_focused, &.mx_RoomSearch_hasQuery {
+        background-color: $roomlist-filter-active-bg-color;
+
+        .mx_RoomSearch_clearButton {
+            width: 16px;
+            height: 16px;
+            mask-image: url('$(res)/img/element-icons/roomlist/search-clear.svg');
+            mask-position: center;
+            mask-size: contain;
+            mask-repeat: no-repeat;
+            background-color: $secondary-fg-color;
+            margin-right: 8px;
+        }
+    }
+
+    .mx_RoomSearch_clearButton {
+        width: 0;
+        height: 0;
+    }
+
+    &.mx_RoomSearch_minimized {
+        border-radius: 32px;
+        height: auto;
+        width: auto;
+        padding: 8px;
+
+        .mx_RoomSearch_icon {
+            margin-left: 0;
+        }
+    }
+}
diff --git a/res/css/structures/_RoomSubList.scss b/res/css/structures/_RoomSubList.scss
deleted file mode 100644
index 2c53258b08..0000000000
--- a/res/css/structures/_RoomSubList.scss
+++ /dev/null
@@ -1,187 +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.
-*/
-
-/* a word of explanation about the flex-shrink values employed here:
-   there are 3 priotized categories of screen real-estate grabbing,
-   each with a flex-shrink difference of 4 order of magnitude,
-   so they ideally wouldn't affect each other.
-   lowest category: .mx_RoomSubList
-        flex-shrink: 10000000
-        distribute size of items within the same category by their size
-   middle category: .mx_RoomSubList.resized-sized
-        flex-shrink: 1000
-        applied when using the resizer, will have a max-height set to it,
-        to limit the size
-   highest category: .mx_RoomSubList.resized-all
-        flex-shrink: 1
-        small flex-shrink value (1), is only added if you can drag the resizer so far
-        so in practice you can only assign this category if there is enough space.
-*/
-
-.mx_RoomSubList {
-    display: flex;
-    flex-direction: column;
-}
-
-
-.mx_RoomSubList_nonEmpty .mx_AutoHideScrollbar_offset {
-    padding-bottom: 4px;
-}
-
-.mx_RoomSubList_labelContainer {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    flex: 0 0 auto;
-    margin: 0 8px;
-    padding: 0 8px;
-    height: 36px;
-}
-
-.mx_RoomSubList_labelContainer.focus-visible:focus-within {
-    background-color: $roomtile-focused-bg-color;
-}
-
-.mx_RoomSubList_label {
-    flex: 1;
-    cursor: pointer;
-    display: flex;
-    align-items: center;
-    padding: 0 6px;
-}
-
-.mx_RoomSubList_label > span {
-    flex: 1 1 auto;
-    text-transform: uppercase;
-    color: $roomsublist-label-fg-color;
-    font-weight: 700;
-    font-size: $font-12px;
-    margin-left: 8px;
-}
-
-.mx_RoomSubList_badge > div {
-    flex: 0 0 auto;
-    border-radius: $font-16px;
-    font-weight: 600;
-    font-size: $font-12px;
-    padding: 0 5px;
-    color: $roomtile-badge-fg-color;
-    background-color: $roomtile-name-color;
-    cursor: pointer;
-}
-
-.mx_RoomSubList_addRoom, .mx_RoomSubList_badge {
-    margin-left: 7px;
-}
-
-.mx_RoomSubList_addRoom {
-    background-color: $roomheader-addroom-bg-color;
-    border-radius: 10px; // 16/2 + 2 padding
-    height: 16px;
-    flex: 0 0 16px;
-    position: relative;
-
-    &::before {
-        background-color: $roomheader-addroom-fg-color;
-        mask: url('$(res)/img/icons-room-add.svg');
-        mask-repeat: no-repeat;
-        mask-position: center;
-        content: '';
-        position: absolute;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        right: 0;
-    }
-}
-
-.mx_RoomSubList_badgeHighlight > div {
-    color: $accent-fg-color;
-    background-color: $warning-color;
-}
-
-.mx_RoomSubList_chevron {
-    pointer-events: none;
-    mask: url('$(res)/img/feather-customised/dropdown-arrow.svg');
-    mask-repeat: no-repeat;
-    transition: transform 0.2s ease-in;
-    width: 10px;
-    height: 6px;
-    margin-left: 2px;
-    background-color: $roomsublist-label-fg-color;
-}
-
-.mx_RoomSubList_chevronDown {
-    transform: rotateZ(0deg);
-}
-
-.mx_RoomSubList_chevronUp {
-    transform: rotateZ(180deg);
-}
-
-.mx_RoomSubList_chevronRight {
-    transform: rotateZ(-90deg);
-}
-
-.mx_RoomSubList_scroll {
-    /* let rooms list grab as much space as it needs (auto),
-       potentially overflowing and showing a scrollbar */
-    flex: 0 1 auto;
-    padding: 0 8px;
-}
-
-.collapsed {
-    .mx_RoomSubList_scroll {
-        padding: 0;
-    }
-
-    .mx_RoomSubList_labelContainer {
-        margin-right: 8px;
-        margin-left: 2px;
-        padding: 0;
-    }
-
-    .mx_RoomSubList_addRoom {
-        margin-left: 3px;
-        margin-right: 10px;
-    }
-
-    .mx_RoomSubList_label > span {
-        display: none;
-    }
-}
-
-// overflow indicators
-.mx_RoomSubList:not(.resized-all) > .mx_RoomSubList_scroll {
-    &.mx_IndicatorScrollbar_topOverflow::before {
-        position: sticky;
-        content: "";
-        top: 0;
-        left: 0;
-        right: 0;
-        height: 8px;
-        z-index: 100;
-        display: block;
-        pointer-events: none;
-        transition: background-image 0.1s ease-in;
-        background: linear-gradient(to top, $panel-gradient);
-    }
-
-
-    &.mx_IndicatorScrollbar_topOverflow {
-        margin-top: -8px;
-    }
-}
diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index f2154ef448..3b60c4e62b 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -261,7 +261,7 @@ hr.mx_RoomView_myReadMarker {
 .mx_RoomView_voipButton {
     float: right;
     margin-right: 13px;
-    margin-top: 10px;
+    margin-top: 13px;
     cursor: pointer;
 }
 
diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss
index 4a78c8df92..b2d05ad7e6 100644
--- a/res/css/structures/_TagPanel.scss
+++ b/res/css/structures/_TagPanel.scss
@@ -33,7 +33,7 @@ limitations under the License.
 .mx_TagPanel .mx_TagPanel_clearButton_container {
     /* Constant height within flex mx_TagPanel */
     height: 70px;
-    width: 60px;
+    width: 56px;
 
     flex: none;
 
@@ -51,7 +51,7 @@ limitations under the License.
 
 .mx_TagPanel .mx_TagPanel_divider {
     height: 0px;
-    width: 42px;
+    width: 34px;
     border-bottom: 1px solid $panel-divider-color;
     display: none;
 }
@@ -66,15 +66,13 @@ limitations under the License.
     flex-direction: column;
     align-items: center;
 
-    height: 100%;
+    padding-top: 6px;
 }
 .mx_TagPanel .mx_TagPanel_tagTileContainer > div {
-    height: $font-40px;
-    padding: 10px 0 9px 0;
+    margin: 6px 0;
 }
 
 .mx_TagPanel .mx_TagTile {
-    margin: 9px 0;
     // opacity: 0.5;
     position: relative;
 }
@@ -86,8 +84,8 @@ limitations under the License.
 
 .mx_TagPanel .mx_TagTile_plus {
     margin-bottom: 12px;
-    height: 40px;
-    width: 40px;
+    height: 32px;
+    width: 32px;
     border-radius: 20px;
     background-color: $roomheader-addroom-bg-color;
     position: relative;
@@ -110,13 +108,12 @@ limitations under the License.
 
 .mx_TagPanel .mx_TagTile.mx_TagTile_selected::before {
     content: '';
-    height: calc(100% + 16px);
+    height: 100%;
     background-color: $accent-color;
-    width: 5px;
+    width: 4px;
     position: absolute;
-    left: -15px;
+    left: -12px;
     border-radius: 0 3px 3px 0;
-    top: -8px; // (16px / 2)
 }
 
 .mx_TagPanel .mx_TagTile.mx_AccessibleButton:focus {
@@ -159,7 +156,7 @@ limitations under the License.
     font-weight: 600;
     font-size: $font-14px;
     padding: 0 5px;
-    background-color: $roomtile-name-color;
+    background-color: $muted-fg-color;
 }
 
 .mx_TagTile_badgeHighlight {
diff --git a/res/css/structures/_ToastContainer.scss b/res/css/structures/_ToastContainer.scss
index 6ec4a0d152..544dcbc180 100644
--- a/res/css/structures/_ToastContainer.scss
+++ b/res/css/structures/_ToastContainer.scss
@@ -28,8 +28,8 @@ limitations under the License.
         margin: 0 4px;
         grid-row: 2 / 4;
         grid-column: 1;
-        background-color: white;
-        box-shadow: 0px 4px 12px $menu-box-shadow-color;
+        background-color: $dark-panel-bg-color;
+        box-shadow: 0px 4px 20px rgba(0, 0, 0, 0.5);
         border-radius: 8px;
     }
 
@@ -37,26 +37,28 @@ limitations under the License.
         grid-row: 1 / 3;
         grid-column: 1;
         color: $primary-fg-color;
-        background-color: $primary-bg-color;
-        box-shadow: 0px 4px 12px $menu-box-shadow-color;
+        background-color: $dark-panel-bg-color;
+        box-shadow: 0px 4px 20px rgba(0, 0, 0, 0.5);
         border-radius: 8px;
         overflow: hidden;
         display: grid;
-        grid-template-columns: 20px 1fr;
-        column-gap: 10px;
+        grid-template-columns: 22px 1fr;
+        column-gap: 8px;
         row-gap: 4px;
         padding: 8px;
-        padding-right: 16px;
 
         &.mx_Toast_hasIcon {
-            &::after {
+            &::before, &::after {
                 content: "";
                 width: 22px;
                 height: 22px;
                 grid-column: 1;
                 grid-row: 1;
                 mask-size: 100%;
+                mask-position: center;
                 mask-repeat: no-repeat;
+                background-size: 100%;
+                background-repeat: no-repeat;
             }
 
             &.mx_Toast_icon_verification::after {
@@ -64,21 +66,59 @@ limitations under the License.
                 background-color: $primary-fg-color;
             }
 
-            &.mx_Toast_icon_verification_warning::after {
-                background-image: url("$(res)/img/e2e/warning.svg");
+            &.mx_Toast_icon_verification_warning {
+                // white infill for the hollow svg mask
+                &::before {
+                    background-color: #ffffff;
+                    mask-image: url('$(res)/img/e2e/normal.svg');
+                    mask-size: 90%;
+                }
+
+                &::after {
+                    mask-image: url("$(res)/img/e2e/warning.svg");
+                    background-color: $notice-primary-color;
+                }
             }
 
-            h2, .mx_Toast_body {
+            .mx_Toast_title, .mx_Toast_body {
                 grid-column: 2;
             }
         }
+        &:not(.mx_Toast_hasIcon) {
+            padding-left: 12px;
 
-        h2 {
-            grid-column: 1 / 3;
-            grid-row: 1;
-            margin: 0;
-            font-size: $font-15px;
-            font-weight: 600;
+            .mx_Toast_title {
+                grid-column: 1 / -1;
+            }
+        }
+
+        .mx_Toast_title,
+        .mx_Toast_description {
+            padding-right: 8px;
+        }
+
+        .mx_Toast_title {
+            width: 100%;
+            box-sizing: border-box;
+
+            h2 {
+                grid-column: 1 / 3;
+                grid-row: 1;
+                margin: 0;
+                font-size: $font-15px;
+                font-weight: 600;
+                display: inline;
+                width: auto;
+                vertical-align: middle;
+            }
+
+            span {
+                padding-left: 8px;
+                float: right;
+                font-size: $font-12px;
+                line-height: $font-22px;
+                color: $muted-fg-color;
+            }
         }
 
         .mx_Toast_body {
@@ -87,7 +127,13 @@ limitations under the License.
         }
 
         .mx_Toast_buttons {
+            float: right;
             display: flex;
+
+            .mx_FormButton {
+                min-width: 96px;
+                box-sizing: border-box;
+            }
         }
 
         .mx_Toast_description {
@@ -96,6 +142,15 @@ limitations under the License.
             text-overflow: ellipsis;
             margin: 4px 0 11px 0;
             font-size: $font-12px;
+
+            .mx_AccessibleButton_kind_link {
+                font-size: inherit;
+                padding: 0;
+            }
+
+            a {
+                text-decoration: none;
+            }
         }
 
         .mx_Toast_deviceID {
diff --git a/res/css/structures/_TopLeftMenuButton.scss b/res/css/structures/_TopLeftMenuButton.scss
deleted file mode 100644
index 53d44e7c24..0000000000
--- a/res/css/structures/_TopLeftMenuButton.scss
+++ /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.
-*/
-
-.mx_TopLeftMenuButton {
-    flex: 0 0 52px;
-    border-bottom: 1px solid $panel-divider-color;
-    color: $topleftmenu-color;
-    background-color: $primary-bg-color;
-    display: flex;
-    align-items: center;
-    min-width: 0;
-    padding: 0 4px;
-    overflow: hidden;
-}
-
-.mx_TopLeftMenuButton .mx_BaseAvatar {
-    margin: 0 7px;
-}
-
-.mx_TopLeftMenuButton_name {
-    margin: 0 7px;
-    font-size: $font-18px;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    font-weight: 600;
-}
-
-.mx_TopLeftMenuButton_chevron {
-    margin: 0 7px;
-    mask: url('$(res)/img/feather-customised/dropdown-arrow.svg');
-    mask-repeat: no-repeat;
-    width: 10px;
-    height: 6px;
-    background-color: $roomsublist-label-fg-color;
-}
diff --git a/res/css/structures/_UserMenu.scss b/res/css/structures/_UserMenu.scss
new file mode 100644
index 0000000000..78795c85a2
--- /dev/null
+++ b/res/css/structures/_UserMenu.scss
@@ -0,0 +1,196 @@
+/*
+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_UserMenu {
+
+    // to make the ... button sort of aligned with the explore button below
+    padding-right: 6px;
+
+    .mx_UserMenu_headerButtons {
+        width: 16px;
+        height: 16px;
+        position: relative;
+        display: block;
+
+        &::before {
+            content: '';
+            width: 16px;
+            height: 16px;
+            position: absolute;
+            top: 0;
+            left: 0;
+            mask-position: center;
+            mask-size: contain;
+            mask-repeat: no-repeat;
+            background: $primary-fg-color;
+            mask-image: url('$(res)/img/element-icons/context-menu.svg');
+        }
+    }
+
+    .mx_UserMenu_row {
+        // Create a row-based flexbox to ensure items stay aligned correctly.
+        display: flex;
+        align-items: center;
+
+        .mx_UserMenu_userAvatarContainer {
+            position: relative; // to make default avatars work
+            margin-right: 8px;
+            height: 32px; // to remove the unknown 4px gap the browser puts below it
+
+            .mx_UserMenu_userAvatar {
+                border-radius: 32px; // should match avatar size
+                object-fit: cover;
+            }
+        }
+
+        .mx_UserMenu_userName {
+            font-weight: 600;
+            font-size: $font-15px;
+            line-height: $font-20px;
+            flex: 1;
+
+            // Ellipsize any text overflow
+            text-overflow: ellipsis;
+            overflow: hidden;
+            white-space: nowrap;
+        }
+
+        .mx_UserMenu_headerButtons {
+            // No special styles: the rest of the layout happens to make it work.
+        }
+    }
+
+    &.mx_UserMenu_minimized {
+        .mx_UserMenu_userHeader {
+            .mx_UserMenu_row {
+                justify-content: center;
+            }
+
+            .mx_UserMenu_userAvatarContainer {
+                margin-right: 0;
+            }
+        }
+    }
+}
+
+.mx_UserMenu_contextMenu {
+    width: 247px;
+
+    &.mx_IconizedContextMenu .mx_IconizedContextMenu_optionList_red {
+        .mx_AccessibleButton {
+            padding-top: 16px;
+            padding-bottom: 16px;
+        }
+    }
+
+    .mx_UserMenu_contextMenu_header {
+        padding: 20px;
+
+        // Create a flexbox to organize the header a bit easier
+        display: flex;
+        align-items: center;
+
+        .mx_UserMenu_contextMenu_name {
+            // Create another flexbox of columns to handle large user IDs
+            display: flex;
+            flex-direction: column;
+            width: calc(100% - 40px); // 40px = 32px theme button + 8px margin to theme button
+
+            * {
+                // Automatically grow all subelements to fit the container
+                flex: 1;
+                width: 100%;
+
+                // Ellipsize any text overflow
+                text-overflow: ellipsis;
+                overflow: hidden;
+                white-space: nowrap;
+            }
+
+            .mx_UserMenu_contextMenu_displayName {
+                font-weight: bold;
+                font-size: $font-15px;
+                line-height: $font-20px;
+            }
+
+            .mx_UserMenu_contextMenu_userId {
+                font-size: $font-15px;
+                line-height: $font-24px;
+            }
+        }
+
+        .mx_UserMenu_contextMenu_themeButton {
+            min-width: 32px;
+            max-width: 32px;
+            width: 32px;
+            height: 32px;
+            margin-left: 8px;
+            border-radius: 32px;
+            background-color: $theme-button-bg-color;
+            cursor: pointer;
+
+            // to make alignment easier, create flexbox for the image
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+    }
+
+    .mx_IconizedContextMenu_icon {
+        width: 16px;
+        height: 16px;
+        display: block;
+
+        &::before {
+            content: '';
+            width: 16px;
+            height: 16px;
+            display: block;
+            mask-position: center;
+            mask-size: contain;
+            mask-repeat: no-repeat;
+            background: $primary-fg-color;
+        }
+    }
+
+    .mx_UserMenu_iconHome::before {
+        mask-image: url('$(res)/img/element-icons/roomlist/home.svg');
+    }
+
+    .mx_UserMenu_iconBell::before {
+        mask-image: url('$(res)/img/element-icons/notifications.svg');
+    }
+
+    .mx_UserMenu_iconLock::before {
+        mask-image: url('$(res)/img/element-icons/security.svg');
+    }
+
+    .mx_UserMenu_iconSettings::before {
+        mask-image: url('$(res)/img/element-icons/settings.svg');
+    }
+
+    .mx_UserMenu_iconArchive::before {
+        mask-image: url('$(res)/img/element-icons/roomlist/archived.svg');
+    }
+
+    .mx_UserMenu_iconMessage::before {
+        mask-image: url('$(res)/img/element-icons/roomlist/feedback.svg');
+    }
+
+    .mx_UserMenu_iconSignOut::before {
+        mask-image: url('$(res)/img/element-icons/leave.svg');
+    }
+}
diff --git a/res/css/views/auth/_AuthBody.scss b/res/css/views/auth/_AuthBody.scss
index 4b2d6b1bf1..0ba0d10e06 100644
--- a/res/css/views/auth/_AuthBody.scss
+++ b/res/css/views/auth/_AuthBody.scss
@@ -128,6 +128,11 @@ limitations under the License.
         margin-top: 16px;
         font-size: $font-15px;
         line-height: $font-24px;
+
+        .mx_InlineSpinner img {
+            vertical-align: sub;
+            margin-right: 5px;
+        }
     }
 
     .mx_AuthBody_paddedFooter_subtitle {
@@ -147,26 +152,11 @@ limitations under the License.
     margin: 1em 0;
 }
 
-.mx_AuthBody_passwordScore {
-    width: 100%;
-    appearance: none;
-    height: 4px;
-    border: 0;
-    border-radius: 2px;
-    position: absolute;
-    top: -12px;
-
-    &::-moz-progress-bar {
-        border-radius: 2px;
-        background-color: $accent-color;
-    }
-
-    &::-webkit-progress-bar,
-    &::-webkit-progress-value {
-        border-radius: 2px;
-    }
-
-    &::-webkit-progress-value {
-        background-color: $accent-color;
+@media only screen and (max-width: 480px) {
+    .mx_AuthBody {
+        border-radius: 4px;
+        width: auto;
+        max-width: 500px;
+        padding: 10px;
     }
 }
diff --git a/res/css/views/auth/_AuthHeader.scss b/res/css/views/auth/_AuthHeader.scss
index b3d07b1925..b1372affee 100644
--- a/res/css/views/auth/_AuthHeader.scss
+++ b/res/css/views/auth/_AuthHeader.scss
@@ -21,3 +21,9 @@ limitations under the License.
     padding: 25px 40px;
     box-sizing: border-box;
 }
+
+@media only screen and (max-width: 480px) {
+    .mx_AuthHeader {
+        display: none;
+    }
+}
diff --git a/res/css/views/auth/_AuthHeaderLogo.scss b/res/css/views/auth/_AuthHeaderLogo.scss
index 091fb0197b..917dcabf67 100644
--- a/res/css/views/auth/_AuthHeaderLogo.scss
+++ b/res/css/views/auth/_AuthHeaderLogo.scss
@@ -23,3 +23,9 @@ limitations under the License.
 .mx_AuthHeaderLogo img {
     width: 100%;
 }
+
+@media only screen and (max-width: 480px) {
+    .mx_AuthHeaderLogo {
+        display: none;
+    }
+}
diff --git a/res/css/views/auth/_AuthPage.scss b/res/css/views/auth/_AuthPage.scss
index 8ef48b6265..e3409792f0 100644
--- a/res/css/views/auth/_AuthPage.scss
+++ b/res/css/views/auth/_AuthPage.scss
@@ -29,3 +29,9 @@ limitations under the License.
     box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.33);
     background-color: $authpage-modal-bg-color;
 }
+
+@media only screen and (max-width: 480px) {
+    .mx_AuthPage_modal {
+        margin-top: 0;
+    }
+}
diff --git a/res/css/views/auth/_PassphraseField.scss b/res/css/views/auth/_PassphraseField.scss
new file mode 100644
index 0000000000..bf8e7f4438
--- /dev/null
+++ b/res/css/views/auth/_PassphraseField.scss
@@ -0,0 +1,37 @@
+/*
+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.
+*/
+
+$PassphraseStrengthHigh: $accent-color;
+$PassphraseStrengthMedium: $username-variant5-color;
+$PassphraseStrengthLow: $notice-primary-color;
+
+progress.mx_PassphraseField_progress {
+    appearance: none;
+    width: 100%;
+    border: 0;
+    height: 4px;
+    position: absolute;
+    top: -12px;
+
+    @mixin ProgressBarBorderRadius "2px";
+    @mixin ProgressBarColour $PassphraseStrengthLow;
+    &[value="2"], &[value="3"] {
+        @mixin ProgressBarColour $PassphraseStrengthMedium;
+    }
+    &[value="4"] {
+        @mixin ProgressBarColour $PassphraseStrengthHigh;
+    }
+}
diff --git a/res/css/views/avatars/_BaseAvatar.scss b/res/css/views/avatars/_BaseAvatar.scss
index e59598278f..1a1e14e7ac 100644
--- a/res/css/views/avatars/_BaseAvatar.scss
+++ b/res/css/views/avatars/_BaseAvatar.scss
@@ -22,7 +22,7 @@ limitations under the License.
     // different results during full reflow of the page vs. incremental reflow
     // of small portions. While that's surely a browser bug, we can avoid it by
     // using `inline-block` instead of the default `inline`.
-    // https://github.com/vector-im/riot-web/issues/5594
+    // https://github.com/vector-im/element-web/issues/5594
     // https://bugzilla.mozilla.org/show_bug.cgi?id=1535053
     // https://bugzilla.mozilla.org/show_bug.cgi?id=255139
     display: inline-block;
diff --git a/res/css/views/avatars/_DecoratedRoomAvatar.scss b/res/css/views/avatars/_DecoratedRoomAvatar.scss
new file mode 100644
index 0000000000..e0afd9de66
--- /dev/null
+++ b/res/css/views/avatars/_DecoratedRoomAvatar.scss
@@ -0,0 +1,73 @@
+/*
+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.
+*/
+
+// XXX: We shouldn't be using TemporaryTile anywhere - delete it.
+.mx_DecoratedRoomAvatar, .mx_TemporaryTile {
+    position: relative;
+
+    &.mx_DecoratedRoomAvatar_cutout .mx_BaseAvatar {
+        mask-image: url('$(res)/img/element-icons/roomlist/decorated-avatar-mask.svg');
+        mask-position: center;
+        mask-size: contain;
+        mask-repeat: no-repeat;
+    }
+
+    .mx_DecoratedRoomAvatar_icon {
+        position: absolute;
+        bottom: -2px;
+        right: -2px;
+        margin: 4px;
+        width: 8px;
+        height: 8px;
+        border-radius: 50%;
+    }
+
+    .mx_DecoratedRoomAvatar_icon::before {
+        content: '';
+        width: 8px;
+        height: 8px;
+        position: absolute;
+        border-radius: 8px;
+    }
+
+    .mx_DecoratedRoomAvatar_icon_globe::before {
+        mask-position: center;
+        mask-size: contain;
+        mask-repeat: no-repeat;
+        background: $secondary-fg-color;
+        mask-image: url('$(res)/img/globe.svg');
+    }
+
+    .mx_DecoratedRoomAvatar_icon_offline::before {
+        background-color: $presence-offline;
+    }
+
+    .mx_DecoratedRoomAvatar_icon_online::before {
+        background-color: $presence-online;
+    }
+
+    .mx_DecoratedRoomAvatar_icon_away::before {
+        background-color: $presence-away;
+    }
+
+    .mx_NotificationBadge, .mx_RoomTile_badgeContainer {
+        position: absolute;
+        top: 0;
+        right: 0;
+        height: 18px;
+        width: 18px;
+    }
+}
diff --git a/res/css/views/avatars/_PulsedAvatar.scss b/res/css/views/avatars/_PulsedAvatar.scss
new file mode 100644
index 0000000000..ce9e3382ab
--- /dev/null
+++ b/res/css/views/avatars/_PulsedAvatar.scss
@@ -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.
+*/
+
+.mx_PulsedAvatar {
+    @keyframes shadow-pulse {
+        0% {
+            box-shadow: 0 0 0 0px rgba($accent-color, 0.2);
+        }
+        100% {
+            box-shadow: 0 0 0 6px rgba($accent-color, 0);
+        }
+    }
+
+    img {
+        animation: shadow-pulse 1s infinite;
+    }
+}
diff --git a/res/css/views/context_menus/_IconizedContextMenu.scss b/res/css/views/context_menus/_IconizedContextMenu.scss
new file mode 100644
index 0000000000..7913058995
--- /dev/null
+++ b/res/css/views/context_menus/_IconizedContextMenu.scss
@@ -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.
+*/
+
+// A context menu that largely fits the | [icon]    [label] | format.
+.mx_IconizedContextMenu {
+    min-width: 146px;
+
+    .mx_IconizedContextMenu_optionList {
+        & > * {
+            padding-left: 20px;
+            padding-right: 20px;
+        }
+
+        // the notFirst class is for cases where the optionList might be under a header of sorts.
+        &:nth-child(n + 2), .mx_IconizedContextMenu_optionList_notFirst {
+            // This is a bit of a hack when we could just use a simple border-top property,
+            // however we have a (kinda) good reason for doing it this way: we need opacity.
+            // To get the right color, we need an opacity modifier which means we have to work
+            // around the problem. PostCSS doesn't support the opacity() function, and if we
+            // use something like postcss-functions we quickly run into an issue where the
+            // function we would define gets passed a CSS variable for custom themes, which
+            // can't be converted easily even when considering https://stackoverflow.com/a/41265350/7037379
+            //
+            // Therefore, we just hack in a line and border the thing ourselves
+            &::before {
+                border-top: 1px solid $primary-fg-color;
+                opacity: 0.1;
+                content: '';
+
+                // Counteract the padding problems (width: 100% ignores the 40px padding,
+                // unless we position it absolutely then it does the right thing).
+                width: 100%;
+                position: absolute;
+                left: 0;
+            }
+        }
+
+        // round the top corners of the top button for the hover effect to be bounded
+        &:first-child .mx_AccessibleButton:first-child {
+            border-radius: 8px 8px 0 0; // radius matches .mx_ContextualMenu
+        }
+
+        // round the bottom corners of the bottom button for the hover effect to be bounded
+        &:last-child .mx_AccessibleButton:last-child {
+            border-radius: 0 0 8px 8px; // radius matches .mx_ContextualMenu
+        }
+
+        .mx_AccessibleButton {
+            // pad the inside of the button so that the hover background is padded too
+            padding-top: 12px;
+            padding-bottom: 12px;
+            text-decoration: none;
+            color: $primary-fg-color;
+            font-size: $font-15px;
+            line-height: $font-24px;
+
+            // Create a flexbox to more easily define the list items
+            display: flex;
+            align-items: center;
+
+            &:hover {
+                background-color: $menu-selected-color;
+            }
+
+            img, .mx_IconizedContextMenu_icon { // icons
+                width: 16px;
+                min-width: 16px;
+                max-width: 16px;
+            }
+
+            span.mx_IconizedContextMenu_label { // labels
+                padding-left: 14px;
+                width: 100%;
+                flex: 1;
+
+                // Ellipsize any text overflow
+                text-overflow: ellipsis;
+                overflow: hidden;
+                white-space: nowrap;
+            }
+        }
+    }
+
+    .mx_IconizedContextMenu_icon {
+        position: relative;
+        width: 16px;
+        height: 16px;
+
+        &::before {
+            content: '';
+            width: 16px;
+            height: 16px;
+            position: absolute;
+            mask-position: center;
+            mask-size: contain;
+            mask-repeat: no-repeat;
+            background: $primary-fg-color;
+        }
+    }
+
+    .mx_IconizedContextMenu_optionList_red {
+        .mx_AccessibleButton {
+            color: $warning-color !important;
+        }
+
+        .mx_IconizedContextMenu_icon::before {
+            background-color: $warning-color;
+        }
+    }
+
+    .mx_IconizedContextMenu_active {
+        &.mx_AccessibleButton, .mx_AccessibleButton {
+            color: $accent-color !important;
+        }
+
+        .mx_IconizedContextMenu_icon::before {
+            background-color: $accent-color;
+        }
+    }
+
+    &.mx_IconizedContextMenu_compact {
+        .mx_IconizedContextMenu_optionList > * {
+            padding: 8px 16px 8px 11px;
+        }
+    }
+
+    .mx_IconizedContextMenu_checked {
+        margin-left: 16px;
+        margin-right: -5px;
+
+        &::before {
+            mask-image: url('$(res)/img/element-icons/roomlist/checkmark.svg');
+        }
+    }
+}
diff --git a/res/css/views/context_menus/_TagTileContextMenu.scss b/res/css/views/context_menus/_TagTileContextMenu.scss
index e4ccc030a2..8929c8906e 100644
--- a/res/css/views/context_menus/_TagTileContextMenu.scss
+++ b/res/css/views/context_menus/_TagTileContextMenu.scss
@@ -15,9 +15,8 @@ limitations under the License.
 */
 
 .mx_TagTileContextMenu_item {
-    padding-top: 8px;
+    padding: 8px;
     padding-right: 20px;
-    padding-bottom: 8px;
     cursor: pointer;
     white-space: nowrap;
     display: flex;
@@ -25,15 +24,22 @@ limitations under the License.
     line-height: $font-16px;
 }
 
-.mx_TagTileContextMenu_item object {
-    pointer-events: none;
+.mx_TagTileContextMenu_item::before {
+    content: '';
+    height: 15px;
+    width: 15px;
+    background-color: currentColor;
+    mask-repeat: no-repeat;
+    mask-size: contain;
+    margin-right: 8px;
 }
 
+.mx_TagTileContextMenu_viewCommunity::before {
+    mask-image: url('$(res)/img/element-icons/view-community.svg');
+}
 
-.mx_TagTileContextMenu_item_icon {
-    padding-right: 8px;
-    padding-left: 4px;
-    display: inline-block;
+.mx_TagTileContextMenu_hideCommunity::before {
+    mask-image: url('$(res)/img/element-icons/hide.svg');
 }
 
 .mx_TagTileContextMenu_separator {
diff --git a/res/css/views/dialogs/_BugReportDialog.scss b/res/css/views/dialogs/_BugReportDialog.scss
new file mode 100644
index 0000000000..1920ac33ea
--- /dev/null
+++ b/res/css/views/dialogs/_BugReportDialog.scss
@@ -0,0 +1,23 @@
+/*
+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_BugReportDialog {
+    .mx_BugReportDialog_download {
+        .mx_AccessibleButton_kind_link {
+            padding-left: 0;
+        }
+    }
+}
diff --git a/res/css/views/dialogs/_GroupAddressPicker.scss b/res/css/views/dialogs/_GroupAddressPicker.scss
index 20a7cc1047..5fa18931f0 100644
--- a/res/css/views/dialogs/_GroupAddressPicker.scss
+++ b/res/css/views/dialogs/_GroupAddressPicker.scss
@@ -18,8 +18,3 @@ limitations under the License.
     margin-top: 10px;
     display: flex;
 }
-
-.mx_GroupAddressPicker_checkboxContainer input[type="checkbox"] {
-    /* Stop flex from shrinking the checkbox */
-    width: 20px;
-}
diff --git a/res/css/views/dialogs/_RoomSettingsDialog.scss b/res/css/views/dialogs/_RoomSettingsDialog.scss
index 3751c15643..d4199a1e66 100644
--- a/res/css/views/dialogs/_RoomSettingsDialog.scss
+++ b/res/css/views/dialogs/_RoomSettingsDialog.scss
@@ -18,19 +18,19 @@ limitations under the License.
 // ==========================================================
 
 .mx_RoomSettingsDialog_settingsIcon::before {
-    mask-image: url('$(res)/img/feather-customised/settings.svg');
+    mask-image: url('$(res)/img/element-icons/settings.svg');
 }
 
 .mx_RoomSettingsDialog_securityIcon::before {
-    mask-image: url('$(res)/img/feather-customised/lock.svg');
+    mask-image: url('$(res)/img/element-icons/security.svg');
 }
 
 .mx_RoomSettingsDialog_rolesIcon::before {
-    mask-image: url('$(res)/img/feather-customised/users-sm.svg');
+    mask-image: url('$(res)/img/element-icons/room/settings/roles.svg');
 }
 
 .mx_RoomSettingsDialog_notificationsIcon::before {
-    mask-image: url('$(res)/img/feather-customised/notifications.svg');
+    mask-image: url('$(res)/img/element-icons/notifications.svg');
 }
 
 .mx_RoomSettingsDialog_bridgesIcon::before {
@@ -39,7 +39,7 @@ limitations under the License.
 }
 
 .mx_RoomSettingsDialog_warningIcon::before {
-    mask-image: url('$(res)/img/feather-customised/warning-triangle.svg');
+    mask-image: url('$(res)/img/element-icons/room/settings/advanced.svg');
 }
 
 .mx_RoomSettingsDialog .mx_Dialog_title {
diff --git a/res/css/views/dialogs/_ServerOfflineDialog.scss b/res/css/views/dialogs/_ServerOfflineDialog.scss
new file mode 100644
index 0000000000..ae4b70beb3
--- /dev/null
+++ b/res/css/views/dialogs/_ServerOfflineDialog.scss
@@ -0,0 +1,72 @@
+/*
+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_ServerOfflineDialog {
+    .mx_ServerOfflineDialog_content {
+        padding-right: 85px;
+        color: $primary-fg-color;
+
+        hr {
+            border-color: $primary-fg-color;
+            opacity: 0.1;
+            border-bottom: none;
+        }
+
+        ul {
+            padding: 16px;
+
+            li:nth-child(n + 2) {
+                margin-top: 16px;
+            }
+        }
+
+        .mx_ServerOfflineDialog_content_context {
+            .mx_ServerOfflineDialog_content_context_timestamp {
+                display: inline-block;
+                width: 115px;
+                color: $muted-fg-color;
+                line-height: 24px; // same as avatar
+                vertical-align: top;
+            }
+
+            .mx_ServerOfflineDialog_content_context_timeline {
+                display: inline-block;
+                width: calc(100% - 155px); // 115px timestamp width + 40px right margin
+
+                .mx_ServerOfflineDialog_content_context_timeline_header {
+                    span {
+                        margin-left: 8px;
+                        vertical-align: middle;
+                    }
+                }
+
+                .mx_ServerOfflineDialog_content_context_txn {
+                    position: relative;
+                    margin-top: 8px;
+
+                    .mx_ServerOfflineDialog_content_context_txn_desc {
+                        width: calc(100% - 100px); // 100px is an arbitrary margin for the button
+                    }
+
+                    .mx_AccessibleButton {
+                        float: right;
+                        padding: 0;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/res/css/views/dialogs/_ShareDialog.scss b/res/css/views/dialogs/_ShareDialog.scss
index 9a2f67dea3..c343b872fd 100644
--- a/res/css/views/dialogs/_ShareDialog.scss
+++ b/res/css/views/dialogs/_ShareDialog.scss
@@ -51,10 +51,12 @@ limitations under the License.
     display: inherit;
 }
 .mx_ShareDialog_matrixto_copy > div {
-    background-image: url($copy-button-url);
+    mask-image: url($copy-button-url);
+    background-color: $message-action-bar-fg-color;
     margin-left: 5px;
     width: 20px;
     height: 20px;
+    background-repeat: no-repeat;
 }
 
 .mx_ShareDialog_split {
@@ -64,9 +66,6 @@ limitations under the License.
 
 .mx_ShareDialog_qrcode_container {
     float: left;
-    background-color: #ffffff;
-    padding: 5px; // makes qr code more readable in dark theme
-    border-radius: 5px;
     height: 256px;
     width: 256px;
     margin-right: 64px;
diff --git a/res/css/views/dialogs/_UnknownDeviceDialog.scss b/res/css/views/dialogs/_UnknownDeviceDialog.scss
deleted file mode 100644
index daa6bd2352..0000000000
--- a/res/css/views/dialogs/_UnknownDeviceDialog.scss
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-Copyright 2016 OpenMarket Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-.mx_UnknownDeviceDialog {
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-}
-
-.mx_UnknownDeviceDialog ul {
-    list-style: none;
-    padding: 0;
-}
-// userid
-.mx_UnknownDeviceDialog p {
-    font-weight: bold;
-    font-size: $font-16px;
-}
-
-.mx_UnknownDeviceDialog .mx_DeviceVerifyButtons {
-    flex-direction: row !important;
-}
-
-.mx_UnknownDeviceDialog .mx_Dialog_content {
-    margin-bottom: 24px;
-    overflow-y: scroll;
-}
-
-.mx_UnknownDeviceDialog_deviceList > li {
-    padding: 4px;
-}
-
-.mx_UnknownDeviceDialog_deviceList > li > * {
-    padding-bottom: 0;
-}
diff --git a/res/css/views/dialogs/_UserSettingsDialog.scss b/res/css/views/dialogs/_UserSettingsDialog.scss
index 4d831d7858..bd472710ea 100644
--- a/res/css/views/dialogs/_UserSettingsDialog.scss
+++ b/res/css/views/dialogs/_UserSettingsDialog.scss
@@ -18,37 +18,41 @@ limitations under the License.
 // ==========================================================
 
 .mx_UserSettingsDialog_settingsIcon::before {
-    mask-image: url('$(res)/img/feather-customised/settings.svg');
+    mask-image: url('$(res)/img/element-icons/settings.svg');
+}
+
+.mx_UserSettingsDialog_appearanceIcon::before {
+    mask-image: url('$(res)/img/element-icons/settings/appearance.svg');
 }
 
 .mx_UserSettingsDialog_voiceIcon::before {
-    mask-image: url('$(res)/img/feather-customised/phone.svg');
+    mask-image: url('$(res)/img/element-icons/call/voice-call.svg');
 }
 
 .mx_UserSettingsDialog_bellIcon::before {
-    mask-image: url('$(res)/img/feather-customised/notifications.svg');
+    mask-image: url('$(res)/img/element-icons/notifications.svg');
 }
 
 .mx_UserSettingsDialog_preferencesIcon::before {
-    mask-image: url('$(res)/img/feather-customised/sliders.svg');
+    mask-image: url('$(res)/img/element-icons/settings/preference.svg');
 }
 
 .mx_UserSettingsDialog_securityIcon::before {
-    mask-image: url('$(res)/img/feather-customised/lock.svg');
+    mask-image: url('$(res)/img/element-icons/security.svg');
 }
 
 .mx_UserSettingsDialog_helpIcon::before {
-    mask-image: url('$(res)/img/feather-customised/help-circle.svg');
+    mask-image: url('$(res)/img/element-icons/settings/help.svg');
 }
 
 .mx_UserSettingsDialog_labsIcon::before {
-    mask-image: url('$(res)/img/feather-customised/flag.svg');
+    mask-image: url('$(res)/img/element-icons/settings/lab-flags.svg');
 }
 
 .mx_UserSettingsDialog_mjolnirIcon::before {
-    mask-image: url('$(res)/img/feather-customised/face.svg');
+    mask-image: url('$(res)/img/element-icons/room/composer/emoji.svg');
 }
 
 .mx_UserSettingsDialog_flairIcon::before {
-    mask-image: url('$(res)/img/feather-customised/flair.svg');
+    mask-image: url('$(res)/img/element-icons/settings/flair.svg');
 }
diff --git a/res/css/views/dialogs/keybackup/_CreateKeyBackupDialog.scss b/res/css/views/dialogs/keybackup/_CreateKeyBackupDialog.scss
index b9babd05f5..9be98e25b2 100644
--- a/res/css/views/dialogs/keybackup/_CreateKeyBackupDialog.scss
+++ b/res/css/views/dialogs/keybackup/_CreateKeyBackupDialog.scss
@@ -35,17 +35,6 @@ limitations under the License.
     align-items: flex-start;
 }
 
-.mx_CreateKeyBackupDialog_passPhraseHelp {
-    flex: 1;
-    height: 85px;
-    margin-left: 20px;
-    font-size: 80%;
-}
-
-.mx_CreateKeyBackupDialog_passPhraseHelp progress {
-    width: 100%;
-}
-
 .mx_CreateKeyBackupDialog_passPhraseInput {
     flex: none;
     width: 250px;
diff --git a/res/css/views/dialogs/secretstorage/_AccessSecretStorageDialog.scss b/res/css/views/dialogs/secretstorage/_AccessSecretStorageDialog.scss
index db11e91bdb..63d0ca555d 100644
--- a/res/css/views/dialogs/secretstorage/_AccessSecretStorageDialog.scss
+++ b/res/css/views/dialogs/secretstorage/_AccessSecretStorageDialog.scss
@@ -15,20 +15,79 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+.mx_AccessSecretStorageDialog_titleWithIcon::before {
+    content: '';
+    display: inline-block;
+    width: 24px;
+    height: 24px;
+    margin-right: 8px;
+    position: relative;
+    top: 5px;
+    background-color: $primary-fg-color;
+}
+
+.mx_AccessSecretStorageDialog_secureBackupTitle::before {
+    mask-image: url('$(res)/img/feather-customised/secure-backup.svg');
+}
+
+.mx_AccessSecretStorageDialog_securePhraseTitle::before {
+    mask-image: url('$(res)/img/feather-customised/secure-phrase.svg');
+}
+
 .mx_AccessSecretStorageDialog_keyStatus {
     height: 30px;
 }
 
-.mx_AccessSecretStorageDialog_primaryContainer {
-    /* FIXME: plinth colour in new theme(s). background-color: $accent-color; */
-    padding: 20px;
-}
-
-.mx_AccessSecretStorageDialog_passPhraseInput,
-.mx_AccessSecretStorageDialog_recoveryKeyInput {
+.mx_AccessSecretStorageDialog_passPhraseInput {
     width: 300px;
     border: 1px solid $accent-color;
     border-radius: 5px;
     padding: 10px;
 }
 
+.mx_AccessSecretStorageDialog_recoveryKeyEntry {
+    display: flex;
+    align-items: center;
+}
+
+.mx_AccessSecretStorageDialog_recoveryKeyEntry_textInput {
+    flex-grow: 1;
+}
+
+.mx_AccessSecretStorageDialog_recoveryKeyEntry_entryControlSeparatorText {
+    margin: 16px;
+}
+
+.mx_AccessSecretStorageDialog_recoveryKeyFeedback {
+    &::before {
+        content: "";
+        display: inline-block;
+        vertical-align: bottom;
+        width: 20px;
+        height: 20px;
+        mask-repeat: no-repeat;
+        mask-position: center;
+        mask-size: 20px;
+        margin-right: 5px;
+    }
+}
+
+.mx_AccessSecretStorageDialog_recoveryKeyFeedback_valid {
+    color: $input-valid-border-color;
+    &::before {
+        mask-image: url('$(res)/img/feather-customised/check.svg');
+        background-color: $input-valid-border-color;
+    }
+}
+
+.mx_AccessSecretStorageDialog_recoveryKeyFeedback_invalid {
+    color: $input-invalid-border-color;
+    &::before {
+        mask-image: url('$(res)/img/feather-customised/x.svg');
+        background-color: $input-invalid-border-color;
+    }
+}
+
+.mx_AccessSecretStorageDialog_recoveryKeyEntry_fileInput {
+    display: none;
+}
diff --git a/res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss b/res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss
index a9ebd54b31..d30803b1f0 100644
--- a/res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss
+++ b/res/css/views/dialogs/secretstorage/_CreateSecretStorageDialog.scss
@@ -48,6 +48,29 @@ limitations under the License.
     margin-bottom: 1em;
 }
 
+.mx_CreateSecretStorageDialog_titleWithIcon::before {
+    content: '';
+    display: inline-block;
+    width: 24px;
+    height: 24px;
+    margin-right: 8px;
+    position: relative;
+    top: 5px;
+    background-color: $primary-fg-color;
+}
+
+.mx_CreateSecretStorageDialog_secureBackupTitle::before {
+    mask-image: url('$(res)/img/feather-customised/secure-backup.svg');
+}
+
+.mx_CreateSecretStorageDialog_securePhraseTitle::before {
+    mask-image: url('$(res)/img/feather-customised/secure-phrase.svg');
+}
+
+.mx_CreateSecretStorageDialog_centeredTitle, .mx_CreateSecretStorageDialog_centeredBody {
+    text-align: center;
+}
+
 .mx_CreateSecretStorageDialog_primaryContainer {
     /* FIXME: plinth colour in new theme(s). background-color: $accent-color; */
     padding-top: 20px;
@@ -59,6 +82,36 @@ limitations under the License.
     display: block;
 }
 
+.mx_CreateSecretStorageDialog_primaryContainer .mx_RadioButton {
+    margin-bottom: 16px;
+    padding: 11px;
+}
+
+.mx_CreateSecretStorageDialog_optionTitle {
+    color: $dialog-title-fg-color;
+    font-weight: 600;
+    font-size: $font-18px;
+    padding-bottom: 10px;
+}
+
+.mx_CreateSecretStorageDialog_optionIcon {
+    display: inline-block;
+    width: 24px;
+    height: 24px;
+    margin-right: 8px;
+    position: relative;
+    top: 5px;
+    background-color: $primary-fg-color;
+}
+
+.mx_CreateSecretStorageDialog_optionIcon_securePhrase {
+    mask-image: url('$(res)/img/feather-customised/secure-phrase.svg');
+}
+
+.mx_CreateSecretStorageDialog_optionIcon_secureBackup {
+    mask-image: url('$(res)/img/feather-customised/secure-backup.svg');
+}
+
 .mx_CreateSecretStorageDialog_passPhraseContainer {
     display: flex;
     align-items: flex-start;
@@ -68,49 +121,47 @@ limitations under the License.
     margin-top: 0px;
 }
 
-.mx_CreateSecretStorageDialog_passPhraseHelp {
-    flex: 1;
-    height: 64px;
-    margin-left: 20px;
-    font-size: 80%;
-}
-
-.mx_CreateSecretStorageDialog_passPhraseHelp progress {
-    width: 100%;
-}
-
 .mx_CreateSecretStorageDialog_passPhraseMatch {
     width: 200px;
     margin-left: 20px;
 }
 
-.mx_CreateSecretStorageDialog_recoveryKeyHeader {
-    margin-bottom: 1em;
-}
-
 .mx_CreateSecretStorageDialog_recoveryKeyContainer {
-    display: flex;
+    width: 380px;
+    margin-left: auto;
+    margin-right: auto;
 }
 
 .mx_CreateSecretStorageDialog_recoveryKey {
-    width: 262px;
+    font-weight: bold;
+    text-align: center;
     padding: 20px;
     color: $info-plinth-fg-color;
     background-color: $info-plinth-bg-color;
-    margin-right: 12px;
+    border-radius: 6px;
+    word-spacing: 1em;
+    margin-bottom: 20px;
 }
 
 .mx_CreateSecretStorageDialog_recoveryKeyButtons {
-    flex: 1;
     display: flex;
+    justify-content: space-between;
     align-items: center;
 }
 
 .mx_CreateSecretStorageDialog_recoveryKeyButtons .mx_AccessibleButton {
-    margin-right: 10px;
-}
-
-.mx_CreateSecretStorageDialog_recoveryKeyButtons button {
-    flex: 1;
+    width: 160px;
+    padding-left: 0px;
+    padding-right: 0px;
     white-space: nowrap;
 }
+
+.mx_CreateSecretStorageDialog_continueSpinner {
+    margin-top: 33px;
+    text-align: right;
+}
+
+.mx_CreateSecretStorageDialog_continueSpinner img {
+    width: 20px;
+    height: 20px;
+}
diff --git a/res/css/views/directory/_NetworkDropdown.scss b/res/css/views/directory/_NetworkDropdown.scss
index bd5c67c7ed..ae0927386a 100644
--- a/res/css/views/directory/_NetworkDropdown.scss
+++ b/res/css/views/directory/_NetworkDropdown.scss
@@ -145,13 +145,14 @@ limitations under the License.
     &::after {
         content: "";
         position: absolute;
-        width: 24px;
-        height: 24px;
-        right: -28px; // - (24 + 4)
+        width: 26px;
+        height: 26px;
+        right: -27.5px; // - (width: 26 + spacing to align with X above: 1.5)
+        top: -3px;
         mask-repeat: no-repeat;
         mask-position: center;
         mask-size: contain;
-        mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
+        mask-image: url('$(res)/img/feather-customised/chevron-down-thin.svg');
         background-color: $primary-fg-color;
     }
 
diff --git a/res/css/views/elements/_AddressSelector.scss b/res/css/views/elements/_AddressSelector.scss
index dd78fcc0f0..087504390c 100644
--- a/res/css/views/elements/_AddressSelector.scss
+++ b/res/css/views/elements/_AddressSelector.scss
@@ -23,6 +23,7 @@ limitations under the License.
     border-radius: 3px;
     border: solid 1px $accent-color;
     cursor: pointer;
+    z-index: 1;
 }
 
 .mx_AddressSelector.mx_AddressSelector_empty {
diff --git a/res/css/views/elements/_Dropdown.scss b/res/css/views/elements/_Dropdown.scss
index dd8511cc42..2a2508c17c 100644
--- a/res/css/views/elements/_Dropdown.scss
+++ b/res/css/views/elements/_Dropdown.scss
@@ -77,12 +77,18 @@ limitations under the License.
     white-space: nowrap;
 }
 
-.mx_Dropdown_option img {
+.mx_Dropdown_option img,
+.mx_Dropdown_option .mx_Dropdown_option_emoji {
     margin: 5px;
     width: 16px;
     vertical-align: middle;
 }
 
+.mx_Dropdown_option_emoji {
+    font-size: $font-16px;
+    line-height: $font-16px;
+}
+
 input.mx_Dropdown_option,
 input.mx_Dropdown_option:focus {
     font-weight: normal;
diff --git a/res/css/views/elements/_Field.scss b/res/css/views/elements/_Field.scss
index cf5bc7ab41..f67da6477b 100644
--- a/res/css/views/elements/_Field.scss
+++ b/res/css/views/elements/_Field.scss
@@ -191,5 +191,5 @@ limitations under the License.
 }
 
 .mx_Field .mx_CountryDropdown {
-    width: 67px;
+    width: $font-78px;
 }
diff --git a/res/css/views/elements/_ImageView.scss b/res/css/views/elements/_ImageView.scss
index 983ef074f2..0a4ed2a194 100644
--- a/res/css/views/elements/_ImageView.scss
+++ b/res/css/views/elements/_ImageView.scss
@@ -37,7 +37,7 @@ limitations under the License.
     order: 2;
     /* min-width hack needed for FF */
     min-width: 0px;
-    max-height: 90%;
+    height: 90%;
     flex: 15 15 0;
     display: flex;
     align-items: center;
diff --git a/res/css/views/elements/_InlineSpinner.scss b/res/css/views/elements/_InlineSpinner.scss
index 612b6209c6..6b91e45923 100644
--- a/res/css/views/elements/_InlineSpinner.scss
+++ b/res/css/views/elements/_InlineSpinner.scss
@@ -18,7 +18,7 @@ limitations under the License.
     display: inline;
 }
 
-.mx_InlineSpinner img {
+.mx_InlineSpinner_spin img {
     margin: 0px 6px;
     vertical-align: -3px;
 }
diff --git a/res/css/views/elements/_InteractiveTooltip.scss b/res/css/views/elements/_InteractiveTooltip.scss
deleted file mode 100644
index db98d95709..0000000000
--- a/res/css/views/elements/_InteractiveTooltip.scss
+++ /dev/null
@@ -1,91 +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_InteractiveTooltip_wrapper {
-    position: fixed;
-    z-index: 5000;
-}
-
-.mx_InteractiveTooltip {
-    border-radius: 3px;
-    background-color: $interactive-tooltip-bg-color;
-    color: $interactive-tooltip-fg-color;
-    position: absolute;
-    font-size: $font-10px;
-    font-weight: 600;
-    padding: 6px;
-    z-index: 5001;
-}
-
-.mx_InteractiveTooltip.mx_InteractiveTooltip_withChevron_top {
-    top: 10px; // 8px chevron + 2px spacing
-}
-
-.mx_InteractiveTooltip_chevron_top {
-    position: absolute;
-    left: calc(50% - 8px);
-    top: -8px;
-    width: 0;
-    height: 0;
-    border-left: 8px solid transparent;
-    border-bottom: 8px solid $interactive-tooltip-bg-color;
-    border-right: 8px solid transparent;
-}
-
-// Adapted from https://codyhouse.co/blog/post/css-rounded-triangles-with-clip-path
-// by Sebastiano Guerriero (@guerriero_se)
-@supports (clip-path: polygon(0% 0%, 100% 100%, 0% 100%)) {
-    .mx_InteractiveTooltip_chevron_top {
-        height: 16px;
-        width: 16px;
-        background-color: inherit;
-        border: none;
-        clip-path: polygon(0% 0%, 100% 100%, 0% 100%);
-        transform: rotate(135deg);
-        border-radius: 0 0 0 3px;
-        top: calc(-8px / 1.414); // sqrt(2) because of rotation
-    }
-}
-
-.mx_InteractiveTooltip.mx_InteractiveTooltip_withChevron_bottom {
-    bottom: 10px; // 8px chevron + 2px spacing
-}
-
-.mx_InteractiveTooltip_chevron_bottom {
-    position: absolute;
-    left: calc(50% - 8px);
-    bottom: -8px;
-    width: 0;
-    height: 0;
-    border-left: 8px solid transparent;
-    border-top: 8px solid $interactive-tooltip-bg-color;
-    border-right: 8px solid transparent;
-}
-
-// Adapted from https://codyhouse.co/blog/post/css-rounded-triangles-with-clip-path
-// by Sebastiano Guerriero (@guerriero_se)
-@supports (clip-path: polygon(0% 0%, 100% 100%, 0% 100%)) {
-    .mx_InteractiveTooltip_chevron_bottom {
-        height: 16px;
-        width: 16px;
-        background-color: inherit;
-        border: none;
-        clip-path: polygon(0% 0%, 100% 100%, 0% 100%);
-        transform: rotate(-45deg);
-        border-radius: 0 0 0 3px;
-        bottom: calc(-8px / 1.414); // sqrt(2) because of rotation
-    }
-}
diff --git a/res/css/views/elements/_ProgressBar.scss b/res/css/views/elements/_ProgressBar.scss
index a3fee232d0..e49d85af04 100644
--- a/res/css/views/elements/_ProgressBar.scss
+++ b/res/css/views/elements/_ProgressBar.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,12 +14,26 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_ProgressBar {
-    height: 5px;
-    border: 1px solid $progressbar-color;
-}
+progress.mx_ProgressBar {
+    height: 4px;
+    width: 60px;
+    border-radius: 10px;
+    overflow: hidden;
+    appearance: none;
+    border: 0;
 
-.mx_ProgressBar_fill {
-    height: 100%;
-    background-color: $progressbar-color;
+    @mixin ProgressBarBorderRadius "10px";
+    @mixin ProgressBarColour $accent-color;
+    ::-webkit-progress-value {
+        transition: width 1s;
+    }
+    ::-moz-progress-bar {
+        transition: padding-bottom 1s;
+        padding-bottom: var(--value);
+        transform-origin: 0 0;
+        transform: rotate(-90deg) translateX(-15px);
+        padding-left: 15px;
+
+        height: 0;
+    }
 }
diff --git a/src/utils/rem.js b/res/css/views/elements/_QRCode.scss
similarity index 85%
rename from src/utils/rem.js
rename to res/css/views/elements/_QRCode.scss
index 1f18c9de05..96d9114b54 100644
--- a/src/utils/rem.js
+++ b/res/css/views/elements/_QRCode.scss
@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// converts a pixel value to rem.
-export default function(pixelVal) {
-  return pixelVal / 15 + "rem";
+.mx_QRCode {
+    img {
+        border-radius: 8px;
+    }
 }
diff --git a/res/css/views/elements/_ResizeHandle.scss b/res/css/views/elements/_ResizeHandle.scss
index 5544799a34..5189f80b30 100644
--- a/res/css/views/elements/_ResizeHandle.scss
+++ b/res/css/views/elements/_ResizeHandle.scss
@@ -34,7 +34,7 @@ limitations under the License.
 
 .mx_MatrixChat > .mx_ResizeHandle.mx_ResizeHandle_horizontal {
     margin: 0 -10px 0 0;
-    padding: 0 10px 0 0;
+    padding: 0 8px 0 0;
 }
 
 .mx_ResizeHandle > div {
diff --git a/res/css/views/elements/_Slider.scss b/res/css/views/elements/_Slider.scss
new file mode 100644
index 0000000000..58ba2813b4
--- /dev/null
+++ b/res/css/views/elements/_Slider.scss
@@ -0,0 +1,99 @@
+/*
+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_Slider {
+    position: relative;
+    margin: 0px;
+    flex-grow: 1;
+}
+
+.mx_Slider_dotContainer {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+}
+
+.mx_Slider_bar {
+    display: flex;
+    box-sizing: border-box;
+    position: absolute;
+    height: 1em;
+    width: 100%;
+    padding: 0 0.5em; // half the width of a dot.
+    align-items: center;
+}
+
+.mx_Slider_bar > hr {
+    width: 100%;
+    height: 0.4em;
+    background-color: $slider-background-color;
+    border: 0;
+}
+
+.mx_Slider_selection {
+    display: flex;
+    align-items: center;
+    width: calc(100% - 1em); // 2 * half the width of a dot
+    height: 1em;
+    position: absolute;
+    pointer-events: none;
+}
+
+.mx_Slider_selectionDot {
+    position: absolute;
+    width: 1.1em;
+    height: 1.1em;
+    background-color: $slider-selection-color;
+    border-radius: 50%;
+    box-shadow: 0 0 6px lightgrey;
+    z-index: 10;
+}
+
+.mx_Slider_selection > hr {
+    margin: 0;
+    border: 0.2em solid $slider-selection-color;
+}
+
+.mx_Slider_dot {
+    height: 1em;
+    width: 1em;
+    border-radius: 50%;
+    background-color: $slider-background-color;
+    z-index: 0;
+}
+
+.mx_Slider_dotActive {
+    background-color: $slider-selection-color;
+}
+
+.mx_Slider_dotValue {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    color: $slider-background-color;
+}
+
+// The following is a hack to center the labels without adding
+// any width to the slider's dots.
+.mx_Slider_labelContainer {
+    width: 1em;
+}
+
+.mx_Slider_label {
+    position: relative;
+    width: fit-content;
+    left: -50%;
+}
diff --git a/res/css/views/elements/_StyledCheckbox.scss b/res/css/views/elements/_StyledCheckbox.scss
new file mode 100644
index 0000000000..e2d61c033b
--- /dev/null
+++ b/res/css/views/elements/_StyledCheckbox.scss
@@ -0,0 +1,90 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+
+.mx_Checkbox {
+    $size: $font-16px;
+    $border-size: $font-1-5px;
+    $border-radius: $font-4px;
+
+    display: flex;
+    align-items: flex-start;
+
+    input[type=checkbox] {
+        appearance: none;
+        margin: 0;
+        padding: 0;
+
+        & + label {
+            display: flex;
+            align-items: center;
+
+            flex-grow: 1;
+        }
+
+        & + label > .mx_Checkbox_background {
+            display: inline-flex;
+            position: relative;
+
+            flex-shrink: 0;
+
+            height: $size;
+            width: $size;
+            size: 0.5rem;
+
+            border: $border-size solid rgba($muted-fg-color, 0.5);
+            box-sizing: border-box;
+            border-radius: $border-radius;
+
+            img {
+                display: none;
+
+                height: 100%;
+                width: 100%;
+                filter: invert(100%);
+            }
+        }
+
+        &:checked + label > .mx_Checkbox_background {
+            background: $accent-color;
+            border-color: $accent-color;
+
+            img {
+                display: block;
+            }
+        }
+
+        & + label > *:not(.mx_Checkbox_background) {
+            margin-left: 10px;
+        }
+
+        &:disabled + label {
+            opacity: 0.5;
+            cursor: not-allowed;
+        }
+
+        &:checked:disabled + label > .mx_Checkbox_background {
+            background-color: $accent-color;
+            border-color: $accent-color;
+        }
+
+        &.focus-visible {
+            & + label .mx_Checkbox_background {
+                @mixin unreal-focus;
+            }
+        }
+    }
+}
diff --git a/res/css/views/elements/_StyledRadioButton.scss b/res/css/views/elements/_StyledRadioButton.scss
new file mode 100644
index 0000000000..62fb5c5512
--- /dev/null
+++ b/res/css/views/elements/_StyledRadioButton.scss
@@ -0,0 +1,124 @@
+/*
+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.
+*/
+
+/**
+* This component expects the parent to specify a positive padding and
+* width
+*/
+
+.mx_RadioButton {
+    $radio-circle-color: $muted-fg-color;
+    $active-radio-circle-color: $accent-color;
+    position: relative;
+
+    display: flex;
+    align-items: baseline;
+    flex-grow: 1;
+
+    > .mx_RadioButton_content {
+        flex-grow: 1;
+
+        display: flex;
+        flex-direction: column;
+
+        margin-left: 8px;
+        margin-right: 8px;
+    }
+
+    .mx_RadioButton_spacer {
+        flex-shrink: 0;
+        flex-grow: 0;
+
+        height: $font-16px;
+        width: $font-16px;
+    }
+
+    > input[type=radio] {
+        // Remove the OS's representation
+        margin: 0;
+        padding: 0;
+        appearance: none;
+
+        + div {
+            flex-shrink: 0;
+            flex-grow: 0;
+
+            display: flex;
+            align-items: center;
+            justify-content: center;
+
+            box-sizing: border-box;
+            height: $font-16px;
+            width: $font-16px;
+            margin-left: 2px; // For the highlight on focus
+
+            border: $font-1-5px solid $radio-circle-color;
+            border-radius: $font-16px;
+
+            > div {
+                box-sizing: border-box;
+
+                height: $font-8px;
+                width: $font-8px;
+
+                border-radius: $font-8px;
+            }
+        }
+
+        &.focus-visible {
+            & + div {
+                @mixin unreal-focus;
+            }
+        }
+
+        &:checked {
+            & + div {
+                border-color: $active-radio-circle-color;
+
+                & > div {
+                    background: $active-radio-circle-color;
+                }
+            }
+        }
+
+        &:disabled {
+            & + div,
+            & + div + span {
+                opacity: 0.5;
+                cursor: not-allowed;
+            }
+
+            & + div {
+                border-color: $radio-circle-color;
+            }
+        }
+
+        &:checked:disabled {
+            & + div > div {
+                background-color: $radio-circle-color;
+            }
+        }
+    }
+}
+
+.mx_RadioButton_outlined {
+    border: 1px solid $input-darker-bg-color;
+    border-radius: 8px;
+}
+
+.mx_RadioButton_checked {
+    border-color: $accent-color;
+}
diff --git a/res/css/views/elements/_ToggleSwitch.scss b/res/css/views/elements/_ToggleSwitch.scss
index 7c65fbc90d..62669889ee 100644
--- a/res/css/views/elements/_ToggleSwitch.scss
+++ b/res/css/views/elements/_ToggleSwitch.scss
@@ -24,11 +24,6 @@ limitations under the License.
 
     background-color: $togglesw-off-color;
     opacity: 0.5;
-
-    display: flex;
-    flex-direction: row;
-    flex: 0 0 auto;
-    align-items: center;
 }
 
 .mx_ToggleSwitch_enabled {
@@ -38,16 +33,18 @@ limitations under the License.
 
 .mx_ToggleSwitch.mx_ToggleSwitch_on {
     background-color: $togglesw-on-color;
+
+    > .mx_ToggleSwitch_ball {
+        left: calc(100% - $font-20px);
+    }
 }
 
 .mx_ToggleSwitch_ball {
-    transition: left 0.15s ease-out 0.1s;
+    position: relative;
     width: $font-20px;
     height: $font-20px;
     border-radius: $font-20px;
     background-color: $togglesw-ball-color;
-}
-
-.mx_ToggleSwitch_on {
-    flex-direction: row-reverse;
+    transition: left 0.15s ease-out 0.1s;
+    left: 0;
 }
diff --git a/res/css/views/elements/_Tooltip.scss b/res/css/views/elements/_Tooltip.scss
index 73ac9b3558..d90c818f94 100644
--- a/res/css/views/elements/_Tooltip.scss
+++ b/res/css/views/elements/_Tooltip.scss
@@ -51,21 +51,27 @@ limitations under the License.
 .mx_Tooltip {
     display: none;
     position: fixed;
-    border: 1px solid $menu-border-color;
-    border-radius: 4px;
+    border-radius: 8px;
     box-shadow: 4px 4px 12px 0 $menu-box-shadow-color;
-    background-color: $menu-bg-color;
-    z-index: 4000; // Higher than dialogs so tooltips can be used in dialogs
+    z-index: 6000; // Higher than context menu so tooltips can be used everywhere
     padding: 10px;
     pointer-events: none;
     line-height: $font-14px;
     font-size: $font-12px;
-    font-weight: 600;
-    color: $primary-fg-color;
+    font-weight: 500;
     max-width: 200px;
     word-break: break-word;
     margin-right: 50px;
 
+    background-color: $inverted-bg-color;
+    color: $accent-fg-color;
+    border: 0;
+    text-align: center;
+
+    .mx_Tooltip_chevron {
+        display: none;
+    }
+
     &.mx_Tooltip_visible {
         animation: mx_fadein 0.2s forwards;
     }
@@ -75,18 +81,23 @@ limitations under the License.
     }
 }
 
-.mx_Tooltip_timeline {
-    box-shadow: none;
-    background-color: $tooltip-timeline-bg-color;
-    color: $tooltip-timeline-fg-color;
-    text-align: center;
-    border: none;
-    border-radius: 3px;
-    font-size: $font-14px;
-    line-height: 1.2;
-    padding: 6px 8px;
+// These tooltips use an older style with a chevron
+.mx_Field_tooltip {
+    background-color: $menu-bg-color;
+    color: $primary-fg-color;
+    border: 1px solid $menu-border-color;
+    text-align: unset;
 
-    .mx_Tooltip_chevron::after {
-        border-right-color: $tooltip-timeline-bg-color;
+    .mx_Tooltip_chevron {
+        display: unset;
     }
 }
+
+.mx_Tooltip_title {
+    font-weight: 600;
+}
+
+.mx_Tooltip_sub {
+    opacity: 0.7;
+    margin-top: 4px;
+}
diff --git a/res/css/views/emojipicker/_EmojiPicker.scss b/res/css/views/emojipicker/_EmojiPicker.scss
index 24561eeeb9..400e40e233 100644
--- a/res/css/views/emojipicker/_EmojiPicker.scss
+++ b/res/css/views/emojipicker/_EmojiPicker.scss
@@ -190,7 +190,7 @@ limitations under the License.
 
 .mx_EmojiPicker_footer {
     border-top: 1px solid $message-action-bar-border-color;
-    height: 72px;
+    min-height: 72px;
 
     display: flex;
     align-items: center;
diff --git a/res/css/views/globals/_MatrixToolbar.scss b/res/css/views/globals/_MatrixToolbar.scss
deleted file mode 100644
index 5fdf572f99..0000000000
--- a/res/css/views/globals/_MatrixToolbar.scss
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-.mx_MatrixToolbar {
-    background-color: $accent-color;
-    color: $accent-fg-color;
-
-    display: flex;
-    align-items: center;
-}
-
-.mx_MatrixToolbar_warning {
-    margin-left: 16px;
-    margin-right: 8px;
-    margin-top: -2px;
-}
-
-.mx_MatrixToolbar_info {
-    padding-left: 16px;
-    padding-right: 8px;
-    background-color: $info-bg-color;
-}
-
-.mx_MatrixToolbar_error {
-    padding-left: 16px;
-    padding-right: 8px;
-    background-color: $warning-bg-color;
-}
-
-.mx_MatrixToolbar_content {
-    flex: 1;
-}
-
-.mx_MatrixToolbar_link {
-    color: $accent-fg-color !important;
-    text-decoration: underline !important;
-    cursor: pointer;
-}
-
-.mx_MatrixToolbar_clickable {
-    cursor: pointer;
-}
-
-.mx_MatrixToolbar_close {
-    cursor: pointer;
-}
-
-.mx_MatrixToolbar_close img {
-    display: block;
-    float: right;
-    margin-right: 10px;
-}
-
-.mx_MatrixToolbar_action {
-    margin-right: 16px;
-}
-
-.mx_MatrixToolbar_changelog {
-    white-space: pre;
-}
diff --git a/res/css/views/messages/_MImageBody.scss b/res/css/views/messages/_MImageBody.scss
index 547b16e9ad..1c773c2f06 100644
--- a/res/css/views/messages/_MImageBody.scss
+++ b/res/css/views/messages/_MImageBody.scss
@@ -25,6 +25,7 @@ limitations under the License.
     height: 100%;
     left: 0;
     top: 0;
+    border-radius: 4px;
 }
 
 .mx_MImageBody_thumbnail_container {
diff --git a/res/css/views/messages/_MessageActionBar.scss b/res/css/views/messages/_MessageActionBar.scss
index 9f3971ecf0..1254b496b5 100644
--- a/res/css/views/messages/_MessageActionBar.scss
+++ b/res/css/views/messages/_MessageActionBar.scss
@@ -24,7 +24,7 @@ limitations under the License.
     line-height: $font-24px;
     border-radius: 4px;
     background: $message-action-bar-bg-color;
-    top: -18px;
+    top: -26px;
     right: 8px;
     user-select: none;
     // Ensure the action bar appears above over things, like the read marker.
@@ -41,7 +41,7 @@ limitations under the License.
         width: calc(10px + 48px + 100% + 8px);
         // safe area + action bar
         height: calc(20px + 100%);
-        top: -20px;
+        top: -12px;
         left: -58px;
         z-index: -1;
         cursor: initial;
@@ -91,17 +91,17 @@ limitations under the License.
 }
 
 .mx_MessageActionBar_reactButton::after {
-    mask-image: url('$(res)/img/react.svg');
+    mask-image: url('$(res)/img/element-icons/room/message-bar/emoji.svg');
 }
 
 .mx_MessageActionBar_replyButton::after {
-    mask-image: url('$(res)/img/reply.svg');
+    mask-image: url('$(res)/img/element-icons/room/message-bar/reply.svg');
 }
 
 .mx_MessageActionBar_editButton::after {
-    mask-image: url('$(res)/img/edit.svg');
+    mask-image: url('$(res)/img/element-icons/room/message-bar/edit.svg');
 }
 
 .mx_MessageActionBar_optionsButton::after {
-    mask-image: url('$(res)/img/icon_context.svg');
+    mask-image: url('$(res)/img/element-icons/context-menu.svg');
 }
diff --git a/res/css/views/messages/_MessageTimestamp.scss b/res/css/views/messages/_MessageTimestamp.scss
index f8d91cc083..85c910296a 100644
--- a/res/css/views/messages/_MessageTimestamp.scss
+++ b/res/css/views/messages/_MessageTimestamp.scss
@@ -17,4 +17,5 @@ limitations under the License.
 .mx_MessageTimestamp {
     color: $event-timestamp-color;
     font-size: $font-10px;
+    font-variant-numeric: tabular-nums;
 }
diff --git a/res/css/views/messages/_ReactionsRowButton.scss b/res/css/views/messages/_ReactionsRowButton.scss
index fe5b081042..7158ffc027 100644
--- a/res/css/views/messages/_ReactionsRowButton.scss
+++ b/res/css/views/messages/_ReactionsRowButton.scss
@@ -16,7 +16,6 @@ limitations under the License.
 
 .mx_ReactionsRowButton {
     display: inline-flex;
-    height: 20px;
     line-height: $font-21px;
     margin-right: 6px;
     padding: 0 6px;
@@ -35,11 +34,6 @@ limitations under the License.
         border-color: $reaction-row-button-selected-border-color;
     }
 
-    // ignore mouse events for all children, treat it as one entire hoverable entity
-    * {
-        pointer-events: none;
-    }
-
     .mx_ReactionsRowButton_content {
         max-width: 100px;
         overflow: hidden;
diff --git a/res/css/views/messages/_RedactedBody.scss b/res/css/views/messages/_RedactedBody.scss
new file mode 100644
index 0000000000..e4ab0c0835
--- /dev/null
+++ b/res/css/views/messages/_RedactedBody.scss
@@ -0,0 +1,36 @@
+/*
+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_RedactedBody {
+    white-space: pre-wrap;
+    color: $muted-fg-color;
+    vertical-align: middle;
+
+    padding-left: 20px;
+    position: relative;
+
+    &::before {
+        height: 14px;
+        width: 14px;
+        background-color: $muted-fg-color;
+        mask-image: url('$(res)/img/feather-customised/trash.custom.svg');
+        mask-repeat: no-repeat;
+        mask-position: center;
+        mask-size: contain;
+        content: '';
+        position: absolute;
+        top: 2px;
+        left: 0;
+    }
+}
diff --git a/res/css/views/messages/_common_CryptoEvent.scss b/res/css/views/messages/_common_CryptoEvent.scss
index 637d25d7a1..09c78ae5b4 100644
--- a/res/css/views/messages/_common_CryptoEvent.scss
+++ b/res/css/views/messages/_common_CryptoEvent.scss
@@ -15,28 +15,45 @@ 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: "";
-        background-image: url("$(res)/img/e2e/normal.svg");
-        background-repeat: no-repeat;
-        background-size: 100%;
+        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;
+        mask-image: url('$(res)/img/e2e/normal.svg');
+        mask-repeat: no-repeat;
+        mask-position: center;
+        mask-size: 90%;
+    }
+
     &.mx_cryptoEvent_icon_verified::after {
-        background-image: url("$(res)/img/e2e/verified.svg");
+        mask-image: url("$(res)/img/e2e/verified.svg");
+        background-color: $accent-color;
     }
 
     &.mx_cryptoEvent_icon_warning::after {
-        background-image: url("$(res)/img/e2e/warning.svg");
+        mask-image: url("$(res)/img/e2e/warning.svg");
+        background-color: $notice-primary-color;
     }
 
     .mx_cryptoEvent_title, .mx_cryptoEvent_subtitle, .mx_cryptoEvent_state {
diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index 26b81e94f3..6f86d1ad18 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -53,7 +53,7 @@ limitations under the License.
     }
 
     .mx_UserInfo_separator {
-        border-bottom: 1px solid lightgray;
+        border-bottom: 1px solid rgba($primary-fg-color, .1);
     }
 
     .mx_UserInfo_memberDetailsContainer {
@@ -121,7 +121,7 @@ limitations under the License.
     h3 {
         text-transform: uppercase;
         color: $notice-secondary-color;
-        font-weight: bold;
+        font-weight: 600;
         font-size: $font-12px;
         margin: 4px 0;
     }
diff --git a/res/css/views/rooms/_AppsDrawer.scss b/res/css/views/rooms/_AppsDrawer.scss
index d6fb055bc0..aae255f81a 100644
--- a/res/css/views/rooms/_AppsDrawer.scss
+++ b/res/css/views/rooms/_AppsDrawer.scss
@@ -49,7 +49,7 @@ $MiniAppTileHeight: 114px;
     order: 2;
     cursor: pointer;
     padding: 0;
-    margin: 5px auto 5px 0px;
+    margin: 5px auto 5px 0;
     color: $accent-color;
     font-size: $font-12px;
 }
@@ -87,7 +87,7 @@ $MiniAppTileHeight: 114px;
     margin: 0;
     padding: 0;
     border: 5px solid $widget-menu-bar-bg-color;
-    border-radius: 4px;
+    border-radius: 8px;
     display: flex;
     flex-direction: column;
 }
@@ -117,6 +117,7 @@ $MiniAppTileHeight: 114px;
 .mx_AppTile_persistedWrapper div {
     width: 100%;
     height: 100%;
+    min-width: 300px;
 }
 
 .mx_AppTileMenuBar {
diff --git a/res/css/views/rooms/_Autocomplete.scss b/res/css/views/rooms/_Autocomplete.scss
index a4aebdb708..f8e0a382b1 100644
--- a/res/css/views/rooms/_Autocomplete.scss
+++ b/res/css/views/rooms/_Autocomplete.scss
@@ -6,9 +6,10 @@
     border: 1px solid $primary-hairline-color;
     background: $primary-bg-color;
     border-bottom: none;
-    border-radius: 4px 4px 0 0;
+    border-radius: 8px 8px 0 0;
     max-height: 50vh;
     overflow: auto;
+    box-shadow: 0px -16px 32px $composer-shadow-color;
 }
 
 .mx_Autocomplete_ProviderSection {
diff --git a/res/css/views/rooms/_E2EIcon.scss b/res/css/views/rooms/_E2EIcon.scss
index 584ea17433..a3473dedec 100644
--- a/res/css/views/rooms/_E2EIcon.scss
+++ b/res/css/views/rooms/_E2EIcon.scss
@@ -22,28 +22,58 @@ limitations under the License.
     display: block;
 }
 
-.mx_E2EIcon_warning::after,
-.mx_E2EIcon_normal::after,
-.mx_E2EIcon_verified::after {
-    content: "";
-    display: block;
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    background-repeat: no-repeat;
-    background-size: contain;
+.mx_E2EIcon_warning,
+.mx_E2EIcon_normal,
+.mx_E2EIcon_verified {
+    &::before, &::after {
+        content: "";
+        display: block;
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        mask-repeat: no-repeat;
+        mask-position: center;
+        mask-size: contain;
+    }
+}
+
+// white infill for the transparency
+.mx_E2EIcon::before {
+    background-color: #ffffff;
+    mask-image: url('$(res)/img/e2e/normal.svg');
+    mask-repeat: no-repeat;
+    mask-position: center;
+    mask-size: 90%;
+}
+
+// transparent-looking border surrounding the shield for when overlain over avatars
+.mx_E2EIcon_bordered {
+    mask-image: url('$(res)/img/e2e/normal.svg');
+    background-color: $header-panel-bg-color;
+
+    // shrink the actual badge
+    &::after {
+        mask-size: 75%;
+    }
+    // shrink the infill of the badge
+    &::before {
+        mask-size: 65%;
+    }
 }
 
 .mx_E2EIcon_warning::after {
-    background-image: url('$(res)/img/e2e/warning.svg');
+    mask-image: url('$(res)/img/e2e/warning.svg');
+    background-color: $notice-primary-color;
 }
 
 .mx_E2EIcon_normal::after {
-    background-image: url('$(res)/img/e2e/normal.svg');
+    mask-image: url('$(res)/img/e2e/normal.svg');
+    background-color: $composer-e2e-icon-color;
 }
 
 .mx_E2EIcon_verified::after {
-    background-image: url('$(res)/img/e2e/verified.svg');
+    mask-image: url('$(res)/img/e2e/verified.svg');
+    background-color: $accent-color;
 }
diff --git a/res/css/views/rooms/_EntityTile.scss b/res/css/views/rooms/_EntityTile.scss
index 8db71f297c..27a4e67089 100644
--- a/res/css/views/rooms/_EntityTile.scss
+++ b/res/css/views/rooms/_EntityTile.scss
@@ -26,8 +26,6 @@ limitations under the License.
         position: absolute;
         bottom: 2px;
         right: 7px;
-        height: 15px;
-        width: 15px;
     }
 }
 
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 99377ee5be..eb0e1dd7b0 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -15,6 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+$left-gutter: 64px;
+
 .mx_EventTile {
     max-width: 100%;
     clear: both;
@@ -37,7 +39,6 @@ limitations under the License.
 }
 
 .mx_EventTile_avatar {
-    position: absolute;
     top: 14px;
     left: 8px;
     cursor: pointer;
@@ -46,7 +47,7 @@ limitations under the License.
 
 .mx_EventTile.mx_EventTile_info .mx_EventTile_avatar {
     top: $font-8px;
-    left: 65px;
+    left: $left-gutter;
 }
 
 .mx_EventTile_continuation {
@@ -68,15 +69,13 @@ limitations under the License.
     display: inline-block; /* anti-zalgo, with overflow hidden */
     overflow: hidden;
     cursor: pointer;
-    padding-left: 65px; /* left gutter */
     padding-bottom: 0px;
     padding-top: 0px;
     margin: 0px;
-    line-height: $font-17px;
     /* the next three lines, along with overflow hidden, truncate long display names */
     white-space: nowrap;
     text-overflow: ellipsis;
-    max-width: calc(100% - 65px);
+    max-width: calc(100% - $left-gutter);
 }
 
 .mx_EventTile .mx_SenderProfile .mx_Flair {
@@ -104,9 +103,7 @@ limitations under the License.
     visibility: hidden;
     white-space: nowrap;
     left: 0px;
-    width: 46px; /* 8 + 30 (avatar) + 8 */
     text-align: center;
-    position: absolute;
     user-select: none;
 }
 
@@ -116,17 +113,14 @@ limitations under the License.
 
 .mx_EventTile_line, .mx_EventTile_reply {
     position: relative;
-    padding-left: 65px; /* left gutter */
-    padding-top: 3px;
-    padding-bottom: 3px;
+    padding-left: $left-gutter;
     border-radius: 4px;
-    line-height: $font-22px;
 }
 
 .mx_RoomView_timeline_rr_enabled,
 // on ELS we need the margin to allow interaction with the expand/collapse button which is normally in the RR gutter
 .mx_EventListSummary {
-    .mx_EventTile_line, .mx_EventTile_reply {
+    .mx_EventTile_line {
         /* ideally should be 100px, but 95px gives us a max thumbnail size of 800x600, which is nice */
         margin-right: 110px;
     }
@@ -151,10 +145,6 @@ limitations under the License.
     margin-right: 10px;
 }
 
-.mx_EventTile_info .mx_EventTile_line {
-    padding-left: 83px;
-}
-
 /* HACK to override line-height which is already marked important elsewhere */
 .mx_EventTile_bigEmoji.mx_EventTile_bigEmoji {
     font-size: 48px !important;
@@ -171,10 +161,15 @@ limitations under the License.
 }
 
 // Explicit relationships so that it doesn't apply to nested EventTile components (e.g in Replies)
+// The first set is to handle the 'group layout' (default) and the second for the IRC layout
 .mx_EventTile_last > div > a > .mx_MessageTimestamp,
 .mx_EventTile:hover > div > a > .mx_MessageTimestamp,
 .mx_EventTile.mx_EventTile_actionBarFocused > div > a > .mx_MessageTimestamp,
-.mx_EventTile.focus-visible:focus-within > div > a > .mx_MessageTimestamp {
+.mx_EventTile.focus-visible:focus-within > div > a > .mx_MessageTimestamp,
+.mx_IRCLayout .mx_EventTile_last > a > .mx_MessageTimestamp,
+.mx_IRCLayout .mx_EventTile:hover > a > .mx_MessageTimestamp,
+.mx_IRCLayout .mx_EventTile.mx_EventTile_actionBarFocused > a > .mx_MessageTimestamp,
+.mx_IRCLayout .mx_EventTile.focus-visible:focus-within > a > .mx_MessageTimestamp {
     visibility: visible;
 }
 
@@ -189,7 +184,7 @@ limitations under the License.
  * TODO: ultimately we probably want some transition on here.
  */
 .mx_EventTile_selected > .mx_EventTile_line {
-    border-left: $accent-color 5px solid;
+    border-left: $accent-color 4px solid;
     padding-left: 60px;
     background-color: $event-selected-color;
 }
@@ -244,34 +239,6 @@ limitations under the License.
     color: $event-notsent-color;
 }
 
-.mx_EventTile_redacted .mx_EventTile_line .mx_UnknownBody,
-.mx_EventTile_redacted .mx_EventTile_reply .mx_UnknownBody {
-    --lozenge-color: $event-redacted-fg-color;
-    --lozenge-border-color: $event-redacted-border-color;
-    display: block;
-    height: 22px;
-    width: 250px;
-    border-radius: 11px;
-    background:
-        repeating-linear-gradient(
-            -45deg,
-            var(--lozenge-color),
-            var(--lozenge-color) 3px,
-            transparent 3px,
-            transparent 6px
-        );
-    box-shadow: 0px 0px 3px var(--lozenge-border-color) inset;
-}
-
-.mx_EventTile_sending.mx_EventTile_redacted .mx_UnknownBody {
-    opacity: 0.4;
-}
-
-div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
-    --lozenge-color: $event-notsent-color;
-    --lozenge-border-color: $event-notsent-color;
-}
-
 .mx_EventTile_contextual {
     opacity: 0.4;
 }
@@ -363,29 +330,67 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
 .mx_EventTile_e2eIcon {
     position: absolute;
     top: 6px;
-    left: 46px;
-    width: 15px;
-    height: 15px;
+    left: 44px;
+    width: 14px;
+    height: 14px;
     display: block;
     bottom: 0;
     right: 0;
     opacity: 0.2;
     background-repeat: no-repeat;
     background-size: contain;
+
+    &::before, &::after {
+        content: "";
+        display: block;
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        mask-repeat: no-repeat;
+        mask-position: center;
+        mask-size: contain;
+    }
+
+    &::before {
+        background-color: #ffffff;
+        mask-image: url('$(res)/img/e2e/normal.svg');
+        mask-repeat: no-repeat;
+        mask-position: center;
+        mask-size: 90%;
+    }
 }
 
 .mx_EventTile_e2eIcon_undecryptable, .mx_EventTile_e2eIcon_unverified {
-    background-image: url('$(res)/img/e2e/warning.svg');
+    &::after {
+        mask-image: url('$(res)/img/e2e/warning.svg');
+        background-color: $notice-primary-color;
+    }
     opacity: 1;
 }
 
 .mx_EventTile_e2eIcon_unknown {
-    background-image: url('$(res)/img/e2e/warning.svg');
+    &::after {
+        mask-image: url('$(res)/img/e2e/warning.svg');
+        background-color: $notice-primary-color;
+    }
     opacity: 1;
 }
 
 .mx_EventTile_e2eIcon_unencrypted {
-    background-image: url('$(res)/img/e2e/warning.svg');
+    &::after {
+        mask-image: url('$(res)/img/e2e/warning.svg');
+        background-color: $notice-primary-color;
+    }
+    opacity: 1;
+}
+
+.mx_EventTile_e2eIcon_unauthenticated {
+    &::after {
+        mask-image: url('$(res)/img/e2e/normal.svg');
+        background-color: $composer-e2e-icon-color;
+    }
     opacity: 1;
 }
 
@@ -427,10 +432,6 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
     margin-bottom: 0px;
 }
 
-.mx_EventTile_12hr .mx_EventTile_e2eIcon {
-    padding-left: 5px;
-}
-
 .mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_line,
 .mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_line,
 .mx_EventTile:hover.mx_EventTile_unknown .mx_EventTile_line {
@@ -438,15 +439,15 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
 }
 
 .mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_line {
-    border-left: $e2e-verified-color 5px solid;
+    border-left: $e2e-verified-color 4px solid;
 }
 
 .mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_line {
-    border-left: $e2e-unverified-color 5px solid;
+    border-left: $e2e-unverified-color 4px solid;
 }
 
 .mx_EventTile:hover.mx_EventTile_unknown .mx_EventTile_line {
-    border-left: $e2e-unknown-color 5px solid;
+    border-left: $e2e-unknown-color 4px solid;
 }
 
 .mx_EventTile:hover.mx_EventTile_verified.mx_EventTile_info .mx_EventTile_line,
@@ -539,7 +540,8 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
     right: 6px;
     width: 19px;
     height: 19px;
-    background-image: url($copy-button-url);
+    mask-image: url($copy-button-url);
+    background-color: $message-action-bar-fg-color;
 }
 
 .mx_EventTile_body .mx_EventTile_pre_container:focus-within .mx_EventTile_copyButton,
@@ -567,7 +569,6 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
 
 .mx_EventTile_content .markdown-body a {
     color: $accent-color-alt;
-    text-decoration: underline;
 }
 
 .mx_EventTile_content .markdown-body .hljs {
@@ -588,84 +589,6 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
 
 /* end of overrides */
 
-.mx_MatrixChat_useCompactLayout {
-    .mx_EventTile {
-        padding-top: 4px;
-    }
-
-    .mx_EventTile.mx_EventTile_info {
-        // same as the padding for non-compact .mx_EventTile.mx_EventTile_info
-        padding-top: 0px;
-        font-size: $font-13px;
-        .mx_EventTile_line, .mx_EventTile_reply {
-            line-height: $font-20px;
-        }
-        .mx_EventTile_avatar {
-            top: 4px;
-        }
-    }
-
-    .mx_EventTile .mx_SenderProfile {
-        font-size: $font-13px;
-    }
-
-    .mx_EventTile.mx_EventTile_emote {
-        // add a bit more space for emotes so that avatars don't collide
-        padding-top: 8px;
-        .mx_EventTile_avatar {
-            top: 2px;
-        }
-        .mx_EventTile_line, .mx_EventTile_reply {
-            padding-top: 0px;
-            padding-bottom: 1px;
-        }
-    }
-
-    .mx_EventTile.mx_EventTile_emote.mx_EventTile_continuation {
-        padding-top: 0;
-        .mx_EventTile_line, .mx_EventTile_reply {
-            padding-top: 0px;
-            padding-bottom: 0px;
-        }
-    }
-
-    .mx_EventTile_line, .mx_EventTile_reply {
-        padding-top: 0px;
-        padding-bottom: 0px;
-    }
-
-    .mx_EventTile_avatar {
-        top: 2px;
-    }
-
-    .mx_EventTile_e2eIcon {
-        top: 3px;
-    }
-
-    .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;
-    }
-
-    .mx_RoomView_MessageList h2 {
-        margin-top: 6px;
-    }
-
-    .mx_EventTile_content .markdown-body {
-        p, ul, ol, dl, blockquote, pre, table {
-            margin-bottom: 4px; // 1/4 of the non-compact margin-bottom
-        }
-    }
-}
-
 .mx_EventTile_tileError {
     color: red;
     text-align: center;
@@ -685,3 +608,14 @@ div.mx_EventTile_notSent.mx_EventTile_redacted .mx_UnknownBody {
         margin-left: 1em;
     }
 }
+
+@media only screen and (max-width: 480px) {
+    .mx_EventTile_line, .mx_EventTile_reply {
+        padding-left: 0;
+        margin-right: 0;
+    }
+    .mx_EventTile_content {
+        margin-top: 10px;
+        margin-right: 0;
+    }
+}
diff --git a/res/css/views/rooms/_GroupLayout.scss b/res/css/views/rooms/_GroupLayout.scss
new file mode 100644
index 0000000000..2b447be44a
--- /dev/null
+++ b/res/css/views/rooms/_GroupLayout.scss
@@ -0,0 +1,130 @@
+/*
+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.
+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.
+*/
+
+$left-gutter: 64px;
+
+.mx_GroupLayout {
+    .mx_EventTile {
+        > .mx_SenderProfile {
+            line-height: $font-17px;
+            padding-left: $left-gutter;
+        }
+
+        > .mx_EventTile_line {
+            padding-left: $left-gutter;
+        }
+
+        > .mx_EventTile_avatar {
+            position: absolute;
+        }
+
+        .mx_MessageTimestamp {
+            position: absolute;
+            width: 46px; /* 8 + 30 (avatar) + 8 */
+        }
+
+        .mx_EventTile_line, .mx_EventTile_reply {
+            padding-top: 3px;
+            padding-bottom: 3px;
+            line-height: $font-22px;
+        }
+    }
+
+    .mx_EventTile_info .mx_EventTile_line {
+        padding-left: calc($left-gutter + 18px);
+    }
+}
+
+/* Compact layout overrides */
+
+.mx_MatrixChat_useCompactLayout {
+    .mx_EventTile {
+        padding-top: 4px;
+
+        .mx_EventTile_line, .mx_EventTile_reply {
+            padding-top: 0;
+            padding-bottom: 0;
+        }
+
+        &.mx_EventTile_info {
+            // same as the padding for non-compact .mx_EventTile.mx_EventTile_info
+            padding-top: 0px;
+            font-size: $font-13px;
+            .mx_EventTile_line, .mx_EventTile_reply {
+                line-height: $font-20px;
+            }
+            .mx_EventTile_avatar {
+                top: 4px;
+            }
+        }
+
+        .mx_SenderProfile {
+            font-size: $font-13px;
+        }
+
+        &.mx_EventTile_emote {
+            // add a bit more space for emotes so that avatars don't collide
+            padding-top: 8px;
+            .mx_EventTile_avatar {
+                top: 2px;
+            }
+            .mx_EventTile_line, .mx_EventTile_reply {
+                padding-top: 0px;
+                padding-bottom: 1px;
+            }
+        }
+
+        &.mx_EventTile_emote.mx_EventTile_continuation {
+            padding-top: 0;
+            .mx_EventTile_line, .mx_EventTile_reply {
+                padding-top: 0px;
+                padding-bottom: 0px;
+            }
+        }
+
+        .mx_EventTile_avatar {
+            top: 2px;
+        }
+
+        .mx_EventTile_e2eIcon {
+            top: 3px;
+        }
+
+        .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;
+        }
+
+        .mx_EventTile_content .markdown-body {
+            p, ul, ol, dl, blockquote, pre, table {
+                margin-bottom: 4px; // 1/4 of the non-compact margin-bottom
+            }
+        }
+    }
+
+    .mx_RoomView_MessageList h2 {
+        margin-top: 6px;
+    }
+}
diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
new file mode 100644
index 0000000000..958d718b11
--- /dev/null
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -0,0 +1,225 @@
+/*
+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.
+*/
+
+$icon-width: 14px;
+$timestamp-width: 45px;
+$right-padding: 5px;
+$irc-line-height: $font-18px;
+
+.mx_IRCLayout {
+    --name-width: 70px;
+
+    line-height: $irc-line-height !important;
+
+    .mx_EventTile {
+
+        // timestamps are links which shouldn't be underlined
+        > a {
+            text-decoration: none;
+        }
+
+        display: flex;
+        flex-direction: row;
+        align-items: flex-start;
+        padding-top: 0;
+
+        > * {
+            margin-right: $right-padding;
+        }
+
+        > .mx_EventTile_msgOption {
+            order: 5;
+            flex-shrink: 0;
+
+            .mx_EventTile_readAvatars {
+                top: 0.2rem; // ($irc-line-height - avatar height) / 2
+            }
+        }
+
+        > .mx_SenderProfile {
+            order: 2;
+            flex-shrink: 0;
+            width: var(--name-width);
+            text-overflow: ellipsis;
+            text-align: left;
+            display: flex;
+            align-items: center;
+            overflow: visible;
+            justify-content: flex-end;
+        }
+
+        .mx_EventTile_line, .mx_EventTile_reply {
+            padding: 0;
+            display: flex;
+            flex-direction: column;
+            order: 3;
+            flex-grow: 1;
+            flex-shrink: 1;
+            min-width: 0;
+        }
+
+        > .mx_EventTile_avatar {
+            order: 1;
+            position: relative;
+            top: 0;
+            left: 0;
+            flex-shrink: 0;
+            height: $irc-line-height;
+            display: flex;
+            align-items: center;
+
+            // Need to use important to override the js provided height and width values.
+            > .mx_BaseAvatar, > .mx_BaseAvatar > * {
+                height: $font-14px !important;
+                width: $font-14px !important;
+                font-size: $font-10px !important;
+                line-height: $font-15px !important;
+            }
+        }
+
+        .mx_MessageTimestamp {
+            font-size: $font-10px;
+            width: $timestamp-width;
+            text-align: right;
+        }
+
+        > .mx_EventTile_e2eIcon {
+            position: absolute;
+            right: unset;
+            left: unset;
+            top: 0;
+
+            padding: 0;
+
+            flex-shrink: 0;
+            flex-grow: 0;
+
+            height: $font-18px;
+
+            background-position: center;
+        }
+
+        .mx_EventTile_line {
+            .mx_EventTile_e2eIcon,
+            .mx_TextualEvent,
+            .mx_MTextBody,
+            .mx_ReplyThread_wrapper_empty {
+                display: inline-block;
+            }
+        }
+
+        .mx_EventTile_reply {
+            order: 4;
+        }
+
+        .mx_EditMessageComposer_buttons {
+            position: relative;
+        }
+    }
+
+    .mx_EventTile_emote {
+        > .mx_EventTile_avatar {
+            margin-left: calc(var(--name-width) + $icon-width + $right-padding);
+        }
+    }
+
+    blockquote {
+        margin: 0;
+    }
+
+    .mx_EventListSummary {
+        > .mx_EventTile_line {
+            padding-left: calc(var(--name-width) + $icon-width + $timestamp-width + 3 * $right-padding); // 15 px of padding
+        }
+
+        .mx_EventListSummary_avatars {
+            padding: 0;
+            margin: 0 9px 0 0;
+        }
+    }
+
+    .mx_EventTile.mx_EventTile_info {
+        .mx_EventTile_avatar {
+            left: calc(var(--name-width) + 10px + $icon-width);
+            top: 0;
+        }
+
+        .mx_EventTile_line {
+            left: calc(var(--name-width) + 10px + $icon-width);
+        }
+
+        .mx_TextualEvent {
+            line-height: $irc-line-height;
+        }
+    }
+
+    // Suppress highlight thing from the normal Layout.
+    .mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_line,
+    .mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_line,
+    .mx_EventTile:hover.mx_EventTile_unknown .mx_EventTile_line {
+        padding-left: 0;
+        border-left: 0;
+    }
+
+    .mx_SenderProfile_hover {
+        background-color: $primary-bg-color;
+        overflow: hidden;
+
+        > span {
+            display: flex;
+
+            > .mx_SenderProfile_name,
+            > .mx_SenderProfile_aux {
+                overflow: hidden;
+                text-overflow: ellipsis;
+                min-width: var(--name-width);
+            }
+        }
+    }
+
+    .mx_SenderProfile:hover {
+        justify-content: flex-start;
+    }
+
+    .mx_SenderProfile_hover:hover {
+        overflow: visible;
+        width: max(auto, 100%);
+        z-index: 10;
+    }
+
+    .mx_ReplyThread {
+        margin: 0;
+        .mx_SenderProfile {
+            width: unset;
+            max-width: var(--name-width);
+        }
+    }
+
+    .mx_ProfileResizer {
+        position: absolute;
+        height: 100%;
+        width: 15px;
+        left: calc(80px + var(--name-width));
+        cursor: col-resize;
+        z-index: 100;
+    }
+
+    // Need to use important to override the js provided height and width values.
+    .mx_Flair > img {
+        height: $font-14px !important;
+        width: $font-14px !important;
+    }
+}
diff --git a/res/css/views/rooms/_InviteOnlyIcon.scss b/res/css/views/rooms/_InviteOnlyIcon.scss
deleted file mode 100644
index b71fd6348d..0000000000
--- a/res/css/views/rooms/_InviteOnlyIcon.scss
+++ /dev/null
@@ -1,58 +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.
-*/
-
-@define-mixin mx_InviteOnlyIcon {
-    width: 12px;
-    height: 12px;
-    position: relative;
-    display: block !important;
-}
-
-@define-mixin mx_InviteOnlyIcon_padlock {
-    background-color: $roomtile-name-color;
-    mask-image: url("$(res)/img/feather-customised/lock-solid.svg");
-    mask-position: center;
-    mask-repeat: no-repeat;
-    mask-size: contain;
-    content: "";
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-}
-
-.mx_InviteOnlyIcon_large {
-    @mixin mx_InviteOnlyIcon;
-    margin: 0 4px;
-
-    &::before {
-        @mixin mx_InviteOnlyIcon_padlock;
-        width: 12px;
-        height: 12px;
-    }
-}
-
-.mx_InviteOnlyIcon_small {
-    @mixin mx_InviteOnlyIcon;
-    left: -2px;
-
-    &::before {
-        @mixin mx_InviteOnlyIcon_padlock;
-        width: 10px;
-        height: 10px;
-    }
-}
diff --git a/res/css/views/rooms/_JumpToBottomButton.scss b/res/css/views/rooms/_JumpToBottomButton.scss
index 63cf574596..6cb3b6bce9 100644
--- a/res/css/views/rooms/_JumpToBottomButton.scss
+++ b/res/css/views/rooms/_JumpToBottomButton.scss
@@ -41,6 +41,11 @@ limitations under the License.
     // with text-align in parent
     display: inline-block;
     padding: 0 4px;
+    color: $accent-fg-color;
+    background-color: $muted-fg-color;
+}
+
+.mx_JumpToBottomButton_highlight .mx_JumpToBottomButton_badge {
     color: $secondary-accent-color;
     background-color: $warning-color;
 }
@@ -51,7 +56,7 @@ limitations under the License.
     border-radius: 19px;
     box-sizing: border-box;
     background: $primary-bg-color;
-    border: 1.3px solid $roomtile-name-color;
+    border: 1.3px solid $muted-fg-color;
     cursor: pointer;
 }
 
@@ -62,8 +67,8 @@ limitations under the License.
     bottom: 0;
     left: 0;
     right: 0;
-    mask: url('$(res)/img/icon-jump-to-bottom.svg');
+    mask-image: url('$(res)/img/feather-customised/chevron-down-thin.svg');
     mask-repeat: no-repeat;
-    mask-position: 9px 14px;
-    background: $roomtile-name-color;
+    mask-size: contain;
+    background: $muted-fg-color;
 }
diff --git a/res/css/views/rooms/_MemberDeviceInfo.scss b/res/css/views/rooms/_MemberDeviceInfo.scss
deleted file mode 100644
index 71b05a93fc..0000000000
--- a/res/css/views/rooms/_MemberDeviceInfo.scss
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-Copyright 2016 OpenMarket Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-.mx_MemberDeviceInfo {
-    display: flex;
-    padding-bottom: 10px;
-    align-items: flex-start;
-}
-
-.mx_MemberDeviceInfo_icon {
-    margin-top: 4px;
-    width: 12px;
-    height: 12px;
-    mask-repeat: no-repeat;
-    mask-size: 100%;
-}
-.mx_MemberDeviceInfo_icon_blacklisted {
-    mask-image: url('$(res)/img/e2e/blacklisted.svg');
-    background-color: $warning-color;
-}
-.mx_MemberDeviceInfo_icon_verified {
-    mask-image: url('$(res)/img/e2e/verified.svg');
-    background-color: $accent-color;
-}
-.mx_MemberDeviceInfo_icon_unverified {
-    mask-image: url('$(res)/img/e2e/warning.svg');
-    background-color: $warning-color;
-}
-
-.mx_MemberDeviceInfo > .mx_DeviceVerifyButtons {
-    display: flex;
-    flex-direction: column;
-    flex: 0 1 auto;
-    align-items: stretch;
-}
-
-.mx_MemberDeviceInfo_textButton {
-    @mixin mx_DialogButton_small;
-    margin: 2px;
-    flex: 1;
-}
-
-.mx_MemberDeviceInfo_textButton:hover {
-    @mixin mx_DialogButton_hover;
-}
-
-.mx_MemberDeviceInfo_deviceId {
-    word-break: break-word;
-    font-size: $font-13px;
-}
-
-.mx_MemberDeviceInfo_deviceInfo {
-    margin: 0 5px 5px 8px;
-    flex: 1;
-}
-
-/* "Unblacklist" is too long for a regular button: make it wider and
-   reduce the padding. */
-.mx_EncryptedEventDialog .mx_MemberDeviceInfo_blacklist,
-.mx_EncryptedEventDialog .mx_MemberDeviceInfo_unblacklist {
-    padding-left: 1em;
-    padding-right: 1em;
-}
-
-.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_verified,
-.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_unverified,
-.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_blacklisted {
-    float: right;
-    padding-left: 1em;
-}
-
-.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_verified {
-    color: $e2e-verified-color;
-}
-
-.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_unverified {
-    color: $e2e-unverified-color;
-}
-
-.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_blacklisted {
-    color: $e2e-warning-color;
-}
diff --git a/res/css/views/rooms/_MemberList.scss b/res/css/views/rooms/_MemberList.scss
index 99dc2338d4..90667d41b4 100644
--- a/res/css/views/rooms/_MemberList.scss
+++ b/res/css/views/rooms/_MemberList.scss
@@ -26,6 +26,10 @@ limitations under the License.
         flex: 1 0 auto;
     }
 
+    .mx_SearchBox {
+        margin-bottom: 5px;
+    }
+
     h2 {
         text-transform: uppercase;
         color: $h3-color;
@@ -59,32 +63,27 @@ limitations under the License.
 .mx_GroupMemberList_query,
 .mx_GroupRoomList_query {
     flex: 1 1 0;
+
+    // stricter rule to override the one in _common.scss
+    &[type="text"] {
+        font-size: $font-12px;
+    }
 }
 
-
-
 .mx_MemberList_wrapper {
     padding: 10px;
 }
 
-
-.mx_MemberList_invite,
-.mx_RightPanel_invite {
+.mx_MemberList_invite {
     flex: 0 0 auto;
     position: relative;
     background-color: $button-bg-color;
     border-radius: 4px;
-    padding: 8px;
-    margin: 9px;
+    margin: 5px 9px 9px;
     display: flex;
     justify-content: center;
     color: $button-fg-color;
     font-weight: 600;
-
-    .mx_RightPanel_icon {
-        padding-right: 5px;
-        padding-top: 2px;
-    }
 }
 
 .mx_MemberList_invite.mx_AccessibleButton_disabled {
@@ -93,8 +92,17 @@ limitations under the License.
 }
 
 .mx_MemberList_invite span {
-    background-image: url('$(res)/img/feather-customised/user-add.svg');
+    background-image: url('$(res)/img/element-icons/room/invite.svg');
     background-repeat: no-repeat;
     background-position: center left;
-    padding-left: 25px;
+    background-size: 20px;
+    padding: 8px 0 8px 25px;
+}
+
+.mx_MemberList_inviteCommunity span {
+    background-image: url('$(res)/img/icon-invite-people.svg');
+}
+
+.mx_MemberList_addRoomToCommunity span {
+    background-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 7b223be3a4..a403a8dc4c 100644
--- a/res/css/views/rooms/_MessageComposer.scss
+++ b/res/css/views/rooms/_MessageComposer.scss
@@ -20,7 +20,8 @@ limitations under the License.
     margin: auto;
     border-top: 1px solid $primary-hairline-color;
     position: relative;
-    padding-left: 84px;
+    padding-left: 82px;
+    padding-right: 6px;
 }
 
 .mx_MessageComposer_replaced_wrapper {
@@ -60,7 +61,7 @@ limitations under the License.
 
 .mx_MessageComposer .mx_MessageComposer_avatar {
     position: absolute;
-    left: 27px;
+    left: 26px;
 }
 
 .mx_MessageComposer .mx_MessageComposer_avatar .mx_BaseAvatar {
@@ -76,8 +77,8 @@ limitations under the License.
     left: 60px;
     margin-right: 0; // Counteract the E2EIcon class
     margin-left: 3px; // Counteract the E2EIcon class
-    width: 15px;
-    height: 15px;
+    width: 12px;
+    height: 12px;
 }
 
 .mx_MessageComposer_noperm_error {
@@ -178,44 +179,72 @@ limitations under the License.
     color: $accent-color;
 }
 
+.mx_MessageComposer_button_highlight {
+    background: rgba($accent-color, 0.25);
+    // make the icon the accent color too
+    &::before {
+        background-color: $accent-color !important;
+    }
+}
+
 .mx_MessageComposer_button {
     position: relative;
-    margin-right: 12px;
+    margin-right: 6px;
     cursor: pointer;
-    height: 20px;
-    width: 20px;
+    height: 26px;
+    width: 26px;
+    border-radius: 100%;
 
     &::before {
         content: '';
         position: absolute;
 
+        top: 3px;
+        left: 3px;
         height: 20px;
         width: 20px;
-        background-color: $composer-button-color;
+        background-color: $icon-button-color;
         mask-repeat: no-repeat;
         mask-size: contain;
         mask-position: center;
     }
+
+    &:hover {
+        background: rgba($accent-color, 0.1);
+
+        &::before {
+            background-color: $accent-color;
+        }
+    }
+
+    &.mx_MessageComposer_hangup::before {
+        background-color: $warning-color;
+    }
 }
 
+
 .mx_MessageComposer_upload::before {
-    mask-image: url('$(res)/img/feather-customised/paperclip.svg');
+    mask-image: url('$(res)/img/element-icons/room/composer/attach.svg');
 }
 
 .mx_MessageComposer_hangup::before {
-    mask-image: url('$(res)/img/hangup.svg');
+    mask-image: url('$(res)/img/element-icons/call/hangup.svg');
 }
 
 .mx_MessageComposer_voicecall::before {
-    mask-image: url('$(res)/img/feather-customised/phone.svg');
+    mask-image: url('$(res)/img/element-icons/call/voice-call.svg');
 }
 
 .mx_MessageComposer_videocall::before {
-    mask-image: url('$(res)/img/feather-customised/video.svg');
+    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');
 }
 
 .mx_MessageComposer_stickers::before {
-    mask-image: url('$(res)/img/feather-customised/face.svg');
+    mask-image: url('$(res)/img/element-icons/room/composer/sticker.svg');
 }
 
 .mx_MessageComposer_formatting {
@@ -279,7 +308,7 @@ limitations under the License.
     mask-size: contain;
     mask-position: center;
     mask-repeat: no-repeat;
-    background-color: $composer-button-color;
+    background-color: $icon-button-color;
 
     &.mx_MessageComposer_markdownDisabled {
         opacity: 0.2;
diff --git a/res/css/views/rooms/_MessageComposerFormatBar.scss b/res/css/views/rooms/_MessageComposerFormatBar.scss
index 27ee7b9795..d97c49630a 100644
--- a/res/css/views/rooms/_MessageComposerFormatBar.scss
+++ b/res/css/views/rooms/_MessageComposerFormatBar.scss
@@ -75,23 +75,23 @@ limitations under the License.
     }
 
     .mx_MessageComposerFormatBar_buttonIconBold::after {
-        mask-image: url('$(res)/img/format/bold.svg');
+        mask-image: url('$(res)/img/element-icons/room/format-bar/bold.svg');
     }
 
     .mx_MessageComposerFormatBar_buttonIconItalic::after {
-        mask-image: url('$(res)/img/format/italics.svg');
+        mask-image: url('$(res)/img/element-icons/room/format-bar/italic.svg');
     }
 
     .mx_MessageComposerFormatBar_buttonIconStrikethrough::after {
-        mask-image: url('$(res)/img/format/strikethrough.svg');
+        mask-image: url('$(res)/img/element-icons/room/format-bar/strikethrough.svg');
     }
 
     .mx_MessageComposerFormatBar_buttonIconQuote::after {
-        mask-image: url('$(res)/img/format/quote.svg');
+        mask-image: url('$(res)/img/element-icons/room/format-bar/quote.svg');
     }
 
     .mx_MessageComposerFormatBar_buttonIconCode::after {
-        mask-image: url('$(res)/img/format/code.svg');
+        mask-image: url('$(res)/img/element-icons/room/format-bar/code.svg');
     }
 }
 
diff --git a/res/css/views/rooms/_NotificationBadge.scss b/res/css/views/rooms/_NotificationBadge.scss
new file mode 100644
index 0000000000..64b2623238
--- /dev/null
+++ b/res/css/views/rooms/_NotificationBadge.scss
@@ -0,0 +1,72 @@
+/*
+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_NotificationBadge {
+    &:not(.mx_NotificationBadge_visible) {
+        display: none;
+    }
+
+    // Badges are structured a bit weirdly to work around issues with non-monospace
+    // font styles. The badge pill is actually a background div and the count floats
+    // within that. For example:
+    //
+    //  ( 99+ ) <-- Rounded pill is a _bg class.
+    //     ^- The count is an element floating within that.
+
+    &.mx_NotificationBadge_visible {
+        background-color: $roomtile-default-badge-bg-color;
+
+        // Create a flexbox to order the count a bit easier
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        &.mx_NotificationBadge_highlighted {
+            // TODO: Use a more specific variable
+            background-color: $warning-color;
+        }
+
+        // These are the 3 background types
+
+        &.mx_NotificationBadge_dot {
+            background-color: $primary-fg-color; // increased visibility
+
+            width: 6px;
+            height: 6px;
+            border-radius: 6px;
+        }
+
+        &.mx_NotificationBadge_2char {
+            width: $font-16px;
+            height: $font-16px;
+            border-radius: $font-16px;
+        }
+
+        &.mx_NotificationBadge_3char {
+            width: $font-26px;
+            height: $font-16px;
+            border-radius: $font-16px;
+        }
+
+        // The following is the floating badge
+
+        .mx_NotificationBadge_count {
+            font-size: $font-10px;
+            line-height: $font-14px;
+            color: #fff; // TODO: Variable
+        }
+    }
+}
diff --git a/res/css/views/rooms/_ReplyPreview.scss b/res/css/views/rooms/_ReplyPreview.scss
index 4dc4cb2c40..10f8e21e43 100644
--- a/res/css/views/rooms/_ReplyPreview.scss
+++ b/res/css/views/rooms/_ReplyPreview.scss
@@ -15,16 +15,13 @@ limitations under the License.
 */
 
 .mx_ReplyPreview {
-    position: absolute;
-    bottom: 0;
-    z-index: 1000;
-    width: 100%;
     border: 1px solid $primary-hairline-color;
     background: $primary-bg-color;
     border-bottom: none;
-    border-radius: 4px 4px 0 0;
+    border-radius: 8px 8px 0 0;
     max-height: 50vh;
     overflow: auto;
+    box-shadow: 0px -16px 32px $composer-shadow-color;
 }
 
 .mx_ReplyPreview_section {
diff --git a/res/css/views/rooms/_RoomBreadcrumbs.scss b/res/css/views/rooms/_RoomBreadcrumbs.scss
index 3858d836e6..6512797401 100644
--- a/res/css/views/rooms/_RoomBreadcrumbs.scss
+++ b/res/css/views/rooms/_RoomBreadcrumbs.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,98 +15,42 @@ limitations under the License.
 */
 
 .mx_RoomBreadcrumbs {
-    position: relative;
-    height: 42px;
-    padding: 8px;
-    padding-bottom: 0;
+    width: 100%;
+
+    // Create a flexbox for the crumbs
     display: flex;
     flex-direction: row;
-
-    // repeating circles as empty placeholders
-    background:
-        radial-gradient(
-            circle at center,
-            $breadcrumb-placeholder-bg-color,
-            $breadcrumb-placeholder-bg-color 15px,
-            transparent 16px
-        );
-    background-size: 36px;
-    background-position: 6px -1px;
-    background-repeat: repeat-x;
-
-
-    // Autohide the scrollbar
-    overflow-x: hidden;
-    &:hover {
-        overflow-x: visible;
-    }
-
-    .mx_AutoHideScrollbar {
-        display: flex;
-        flex-direction: row;
-        height: 100%;
-    }
+    align-items: flex-start;
 
     .mx_RoomBreadcrumbs_crumb {
-        margin-left: 4px;
-        height: 32px;
-        display: inline-block;
-        transition: transform 0.3s, width 0.3s;
-        position: relative;
-
-        .mx_RoomTile_badge {
-            position: absolute;
-            top: -3px;
-            right: -4px;
-        }
-
-        .mx_RoomBreadcrumbs_dmIndicator {
-            position: absolute;
-            bottom: 0;
-            right: -4px;
-        }
-    }
-
-    .mx_RoomBreadcrumbs_animate {
-        margin-left: 0;
+        margin-right: 8px;
         width: 32px;
-        transform: scale(1);
     }
 
-    .mx_RoomBreadcrumbs_preAnimate {
-        width: 0;
-        transform: scale(0);
+    // These classes come from the CSSTransition component. There's many more classes we
+    // could care about, but this is all we worried about for now. The animation works by
+    // first triggering the enter state with the newest breadcrumb off screen (-40px) then
+    // sliding it into view.
+    &.mx_RoomBreadcrumbs-enter {
+        margin-left: -40px; // 32px for the avatar, 8px for the margin
+    }
+    &.mx_RoomBreadcrumbs-enter-active {
+        margin-left: 0;
+
+        // Timing function is as-requested by design.
+        // NOTE: The transition time MUST match the value passed to CSSTransition!
+        transition: margin-left 640ms cubic-bezier(0.66, 0.02, 0.36, 1);
     }
 
-    .mx_RoomBreadcrumbs_left {
-        opacity: 0.5;
-    }
-
-    // Note: we have to manually control the gradient and stuff, but the IndicatorScrollbar
-    // will deal with left/right positioning for us. Normally we'd use position:sticky on
-    // a few key elements, however that doesn't work in horizontal scrolling scenarios.
-
-    .mx_IndicatorScrollbar_leftOverflowIndicator,
-    .mx_IndicatorScrollbar_rightOverflowIndicator {
-        display: none;
-    }
-
-    .mx_IndicatorScrollbar_leftOverflowIndicator {
-        background: linear-gradient(to left, $panel-gradient);
-    }
-
-    .mx_IndicatorScrollbar_rightOverflowIndicator {
-        background: linear-gradient(to right, $panel-gradient);
-    }
-
-    &.mx_IndicatorScrollbar_leftOverflow .mx_IndicatorScrollbar_leftOverflowIndicator,
-    &.mx_IndicatorScrollbar_rightOverflow .mx_IndicatorScrollbar_rightOverflowIndicator {
-        position: absolute;
-        top: 0;
-        bottom: 0;
-        width: 15px;
-        display: block;
-        pointer-events: none;
-        z-index: 100;
+    .mx_RoomBreadcrumbs_placeholder {
+        font-weight: 600;
+        font-size: $font-14px;
+        line-height: 32px; // specifically to match the height this is not scaled
+        height: 32px;
     }
 }
+
+.mx_RoomBreadcrumbs_Tooltip {
+    margin-left: -42px;
+    margin-top: -42px;
+}
diff --git a/res/css/views/rooms/_RoomDropTarget.scss b/res/css/views/rooms/_RoomDropTarget.scss
deleted file mode 100644
index 2e8145c2c9..0000000000
--- a/res/css/views/rooms/_RoomDropTarget.scss
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-.mx_RoomDropTarget_container {
-    background-color: $secondary-accent-color;
-    padding-left: 18px;
-    padding-right: 18px;
-    padding-top: 8px;
-    padding-bottom: 7px;
-}
-
-.collapsed .mx_RoomDropTarget_container {
-    padding-right: 10px;
-    padding-left: 10px;
-}
-
-.mx_RoomDropTarget {
-    font-size: $font-13px;
-    padding-top: 5px;
-    padding-bottom: 5px;
-    border: 1px dashed $accent-color;
-    color: $primary-fg-color;
-    background-color: $droptarget-bg-color;
-    border-radius: 4px;
-}
-
-
-.mx_RoomDropTarget_label {
-    position: relative;
-    margin-top: 3px;
-    line-height: $font-21px;
-    z-index: 1;
-    text-align: center;
-}
-
-.collapsed .mx_RoomDropTarget_avatar {
-    float: none;
-}
-
-.collapsed .mx_RoomDropTarget_label {
-    display: none;
-}
diff --git a/res/css/views/rooms/_RoomHeader.scss b/res/css/views/rooms/_RoomHeader.scss
index 80f6c40f39..a880a7bee2 100644
--- a/res/css/views/rooms/_RoomHeader.scss
+++ b/res/css/views/rooms/_RoomHeader.scss
@@ -15,26 +15,34 @@ limitations under the License.
 */
 
 .mx_RoomHeader {
-    flex: 0 0 52px;
+    flex: 0 0 50px;
     border-bottom: 1px solid $primary-hairline-color;
+    background-color: $roomheader-bg-color;
 
-    .mx_E2EIcon {
-        margin: 0;
-        position: absolute;
-        bottom: -2px;
-        right: -6px;
-        height: 15px;
-        width: 15px;
+    .mx_RoomHeader_e2eIcon {
+        height: 12px;
+        width: 12px;
+
+        .mx_E2EIcon {
+            margin: 0;
+            position: absolute;
+            height: 12px;
+            width: 12px;
+        }
     }
 }
 
 .mx_RoomHeader_wrapper {
     margin: auto;
-    height: 52px;
+    height: 50px;
     display: flex;
     align-items: center;
     min-width: 0;
-    padding: 0 10px 0 19px;
+    padding: 0 10px 0 18px;
+
+    .mx_InviteOnlyIcon_large {
+        margin: 0;
+    }
 }
 
 .mx_RoomHeader_spinner {
@@ -67,7 +75,6 @@ limitations under the License.
 .mx_RoomHeader_buttons {
     display: flex;
     background-color: $primary-bg-color;
-    padding-right: 5px;
 }
 
 .mx_RoomHeader_info {
@@ -173,7 +180,7 @@ limitations under the License.
 
 .mx_RoomHeader_avatar {
     flex: 0;
-    margin: 0 7px;
+    margin: 0 6px 0 7px;
     position: relative;
 }
 
@@ -201,41 +208,53 @@ limitations under the License.
 
 .mx_RoomHeader_button {
     position: relative;
-    margin-left: 10px;
+    margin-left: 1px;
+    margin-right: 1px;
     cursor: pointer;
-    height: 20px;
-    width: 20px;
+    height: 32px;
+    width: 32px;
+    border-radius: 100%;
 
     &::before {
         content: '';
         position: absolute;
-        height: 20px;
-        width: 20px;
-        background-color: $roomheader-button-color;
+        top: 4px; // center with parent of 32px
+        left: 4px; // center with parent of 32px
+        height: 24px;
+        width: 24px;
+        background-color: $icon-button-color;
         mask-repeat: no-repeat;
         mask-size: contain;
     }
+
+    &:hover {
+        background: rgba($accent-color, 0.1);
+
+        &::before {
+            background-color: $accent-color;
+        }
+    }
 }
 
 .mx_RoomHeader_settingsButton::before {
-    mask-image: url('$(res)/img/feather-customised/settings.svg');
+    mask-image: url('$(res)/img/element-icons/settings.svg');
 }
 
 .mx_RoomHeader_forgetButton::before {
-    mask-image: url('$(res)/img/leave.svg');
+    mask-image: url('$(res)/img/element-icons/leave.svg');
     width: 26px;
 }
 
 .mx_RoomHeader_searchButton::before {
-    mask-image: url('$(res)/img/feather-customised/search.svg');
+    mask-image: url('$(res)/img/element-icons/room/search-inset.svg');
 }
 
 .mx_RoomHeader_shareButton::before {
-    mask-image: url('$(res)/img/feather-customised/share.svg');
+    mask-image: url('$(res)/img/element-icons/room/share.svg');
 }
 
 .mx_RoomHeader_manageIntegsButton::before {
-    mask-image: url('$(res)/img/feather-customised/grid.svg');
+    mask-image: url('$(res)/img/element-icons/room/integrations.svg');
 }
 
 .mx_RoomHeader_showPanel {
@@ -251,7 +270,7 @@ limitations under the License.
 }
 
 .mx_RoomHeader_pinnedButton::before {
-    mask-image: url('$(res)/img/icons-pin.svg');
+    mask-image: url('$(res)/img/element-icons/room/pin.svg');
 }
 
 .mx_RoomHeader_pinsIndicator {
@@ -267,3 +286,12 @@ limitations under the License.
 .mx_RoomHeader_pinsIndicatorUnread {
     background-color: $pinned-unread-color;
 }
+
+@media only screen and (max-width: 480px) {
+    .mx_RoomHeader_wrapper {
+        padding: 0;
+    }
+    .mx_RoomHeader {
+        overflow: hidden;
+    }
+}
diff --git a/res/css/views/rooms/_RoomList.scss b/res/css/views/rooms/_RoomList.scss
index 50a9e7ee1f..78e7307bc0 100644
--- a/res/css/views/rooms/_RoomList.scss
+++ b/res/css/views/rooms/_RoomList.scss
@@ -1,6 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations 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.
@@ -16,51 +15,45 @@ limitations under the License.
 */
 
 .mx_RoomList {
-    /* take up remaining space below TopLeftMenu */
-    flex: 1;
-    min-height: 0;
-    overflow-y: hidden;
+    padding-right: 7px; // width of the scrollbar, to line things up
 }
 
-.mx_RoomList .mx_ResizeHandle {
-    // needed so the z-index takes effect
-    position: relative;
+.mx_RoomList_iconPlus::before {
+    mask-image: url('$(res)/img/element-icons/roomlist/plus.svg');
+}
+.mx_RoomList_iconExplore::before {
+    mask-image: url('$(res)/img/element-icons/roomlist/explore.svg');
 }
 
-/* hide resize handles next to collapsed / empty sublists */
-.mx_RoomList .mx_RoomSubList:not(.mx_RoomSubList_nonEmpty) + .mx_ResizeHandle {
-    display: none;
-}
-
-.mx_RoomList_expandButton {
-    margin-left: 8px;
-    cursor: pointer;
-    padding-left: 12px;
-    padding-right: 12px;
-}
-
-.mx_RoomList_emptySubListTip_container {
-    padding-left: 18px;
-    padding-right: 18px;
-    padding-top: 8px;
-    padding-bottom: 7px;
-}
-
-.mx_RoomList_emptySubListTip {
+.mx_RoomList_explorePrompt {
+    margin: 4px 12px 4px;
+    padding-top: 12px;
+    border-top: 1px solid $tertiary-fg-color;
     font-size: $font-13px;
-    padding: 5px;
-    border: 1px dashed $accent-color;
-    color: $primary-fg-color;
-    background-color: $droptarget-bg-color;
-    border-radius: 4px;
-    line-height: $font-16px;
-}
 
-.mx_RoomList_emptySubListTip .mx_RoleButton {
-    vertical-align: -2px;
-}
+    div:first-child {
+        font-weight: $font-semi-bold;
+        margin-bottom: 8px;
+    }
 
-.mx_RoomList_headerButtons {
-    position: absolute;
-    right: 60px;
+    .mx_AccessibleButton {
+        color: $secondary-fg-color;
+        position: relative;
+        padding: 0 0 0 24px;
+        font-size: inherit;
+
+        &::before {
+            content: '';
+            width: 16px;
+            height: 16px;
+            position: absolute;
+            top: 0;
+            left: 0;
+            background: $secondary-fg-color;
+            mask-position: center;
+            mask-size: contain;
+            mask-repeat: no-repeat;
+            mask-image: url('$(res)/img/element-icons/roomlist/explore.svg');
+        }
+    }
 }
diff --git a/res/css/views/rooms/_RoomPreviewBar.scss b/res/css/views/rooms/_RoomPreviewBar.scss
index 8708f13ada..0b1da7a41c 100644
--- a/res/css/views/rooms/_RoomPreviewBar.scss
+++ b/res/css/views/rooms/_RoomPreviewBar.scss
@@ -58,11 +58,6 @@ limitations under the License.
     }
 }
 
-.mx_RoomPreviewBar_dark {
-    background-color: $tagpanel-bg-color;
-    color: $accent-fg-color;
-}
-
 .mx_RoomPreviewBar_actions {
     display: flex;
 }
diff --git a/res/css/views/rooms/_RoomSublist.scss b/res/css/views/rooms/_RoomSublist.scss
new file mode 100644
index 0000000000..543940fb78
--- /dev/null
+++ b/res/css/views/rooms/_RoomSublist.scss
@@ -0,0 +1,389 @@
+/*
+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_RoomSublist {
+    margin-left: 8px;
+    margin-bottom: 4px;
+
+    .mx_RoomSublist_headerContainer {
+        // Create a flexbox to make alignment easy
+        display: flex;
+        align-items: center;
+
+        // ***************************
+        // Sticky Headers Start
+
+        // Ideally we'd be able to use `position: sticky; top: 0; bottom: 0;` on the
+        // headerContainer, however due to our layout concerns we actually have to
+        // calculate it manually so we can sticky things in the right places. We also
+        // target the headerText instead of the container to reduce jumps when scrolling,
+        // and to help hide the badges/other buttons that could appear on hover. This
+        // all works by ensuring the header text has a fixed height when sticky so the
+        // fixed height of the container can maintain the scroll position.
+
+        // The combined height must be set in the LeftPanel component for sticky headers
+        // to work correctly.
+        padding-bottom: 8px;
+        height: 24px;
+        color: $roomlist-header-color;
+
+        .mx_RoomSublist_stickable {
+            flex: 1;
+            max-width: 100%;
+
+            // Create a flexbox to make ordering easy
+            display: flex;
+            align-items: center;
+
+            // We use a generic sticky class for 2 reasons: to reduce style duplication and
+            // to identify when a header is sticky. If we didn't have a consistent sticky class,
+            // we'd have to do the "is sticky" checks again on click, as clicking the header
+            // when sticky scrolls instead of collapses the list.
+            &.mx_RoomSublist_headerContainer_sticky {
+                position: fixed;
+                height: 32px; // to match the header container
+                // width set by JS
+                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.
+        }
+
+        // Sticky Headers End
+        // ***************************
+
+        .mx_RoomSublist_badgeContainer {
+            // Create another flexbox row because it's super easy to position the badge this way.
+            display: flex;
+            align-items: center;
+            justify-content: center;
+
+            // Apply the width and margin to the badge so the container doesn't occupy dead space
+            .mx_NotificationBadge {
+                // Do not set a width so the badges get properly sized
+                margin-left: 8px; // same as menu+aux buttons
+            }
+        }
+
+        &:not(.mx_RoomSublist_headerContainer_withAux) {
+            .mx_NotificationBadge {
+                margin-right: 4px; // just to push it over a bit, aligning it with the other elements
+            }
+        }
+
+        .mx_RoomSublist_auxButton,
+        .mx_RoomSublist_menuButton {
+            margin-left: 8px; // should be the same as the notification badge
+            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;
+                background: $muted-fg-color;
+            }
+        }
+
+        // Hide the menu button by default
+        .mx_RoomSublist_menuButton {
+            visibility: hidden;
+            width: 0;
+            margin: 0;
+        }
+
+        .mx_RoomSublist_auxButton::before {
+            mask-image: url('$(res)/img/element-icons/roomlist/plus.svg');
+        }
+
+        .mx_RoomSublist_menuButton::before {
+            mask-image: url('$(res)/img/element-icons/context-menu.svg');
+        }
+
+        .mx_RoomSublist_headerText {
+            flex: 1;
+            max-width: calc(100% - 16px); // 16px is the badge width
+            line-height: $font-16px;
+            font-size: $font-13px;
+            font-weight: 600;
+
+            // Ellipsize any text overflow
+            text-overflow: ellipsis;
+            overflow: hidden;
+            white-space: nowrap;
+
+            .mx_RoomSublist_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_RoomSublist_collapseBtn_collapsed::before {
+                    transform: rotate(-90deg);
+                }
+            }
+        }
+    }
+
+    // In the general case, we leave height of headers alone even if sticky, so
+    // that the sublists below them do not jump. However, that leaves a gap
+    // when scrolled to the top above the first sublist (whose header can only
+    // ever stick to top), so we force height to 0 for only that first header.
+    // See also https://github.com/vector-im/element-web/issues/14429.
+    &:first-child .mx_RoomSublist_headerContainer {
+        height: 0;
+        padding-bottom: 4px;
+    }
+
+    .mx_RoomSublist_resizeBox {
+        position: relative;
+
+        // Create another flexbox column for the tiles
+        display: flex;
+        flex-direction: column;
+        overflow: hidden;
+
+        .mx_RoomSublist_tiles {
+            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;
+
+            mask-image: linear-gradient(0deg, transparent, black 4px);
+        }
+
+        .mx_RoomSublist_resizerHandles_showNButton {
+            flex: 0 0 32px;
+        }
+
+        .mx_RoomSublist_resizerHandles {
+            flex: 0 0 4px;
+        }
+
+        // Class name comes from the ResizableBox component
+        // The hover state needs to use the whole sublist, not just the resizable box,
+        // so that selector is below and one level higher.
+        .mx_RoomSublist_resizerHandle {
+            cursor: ns-resize;
+            border-radius: 3px;
+
+            // Override styles from library
+            width: unset !important;
+            height: 4px !important; // Update RESIZE_HANDLE_HEIGHT if this changes
+
+            // This is positioned directly below the 'show more' button.
+            position: absolute;
+            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 {
+            .mx_RoomSublist_resizerHandle {
+                opacity: 0.8;
+                background-color: $primary-fg-color;
+            }
+        }
+    }
+
+    .mx_RoomSublist_showNButton {
+        cursor: pointer;
+        font-size: $font-13px;
+        line-height: $font-18px;
+        color: $roomtile-preview-color;
+
+        // Update the render() function for RoomSublist if these change
+        // Update the ListLayout class for minVisibleTiles if these change.
+        height: 24px;
+        padding-bottom: 4px;
+
+        // We create a flexbox to cheat at alignment
+        display: flex;
+        align-items: center;
+
+        .mx_RoomSublist_showNButtonChevron {
+            position: relative;
+            width: 18px;
+            height: 18px;
+            margin-left: 12px;
+            margin-right: 16px;
+            mask-position: center;
+            mask-size: contain;
+            mask-repeat: no-repeat;
+            background: $roomlist-header-color;
+            left: -1px; // adjust for image position
+        }
+
+        .mx_RoomSublist_showMoreButtonChevron,
+        .mx_RoomSublist_showLessButtonChevron {
+            mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
+        }
+
+        .mx_RoomSublist_showLessButtonChevron {
+            transform: rotate(180deg);
+        }
+    }
+
+    &.mx_RoomSublist_hasMenuOpen,
+    &:not(.mx_RoomSublist_minimized) > .mx_RoomSublist_headerContainer:focus-within,
+    &:not(.mx_RoomSublist_minimized) > .mx_RoomSublist_headerContainer:hover {
+        .mx_RoomSublist_menuButton {
+            visibility: visible;
+            width: 24px;
+            margin-left: 8px;
+        }
+    }
+
+    &.mx_RoomSublist_minimized {
+        .mx_RoomSublist_headerContainer {
+            height: auto;
+            flex-direction: column;
+            position: relative;
+
+            .mx_RoomSublist_badgeContainer {
+                order: 0;
+                align-self: flex-end;
+                margin-right: 0;
+            }
+
+            .mx_RoomSublist_stickable {
+                order: 1;
+                max-width: 100%;
+            }
+
+            .mx_RoomSublist_auxButton {
+                order: 2;
+                visibility: visible;
+                width: 32px !important; // !important to override hover styles
+                height: 32px !important; // !important to override hover styles
+                margin-left: 0 !important; // !important to override hover styles
+                background-color: $roomlist-button-bg-color;
+                margin-top: 8px;
+
+                &::before {
+                    top: 8px;
+                    left: 8px;
+                }
+            }
+        }
+
+        .mx_RoomSublist_resizeBox {
+            align-items: center;
+        }
+
+        .mx_RoomSublist_showNButton {
+            flex-direction: column;
+
+            .mx_RoomSublist_showNButtonChevron {
+                margin-right: 12px; // to center
+            }
+        }
+
+        .mx_RoomSublist_menuButton {
+            height: 16px;
+        }
+
+        &.mx_RoomSublist_hasMenuOpen,
+        & > .mx_RoomSublist_headerContainer:hover {
+            .mx_RoomSublist_menuButton {
+                visibility: visible;
+                position: absolute;
+                bottom: 48px; // align to middle of name, 40px for aux button (with padding) and 8px for alignment
+                right: 0;
+                width: 16px;
+                height: 16px;
+                border-radius: 0;
+                z-index: 1; // occlude the list name
+
+                // This is the same color as the left panel background because it needs
+                // to occlude the sublist title
+                background-color: $roomlist-bg-color;
+
+                &::before {
+                    top: 0;
+                    left: 0;
+                }
+            }
+
+            &.mx_RoomSublist_headerContainer:not(.mx_RoomSublist_headerContainer_withAux) {
+                .mx_RoomSublist_menuButton {
+                    bottom: 8px; // align to the middle of name, 40px less than the `bottom` above.
+                }
+            }
+        }
+    }
+}
+
+.mx_RoomSublist_contextMenu {
+    padding: 20px 16px;
+    width: 250px;
+
+    hr {
+        margin-top: 16px;
+        margin-bottom: 16px;
+        margin-right: 16px; // additional 16px
+        border: 1px solid $roomsublist-divider-color;
+        opacity: 0.1;
+    }
+
+    .mx_RoomSublist_contextMenu_title {
+        font-size: $font-15px;
+        line-height: $font-20px;
+        font-weight: 600;
+        margin-bottom: 4px;
+    }
+
+    .mx_RadioButton, .mx_Checkbox {
+        margin-top: 8px;
+    }
+}
+
+.mx_RoomSublist_addRoomTooltip {
+    margin-top: -3px;
+}
diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index 5bc7d5624d..8eca3f1efa 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -1,6 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,213 +14,182 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// Note: the room tile expects to be in a flexbox column container
 .mx_RoomTile {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    cursor: pointer;
-    height: $font-34px;
-    margin: 0;
-    padding: 0 8px 0 10px;
-    position: relative;
-
-    .mx_RoomTile_menuButton {
-        display: none;
-        flex: 0 0 16px;
-        height: 16px;
-        background-image: url('$(res)/img/icon_context.svg');
-        background-repeat: no-repeat;
-        background-position: center;
-    }
-
-    .mx_UserOnlineDot {
-        display: block;
-        margin-right: 5px;
-    }
-}
-
-.mx_RoomTile:focus {
-    filter: none !important;
-    background-color: $roomtile-focused-bg-color;
-}
-
-.mx_RoomTile_tooltip {
-    display: inline-block;
-    position: relative;
-    top: -54px;
-    left: -12px;
-}
-
-.mx_RoomTile_nameContainer {
-    display: flex;
-    align-items: center;
-    flex: 1;
-    vertical-align: middle;
-    min-width: 0;
-}
-
-.mx_RoomTile_labelContainer {
-    display: flex;
-    flex-direction: column;
-    flex: 1;
-    min-width: 0;
-}
-
-.mx_RoomTile_subtext {
-    display: inline-block;
-    font-size: $font-11px;
-    padding: 0 0 0 7px;
-    margin: 0;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: clip;
-    position: relative;
-    bottom: 4px;
-}
-
-.mx_RoomTile_avatar_container {
-    position: relative;
-}
-
-.mx_RoomTile_avatar {
-    flex: 0;
+    margin-bottom: 4px;
     padding: 4px;
-    width: 24px;
-    vertical-align: middle;
-}
 
-.mx_RoomTile_hasSubtext .mx_RoomTile_avatar {
-    padding-top: 0;
-    vertical-align: super;
-}
+    // The tile is also a flexbox row itself
+    display: flex;
 
-.mx_RoomTile_dm {
-    display: block;
-    position: absolute;
-    bottom: 0;
-    right: -5px;
-    z-index: 2;
-}
+    &.mx_RoomTile_selected,
+    &:hover,
+    &:focus-within,
+    &.mx_RoomTile_hasMenuOpen {
+        background-color: $roomtile-selected-bg-color;
+        border-radius: 8px;
+    }
 
-// Note we match .mx_E2EIcon to make sure this matches more tightly than just
-// .mx_E2EIcon on its own
-.mx_RoomTile_e2eIcon.mx_E2EIcon {
-    height: 14px;
-    width: 14px;
-    display: block;
-    position: absolute;
-    bottom: -2px;
-    right: -5px;
-    z-index: 1;
-    margin: 0;
-}
+    .mx_DecoratedRoomAvatar, .mx_RoomTile_avatarContainer {
+        margin-right: 8px;
+    }
 
-.mx_RoomTile_name {
-    font-size: $font-14px;
-    padding: 0 4px;
-    color: $roomtile-name-color;
-    white-space: nowrap;
-    overflow-x: hidden;
-    text-overflow: ellipsis;
-}
+    .mx_RoomTile_nameContainer {
+        flex-grow: 1;
+        min-width: 0; // allow flex to shrink it
+        margin-right: 8px; // spacing to buttons/badges
 
-.mx_RoomTile_badge {
-    flex: 0 1 content;
-    border-radius: 0.8em;
-    padding: 0 0.4em;
-    color: $roomtile-badge-fg-color;
-    font-weight: 600;
-    font-size: $font-12px;
-}
-
-.collapsed {
-    .mx_RoomTile {
-        margin: 0 6px;
-        padding: 0 2px;
-        position: relative;
+        // Create a new column layout flexbox for the name parts
+        display: flex;
+        flex-direction: column;
         justify-content: center;
+
+        .mx_RoomTile_name,
+        .mx_RoomTile_messagePreview {
+            margin: 0 2px;
+            width: 100%;
+
+            // Ellipsize any text overflow
+            text-overflow: ellipsis;
+            overflow: hidden;
+            white-space: nowrap;
+        }
+
+        .mx_RoomTile_name {
+            font-size: $font-14px;
+            line-height: $font-18px;
+        }
+
+        .mx_RoomTile_name.mx_RoomTile_nameHasUnreadEvents {
+            font-weight: 600;
+        }
+
+        .mx_RoomTile_messagePreview {
+            font-size: $font-13px;
+            line-height: $font-18px;
+            color: $roomtile-preview-color;
+        }
+
+        .mx_RoomTile_nameWithPreview {
+            margin-top: -4px; // shift the name up a bit more
+        }
     }
 
-    .mx_RoomTile_name {
+    .mx_RoomTile_notificationsButton {
+        margin-left: 4px; // spacing between buttons
+    }
+
+    .mx_RoomTile_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-right: 2px; // centering
+        }
+
+        .mx_NotificationBadge_dot {
+            // make the smaller dot occupy the same width for centering
+            margin-left: 5px;
+            margin-right: 7px;
+        }
+    }
+
+    // The context menu buttons are hidden by default
+    .mx_RoomTile_menuButton,
+    .mx_RoomTile_notificationsButton {
+        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;
+            background: $primary-fg-color;
+        }
     }
 
-    .mx_RoomTile_badge {
-        position: absolute;
-        right: 6px;
-        top: 0px;
-        border-radius: 16px;
-        z-index: 3;
-        border: 0.18em solid $secondary-accent-color;
-    }
-
-    .mx_RoomTile_menuButton {
-        display: none; // no design for this for now
-    }
-    .mx_UserOnlineDot {
-        display: none; // no design for this for now
-    }
-}
-
-// toggle menuButton and badge on menu displayed
-.mx_RoomTile_menuDisplayed,
-// or on keyboard focus of room tile
-.mx_LeftPanel_container:not(.collapsed) .mx_RoomTile:focus-within,
-// or on pointer hover
-.mx_LeftPanel_container:not(.collapsed) .mx_RoomTile:hover {
-    .mx_RoomTile_menuButton {
+    // If the room has an overriden notification setting then we always show the notifications menu button
+    .mx_RoomTile_notificationsButton.mx_RoomTile_notificationsButton_show {
         display: block;
     }
-    .mx_UserOnlineDot {
-        display: none;
+
+    .mx_RoomTile_menuButton::before {
+        mask-image: url('$(res)/img/element-icons/context-menu.svg');
+    }
+
+    &:not(.mx_RoomTile_minimized) {
+        &:hover,
+        &:focus-within,
+        &.mx_RoomTile_hasMenuOpen {
+            // Hide the badge container on hover because it'll be a menu button
+            .mx_RoomTile_badgeContainer {
+                width: 0;
+                height: 0;
+                display: none;
+            }
+
+            .mx_RoomTile_notificationsButton,
+            .mx_RoomTile_menuButton {
+                display: block;
+            }
+        }
+    }
+
+    &.mx_RoomTile_minimized {
+        flex-direction: column;
+        align-items: center;
+        position: relative;
+
+        .mx_DecoratedRoomAvatar, .mx_RoomTile_avatarContainer {
+            margin-right: 0;
+        }
     }
 }
 
-.mx_RoomTile_unreadNotify .mx_RoomTile_badge,
-.mx_RoomTile_badge.mx_RoomTile_badgeUnread {
-    background-color: $roomtile-name-color;
+// We use these both in context menus and the room tiles
+.mx_RoomTile_iconBell::before {
+    mask-image: url('$(res)/img/element-icons/notifications.svg');
+}
+.mx_RoomTile_iconBellDot::before {
+    mask-image: url('$(res)/img/element-icons/roomlist/notifications-default.svg');
+}
+.mx_RoomTile_iconBellCrossed::before {
+    mask-image: url('$(res)/img/element-icons/roomlist/notifications-off.svg');
+}
+.mx_RoomTile_iconBellMentions::before {
+    mask-image: url('$(res)/img/element-icons/roomlist/notifications-dm.svg');
 }
 
-.mx_RoomTile_highlight .mx_RoomTile_badge,
-.mx_RoomTile_badge.mx_RoomTile_badgeRed {
-    color: $accent-fg-color;
-    background-color: $warning-color;
-}
+.mx_RoomTile_contextMenu {
+    .mx_RoomTile_iconStar::before {
+        mask-image: url('$(res)/img/element-icons/roomlist/favorite.svg');
+    }
 
-.mx_RoomTile_unread, .mx_RoomTile_highlight {
-    .mx_RoomTile_name {
-        font-weight: 600;
-        color: $roomtile-selected-color;
+    .mx_RoomTile_iconArrowDown::before {
+        mask-image: url('$(res)/img/element-icons/roomlist/low-priority.svg');
+    }
+
+    .mx_RoomTile_iconSettings::before {
+        mask-image: url('$(res)/img/element-icons/settings.svg');
+    }
+
+    .mx_RoomTile_iconSignOut::before {
+        mask-image: url('$(res)/img/element-icons/leave.svg');
     }
 }
-
-.mx_RoomTile_selected {
-    border-radius: 4px;
-    background-color: $roomtile-selected-bg-color;
-}
-
-.mx_DNDRoomTile {
-    transform: none;
-    transition: transform 0.2s;
-}
-
-.mx_DNDRoomTile_dragging {
-    transform: scale(1.05, 1.05);
-}
-
-.mx_RoomTile_arrow {
-    position: absolute;
-    right: 0px;
-}
-
-.mx_RoomTile.mx_RoomTile_transparent {
-    background-color: transparent;
-}
-
-.mx_RoomTile.mx_RoomTile_transparent:focus {
-    background-color: $roomtile-transparent-focused-color;
-}
-
-.mx_GroupInviteTile .mx_RoomTile_name {
-    flex: 1;
-}
diff --git a/res/css/views/rooms/_SendMessageComposer.scss b/res/css/views/rooms/_SendMessageComposer.scss
index 0b646666e7..9f6a8d52ce 100644
--- a/res/css/views/rooms/_SendMessageComposer.scss
+++ b/res/css/views/rooms/_SendMessageComposer.scss
@@ -44,10 +44,5 @@ limitations under the License.
             overflow-y: auto;
         }
     }
-
-    .mx_SendMessageComposer_overlayWrapper {
-        position: relative;
-        height: 0;
-    }
 }
 
diff --git a/res/css/views/rooms/_Stickers.scss b/res/css/views/rooms/_Stickers.scss
index d33ecc0bb6..4bd45631cc 100644
--- a/res/css/views/rooms/_Stickers.scss
+++ b/res/css/views/rooms/_Stickers.scss
@@ -31,7 +31,7 @@
 .mx_Stickers_addLink {
     display: inline;
     cursor: pointer;
-    text-decoration: underline;
+    color: $button-link-fg-color;
 }
 
 .mx_Stickers_hideStickers {
diff --git a/res/css/views/rooms/_TopUnreadMessagesBar.scss b/res/css/views/rooms/_TopUnreadMessagesBar.scss
index 28eddf1fa2..8841b042a0 100644
--- a/res/css/views/rooms/_TopUnreadMessagesBar.scss
+++ b/res/css/views/rooms/_TopUnreadMessagesBar.scss
@@ -28,7 +28,7 @@ limitations under the License.
     content: "";
     position: absolute;
     top: -8px;
-    left: 11px;
+    left: 10.5px;
     width: 4px;
     height: 4px;
     border-radius: 16px;
@@ -42,19 +42,20 @@ limitations under the License.
     border-radius: 19px;
     box-sizing: border-box;
     background: $primary-bg-color;
-    border: 1.3px solid $roomtile-name-color;
+    border: 1.3px solid $muted-fg-color;
     cursor: pointer;
 }
 
 .mx_TopUnreadMessagesBar_scrollUp::before {
     content: "";
     position: absolute;
-    width: 38px;
-    height: 38px;
-    mask-image: url('$(res)/img/icon-jump-to-first-unread.svg');
+    width: 36px;
+    height: 36px;
+    mask-image: url('$(res)/img/feather-customised/chevron-down-thin.svg');
     mask-repeat: no-repeat;
-    mask-position: 9px 13px;
-    background: $roomtile-name-color;
+    mask-size: contain;
+    background: $muted-fg-color;
+    transform: rotate(180deg);
 }
 
 .mx_TopUnreadMessagesBar_markAsRead {
@@ -62,7 +63,7 @@ limitations under the License.
     width: 18px;
     height: 18px;
     background: $primary-bg-color;
-    border: 1.3px solid $roomtile-name-color;
+    border: 1.3px solid $muted-fg-color;
     border-radius: 10px;
     margin: 5px auto;
 }
@@ -76,5 +77,5 @@ limitations under the License.
     mask-repeat: no-repeat;
     mask-size: 10px;
     mask-position: 4px 4px;
-    background: $roomtile-name-color;
+    background: $muted-fg-color;
 }
diff --git a/res/css/views/rooms/_WhoIsTypingTile.scss b/res/css/views/rooms/_WhoIsTypingTile.scss
index 8b135152d6..1c0dabbeb5 100644
--- a/res/css/views/rooms/_WhoIsTypingTile.scss
+++ b/res/css/views/rooms/_WhoIsTypingTile.scss
@@ -59,7 +59,7 @@ limitations under the License.
     flex: 1;
     font-size: $font-14px;
     font-weight: 600;
-    color: $eventtile-meta-color;
+    color: $roomtopic-color;
 }
 
 .mx_WhoIsTypingTile_label > span {
diff --git a/res/css/views/settings/_AvatarSetting.scss b/res/css/views/settings/_AvatarSetting.scss
index 9fa10907b4..eddcf9f55a 100644
--- a/res/css/views/settings/_AvatarSetting.scss
+++ b/res/css/views/settings/_AvatarSetting.scss
@@ -27,28 +27,6 @@ limitations under the License.
 
     .mx_AccessibleButton.mx_AccessibleButton_kind_primary {
         margin-top: 8px;
-
-        div {
-            position: relative;
-            height: 12px;
-            width: 12px;
-            display: inline;
-            padding-right: 6px; // 0.5 * 12px
-            left: -6px; // 0.5 * 12px
-            top: 3px;
-        }
-
-        div::before {
-            content: '';
-            position: absolute;
-            height: 12px;
-            width: 12px;
-
-            background-color: $button-primary-fg-color;
-            mask-repeat: no-repeat;
-            mask-size: contain;
-            mask-image: url('$(res)/img/feather-customised/upload.svg');
-        }
     }
 
     .mx_AccessibleButton.mx_AccessibleButton_kind_link_sm {
diff --git a/res/css/views/rooms/_UserOnlineDot.scss b/res/css/views/settings/_UpdateCheckButton.scss
similarity index 73%
rename from res/css/views/rooms/_UserOnlineDot.scss
rename to res/css/views/settings/_UpdateCheckButton.scss
index f9da8648ed..f35a023ac1 100644
--- a/res/css/views/rooms/_UserOnlineDot.scss
+++ b/res/css/views/settings/_UpdateCheckButton.scss
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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,10 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_UserOnlineDot {
-    border-radius: 50%;
-    background-color: $accent-color;
-    height: 6px;
-    width: 6px;
-    display: inline-block;
+.mx_UpdateCheckButton_summary {
+    margin-left: 16px;
+
+    .mx_AccessibleButton_kind_link {
+        padding: 0;
+    }
 }
diff --git a/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss b/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss
index b5a57dfefb..23dcc532b2 100644
--- a/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss
+++ b/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss
@@ -14,10 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_SecurityRoomSettingsTab label {
-    display: block;
-}
-
 .mx_SecurityRoomSettingsTab_warning {
     display: block;
 
diff --git a/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss b/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
new file mode 100644
index 0000000000..94983a60bf
--- /dev/null
+++ b/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
@@ -0,0 +1,230 @@
+/*
+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_AppearanceUserSettingsTab_fontSlider,
+.mx_AppearanceUserSettingsTab_fontSlider_preview,
+.mx_AppearanceUserSettingsTab_Layout {
+    @mixin mx_Settings_fullWidthField;
+}
+
+.mx_AppearanceUserSettingsTab .mx_Field {
+    width: 256px;
+}
+
+.mx_AppearanceUserSettingsTab_fontScaling {
+    color: $primary-fg-color;
+}
+
+.mx_AppearanceUserSettingsTab_fontSlider {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    padding: 15px;
+    background: rgba($appearance-tab-border-color, 0.2);
+    border-radius: 10px;
+    font-size: 10px;
+    margin-top: 24px;
+    margin-bottom: 24px;
+}
+
+.mx_AppearanceUserSettingsTab_fontSlider_preview {
+    border: 1px solid $appearance-tab-border-color;
+    border-radius: 10px;
+    padding: 0 16px 9px 16px;
+    pointer-events: none;
+
+    .mx_EventTile_msgOption {
+        display: none;
+    }
+
+    &.mx_IRCLayout {
+        padding-top: 9px;
+    }
+}
+
+.mx_AppearanceUserSettingsTab_fontSlider_smallText {
+    font-size: 15px;
+    padding-right: 20px;
+    padding-left: 5px;
+    font-weight: 500;
+}
+
+.mx_AppearanceUserSettingsTab_fontSlider_largeText {
+    font-size: 18px;
+    padding-left: 20px;
+    padding-right: 5px;
+    font-weight: 500;
+}
+
+.mx_AppearanceUserSettingsTab {
+    > .mx_SettingsTab_SubHeading {
+        margin-bottom: 32px;
+    }
+}
+
+.mx_AppearanceUserSettingsTab_themeSection {
+    $radio-bg-color: $input-darker-bg-color;
+    color: $primary-fg-color;
+
+    > .mx_ThemeSelectors {
+        display: flex;
+        flex-direction: row;
+        flex-wrap: wrap;
+
+        margin-top: 4px;
+        margin-bottom: 30px;
+
+        > .mx_RadioButton {
+            padding: $font-16px;
+            box-sizing: border-box;
+            border-radius: 10px;
+            width: 180px;
+
+            background: $radio-bg-color;
+            opacity: 0.4;
+
+            flex-shrink: 1;
+            flex-grow: 0;
+
+            margin-right: 15px;
+            margin-top: 10px;
+
+            font-weight: 600;
+            color: $muted-fg-color;
+
+            > span {
+                justify-content: center;
+            }
+        }
+
+        > .mx_RadioButton_enabled {
+            opacity: 1;
+
+            // These colors need to be hardcoded because they don't change with the theme
+            &.mx_ThemeSelector_light {
+                background-color: #f3f8fd;
+                color: #2e2f32;
+            }
+
+            &.mx_ThemeSelector_dark {
+                // 5% lightened version of 181b21
+                background-color: #25282e;
+                color: #f3f8fd;
+
+                > input > div {
+                    border-color: $input-darker-bg-color;
+                    > div {
+                        border-color: $input-darker-bg-color;
+                    }
+                }
+            }
+
+            &.mx_ThemeSelector_black {
+                background-color: #000000;
+                color: #f3f8fd;
+
+                > input > div {
+                    border-color: $input-darker-bg-color;
+                    > div {
+                        border-color: $input-darker-bg-color;
+                    }
+                }
+            }
+        }
+    }
+}
+
+.mx_SettingsTab_customFontSizeField {
+    margin-left: calc($font-16px + 10px);
+}
+
+.mx_AppearanceUserSettingsTab_Layout_RadioButtons {
+    display: flex;
+    flex-direction: row;
+
+    color: $primary-fg-color;
+
+    .mx_AppearanceUserSettingsTab_spacer {
+        width: 24px;
+    }
+
+    > .mx_AppearanceUserSettingsTab_Layout_RadioButton {
+        flex-grow: 0;
+        flex-shrink: 1;
+        display: flex;
+        flex-direction: column;
+
+        width: 300px;
+
+        border: 1px solid $appearance-tab-border-color;
+        border-radius: 10px;
+
+        .mx_EventTile_msgOption,
+        .mx_MessageActionBar {
+            display: none;
+        }
+
+        .mx_AppearanceUserSettingsTab_Layout_RadioButton_preview {
+            flex-grow: 1;
+            display: flex;
+            align-items: center;
+            padding: 10px;
+            pointer-events: none;
+        }
+
+        .mx_RadioButton {
+            flex-grow: 0;
+            padding: 10px;
+        }
+
+        .mx_EventTile_content {
+            margin-right: 0;
+        }
+
+        &.mx_AppearanceUserSettingsTab_Layout_RadioButton_selected {
+            border-color: $accent-color;
+        }
+    }
+
+    .mx_RadioButton {
+        border-top: 1px solid $appearance-tab-border-color;
+
+        > input + div {
+            border-color: rgba($muted-fg-color, 0.2);
+        }
+    }
+
+    .mx_RadioButton_checked {
+        background-color: rgba($accent-color, 0.08);
+    }
+}
+
+.mx_AppearanceUserSettingsTab_Advanced {
+    color: $primary-fg-color;
+
+    > * {
+        margin-bottom: 16px;
+    }
+
+    .mx_AppearanceUserSettingsTab_AdvancedToggle {
+        color: $accent-color;
+        cursor: pointer;
+    }
+
+    .mx_AppearanceUserSettingsTab_systemFont {
+        margin-left: calc($font-16px + 10px);
+    }
+}
diff --git a/res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss b/res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss
index 62d230e752..6c9b89cf5a 100644
--- a/res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_GeneralUserSettingsTab.scss
@@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_GeneralUserSettingsTab_changePassword .mx_Field,
-.mx_GeneralUserSettingsTab_themeSection .mx_Field {
+.mx_GeneralUserSettingsTab_changePassword .mx_Field {
     @mixin mx_Settings_fullWidthField;
 }
 
@@ -23,6 +22,12 @@ limitations under the License.
     margin-top: 0;
 }
 
+.mx_GeneralUserSettingsTab_accountSection .mx_Spinner,
+.mx_GeneralUserSettingsTab_discovery .mx_Spinner {
+    // Move the spinner to the left side of the container (default center)
+    justify-content: left;
+}
+
 .mx_GeneralUserSettingsTab_accountSection .mx_EmailAddresses,
 .mx_GeneralUserSettingsTab_accountSection .mx_PhoneNumbers,
 .mx_GeneralUserSettingsTab_discovery .mx_ExistingEmailAddress,
diff --git a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss
index 8700f8747d..d6466a03f9 100644
--- a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss
@@ -63,4 +63,25 @@ limitations under the License.
             font-size: inherit;
         }
     }
+
+    .mx_SecurityUserSettingsTab_warning {
+        color: $notice-primary-color;
+        position: relative;
+        padding-left: 40px;
+        margin-top: 30px;
+
+        &::before {
+            mask-repeat: no-repeat;
+            mask-position: 0 center;
+            mask-size: $font-24px;
+            position: absolute;
+            width: $font-24px;
+            height: $font-24px;
+            content: "";
+            top: 0;
+            left: 0;
+            background-color: $notice-primary-color;
+            mask-image: url('$(res)/img/feather-customised/alert-triangle.svg');
+        }
+    }
 }
diff --git a/res/css/views/toasts/_NonUrgentEchoFailureToast.scss b/res/css/views/toasts/_NonUrgentEchoFailureToast.scss
new file mode 100644
index 0000000000..9a8229b38e
--- /dev/null
+++ b/res/css/views/toasts/_NonUrgentEchoFailureToast.scss
@@ -0,0 +1,37 @@
+/*
+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_NonUrgentEchoFailureToast {
+    .mx_NonUrgentEchoFailureToast_icon {
+        display: inline-block;
+        width: $font-18px;
+        height: $font-18px;
+        mask-position: center;
+        mask-size: contain;
+        mask-repeat: no-repeat;
+        background-color: #fff; // we know that non-urgent toasts are always styled the same
+        mask-image: url('$(res)/img/element-icons/cloud-off.svg');
+        margin-right: 8px;
+    }
+
+    span { // includes the i18n block
+        vertical-align: middle;
+    }
+
+    .mx_AccessibleButton {
+        padding: 0;
+    }
+}
diff --git a/res/css/views/voip/_CallContainer.scss b/res/css/views/voip/_CallContainer.scss
new file mode 100644
index 0000000000..8d1b68dd99
--- /dev/null
+++ b/res/css/views/voip/_CallContainer.scss
@@ -0,0 +1,89 @@
+/*
+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_CallContainer {
+    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);
+
+    cursor: pointer;
+
+    .mx_CallPreview {
+        .mx_VideoView {
+            width: 350px;
+        }
+
+        .mx_VideoView_localVideoFeed {
+            border-radius: 8px;
+            overflow: hidden;
+        }
+    }
+
+    .mx_IncomingCallBox {
+        min-width: 250px;
+        background-color: $primary-bg-color;
+        padding: 8px;
+
+        .mx_IncomingCallBox_CallerInfo {
+            display: flex;
+            direction: row;
+
+            img {
+                margin: 8px;
+            }
+
+            > div {
+                display: flex;
+                flex-direction: column;
+
+                justify-content: center;
+            }
+
+            h1, p {
+                margin: 0px;
+                padding: 0px;
+                font-size: $font-14px;
+                line-height: $font-16px;
+            }
+
+            h1 {
+                font-weight: bold;
+            }
+        }
+
+        .mx_IncomingCallBox_buttons {
+            padding: 8px;
+            display: flex;
+            flex-direction: row;
+
+            > .mx_IncomingCallBox_spacer {
+                width: 8px;
+            }
+
+            > * {
+                flex-shrink: 0;
+                flex-grow: 1;
+                margin-right: 0;
+                font-size: $font-15px;
+                line-height: $font-24px;
+            }
+        }
+    }
+}
diff --git a/res/css/views/voip/_CallView.scss b/res/css/views/voip/_CallView.scss
index 4650f30c1d..f6f3d40308 100644
--- a/res/css/views/voip/_CallView.scss
+++ b/res/css/views/voip/_CallView.scss
@@ -1,5 +1,6 @@
 /*
 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.
@@ -18,8 +19,76 @@ limitations under the License.
     background-color: $accent-color;
     color: $accent-fg-color;
     cursor: pointer;
-    text-align: center;
     padding: 6px;
     font-weight: bold;
-    font-size: $font-13px;
+
+    border-radius: 8px;
+    min-width: 200px;
+
+    display: flex;
+    align-items: center;
+
+    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_hangup {
+    position: absolute;
+
+    right: 8px;
+    bottom: 10px;
+
+    height: 35px;
+    width: 35px;
+
+    border-radius: 35px;
+
+    background-color: $notice-primary-color;
+
+    z-index: 101;
+
+    cursor: pointer;
+
+    &::before {
+        content: '';
+        position: absolute;
+
+        height: 20px;
+        width: 20px;
+
+        top: 6.5px;
+        left: 7.5px;
+
+        mask: url('$(res)/img/hangup.svg');
+        mask-size: contain;
+        background-size: contain;
+
+        background-color: $primary-fg-color;
+    }
 }
diff --git a/res/css/views/voip/_IncomingCallbox.scss b/res/css/views/voip/_IncomingCallbox.scss
deleted file mode 100644
index ed33de470d..0000000000
--- a/res/css/views/voip/_IncomingCallbox.scss
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-.mx_IncomingCallBox {
-    text-align: center;
-    border: 1px solid #a4a4a4;
-    border-radius: 8px;
-    background-color: $primary-bg-color;
-    position: fixed;
-    z-index: 1000;
-    padding: 6px;
-    margin-top: -3px;
-    margin-left: -20px;
-    width: 200px;
-}
-
-.mx_IncomingCallBox_chevron {
-    padding: 12px;
-    position: absolute;
-    left: -21px;
-    top: 0px;
-}
-
-.mx_IncomingCallBox_title {
-    padding: 6px;
-    font-weight: bold;
-}
-
-.mx_IncomingCallBox_buttons {
-    display: flex;
-}
-
-.mx_IncomingCallBox_buttons_cell {
-    vertical-align: middle;
-    padding: 6px;
-    flex: 1;
-}
-
-.mx_IncomingCallBox_buttons_decline,
-.mx_IncomingCallBox_buttons_accept {
-    vertical-align: middle;
-    width: 80px;
-    height: 36px;
-    line-height: $font-36px;
-    border-radius: 36px;
-    color: $accent-fg-color;
-    margin: auto;
-}
-
-.mx_IncomingCallBox_buttons_decline {
-    background-color: $voip-decline-color;
-}
-
-.mx_IncomingCallBox_buttons_accept {
-    background-color: $voip-accept-color;
-}
diff --git a/res/fonts/Inter/Inter-Bold.woff b/res/fonts/Inter/Inter-Bold.woff
new file mode 100644
index 0000000000..61e1c25e64
Binary files /dev/null and b/res/fonts/Inter/Inter-Bold.woff differ
diff --git a/res/fonts/Inter/Inter-Bold.woff2 b/res/fonts/Inter/Inter-Bold.woff2
new file mode 100644
index 0000000000..6c401bb09b
Binary files /dev/null and b/res/fonts/Inter/Inter-Bold.woff2 differ
diff --git a/res/fonts/Inter/Inter-BoldItalic.woff b/res/fonts/Inter/Inter-BoldItalic.woff
new file mode 100644
index 0000000000..2de403edd1
Binary files /dev/null and b/res/fonts/Inter/Inter-BoldItalic.woff differ
diff --git a/res/fonts/Inter/Inter-BoldItalic.woff2 b/res/fonts/Inter/Inter-BoldItalic.woff2
new file mode 100644
index 0000000000..80efd4848d
Binary files /dev/null and b/res/fonts/Inter/Inter-BoldItalic.woff2 differ
diff --git a/res/fonts/Inter/Inter-Italic.woff b/res/fonts/Inter/Inter-Italic.woff
new file mode 100644
index 0000000000..e7da6663fe
Binary files /dev/null and b/res/fonts/Inter/Inter-Italic.woff differ
diff --git a/res/fonts/Inter/Inter-Italic.woff2 b/res/fonts/Inter/Inter-Italic.woff2
new file mode 100644
index 0000000000..8559dfde38
Binary files /dev/null and b/res/fonts/Inter/Inter-Italic.woff2 differ
diff --git a/res/fonts/Inter/Inter-Medium.woff b/res/fonts/Inter/Inter-Medium.woff
new file mode 100644
index 0000000000..8c36a6345e
Binary files /dev/null and b/res/fonts/Inter/Inter-Medium.woff differ
diff --git a/res/fonts/Inter/Inter-Medium.woff2 b/res/fonts/Inter/Inter-Medium.woff2
new file mode 100644
index 0000000000..3b31d3350a
Binary files /dev/null and b/res/fonts/Inter/Inter-Medium.woff2 differ
diff --git a/res/fonts/Inter/Inter-MediumItalic.woff b/res/fonts/Inter/Inter-MediumItalic.woff
new file mode 100644
index 0000000000..fb79e91ff4
Binary files /dev/null and b/res/fonts/Inter/Inter-MediumItalic.woff differ
diff --git a/res/fonts/Inter/Inter-MediumItalic.woff2 b/res/fonts/Inter/Inter-MediumItalic.woff2
new file mode 100644
index 0000000000..d32c111f9c
Binary files /dev/null and b/res/fonts/Inter/Inter-MediumItalic.woff2 differ
diff --git a/res/fonts/Inter/Inter-Regular.woff b/res/fonts/Inter/Inter-Regular.woff
new file mode 100644
index 0000000000..7d587c40bf
Binary files /dev/null and b/res/fonts/Inter/Inter-Regular.woff differ
diff --git a/res/fonts/Inter/Inter-Regular.woff2 b/res/fonts/Inter/Inter-Regular.woff2
new file mode 100644
index 0000000000..d5ffd2a1f1
Binary files /dev/null and b/res/fonts/Inter/Inter-Regular.woff2 differ
diff --git a/res/fonts/Inter/Inter-SemiBold.woff b/res/fonts/Inter/Inter-SemiBold.woff
new file mode 100644
index 0000000000..99df06cbee
Binary files /dev/null and b/res/fonts/Inter/Inter-SemiBold.woff differ
diff --git a/res/fonts/Inter/Inter-SemiBold.woff2 b/res/fonts/Inter/Inter-SemiBold.woff2
new file mode 100644
index 0000000000..df746af999
Binary files /dev/null and b/res/fonts/Inter/Inter-SemiBold.woff2 differ
diff --git a/res/fonts/Inter/Inter-SemiBoldItalic.woff b/res/fonts/Inter/Inter-SemiBoldItalic.woff
new file mode 100644
index 0000000000..91e192b9f1
Binary files /dev/null and b/res/fonts/Inter/Inter-SemiBoldItalic.woff differ
diff --git a/res/fonts/Inter/Inter-SemiBoldItalic.woff2 b/res/fonts/Inter/Inter-SemiBoldItalic.woff2
new file mode 100644
index 0000000000..ff8774ccb4
Binary files /dev/null and b/res/fonts/Inter/Inter-SemiBoldItalic.woff2 differ
diff --git a/res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2 b/res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2
index 593d7c8f5c..a52e5a3800 100644
Binary files a/res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2 and b/res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2 differ
diff --git a/res/fonts/Twemoji_Mozilla/TwemojiMozilla-sbix.woff2 b/res/fonts/Twemoji_Mozilla/TwemojiMozilla-sbix.woff2
index 277324851f..660a93193d 100644
Binary files a/res/fonts/Twemoji_Mozilla/TwemojiMozilla-sbix.woff2 and b/res/fonts/Twemoji_Mozilla/TwemojiMozilla-sbix.woff2 differ
diff --git a/res/img/attach.png b/res/img/attach.png
deleted file mode 100644
index 1bcb70045d..0000000000
Binary files a/res/img/attach.png and /dev/null differ
diff --git a/res/img/button-text-block-quote-on.svg b/res/img/button-text-block-quote-on.svg
deleted file mode 100644
index f8a86125c9..0000000000
--- a/res/img/button-text-block-quote-on.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="28px" height="16px" viewBox="0 0 28 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 39 (31667) - http://www.bohemiancoding.com/sketch -->
-    <title>3B24B8C7-64BE-4B3E-A748-94DB72E1210F</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="Screens-revised" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="02_x-Chat-text-input-markdown-panel-MD_off-BUTTONS-ON" transform="translate(-390.000000, -745.000000)">
-            <g id="format-buttons-A-Copy" transform="translate(294.000000, 745.000000)">
-                <g id="button_text_quote_ON" transform="translate(96.000000, 0.000000)">
-                    <rect id="Rectangle-108" fill="#4A4A4A" x="0" y="0" width="28" height="16" rx="8"></rect>
-                    <path d="M13.6762695,4.58734809 C13.2019833,4.85981039 12.8185236,5.09442718 12.5258789,5.29120551 C12.2332342,5.48798384 11.9355484,5.74782825 11.6328125,6.07074653 C11.350259,6.37348242 11.1333015,6.69135033 10.9819336,7.02435981 C10.8305656,7.35736929 10.7246097,7.7862387 10.6640625,8.3109809 L11.390625,8.3109809 C12.0162792,8.3109809 12.5082176,8.46486934 12.8664551,8.77265082 C13.2246925,9.08043231 13.4038086,9.53200657 13.4038086,10.1273872 C13.4038086,10.5512174 13.2448746,10.9472909 12.927002,11.3156196 C12.6091293,11.6839482 12.1726916,11.8681098 11.6176758,11.8681098 C10.7498329,11.8681098 10.1292336,11.5830378 9.75585938,11.0128852 C9.38248511,10.4427326 9.19580078,9.69347252 9.19580078,8.76508247 C9.19580078,8.10915471 9.33707541,7.51126029 9.61962891,6.97138129 C9.9021824,6.43150229 10.2452779,5.9496549 10.6489258,5.52582465 C11.0626648,5.09190321 11.5016253,4.72358007 11.9658203,4.42084418 C12.4300153,4.1181083 12.8185206,3.87087769 13.1313477,3.67914497 L13.6762695,4.58734809 Z M19.2768555,4.58734809 C18.8025692,4.85981039 18.4191095,5.09442718 18.1264648,5.29120551 C17.8338202,5.48798384 17.5361343,5.74782825 17.2333984,6.07074653 C16.9407537,6.38357361 16.7212735,6.70396429 16.5749512,7.03192817 C16.4286288,7.35989205 16.3251956,7.7862387 16.2646484,8.3109809 L16.9912109,8.3109809 C17.6168651,8.3109809 18.1088035,8.46486934 18.467041,8.77265082 C18.8252785,9.08043231 19.0043945,9.53200657 19.0043945,10.1273872 C19.0043945,10.5512174 18.8454606,10.9472909 18.5275879,11.3156196 C18.2097152,11.6839482 17.7732775,11.8681098 17.2182617,11.8681098 C16.3504188,11.8681098 15.7298196,11.5830378 15.3564453,11.0128852 C14.983071,10.4427326 14.7963867,9.69347252 14.7963867,8.76508247 C14.7963867,8.10915471 14.9376613,7.51126029 15.2202148,6.97138129 C15.5027683,6.43150229 15.8458639,5.9496549 16.2495117,5.52582465 C16.6632508,5.09190321 17.1022112,4.72358007 17.5664062,4.42084418 C18.0306013,4.1181083 18.4191065,3.87087769 18.7319336,3.67914497 L19.2768555,4.58734809 Z" id="“" fill="#FFFFFF"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/button-text-block-quote.svg b/res/img/button-text-block-quote.svg
deleted file mode 100644
index d70c261f5d..0000000000
--- a/res/img/button-text-block-quote.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="28px" height="16px" viewBox="0 0 28 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 39 (31667) - http://www.bohemiancoding.com/sketch -->
-    <title>BFC0418B-9081-4789-A231-B75953157748</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="Screens-revised" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="02_x-Chat-text-input-markdown-panel-MD_off" transform="translate(-390.000000, -745.000000)">
-            <g id="format-buttons-A-Copy" transform="translate(294.000000, 745.000000)">
-                <g id="button_text_quote" transform="translate(96.000000, 0.000000)">
-                    <rect id="Rectangle-108" fill-opacity="0.1" fill="#000000" x="0" y="0" width="28" height="16" rx="8"></rect>
-                    <path d="M13.6762695,4.58734809 C13.2019833,4.85981039 12.8185236,5.09442718 12.5258789,5.29120551 C12.2332342,5.48798384 11.9355484,5.74782825 11.6328125,6.07074653 C11.350259,6.37348242 11.1333015,6.69135033 10.9819336,7.02435981 C10.8305656,7.35736929 10.7246097,7.7862387 10.6640625,8.3109809 L11.390625,8.3109809 C12.0162792,8.3109809 12.5082176,8.46486934 12.8664551,8.77265082 C13.2246925,9.08043231 13.4038086,9.53200657 13.4038086,10.1273872 C13.4038086,10.5512174 13.2448746,10.9472909 12.927002,11.3156196 C12.6091293,11.6839482 12.1726916,11.8681098 11.6176758,11.8681098 C10.7498329,11.8681098 10.1292336,11.5830378 9.75585938,11.0128852 C9.38248511,10.4427326 9.19580078,9.69347252 9.19580078,8.76508247 C9.19580078,8.10915471 9.33707541,7.51126029 9.61962891,6.97138129 C9.9021824,6.43150229 10.2452779,5.9496549 10.6489258,5.52582465 C11.0626648,5.09190321 11.5016253,4.72358007 11.9658203,4.42084418 C12.4300153,4.1181083 12.8185206,3.87087769 13.1313477,3.67914497 L13.6762695,4.58734809 Z M19.2768555,4.58734809 C18.8025692,4.85981039 18.4191095,5.09442718 18.1264648,5.29120551 C17.8338202,5.48798384 17.5361343,5.74782825 17.2333984,6.07074653 C16.9407537,6.38357361 16.7212735,6.70396429 16.5749512,7.03192817 C16.4286288,7.35989205 16.3251956,7.7862387 16.2646484,8.3109809 L16.9912109,8.3109809 C17.6168651,8.3109809 18.1088035,8.46486934 18.467041,8.77265082 C18.8252785,9.08043231 19.0043945,9.53200657 19.0043945,10.1273872 C19.0043945,10.5512174 18.8454606,10.9472909 18.5275879,11.3156196 C18.2097152,11.6839482 17.7732775,11.8681098 17.2182617,11.8681098 C16.3504188,11.8681098 15.7298196,11.5830378 15.3564453,11.0128852 C14.983071,10.4427326 14.7963867,9.69347252 14.7963867,8.76508247 C14.7963867,8.10915471 14.9376613,7.51126029 15.2202148,6.97138129 C15.5027683,6.43150229 15.8458639,5.9496549 16.2495117,5.52582465 C16.6632508,5.09190321 17.1022112,4.72358007 17.5664062,4.42084418 C18.0306013,4.1181083 18.4191065,3.87087769 18.7319336,3.67914497 L19.2768555,4.58734809 Z" id="“" fill="#4A4A4A"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/button-text-bold-on.svg b/res/img/button-text-bold-on.svg
deleted file mode 100644
index 161e740e90..0000000000
--- a/res/img/button-text-bold-on.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="28px" height="16px" viewBox="0 0 28 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 39 (31667) - http://www.bohemiancoding.com/sketch -->
-    <title>01F3F9B2-8F38-4BAF-A345-AECAC3D88E79</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="Screens-revised" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="02_x-Chat-text-input-markdown-panel-MD_off-BUTTONS-ON" transform="translate(-294.000000, -745.000000)">
-            <g id="format-buttons-A-Copy" transform="translate(294.000000, 745.000000)">
-                <g id="button_text_bold_ON">
-                    <rect id="Rectangle-108" fill="#4A4A4A" x="0" y="0" width="28" height="16" rx="8"></rect>
-                    <path d="M10.9882812,3.92523872 L13.4321289,3.92523872 C14.5457412,3.92523872 15.3540828,4.0836844 15.8571777,4.40058051 C16.3602727,4.71747663 16.6118164,5.22145922 16.6118164,5.9125434 C16.6118164,6.38162127 16.5017101,6.76654581 16.2814941,7.06732856 C16.0612782,7.36811131 15.7685565,7.54893633 15.4033203,7.60980903 L15.4033203,7.66351997 C15.9010442,7.77452312 16.2600087,7.98220334 16.4802246,8.28656684 C16.7004406,8.59093034 16.8105469,8.99554869 16.8105469,9.50043403 C16.8105469,10.2165834 16.5518418,10.7751716 16.0344238,11.1762153 C15.5170059,11.5772589 14.8142948,11.7777778 13.9262695,11.7777778 L10.9882812,11.7777778 L10.9882812,3.92523872 Z M12.6533203,7.035102 L13.6201172,7.035102 C14.0712913,7.035102 14.3980296,6.96527848 14.6003418,6.82562934 C14.802654,6.6859802 14.9038086,6.45502548 14.9038086,6.13275825 C14.9038086,5.83197549 14.7937023,5.61623872 14.5734863,5.48554145 C14.3532704,5.35484418 14.005048,5.28949653 13.5288086,5.28949653 L12.6533203,5.28949653 L12.6533203,7.035102 Z M12.6533203,8.35639106 L12.6533203,10.4027778 L13.7382812,10.4027778 C14.1966169,10.4027778 14.5349924,10.3150508 14.753418,10.1395942 C14.9718435,9.96413758 15.0810547,9.69558558 15.0810547,9.33393012 C15.0810547,8.68223415 14.6155646,8.35639106 13.6845703,8.35639106 L12.6533203,8.35639106 Z" id="B" fill="#FFFFFF"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/button-text-bold.svg b/res/img/button-text-bold.svg
deleted file mode 100644
index 0fd0baa07e..0000000000
--- a/res/img/button-text-bold.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="28px" height="16px" viewBox="0 0 28 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 39 (31667) - http://www.bohemiancoding.com/sketch -->
-    <title>9BC64A5B-F157-43FF-BCC4-02D30CDF520B</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="Screens-revised" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="02_x-Chat-text-input-markdown-panel-MD_off" transform="translate(-294.000000, -745.000000)">
-            <g id="format-buttons-A-Copy" transform="translate(294.000000, 745.000000)">
-                <g id="button_text_bold">
-                    <rect id="Rectangle-108" fill-opacity="0.1" fill="#000000" x="0" y="0" width="28" height="16" rx="8"></rect>
-                    <path d="M10.9882812,3.92523872 L13.4321289,3.92523872 C14.5457412,3.92523872 15.3540828,4.0836844 15.8571777,4.40058051 C16.3602727,4.71747663 16.6118164,5.22145922 16.6118164,5.9125434 C16.6118164,6.38162127 16.5017101,6.76654581 16.2814941,7.06732856 C16.0612782,7.36811131 15.7685565,7.54893633 15.4033203,7.60980903 L15.4033203,7.66351997 C15.9010442,7.77452312 16.2600087,7.98220334 16.4802246,8.28656684 C16.7004406,8.59093034 16.8105469,8.99554869 16.8105469,9.50043403 C16.8105469,10.2165834 16.5518418,10.7751716 16.0344238,11.1762153 C15.5170059,11.5772589 14.8142948,11.7777778 13.9262695,11.7777778 L10.9882812,11.7777778 L10.9882812,3.92523872 Z M12.6533203,7.035102 L13.6201172,7.035102 C14.0712913,7.035102 14.3980296,6.96527848 14.6003418,6.82562934 C14.802654,6.6859802 14.9038086,6.45502548 14.9038086,6.13275825 C14.9038086,5.83197549 14.7937023,5.61623872 14.5734863,5.48554145 C14.3532704,5.35484418 14.005048,5.28949653 13.5288086,5.28949653 L12.6533203,5.28949653 L12.6533203,7.035102 Z M12.6533203,8.35639106 L12.6533203,10.4027778 L13.7382812,10.4027778 C14.1966169,10.4027778 14.5349924,10.3150508 14.753418,10.1395942 C14.9718435,9.96413758 15.0810547,9.69558558 15.0810547,9.33393012 C15.0810547,8.68223415 14.6155646,8.35639106 13.6845703,8.35639106 L12.6533203,8.35639106 Z" id="B" fill="#4A4A4A"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/button-text-bulleted-list-on.svg b/res/img/button-text-bulleted-list-on.svg
deleted file mode 100644
index d4a40e889c..0000000000
--- a/res/img/button-text-bulleted-list-on.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="28px" height="16px" viewBox="0 0 28 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 39 (31667) - http://www.bohemiancoding.com/sketch -->
-    <title>654917CF-20A4-49B6-B0A1-9875D7B733C8</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="Screens-revised" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="02_x-Chat-text-input-markdown-panel-MD_off-BUTTONS-ON" transform="translate(-422.000000, -745.000000)">
-            <g id="format-buttons-A-Copy" transform="translate(294.000000, 745.000000)">
-                <g id="button_text_bullet_ON" transform="translate(128.000000, 0.000000)">
-                    <rect id="Rectangle-108" fill="#4A4A4A" x="0" y="0" width="28" height="16" rx="8"></rect>
-                    <path d="M5.57421875,5.39496528 C5.57421875,4.79339977 5.71874855,4.33344343 6.0078125,4.01508247 C6.29687645,3.6967215 6.71288791,3.5375434 7.25585938,3.5375434 C7.7910183,3.5375434 8.20507666,3.69769805 8.49804688,4.01801215 C8.79101709,4.33832625 8.9375,4.79730604 8.9375,5.39496528 C8.9375,5.98871825 8.79004054,6.44769803 8.49511719,6.7719184 C8.20019384,7.09613877 7.78711203,7.25824653 7.25585938,7.25824653 C6.71679418,7.25824653 6.30175927,7.09613877 6.01074219,6.7719184 C5.71972511,6.44769803 5.57421875,5.98871825 5.57421875,5.39496528 L5.57421875,5.39496528 Z" id="•" fill="#FFFFFF"></path>
-                    <path d="M11.5,5.5 L19.5,5.5" id="Line" stroke="#FFFFFF" stroke-linecap="round"></path>
-                    <path d="M11.5,8.5 L19.5,8.5" id="Line-Copy" stroke="#FFFFFF" stroke-linecap="round"></path>
-                    <path d="M11.5,11.5 L19.5,11.5" id="Line-Copy-3" stroke="#FFFFFF" stroke-linecap="round"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/button-text-bulleted-list.svg b/res/img/button-text-bulleted-list.svg
deleted file mode 100644
index ae3e640d8e..0000000000
--- a/res/img/button-text-bulleted-list.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="28px" height="16px" viewBox="0 0 28 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 39 (31667) - http://www.bohemiancoding.com/sketch -->
-    <title>B7D94619-44BC-4184-A60A-DBC5BB54E5F9</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="Screens-revised" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="02_x-Chat-text-input-markdown-panel-MD_off" transform="translate(-422.000000, -745.000000)">
-            <g id="format-buttons-A-Copy" transform="translate(294.000000, 745.000000)">
-                <g id="button_text_bullet" transform="translate(128.000000, 0.000000)">
-                    <rect id="Rectangle-108" fill-opacity="0.1" fill="#000000" x="0" y="0" width="28" height="16" rx="8"></rect>
-                    <path d="M5.57421875,5.39496528 C5.57421875,4.79339977 5.71874855,4.33344343 6.0078125,4.01508247 C6.29687645,3.6967215 6.71288791,3.5375434 7.25585938,3.5375434 C7.7910183,3.5375434 8.20507666,3.69769805 8.49804688,4.01801215 C8.79101709,4.33832625 8.9375,4.79730604 8.9375,5.39496528 C8.9375,5.98871825 8.79004054,6.44769803 8.49511719,6.7719184 C8.20019384,7.09613877 7.78711203,7.25824653 7.25585938,7.25824653 C6.71679418,7.25824653 6.30175927,7.09613877 6.01074219,6.7719184 C5.71972511,6.44769803 5.57421875,5.98871825 5.57421875,5.39496528 L5.57421875,5.39496528 Z" id="•" fill="#4A4A4A"></path>
-                    <path d="M11.5,5.5 L19.5,5.5" id="Line" stroke="#4A4A4A" stroke-linecap="round"></path>
-                    <path d="M11.5,8.5 L19.5,8.5" id="Line-Copy" stroke="#4A4A4A" stroke-linecap="round"></path>
-                    <path d="M11.5,11.5 L19.5,11.5" id="Line-Copy-3" stroke="#4A4A4A" stroke-linecap="round"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/button-text-deleted-on.svg b/res/img/button-text-deleted-on.svg
deleted file mode 100644
index 2914fcabe6..0000000000
--- a/res/img/button-text-deleted-on.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="28px" height="16px" viewBox="0 0 28 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 39 (31667) - http://www.bohemiancoding.com/sketch -->
-    <title>69B11088-0F3A-4E14-BD9F-4FEF4115E99B</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="Screens-revised" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="02_x-Chat-text-input-markdown-panel-MD_off-BUTTONS-ON" transform="translate(-358.000000, -745.000000)">
-            <g id="format-buttons-A-Copy" transform="translate(294.000000, 745.000000)">
-                <g id="button_text_strike_ON" transform="translate(64.000000, 0.000000)">
-                    <rect id="Rectangle-108" fill="#4A4A4A" x="0" y="0" width="28" height="16" rx="8"></rect>
-                    <path d="M16.5107422,9.68842231 C16.5107422,10.3795065 16.2600937,10.9184008 15.7587891,11.3051215 C15.2574845,11.6918422 14.5771527,11.8851997 13.7177734,11.8851997 C12.7867792,11.8851997 12.0706405,11.7652464 11.5693359,11.5253364 L11.5693359,10.644477 C11.8916032,10.7805454 12.2425111,10.8879662 12.6220703,10.9667426 C13.0016295,11.0455191 13.3776023,11.0849067 13.75,11.0849067 C14.358727,11.0849067 14.8170558,10.9694293 15.125,10.7384711 C15.4329442,10.507513 15.5869141,10.1861457 15.5869141,9.77435981 C15.5869141,9.50222303 15.5323085,9.27932487 15.4230957,9.10565864 C15.3138829,8.9319924 15.1312676,8.77175638 14.8752441,8.62494575 C14.6192207,8.47813512 14.2298203,8.31163288 13.7070312,8.12543403 C12.9765588,7.86403949 12.4546728,7.55430952 12.1413574,7.19623481 C11.8280421,6.8381601 11.6713867,6.37087962 11.6713867,5.79437934 C11.6713867,5.18923309 11.8987607,4.70762983 12.3535156,4.34955512 C12.8082705,3.99148041 13.409827,3.81244575 14.1582031,3.81244575 C14.938806,3.81244575 15.656735,3.95567348 16.3120117,4.24213325 L16.0273438,5.03705512 C15.3792285,4.76491834 14.7490265,4.628852 14.1367188,4.628852 C13.6533179,4.628852 13.2755547,4.7326921 13.003418,4.94037543 C12.7312812,5.14805876 12.5952148,5.43630458 12.5952148,5.80512153 C12.5952148,6.07725831 12.6453446,6.30015647 12.7456055,6.4738227 C12.8458664,6.64748893 13.0150541,6.80682979 13.2531738,6.95185004 C13.4912935,7.0968703 13.8556291,7.25710633 14.3461914,7.43256293 C15.1697632,7.72618419 15.736408,8.04128521 16.0461426,8.37787543 C16.3558772,8.71446566 16.5107422,9.15131025 16.5107422,9.68842231 L16.5107422,9.68842231 Z" id="S-" fill="#FFFFFF"></path>
-                    <path d="M9.5,8.5 L18.7195444,7.5" id="Line" stroke="#FFFFFF" stroke-linecap="round" opacity="0.5" transform="translate(14.109772, 8.000000) scale(1, -1) translate(-14.109772, -8.000000) "></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/button-text-deleted.svg b/res/img/button-text-deleted.svg
deleted file mode 100644
index 5f262dc350..0000000000
--- a/res/img/button-text-deleted.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="28px" height="16px" viewBox="0 0 28 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 39 (31667) - http://www.bohemiancoding.com/sketch -->
-    <title>A34F2223-34C6-46AE-AA47-38EC8984E9B3</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="Screens-revised" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="02_x-Chat-text-input-markdown-panel-MD_off" transform="translate(-358.000000, -745.000000)">
-            <g id="format-buttons-A-Copy" transform="translate(294.000000, 745.000000)">
-                <g id="button_text_strike" transform="translate(64.000000, 0.000000)">
-                    <rect id="Rectangle-108" fill-opacity="0.1" fill="#000000" x="0" y="0" width="28" height="16" rx="8"></rect>
-                    <path d="M16.5107422,9.68842231 C16.5107422,10.3795065 16.2600937,10.9184008 15.7587891,11.3051215 C15.2574845,11.6918422 14.5771527,11.8851997 13.7177734,11.8851997 C12.7867792,11.8851997 12.0706405,11.7652464 11.5693359,11.5253364 L11.5693359,10.644477 C11.8916032,10.7805454 12.2425111,10.8879662 12.6220703,10.9667426 C13.0016295,11.0455191 13.3776023,11.0849067 13.75,11.0849067 C14.358727,11.0849067 14.8170558,10.9694293 15.125,10.7384711 C15.4329442,10.507513 15.5869141,10.1861457 15.5869141,9.77435981 C15.5869141,9.50222303 15.5323085,9.27932487 15.4230957,9.10565864 C15.3138829,8.9319924 15.1312676,8.77175638 14.8752441,8.62494575 C14.6192207,8.47813512 14.2298203,8.31163288 13.7070312,8.12543403 C12.9765588,7.86403949 12.4546728,7.55430952 12.1413574,7.19623481 C11.8280421,6.8381601 11.6713867,6.37087962 11.6713867,5.79437934 C11.6713867,5.18923309 11.8987607,4.70762983 12.3535156,4.34955512 C12.8082705,3.99148041 13.409827,3.81244575 14.1582031,3.81244575 C14.938806,3.81244575 15.656735,3.95567348 16.3120117,4.24213325 L16.0273438,5.03705512 C15.3792285,4.76491834 14.7490265,4.628852 14.1367188,4.628852 C13.6533179,4.628852 13.2755547,4.7326921 13.003418,4.94037543 C12.7312812,5.14805876 12.5952148,5.43630458 12.5952148,5.80512153 C12.5952148,6.07725831 12.6453446,6.30015647 12.7456055,6.4738227 C12.8458664,6.64748893 13.0150541,6.80682979 13.2531738,6.95185004 C13.4912935,7.0968703 13.8556291,7.25710633 14.3461914,7.43256293 C15.1697632,7.72618419 15.736408,8.04128521 16.0461426,8.37787543 C16.3558772,8.71446566 16.5107422,9.15131025 16.5107422,9.68842231 L16.5107422,9.68842231 Z" id="S-" fill="#4A4A4A"></path>
-                    <path d="M9.5,8.5 L18.7195444,7.5" id="Line" stroke="#4A4A4A" stroke-linecap="round" opacity="0.5" transform="translate(14.109772, 8.000000) scale(1, -1) translate(-14.109772, -8.000000) "></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/button-text-formatting.svg b/res/img/button-text-formatting.svg
deleted file mode 100644
index d697010d40..0000000000
--- a/res/img/button-text-formatting.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 18" style="enable-background:new 0 0 24 18;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#F6F6F6;}
-	.st1{enable-background:new    ;}
-	.st2{fill:#4A4A4A;}
-</style>
-<path id="Rectangle-111" class="st0" d="M9,0h6c5,0,9,4,9,9l0,0c0,5-4,9-9,9H9c-5,0-9-4-9-9l0,0C0,4,4,0,9,0z"/>
-<g class="st1">
-	<path class="st2" d="M11.3,13l-0.6-2H7.6L7,13H5l3-8.6h2.2l3,8.6H11.3z M10.3,9.4c-0.6-1.8-0.9-2.9-1-3.1S9.2,5.9,9.1,5.7
-		C9,6.2,8.6,7.5,8,9.4H10.3z"/>
-</g>
-<g class="st1">
-	<path class="st2" d="M15.8,6.5c0.4,0,0.7,0.1,1,0.3s0.5,0.5,0.7,0.8h0.1l0.4-1h0.7L17.3,13h-0.8l0.2-1.2h0
-		c-0.7,0.9-1.4,1.3-2.2,1.3c-0.5,0-1-0.2-1.3-0.6s-0.5-0.9-0.5-1.6c0-0.8,0.1-1.6,0.4-2.3s0.7-1.2,1.1-1.6S15.2,6.5,15.8,6.5z
-		 M14.7,12.3c0.4,0,0.8-0.2,1.1-0.5s0.7-0.8,0.9-1.4s0.4-1.2,0.4-1.7c0-0.4-0.1-0.7-0.3-1s-0.5-0.4-0.9-0.4c-0.4,0-0.8,0.2-1.1,0.5
-		S14.2,8.6,14,9.2s-0.3,1.2-0.3,1.8c0,0.4,0.1,0.8,0.3,1S14.4,12.3,14.7,12.3z"/>
-</g>
-</svg>
diff --git a/res/img/button-text-inline-code-on.svg b/res/img/button-text-inline-code-on.svg
deleted file mode 100644
index 8d1439c97b..0000000000
--- a/res/img/button-text-inline-code-on.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="28px" height="16px" viewBox="0 0 28 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
-    <title>B76754AB-42E6-48D2-9443-80CBC0DE02ED</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="Screens-revised" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="02_x-Chat-text-input-markdown-panel-MD_off-BUTTONS-ON" transform="translate(-422.000000, -745.000000)">
-            <g id="format-buttons-A-Copy" transform="translate(294.000000, 745.000000)">
-                <g id="button_text_code_ON" transform="translate(128.000000, 0.000000)">
-                    <rect id="Rectangle-108" fill="#4A4A4A" x="0" y="0" width="28" height="16" rx="8"></rect>
-                    <polygon id="/" fill="#FFFFFF" points="15.9262695 4.14746094 12.9990234 12 12.1074219 12 15.034668 4.14746094"></polygon>
-                    <g id="Group-5" opacity="0.5" transform="translate(17.000000, 5.000000)" stroke="#FFFFFF" stroke-linecap="round">
-                        <path d="M0.5,0.5 L2.97487373,2.97487373" id="Line"></path>
-                        <path d="M0.5,3.02512627 L2.97487373,5.5" id="Line-Copy-4" transform="translate(1.737437, 4.262563) scale(1, -1) translate(-1.737437, -4.262563) "></path>
-                    </g>
-                    <g id="Group-5-Copy" opacity="0.5" transform="translate(9.500000, 8.000000) scale(-1, 1) translate(-9.500000, -8.000000) translate(8.000000, 5.000000)" stroke="#FFFFFF" stroke-linecap="round">
-                        <path d="M0.5,0.5 L2.97487373,2.97487373" id="Line"></path>
-                        <path d="M0.5,3.02512627 L2.97487373,5.5" id="Line-Copy-4" transform="translate(1.737437, 4.262563) scale(1, -1) translate(-1.737437, -4.262563) "></path>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/button-text-inline-code.svg b/res/img/button-text-inline-code.svg
deleted file mode 100644
index 24026cb709..0000000000
--- a/res/img/button-text-inline-code.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="28px" height="16px" viewBox="0 0 28 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
-    <title>4CAFF494-61AE-4916-AFE8-D1E62F7CF0DE</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="Screens-revised" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="02_x-Chat-text-input-markdown-panel-MD_on" transform="translate(-422.000000, -745.000000)">
-            <g id="format-buttons-A-Copy" transform="translate(294.000000, 745.000000)">
-                <g id="button_text_code" transform="translate(128.000000, 0.000000)">
-                    <rect id="Rectangle-108" fill-opacity="0.1" fill="#000000" x="0" y="0" width="28" height="16" rx="8"></rect>
-                    <polygon id="/" fill-opacity="0.7" fill="#000000" points="15.9262695 4.14746094 12.9990234 12 12.1074219 12 15.034668 4.14746094"></polygon>
-                    <g id="Group-5" opacity="0.5" transform="translate(17.000000, 5.000000)" stroke="#4A4A4A" stroke-linecap="round">
-                        <path d="M0.5,0.5 L2.97487373,2.97487373" id="Line"></path>
-                        <path d="M0.5,3.02512627 L2.97487373,5.5" id="Line-Copy-4" transform="translate(1.737437, 4.262563) scale(1, -1) translate(-1.737437, -4.262563) "></path>
-                    </g>
-                    <g id="Group-5-Copy" opacity="0.5" transform="translate(9.500000, 8.000000) scale(-1, 1) translate(-9.500000, -8.000000) translate(8.000000, 5.000000)" stroke="#4A4A4A" stroke-linecap="round">
-                        <path d="M0.5,0.5 L2.97487373,2.97487373" id="Line"></path>
-                        <path d="M0.5,3.02512627 L2.97487373,5.5" id="Line-Copy-4" transform="translate(1.737437, 4.262563) scale(1, -1) translate(-1.737437, -4.262563) "></path>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/button-text-italic-on.svg b/res/img/button-text-italic-on.svg
deleted file mode 100644
index 15fe588596..0000000000
--- a/res/img/button-text-italic-on.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="28px" height="16px" viewBox="0 0 28 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 39 (31667) - http://www.bohemiancoding.com/sketch -->
-    <title>116426C2-0B55-480E-92B3-57D4B3ABAB90</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="Screens-revised" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="02_x-Chat-text-input-markdown-panel-MD_off-BUTTONS-ON" transform="translate(-326.000000, -745.000000)">
-            <g id="format-buttons-A-Copy" transform="translate(294.000000, 745.000000)">
-                <g id="button_text_italic_ON" transform="translate(32.000000, 0.000000)">
-                    <rect id="Rectangle-108" fill="#4A4A4A" x="0" y="0" width="28" height="16" rx="8"></rect>
-                    <polygon id="I" fill="#FFFFFF" points="12.4619141 11.7777778 14.1323242 3.92523872 15.034668 3.92523872 13.3642578 11.7777778"></polygon>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/button-text-italic.svg b/res/img/button-text-italic.svg
deleted file mode 100644
index b5722e827b..0000000000
--- a/res/img/button-text-italic.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="28px" height="16px" viewBox="0 0 28 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 39 (31667) - http://www.bohemiancoding.com/sketch -->
-    <title>9FBC844D-96CF-4DCB-B545-FCD23727218B</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="Screens-revised" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="02_x-Chat-text-input-markdown-panel-MD_off" transform="translate(-326.000000, -745.000000)">
-            <g id="format-buttons-A-Copy" transform="translate(294.000000, 745.000000)">
-                <g id="button_text_italic" transform="translate(32.000000, 0.000000)">
-                    <rect id="Rectangle-108" fill-opacity="0.1" fill="#000000" x="0" y="0" width="28" height="16" rx="8"></rect>
-                    <polygon id="I" fill="#4A4A4A" points="12.4619141 11.7777778 14.1323242 3.92523872 15.034668 3.92523872 13.3642578 11.7777778"></polygon>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/button-text-numbered-list-on.svg b/res/img/button-text-numbered-list-on.svg
deleted file mode 100644
index 869a2c2cc2..0000000000
--- a/res/img/button-text-numbered-list-on.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="28px" height="16px" viewBox="0 0 28 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 39 (31667) - http://www.bohemiancoding.com/sketch -->
-    <title>294F929B-31AA-4D0C-98B3-9CA96764060D</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="Screens-revised" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="02_x-Chat-text-input-markdown-panel-MD_off-BUTTONS-ON" transform="translate(-454.000000, -745.000000)">
-            <g id="format-buttons-A-Copy" transform="translate(294.000000, 745.000000)">
-                <g id="button_text_numbullet_ON" transform="translate(160.000000, 0.000000)">
-                    <rect id="Rectangle-108" fill="#4A4A4A" x="0" y="0" width="28" height="16" rx="8"></rect>
-                    <path d="M8.3046875,8.77777778 L7.09765625,8.77777778 L7.09765625,5.47309028 L7.109375,4.93012153 L7.12890625,4.33637153 C6.92838441,4.53689336 6.78906289,4.66840247 6.7109375,4.73090278 L6.0546875,5.25824653 L5.47265625,4.53168403 L7.3125,3.06684028 L8.3046875,3.06684028 L8.3046875,8.77777778 Z" id="1" fill="#FFFFFF"></path>
-                    <path d="M11.5,5.5 L19.5,5.5" id="Line" stroke="#FFFFFF" stroke-linecap="round"></path>
-                    <path d="M11.5,8.5 L19.5,8.5" id="Line-Copy" stroke="#FFFFFF" stroke-linecap="round"></path>
-                    <path d="M11.5,11.5 L19.5,11.5" id="Line-Copy-3" stroke="#FFFFFF" stroke-linecap="round"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/button-text-numbered-list.svg b/res/img/button-text-numbered-list.svg
deleted file mode 100644
index 8e5b8b87b6..0000000000
--- a/res/img/button-text-numbered-list.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="28px" height="16px" viewBox="0 0 28 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 39 (31667) - http://www.bohemiancoding.com/sketch -->
-    <title>F0F58459-A13A-48C5-9332-ABFB96726F05</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="Screens-revised" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="02_x-Chat-text-input-markdown-panel-MD_off" transform="translate(-454.000000, -745.000000)">
-            <g id="format-buttons-A-Copy" transform="translate(294.000000, 745.000000)">
-                <g id="button_text_numbullet" transform="translate(160.000000, 0.000000)">
-                    <rect id="Rectangle-108" fill-opacity="0.1" fill="#000000" x="0" y="0" width="28" height="16" rx="8"></rect>
-                    <path d="M8.3046875,8.77777778 L7.09765625,8.77777778 L7.09765625,5.47309028 L7.109375,4.93012153 L7.12890625,4.33637153 C6.92838441,4.53689336 6.78906289,4.66840247 6.7109375,4.73090278 L6.0546875,5.25824653 L5.47265625,4.53168403 L7.3125,3.06684028 L8.3046875,3.06684028 L8.3046875,8.77777778 Z" id="1" fill="#4A4A4A"></path>
-                    <path d="M11.5,5.5 L19.5,5.5" id="Line" stroke="#4A4A4A" stroke-linecap="round"></path>
-                    <path d="M11.5,8.5 L19.5,8.5" id="Line-Copy" stroke="#4A4A4A" stroke-linecap="round"></path>
-                    <path d="M11.5,11.5 L19.5,11.5" id="Line-Copy-3" stroke="#4A4A4A" stroke-linecap="round"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/button-text-underlined-on.svg b/res/img/button-text-underlined-on.svg
deleted file mode 100644
index 870be3ce6a..0000000000
--- a/res/img/button-text-underlined-on.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="28px" height="16px" viewBox="0 0 28 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
-    <title>FD84FF7C-43E4-4312-90AB-5A59AD018377</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="Screens-revised" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="02_x-Chat-text-input-markdown-panel-MD_off-BUTTONS-ON" transform="translate(-390.000000, -745.000000)">
-            <g id="format-buttons-A-Copy" transform="translate(294.000000, 745.000000)">
-                <g id="button_text_underline_ON" transform="translate(96.000000, 0.000000)">
-                    <rect id="Rectangle-108" fill="#4A4A4A" x="0" y="0" width="28" height="16" rx="8"></rect>
-                    <path d="M17.0092773,4.14746094 L17.0092773,9.22851562 C17.0092773,10.1237024 16.738935,10.8273086 16.1982422,11.3393555 C15.6575494,11.8514023 14.9145555,12.1074219 13.9692383,12.1074219 C13.0239211,12.1074219 12.2925644,11.849612 11.7751465,11.3339844 C11.2577285,10.8183568 10.9990234,10.1093795 10.9990234,9.20703125 L10.9990234,4.14746094 L11.9121094,4.14746094 L11.9121094,9.27148438 C11.9121094,9.92676109 12.091144,10.4298485 12.4492188,10.7807617 C12.8072935,11.1316749 13.3336554,11.3071289 14.0283203,11.3071289 C14.6907585,11.3071289 15.2010073,11.1307798 15.559082,10.7780762 C15.9171567,10.4253726 16.0961914,9.91959965 16.0961914,9.26074219 L16.0961914,4.14746094 L17.0092773,4.14746094 Z" id="U" fill="#FFFFFF"></path>
-                    <path d="M9.5,13.5 L18.7195444,13.5" id="Line" stroke="#4A4A4A" stroke-linecap="round" opacity="0.5" transform="translate(14.109772, 13.500000) scale(1, -1) translate(-14.109772, -13.500000) "></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/button-text-underlined.svg b/res/img/button-text-underlined.svg
deleted file mode 100644
index 26f448539c..0000000000
--- a/res/img/button-text-underlined.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="28px" height="16px" viewBox="0 0 28 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
-    <title>13E7EE68-9B16-4A3D-8F9F-31E4BAB7E438</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="Screens-revised" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="02_x-Chat-text-input-markdown-panel-MD_on" transform="translate(-390.000000, -745.000000)">
-            <g id="format-buttons-A-Copy" transform="translate(294.000000, 745.000000)">
-                <g id="button_text_underline" transform="translate(96.000000, 0.000000)">
-                    <rect id="Rectangle-108" fill-opacity="0.1" fill="#000000" x="0" y="0" width="28" height="16" rx="8"></rect>
-                    <path d="M17.0092773,4.14746094 L17.0092773,9.22851562 C17.0092773,10.1237024 16.738935,10.8273086 16.1982422,11.3393555 C15.6575494,11.8514023 14.9145555,12.1074219 13.9692383,12.1074219 C13.0239211,12.1074219 12.2925644,11.849612 11.7751465,11.3339844 C11.2577285,10.8183568 10.9990234,10.1093795 10.9990234,9.20703125 L10.9990234,4.14746094 L11.9121094,4.14746094 L11.9121094,9.27148438 C11.9121094,9.92676109 12.091144,10.4298485 12.4492188,10.7807617 C12.8072935,11.1316749 13.3336554,11.3071289 14.0283203,11.3071289 C14.6907585,11.3071289 15.2010073,11.1307798 15.559082,10.7780762 C15.9171567,10.4253726 16.0961914,9.91959965 16.0961914,9.26074219 L16.0961914,4.14746094 L17.0092773,4.14746094 Z" id="U" fill-opacity="0.7" fill="#000000"></path>
-                    <path d="M9.5,13.5 L18.7195444,13.5" id="Line" stroke="#4A4A4A" stroke-linecap="round" opacity="0.5" transform="translate(14.109772, 13.500000) scale(1, -1) translate(-14.109772, -13.500000) "></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/call.png b/res/img/call.png
deleted file mode 100644
index a7805e0596..0000000000
Binary files a/res/img/call.png and /dev/null differ
diff --git a/res/img/cancel-black.png b/res/img/cancel-black.png
deleted file mode 100644
index 87dcfd41a8..0000000000
Binary files a/res/img/cancel-black.png and /dev/null differ
diff --git a/res/img/cancel-black2.png b/res/img/cancel-black2.png
deleted file mode 100644
index a928c61b09..0000000000
Binary files a/res/img/cancel-black2.png and /dev/null differ
diff --git a/res/img/cancel.png b/res/img/cancel.png
deleted file mode 100644
index 2bda8ff5bf..0000000000
Binary files a/res/img/cancel.png and /dev/null differ
diff --git a/res/img/chevron-left.png b/res/img/chevron-left.png
deleted file mode 100644
index efb0065de9..0000000000
Binary files a/res/img/chevron-left.png and /dev/null differ
diff --git a/res/img/chevron-right.png b/res/img/chevron-right.png
deleted file mode 100644
index 18a4684e47..0000000000
Binary files a/res/img/chevron-right.png and /dev/null differ
diff --git a/res/img/chevron.png b/res/img/chevron.png
deleted file mode 100644
index 81236f91bc..0000000000
Binary files a/res/img/chevron.png and /dev/null differ
diff --git a/res/img/close-white.png b/res/img/close-white.png
deleted file mode 100644
index d8752ed9fe..0000000000
Binary files a/res/img/close-white.png and /dev/null differ
diff --git a/res/img/create-big.png b/res/img/create-big.png
deleted file mode 100644
index b7307a11c7..0000000000
Binary files a/res/img/create-big.png and /dev/null differ
diff --git a/res/img/create-big.svg b/res/img/create-big.svg
deleted file mode 100644
index 2450542b63..0000000000
--- a/res/img/create-big.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="26px" height="26px" viewBox="-1 -1 26 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: sketchtool 3.4 (381) - http://www.bohemiancoding.com/sketch -->
-    <title>icons_create_room</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="01-Sign-up" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="01_2-Sign-up-2" sketch:type="MSArtboardGroup" transform="translate(-14.000000, -653.000000)">
-            <g id="Left-panel" sketch:type="MSLayerGroup" transform="translate(-4.000000, 0.000000)">
-                <g id="right_bottom" transform="translate(0.000000, 626.000000)" sketch:type="MSShapeGroup">
-                    <g id="Group-Copy-29" transform="translate(18.000000, 27.000000)">
-                        <g id="Group-Copy-15">
-                            <g id="icons_create_room">
-                                <g id="Oval-1-Copy-7-+-Group-Copy-5-Copy-Copy-Copy-Copy-Copy-Copy-Copy-Copy-Copy-Copy-Copy" fill="#454545">
-                                    <circle id="Oval-1-Copy-7" cx="12" cy="12" r="12"></circle>
-                                </g>
-                                <path d="M7,12 L17,12" id="Line" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round"></path>
-                                <path d="M12,7 L12,17" id="Line" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round"></path>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/create.png b/res/img/create.png
deleted file mode 100644
index 2d6107ac50..0000000000
Binary files a/res/img/create.png and /dev/null differ
diff --git a/res/img/delete.png b/res/img/delete.png
deleted file mode 100644
index 8ff20a116d..0000000000
Binary files a/res/img/delete.png and /dev/null differ
diff --git a/res/img/directory-big.png b/res/img/directory-big.png
deleted file mode 100644
index 03cab69c4a..0000000000
Binary files a/res/img/directory-big.png and /dev/null differ
diff --git a/res/img/download.png b/res/img/download.png
deleted file mode 100644
index 1999ebf7ab..0000000000
Binary files a/res/img/download.png and /dev/null differ
diff --git a/res/img/e2e/blacklisted.svg b/res/img/e2e/blacklisted.svg
deleted file mode 100644
index ac99d23f05..0000000000
--- a/res/img/e2e/blacklisted.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12">
-    <defs>
-        <path id="a" d="M5 10A5 5 0 1 0 5 0a5 5 0 0 0 0 10zM2.5 3.5h5a1.5 1.5 0 0 1 0 3h-5a1.5 1.5 0 0 1 0-3z"/>
-    </defs>
-    <use fill="#F56679" fill-rule="evenodd" stroke="#F56679" stroke-linecap="round" stroke-linejoin="round" stroke-width="1" transform="translate(1 1)" xlink:href="#a"/>
-</svg>
diff --git a/res/img/e2e/lock-verified.svg b/res/img/e2e/lock-verified.svg
deleted file mode 100644
index 819dfacc49..0000000000
--- a/res/img/e2e/lock-verified.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="22" height="25" viewBox="0 0 22 25">
-    <g fill="none" fill-rule="evenodd" stroke="#7AC9A1" stroke-linecap="round" stroke-linejoin="round">
-        <path stroke-width="1" d="M8.23 21.01l-5.233-.007a1.995 1.995 0 0 1-1.997-2V11a2 2 0 0 1 2-2h14c1.259 0 2 .939 2 1M5 9V6a5 5 0 1 1 10 0v3"/>
-        <path fill="#7AC9A1" d="M15.5 24s5.5-2.4 5.5-6v-4.2L15.5 12 10 13.8V18c0 3.6 5.5 6 5.5 6z"/>
-    </g>
-</svg>
diff --git a/res/img/e2e/lock-warning.svg b/res/img/e2e/lock-warning.svg
deleted file mode 100644
index de2bded7f8..0000000000
--- a/res/img/e2e/lock-warning.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="23" height="25" viewBox="0 0 23 25">
-    <defs>
-        <path id="a" d="M15 23a6 6 0 1 0 0-12 6 6 0 0 0 0 12zm0-10.5a1.5 1.5 0 0 1 1.5 1.5v3a1.5 1.5 0 0 1-3 0v-3a1.5 1.5 0 0 1 1.5-1.5zm0 9a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd" stroke="#F56679" stroke-linecap="round" stroke-linejoin="round" transform="translate(1 1)">
-        <path stroke-width="1" d="M7.23 20.01l-5.233-.007a2 2 0 0 1-1.997-2V10a2 2 0 0 1 2-2h14c1.259 0 2 .939 2 1M4 8V5a5 5 0 1 1 10 0v3"/>
-        <use fill="#F56679" xlink:href="#a"/>
-    </g>
-</svg>
diff --git a/res/img/e2e/normal.svg b/res/img/e2e/normal.svg
index 5b848bc27f..23ca78e44d 100644
--- a/res/img/e2e/normal.svg
+++ b/res/img/e2e/normal.svg
@@ -1,3 +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 21C12 21 21 17.2 21 11.5V4.85L12 2L3 4.85V11.5C3 17.2 12 21 12 21Z" fill="#2E2F32" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.77777 8.24003V2.71114L7.99999 0.888916L14.2222 2.71114V8.24003C14.2222 13.8934 7.99999 15.1111 7.99999 15.1111C7.99999 15.1111 1.77777 13.8934 1.77777 8.24003Z" fill="#020202"/>
 </svg>
diff --git a/res/img/e2e/verified.svg b/res/img/e2e/verified.svg
index 464b443dcf..ac4827baed 100644
--- a/res/img/e2e/verified.svg
+++ b/res/img/e2e/verified.svg
@@ -1,4 +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 21C12 21 21 17.2 21 11.5V4.85L12 2L3 4.85V11.5C3 17.2 12 21 12 21Z" fill="#03B381" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17.2268 7.80652C17.6053 8.17175 17.6053 8.7639 17.2268 9.12913L11.4013 14.7502C11.0228 15.1154 10.4091 15.1154 10.0306 14.7502L10.0145 14.7342C10.0084 14.7286 10.0023 14.7229 9.99635 14.7171L7.32348 12.1381C6.92604 11.7546 6.92604 11.1328 7.32348 10.7493C7.72091 10.3658 8.36528 10.3658 8.76272 10.7493L10.7838 12.6995L15.8561 7.80652C16.2346 7.44129 16.8483 7.44129 17.2268 7.80652Z" fill="white"/>
+<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="M1.77783 2.71114V8.24003C1.77783 13.8934 8.00005 15.1111 8.00005 15.1111C8.00005 15.1111 14.2223 13.8934 14.2223 8.24003V2.71114L8.00005 0.888916L1.77783 2.71114ZM10.6139 4.90635C10.7827 4.74635 11.0494 4.75524 11.2094 4.92413C11.3516 5.08413 11.3516 5.32413 11.2272 5.48413L7.47608 10.0263L7.44941 10.0619C7.20052 10.3641 6.74719 10.4086 6.44497 10.1597C6.41812 10.1463 6.39635 10.1227 6.37581 10.1005C6.36914 10.0933 6.36261 10.0862 6.35608 10.0797L4.74719 8.23079C4.56941 8.01746 4.58719 7.69746 4.80052 7.51968C4.9783 7.35968 5.23608 7.35968 5.42274 7.48413L6.8183 8.46191L10.6139 4.90635Z" fill="#0DBD8B"/>
 </svg>
diff --git a/res/img/e2e/warning.svg b/res/img/e2e/warning.svg
index 209ae0f71f..d42922892a 100644
--- a/res/img/e2e/warning.svg
+++ b/res/img/e2e/warning.svg
@@ -1,5 +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 21C12 21 21 17.2 21 11.5V4.85L12 2L3 4.85V11.5C3 17.2 12 21 12 21Z" fill="#FF4B55" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
-<rect x="10.8" y="5.5" width="2.5" height="8" rx="1.25" fill="white"/>
-<rect x="10.8" y="15" width="2.5" height="2.5" rx="1.25" fill="white"/>
+<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="M1.77783 2.71114V8.24003C1.77783 13.8934 8.00005 15.1111 8.00005 15.1111C8.00005 15.1111 14.2223 13.8934 14.2223 8.24003V2.71114L8.00005 0.888916L1.77783 2.71114ZM7.92899 3.91112C7.42232 3.94668 7.04899 4.39113 7.09343 4.89779L7.37788 8.45335C7.40455 8.76446 7.64455 9.00446 7.95566 9.03113H8.00899C8.33788 9.03113 8.61343 8.78224 8.6401 8.45335L8.92455 4.89779V4.75557C8.87121 4.2489 8.42677 3.87557 7.92899 3.91112ZM8 11.5556C8.43201 11.5556 8.78222 11.2054 8.78222 10.7733C8.78222 10.3413 8.43201 9.99112 8 9.99112C7.56799 9.99112 7.21777 10.3413 7.21777 10.7733C7.21777 11.2054 7.56799 11.5556 8 11.5556Z" fill="#FF4B55"/>
 </svg>
diff --git a/res/img/edit.png b/res/img/edit.png
deleted file mode 100644
index 6f373d3f3d..0000000000
Binary files a/res/img/edit.png and /dev/null differ
diff --git a/res/img/edit.svg b/res/img/edit.svg
deleted file mode 100644
index 9674b31690..0000000000
--- a/res/img/edit.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="14.865319" viewBox="0 0 15.093 14.865319" width="15.093" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g style="fill:none;fill-rule:evenodd;stroke:#2e2f32;stroke-width:.75;stroke-linecap:round;stroke-linejoin:round;" transform="translate(-1048.2035 -582.14881)"><path d="m1055.75 596h6.75m-3.375-12.375a1.591 1.591 0 0 1 2.25 2.25l-9.375 9.375-3 .75.75-3z"/></g></svg>
diff --git a/res/img/element-icons/call/fullscreen.svg b/res/img/element-icons/call/fullscreen.svg
new file mode 100644
index 0000000000..d2a4c2aa8c
--- /dev/null
+++ b/res/img/element-icons/call/fullscreen.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="M10 4H4V10" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14 20L20 20L20 14" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4 4L9.5 9.5" stroke="white" stroke-width="2" stroke-linecap="round"/>
+<path d="M14.5 14.5L20 20" stroke="white" stroke-width="2" stroke-linecap="round"/>
+</svg>
diff --git a/res/img/element-icons/call/hangup.svg b/res/img/element-icons/call/hangup.svg
new file mode 100644
index 0000000000..1a1b82a1d7
--- /dev/null
+++ b/res/img/element-icons/call/hangup.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.0084 7.75648C10.3211 7.69163 6.85136 8.12949 6.00781 8.35133C5.95792 8.36445 5.90044 8.37912 5.83616 8.39552C4.54101 8.72607 0.48272 9.76183 0.0442423 13.0436C-0.295466 15.5862 1.40575 16.3558 2.25618 16.2386C2.84479 16.1648 4.5301 15.8983 6.08724 15.6189C7.61629 15.3446 7.61551 14.3359 7.61499 13.6538C7.61498 13.6413 7.61497 13.6288 7.61497 13.6165L7.61497 12.2453C7.61497 11.8961 7.94315 11.6942 8.3958 11.6396C9.99822 11.422 11.3359 11.4213 12.0055 11.4213L12.0112 11.4213C12.6807 11.4213 14.0018 11.422 15.6042 11.6396C16.0569 11.6942 16.385 11.8961 16.385 12.2453L16.385 13.6165C16.385 13.6289 16.385 13.6413 16.385 13.6538C16.3845 14.3359 16.3837 15.3446 17.9128 15.619C19.4699 15.8983 21.1552 16.1648 21.7438 16.2386C22.5942 16.3558 24.2955 15.5862 23.9558 13.0436C23.5173 9.76183 19.459 8.72608 18.1638 8.39553C18.0996 8.37913 18.0421 8.36446 17.9922 8.35134C17.1487 8.1295 13.6956 7.69163 12.0084 7.75648Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/call/video-call.svg b/res/img/element-icons/call/video-call.svg
new file mode 100644
index 0000000000..0c1cd2d419
--- /dev/null
+++ b/res/img/element-icons/call/video-call.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 7C0 5.34315 1.34315 4 3 4H14C15.6569 4 17 5.34315 17 7V17C17 18.6569 15.6569 20 14 20H3C1.34315 20 0 18.6569 0 17V7Z" 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/video-muted.svg b/res/img/element-icons/call/video-muted.svg
new file mode 100644
index 0000000000..d2aea71d11
--- /dev/null
+++ b/res/img/element-icons/call/video-muted.svg
@@ -0,0 +1,5 @@
+<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-call.svg b/res/img/element-icons/call/voice-call.svg
new file mode 100644
index 0000000000..d32b703523
--- /dev/null
+++ b/res/img/element-icons/call/voice-call.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="M6.02698 13.9613C7.16801 15.1932 9.91484 17.3263 10.6635 17.7641C10.7078 17.79 10.7585 17.8201 10.8152 17.8538C11.9576 18.5329 15.5373 20.6609 18.1454 18.6694C20.1661 17.1266 19.5091 15.3909 18.8289 14.875C18.3633 14.5128 16.9914 13.5145 15.7006 12.6152C14.4331 11.7322 13.7268 12.4397 13.2492 12.918C13.2404 12.9268 13.2317 12.9355 13.2231 12.9442L12.2621 13.9051C12.0174 14.1498 11.6451 14.0605 11.2886 13.7804C10.0092 12.8061 9.06809 11.8659 8.59723 11.395L8.59326 11.391C8.12246 10.9202 7.19387 9.99076 6.21957 8.7114C5.93949 8.35485 5.85018 7.9826 6.09489 7.73789L7.05586 6.77693C7.06448 6.7683 7.0732 6.7596 7.08199 6.75082C7.56034 6.27321 8.2678 5.56684 7.38479 4.29937C6.48555 3.0086 5.4872 1.6367 5.125 1.17106C4.60907 0.490937 2.87345 -0.166084 1.33056 1.85458C-0.660932 4.46274 1.46708 8.04241 2.1462 9.18482C2.17991 9.24152 2.21005 9.29221 2.23593 9.33649C2.67367 10.0851 4.79507 12.8203 6.02698 13.9613Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/call/voice-muted.svg b/res/img/element-icons/call/voice-muted.svg
new file mode 100644
index 0000000000..32abafb04a
--- /dev/null
+++ b/res/img/element-icons/call/voice-muted.svg
@@ -0,0 +1,4 @@
+<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
new file mode 100644
index 0000000000..e664080217
--- /dev/null
+++ b/res/img/element-icons/call/voice-unmuted.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="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/cloud-off.svg b/res/img/element-icons/cloud-off.svg
new file mode 100644
index 0000000000..7faea7d3b5
--- /dev/null
+++ b/res/img/element-icons/cloud-off.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="M1.53033 0.46967C1.23744 0.176777 0.762563 0.176777 0.46967 0.46967C0.176777 0.762563 0.176777 1.23744 0.46967 1.53033L4.3982 5.45886C3.81109 6.13809 3.38896 7.01315 3.21555 7.99387C1.96379 8.20624 1 9.465 1 10.981C1 12.6455 2.16209 14 3.59014 14H12.9393L16.4697 17.5303C16.7626 17.8232 17.2374 17.8232 17.5303 17.5303C17.8232 17.2374 17.8232 16.7626 17.5303 16.4697L1.53033 0.46967ZM17 10.9817C16.998 11.8303 16.6946 12.5985 16.2081 13.1475L7.07635 4.01569C7.18805 4.00529 7.30083 4 7.41451 4C8.75982 4 9.99711 4.71787 10.8072 5.94503C11.0993 5.85476 11.4011 5.80939 11.7058 5.80939C13.0303 5.80939 14.2138 6.65743 14.8199 8.00337C16.0519 8.23522 17 9.48685 17 10.9817Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/community-members.svg b/res/img/element-icons/community-members.svg
new file mode 100644
index 0000000000..553ba3b1af
--- /dev/null
+++ b/res/img/element-icons/community-members.svg
@@ -0,0 +1,8 @@
+<svg width="24" height="24" viewBox="0 0 24 24" 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="M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12ZM16.3804 13.412C17.59 13.412 18.5705 12.3498 18.5705 11.0394C18.5705 9.72896 17.59 8.66667 16.3804 8.66667C15.1708 8.66667 14.1902 9.72896 14.1902 11.0394C14.1902 12.3498 15.1708 13.412 16.3804 13.412ZM12.8333 17.7461C12.8333 15.7941 11.4623 14.1623 9.63071 13.7611C9.31877 13.6991 8.99645 13.6667 8.66667 13.6667C6.66814 13.6667 4.94347 14.8594 4.14307 16.5833L7.83334 20.4483H12.8333L12.8333 17.7461ZM14.8333 20.4483H16.3804L20.0844 16.5833C19.3081 15.3356 17.9394 14.5071 16.3804 14.5071C15.5955 14.5071 14.8588 14.7171 14.2216 15.0849C14.6134 15.8884 14.8333 16.7913 14.8333 17.7461L14.8333 20.4483ZM11.1667 9.70833C11.1667 11.2041 10.0474 12.4167 8.66669 12.4167C7.28597 12.4167 6.16669 11.2041 6.16669 9.70833C6.16669 8.21256 7.28597 7 8.66669 7C10.0474 7 11.1667 8.21256 11.1667 9.70833Z"/>
+</mask>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12ZM16.3804 13.412C17.59 13.412 18.5705 12.3498 18.5705 11.0394C18.5705 9.72896 17.59 8.66667 16.3804 8.66667C15.1708 8.66667 14.1902 9.72896 14.1902 11.0394C14.1902 12.3498 15.1708 13.412 16.3804 13.412ZM12.8333 17.7461C12.8333 15.7941 11.4623 14.1623 9.63071 13.7611C9.31877 13.6991 8.99645 13.6667 8.66667 13.6667C6.66814 13.6667 4.94347 14.8594 4.14307 16.5833L7.83334 20.4483H12.8333L12.8333 17.7461ZM14.8333 20.4483H16.3804L20.0844 16.5833C19.3081 15.3356 17.9394 14.5071 16.3804 14.5071C15.5955 14.5071 14.8588 14.7171 14.2216 15.0849C14.6134 15.8884 14.8333 16.7913 14.8333 17.7461L14.8333 20.4483ZM11.1667 9.70833C11.1667 11.2041 10.0474 12.4167 8.66669 12.4167C7.28597 12.4167 6.16669 11.2041 6.16669 9.70833C6.16669 8.21256 7.28597 7 8.66669 7C10.0474 7 11.1667 8.21256 11.1667 9.70833Z" fill="black"/>
+<path d="M9.63071 13.7611L9.9873 12.1331L9.97144 12.1296L9.95552 12.1264L9.63071 13.7611ZM12.8333 17.7461H11.1667V17.7461L12.8333 17.7461ZM4.14307 16.5833L2.63139 15.8815L2.15278 16.9123L2.93762 17.7343L4.14307 16.5833ZM7.83334 20.4483L6.62789 21.5993L7.1203 22.115H7.83334V20.4483ZM12.8333 20.4483V22.115H14.5L14.5 20.4483L12.8333 20.4483ZM16.3804 20.4483V22.115H17.0916L17.5837 21.6015L16.3804 20.4483ZM14.8333 20.4483L13.1667 20.4483L13.1667 22.115H14.8333V20.4483ZM20.0844 16.5833L21.2877 17.7365L22.1834 16.802L21.4996 15.7029L20.0844 16.5833ZM14.2216 15.0849L13.3884 13.6415L12.0423 14.4185L12.7236 15.8155L14.2216 15.0849ZM14.8333 17.7461H13.1667V17.7461L14.8333 17.7461ZM12 23.6667C18.4433 23.6667 23.6667 18.4433 23.6667 12H20.3333C20.3333 16.6024 16.6024 20.3333 12 20.3333V23.6667ZM0.333333 12C0.333333 18.4433 5.55668 23.6667 12 23.6667V20.3333C7.39763 20.3333 3.66667 16.6024 3.66667 12H0.333333ZM12 0.333333C5.55668 0.333333 0.333333 5.55668 0.333333 12H3.66667C3.66667 7.39763 7.39763 3.66667 12 3.66667V0.333333ZM23.6667 12C23.6667 5.55668 18.4433 0.333333 12 0.333333V3.66667C16.6024 3.66667 20.3333 7.39763 20.3333 12H23.6667ZM16.9039 11.0394C16.9039 11.5574 16.5464 11.7454 16.3804 11.7454V15.0787C18.6335 15.0787 20.2372 13.1421 20.2372 11.0394H16.9039ZM16.3804 10.3333C16.5464 10.3333 16.9039 10.5213 16.9039 11.0394H20.2372C20.2372 8.9366 18.6335 7.00001 16.3804 7.00001V10.3333ZM15.8569 11.0394C15.8569 10.5213 16.2143 10.3333 16.3804 10.3333V7.00001C14.1272 7.00001 12.5235 8.9366 12.5235 11.0394H15.8569ZM16.3804 11.7454C16.2143 11.7454 15.8569 11.5574 15.8569 11.0394H12.5235C12.5235 13.1421 14.1272 15.0787 16.3804 15.0787V11.7454ZM9.27412 15.3892C10.357 15.6264 11.1667 16.5936 11.1667 17.7461H14.5C14.5 14.9945 12.5676 12.6982 9.9873 12.1331L9.27412 15.3892ZM8.66667 15.3333C8.88675 15.3333 9.10029 15.355 9.3059 15.3958L9.95552 12.1264C9.53724 12.0433 9.10614 12 8.66667 12V15.3333ZM5.65474 17.2852C6.19734 16.1166 7.3526 15.3333 8.66667 15.3333V12C5.98369 12 3.68961 13.6023 2.63139 15.8815L5.65474 17.2852ZM9.03878 19.2974L5.34851 15.4324L2.93762 17.7343L6.62789 21.5993L9.03878 19.2974ZM12.8333 18.7817H7.83334V22.115H12.8333V18.7817ZM11.1667 17.7461L11.1667 20.4483L14.5 20.4483L14.5 17.7461L11.1667 17.7461ZM16.3804 18.7817H14.8333V22.115H16.3804V18.7817ZM18.8811 15.4301L15.1771 19.2951L17.5837 21.6015L21.2877 17.7365L18.8811 15.4301ZM16.3804 16.1738C17.3311 16.1738 18.1797 16.6768 18.6693 17.4638L21.4996 15.7029C20.4366 13.9944 18.5477 12.8405 16.3804 12.8405V16.1738ZM15.0549 16.5284C15.4465 16.3023 15.8969 16.1738 16.3804 16.1738V12.8405C15.2941 12.8405 14.2711 13.132 13.3884 13.6415L15.0549 16.5284ZM16.5 17.7461C16.5 16.5328 16.2201 15.3806 15.7196 14.3544L12.7236 15.8155C13.0068 16.3963 13.1667 17.0498 13.1667 17.7461H16.5ZM16.5 20.4483L16.5 17.7461L13.1667 17.7461L13.1667 20.4483L16.5 20.4483ZM8.66669 14.0833C11.091 14.0833 12.8334 11.9965 12.8334 9.70833H9.50002C9.50002 10.4117 9.00383 10.75 8.66669 10.75V14.0833ZM4.50002 9.70833C4.50002 11.9965 6.2424 14.0833 8.66669 14.0833V10.75C8.32955 10.75 7.83335 10.4117 7.83335 9.70833H4.50002ZM8.66669 5.33333C6.2424 5.33333 4.50002 7.42021 4.50002 9.70833H7.83335C7.83335 9.00492 8.32955 8.66667 8.66669 8.66667V5.33333ZM12.8334 9.70833C12.8334 7.42021 11.091 5.33333 8.66669 5.33333V8.66667C9.00383 8.66667 9.50002 9.00492 9.50002 9.70833H12.8334Z" fill="black" mask="url(#path-1-inside-1)"/>
+<path d="M21 12C21 16.9706 16.9706 21 12 21C7.02944 21 3 16.9706 3 12C3 7.02944 7.02944 3 12 3C16.9706 3 21 7.02944 21 12Z" stroke="black" stroke-width="2"/>
+</svg>
diff --git a/res/img/element-icons/community-rooms.svg b/res/img/element-icons/community-rooms.svg
new file mode 100644
index 0000000000..570b45a488
--- /dev/null
+++ b/res/img/element-icons/community-rooms.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="M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12ZM10.5253 6.00581C11.0743 6.06524 11.4713 6.55853 11.4118 7.10761L11.2234 8.84821H13.3843L13.596 6.89239C13.6554 6.34332 14.1487 5.94638 14.6978 6.00581C15.2469 6.06524 15.6438 6.55853 15.5844 7.10761L15.396 8.84821H16.3C16.8523 8.84821 17.3 9.29592 17.3 9.84821C17.3 10.4005 16.8523 10.8482 16.3 10.8482H15.1795L14.9319 13.1362H16.3C16.8523 13.1362 17.3 13.5839 17.3 14.1362C17.3 14.6884 16.8523 15.1362 16.3 15.1362H14.7154L14.502 17.1076C14.4426 17.6567 13.9493 18.0536 13.4002 17.9942C12.8512 17.9348 12.4542 17.4415 12.5136 16.8924L12.7037 15.1362H10.5429L10.3295 17.1076C10.2701 17.6567 9.77677 18.0536 9.22769 17.9942C8.67861 17.9348 8.28167 17.4415 8.3411 16.8924L8.53119 15.1362H7.5C6.94772 15.1362 6.5 14.6884 6.5 14.1362C6.5 13.5839 6.94772 13.1362 7.5 13.1362H8.74766L8.9953 10.8482H7.93922C7.38693 10.8482 6.93922 10.4005 6.93922 9.84821C6.93922 9.29592 7.38693 8.84821 7.93922 8.84821H9.21177L9.42345 6.89239C9.48288 6.34332 9.97618 5.94638 10.5253 6.00581ZM10.7593 13.1362H12.9202L13.1678 10.8482H11.007L10.7593 13.1362Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/context-menu.svg b/res/img/element-icons/context-menu.svg
new file mode 100644
index 0000000000..76a28d50d0
--- /dev/null
+++ b/res/img/element-icons/context-menu.svg
@@ -0,0 +1,5 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="4.25" cy="9" r="1.25" fill="black"/>
+<circle cx="9" cy="9" r="1.25" fill="black"/>
+<circle cx="13.75" cy="9" r="1.25" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/hide.svg b/res/img/element-icons/hide.svg
new file mode 100644
index 0000000000..8ea50a028f
--- /dev/null
+++ b/res/img/element-icons/hide.svg
@@ -0,0 +1,5 @@
+<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="M1.74889 6.95039C2.29001 6.28246 2.98613 5.54443 3.83039 4.88884L5.69202 6.75047C5.2553 7.39143 5 8.1659 5 9C5 11.2091 6.79086 13 9 13C9.8341 13 10.6086 12.7447 11.2495 12.308L12.9251 13.9836C11.8136 14.5897 10.5052 15 9 15C5.51954 15 3.0914 12.806 1.7156 11.0714C0.745735 9.84863 0.766473 8.16305 1.74889 6.95039ZM12.9305 9.74631L15.3314 12.1473C15.6913 11.7844 16.0089 11.4187 16.2844 11.0714C17.2543 9.84863 17.2335 8.16305 16.2511 6.95039C14.8432 5.21247 12.3858 3 9 3C8.13025 3 7.32178 3.14599 6.57662 3.39243L8.25369 5.0695C8.49547 5.02387 8.74495 5 9 5C11.2091 5 13 6.79086 13 9C13 9.25505 12.9761 9.50453 12.9305 9.74631Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.15892 8.21741C7.05661 8.45779 7 8.7223 7 9.00003C7 10.1046 7.89543 11 9 11C9.27773 11 9.54224 10.9434 9.78262 10.8411L7.15892 8.21741Z" fill="black"/>
+<path d="M1 1L17 17" stroke="black" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round"/>
+</svg>
diff --git a/res/img/element-icons/leave.svg b/res/img/element-icons/leave.svg
new file mode 100644
index 0000000000..773e27d4ce
--- /dev/null
+++ b/res/img/element-icons/leave.svg
@@ -0,0 +1,7 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 4L18.2139 2.44654C19.1211 2.21972 20 2.90592 20 3.84112V20.1589C20 21.0941 19.1211 21.7803 18.2139 21.5535L12 20V4Z" fill="black"/>
+<mask id="path-2-inside-1" fill="white">
+<rect x="4" y="4" width="10" height="16" rx="1.4375"/>
+</mask>
+<rect x="4" y="4" width="10" height="16" rx="1.4375" stroke="black" stroke-width="4" mask="url(#path-2-inside-1)"/>
+</svg>
diff --git a/res/img/element-icons/notifications.svg b/res/img/element-icons/notifications.svg
new file mode 100644
index 0000000000..7002782129
--- /dev/null
+++ b/res/img/element-icons/notifications.svg
@@ -0,0 +1,5 @@
+<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="M10.2375 19.5C10.1625 19.7 10.125 19.9 10.125 20.125C10.125 21.1625 10.9625 22 12 22C13.0375 22 13.875 21.1625 13.875 20.125C13.875 19.9 13.825 19.7 13.7625 19.5H10.2375Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.6125 16.0625C18.8625 15.625 18.25 14.8875 18.25 13.75V9.5C18.25 6.05 15.3 3.25 12 3.25C8.7 3.25 5.75 6.05 5.75 9.5V13.75C5.75 14.875 5.125 15.625 4.3875 16.0625C3.8875 16.3625 3.25 16.775 3.25 17.275C3.25 17.85 3.6125 18.2375 4.3625 18.2375H12H19.6375C20.3875 18.2375 20.75 17.8375 20.75 17.275C20.75 16.775 20.125 16.3625 19.6125 16.0625Z" fill="black"/>
+<path d="M12 4.5C12.6904 4.5 13.25 3.94036 13.25 3.25C13.25 2.55964 12.6904 2 12 2C11.3096 2 10.75 2.55964 10.75 3.25C10.75 3.94036 11.3096 4.5 12 4.5Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/room/composer/attach.svg b/res/img/element-icons/room/composer/attach.svg
new file mode 100644
index 0000000000..0cac44d29f
--- /dev/null
+++ b/res/img/element-icons/room/composer/attach.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="M15.8155 13.0336L11.2282 17.4193C9.08205 19.45 5.53015 19.6024 3.45617 17.4193C1.4888 15.3484 1.48412 12.0136 3.63032 9.98294L11.8691 2.10597C13.2999 0.752226 15.5435 0.535035 16.984 2.05147C18.5968 3.7491 18.1298 5.99061 16.699 7.34435L8.6284 14.9682C7.913 15.645 6.7551 15.7233 6.03771 14.9682C5.34842 14.2426 5.45967 13.0625 6.17507 12.3856L10.9045 7.86398" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/res/img/element-icons/room/composer/emoji.svg b/res/img/element-icons/room/composer/emoji.svg
new file mode 100644
index 0000000000..9613d9edd9
--- /dev/null
+++ b/res/img/element-icons/room/composer/emoji.svg
@@ -0,0 +1,7 @@
+<svg width="20" height="20" viewBox="0 0 20 20" 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="M10 20C15.5228 20 20 15.5228 20 10C20 4.47715 15.5228 0 10 0C4.47715 0 0 4.47715 0 10C0 15.5228 4.47715 20 10 20ZM13.389 11.7659C13.6794 11.3162 14.2793 11.187 14.729 11.4774C15.1788 11.7677 15.308 12.3676 15.0176 12.8174C13.9565 14.461 12.1059 15.5526 9.99965 15.5526C7.89343 15.5526 6.04281 14.461 4.98167 12.8174C4.69133 12.3677 4.82053 11.7677 5.27025 11.4774C5.71997 11.187 6.31991 11.3162 6.61025 11.7659C7.32946 12.88 8.57908 13.6141 9.99965 13.6141C11.4202 13.6141 12.6698 12.88 13.389 11.7659ZM8 8C8 8.82843 7.44036 9.5 6.75 9.5C6.05964 9.5 5.5 8.82843 5.5 8C5.5 7.17157 6.05964 6.5 6.75 6.5C7.44036 6.5 8 7.17157 8 8ZM13.25 9.5C13.9404 9.5 14.5 8.82843 14.5 8C14.5 7.17157 13.9404 6.5 13.25 6.5C12.5596 6.5 12 7.17157 12 8C12 8.82843 12.5596 9.5 13.25 9.5Z"/>
+</mask>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10 20C15.5228 20 20 15.5228 20 10C20 4.47715 15.5228 0 10 0C4.47715 0 0 4.47715 0 10C0 15.5228 4.47715 20 10 20ZM13.389 11.7659C13.6794 11.3162 14.2793 11.187 14.729 11.4774C15.1788 11.7677 15.308 12.3676 15.0176 12.8174C13.9565 14.461 12.1059 15.5526 9.99965 15.5526C7.89343 15.5526 6.04281 14.461 4.98167 12.8174C4.69133 12.3677 4.82053 11.7677 5.27025 11.4774C5.71997 11.187 6.31991 11.3162 6.61025 11.7659C7.32946 12.88 8.57908 13.6141 9.99965 13.6141C11.4202 13.6141 12.6698 12.88 13.389 11.7659ZM8 8C8 8.82843 7.44036 9.5 6.75 9.5C6.05964 9.5 5.5 8.82843 5.5 8C5.5 7.17157 6.05964 6.5 6.75 6.5C7.44036 6.5 8 7.17157 8 8ZM13.25 9.5C13.9404 9.5 14.5 8.82843 14.5 8C14.5 7.17157 13.9404 6.5 13.25 6.5C12.5596 6.5 12 7.17157 12 8C12 8.82843 12.5596 9.5 13.25 9.5Z" fill="black"/>
+<path d="M14.1748 11.4164C14.0254 11.6478 14.0919 11.9565 14.3233 12.1059C14.5546 12.2553 14.8633 12.1888 15.0127 11.9574L14.1748 11.4164ZM15.148 11.7479C15.2974 11.5165 15.2309 11.2078 14.9995 11.0584C14.7681 10.909 14.4595 10.9755 14.3101 11.2069L15.148 11.7479ZM15.0127 11.9574L15.148 11.7479L14.3101 11.2069L14.1748 11.4164L15.0127 11.9574ZM14.729 11.4774L15.27 10.6394L15.27 10.6394L14.729 11.4774ZM13.389 11.7659L12.5511 11.225V11.225L13.389 11.7659ZM15.0176 12.8174L14.1797 12.2764V12.2764L15.0176 12.8174ZM4.98167 12.8174L5.8196 12.2764L5.8196 12.2764L4.98167 12.8174ZM5.27025 11.4774L4.72928 10.6394L4.72928 10.6394L5.27025 11.4774ZM6.61025 11.7659L5.77233 12.3069L6.61025 11.7659ZM19.0026 10C19.0026 14.972 14.972 19.0026 10 19.0026V20.9974C16.0737 20.9974 20.9974 16.0737 20.9974 10H19.0026ZM10 0.997378C14.972 0.997378 19.0026 5.02799 19.0026 10H20.9974C20.9974 3.92632 16.0737 -0.997378 10 -0.997378V0.997378ZM0.997378 10C0.997378 5.02799 5.02799 0.997378 10 0.997378V-0.997378C3.92632 -0.997378 -0.997378 3.92632 -0.997378 10H0.997378ZM10 19.0026C5.02799 19.0026 0.997378 14.972 0.997378 10H-0.997378C-0.997378 16.0737 3.92632 20.9974 10 20.9974V19.0026ZM15.27 10.6394C14.3575 10.0503 13.1402 10.3125 12.5511 11.225L14.227 12.3069C14.2259 12.3086 14.2229 12.312 14.2187 12.315C14.215 12.3174 14.2118 12.3186 14.2092 12.3192C14.2067 12.3197 14.2033 12.32 14.1989 12.3192C14.1939 12.3183 14.1898 12.3164 14.1881 12.3153L15.27 10.6394ZM15.8555 13.3583C16.4447 12.4458 16.1825 11.2286 15.27 10.6394L14.1881 12.3153C14.1863 12.3142 14.1829 12.3113 14.18 12.307C14.1775 12.3033 14.1764 12.3001 14.1758 12.2976C14.1753 12.2951 14.175 12.2917 14.1758 12.2873C14.1767 12.2822 14.1786 12.2781 14.1797 12.2764L15.8555 13.3583ZM9.99965 16.55C12.4589 16.55 14.6186 15.2742 15.8555 13.3583L14.1797 12.2764C13.2943 13.6478 11.7528 14.5552 9.99965 14.5552V16.55ZM4.14375 13.3583C5.38067 15.2742 7.54041 16.55 9.99965 16.55V14.5552C8.24645 14.5552 6.70495 13.6478 5.8196 12.2764L4.14375 13.3583ZM4.72928 10.6394C3.81679 11.2286 3.55464 12.4458 4.14375 13.3583L5.8196 12.2764C5.8207 12.2781 5.82261 12.2822 5.8235 12.2873C5.82426 12.2917 5.824 12.2951 5.82346 12.2976C5.82292 12.3001 5.82175 12.3033 5.81926 12.307C5.81635 12.3113 5.81294 12.3142 5.81122 12.3153L4.72928 10.6394ZM7.44818 11.225C6.85907 10.3125 5.64178 10.0503 4.72928 10.6394L5.81122 12.3153C5.8095 12.3164 5.80542 12.3183 5.80034 12.3192C5.79597 12.32 5.79256 12.3197 5.79004 12.3192C5.78752 12.3186 5.7843 12.3174 5.78064 12.315C5.77637 12.3121 5.77344 12.3086 5.77233 12.3069L7.44818 11.225ZM9.99965 12.6167C8.93153 12.6167 7.99128 12.0662 7.44818 11.225L5.77233 12.3069C6.66764 13.6937 8.22663 14.6115 9.99965 14.6115V12.6167ZM12.5511 11.225C12.008 12.0662 11.0678 12.6167 9.99965 12.6167V14.6115C11.7727 14.6115 13.3316 13.6937 14.227 12.3069L12.5511 11.225ZM6.75 10.4974C8.15374 10.4974 8.99738 9.20127 8.99738 8H7.00262C7.00262 8.19305 6.93691 8.33907 6.86768 8.42215C6.80022 8.50311 6.75428 8.50262 6.75 8.50262V10.4974ZM4.50262 8C4.50262 9.20127 5.34626 10.4974 6.75 10.4974V8.50262C6.74572 8.50262 6.69978 8.50311 6.63232 8.42215C6.56309 8.33907 6.49738 8.19305 6.49738 8H4.50262ZM6.75 5.50262C5.34626 5.50262 4.50262 6.79873 4.50262 8H6.49738C6.49738 7.80695 6.56309 7.66093 6.63232 7.57785C6.69978 7.49689 6.74572 7.49738 6.75 7.49738V5.50262ZM8.99738 8C8.99738 6.79873 8.15374 5.50262 6.75 5.50262V7.49738C6.75428 7.49738 6.80022 7.49689 6.86768 7.57785C6.93691 7.66093 7.00262 7.80695 7.00262 8H8.99738ZM13.5026 8C13.5026 8.19305 13.4369 8.33907 13.3677 8.42215C13.3002 8.50311 13.2543 8.50262 13.25 8.50262V10.4974C14.6537 10.4974 15.4974 9.20127 15.4974 8H13.5026ZM13.25 7.49738C13.2543 7.49738 13.3002 7.49689 13.3677 7.57785C13.4369 7.66093 13.5026 7.80695 13.5026 8H15.4974C15.4974 6.79873 14.6537 5.50262 13.25 5.50262V7.49738ZM12.9974 8C12.9974 7.80695 13.0631 7.66093 13.1323 7.57785C13.1998 7.49689 13.2457 7.49738 13.25 7.49738V5.50262C11.8463 5.50262 11.0026 6.79873 11.0026 8H12.9974ZM13.25 8.50262C13.2457 8.50262 13.1998 8.50311 13.1323 8.42215C13.0631 8.33907 12.9974 8.19305 12.9974 8H11.0026C11.0026 9.20127 11.8463 10.4974 13.25 10.4974V8.50262Z" fill="black" mask="url(#path-1-inside-1)"/>
+</svg>
diff --git a/res/img/element-icons/room/composer/sticker.svg b/res/img/element-icons/room/composer/sticker.svg
new file mode 100644
index 0000000000..3d8f445926
--- /dev/null
+++ b/res/img/element-icons/room/composer/sticker.svg
@@ -0,0 +1,7 @@
+<svg width="20" height="20" viewBox="0 0 20 20" 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="M8.83268 19.9326C3.85983 19.3544 0 15.128 0 10C0 4.47715 4.47715 0 10 0C15.1526 0 19.395 3.89699 19.9407 8.9044C19.906 8.88852 19.8701 8.87447 19.833 8.8624C16.7196 7.85038 13.2389 8.47712 10.8486 10.8893C8.46405 13.2956 7.84019 16.7967 8.83268 19.9326ZM10.7222 19.2778L19.2195 10.7805C16.7328 9.97252 14.0596 10.4993 12.2608 12.3145C10.4761 14.1155 9.94832 16.7851 10.7222 19.2778Z"/>
+</mask>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.83268 19.9326C3.85983 19.3544 0 15.128 0 10C0 4.47715 4.47715 0 10 0C15.1526 0 19.395 3.89699 19.9407 8.9044C19.906 8.88852 19.8701 8.87447 19.833 8.8624C16.7196 7.85038 13.2389 8.47712 10.8486 10.8893C8.46405 13.2956 7.84019 16.7967 8.83268 19.9326ZM10.7222 19.2778L19.2195 10.7805C16.7328 9.97252 14.0596 10.4993 12.2608 12.3145C10.4761 14.1155 9.94832 16.7851 10.7222 19.2778Z" fill="black"/>
+<path d="M8.83268 19.9326L8.7175 20.9233C9.05357 20.9624 9.38653 20.8284 9.6019 20.5675C9.81726 20.3065 9.88566 19.9542 9.78357 19.6316L8.83268 19.9326ZM19.9407 8.9044L19.5254 9.81119C19.8517 9.96064 20.2331 9.92324 20.5242 9.71327C20.8152 9.5033 20.9711 9.15314 20.9322 8.79635L19.9407 8.9044ZM19.833 8.8624L20.1413 7.91388L20.1413 7.91388L19.833 8.8624ZM10.8486 10.8893L11.557 11.5913L10.8486 10.8893ZM10.7222 19.2778L9.76968 19.5735C9.87326 19.9072 10.1439 20.1623 10.483 20.2461C10.8222 20.3298 11.1804 20.2301 11.4275 19.983L10.7222 19.2778ZM19.2195 10.7805L19.9248 11.4857C20.1702 11.2403 20.2704 10.8851 20.1894 10.5476C20.1083 10.2102 19.8578 9.93913 19.5277 9.8319L19.2195 10.7805ZM12.2608 12.3145L12.9693 13.0165L12.2608 12.3145ZM-0.997378 10C-0.997378 15.6401 3.24762 20.2874 8.7175 20.9233L8.94786 18.9419C4.47204 18.4215 0.997378 14.6158 0.997378 10H-0.997378ZM10 -0.997378C3.92632 -0.997378 -0.997378 3.92632 -0.997378 10H0.997378C0.997378 5.02799 5.02799 0.997378 10 0.997378V-0.997378ZM20.9322 8.79635C20.332 3.28845 15.6672 -0.997378 10 -0.997378V0.997378C14.638 0.997378 18.458 4.50552 18.9492 9.01244L20.9322 8.79635ZM19.5246 9.81093L19.5254 9.81119L20.356 7.9976C20.2866 7.96583 20.215 7.93783 20.1413 7.91388L19.5246 9.81093ZM11.557 11.5913C13.6521 9.47718 16.7269 8.9015 19.5246 9.81093L20.1413 7.91388C16.7123 6.79926 12.8258 7.47705 10.1401 10.1873L11.557 11.5913ZM9.78357 19.6316C8.88863 16.804 9.46516 13.7023 11.557 11.5913L10.1401 10.1873C7.46293 12.8889 6.79174 16.7894 7.88179 20.2335L9.78357 19.6316ZM11.4275 19.983L19.9248 11.4857L18.5143 10.0752L10.017 18.5725L11.4275 19.983ZM19.5277 9.8319C16.7239 8.92094 13.6455 9.50024 11.5524 11.6124L12.9693 13.0165C14.4738 11.4983 16.7417 11.0241 18.9113 11.729L19.5277 9.8319ZM11.5524 11.6124C9.47765 13.7061 8.89993 16.7721 9.76968 19.5735L11.6747 18.9821C10.9967 16.7982 11.4746 14.5248 12.9693 13.0165L11.5524 11.6124Z" fill="black" mask="url(#path-1-inside-1)"/>
+</svg>
diff --git a/res/img/element-icons/room/files.svg b/res/img/element-icons/room/files.svg
new file mode 100644
index 0000000000..6648ab00a5
--- /dev/null
+++ b/res/img/element-icons/room/files.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="M4 5C4 3.34315 5.34315 2 7 2H17C18.6569 2 20 3.34315 20 5V19C20 20.6569 18.6569 22 17 22H7C5.34315 22 4 20.6569 4 19V5ZM7 14.25C7 13.8358 7.33579 13.5 7.75 13.5H16.25C16.6642 13.5 17 13.8358 17 14.25C17 14.6642 16.6642 15 16.25 15H7.75C7.33579 15 7 14.6642 7 14.25ZM7.75 17C7.33579 17 7 17.3358 7 17.75C7 18.1642 7.33579 18.5 7.75 18.5H12.25C12.6642 18.5 13 18.1642 13 17.75C13 17.3358 12.6642 17 12.25 17H7.75Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/room/format-bar/bold.svg b/res/img/element-icons/room/format-bar/bold.svg
new file mode 100644
index 0000000000..e21210c525
--- /dev/null
+++ b/res/img/element-icons/room/format-bar/bold.svg
@@ -0,0 +1,5 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.5 4H9.19231C10.4668 4 11.5 5.11929 11.5 6.5C11.5 7.88071 10.4668 9 9.19231 9H6.5" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.92857 9C11.3487 9 12.5 10.1193 12.5 11.5C12.5 12.8807 11.3487 14 9.92857 14H6.5" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6 4V14" stroke="black" stroke-width="2" stroke-linecap="round"/>
+</svg>
diff --git a/res/img/element-icons/room/format-bar/code.svg b/res/img/element-icons/room/format-bar/code.svg
new file mode 100644
index 0000000000..38f94457e8
--- /dev/null
+++ b/res/img/element-icons/room/format-bar/code.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="18" viewBox="0 0 20 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5 6L2.5 9L5 12" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M15 6L17.5 9L15 12" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.5 14L11.5 4" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/res/img/element-icons/room/format-bar/italic.svg b/res/img/element-icons/room/format-bar/italic.svg
new file mode 100644
index 0000000000..270c4f5f15
--- /dev/null
+++ b/res/img/element-icons/room/format-bar/italic.svg
@@ -0,0 +1,5 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 14L10 4" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6 14H10" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 4H12" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/res/img/element-icons/room/format-bar/quote.svg b/res/img/element-icons/room/format-bar/quote.svg
new file mode 100644
index 0000000000..3d3d444487
--- /dev/null
+++ b/res/img/element-icons/room/format-bar/quote.svg
@@ -0,0 +1,6 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.75 4L3.25 7.5" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M11.25 10.5L10.75 14" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M7.25 4C7.25 4 6.94526 6.52369 6.75 7.5" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M14.75 10.5L14.25 14" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+</svg>
diff --git a/res/img/element-icons/room/format-bar/strikethrough.svg b/res/img/element-icons/room/format-bar/strikethrough.svg
new file mode 100644
index 0000000000..775e0cf8ec
--- /dev/null
+++ b/res/img/element-icons/room/format-bar/strikethrough.svg
@@ -0,0 +1,4 @@
+<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="M8.56492 4.7659C9.60808 4.66254 10.5519 5.05294 11.0122 5.90446C11.2091 6.26884 11.6642 6.40456 12.0286 6.20759C12.393 6.01062 12.5287 5.55555 12.3317 5.19116C11.5107 3.67245 9.89203 3.12706 8.41702 3.27321C5.91255 3.52137 4.83552 5.53838 5.27315 7.20425C5.50106 8.0718 6.01113 8.62683 6.61493 9H11.4496C11.299 8.9214 11.1451 8.85419 10.9923 8.7957C10.4784 8.59897 9.88735 8.4702 9.35846 8.35499L9.35839 8.35497C9.25076 8.33152 9.1457 8.30864 9.0444 8.28585C7.70219 7.98399 6.94756 7.6744 6.72393 6.82313C6.52759 6.07574 6.95155 4.92576 8.56492 4.7659ZM12.9372 11H11.3798C11.575 11.4977 11.5295 12.0072 11.267 12.3926C10.9822 12.8107 10.3242 13.25 8.98945 13.25C6.91808 13.25 6.30505 12.1319 6.22771 11.8222C6.12735 11.4203 5.72021 11.1759 5.31834 11.2763C4.91647 11.3766 4.67204 11.7838 4.7724 12.1856C5.02738 13.2066 6.27536 14.75 8.98945 14.75C10.6457 14.75 11.8569 14.1912 12.5068 13.237C12.9731 12.5523 13.0889 11.751 12.9372 11Z" fill="black"/>
+<path d="M3.5 9L14.5 9" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/res/img/element-icons/room/in-call.svg b/res/img/element-icons/room/in-call.svg
new file mode 100644
index 0000000000..0e574faa84
--- /dev/null
+++ b/res/img/element-icons/room/in-call.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="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
new file mode 100644
index 0000000000..3a39506411
--- /dev/null
+++ b/res/img/element-icons/room/integrations.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="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
new file mode 100644
index 0000000000..f713e57d73
--- /dev/null
+++ b/res/img/element-icons/room/invite.svg
@@ -0,0 +1,3 @@
+<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28 8.5C28 12.0899 25.0899 15 21.5 15C17.9101 15 15 12.0899 15 8.5C15 4.91015 17.9101 2 21.5 2C25.0899 2 28 4.91015 28 8.5ZM22.5 5C22.5 4.44772 22.0523 4 21.5 4C20.9477 4 20.5 4.44772 20.5 5V7.6286H17.9C17.4029 7.6286 17 8.02089 17 8.5048C17 8.98871 17.4029 9.381 17.9 9.381H20.5V12.0096C20.5 12.5619 20.9477 13.0096 21.5 13.0096C22.0523 13.0096 22.5 12.5619 22.5 12.0096V9.381H25.1C25.5971 9.381 26 8.98871 26 8.5048C26 8.02089 25.5971 7.6286 25.1 7.6286H22.5V5ZM21.5 16C23.6351 16 25.5619 15.1078 26.9278 13.6759C26.9755 14.1107 27 14.5525 27 15C27 18.9261 25.1146 22.4117 22.1998 24.601V24.6009C20.348 25.9918 18.0808 26.8595 15.6175 26.9844C15.413 26.9948 15.2071 27 15 27C8.37258 27 3 21.6274 3 15C3 8.37258 8.37258 3 15 3C15.4475 3 15.8893 3.0245 16.3241 3.07223C14.929 4.40304 14.0462 6.26631 14.0018 8.336C12.8183 8.89737 12 10.1031 12 11.5C12 13.433 13.567 15 15.5 15C16.0892 15 16.6445 14.8544 17.1316 14.5972C18.3618 15.4802 19.8702 16 21.5 16ZM14.9998 24.6C17.5942 24.6 19.9482 23.5709 21.6759 21.8986C20.6074 19.2607 18.0209 17.4 14.9998 17.4C11.9787 17.4 9.39221 19.2607 8.32376 21.8986C10.0514 23.5709 12.4054 24.6 14.9998 24.6Z" fill="white"/>
+</svg>
diff --git a/res/img/element-icons/room/members.svg b/res/img/element-icons/room/members.svg
new file mode 100644
index 0000000000..03aba81ad4
--- /dev/null
+++ b/res/img/element-icons/room/members.svg
@@ -0,0 +1,7 @@
+<svg width="24" height="24" viewBox="0 0 24 24" 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="M17.5911 20.2922C15.9951 21.3704 14.0711 22 12 22C9.74879 22 7.67132 21.2561 6 20.0007C3.5711 18.1763 2 15.2716 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12C22 15.4518 20.2511 18.4951 17.5911 20.2922ZM12 12.5C13.6569 12.5 15 11.0449 15 9.25C15 7.45507 13.6569 6 12 6C10.3431 6 9 7.45507 9 9.25C9 11.0449 10.3431 12.5 12 12.5ZM12 20C14.162 20 16.1236 19.1424 17.5634 17.7488C16.673 15.5506 14.5176 14 12 14C9.48242 14 7.32699 15.5506 6.43662 17.7488C7.87635 19.1424 9.83802 20 12 20Z"/>
+</mask>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.5911 20.2922C15.9951 21.3704 14.0711 22 12 22C9.74879 22 7.67132 21.2561 6 20.0007C3.5711 18.1763 2 15.2716 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12C22 15.4518 20.2511 18.4951 17.5911 20.2922ZM12 12.5C13.6569 12.5 15 11.0449 15 9.25C15 7.45507 13.6569 6 12 6C10.3431 6 9 7.45507 9 9.25C9 11.0449 10.3431 12.5 12 12.5ZM12 20C14.162 20 16.1236 19.1424 17.5634 17.7488C16.673 15.5506 14.5176 14 12 14C9.48242 14 7.32699 15.5506 6.43662 17.7488C7.87635 19.1424 9.83802 20 12 20Z" fill="black"/>
+<path d="M17.5911 20.2922L16.4715 18.6349L17.5911 20.2922ZM6 20.0007L4.79885 21.5999L4.79885 21.5999L6 20.0007ZM17.5634 17.7488L18.9544 19.1859L19.9234 18.2479L19.4171 16.998L17.5634 17.7488ZM6.43662 17.7488L4.5829 16.998L4.07662 18.2479L5.04563 19.1859L6.43662 17.7488ZM12 24C14.4825 24 16.7945 23.244 18.7107 21.9494L16.4715 18.6349C15.1957 19.4968 13.6596 20 12 20V24ZM4.79885 21.5999C6.80462 23.1065 9.30085 24 12 24V20C10.1967 20 8.53802 19.4058 7.20115 18.4016L4.79885 21.5999ZM0 12C0 15.9273 1.88868 19.414 4.79885 21.5999L7.20115 18.4016C5.25353 16.9387 4 14.616 4 12H0ZM12 0C5.37258 0 0 5.37258 0 12H4C4 7.58172 7.58172 4 12 4V0ZM24 12C24 5.37258 18.6274 0 12 0V4C16.4183 4 20 7.58172 20 12H24ZM18.7107 21.9494C21.8977 19.7963 24 16.144 24 12H20C20 14.7596 18.6045 17.1939 16.4715 18.6349L18.7107 21.9494ZM13 9.25C13 10.0941 12.4046 10.5 12 10.5V14.5C14.9091 14.5 17 11.9958 17 9.25H13ZM12 8C12.4046 8 13 8.4059 13 9.25H17C17 6.50425 14.9091 4 12 4V8ZM11 9.25C11 8.4059 11.5954 8 12 8V4C9.09086 4 7 6.50425 7 9.25H11ZM12 10.5C11.5954 10.5 11 10.0941 11 9.25H7C7 11.9958 9.09086 14.5 12 14.5V10.5ZM16.1724 16.3118C15.0906 17.3588 13.6223 18 12 18V22C14.7017 22 17.1567 20.926 18.9544 19.1859L16.1724 16.3118ZM12 16C13.6752 16 15.1146 17.0305 15.7097 18.4996L19.4171 16.998C18.2314 14.0707 15.3599 12 12 12V16ZM8.29033 18.4996C8.88541 17.0305 10.3248 16 12 16V12C8.64008 12 5.76858 14.0707 4.5829 16.998L8.29033 18.4996ZM12 18C10.3777 18 8.90936 17.3588 7.82761 16.3118L5.04563 19.1859C6.84334 20.926 9.2983 22 12 22V18Z" fill="black" mask="url(#path-1-inside-1)"/>
+</svg>
diff --git a/res/img/element-icons/room/message-bar/edit.svg b/res/img/element-icons/room/message-bar/edit.svg
new file mode 100644
index 0000000000..d4a7e8eaaf
--- /dev/null
+++ b/res/img/element-icons/room/message-bar/edit.svg
@@ -0,0 +1,4 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3 14L15 14" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5 10.5L12 3.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/res/img/element-icons/room/message-bar/emoji.svg b/res/img/element-icons/room/message-bar/emoji.svg
new file mode 100644
index 0000000000..697f656b8a
--- /dev/null
+++ b/res/img/element-icons/room/message-bar/emoji.svg
@@ -0,0 +1,5 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<ellipse cx="5" cy="5.75" rx="1.5" ry="1.75" fill="black"/>
+<ellipse cx="13" cy="5.75" rx="1.5" ry="1.75" fill="black"/>
+<path d="M4.66558 10.6543C4.47466 10.2867 4.0219 10.1435 3.65431 10.3344C3.28672 10.5253 3.1435 10.9781 3.33442 11.3457L4.66558 10.6543ZM14.678 11.3206C14.8551 10.9462 14.6951 10.4991 14.3206 10.322C13.9462 10.1449 13.4991 10.3049 13.322 10.6794L14.678 11.3206ZM4 11C3.33442 11.3457 3.33458 11.346 3.33475 11.3463C3.33481 11.3464 3.33499 11.3468 3.33512 11.347C3.33537 11.3475 3.33565 11.3481 3.33596 11.3486C3.33657 11.3498 3.33729 11.3512 3.3381 11.3527C3.33972 11.3558 3.34175 11.3596 3.34417 11.3641C3.34901 11.3731 3.35546 11.3849 3.36353 11.3993C3.37966 11.4282 3.40229 11.4677 3.43154 11.5162C3.48998 11.6131 3.57517 11.7467 3.68808 11.9048C3.91323 12.2199 4.25254 12.6377 4.71468 13.056C5.64215 13.8956 7.08135 14.75 9.06977 14.75V13.25C7.54656 13.25 6.45087 12.6044 5.72136 11.944C5.35502 11.6123 5.08532 11.2801 4.90858 11.0327C4.82054 10.9095 4.75657 10.8088 4.71608 10.7416C4.69586 10.7081 4.68159 10.6831 4.67318 10.668C4.66898 10.6605 4.66625 10.6555 4.66499 10.6531C4.66435 10.652 4.66409 10.6515 4.66419 10.6516C4.66424 10.6517 4.66438 10.652 4.66461 10.6524C4.66473 10.6527 4.66487 10.6529 4.66503 10.6532C4.66511 10.6534 4.66525 10.6537 4.66529 10.6537C4.66543 10.654 4.66558 10.6543 4 11ZM9.06977 14.75C11.0611 14.75 12.4696 13.893 13.3669 13.0451C13.8129 12.6236 14.1351 12.2027 14.3471 11.8853C14.4535 11.7261 14.5331 11.5914 14.5875 11.4936C14.6148 11.4446 14.6358 11.4047 14.6508 11.3754C14.6583 11.3608 14.6643 11.3488 14.6688 11.3396C14.6711 11.335 14.673 11.3311 14.6745 11.3279C14.6753 11.3263 14.676 11.3249 14.6765 11.3237C14.6768 11.3231 14.6771 11.3225 14.6774 11.322C14.6775 11.3218 14.6776 11.3214 14.6777 11.3213C14.6779 11.3209 14.678 11.3206 14 11C13.322 10.6794 13.3221 10.6791 13.3223 10.6788C13.3223 10.6787 13.3224 10.6784 13.3225 10.6783C13.3227 10.6779 13.3228 10.6776 13.3229 10.6774C13.3232 10.6769 13.3233 10.6766 13.3234 10.6764C13.3235 10.6762 13.3233 10.6766 13.3228 10.6776C13.3217 10.6798 13.3193 10.6846 13.3156 10.6919C13.3081 10.7066 13.2952 10.7312 13.2768 10.7642C13.24 10.8304 13.1813 10.9301 13.0998 11.0522C12.9361 11.2973 12.6842 11.6264 12.3366 11.9549C11.6466 12.607 10.5901 13.25 9.06977 13.25V14.75Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/room/message-bar/reply.svg b/res/img/element-icons/room/message-bar/reply.svg
new file mode 100644
index 0000000000..9900d4d19d
--- /dev/null
+++ b/res/img/element-icons/room/message-bar/reply.svg
@@ -0,0 +1,4 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.0663 14.25H11.636C13.4938 14.25 14.9998 12.683 14.9998 10.75C14.9998 8.817 13.4938 7.25 11.636 7.25H4.53369" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M6.52417 3.75L3.00006 7.28553L6.52417 10.8211" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/res/img/element-icons/room/pin.svg b/res/img/element-icons/room/pin.svg
new file mode 100644
index 0000000000..16941b329b
--- /dev/null
+++ b/res/img/element-icons/room/pin.svg
@@ -0,0 +1,7 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18.5151 20.0831L15.6941 17.2621L17.2621 15.6941L20.0831 18.5151C21.5741 20.0061 22.1529 21.7793 21.9661 21.9661C21.7793 22.1529 20.0061 21.5741 18.5151 20.0831Z" fill="black"/>
+<path d="M7.46196 11.3821C7.07677 11.5059 5.49073 12.0989 3.63366 12.0744C1.77658 12.0499 1.67795 10.8941 2.46811 10.1039L6.28598 6.28602L9.42196 9.42203L7.46196 11.3821Z" fill="black"/>
+<path d="M11.3821 7.46202C11.5059 7.07682 12.0989 5.49077 12.0744 3.63368C12.0499 1.77658 10.8941 1.67795 10.1039 2.46812L6.28598 6.28602L9.42196 9.42203L11.3821 7.46202Z" fill="black"/>
+<path d="M7.40596 11.438L11.4379 7.40602L14.9099 10.206L10.2059 14.9101L7.40596 11.438Z" fill="black"/>
+<path d="M11.774 11.774C9.31114 14.2369 8.61779 17.7115 9.83827 20.3213C10.3104 21.3308 11.6288 21.3273 12.4169 20.5392L20.5391 12.4169C21.3271 11.6289 21.3307 10.3104 20.3212 9.83829C17.7114 8.61779 14.2369 9.31115 11.774 11.774Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/room/search-inset.svg b/res/img/element-icons/room/search-inset.svg
new file mode 100644
index 0000000000..699cdd1d00
--- /dev/null
+++ b/res/img/element-icons/room/search-inset.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 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22ZM11 14C12.6569 14 14 12.6569 14 11C14 9.34315 12.6569 8 11 8C9.34315 8 8 9.34315 8 11C8 12.6569 9.34315 14 11 14ZM16 11C16 12.0191 15.6951 12.967 15.1716 13.7574L17.2071 15.7929C17.5976 16.1834 17.5976 16.8166 17.2071 17.2071C16.8166 17.5976 16.1834 17.5976 15.7929 17.2071L13.7574 15.1716C12.967 15.6951 12.0191 16 11 16C8.23858 16 6 13.7614 6 11C6 8.23858 8.23858 6 11 6C13.7614 6 16 8.23858 16 11Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/room/settings/advanced.svg b/res/img/element-icons/room/settings/advanced.svg
new file mode 100644
index 0000000000..734ae543ea
--- /dev/null
+++ b/res/img/element-icons/room/settings/advanced.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 13.89C17 15.0256 16.1603 16 14.9272 16H3.08038C1.83972 16 1 15.0256 1 13.89C1 13.5371 1.09078 13.1841 1.27234 12.8542L7.20331 2.08951C7.60426 1.36061 8.30024 1 9.00378 1C9.70733 1 10.3957 1.34527 10.7967 2.08951L16.7277 12.8542C16.9092 13.1841 17 13.5371 17 13.89ZM8.92011 5.00263C8.35011 5.04263 7.93011 5.54264 7.98011 6.11264L8.28011 9.85C8.31011 10.2 8.58011 10.47 8.93011 10.5H8.99011C9.36011 10.5 9.67011 10.22 9.70011 9.85L10.0401 6.11264V5.95264C9.98011 5.38264 9.48011 4.96263 8.92011 5.00263ZM10 12.5C10 13.0523 9.55229 13.5 9 13.5C8.44772 13.5 8 13.0523 8 12.5C8 11.9477 8.44772 11.5 9 11.5C9.55229 11.5 10 11.9477 10 12.5Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/room/settings/roles.svg b/res/img/element-icons/room/settings/roles.svg
new file mode 100644
index 0000000000..24bccf78f4
--- /dev/null
+++ b/res/img/element-icons/room/settings/roles.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="M6.29794 15.1653H4.87499C3.51012 15.1653 2.83495 14.4974 2.83495 13.1254V11.7027C2.83495 11.601 2.80591 11.5212 2.73331 11.4486L1.72418 10.4396C0.758607 9.47411 0.758607 8.53043 1.72418 7.56497L2.73331 6.55595C2.80591 6.4761 2.83495 6.40351 2.83495 6.30188V4.87183C2.83495 3.49986 3.50286 2.83928 4.87499 2.83928H6.29794C6.40684 2.83928 6.47944 2.81024 6.55204 2.73039L7.56117 1.7359C8.52674 0.755915 9.47053 0.755915 10.4434 1.72864L11.4452 2.73039C11.5251 2.81024 11.5977 2.83928 11.7066 2.83928H13.1295C14.4944 2.83928 15.1623 3.50712 15.1623 4.87183V6.30188C15.1623 6.40351 15.1914 6.4761 15.2712 6.55595L16.2731 7.56497C17.2387 8.53043 17.2459 9.47411 16.2731 10.4396L15.2712 11.4486C15.1986 11.5212 15.1623 11.601 15.1623 11.7027V13.1254C15.1623 14.4902 14.4944 15.1653 13.1295 15.1653H11.7066C11.5977 15.1653 11.5324 15.187 11.4452 15.2669L10.4434 16.2759C9.47053 17.2414 8.52674 17.2414 7.56117 16.2759L6.55204 15.2669C6.47218 15.187 6.40684 15.1653 6.29794 15.1653ZM11.7631 6.11992C11.9397 5.95256 12.2186 5.96186 12.386 6.13851C12.5347 6.30586 12.5347 6.55689 12.4046 6.72425L8.48108 11.4752L8.45319 11.5124C8.19286 11.8285 7.7187 11.875 7.40259 11.6147C7.37451 11.6006 7.35173 11.576 7.33025 11.5528C7.32328 11.5452 7.31645 11.5378 7.30961 11.531L5.62678 9.59714C5.44083 9.374 5.45943 9.0393 5.68257 8.85335C5.86852 8.686 6.13814 8.686 6.33338 8.81616L7.79308 9.83887L11.7631 6.11992Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/room/share.svg b/res/img/element-icons/room/share.svg
new file mode 100644
index 0000000000..dac35ae5a7
--- /dev/null
+++ b/res/img/element-icons/room/share.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.7688 2.29289C12.3782 1.90237 11.7451 1.90237 11.3545 2.29289L6.82365 6.82378C6.43313 7.2143 6.43313 7.84747 6.82365 8.23799C7.21418 8.62851 7.84734 8.62851 8.23787 8.23799L11.0616 5.41421V10H6C4.89543 10 4 10.8954 4 12V20C4 21.1046 4.89543 22 6 22H18C19.1046 22 20 21.1046 20 20V12C20 10.8954 19.1046 10 18 10H13.0618V15C13.0618 15.5523 12.6141 16 12.0618 16C11.5095 16 11.0618 15.5523 11.0618 15V10H13.0616V5.41421L15.8854 8.23799C16.2759 8.62851 16.9091 8.62851 17.2996 8.23799C17.6902 7.84747 17.6902 7.2143 17.2996 6.82378L12.7688 2.29289Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/roomlist/archived.svg b/res/img/element-icons/roomlist/archived.svg
new file mode 100644
index 0000000000..4d30195082
--- /dev/null
+++ b/res/img/element-icons/roomlist/archived.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="M2 2C1.44772 2 1 2.44772 1 3V4C1 4.55228 1.44772 5 2 5H16C16.5523 5 17 4.55228 17 4V3C17 2.44772 16.5523 2 16 2H2ZM2.5 6.5H15.5V13.5C15.5 14.8807 14.3807 16 13 16H5C3.61929 16 2.5 14.8807 2.5 13.5V6.5ZM6 9C6 8.72386 6.22386 8.5 6.5 8.5H11.5C11.7761 8.5 12 8.72386 12 9V9.5C12 9.77614 11.7761 10 11.5 10H6.5C6.22386 10 6 9.77614 6 9.5V9Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/roomlist/checkmark.svg b/res/img/element-icons/roomlist/checkmark.svg
new file mode 100644
index 0000000000..3be39fc9b2
--- /dev/null
+++ b/res/img/element-icons/roomlist/checkmark.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 d="M4 8.81818L7.125 12L14 5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/res/img/element-icons/roomlist/dark-light-mode.svg b/res/img/element-icons/roomlist/dark-light-mode.svg
new file mode 100644
index 0000000000..a6a6464b5c
--- /dev/null
+++ b/res/img/element-icons/roomlist/dark-light-mode.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="M15 9C15 12.3137 12.3137 15 9 15V13C11.2091 13 13 11.2091 13 9C13 6.79086 11.2091 5 9 5V3C12.3137 3 15 5.68629 15 9ZM9 5C6.79086 5 5 6.79086 5 9C5 11.2091 6.79086 13 9 13V5ZM17 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 9Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/roomlist/decorated-avatar-mask.svg b/res/img/element-icons/roomlist/decorated-avatar-mask.svg
new file mode 100644
index 0000000000..fb09c16bba
--- /dev/null
+++ b/res/img/element-icons/roomlist/decorated-avatar-mask.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="M30.7161 22.2903C31.5425 20.3595 32 18.2332 32 16C32 7.16344 24.8366 0 16 0C7.16344 0 0 7.16344 0 16C0 24.8366 7.16344 32 16 32C18.2332 32 20.3595 31.5425 22.2903 30.7161C20.8956 29.6174 20 27.9133 20 26C20 22.6863 22.6863 20 26 20C27.9133 20 29.6174 20.8956 30.7161 22.2903Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/roomlist/explore.svg b/res/img/element-icons/roomlist/explore.svg
new file mode 100644
index 0000000000..3786ce1153
--- /dev/null
+++ b/res/img/element-icons/roomlist/explore.svg
@@ -0,0 +1,4 @@
+<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 9ZM13.375 5.3266C13.5583 4.92826 13.0716 4.44152 12.6733 4.62491L7.66968 6.9285C7.33893 7.08077 7.08014 7.33956 6.92787 7.67031L4.62428 12.6739C4.44089 13.0722 4.92763 13.559 5.32597 13.3756L10.3295 11.072C10.6603 10.9197 10.9191 10.6609 11.0714 10.3302L13.375 5.3266Z" fill="black"/>
+<path d="M9.8835 9.88413C9.39534 10.3723 8.60389 10.3723 8.11573 9.88413C7.62757 9.39597 7.62757 8.60452 8.11573 8.11636C8.60389 7.62821 9.39534 7.62821 9.8835 8.11636C10.3717 8.60452 10.3717 9.39597 9.8835 9.88413Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/roomlist/favorite.svg b/res/img/element-icons/roomlist/favorite.svg
new file mode 100644
index 0000000000..0c33999ea3
--- /dev/null
+++ b/res/img/element-icons/roomlist/favorite.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 d="M8.41411 1.43218C8.59217 0.855939 9.40783 0.855941 9.58589 1.43218L11.1715 6.56319H16.3856C16.9721 6.56319 17.224 7.30764 16.7578 7.66373L12.5135 10.9061L14.1185 16.1001C14.2948 16.6705 13.6348 17.1309 13.1604 16.7684L9 13.5902L4.83965 16.7684C4.3652 17.1309 3.70521 16.6705 3.88148 16.1001L5.4865 10.9061L1.24216 7.66373C0.776033 7.30764 1.02785 6.56319 1.61443 6.56319H6.82854L8.41411 1.43218Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/roomlist/feedback.svg b/res/img/element-icons/roomlist/feedback.svg
new file mode 100644
index 0000000000..c15edd709a
--- /dev/null
+++ b/res/img/element-icons/roomlist/feedback.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="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 9ZM6.85231 7.13323L8.0052 5.98033C8.2981 5.68744 8.2981 5.21256 8.0052 4.91967C7.71231 4.62678 7.23744 4.62678 6.94454 4.91967L4.46967 7.39454C4.17678 7.68744 4.17678 8.16231 4.46967 8.4552L6.94454 10.9301C7.23744 11.223 7.71231 11.223 8.0052 10.9301C8.2981 10.6372 8.2981 10.1623 8.0052 9.86942L6.76901 8.63323H10.3537C11.0454 8.63323 11.725 9.27325 11.725 10.2166C11.725 11.1599 11.0454 11.7999 10.3537 11.7999H9.36384C8.94962 11.7999 8.61384 12.1357 8.61384 12.5499C8.61384 12.9641 8.94962 13.2999 9.36384 13.2999H10.3537C12.0051 13.2999 13.225 11.8506 13.225 10.2166C13.225 8.58255 12.0051 7.13323 10.3537 7.13323H6.85231Z"/>
+</mask>
+<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 9ZM6.85231 7.13323L8.0052 5.98033C8.2981 5.68744 8.2981 5.21256 8.0052 4.91967C7.71231 4.62678 7.23744 4.62678 6.94454 4.91967L4.46967 7.39454C4.17678 7.68744 4.17678 8.16231 4.46967 8.4552L6.94454 10.9301C7.23744 11.223 7.71231 11.223 8.0052 10.9301C8.2981 10.6372 8.2981 10.1623 8.0052 9.86942L6.76901 8.63323H10.3537C11.0454 8.63323 11.725 9.27325 11.725 10.2166C11.725 11.1599 11.0454 11.7999 10.3537 11.7999H9.36384C8.94962 11.7999 8.61384 12.1357 8.61384 12.5499C8.61384 12.9641 8.94962 13.2999 9.36384 13.2999H10.3537C12.0051 13.2999 13.225 11.8506 13.225 10.2166C13.225 8.58255 12.0051 7.13323 10.3537 7.13323H6.85231Z" fill="black"/>
+<path d="M8.0052 5.98033L7.29995 5.27508L7.29995 5.27508L8.0052 5.98033ZM6.85231 7.13323L6.14705 6.42797L4.44442 8.13061H6.85231V7.13323ZM6.94454 4.91967L7.6498 5.62492L6.94454 4.91967ZM4.46967 7.39454L3.76442 6.68929L3.76442 6.68929L4.46967 7.39454ZM4.46967 8.4552L3.76442 9.16046H3.76442L4.46967 8.4552ZM6.94454 10.9301L7.6498 10.2248L7.6498 10.2248L6.94454 10.9301ZM6.76901 8.63323V7.63585H4.36113L6.06376 9.33848L6.76901 8.63323ZM9 17.9974C13.9691 17.9974 17.9974 13.9691 17.9974 9H16.0026C16.0026 12.8674 12.8674 16.0026 9 16.0026V17.9974ZM0.00262225 9C0.00262225 13.9691 4.03089 17.9974 9 17.9974V16.0026C5.13256 16.0026 1.99738 12.8674 1.99738 9H0.00262225ZM9 0.00262225C4.03089 0.00262225 0.00262225 4.03089 0.00262225 9H1.99738C1.99738 5.13256 5.13256 1.99738 9 1.99738V0.00262225ZM17.9974 9C17.9974 4.03089 13.9691 0.00262225 9 0.00262225V1.99738C12.8674 1.99738 16.0026 5.13256 16.0026 9H17.9974ZM7.29995 5.27508L6.14705 6.42797L7.55756 7.83848L8.71046 6.68558L7.29995 5.27508ZM7.29995 5.62492C7.20334 5.52832 7.20334 5.37168 7.29995 5.27508L8.71046 6.68558C9.39285 6.00319 9.39285 4.89681 8.71046 4.21442L7.29995 5.62492ZM7.6498 5.62492C7.55319 5.72153 7.39656 5.72153 7.29995 5.62492L8.71046 4.21442C8.02806 3.53202 6.92168 3.53202 6.23929 4.21442L7.6498 5.62492ZM5.17492 8.0998L7.6498 5.62492L6.23929 4.21442L3.76442 6.68929L5.17492 8.0998ZM5.17492 7.74995C5.27153 7.84656 5.27153 8.00319 5.17492 8.0998L3.76442 6.68929C3.08202 7.37169 3.08202 8.47806 3.76442 9.16046L5.17492 7.74995ZM7.6498 10.2248L5.17492 7.74995L3.76442 9.16046L6.23929 11.6353L7.6498 10.2248ZM7.29995 10.2248C7.39656 10.1282 7.55319 10.1282 7.6498 10.2248L6.23929 11.6353C6.92168 12.3177 8.02806 12.3177 8.71046 11.6353L7.29995 10.2248ZM7.29995 10.5747C7.20334 10.4781 7.20334 10.3214 7.29995 10.2248L8.71046 11.6353C9.39285 10.9529 9.39285 9.84656 8.71046 9.16416L7.29995 10.5747ZM6.06376 9.33848L7.29995 10.5747L8.71046 9.16416L7.47427 7.92797L6.06376 9.33848ZM6.76901 9.6306H10.3537V7.63585H6.76901V9.6306ZM10.3537 9.6306C10.4202 9.6306 10.7276 9.74669 10.7276 10.2166H12.7223C12.7223 8.79981 11.6705 7.63585 10.3537 7.63585V9.6306ZM10.7276 10.2166C10.7276 10.6865 10.4202 10.8025 10.3537 10.8025V12.7973C11.6705 12.7973 12.7223 11.6333 12.7223 10.2166H10.7276ZM10.3537 10.8025H9.36384V12.7973H10.3537V10.8025ZM9.36384 10.8025C8.39879 10.8025 7.61646 11.5849 7.61646 12.5499H9.61121C9.61121 12.6865 9.50046 12.7973 9.36384 12.7973V10.8025ZM7.61646 12.5499C7.61646 13.515 8.39879 14.2973 9.36384 14.2973V12.3025C9.50046 12.3025 9.61121 12.4133 9.61121 12.5499H7.61646ZM9.36384 14.2973H10.3537V12.3025H9.36384V14.2973ZM10.3537 14.2973C12.6497 14.2973 14.2223 12.3028 14.2223 10.2166H12.2276C12.2276 11.3984 11.3606 12.3025 10.3537 12.3025V14.2973ZM14.2223 10.2166C14.2223 8.13036 12.6497 6.13585 10.3537 6.13585V8.13061C11.3606 8.13061 12.2276 9.03475 12.2276 10.2166H14.2223ZM10.3537 6.13585H6.85231V8.13061H10.3537V6.13585Z" fill="black" mask="url(#path-1-inside-1)"/>
+</svg>
diff --git a/res/img/element-icons/roomlist/home.svg b/res/img/element-icons/roomlist/home.svg
new file mode 100644
index 0000000000..9598ccf184
--- /dev/null
+++ b/res/img/element-icons/roomlist/home.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 d="M2.33325 14.9494V7.28325C2.33325 6.8921 2.50502 6.52067 2.80305 6.26733L8.02845 1.82575C8.58859 1.34963 9.41125 1.34963 9.97139 1.82575L15.1968 6.26734C15.4948 6.52067 15.6666 6.89065 15.6666 7.28181V14.9756C15.6666 16.0899 14.7594 16.9891 13.6451 16.9792C11.3216 16.9585 7.43591 16.9341 4.38177 16.9659C3.25769 16.9776 2.33325 16.0735 2.33325 14.9494Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/roomlist/low-priority.svg b/res/img/element-icons/roomlist/low-priority.svg
new file mode 100644
index 0000000000..832501527b
--- /dev/null
+++ b/res/img/element-icons/roomlist/low-priority.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="M10.079 1.44694C9.48309 0.85102 8.51691 0.85102 7.92099 1.44694L1.44694 7.92099C0.85102 8.51691 0.85102 9.48309 1.44694 10.079L7.92099 16.5531C8.51691 17.149 9.48309 17.149 10.079 16.5531L16.5531 10.079C17.149 9.48309 17.149 8.51691 16.5531 7.92099L10.079 1.44694ZM9 4.25C9.41421 4.25 9.75 4.58579 9.75 5V11.1893L11.4697 9.46966C11.7626 9.17677 12.2374 9.17677 12.5303 9.46966C12.8232 9.76255 12.8232 10.2374 12.5303 10.5303L9.53259 13.5281C9.52504 13.5357 9.51732 13.5431 9.50945 13.5504C9.44549 13.6097 9.37372 13.6558 9.29761 13.6886C9.20637 13.7281 9.10574 13.75 9 13.75C8.89426 13.75 8.79363 13.7281 8.70239 13.6886C8.62599 13.6556 8.55396 13.6093 8.48983 13.5498C8.48224 13.5427 8.47481 13.5355 8.46752 13.5282L5.46967 10.5303C5.17678 10.2374 5.17678 9.76255 5.46967 9.46966C5.76256 9.17677 6.23744 9.17677 6.53033 9.46966L8.25 11.1893L8.25 5C8.25 4.58579 8.58579 4.25 9 4.25Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/roomlist/notifications-default.svg b/res/img/element-icons/roomlist/notifications-default.svg
new file mode 100644
index 0000000000..59743f5d67
--- /dev/null
+++ b/res/img/element-icons/roomlist/notifications-default.svg
@@ -0,0 +1,5 @@
+<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="M7.59 15C7.53 15.16 7.5 15.32 7.5 15.5C7.5 16.33 8.17 17 9 17C9.83 17 10.5 16.33 10.5 15.5C10.5 15.32 10.46 15.16 10.41 15H7.59Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14 10.4C14 11.31 14.49 11.9 15.09 12.25C15.5 12.49 16 12.82 16 13.22C16 13.67 15.71 13.99 15.11 13.99H9H2.89C2.29 13.99 2 13.68 2 13.22C2 12.82 2.51 12.49 2.91 12.25C3.5 11.9 4 11.3 4 10.4V7C4 4.24 6.36 2 9 2C11.64 2 14 4.24 14 7V10.4ZM11.2402 6.1226C11.4223 5.9515 11.7099 5.96101 11.8824 6.14162C12.0358 6.31272 12.0358 6.56938 11.9016 6.74048L8.92075 10.685L8.892 10.723C8.62358 11.0462 8.13469 11.0938 7.80875 10.8276C7.7798 10.8132 7.75632 10.7881 7.73417 10.7643C7.72698 10.7566 7.71994 10.749 7.71289 10.7421L6.13071 8.99336C5.93899 8.76522 5.95816 8.42302 6.18823 8.2329C6.37995 8.0618 6.65795 8.0618 6.85926 8.19488L8.21138 9.012L11.2402 6.1226Z" fill="black"/>
+<path d="M9 3C9.55228 3 10 2.55228 10 2C10 1.44772 9.55228 1 9 1C8.44772 1 8 1.44772 8 2C8 2.55228 8.44772 3 9 3Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/roomlist/notifications-dm.svg b/res/img/element-icons/roomlist/notifications-dm.svg
new file mode 100644
index 0000000000..e0bd435240
--- /dev/null
+++ b/res/img/element-icons/roomlist/notifications-dm.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="M13 7C14.6569 7 16 5.65685 16 4C16 2.34315 14.6569 1 13 1C11.3431 1 10 2.34315 10 4C10 5.65685 11.3431 7 13 7ZM8.9677 2C6.34078 2.01817 4 4.25115 4 6.99989V10.3999C4 11.2999 3.5 11.8999 2.91 12.2499C2.51 12.4899 2 12.8199 2 13.2199C2 13.6799 2.29 13.9899 2.89 13.9899H9H15.11C15.71 13.9899 16 13.6699 16 13.2199C16 12.8199 15.5 12.4899 15.09 12.2499C14.49 11.8999 14 11.3099 14 10.3999V8.38838C13.6784 8.46136 13.3437 8.49989 13 8.49989C10.5147 8.49989 8.5 6.48517 8.5 3.99989C8.5 3.28151 8.66833 2.60245 8.9677 2ZM7.59 15C7.53 15.16 7.5 15.32 7.5 15.5C7.5 16.33 8.17 17 9 17C9.83 17 10.5 16.33 10.5 15.5C10.5 15.32 10.46 15.16 10.41 15H7.59Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/roomlist/notifications-off.svg b/res/img/element-icons/roomlist/notifications-off.svg
new file mode 100644
index 0000000000..c848471f63
--- /dev/null
+++ b/res/img/element-icons/roomlist/notifications-off.svg
@@ -0,0 +1,7 @@
+<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="M7.59 15C7.53 15.16 7.5 15.32 7.5 15.5C7.5 16.33 8.17 17 9 17C9.83 17 10.5 16.33 10.5 15.5C10.5 15.32 10.46 15.16 10.41 15H7.59Z" fill="black"/>
+<path d="M9 3C9.55228 3 10 2.55228 10 2C10 1.44772 9.55228 1 9 1C8.44772 1 8 1.44772 8 2C8 2.55228 8.44772 3 9 3Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.08 10.9698C14.03 10.7998 14 10.6098 14 10.4098V7.00977C14 4.24977 11.64 2.00977 8.99998 2.00977C7.93998 2.00977 6.92998 2.37977 6.09998 2.98977L14.08 10.9698Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.38 5.14978C4.14 5.72978 4 6.34978 4 6.99978V10.3998C4 11.2998 3.5 11.8998 2.91 12.2498C2.51 12.4898 2 12.8198 2 13.2198C2 13.6798 2.29 13.9898 2.89 13.9898H9H13.22L4.38 5.14978Z" fill="black"/>
+<path d="M1 1L17 17" stroke="black" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round"/>
+</svg>
diff --git a/res/img/element-icons/roomlist/plus.svg b/res/img/element-icons/roomlist/plus.svg
new file mode 100644
index 0000000000..f6d80ac7ef
--- /dev/null
+++ b/res/img/element-icons/roomlist/plus.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="M9.75 4C9.75 3.58579 9.41421 3.25 9 3.25C8.58579 3.25 8.25 3.58579 8.25 4V8.25L4 8.25C3.58579 8.25 3.25 8.58579 3.25 9C3.25 9.41421 3.58579 9.75 4 9.75L8.25 9.75V14C8.25 14.4142 8.58579 14.75 9 14.75C9.41421 14.75 9.75 14.4142 9.75 14V9.75L14 9.75C14.4142 9.75 14.75 9.41421 14.75 9C14.75 8.58579 14.4142 8.25 14 8.25L9.75 8.25V4Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/roomlist/search-clear.svg b/res/img/element-icons/roomlist/search-clear.svg
new file mode 100644
index 0000000000..29fc097600
--- /dev/null
+++ b/res/img/element-icons/roomlist/search-clear.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="M9 16C12.866 16 16 12.866 16 9C16 5.13401 12.866 2 9 2C5.13401 2 2 5.13401 2 9C2 12.866 5.13401 16 9 16ZM5.96967 5.96967C6.26256 5.67678 6.73744 5.67678 7.03033 5.96967L9 7.93934L10.9697 5.96967C11.2626 5.67678 11.7374 5.67678 12.0303 5.96967C12.3232 6.26256 12.3232 6.73744 12.0303 7.03033L10.0607 9L12.0303 10.9697C12.3232 11.2626 12.3232 11.7374 12.0303 12.0303C11.7374 12.3232 11.2626 12.3232 10.9697 12.0303L9 10.0607L7.03033 12.0303C6.73744 12.3232 6.26256 12.3232 5.96967 12.0303C5.67678 11.7374 5.67678 11.2626 5.96967 10.9697L7.93934 9L5.96967 7.03033C5.67678 6.73744 5.67678 6.26256 5.96967 5.96967Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/roomlist/search.svg b/res/img/element-icons/roomlist/search.svg
new file mode 100644
index 0000000000..b706092a5c
--- /dev/null
+++ b/res/img/element-icons/roomlist/search.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="M12.1333 8.06667C12.1333 10.3126 10.3126 12.1333 8.06667 12.1333C5.82071 12.1333 4 10.3126 4 8.06667C4 5.82071 5.82071 4 8.06667 4C10.3126 4 12.1333 5.82071 12.1333 8.06667ZM12.9992 11.5994C13.7131 10.6044 14.1333 9.38463 14.1333 8.06667C14.1333 4.71614 11.4172 2 8.06667 2C4.71614 2 2 4.71614 2 8.06667C2 11.4172 4.71614 14.1333 8.06667 14.1333C9.38457 14.1333 10.6043 13.7131 11.5992 12.9993C11.6274 13.0369 11.6586 13.0729 11.6928 13.1071L14.2928 15.7071C14.6833 16.0977 15.3165 16.0977 15.707 15.7071C16.0975 15.3166 16.0975 14.6834 15.707 14.2929L13.107 11.6929C13.0728 11.6587 13.0368 11.6276 12.9992 11.5994Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/security.svg b/res/img/element-icons/security.svg
new file mode 100644
index 0000000000..3fe62b7af9
--- /dev/null
+++ b/res/img/element-icons/security.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="M8.5 1.5C6.29086 1.5 4.5 3.29086 4.5 5.5V7.5C4.5 7.521 4.50016 7.54196 4.50048 7.56288C3.63762 7.78474 3 8.56791 3 9.5V14.5C3 15.6046 3.89543 16.5 5 16.5H13C14.1046 16.5 15 15.6046 15 14.5V9.5C15 8.56791 14.3624 7.78474 13.4995 7.56288C13.4998 7.54196 13.5 7.521 13.5 7.5V5.5C13.5 3.29086 11.7091 1.5 9.5 1.5H8.5ZM11.5 7.5V5.5C11.5 4.39543 10.6046 3.5 9.5 3.5H8.5C7.39543 3.5 6.5 4.39543 6.5 5.5V7.5H11.5Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/settings.svg b/res/img/element-icons/settings.svg
new file mode 100644
index 0000000000..05d640df27
--- /dev/null
+++ b/res/img/element-icons/settings.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="M19.3625 9.2875C19.5625 9.8125 20.075 10.1625 20.6375 10.1625C21.3875 10.1625 22 10.775 22 11.525V12.475C22 13.225 21.3875 13.8375 20.6375 13.8375C20.075 13.8375 19.5625 14.1875 19.3625 14.7125C19.346 14.7538 19.3294 14.7958 19.3128 14.838C19.2538 14.9876 19.1932 15.1413 19.125 15.2875C18.8875 15.8 19 16.4 19.4 16.8C19.9375 17.325 19.9375 18.1875 19.4 18.725L18.725 19.4C18.2 19.9375 17.3375 19.9375 16.8 19.4C16.4125 19 15.8 18.8875 15.2875 19.125C15.1 19.2125 14.9125 19.2875 14.7125 19.3625C14.1875 19.5625 13.8375 20.075 13.8375 20.6375C13.8375 21.3875 13.225 22 12.475 22H11.525C10.775 22 10.1625 21.3875 10.1625 20.6375C10.1625 20.075 9.8125 19.5625 9.2875 19.3625C9.24617 19.346 9.20423 19.3294 9.16195 19.3128C9.01243 19.2538 8.85867 19.1932 8.7125 19.125C8.2 18.8875 7.6 19 7.2 19.4C6.675 19.9375 5.8125 19.9375 5.275 19.4L4.6 18.725C4.0625 18.2 4.0625 17.3375 4.6 16.8C5 16.4125 5.1125 15.8 4.875 15.2875C4.7875 15.1 4.7125 14.9125 4.6375 14.7125C4.4375 14.1875 3.925 13.8375 3.3625 13.8375C2.6125 13.8375 2 13.225 2 12.475V11.525C2 10.775 2.6125 10.1625 3.3625 10.1625C3.925 10.1625 4.4375 9.8125 4.6375 9.2875C4.67694 9.16129 4.72634 9.04005 4.77627 8.91751C4.80546 8.84587 4.83483 8.77379 4.8625 8.7C5.1 8.1875 4.9875 7.5875 4.5875 7.1875C4.05 6.6625 4.05 5.8 4.5875 5.2625L5.275 4.6C5.8 4.0625 6.6625 4.0625 7.2 4.6C7.5875 5 8.2 5.1125 8.7125 4.875C8.9 4.7875 9.0875 4.7 9.2875 4.6375C9.8125 4.4375 10.1625 3.925 10.1625 3.3625C10.1625 2.6125 10.775 2 11.525 2H12.475C13.225 2 13.8375 2.6125 13.8375 3.3625C13.8375 3.9375 14.1875 4.4375 14.7125 4.6375C14.7538 4.65403 14.7958 4.67056 14.838 4.68723C14.9876 4.74617 15.1413 4.80679 15.2875 4.875C15.8 5.1125 16.4 5 16.8 4.6C17.325 4.0625 18.1875 4.0625 18.725 4.6L19.4 5.275C19.9375 5.8 19.9375 6.6625 19.4 7.2C19 7.5875 18.8875 8.2 19.125 8.7125C19.2125 8.9 19.2875 9.0875 19.3625 9.2875ZM12 17C9.2375 17 7 14.7625 7 12C7 9.2375 9.2375 7 12 7C14.7625 7 17 9.2375 17 12C17 14.7625 14.7625 17 12 17Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/settings/appearance.svg b/res/img/element-icons/settings/appearance.svg
new file mode 100644
index 0000000000..6f91759354
--- /dev/null
+++ b/res/img/element-icons/settings/appearance.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="M16.2962 6.95039C17.2815 8.16305 17.3023 9.84863 16.3296 11.0714C14.9497 12.806 12.5144 15 9.02365 15C5.5329 15 3.09759 12.806 1.71772 11.0714C0.744983 9.84863 0.765783 8.16305 1.75111 6.95039C3.16323 5.21247 5.6278 3 9.02365 3C12.4195 3 14.8841 5.21247 16.2962 6.95039ZM13 9C13 11.2091 11.2091 13 9 13C6.79086 13 5 11.2091 5 9C5 6.79086 6.79086 5 9 5C11.2091 5 13 6.79086 13 9ZM9 11C10.1046 11 11 10.1046 11 9C11 7.89543 10.1046 7 9 7C7.89543 7 7 7.89543 7 9C7 10.1046 7.89543 11 9 11Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/settings/flair.svg b/res/img/element-icons/settings/flair.svg
new file mode 100644
index 0000000000..e1ae44f386
--- /dev/null
+++ b/res/img/element-icons/settings/flair.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 d="M8.99182 17C9.45808 17 9.84254 16.6564 9.90798 16.1738C10.6196 11.1595 11.2986 10.4724 16.1411 9.92434C16.6319 9.86708 17 9.46626 17 9C17 8.52556 16.6401 8.1411 16.1493 8.07566C11.3313 7.44581 10.7096 6.83231 9.90798 1.818C9.82618 1.33538 9.45808 1 8.99182 1C8.53374 1 8.14928 1.33538 8.07566 1.82618C7.37219 6.84049 6.69325 7.52761 1.85072 8.07566C1.35992 8.13292 1 8.52556 1 9C1 9.46626 1.35174 9.8589 1.85072 9.92434C6.66871 10.5951 7.26585 11.1677 8.07566 16.182C8.16564 16.6646 8.54192 17 8.99182 17Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/settings/help.svg b/res/img/element-icons/settings/help.svg
new file mode 100644
index 0000000000..2ac4f675ec
--- /dev/null
+++ b/res/img/element-icons/settings/help.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="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 17ZM9 13.9167C9.55228 13.9167 10 13.469 10 12.9167C10 12.3644 9.55228 11.9167 9 11.9167C8.44772 11.9167 8 12.3644 8 12.9167C8 13.469 8.44772 13.9167 9 13.9167ZM7.61072 7.49307C7.61072 6.72339 8.23521 6.10417 8.99961 6.10417C9.76178 6.10417 10.3885 6.73089 10.3885 7.49307C10.3885 7.84605 10.2375 7.97202 9.64273 8.38297C9.37919 8.56505 9.01775 8.81799 8.73629 9.189C8.43501 9.58614 8.24961 10.0814 8.24961 10.7111H9.74961C9.74961 10.4027 9.83156 10.2271 9.93133 10.0956C10.0509 9.93794 10.2242 9.80442 10.4954 9.61706C10.5238 9.59739 10.5539 9.57694 10.5853 9.5556C11.0769 9.22121 11.8885 8.6692 11.8885 7.49307C11.8885 5.90248 10.5902 4.60417 8.99961 4.60417C7.41122 4.60417 6.11072 5.89054 6.11072 7.49307H7.61072Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/settings/lab-flags.svg b/res/img/element-icons/settings/lab-flags.svg
new file mode 100644
index 0000000000..b96aa17d26
--- /dev/null
+++ b/res/img/element-icons/settings/lab-flags.svg
@@ -0,0 +1,4 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.9722 17C2.43527 17 2 16.5647 2 16.0278V9.29493C2 9.12977 2.21388 9 2.4861 9H3.45831C3.73052 9 3.94441 9.12977 3.94441 9.29493V16.0278C3.94441 16.5647 3.50914 17 2.9722 17Z" fill="black"/>
+<path d="M4.67853 1C2.71201 1 2.00037 2.32352 2.00037 3.14492V11.7828H3.46227C6.54174 10.3832 9.54358 13.0302 12.7136 12.9997C15.8837 12.9693 16.0001 11.2655 16.0001 10.4136V3.57086C16.0001 0.786973 14.0724 3.46432 10.7987 2.38431C7.95667 1.44674 7.44433 1 4.67853 1Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/settings/preference.svg b/res/img/element-icons/settings/preference.svg
new file mode 100644
index 0000000000..d466662117
--- /dev/null
+++ b/res/img/element-icons/settings/preference.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="M6 4C3.23858 4 1 6.23858 1 9C1 11.7614 3.23858 14 6 14H12C14.7614 14 17 11.7614 17 9C17 6.23858 14.7614 4 12 4H6ZM9 9C9 10.6569 7.65685 12 6 12C4.34315 12 3 10.6569 3 9C3 7.34315 4.34315 6 6 6C7.65685 6 9 7.34315 9 9Z" fill="black"/>
+</svg>
diff --git a/res/img/element-icons/view-community.svg b/res/img/element-icons/view-community.svg
new file mode 100644
index 0000000000..ee33aa525e
--- /dev/null
+++ b/res/img/element-icons/view-community.svg
@@ -0,0 +1,8 @@
+<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.3335 7.16667C8.3335 8.36328 7.43807 9.33333 6.3335 9.33333C5.22893 9.33333 4.3335 8.36328 4.3335 7.16667C4.3335 5.97005 5.22893 5 6.3335 5C7.43807 5 8.3335 5.97005 8.3335 7.16667ZM12.5043 10.1297C13.472 10.1297 14.2565 9.27984 14.2565 8.23152C14.2565 7.1832 13.472 6.33337 12.5043 6.33337C11.5367 6.33337 10.7522 7.1832 10.7522 8.23152C10.7522 9.27984 11.5367 10.1297 12.5043 10.1297ZM7.10447 10.4089C8.56975 10.7299 9.66656 12.0353 9.66656 13.5969L9.66656 15.7587H5.66657L2.71436 12.6667C3.35468 11.2876 4.73442 10.3334 6.33324 10.3334C6.59706 10.3334 6.85492 10.3594 7.10447 10.4089ZM11.1665 15.7586H12.5044L15.4676 12.6666C14.8466 11.6684 13.7516 11.0057 12.5044 11.0057C11.8406 11.0057 11.22 11.1934 10.6909 11.5195C10.9956 12.1471 11.1665 12.8519 11.1665 13.5969L11.1665 15.7586Z"/>
+</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.3335 7.16667C8.3335 8.36328 7.43807 9.33333 6.3335 9.33333C5.22893 9.33333 4.3335 8.36328 4.3335 7.16667C4.3335 5.97005 5.22893 5 6.3335 5C7.43807 5 8.3335 5.97005 8.3335 7.16667ZM12.5043 10.1297C13.472 10.1297 14.2565 9.27984 14.2565 8.23152C14.2565 7.1832 13.472 6.33337 12.5043 6.33337C11.5367 6.33337 10.7522 7.1832 10.7522 8.23152C10.7522 9.27984 11.5367 10.1297 12.5043 10.1297ZM7.10447 10.4089C8.56975 10.7299 9.66656 12.0353 9.66656 13.5969L9.66656 15.7587H5.66657L2.71436 12.6667C3.35468 11.2876 4.73442 10.3334 6.33324 10.3334C6.59706 10.3334 6.85492 10.3594 7.10447 10.4089ZM11.1665 15.7586H12.5044L15.4676 12.6666C14.8466 11.6684 13.7516 11.0057 12.5044 11.0057C11.8406 11.0057 11.22 11.1934 10.6909 11.5195C10.9956 12.1471 11.1665 12.8519 11.1665 13.5969L11.1665 15.7586Z" fill="black"/>
+<path d="M9.66656 13.5969H8.33322V13.5969L9.66656 13.5969ZM7.10447 10.4089L7.38974 9.10648L7.37705 9.1037L7.36431 9.10117L7.10447 10.4089ZM9.66656 15.7587V17.092H10.9999L10.9999 15.7587L9.66656 15.7587ZM5.66657 15.7587L4.70222 16.6795L5.09614 17.092H5.66657V15.7587ZM2.71436 12.6667L1.50502 12.1052L1.12213 12.9299L1.75 13.5875L2.71436 12.6667ZM12.5044 15.7586V17.092H13.0733L13.467 16.6812L12.5044 15.7586ZM11.1665 15.7586L9.83313 15.7586L9.83313 17.092H11.1665V15.7586ZM15.4676 12.6666L16.4303 13.5892L17.1468 12.8416L16.5997 11.9623L15.4676 12.6666ZM10.6909 11.5195L9.99128 10.3845L8.96494 11.0171L9.49143 12.1018L10.6909 11.5195ZM11.1665 13.5969H9.83312V13.5969L11.1665 13.5969ZM15.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.6667ZM6.3335 10.6667C8.27292 10.6667 9.66683 8.99717 9.66683 7.16667H7.00016C7.00016 7.7294 6.60321 8 6.3335 8V10.6667ZM3.00016 7.16667C3.00016 8.99717 4.39407 10.6667 6.3335 10.6667V8C6.06378 8 5.66683 7.7294 5.66683 7.16667H3.00016ZM6.3335 3.66667C4.39407 3.66667 3.00016 5.33616 3.00016 7.16667H5.66683C5.66683 6.60393 6.06378 6.33333 6.3335 6.33333V3.66667ZM9.66683 7.16667C9.66683 5.33616 8.27292 3.66667 6.3335 3.66667V6.33333C6.60321 6.33333 7.00016 6.60393 7.00016 7.16667H9.66683ZM12.9231 8.23152C12.9231 8.64596 12.6372 8.79634 12.5043 8.79634V11.463C14.3069 11.463 15.5898 9.91373 15.5898 8.23152H12.9231ZM12.5043 7.66671C12.6372 7.66671 12.9231 7.81709 12.9231 8.23152H15.5898C15.5898 6.54932 14.3069 5.00004 12.5043 5.00004V7.66671ZM12.0855 8.23152C12.0855 7.81709 12.3715 7.66671 12.5043 7.66671V5.00004C10.7018 5.00004 9.41886 6.54932 9.41886 8.23152H12.0855ZM12.5043 8.79634C12.3715 8.79634 12.0855 8.64596 12.0855 8.23152H9.41886C9.41886 9.91373 10.7018 11.463 12.5043 11.463V8.79634ZM10.9999 13.5969C10.9999 11.3957 9.45399 9.5586 7.38974 9.10648L6.8192 11.7114C7.68551 11.9011 8.33322 12.6749 8.33322 13.5969H10.9999ZM10.9999 15.7587L10.9999 13.5969L8.33322 13.5969L8.33323 15.7587L10.9999 15.7587ZM5.66657 17.092H9.66656V14.4254H5.66657V17.092ZM1.75 13.5875L4.70222 16.6795L6.63093 14.8379L3.67871 11.7459L1.75 13.5875ZM6.33324 9.00004C4.18685 9.00004 2.35159 10.2819 1.50502 12.1052L3.92369 13.2282C4.35777 12.2933 5.28198 11.6667 6.33324 11.6667V9.00004ZM7.36431 9.10117C7.0297 9.03469 6.68482 9.00004 6.33324 9.00004V11.6667C6.5093 11.6667 6.68013 11.684 6.84462 11.7167L7.36431 9.10117ZM12.5044 14.4253H11.1665V17.092H12.5044V14.4253ZM14.505 11.7441L11.5417 14.8361L13.467 16.6812L16.4303 13.5892L14.505 11.7441ZM12.5044 12.339C13.2649 12.339 13.9438 12.7414 14.3355 13.371L16.5997 11.9623C15.7493 10.5955 14.2382 9.67234 12.5044 9.67234V12.339ZM11.3906 12.6545C11.7163 12.4538 12.0958 12.339 12.5044 12.339V9.67234C11.5854 9.67234 10.7237 9.93304 9.99128 10.3845L11.3906 12.6545ZM12.4998 13.5969C12.4998 12.6459 12.2813 11.7425 11.8904 10.9373L9.49143 12.1018C9.70988 12.5518 9.83312 13.0578 9.83312 13.5969H12.4998ZM12.4998 15.7586L12.4998 13.5969L9.83312 13.5969L9.83313 15.7586L12.4998 15.7586Z" fill="black" mask="url(#path-1-inside-1)"/>
+<path d="M16.25 9C16.25 13.0041 13.0041 16.25 9 16.25C4.99594 16.25 1.75 13.0041 1.75 9C1.75 4.99594 4.99594 1.75 9 1.75C13.0041 1.75 16.25 4.99594 16.25 9Z" stroke="black" stroke-width="1.5"/>
+</svg>
diff --git a/res/img/ems-logo.svg b/res/img/ems-logo.svg
new file mode 100644
index 0000000000..5ad29173cb
--- /dev/null
+++ b/res/img/ems-logo.svg
@@ -0,0 +1,9 @@
+<svg width="32" height="12" viewBox="0 0 32 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18.8612 6.11398H15.0997C15.1441 6.50759 15.2869 6.82185 15.5282 7.05675C15.7694 7.2853 16.0869 7.39957 16.4805 7.39957C16.7408 7.39957 16.9757 7.33609 17.1852 7.20912C17.3947 7.08214 17.5439 6.91073 17.6328 6.69488H18.7755C18.6232 7.19642 18.3375 7.60273 17.9185 7.91381C17.5058 8.21855 17.0169 8.37092 16.4519 8.37092C15.7155 8.37092 15.1187 8.12649 14.6616 7.63765C14.2109 7.1488 13.9855 6.52981 13.9855 5.78067C13.9855 5.05058 14.214 4.43794 14.6711 3.94274C15.1282 3.44755 15.7187 3.19995 16.4424 3.19995C17.1661 3.19995 17.7502 3.44437 18.1946 3.93322C18.6454 4.41572 18.8708 5.02518 18.8708 5.76163L18.8612 6.11398ZM16.4424 4.12368C16.0869 4.12368 15.7917 4.22843 15.5568 4.43794C15.3219 4.64744 15.1758 4.92678 15.1187 5.27596H17.747C17.6963 4.92678 17.5566 4.64744 17.328 4.43794C17.0995 4.22843 16.8043 4.12368 16.4424 4.12368Z" fill="#454545"/>
+<path d="M23.974 5.4188V8.25664H22.8408V5.295C22.8408 4.54586 22.5297 4.17129 21.9075 4.17129C21.5711 4.17129 21.3012 4.27922 21.0981 4.49507C20.9013 4.71093 20.8029 5.00614 20.8029 5.38071V8.25664H19.6696V3.31423H20.7172V3.97131C20.8378 3.74911 21.0219 3.565 21.2695 3.41898C21.5171 3.27296 21.825 3.19995 22.1932 3.19995C22.8789 3.19995 23.3741 3.46025 23.6788 3.98083C24.0978 3.46025 24.6565 3.19995 25.3548 3.19995C25.9326 3.19995 26.377 3.38089 26.6881 3.74276C26.9991 4.09828 27.1547 4.56808 27.1547 5.15216V8.25664H26.0214V5.295C26.0214 4.54586 25.7104 4.17129 25.0882 4.17129C24.7454 4.17129 24.4724 4.28239 24.2692 4.5046C24.0724 4.72045 23.974 5.02518 23.974 5.4188Z" fill="#454545"/>
+<path d="M29.9335 8.37092C29.2542 8.37092 28.7432 8.2122 28.4003 7.89477C28.0575 7.57734 27.8702 7.17102 27.8385 6.67583H28.9336C28.9463 6.90438 29.0447 7.08849 29.2288 7.22816C29.4129 7.36783 29.6701 7.43767 30.0002 7.43767C30.2922 7.43767 30.5176 7.38688 30.6763 7.2853C30.835 7.18372 30.9144 7.04723 30.9144 6.87581C30.9144 6.68535 30.816 6.54568 30.6192 6.4568C30.4287 6.36157 30.1938 6.29174 29.9145 6.2473C29.6351 6.20286 29.3558 6.14572 29.0765 6.07588C28.7971 5.9997 28.559 5.85368 28.3622 5.63783C28.1718 5.42197 28.0765 5.12676 28.0765 4.75219C28.0765 4.32049 28.2543 3.95544 28.6098 3.65705C28.9717 3.35232 29.4479 3.19995 30.0383 3.19995C30.3748 3.19995 30.67 3.25391 30.9239 3.36184C31.1842 3.46342 31.3842 3.59992 31.5239 3.77133C31.6699 3.94274 31.7778 4.11733 31.8476 4.29509C31.9238 4.47285 31.9683 4.65379 31.981 4.8379H30.8953C30.8763 4.64109 30.7906 4.47285 30.6382 4.33318C30.4922 4.19351 30.2827 4.12368 30.0097 4.12368C29.7367 4.12368 29.5272 4.17764 29.3812 4.28557C29.2352 4.38715 29.1622 4.52999 29.1622 4.7141C29.1622 4.88551 29.2574 5.01566 29.4479 5.10454C29.6447 5.19342 29.8827 5.26008 30.1621 5.30452C30.4414 5.34897 30.7208 5.41245 31.0001 5.49498C31.2794 5.57117 31.5143 5.72036 31.7048 5.94256C31.9016 6.16477 32 6.45998 32 6.8282C32 7.2726 31.8191 7.64082 31.4572 7.93286C31.1017 8.2249 30.5938 8.37092 29.9335 8.37092Z" fill="#454545"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.85681 1.18284C3.85681 0.82783 4.1446 0.540039 4.49961 0.540039C6.86634 0.540039 8.78494 2.45865 8.78494 4.82537C8.78494 5.18038 8.49715 5.46817 8.14214 5.46817C7.78714 5.46817 7.49934 5.18038 7.49934 4.82537C7.49934 3.16866 6.15632 1.82564 4.49961 1.82564C4.1446 1.82564 3.85681 1.53785 3.85681 1.18284Z" fill="#454545"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.85657 10.6106C6.85657 10.9656 6.56878 11.2534 6.21377 11.2534C3.84705 11.2534 1.92844 9.33481 1.92844 6.96809C1.92844 6.61308 2.21623 6.32529 2.57124 6.32529C2.92625 6.32529 3.21404 6.61308 3.21404 6.96809C3.21404 8.62479 4.55706 9.96782 6.21377 9.96782C6.56878 9.96782 6.85657 10.2556 6.85657 10.6106Z" fill="#454545"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.6428 7.39661C0.287791 7.39661 -1.25798e-08 7.10882 -2.80977e-08 6.75381C-1.3155e-07 4.38708 1.91861 2.46848 4.28533 2.46848C4.64034 2.46848 4.92813 2.75627 4.92813 3.11128C4.92813 3.46628 4.64034 3.75408 4.28533 3.75408C2.62863 3.75408 1.2856 5.0971 1.2856 6.75381C1.2856 7.10882 0.997809 7.39661 0.6428 7.39661Z" fill="#454545"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.0706 4.39685C10.4256 4.39685 10.7134 4.68464 10.7134 5.03965C10.7134 7.40637 8.79477 9.32498 6.42805 9.32498C6.07304 9.32498 5.78525 9.03719 5.78525 8.68218C5.78525 8.32717 6.07304 8.03938 6.42805 8.03938C8.08475 8.03938 9.42778 6.69636 9.42778 5.03965C9.42778 4.68464 9.71557 4.39685 10.0706 4.39685Z" fill="#454545"/>
+</svg>
diff --git a/res/img/explore.svg b/res/img/explore.svg
deleted file mode 100644
index 3956e912ac..0000000000
--- a/res/img/explore.svg
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="21.124001"
-   height="14.896"
-   viewBox="0 0 21.124001 14.896"
-   version="1.1"
-   id="svg21"
-   sodipodi:docname="explore.svg"
-   inkscape:version="0.92.4 (unknown)">
-  <metadata
-     id="metadata25">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     id="namedview23"
-     showgrid="false"
-     fit-margin-top="0.5"
-     fit-margin-left="0.5"
-     fit-margin-right="0.5"
-     fit-margin-bottom="0.5"
-     inkscape:zoom="3.1891892"
-     inkscape:cx="-23.683763"
-     inkscape:cy="5.4480001"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg21" />
-  <defs
-     id="defs15">
-    <filter
-       id="a"
-       width="1.118"
-       height="1.158"
-       x="-0.059"
-       y="-0.079000004"
-       filterUnits="objectBoundingBox">
-      <feOffset
-         dy="2"
-         in="SourceAlpha"
-         result="shadowOffsetOuter1"
-         id="feOffset2" />
-      <feGaussianBlur
-         in="shadowOffsetOuter1"
-         result="shadowBlurOuter1"
-         stdDeviation="16"
-         id="feGaussianBlur4" />
-      <feColorMatrix
-         in="shadowBlurOuter1"
-         result="shadowMatrixOuter1"
-         values="0 0 0 0 0 0 0 0 0 0.473684211 0 0 0 0 1 0 0 0 0.241258741 0"
-         id="feColorMatrix6" />
-      <feMerge
-         id="feMerge12">
-        <feMergeNode
-           in="shadowMatrixOuter1"
-           id="feMergeNode8" />
-        <feMergeNode
-           in="SourceGraphic"
-           id="feMergeNode10" />
-      </feMerge>
-    </filter>
-  </defs>
-  <g
-     transform="translate(-91.438,-120.552)"
-     id="g19"
-     style="fill:none;fill-rule:evenodd;stroke:#61708b;stroke-width:1.29999995;stroke-linecap:round;filter:url(#a)">
-    <path
-       d="m 98,122 h 13 m -13,6 h 13 m -13,6 h 13 M 93,122 h 0.5 m -0.5,6 h 0.5 m -0.5,6 h 0.5"
-       id="path17"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/res/img/feather-customised/alert-triangle.svg b/res/img/feather-customised/alert-triangle.svg
new file mode 100644
index 0000000000..ceb664790f
--- /dev/null
+++ b/res/img/feather-customised/alert-triangle.svg
@@ -0,0 +1,5 @@
+<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="M10.29 3.86002L1.82002 18C1.46466 18.6154 1.46254 19.3732 1.81445 19.9905C2.16635 20.6079 2.81943 20.9922 3.53002 21H20.47C21.1806 20.9922 21.8337 20.6079 22.1856 19.9905C22.5375 19.3732 22.5354 18.6154 22.18 18L13.71 3.86002C13.3475 3.2623 12.6991 2.89728 12 2.89728C11.3009 2.89728 10.6526 3.2623 10.29 3.86002Z" stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 9V13" stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round"/>
+<circle cx="12" cy="17" r="1" fill="#2E2F32"/>
+</svg>
diff --git a/res/img/feather-customised/chevron-down-thin.svg b/res/img/feather-customised/chevron-down-thin.svg
new file mode 100644
index 0000000000..109c83def6
--- /dev/null
+++ b/res/img/feather-customised/chevron-down-thin.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 d="M6 7.5L9 10.5L12 7.5" stroke="black" stroke-width="0.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/res/img/feather-customised/chevron-down.svg b/res/img/feather-customised/chevron-down.svg
index bcb185ede7..a091913b42 100644
--- a/res/img/feather-customised/chevron-down.svg
+++ b/res/img/feather-customised/chevron-down.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6 9L12 15L18 9" stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round"/>
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 7.5L9 10.5L12 7.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/res/img/feather-customised/clipboard.svg b/res/img/feather-customised/clipboard.svg
new file mode 100644
index 0000000000..b25b97176c
--- /dev/null
+++ b/res/img/feather-customised/clipboard.svg
@@ -0,0 +1,4 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.75 3.75H3.75V10.75" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<rect x="7" y="7" width="7" height="7" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/res/img/feather-customised/face.svg b/res/img/feather-customised/face.svg
deleted file mode 100644
index a8ca856b67..0000000000
--- a/res/img/feather-customised/face.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="LifeBuoy" transform="translate(-1073.000000, -872.000000)">
-            <g id="face-copy" transform="translate(1074.000000, 873.000000)">
-                <circle id="Oval" stroke="#B8BEC9" stroke-width="1" stroke-linecap="round" stroke-linejoin="round" cx="8" cy="8" r="8"></circle>
-                <path d="M7.6,7.6 C8.13333333,8.71262059 8.4,9.77928725 8.4,10.8 C8.4,11.8207127 8.13333333,12.8873794 7.6,14" id="Path" stroke="#B8BEC9" stroke-width="1" stroke-linecap="round" stroke-linejoin="round" transform="translate(8.000000, 10.800000) rotate(90.000000) translate(-8.000000, -10.800000) "></path>
-                <path d="" id="Path-Copy" stroke="#B8BEC9" stroke-width="1" stroke-linecap="round" stroke-linejoin="round" transform="translate(4.800000, 4.800000) rotate(90.000000) translate(-4.800000, -4.800000) "></path>
-                <circle id="Oval" fill="#B8BEC9" fill-rule="nonzero" cx="4.8" cy="5.6" r="1"></circle>
-                <circle id="Oval-Copy" fill="#B8BEC9" fill-rule="nonzero" cx="11.2" cy="5.6" r="1"></circle>
-            </g>
-        </g>
-    </g>
-</svg>
diff --git a/res/img/feather-customised/flag.svg b/res/img/feather-customised/flag.svg
deleted file mode 100644
index 983c02762b..0000000000
--- a/res/img/feather-customised/flag.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="11" height="14" viewBox="0 0 11 14">
-    <g fill="none" fill-rule="evenodd" stroke="#454545" stroke-linecap="round" stroke-linejoin="round">
-        <path d="M.588 8.8s.588-.6 2.353-.6c1.765 0 2.941 1.2 4.706 1.2C9.412 9.4 10 8.8 10 8.8V1.6s-.588.6-2.353.6C5.882 2.2 4.706 1 2.941 1c-1.765 0-2.353.6-2.353.6v7.2zM.588 13V8.8"/>
-    </g>
-</svg>
diff --git a/res/img/feather-customised/flair.svg b/res/img/feather-customised/flair.svg
deleted file mode 100644
index ce3a5ed6ad..0000000000
--- a/res/img/feather-customised/flair.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="10" height="14" viewBox="0 0 10 14">
-    <g fill="none" fill-rule="evenodd" stroke="#454545" stroke-linecap="round" stroke-linejoin="round" transform="translate(1 1)">
-        <ellipse cx="4" cy="3.818" rx="4" ry="3.818"/>
-        <path d="M1.834 7.03L1.143 12 4 10.364 6.857 12l-.691-4.975"/>
-    </g>
-</svg>
diff --git a/res/img/feather-customised/grid.svg b/res/img/feather-customised/grid.svg
deleted file mode 100644
index 4f7ab30d97..0000000000
--- a/res/img/feather-customised/grid.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="LifeBuoy" transform="translate(-1350.000000, -91.000000)" stroke="#B8BEC9" stroke-width="1">
-            <g id="grid-copy" transform="translate(1351.000000, 92.000000)">
-                <rect id="Rectangle" x="0" y="0" width="5.44444444" height="5.44444444"></rect>
-                <rect id="Rectangle" x="8.55555556" y="0" width="5.44444444" height="5.44444444"></rect>
-                <rect id="Rectangle" x="8.55555556" y="8.55555556" width="5.44444444" height="5.44444444"></rect>
-                <rect id="Rectangle" x="0" y="8.55555556" width="5.44444444" height="5.44444444"></rect>
-            </g>
-        </g>
-    </g>
-</svg>
diff --git a/res/img/feather-customised/lock-solid.svg b/res/img/feather-customised/lock-solid.svg
deleted file mode 100644
index 9eb8b6a4c5..0000000000
--- a/res/img/feather-customised/lock-solid.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 fill-rule="evenodd" clip-rule="evenodd" d="M3 13C3 11.8954 3.89543 11 5 11H19C20.1046 11 21 11.8954 21 13V20C21 21.1046 20.1046 22 19 22H5C3.89543 22 3 21.1046 3 20V13Z" fill="#2E2F32" stroke="#2E2F32" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7 11V7C7 4.23858 9.23858 2 12 2C14.7614 2 17 4.23858 17 7V11" stroke="#2E2F32" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/res/img/feather-customised/lock.svg b/res/img/feather-customised/lock.svg
deleted file mode 100644
index 1330903b30..0000000000
--- a/res/img/feather-customised/lock.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="13" height="14" viewBox="0 0 13 14">
-    <g fill="none" fill-rule="evenodd" stroke="#454545" stroke-linecap="round" stroke-linejoin="round" transform="translate(1 1)">
-        <rect width="11" height="6.6" y="5.4" rx="1.2"/>
-        <path d="M2.444 5.4V3c0-1.657 1.368-3 3.056-3s3.056 1.343 3.056 3v2.4"/>
-    </g>
-</svg>
diff --git a/res/img/feather-customised/notifications.svg b/res/img/feather-customised/notifications.svg
deleted file mode 100644
index a590031ac3..0000000000
--- a/res/img/feather-customised/notifications.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="LifeBuoy" transform="translate(-1460.000000, -90.000000)" stroke="#B8BEC9" stroke-width="1">
-            <g id="bell-copy" transform="translate(1461.000000, 91.000000)">
-                <path d="M16,12 L0,12 C1.3254834,12 2.4,10.9254834 2.4,9.6 L2.4,5.6 C2.40000005,2.50720543 4.90720543,8.34465016e-08 8,8.3446502e-08 C11.0927946,8.34465023e-08 13.6,2.50720543 13.6,5.6 L13.6,9.6 C13.6,10.9254834 14.6745166,12 16,12 Z M9.384,15.2 C9.09776179,15.6934435 8.57045489,15.997165 8,15.997165 C7.42954511,15.997165 6.90223821,15.6934435 6.616,15.2 L9.384,15.2 Z" id="Shape"></path>
-            </g>
-        </g>
-    </g>
-</svg>
diff --git a/res/img/feather-customised/paperclip.svg b/res/img/feather-customised/paperclip.svg
deleted file mode 100644
index 74a90e0fa3..0000000000
--- a/res/img/feather-customised/paperclip.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<svg width="18px" height="19px" viewBox="0 0 18 19" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="LifeBuoy" transform="translate(-1103.000000, -871.000000)" stroke="#B8BEC9" stroke-width="1">
-            <g id="paperclip-copy" transform="translate(1104.000000, 872.000000)">
-                <path d="M15.552,8.13571429 L8.2,15.5752381 C6.32444099,17.4731252 3.28355901,17.4731252 1.408,15.5752381 C-0.46755901,13.677351 -0.46755901,10.600268 1.408,8.70238095 L8.76,1.26285714 C10.0103727,-0.00240088755 12.0376273,-0.00240087226 13.288,1.26285718 C14.5383726,2.52811523 14.5383726,4.57950384 13.288,5.8447619 L5.928,13.2842857 C5.30281366,13.9169147 4.28918634,13.9169147 3.664,13.2842857 C3.03881366,12.6516567 3.03881366,11.6259624 3.664,10.9933333 L10.456,4.12857143" id="Path"></path>
-            </g>
-        </g>
-    </g>
-</svg>
diff --git a/res/img/feather-customised/phone.svg b/res/img/feather-customised/phone.svg
deleted file mode 100644
index 85661c5320..0000000000
--- a/res/img/feather-customised/phone.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="LifeBuoy" transform="translate(-1133.000000, -872.000000)" stroke="#B8BEC9" stroke-width="1">
-            <g id="phone-copy" transform="translate(1134.000000, 873.000000)">
-                <path d="M16.1904762,11.936 L16.1904762,14.336 C16.1923266,14.7865161 16.001896,15.2169267 15.6659678,15.5214919 C15.3300396,15.8260571 14.879747,15.9765505 14.4257143,15.936 C11.934675,15.6685126 9.54185647,14.8273156 7.43952381,13.48 C5.48357515,12.2517311 3.82527212,10.6129375 2.58238095,8.68 C1.21426795,6.59296319 0.362863382,4.21679565 0.0971428571,1.744 C0.0562402179,1.29669787 0.207458292,0.853001939 0.513858012,0.521296845 C0.820257732,0.18959175 1.25362391,0.000422952191 1.70809524,0 L4.13666667,0 C4.94931852,-0.00790412572 5.64197687,0.580773986 5.75571429,1.376 C5.85821863,2.14405316 6.04831623,2.89818151 6.32238095,3.624 C6.54478548,4.20870002 6.40253601,4.86784501 5.95809524,5.312 L4.93,6.328 C6.08240205,8.33083666 7.7604629,9.98915562 9.78714286,11.128 L10.8152381,10.112 C11.2646806,9.67278794 11.9316726,9.532212 12.5233333,9.752 C13.2577925,10.0228404 14.0208986,10.2107016 14.7980952,10.312 C15.6121222,10.4254883 16.2108681,11.1238341 16.1904762,11.936 Z" id="Path"></path>
-            </g>
-        </g>
-    </g>
-</svg>
diff --git a/res/img/feather-customised/search.svg b/res/img/feather-customised/search.svg
deleted file mode 100644
index 9ce0724ea7..0000000000
--- a/res/img/feather-customised/search.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="LifeBuoy" transform="translate(-1378.000000, -91.000000)" stroke="#B8BEC9" stroke-width="1">
-            <g id="search-copy" transform="translate(1379.000000, 92.000000)">
-                <circle id="Oval" cx="6.22222222" cy="6.22222222" r="6.22222222"></circle>
-                <path d="M14,14 L10.6166667,10.6166667" id="Path"></path>
-            </g>
-        </g>
-    </g>
-</svg>
diff --git a/res/img/feather-customised/secure-backup.svg b/res/img/feather-customised/secure-backup.svg
new file mode 100644
index 0000000000..c06f93c1fe
--- /dev/null
+++ b/res/img/feather-customised/secure-backup.svg
@@ -0,0 +1,11 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0" mask-type="alpha" maskUnits="userSpaceOnUse" x="1" y="2" width="22" height="21">
+<rect x="1" y="2" width="21.5" height="5" fill="white"/>
+<rect x="1" y="17.7" width="21.5" height="5" fill="white"/>
+</mask>
+<g mask="url(#mask0)">
+<path d="M3.16626 12.4014C3.16626 7.64675 6.99526 3.81775 11.75 3.81775C13.0964 3.81775 14.4429 4.15437 15.6631 4.74345H14.9899C14.5691 4.74345 14.2325 5.08006 14.2325 5.50083C14.2325 5.9216 14.5691 6.25822 14.9899 6.25822H17.3041C17.809 6.25822 18.1877 5.83745 18.1877 5.3746V3.06037C18.1877 2.6396 17.8511 2.30298 17.4303 2.30298C17.0096 2.30298 16.673 2.6396 16.673 3.06037V3.60737C16.6309 3.56529 16.5888 3.5653 16.5467 3.52322C15.074 2.72376 13.433 2.30298 11.75 2.30298C6.1958 2.30298 1.65149 6.84729 1.65149 12.4014C1.65149 14.0845 2.07226 15.7676 2.87172 17.2403C2.99795 17.4928 3.25041 17.619 3.54495 17.619C3.67118 17.619 3.79741 17.5769 3.92364 17.5348C4.30233 17.3245 4.42857 16.8616 4.21819 16.525C3.50288 15.2627 3.16626 13.8321 3.16626 12.4014Z" fill="#2E2F32"/>
+<path d="M20.6281 7.56263C20.4177 7.18394 19.9548 7.05771 19.6182 7.2681C19.2395 7.47848 19.1133 7.94133 19.3237 8.27794C19.9969 9.54025 20.3756 10.9288 20.3756 12.4015C20.3756 17.1562 16.5045 20.9852 11.7919 20.9852C10.4454 20.9852 9.09897 20.6486 7.87874 20.0595H8.55198C8.97275 20.0595 9.30937 19.7229 9.30937 19.3021C9.30937 18.8813 8.97275 18.5447 8.55198 18.5447H6.23774C5.73282 18.5447 5.35413 18.9655 5.35413 19.4283V21.7426C5.35413 22.1633 5.69075 22.4999 6.11152 22.4999C6.53229 22.4999 6.8689 22.1633 6.8689 21.7426V21.1956C6.91098 21.2376 6.95306 21.2376 6.99514 21.2797C8.42575 22.0792 10.0667 22.4999 11.7498 22.4999C17.304 22.4999 21.8483 17.9556 21.8483 12.4015C21.8483 10.7184 21.4275 9.03532 20.6281 7.56263Z" fill="#2E2F32"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 9C1.89543 9 1 9.89543 1 11V14C1 15.1046 1.89543 16 3 16H21C22.1046 16 23 15.1046 23 14V11C23 9.89543 22.1046 9 21 9H3ZM5.25 10.5C4.83579 10.5 4.5 10.8358 4.5 11.25C4.5 11.6642 4.83579 12 5.25 12H7.75C8.16421 12 8.5 11.6642 8.5 11.25C8.5 10.8358 8.16421 10.5 7.75 10.5H5.25ZM9.5 11.25C9.5 10.8358 9.83579 10.5 10.25 10.5H10.75C11.1642 10.5 11.5 10.8358 11.5 11.25C11.5 11.6642 11.1642 12 10.75 12H10.25C9.83579 12 9.5 11.6642 9.5 11.25ZM13.25 10.5C12.8358 10.5 12.5 10.8358 12.5 11.25C12.5 11.6642 12.8358 12 13.25 12H15.75C16.1642 12 16.5 11.6642 16.5 11.25C16.5 10.8358 16.1642 10.5 15.75 10.5H13.25ZM17.5 11.25C17.5 10.8358 17.8358 10.5 18.25 10.5H18.75C19.1642 10.5 19.5 10.8358 19.5 11.25C19.5 11.6642 19.1642 12 18.75 12H18.25C17.8358 12 17.5 11.6642 17.5 11.25ZM5.25 13C4.83579 13 4.5 13.3358 4.5 13.75C4.5 14.1642 4.83579 14.5 5.25 14.5H5.75C6.16421 14.5 6.5 14.1642 6.5 13.75C6.5 13.3358 6.16421 13 5.75 13H5.25ZM7.5 13.75C7.5 13.3358 7.83579 13 8.25 13H10.75C11.1642 13 11.5 13.3358 11.5 13.75C11.5 14.1642 11.1642 14.5 10.75 14.5H8.25C7.83579 14.5 7.5 14.1642 7.5 13.75ZM13.25 13C12.8358 13 12.5 13.3358 12.5 13.75C12.5 14.1642 12.8358 14.5 13.25 14.5H13.75C14.1642 14.5 14.5 14.1642 14.5 13.75C14.5 13.3358 14.1642 13 13.75 13H13.25Z" fill="#2E2F32"/>
+</svg>
diff --git a/res/img/feather-customised/secure-phrase.svg b/res/img/feather-customised/secure-phrase.svg
new file mode 100644
index 0000000000..eb13d3f048
--- /dev/null
+++ b/res/img/feather-customised/secure-phrase.svg
@@ -0,0 +1,11 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0" mask-type="alpha" maskUnits="userSpaceOnUse" x="1" y="2" width="22" height="21">
+<rect x="1" y="2" width="21.5" height="5" fill="white"/>
+<rect x="1" y="17.7" width="21.5" height="5" fill="white"/>
+</mask>
+<g mask="url(#mask0)">
+<path d="M3.16626 12.4014C3.16626 7.64675 6.99526 3.81775 11.75 3.81775C13.0964 3.81775 14.4429 4.15437 15.6631 4.74345H14.9899C14.5691 4.74345 14.2325 5.08006 14.2325 5.50083C14.2325 5.9216 14.5691 6.25822 14.9899 6.25822H17.3041C17.809 6.25822 18.1877 5.83745 18.1877 5.3746V3.06037C18.1877 2.6396 17.8511 2.30298 17.4303 2.30298C17.0096 2.30298 16.673 2.6396 16.673 3.06037V3.60737C16.6309 3.56529 16.5888 3.5653 16.5467 3.52322C15.074 2.72376 13.433 2.30298 11.75 2.30298C6.1958 2.30298 1.65149 6.84729 1.65149 12.4014C1.65149 14.0845 2.07226 15.7676 2.87172 17.2403C2.99795 17.4928 3.25041 17.619 3.54495 17.619C3.67118 17.619 3.79741 17.5769 3.92364 17.5348C4.30233 17.3245 4.42857 16.8616 4.21819 16.525C3.50288 15.2627 3.16626 13.8321 3.16626 12.4014Z" fill="#2E2F32"/>
+<path d="M20.6281 7.56263C20.4177 7.18394 19.9548 7.05771 19.6182 7.2681C19.2395 7.47848 19.1133 7.94133 19.3237 8.27794C19.9969 9.54025 20.3756 10.9288 20.3756 12.4015C20.3756 17.1562 16.5045 20.9852 11.7919 20.9852C10.4454 20.9852 9.09897 20.6486 7.87874 20.0595H8.55198C8.97275 20.0595 9.30937 19.7229 9.30937 19.3021C9.30937 18.8813 8.97275 18.5447 8.55198 18.5447H6.23774C5.73282 18.5447 5.35413 18.9655 5.35413 19.4283V21.7426C5.35413 22.1633 5.69075 22.4999 6.11152 22.4999C6.53229 22.4999 6.8689 22.1633 6.8689 21.7426V21.1956C6.91098 21.2376 6.95306 21.2376 6.99514 21.2797C8.42575 22.0792 10.0667 22.4999 11.7498 22.4999C17.304 22.4999 21.8483 17.9556 21.8483 12.4015C21.8483 10.7184 21.4275 9.03532 20.6281 7.56263Z" fill="#2E2F32"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1 11C1 9.89543 1.89543 9 3 9H21C22.1046 9 23 9.89543 23 11V14C23 15.1046 22.1046 16 21 16H3C1.89543 16 1 15.1046 1 14V11ZM6 12.5C6 13.3284 5.32843 14 4.5 14C3.67157 14 3 13.3284 3 12.5C3 11.6716 3.67157 11 4.5 11C5.32843 11 6 11.6716 6 12.5ZM9.5 14C10.3284 14 11 13.3284 11 12.5C11 11.6716 10.3284 11 9.5 11C8.67157 11 8 11.6716 8 12.5C8 13.3284 8.67157 14 9.5 14ZM16 12.5C16 13.3284 15.3284 14 14.5 14C13.6716 14 13 13.3284 13 12.5C13 11.6716 13.6716 11 14.5 11C15.3284 11 16 11.6716 16 12.5ZM19.5 14C20.3284 14 21 13.3284 21 12.5C21 11.6716 20.3284 11 19.5 11C18.6716 11 18 11.6716 18 12.5C18 13.3284 18.6716 14 19.5 14Z" fill="#2E2F32"/>
+</svg>
diff --git a/res/img/feather-customised/share.svg b/res/img/feather-customised/share.svg
deleted file mode 100644
index 7098af58aa..0000000000
--- a/res/img/feather-customised/share.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-
-<svg width="16px" height="18px" viewBox="0 0 16 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="LifeBuoy" transform="translate(-1322.000000, -90.000000)" stroke="#B8BEC9" stroke-width="1">
-            <g id="share-2-copy" transform="translate(1323.000000, 91.000000)">
-                <ellipse id="Oval" cx="11.6666667" cy="2.4" rx="2.33333333" ry="2.4"></ellipse>
-                <ellipse id="Oval" cx="2.33333333" cy="8" rx="2.33333333" ry="2.4"></ellipse>
-                <ellipse id="Oval" cx="11.6666667" cy="13.6" rx="2.33333333" ry="2.4"></ellipse>
-                <path d="M4.34777778,9.208 L9.66,12.392" id="Path"></path>
-                <path d="M9.65222222,3.608 L4.34777778,6.792" id="Path"></path>
-            </g>
-        </g>
-    </g>
-</svg>
diff --git a/res/img/feather-customised/sliders.svg b/res/img/feather-customised/sliders.svg
deleted file mode 100644
index 5b5ec8656c..0000000000
--- a/res/img/feather-customised/sliders.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="12" viewBox="0 0 14 12">
-    <g fill="none" fill-rule="evenodd" stroke="#454545" stroke-linecap="round" stroke-linejoin="round">
-        <path d="M2.636 11V7.111M2.636 4.889V1M7 11V6M7 3.778V1M11.364 11V8.222M11.364 6V1M1 7.111h3.273M5.364 3.778h3.272M9.727 8.222H13"/>
-    </g>
-</svg>
diff --git a/res/img/feather-customised/trash.custom.svg b/res/img/feather-customised/trash.custom.svg
new file mode 100644
index 0000000000..dc1985ddb2
--- /dev/null
+++ b/res/img/feather-customised/trash.custom.svg
@@ -0,0 +1,7 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.25 5.5H5.16667H21.75" stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M16.5 5.5L15 1H9L7.5 5.5" stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.25 9.25V20.75C5.25 21.8546 6.14543 22.75 7.25 22.75H16.75C17.8546 22.75 18.75 21.8546 18.75 20.75V9.25" stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.75 9.25V18.25" stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14.25 9.25V18.25" stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/res/img/feather-customised/upload.svg b/res/img/feather-customised/upload.svg
deleted file mode 100644
index 30c89d3819..0000000000
--- a/res/img/feather-customised/upload.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14">
-    <g fill="none" fill-rule="evenodd" stroke="#454545" stroke-linecap="round" stroke-linejoin="round" stroke-width="1">
-        <path d="M13 9v2.667c0 .736-.597 1.333-1.333 1.333H2.333A1.333 1.333 0 0 1 1 11.667V9M10.667 4.333L7.333 1 4 4.333M7.333 1v8"/>
-    </g>
-</svg>
diff --git a/res/img/feather-customised/user-add.svg b/res/img/feather-customised/user-add.svg
deleted file mode 100644
index 6b5210c1d6..0000000000
--- a/res/img/feather-customised/user-add.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-
-<svg width="20px" height="16px" viewBox="0 0 20 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="LifeBuoy" transform="translate(-1269.000000, -143.000000)" stroke="#FFFFFF" stroke-width="1">
-            <g id="user-plus-copy" transform="translate(1270.000000, 144.000000)">
-                <path d="M12.2727273,14 L12.2727273,12.4444444 C12.2727273,10.7262252 10.8074774,9.33333333 9,9.33333333 L3.27272727,9.33333333 C1.46524991,9.33333333 1.81672859e-16,10.7262252 0,12.4444444 L0,14" id="Path"></path>
-                <ellipse id="Oval" cx="6.13636364" cy="3.11111111" rx="3.27272727" ry="3.11111111"></ellipse>
-                <path d="M15.5454545,3.88888889 L15.5454545,8.55555556" id="Path"></path>
-                <path d="M18,6.22222222 L13.0909091,6.22222222" id="Path"></path>
-            </g>
-        </g>
-    </g>
-</svg>
diff --git a/res/img/feather-customised/users-sm.svg b/res/img/feather-customised/users-sm.svg
deleted file mode 100644
index 6098be38c3..0000000000
--- a/res/img/feather-customised/users-sm.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="15" height="12" viewBox="0 0 15 12">
-    <g fill="none" fill-rule="evenodd" stroke="#454545" stroke-linecap="round" stroke-linejoin="round" transform="translate(1 1)">
-        <path d="M9.455 11V9.778c0-1.35-1.059-2.445-2.364-2.445H2.364C1.058 7.333 0 8.428 0 9.778V11"/>
-        <ellipse cx="4.727" cy="2.444" rx="2.364" ry="2.444"/>
-        <path d="M13 11V9.778c0-1.114-.73-2.087-1.773-2.365M8.864.08C9.909.355 10.64 1.33 10.64 2.446c0 1.117-.732 2.092-1.777 2.369"/>
-    </g>
-</svg>
diff --git a/res/img/feather-customised/users.svg b/res/img/feather-customised/users.svg
deleted file mode 100644
index b90aafdd4a..0000000000
--- a/res/img/feather-customised/users.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-
-<svg width="20px" height="16px" viewBox="0 0 20 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="LifeBuoy-Copy" transform="translate(-78.000000, -813.000000)" stroke="#293042" stroke-width="1">
-            <g id="Buoy-Copy" transform="translate(68.000000, 802.000000)">
-                <g id="users-copy" transform="translate(11.000000, 12.000000)">
-                    <path d="M13.0909091,14 L13.0909091,12.4444444 C13.0909091,10.7262252 11.6256592,9.33333333 9.81818182,9.33333333 L3.27272727,9.33333333 C1.46524991,9.33333333 1.81672859e-16,10.7262252 0,12.4444444 L0,14" id="Path"></path>
-                    <ellipse id="Oval" cx="6.54545455" cy="3.11111111" rx="3.27272727" ry="3.11111111"></ellipse>
-                    <path d="M18,14 L18,12.4444444 C17.9988875,11.0266471 16.9895445,9.78889348 15.5454545,9.43444444" id="Path"></path>
-                    <path d="M12.2727273,0.101111111 C13.7208394,0.453576501 14.7336899,1.69399311 14.7336899,3.115 C14.7336899,4.53600689 13.7208394,5.7764235 12.2727273,6.12888889" id="Path"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
diff --git a/res/img/feather-customised/video.svg b/res/img/feather-customised/video.svg
deleted file mode 100644
index da77b6c57a..0000000000
--- a/res/img/feather-customised/video.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-
-<svg width="20px" height="13px" viewBox="0 0 20 13" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="LifeBuoy" transform="translate(-1164.000000, -874.000000)" stroke="#B8BEC9" stroke-width="1">
-            <g id="video-copy" transform="translate(1165.000000, 875.000000)">
-                <polygon id="Path" points="18 1.57142857 12.2727273 5.5 18 9.42857143"></polygon>
-                <rect id="Rectangle" x="0" y="0" width="12.2727273" height="11" rx="1.6"></rect>
-            </g>
-        </g>
-    </g>
-</svg>
diff --git a/res/img/file.png b/res/img/file.png
deleted file mode 100644
index 5904ea8284..0000000000
Binary files a/res/img/file.png and /dev/null differ
diff --git a/res/img/filegrid.png b/res/img/filegrid.png
deleted file mode 100644
index c2c2799f37..0000000000
Binary files a/res/img/filegrid.png and /dev/null differ
diff --git a/res/img/filelist.png b/res/img/filelist.png
deleted file mode 100644
index 3cf6cb494e..0000000000
Binary files a/res/img/filelist.png and /dev/null differ
diff --git a/res/img/files.png b/res/img/files.png
deleted file mode 100644
index 83932267f8..0000000000
Binary files a/res/img/files.png and /dev/null differ
diff --git a/res/img/files.svg b/res/img/files.svg
deleted file mode 100644
index 20aba851ea..0000000000
--- a/res/img/files.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="22px" viewBox="0 0 17 22" 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: bin/sketchtool 1.4 (305) - http://www.bohemiancoding.com/sketch -->
-    <title>icons_browse_files</title>
-    <desc>Created with bin/sketchtool.</desc>
-    <defs></defs>
-    <g id="02-Chat" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="02_13-Chat-member-profile" sketch:type="MSArtboardGroup" transform="translate(-1025.000000, -33.000000)">
-            <g id="icons_browse_files" sketch:type="MSLayerGroup" transform="translate(1025.000000, 32.000000)">
-                <g id="Rectangle-5-+-Rectangle-6-Copy" transform="translate(0.000000, 1.000000)" sketch:type="MSShapeGroup">
-                    <path d="M0,4.00955791 C0,1.79514022 1.78163126,0 3.99825563,0 L9.59161955,0 C9.59161955,0 16.3225806,6.49234232 16.3225806,6.49234232 L16.3225806,18.0063928 C16.3225806,20.2120012 14.5290874,22 12.3296282,22 L3.99295243,22 C1.7877057,22 0,20.1996477 0,17.9904421 L0,4.00955791 Z" id="Rectangle-5" stroke="#76CFA6"></path>
-                    <path d="M15.6804916,7.49527496 L11.5273266,7.49527496 C10.3308881,7.49527496 9.3609831,6.52527676 9.3609831,5.3289315 L9.3609831,1.88544393 L15.6804916,7.49527496 Z" id="Rectangle-6-Copy" fill="#FFFFFF"></path>
-                    <path d="M16.3225806,7.09677419 L11.4129801,7.09677419 C10.2050375,7.09677419 9.22580645,6.11744908 9.22580645,4.90960051 L9.22580645,0" id="Rectangle-6" stroke="#76CFA6"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/flags/AD.png b/res/img/flags/AD.png
deleted file mode 100644
index d5d59645fe..0000000000
Binary files a/res/img/flags/AD.png and /dev/null differ
diff --git a/res/img/flags/AE.png b/res/img/flags/AE.png
deleted file mode 100644
index 05c7418aa4..0000000000
Binary files a/res/img/flags/AE.png and /dev/null differ
diff --git a/res/img/flags/AF.png b/res/img/flags/AF.png
deleted file mode 100644
index bc7cef0916..0000000000
Binary files a/res/img/flags/AF.png and /dev/null differ
diff --git a/res/img/flags/AG.png b/res/img/flags/AG.png
deleted file mode 100644
index d48facad47..0000000000
Binary files a/res/img/flags/AG.png and /dev/null differ
diff --git a/res/img/flags/AI.png b/res/img/flags/AI.png
deleted file mode 100644
index 8fd27cd39e..0000000000
Binary files a/res/img/flags/AI.png and /dev/null differ
diff --git a/res/img/flags/AL.png b/res/img/flags/AL.png
deleted file mode 100644
index 883835ffb3..0000000000
Binary files a/res/img/flags/AL.png and /dev/null differ
diff --git a/res/img/flags/AM.png b/res/img/flags/AM.png
deleted file mode 100644
index b1bb36b987..0000000000
Binary files a/res/img/flags/AM.png and /dev/null differ
diff --git a/res/img/flags/AO.png b/res/img/flags/AO.png
deleted file mode 100644
index ae68b12c44..0000000000
Binary files a/res/img/flags/AO.png and /dev/null differ
diff --git a/res/img/flags/AQ.png b/res/img/flags/AQ.png
deleted file mode 100644
index 146e9c0a04..0000000000
Binary files a/res/img/flags/AQ.png and /dev/null differ
diff --git a/res/img/flags/AR.png b/res/img/flags/AR.png
deleted file mode 100644
index 8142adfc83..0000000000
Binary files a/res/img/flags/AR.png and /dev/null differ
diff --git a/res/img/flags/AS.png b/res/img/flags/AS.png
deleted file mode 100644
index cc5bf30daf..0000000000
Binary files a/res/img/flags/AS.png and /dev/null differ
diff --git a/res/img/flags/AT.png b/res/img/flags/AT.png
deleted file mode 100644
index e32414bd6a..0000000000
Binary files a/res/img/flags/AT.png and /dev/null differ
diff --git a/res/img/flags/AU.png b/res/img/flags/AU.png
deleted file mode 100644
index 8d1e143791..0000000000
Binary files a/res/img/flags/AU.png and /dev/null differ
diff --git a/res/img/flags/AW.png b/res/img/flags/AW.png
deleted file mode 100644
index 6ec178847e..0000000000
Binary files a/res/img/flags/AW.png and /dev/null differ
diff --git a/res/img/flags/AX.png b/res/img/flags/AX.png
deleted file mode 100644
index ba269c0453..0000000000
Binary files a/res/img/flags/AX.png and /dev/null differ
diff --git a/res/img/flags/AZ.png b/res/img/flags/AZ.png
deleted file mode 100644
index 2bf3c746e7..0000000000
Binary files a/res/img/flags/AZ.png and /dev/null differ
diff --git a/res/img/flags/BA.png b/res/img/flags/BA.png
deleted file mode 100644
index 3e3ec3fc76..0000000000
Binary files a/res/img/flags/BA.png and /dev/null differ
diff --git a/res/img/flags/BB.png b/res/img/flags/BB.png
deleted file mode 100644
index 694050ca46..0000000000
Binary files a/res/img/flags/BB.png and /dev/null differ
diff --git a/res/img/flags/BD.png b/res/img/flags/BD.png
deleted file mode 100644
index 6de2cde85b..0000000000
Binary files a/res/img/flags/BD.png and /dev/null differ
diff --git a/res/img/flags/BE.png b/res/img/flags/BE.png
deleted file mode 100644
index 742ba9231f..0000000000
Binary files a/res/img/flags/BE.png and /dev/null differ
diff --git a/res/img/flags/BF.png b/res/img/flags/BF.png
deleted file mode 100644
index 17f9f67d26..0000000000
Binary files a/res/img/flags/BF.png and /dev/null differ
diff --git a/res/img/flags/BG.png b/res/img/flags/BG.png
deleted file mode 100644
index b01d3ff57b..0000000000
Binary files a/res/img/flags/BG.png and /dev/null differ
diff --git a/res/img/flags/BH.png b/res/img/flags/BH.png
deleted file mode 100644
index d0f82e8285..0000000000
Binary files a/res/img/flags/BH.png and /dev/null differ
diff --git a/res/img/flags/BI.png b/res/img/flags/BI.png
deleted file mode 100644
index 21865ac720..0000000000
Binary files a/res/img/flags/BI.png and /dev/null differ
diff --git a/res/img/flags/BJ.png b/res/img/flags/BJ.png
deleted file mode 100644
index a7c6091434..0000000000
Binary files a/res/img/flags/BJ.png and /dev/null differ
diff --git a/res/img/flags/BL.png b/res/img/flags/BL.png
deleted file mode 100644
index 6d50a0f544..0000000000
Binary files a/res/img/flags/BL.png and /dev/null differ
diff --git a/res/img/flags/BM.png b/res/img/flags/BM.png
deleted file mode 100644
index 310a25ea23..0000000000
Binary files a/res/img/flags/BM.png and /dev/null differ
diff --git a/res/img/flags/BN.png b/res/img/flags/BN.png
deleted file mode 100644
index bc4da8d9a6..0000000000
Binary files a/res/img/flags/BN.png and /dev/null differ
diff --git a/res/img/flags/BO.png b/res/img/flags/BO.png
deleted file mode 100644
index 144b8d32db..0000000000
Binary files a/res/img/flags/BO.png and /dev/null differ
diff --git a/res/img/flags/BQ.png b/res/img/flags/BQ.png
deleted file mode 100644
index 0897943760..0000000000
Binary files a/res/img/flags/BQ.png and /dev/null differ
diff --git a/res/img/flags/BR.png b/res/img/flags/BR.png
deleted file mode 100644
index 0278492592..0000000000
Binary files a/res/img/flags/BR.png and /dev/null differ
diff --git a/res/img/flags/BS.png b/res/img/flags/BS.png
deleted file mode 100644
index 2b05a8fc7c..0000000000
Binary files a/res/img/flags/BS.png and /dev/null differ
diff --git a/res/img/flags/BT.png b/res/img/flags/BT.png
deleted file mode 100644
index 1f031df071..0000000000
Binary files a/res/img/flags/BT.png and /dev/null differ
diff --git a/res/img/flags/BV.png b/res/img/flags/BV.png
deleted file mode 100644
index aafb0f1776..0000000000
Binary files a/res/img/flags/BV.png and /dev/null differ
diff --git a/res/img/flags/BW.png b/res/img/flags/BW.png
deleted file mode 100644
index 3084016718..0000000000
Binary files a/res/img/flags/BW.png and /dev/null differ
diff --git a/res/img/flags/BY.png b/res/img/flags/BY.png
deleted file mode 100644
index ce9de9c9c7..0000000000
Binary files a/res/img/flags/BY.png and /dev/null differ
diff --git a/res/img/flags/BZ.png b/res/img/flags/BZ.png
deleted file mode 100644
index 33620c3f31..0000000000
Binary files a/res/img/flags/BZ.png and /dev/null differ
diff --git a/res/img/flags/CA.png b/res/img/flags/CA.png
deleted file mode 100644
index 4bbf8b1169..0000000000
Binary files a/res/img/flags/CA.png and /dev/null differ
diff --git a/res/img/flags/CC.png b/res/img/flags/CC.png
deleted file mode 100644
index fd40fc8a78..0000000000
Binary files a/res/img/flags/CC.png and /dev/null differ
diff --git a/res/img/flags/CD.png b/res/img/flags/CD.png
deleted file mode 100644
index 230aacd454..0000000000
Binary files a/res/img/flags/CD.png and /dev/null differ
diff --git a/res/img/flags/CF.png b/res/img/flags/CF.png
deleted file mode 100644
index c58ed4f7b2..0000000000
Binary files a/res/img/flags/CF.png and /dev/null differ
diff --git a/res/img/flags/CG.png b/res/img/flags/CG.png
deleted file mode 100644
index 6c2441e3e0..0000000000
Binary files a/res/img/flags/CG.png and /dev/null differ
diff --git a/res/img/flags/CH.png b/res/img/flags/CH.png
deleted file mode 100644
index 9fd87167df..0000000000
Binary files a/res/img/flags/CH.png and /dev/null differ
diff --git a/res/img/flags/CI.png b/res/img/flags/CI.png
deleted file mode 100644
index 9741b9b11f..0000000000
Binary files a/res/img/flags/CI.png and /dev/null differ
diff --git a/res/img/flags/CK.png b/res/img/flags/CK.png
deleted file mode 100644
index 6cca35967c..0000000000
Binary files a/res/img/flags/CK.png and /dev/null differ
diff --git a/res/img/flags/CL.png b/res/img/flags/CL.png
deleted file mode 100644
index 13b993d15d..0000000000
Binary files a/res/img/flags/CL.png and /dev/null differ
diff --git a/res/img/flags/CM.png b/res/img/flags/CM.png
deleted file mode 100644
index bca5730fb5..0000000000
Binary files a/res/img/flags/CM.png and /dev/null differ
diff --git a/res/img/flags/CN.png b/res/img/flags/CN.png
deleted file mode 100644
index e086855c73..0000000000
Binary files a/res/img/flags/CN.png and /dev/null differ
diff --git a/res/img/flags/CO.png b/res/img/flags/CO.png
deleted file mode 100644
index 65c0aba447..0000000000
Binary files a/res/img/flags/CO.png and /dev/null differ
diff --git a/res/img/flags/CR.png b/res/img/flags/CR.png
deleted file mode 100644
index b351c67a53..0000000000
Binary files a/res/img/flags/CR.png and /dev/null differ
diff --git a/res/img/flags/CU.png b/res/img/flags/CU.png
deleted file mode 100644
index e7a25c60b3..0000000000
Binary files a/res/img/flags/CU.png and /dev/null differ
diff --git a/res/img/flags/CV.png b/res/img/flags/CV.png
deleted file mode 100644
index f249bbaa46..0000000000
Binary files a/res/img/flags/CV.png and /dev/null differ
diff --git a/res/img/flags/CW.png b/res/img/flags/CW.png
deleted file mode 100644
index e02cacd3dd..0000000000
Binary files a/res/img/flags/CW.png and /dev/null differ
diff --git a/res/img/flags/CX.png b/res/img/flags/CX.png
deleted file mode 100644
index 3ea21422f0..0000000000
Binary files a/res/img/flags/CX.png and /dev/null differ
diff --git a/res/img/flags/CY.png b/res/img/flags/CY.png
deleted file mode 100644
index 3182f48bd2..0000000000
Binary files a/res/img/flags/CY.png and /dev/null differ
diff --git a/res/img/flags/CZ.png b/res/img/flags/CZ.png
deleted file mode 100644
index 5462334638..0000000000
Binary files a/res/img/flags/CZ.png and /dev/null differ
diff --git a/res/img/flags/DE.png b/res/img/flags/DE.png
deleted file mode 100644
index 93e269166b..0000000000
Binary files a/res/img/flags/DE.png and /dev/null differ
diff --git a/res/img/flags/DJ.png b/res/img/flags/DJ.png
deleted file mode 100644
index 243bb7390d..0000000000
Binary files a/res/img/flags/DJ.png and /dev/null differ
diff --git a/res/img/flags/DK.png b/res/img/flags/DK.png
deleted file mode 100644
index fc74cc396c..0000000000
Binary files a/res/img/flags/DK.png and /dev/null differ
diff --git a/res/img/flags/DM.png b/res/img/flags/DM.png
deleted file mode 100644
index c3a0e9d102..0000000000
Binary files a/res/img/flags/DM.png and /dev/null differ
diff --git a/res/img/flags/DO.png b/res/img/flags/DO.png
deleted file mode 100644
index 5c4a004fef..0000000000
Binary files a/res/img/flags/DO.png and /dev/null differ
diff --git a/res/img/flags/DZ.png b/res/img/flags/DZ.png
deleted file mode 100644
index 1589d0cc40..0000000000
Binary files a/res/img/flags/DZ.png and /dev/null differ
diff --git a/res/img/flags/EC.png b/res/img/flags/EC.png
deleted file mode 100644
index 4c53dead1c..0000000000
Binary files a/res/img/flags/EC.png and /dev/null differ
diff --git a/res/img/flags/EE.png b/res/img/flags/EE.png
deleted file mode 100644
index 3668de7919..0000000000
Binary files a/res/img/flags/EE.png and /dev/null differ
diff --git a/res/img/flags/EG.png b/res/img/flags/EG.png
deleted file mode 100644
index 66ec709df7..0000000000
Binary files a/res/img/flags/EG.png and /dev/null differ
diff --git a/res/img/flags/EH.png b/res/img/flags/EH.png
deleted file mode 100644
index 148be93c08..0000000000
Binary files a/res/img/flags/EH.png and /dev/null differ
diff --git a/res/img/flags/ER.png b/res/img/flags/ER.png
deleted file mode 100644
index 7cb8441514..0000000000
Binary files a/res/img/flags/ER.png and /dev/null differ
diff --git a/res/img/flags/ES.png b/res/img/flags/ES.png
deleted file mode 100644
index aae73b6fcb..0000000000
Binary files a/res/img/flags/ES.png and /dev/null differ
diff --git a/res/img/flags/ET.png b/res/img/flags/ET.png
deleted file mode 100644
index 7b420f02f4..0000000000
Binary files a/res/img/flags/ET.png and /dev/null differ
diff --git a/res/img/flags/FI.png b/res/img/flags/FI.png
deleted file mode 100644
index 42f64bf360..0000000000
Binary files a/res/img/flags/FI.png and /dev/null differ
diff --git a/res/img/flags/FJ.png b/res/img/flags/FJ.png
deleted file mode 100644
index cecc683c9c..0000000000
Binary files a/res/img/flags/FJ.png and /dev/null differ
diff --git a/res/img/flags/FK.png b/res/img/flags/FK.png
deleted file mode 100644
index 6074fea09c..0000000000
Binary files a/res/img/flags/FK.png and /dev/null differ
diff --git a/res/img/flags/FM.png b/res/img/flags/FM.png
deleted file mode 100644
index 45fdb66426..0000000000
Binary files a/res/img/flags/FM.png and /dev/null differ
diff --git a/res/img/flags/FO.png b/res/img/flags/FO.png
deleted file mode 100644
index d8fd75c638..0000000000
Binary files a/res/img/flags/FO.png and /dev/null differ
diff --git a/res/img/flags/FR.png b/res/img/flags/FR.png
deleted file mode 100644
index 6d50a0f544..0000000000
Binary files a/res/img/flags/FR.png and /dev/null differ
diff --git a/res/img/flags/GA.png b/res/img/flags/GA.png
deleted file mode 100644
index 3808a61f1d..0000000000
Binary files a/res/img/flags/GA.png and /dev/null differ
diff --git a/res/img/flags/GB.png b/res/img/flags/GB.png
deleted file mode 100644
index 589be70063..0000000000
Binary files a/res/img/flags/GB.png and /dev/null differ
diff --git a/res/img/flags/GD.png b/res/img/flags/GD.png
deleted file mode 100644
index babe1e4cc6..0000000000
Binary files a/res/img/flags/GD.png and /dev/null differ
diff --git a/res/img/flags/GE.png b/res/img/flags/GE.png
deleted file mode 100644
index d34cddeca9..0000000000
Binary files a/res/img/flags/GE.png and /dev/null differ
diff --git a/res/img/flags/GF.png b/res/img/flags/GF.png
deleted file mode 100644
index 98828a5906..0000000000
Binary files a/res/img/flags/GF.png and /dev/null differ
diff --git a/res/img/flags/GG.png b/res/img/flags/GG.png
deleted file mode 100644
index aec8969b28..0000000000
Binary files a/res/img/flags/GG.png and /dev/null differ
diff --git a/res/img/flags/GH.png b/res/img/flags/GH.png
deleted file mode 100644
index 70b1a623de..0000000000
Binary files a/res/img/flags/GH.png and /dev/null differ
diff --git a/res/img/flags/GI.png b/res/img/flags/GI.png
deleted file mode 100644
index 9aa58327e3..0000000000
Binary files a/res/img/flags/GI.png and /dev/null differ
diff --git a/res/img/flags/GL.png b/res/img/flags/GL.png
deleted file mode 100644
index cf1645c2b5..0000000000
Binary files a/res/img/flags/GL.png and /dev/null differ
diff --git a/res/img/flags/GM.png b/res/img/flags/GM.png
deleted file mode 100644
index ec374fb3c3..0000000000
Binary files a/res/img/flags/GM.png and /dev/null differ
diff --git a/res/img/flags/GN.png b/res/img/flags/GN.png
deleted file mode 100644
index 46874b4d98..0000000000
Binary files a/res/img/flags/GN.png and /dev/null differ
diff --git a/res/img/flags/GP.png b/res/img/flags/GP.png
deleted file mode 100644
index 81b7abdf0e..0000000000
Binary files a/res/img/flags/GP.png and /dev/null differ
diff --git a/res/img/flags/GQ.png b/res/img/flags/GQ.png
deleted file mode 100644
index 7fd1015e8b..0000000000
Binary files a/res/img/flags/GQ.png and /dev/null differ
diff --git a/res/img/flags/GR.png b/res/img/flags/GR.png
deleted file mode 100644
index 101de51eab..0000000000
Binary files a/res/img/flags/GR.png and /dev/null differ
diff --git a/res/img/flags/GS.png b/res/img/flags/GS.png
deleted file mode 100644
index 772c2cbe6d..0000000000
Binary files a/res/img/flags/GS.png and /dev/null differ
diff --git a/res/img/flags/GT.png b/res/img/flags/GT.png
deleted file mode 100644
index d5bd8c1e46..0000000000
Binary files a/res/img/flags/GT.png and /dev/null differ
diff --git a/res/img/flags/GU.png b/res/img/flags/GU.png
deleted file mode 100644
index 8923085d5a..0000000000
Binary files a/res/img/flags/GU.png and /dev/null differ
diff --git a/res/img/flags/GW.png b/res/img/flags/GW.png
deleted file mode 100644
index 20c268ce06..0000000000
Binary files a/res/img/flags/GW.png and /dev/null differ
diff --git a/res/img/flags/GY.png b/res/img/flags/GY.png
deleted file mode 100644
index 86f56635ef..0000000000
Binary files a/res/img/flags/GY.png and /dev/null differ
diff --git a/res/img/flags/HK.png b/res/img/flags/HK.png
deleted file mode 100644
index 907dc59624..0000000000
Binary files a/res/img/flags/HK.png and /dev/null differ
diff --git a/res/img/flags/HM.png b/res/img/flags/HM.png
deleted file mode 100644
index 8d1e143791..0000000000
Binary files a/res/img/flags/HM.png and /dev/null differ
diff --git a/res/img/flags/HN.png b/res/img/flags/HN.png
deleted file mode 100644
index 4cf8c3112c..0000000000
Binary files a/res/img/flags/HN.png and /dev/null differ
diff --git a/res/img/flags/HR.png b/res/img/flags/HR.png
deleted file mode 100644
index 413ceb1586..0000000000
Binary files a/res/img/flags/HR.png and /dev/null differ
diff --git a/res/img/flags/HT.png b/res/img/flags/HT.png
deleted file mode 100644
index 097abeb434..0000000000
Binary files a/res/img/flags/HT.png and /dev/null differ
diff --git a/res/img/flags/HU.png b/res/img/flags/HU.png
deleted file mode 100644
index 23499bf63c..0000000000
Binary files a/res/img/flags/HU.png and /dev/null differ
diff --git a/res/img/flags/ID.png b/res/img/flags/ID.png
deleted file mode 100644
index 80200657c6..0000000000
Binary files a/res/img/flags/ID.png and /dev/null differ
diff --git a/res/img/flags/IE.png b/res/img/flags/IE.png
deleted file mode 100644
index 63f2220118..0000000000
Binary files a/res/img/flags/IE.png and /dev/null differ
diff --git a/res/img/flags/IL.png b/res/img/flags/IL.png
deleted file mode 100644
index 0268826321..0000000000
Binary files a/res/img/flags/IL.png and /dev/null differ
diff --git a/res/img/flags/IM.png b/res/img/flags/IM.png
deleted file mode 100644
index c777acc490..0000000000
Binary files a/res/img/flags/IM.png and /dev/null differ
diff --git a/res/img/flags/IN.png b/res/img/flags/IN.png
deleted file mode 100644
index 85fa9bfe72..0000000000
Binary files a/res/img/flags/IN.png and /dev/null differ
diff --git a/res/img/flags/IO.png b/res/img/flags/IO.png
deleted file mode 100644
index 1675d8e7db..0000000000
Binary files a/res/img/flags/IO.png and /dev/null differ
diff --git a/res/img/flags/IQ.png b/res/img/flags/IQ.png
deleted file mode 100644
index f2c21f7260..0000000000
Binary files a/res/img/flags/IQ.png and /dev/null differ
diff --git a/res/img/flags/IR.png b/res/img/flags/IR.png
deleted file mode 100644
index 0b8e67506c..0000000000
Binary files a/res/img/flags/IR.png and /dev/null differ
diff --git a/res/img/flags/IS.png b/res/img/flags/IS.png
deleted file mode 100644
index 5ee3e63c5c..0000000000
Binary files a/res/img/flags/IS.png and /dev/null differ
diff --git a/res/img/flags/IT.png b/res/img/flags/IT.png
deleted file mode 100644
index 53b967be99..0000000000
Binary files a/res/img/flags/IT.png and /dev/null differ
diff --git a/res/img/flags/JE.png b/res/img/flags/JE.png
deleted file mode 100644
index a1437aba78..0000000000
Binary files a/res/img/flags/JE.png and /dev/null differ
diff --git a/res/img/flags/JM.png b/res/img/flags/JM.png
deleted file mode 100644
index 0d462fa3ae..0000000000
Binary files a/res/img/flags/JM.png and /dev/null differ
diff --git a/res/img/flags/JO.png b/res/img/flags/JO.png
deleted file mode 100644
index 8934db7eca..0000000000
Binary files a/res/img/flags/JO.png and /dev/null differ
diff --git a/res/img/flags/JP.png b/res/img/flags/JP.png
deleted file mode 100644
index 6f92d52365..0000000000
Binary files a/res/img/flags/JP.png and /dev/null differ
diff --git a/res/img/flags/KE.png b/res/img/flags/KE.png
deleted file mode 100644
index 866b3f15dc..0000000000
Binary files a/res/img/flags/KE.png and /dev/null differ
diff --git a/res/img/flags/KG.png b/res/img/flags/KG.png
deleted file mode 100644
index 56b433c756..0000000000
Binary files a/res/img/flags/KG.png and /dev/null differ
diff --git a/res/img/flags/KH.png b/res/img/flags/KH.png
deleted file mode 100644
index e1ddd5f84c..0000000000
Binary files a/res/img/flags/KH.png and /dev/null differ
diff --git a/res/img/flags/KI.png b/res/img/flags/KI.png
deleted file mode 100644
index 8b7c54bc0f..0000000000
Binary files a/res/img/flags/KI.png and /dev/null differ
diff --git a/res/img/flags/KM.png b/res/img/flags/KM.png
deleted file mode 100644
index 227a3b3396..0000000000
Binary files a/res/img/flags/KM.png and /dev/null differ
diff --git a/res/img/flags/KN.png b/res/img/flags/KN.png
deleted file mode 100644
index bc6189bed1..0000000000
Binary files a/res/img/flags/KN.png and /dev/null differ
diff --git a/res/img/flags/KP.png b/res/img/flags/KP.png
deleted file mode 100644
index c92248b910..0000000000
Binary files a/res/img/flags/KP.png and /dev/null differ
diff --git a/res/img/flags/KR.png b/res/img/flags/KR.png
deleted file mode 100644
index ab1cb94943..0000000000
Binary files a/res/img/flags/KR.png and /dev/null differ
diff --git a/res/img/flags/KW.png b/res/img/flags/KW.png
deleted file mode 100644
index 0b41c7a532..0000000000
Binary files a/res/img/flags/KW.png and /dev/null differ
diff --git a/res/img/flags/KY.png b/res/img/flags/KY.png
deleted file mode 100644
index 7af5290d31..0000000000
Binary files a/res/img/flags/KY.png and /dev/null differ
diff --git a/res/img/flags/KZ.png b/res/img/flags/KZ.png
deleted file mode 100644
index e10a1255a0..0000000000
Binary files a/res/img/flags/KZ.png and /dev/null differ
diff --git a/res/img/flags/LA.png b/res/img/flags/LA.png
deleted file mode 100644
index 6ad67d4255..0000000000
Binary files a/res/img/flags/LA.png and /dev/null differ
diff --git a/res/img/flags/LB.png b/res/img/flags/LB.png
deleted file mode 100644
index 865df57a42..0000000000
Binary files a/res/img/flags/LB.png and /dev/null differ
diff --git a/res/img/flags/LC.png b/res/img/flags/LC.png
deleted file mode 100644
index e83a2d08bc..0000000000
Binary files a/res/img/flags/LC.png and /dev/null differ
diff --git a/res/img/flags/LI.png b/res/img/flags/LI.png
deleted file mode 100644
index 57034d367c..0000000000
Binary files a/res/img/flags/LI.png and /dev/null differ
diff --git a/res/img/flags/LK.png b/res/img/flags/LK.png
deleted file mode 100644
index 6e7ad58254..0000000000
Binary files a/res/img/flags/LK.png and /dev/null differ
diff --git a/res/img/flags/LR.png b/res/img/flags/LR.png
deleted file mode 100644
index 46c3b84a92..0000000000
Binary files a/res/img/flags/LR.png and /dev/null differ
diff --git a/res/img/flags/LS.png b/res/img/flags/LS.png
deleted file mode 100644
index 79b505d490..0000000000
Binary files a/res/img/flags/LS.png and /dev/null differ
diff --git a/res/img/flags/LT.png b/res/img/flags/LT.png
deleted file mode 100644
index 7740cdc0a0..0000000000
Binary files a/res/img/flags/LT.png and /dev/null differ
diff --git a/res/img/flags/LU.png b/res/img/flags/LU.png
deleted file mode 100644
index 8f383e674e..0000000000
Binary files a/res/img/flags/LU.png and /dev/null differ
diff --git a/res/img/flags/LV.png b/res/img/flags/LV.png
deleted file mode 100644
index a0f36d89c4..0000000000
Binary files a/res/img/flags/LV.png and /dev/null differ
diff --git a/res/img/flags/LY.png b/res/img/flags/LY.png
deleted file mode 100644
index 2884c4c0a9..0000000000
Binary files a/res/img/flags/LY.png and /dev/null differ
diff --git a/res/img/flags/MA.png b/res/img/flags/MA.png
deleted file mode 100644
index 1f76cfc9bd..0000000000
Binary files a/res/img/flags/MA.png and /dev/null differ
diff --git a/res/img/flags/MC.png b/res/img/flags/MC.png
deleted file mode 100644
index 06fc2ad166..0000000000
Binary files a/res/img/flags/MC.png and /dev/null differ
diff --git a/res/img/flags/MD.png b/res/img/flags/MD.png
deleted file mode 100644
index 8e54c2b815..0000000000
Binary files a/res/img/flags/MD.png and /dev/null differ
diff --git a/res/img/flags/ME.png b/res/img/flags/ME.png
deleted file mode 100644
index 97424d4ec2..0000000000
Binary files a/res/img/flags/ME.png and /dev/null differ
diff --git a/res/img/flags/MF.png b/res/img/flags/MF.png
deleted file mode 100644
index 6d50a0f544..0000000000
Binary files a/res/img/flags/MF.png and /dev/null differ
diff --git a/res/img/flags/MG.png b/res/img/flags/MG.png
deleted file mode 100644
index 28bfccc9e8..0000000000
Binary files a/res/img/flags/MG.png and /dev/null differ
diff --git a/res/img/flags/MH.png b/res/img/flags/MH.png
deleted file mode 100644
index e482a65924..0000000000
Binary files a/res/img/flags/MH.png and /dev/null differ
diff --git a/res/img/flags/MK.png b/res/img/flags/MK.png
deleted file mode 100644
index 84e2e65e76..0000000000
Binary files a/res/img/flags/MK.png and /dev/null differ
diff --git a/res/img/flags/ML.png b/res/img/flags/ML.png
deleted file mode 100644
index 38fec34796..0000000000
Binary files a/res/img/flags/ML.png and /dev/null differ
diff --git a/res/img/flags/MM.png b/res/img/flags/MM.png
deleted file mode 100644
index 70a03c6b14..0000000000
Binary files a/res/img/flags/MM.png and /dev/null differ
diff --git a/res/img/flags/MN.png b/res/img/flags/MN.png
deleted file mode 100644
index 1e1bbe6089..0000000000
Binary files a/res/img/flags/MN.png and /dev/null differ
diff --git a/res/img/flags/MO.png b/res/img/flags/MO.png
deleted file mode 100644
index 3833d683e7..0000000000
Binary files a/res/img/flags/MO.png and /dev/null differ
diff --git a/res/img/flags/MP.png b/res/img/flags/MP.png
deleted file mode 100644
index 63119096b0..0000000000
Binary files a/res/img/flags/MP.png and /dev/null differ
diff --git a/res/img/flags/MQ.png b/res/img/flags/MQ.png
deleted file mode 100644
index 9cab441aec..0000000000
Binary files a/res/img/flags/MQ.png and /dev/null differ
diff --git a/res/img/flags/MR.png b/res/img/flags/MR.png
deleted file mode 100644
index c144de17f7..0000000000
Binary files a/res/img/flags/MR.png and /dev/null differ
diff --git a/res/img/flags/MS.png b/res/img/flags/MS.png
deleted file mode 100644
index 1221707042..0000000000
Binary files a/res/img/flags/MS.png and /dev/null differ
diff --git a/res/img/flags/MT.png b/res/img/flags/MT.png
deleted file mode 100644
index 7963aa618a..0000000000
Binary files a/res/img/flags/MT.png and /dev/null differ
diff --git a/res/img/flags/MU.png b/res/img/flags/MU.png
deleted file mode 100644
index d5d4d4008d..0000000000
Binary files a/res/img/flags/MU.png and /dev/null differ
diff --git a/res/img/flags/MV.png b/res/img/flags/MV.png
deleted file mode 100644
index 0f2ecb4389..0000000000
Binary files a/res/img/flags/MV.png and /dev/null differ
diff --git a/res/img/flags/MW.png b/res/img/flags/MW.png
deleted file mode 100644
index d0a5d24f55..0000000000
Binary files a/res/img/flags/MW.png and /dev/null differ
diff --git a/res/img/flags/MX.png b/res/img/flags/MX.png
deleted file mode 100644
index 096cb1111f..0000000000
Binary files a/res/img/flags/MX.png and /dev/null differ
diff --git a/res/img/flags/MY.png b/res/img/flags/MY.png
deleted file mode 100644
index 17f18ac519..0000000000
Binary files a/res/img/flags/MY.png and /dev/null differ
diff --git a/res/img/flags/MZ.png b/res/img/flags/MZ.png
deleted file mode 100644
index 66be6563c6..0000000000
Binary files a/res/img/flags/MZ.png and /dev/null differ
diff --git a/res/img/flags/NA.png b/res/img/flags/NA.png
deleted file mode 100644
index 7ecfd317c7..0000000000
Binary files a/res/img/flags/NA.png and /dev/null differ
diff --git a/res/img/flags/NC.png b/res/img/flags/NC.png
deleted file mode 100644
index 11126ade77..0000000000
Binary files a/res/img/flags/NC.png and /dev/null differ
diff --git a/res/img/flags/NE.png b/res/img/flags/NE.png
deleted file mode 100644
index d584fa8429..0000000000
Binary files a/res/img/flags/NE.png and /dev/null differ
diff --git a/res/img/flags/NF.png b/res/img/flags/NF.png
deleted file mode 100644
index c054042591..0000000000
Binary files a/res/img/flags/NF.png and /dev/null differ
diff --git a/res/img/flags/NG.png b/res/img/flags/NG.png
deleted file mode 100644
index 73aee15b3f..0000000000
Binary files a/res/img/flags/NG.png and /dev/null differ
diff --git a/res/img/flags/NI.png b/res/img/flags/NI.png
deleted file mode 100644
index fd044933e4..0000000000
Binary files a/res/img/flags/NI.png and /dev/null differ
diff --git a/res/img/flags/NL.png b/res/img/flags/NL.png
deleted file mode 100644
index 0897943760..0000000000
Binary files a/res/img/flags/NL.png and /dev/null differ
diff --git a/res/img/flags/NO.png b/res/img/flags/NO.png
deleted file mode 100644
index aafb0f1776..0000000000
Binary files a/res/img/flags/NO.png and /dev/null differ
diff --git a/res/img/flags/NP.png b/res/img/flags/NP.png
deleted file mode 100644
index 744458e17e..0000000000
Binary files a/res/img/flags/NP.png and /dev/null differ
diff --git a/res/img/flags/NR.png b/res/img/flags/NR.png
deleted file mode 100644
index 58c2afb228..0000000000
Binary files a/res/img/flags/NR.png and /dev/null differ
diff --git a/res/img/flags/NU.png b/res/img/flags/NU.png
deleted file mode 100644
index 007c99eca5..0000000000
Binary files a/res/img/flags/NU.png and /dev/null differ
diff --git a/res/img/flags/NZ.png b/res/img/flags/NZ.png
deleted file mode 100644
index 839368dd7b..0000000000
Binary files a/res/img/flags/NZ.png and /dev/null differ
diff --git a/res/img/flags/OM.png b/res/img/flags/OM.png
deleted file mode 100644
index 63a893367f..0000000000
Binary files a/res/img/flags/OM.png and /dev/null differ
diff --git a/res/img/flags/PA.png b/res/img/flags/PA.png
deleted file mode 100644
index 3515d95d37..0000000000
Binary files a/res/img/flags/PA.png and /dev/null differ
diff --git a/res/img/flags/PE.png b/res/img/flags/PE.png
deleted file mode 100644
index 58f70b8d18..0000000000
Binary files a/res/img/flags/PE.png and /dev/null differ
diff --git a/res/img/flags/PF.png b/res/img/flags/PF.png
deleted file mode 100644
index 2f33f2574f..0000000000
Binary files a/res/img/flags/PF.png and /dev/null differ
diff --git a/res/img/flags/PG.png b/res/img/flags/PG.png
deleted file mode 100644
index c796f587c6..0000000000
Binary files a/res/img/flags/PG.png and /dev/null differ
diff --git a/res/img/flags/PH.png b/res/img/flags/PH.png
deleted file mode 100644
index 0d98de0386..0000000000
Binary files a/res/img/flags/PH.png and /dev/null differ
diff --git a/res/img/flags/PK.png b/res/img/flags/PK.png
deleted file mode 100644
index 87f4e2f492..0000000000
Binary files a/res/img/flags/PK.png and /dev/null differ
diff --git a/res/img/flags/PL.png b/res/img/flags/PL.png
deleted file mode 100644
index 273869dfc6..0000000000
Binary files a/res/img/flags/PL.png and /dev/null differ
diff --git a/res/img/flags/PM.png b/res/img/flags/PM.png
deleted file mode 100644
index b74c396d92..0000000000
Binary files a/res/img/flags/PM.png and /dev/null differ
diff --git a/res/img/flags/PN.png b/res/img/flags/PN.png
deleted file mode 100644
index e34c62d598..0000000000
Binary files a/res/img/flags/PN.png and /dev/null differ
diff --git a/res/img/flags/PR.png b/res/img/flags/PR.png
deleted file mode 100644
index 8efdb91252..0000000000
Binary files a/res/img/flags/PR.png and /dev/null differ
diff --git a/res/img/flags/PS.png b/res/img/flags/PS.png
deleted file mode 100644
index 7a0cceec00..0000000000
Binary files a/res/img/flags/PS.png and /dev/null differ
diff --git a/res/img/flags/PT.png b/res/img/flags/PT.png
deleted file mode 100644
index 49e290827c..0000000000
Binary files a/res/img/flags/PT.png and /dev/null differ
diff --git a/res/img/flags/PW.png b/res/img/flags/PW.png
deleted file mode 100644
index 6cb2e1e70d..0000000000
Binary files a/res/img/flags/PW.png and /dev/null differ
diff --git a/res/img/flags/PY.png b/res/img/flags/PY.png
deleted file mode 100644
index a61c42c423..0000000000
Binary files a/res/img/flags/PY.png and /dev/null differ
diff --git a/res/img/flags/QA.png b/res/img/flags/QA.png
deleted file mode 100644
index bb091cc88c..0000000000
Binary files a/res/img/flags/QA.png and /dev/null differ
diff --git a/res/img/flags/RE.png b/res/img/flags/RE.png
deleted file mode 100644
index 6d50a0f544..0000000000
Binary files a/res/img/flags/RE.png and /dev/null differ
diff --git a/res/img/flags/RO.png b/res/img/flags/RO.png
deleted file mode 100644
index 4495d29eb0..0000000000
Binary files a/res/img/flags/RO.png and /dev/null differ
diff --git a/res/img/flags/RS.png b/res/img/flags/RS.png
deleted file mode 100644
index ebb0f28a7b..0000000000
Binary files a/res/img/flags/RS.png and /dev/null differ
diff --git a/res/img/flags/RU.png b/res/img/flags/RU.png
deleted file mode 100644
index 64532ffa58..0000000000
Binary files a/res/img/flags/RU.png and /dev/null differ
diff --git a/res/img/flags/RW.png b/res/img/flags/RW.png
deleted file mode 100644
index 64b3cfff04..0000000000
Binary files a/res/img/flags/RW.png and /dev/null differ
diff --git a/res/img/flags/SA.png b/res/img/flags/SA.png
deleted file mode 100644
index 250de6f6f5..0000000000
Binary files a/res/img/flags/SA.png and /dev/null differ
diff --git a/res/img/flags/SB.png b/res/img/flags/SB.png
deleted file mode 100644
index 5833c130eb..0000000000
Binary files a/res/img/flags/SB.png and /dev/null differ
diff --git a/res/img/flags/SC.png b/res/img/flags/SC.png
deleted file mode 100644
index ce5248f434..0000000000
Binary files a/res/img/flags/SC.png and /dev/null differ
diff --git a/res/img/flags/SD.png b/res/img/flags/SD.png
deleted file mode 100644
index d8711a83d6..0000000000
Binary files a/res/img/flags/SD.png and /dev/null differ
diff --git a/res/img/flags/SE.png b/res/img/flags/SE.png
deleted file mode 100644
index 81880931f3..0000000000
Binary files a/res/img/flags/SE.png and /dev/null differ
diff --git a/res/img/flags/SG.png b/res/img/flags/SG.png
deleted file mode 100644
index 6f00e57923..0000000000
Binary files a/res/img/flags/SG.png and /dev/null differ
diff --git a/res/img/flags/SH.png b/res/img/flags/SH.png
deleted file mode 100644
index 055dde68bc..0000000000
Binary files a/res/img/flags/SH.png and /dev/null differ
diff --git a/res/img/flags/SI.png b/res/img/flags/SI.png
deleted file mode 100644
index 9635983406..0000000000
Binary files a/res/img/flags/SI.png and /dev/null differ
diff --git a/res/img/flags/SJ.png b/res/img/flags/SJ.png
deleted file mode 100644
index aafb0f1776..0000000000
Binary files a/res/img/flags/SJ.png and /dev/null differ
diff --git a/res/img/flags/SK.png b/res/img/flags/SK.png
deleted file mode 100644
index 84c7021f0a..0000000000
Binary files a/res/img/flags/SK.png and /dev/null differ
diff --git a/res/img/flags/SL.png b/res/img/flags/SL.png
deleted file mode 100644
index c5ed199141..0000000000
Binary files a/res/img/flags/SL.png and /dev/null differ
diff --git a/res/img/flags/SM.png b/res/img/flags/SM.png
deleted file mode 100644
index 1af1ca284f..0000000000
Binary files a/res/img/flags/SM.png and /dev/null differ
diff --git a/res/img/flags/SN.png b/res/img/flags/SN.png
deleted file mode 100644
index d0b1843561..0000000000
Binary files a/res/img/flags/SN.png and /dev/null differ
diff --git a/res/img/flags/SO.png b/res/img/flags/SO.png
deleted file mode 100644
index 64e2970b9d..0000000000
Binary files a/res/img/flags/SO.png and /dev/null differ
diff --git a/res/img/flags/SR.png b/res/img/flags/SR.png
deleted file mode 100644
index b072dda835..0000000000
Binary files a/res/img/flags/SR.png and /dev/null differ
diff --git a/res/img/flags/SS.png b/res/img/flags/SS.png
deleted file mode 100644
index 83933d4521..0000000000
Binary files a/res/img/flags/SS.png and /dev/null differ
diff --git a/res/img/flags/ST.png b/res/img/flags/ST.png
deleted file mode 100644
index c102721a86..0000000000
Binary files a/res/img/flags/ST.png and /dev/null differ
diff --git a/res/img/flags/SV.png b/res/img/flags/SV.png
deleted file mode 100644
index 80de92e556..0000000000
Binary files a/res/img/flags/SV.png and /dev/null differ
diff --git a/res/img/flags/SX.png b/res/img/flags/SX.png
deleted file mode 100644
index dd52215c5d..0000000000
Binary files a/res/img/flags/SX.png and /dev/null differ
diff --git a/res/img/flags/SY.png b/res/img/flags/SY.png
deleted file mode 100644
index 78f45b7c0b..0000000000
Binary files a/res/img/flags/SY.png and /dev/null differ
diff --git a/res/img/flags/SZ.png b/res/img/flags/SZ.png
deleted file mode 100644
index 2182f4ff93..0000000000
Binary files a/res/img/flags/SZ.png and /dev/null differ
diff --git a/res/img/flags/TC.png b/res/img/flags/TC.png
deleted file mode 100644
index 3e3e19d4b3..0000000000
Binary files a/res/img/flags/TC.png and /dev/null differ
diff --git a/res/img/flags/TD.png b/res/img/flags/TD.png
deleted file mode 100644
index 753bec22b0..0000000000
Binary files a/res/img/flags/TD.png and /dev/null differ
diff --git a/res/img/flags/TF.png b/res/img/flags/TF.png
deleted file mode 100644
index 6d50a0f544..0000000000
Binary files a/res/img/flags/TF.png and /dev/null differ
diff --git a/res/img/flags/TG.png b/res/img/flags/TG.png
deleted file mode 100644
index 8501ada655..0000000000
Binary files a/res/img/flags/TG.png and /dev/null differ
diff --git a/res/img/flags/TH.png b/res/img/flags/TH.png
deleted file mode 100644
index 0c884c329e..0000000000
Binary files a/res/img/flags/TH.png and /dev/null differ
diff --git a/res/img/flags/TJ.png b/res/img/flags/TJ.png
deleted file mode 100644
index 3c9026fa0f..0000000000
Binary files a/res/img/flags/TJ.png and /dev/null differ
diff --git a/res/img/flags/TK.png b/res/img/flags/TK.png
deleted file mode 100644
index fd605749ea..0000000000
Binary files a/res/img/flags/TK.png and /dev/null differ
diff --git a/res/img/flags/TL.png b/res/img/flags/TL.png
deleted file mode 100644
index b4c834b1d6..0000000000
Binary files a/res/img/flags/TL.png and /dev/null differ
diff --git a/res/img/flags/TM.png b/res/img/flags/TM.png
deleted file mode 100644
index d18cb939a9..0000000000
Binary files a/res/img/flags/TM.png and /dev/null differ
diff --git a/res/img/flags/TN.png b/res/img/flags/TN.png
deleted file mode 100644
index 21c4b98be7..0000000000
Binary files a/res/img/flags/TN.png and /dev/null differ
diff --git a/res/img/flags/TO.png b/res/img/flags/TO.png
deleted file mode 100644
index c828206e35..0000000000
Binary files a/res/img/flags/TO.png and /dev/null differ
diff --git a/res/img/flags/TR.png b/res/img/flags/TR.png
deleted file mode 100644
index f2a5bd22c8..0000000000
Binary files a/res/img/flags/TR.png and /dev/null differ
diff --git a/res/img/flags/TT.png b/res/img/flags/TT.png
deleted file mode 100644
index 66d698334b..0000000000
Binary files a/res/img/flags/TT.png and /dev/null differ
diff --git a/res/img/flags/TV.png b/res/img/flags/TV.png
deleted file mode 100644
index 7a127f51ae..0000000000
Binary files a/res/img/flags/TV.png and /dev/null differ
diff --git a/res/img/flags/TW.png b/res/img/flags/TW.png
deleted file mode 100644
index 2353ba1b0a..0000000000
Binary files a/res/img/flags/TW.png and /dev/null differ
diff --git a/res/img/flags/TZ.png b/res/img/flags/TZ.png
deleted file mode 100644
index 7949f65d8a..0000000000
Binary files a/res/img/flags/TZ.png and /dev/null differ
diff --git a/res/img/flags/UA.png b/res/img/flags/UA.png
deleted file mode 100644
index 687e305294..0000000000
Binary files a/res/img/flags/UA.png and /dev/null differ
diff --git a/res/img/flags/UG.png b/res/img/flags/UG.png
deleted file mode 100644
index 0a21ad15c3..0000000000
Binary files a/res/img/flags/UG.png and /dev/null differ
diff --git a/res/img/flags/US.png b/res/img/flags/US.png
deleted file mode 100644
index c3a245b767..0000000000
Binary files a/res/img/flags/US.png and /dev/null differ
diff --git a/res/img/flags/UY.png b/res/img/flags/UY.png
deleted file mode 100644
index 21a347c6fc..0000000000
Binary files a/res/img/flags/UY.png and /dev/null differ
diff --git a/res/img/flags/UZ.png b/res/img/flags/UZ.png
deleted file mode 100644
index 643b6ae0cf..0000000000
Binary files a/res/img/flags/UZ.png and /dev/null differ
diff --git a/res/img/flags/VA.png b/res/img/flags/VA.png
deleted file mode 100644
index 63a13c0e81..0000000000
Binary files a/res/img/flags/VA.png and /dev/null differ
diff --git a/res/img/flags/VC.png b/res/img/flags/VC.png
deleted file mode 100644
index da991a9344..0000000000
Binary files a/res/img/flags/VC.png and /dev/null differ
diff --git a/res/img/flags/VE.png b/res/img/flags/VE.png
deleted file mode 100644
index e75e17c9f0..0000000000
Binary files a/res/img/flags/VE.png and /dev/null differ
diff --git a/res/img/flags/VG.png b/res/img/flags/VG.png
deleted file mode 100644
index 46f93cad1e..0000000000
Binary files a/res/img/flags/VG.png and /dev/null differ
diff --git a/res/img/flags/VI.png b/res/img/flags/VI.png
deleted file mode 100644
index 8c849a733e..0000000000
Binary files a/res/img/flags/VI.png and /dev/null differ
diff --git a/res/img/flags/VN.png b/res/img/flags/VN.png
deleted file mode 100644
index 6ea2122f9d..0000000000
Binary files a/res/img/flags/VN.png and /dev/null differ
diff --git a/res/img/flags/VU.png b/res/img/flags/VU.png
deleted file mode 100644
index bad3ba4d46..0000000000
Binary files a/res/img/flags/VU.png and /dev/null differ
diff --git a/res/img/flags/WF.png b/res/img/flags/WF.png
deleted file mode 100644
index d94359dcc4..0000000000
Binary files a/res/img/flags/WF.png and /dev/null differ
diff --git a/res/img/flags/WS.png b/res/img/flags/WS.png
deleted file mode 100644
index f8b80e5ba9..0000000000
Binary files a/res/img/flags/WS.png and /dev/null differ
diff --git a/res/img/flags/YE.png b/res/img/flags/YE.png
deleted file mode 100644
index 8b9bbd8942..0000000000
Binary files a/res/img/flags/YE.png and /dev/null differ
diff --git a/res/img/flags/YT.png b/res/img/flags/YT.png
deleted file mode 100644
index 328879361e..0000000000
Binary files a/res/img/flags/YT.png and /dev/null differ
diff --git a/res/img/flags/ZA.png b/res/img/flags/ZA.png
deleted file mode 100644
index 7f0a52d3b2..0000000000
Binary files a/res/img/flags/ZA.png and /dev/null differ
diff --git a/res/img/flags/ZM.png b/res/img/flags/ZM.png
deleted file mode 100644
index 87adc3afaa..0000000000
Binary files a/res/img/flags/ZM.png and /dev/null differ
diff --git a/res/img/flags/ZW.png b/res/img/flags/ZW.png
deleted file mode 100644
index 742c9f7e71..0000000000
Binary files a/res/img/flags/ZW.png and /dev/null differ
diff --git a/res/img/fullscreen.svg b/res/img/fullscreen.svg
deleted file mode 100644
index e333abb6fb..0000000000
--- a/res/img/fullscreen.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="29px" height="22px" viewBox="-1 -1 29 22" 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.4 (17249) - http://www.bohemiancoding.com/sketch -->
-    <title>Zoom</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(-824.000000, -667.000000)">
-            <g id="Zoom" sketch:type="MSLayerGroup" transform="translate(824.000000, 667.000000)">
-                <rect id="Rectangle-20" stroke="#FFFFFF" sketch:type="MSShapeGroup" x="0" y="0" width="27" height="20" rx="4"></rect>
-                <rect id="Rectangle-20" stroke="#FFFFFF" sketch:type="MSShapeGroup" x="6" y="2" width="15" height="11" rx="4"></rect>
-                <g id="Line-+-Triangle-3" transform="translate(4.474874, 15.181981) rotate(-45.000000) translate(-4.474874, -15.181981) translate(0.974874, 13.181981)" sketch:type="MSShapeGroup">
-                    <path d="M6.53553391,2 L3,2" id="Line" stroke="#FFFFFF" stroke-linecap="square"></path>
-                    <path d="M3.26960678,3.51960678 L0.269606781,2.01960678 L3.26960678,0.519606781 L3.26960678,3.51960678 Z" id="Triangle-3" fill="#FFFFFF"></path>
-                </g>
-                <g id="Line-+-Triangle-3-Copy" transform="translate(22.681981, 15.181981) scale(-1, 1) rotate(-45.000000) translate(-22.681981, -15.181981) translate(19.181981, 13.181981)" sketch:type="MSShapeGroup">
-                    <path d="M6.53553391,2 L3,2" id="Line" stroke="#FFFFFF" stroke-linecap="square"></path>
-                    <path d="M3.375,0.5 L3.375,3.5 L0.375,2 L3.375,0.5 Z" id="Triangle-3" fill="#FFFFFF"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/globe.svg b/res/img/globe.svg
new file mode 100644
index 0000000000..635fa91cce
--- /dev/null
+++ b/res/img/globe.svg
@@ -0,0 +1,3 @@
+<svg width="8" height="8" viewBox="0 0 8 8" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4 8C6.20914 8 8 6.20914 8 4C8 1.79086 6.20914 0 4 0C1.79086 0 0 1.79086 0 4C0 6.20914 1.79086 8 4 8ZM6.53332 5.3468L6.24528 6.23562C6.23346 6.27208 6.21342 6.30534 6.1867 6.33282L5.90913 6.61831L5.59095 6.94559L5.52111 7.01743C5.4003 7.14169 5.19279 7.10832 5.11702 6.95246L4.97216 6.65447C4.96052 6.63052 4.94513 6.60859 4.92657 6.58949L4.63641 6.29104L4.39185 6.0395C4.34478 5.99108 4.28013 5.96377 4.2126 5.96377H3.83831C3.74261 5.96377 3.6553 5.90914 3.61347 5.82307L3.38884 5.36098C3.37228 5.32692 3.36368 5.28955 3.36368 5.25168V4.47996C3.36368 4.38629 3.31132 4.30048 3.22802 4.25764L2.78114 4.02781C2.74577 4.00962 2.70657 4.00013 2.6668 4.00013H2.19658C2.12905 4.00013 2.0644 3.97282 2.01733 3.9244L1.53085 3.42402C1.48223 3.37402 1.45672 3.30599 1.46046 3.23635L1.49316 2.62739C1.4977 2.54285 1.51357 2.45929 1.54034 2.37897L1.65227 2.0432C1.87098 1.38707 2.38792 0.873558 3.0455 0.659224L3.05974 0.654815C3.66901 0.466234 4.32388 0.487134 4.91987 0.714181C4.94274 0.722892 4.96343 0.736497 4.98049 0.754043L5.42152 1.20768C5.51586 1.30471 5.51586 1.45919 5.42152 1.55622L4.70716 2.291C4.66179 2.33766 4.63641 2.40018 4.63641 2.46527V2.71165C4.63641 2.86997 4.49111 2.98843 4.33603 2.95652L3.34587 2.75283C3.1908 2.72093 3.0455 2.83938 3.0455 2.99771V3.09559C3.0455 3.23366 3.15743 3.34559 3.2955 3.34559H3.75004C3.88812 3.34559 4.00004 3.45752 4.00004 3.59559V3.75013C4.00004 3.8882 4.11197 4.00013 4.25004 4.00013H5.16715C5.23467 4.00013 5.29933 4.02745 5.3464 4.07586L5.56243 4.29807C5.58132 4.3175 5.60324 4.33373 5.62734 4.34612L6.19093 4.63596C6.21503 4.64836 6.23695 4.66459 6.25584 4.68402L6.47475 4.90918C6.52012 4.95584 6.5455 5.01836 6.5455 5.08345V5.26973C6.5455 5.2959 6.54139 5.3219 6.53332 5.3468Z" fill="#A9B2BC"/>
+</svg>
diff --git a/res/img/hide.png b/res/img/hide.png
deleted file mode 100644
index c5aaf0dd0d..0000000000
Binary files a/res/img/hide.png and /dev/null differ
diff --git a/res/img/icon-jump-to-bottom.svg b/res/img/icon-jump-to-bottom.svg
deleted file mode 100644
index c4210b4ebe..0000000000
--- a/res/img/icon-jump-to-bottom.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   width="18.666187"
-   height="8.7375822"
-   viewBox="0 0 18.666187 8.7375818"
-   version="1.1"
-   style="fill:none">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2-8-3"
-     style="fill:none;stroke:#000000;stroke-width:1.29999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 17.909095,0.75599092 9.3330939,7.987602 0.75709259,0.75599092" />
-</svg>
diff --git a/res/img/icon-jump-to-first-unread.svg b/res/img/icon-jump-to-first-unread.svg
deleted file mode 100644
index 652ccec20d..0000000000
--- a/res/img/icon-jump-to-first-unread.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   style="fill:none"
-   version="1.1"
-   viewBox="0 0 18.666187 8.7375818"
-   height="8.7375822"
-   width="18.666187">
-  <defs
-     id="defs8" />
-  <path
-     d="M 17.909095,7.981591 9.3330939,0.74997995 0.75709259,7.981591"
-     style="fill:none;stroke:#000000;stroke-width:1.29999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="path2-8-3" />
-</svg>
diff --git a/res/img/icon-text-cancel.svg b/res/img/icon-text-cancel.svg
deleted file mode 100644
index ce28d128aa..0000000000
--- a/res/img/icon-text-cancel.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="11px" height="9px" viewBox="0 0 11 9" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 39 (31667) - http://www.bohemiancoding.com/sketch -->
-    <title>28D80248-63BA-4A5F-9216-4CFE72784BAC</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="Screens-revised" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round">
-        <g id="02_x-Chat-text-input-markdown-panel-MD_on" transform="translate(-915.000000, -749.000000)" stroke="#000000">
-            <g id="icon_text_cancel" transform="translate(916.000000, 749.000000)">
-                <path d="M0.45,0.45 L8.55,8.55" id="Line"></path>
-                <path d="M0.45,0.45 L8.55,8.55" id="Line-Copy-2" transform="translate(4.500000, 4.500000) scale(-1, 1) translate(-4.500000, -4.500000) "></path>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/icon_copy_message.svg b/res/img/icon_copy_message.svg
deleted file mode 100644
index 8d8887bb22..0000000000
--- a/res/img/icon_copy_message.svg
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="19px"
-   height="19px"
-   viewBox="0 0 19 19"
-   version="1.1"
-   id="svg3734"
-   sodipodi:docname="icon_copy_message.svg"
-   inkscape:version="0.92.1 r">
-  <metadata
-     id="metadata3738">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>ED5D3E59-2561-4AC1-9B43-82FBC51767FC</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1596"
-     inkscape:window-height="846"
-     id="namedview3736"
-     showgrid="false"
-     inkscape:zoom="12.421053"
-     inkscape:cx="3.4935767"
-     inkscape:cy="2.469644"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="Symbols" />
-  <!-- Generator: sketchtool 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
-  <title
-     id="title3722">ED5D3E59-2561-4AC1-9B43-82FBC51767FC</title>
-  <desc
-     id="desc3724">Created with sketchtool.</desc>
-  <defs
-     id="defs3726" />
-  <g
-     id="Symbols"
-     stroke="none"
-     stroke-width="1"
-     fill="none"
-     fill-rule="evenodd">
-    <path
-       d="M 9.5,19 C 14.746705,19 19,14.746705 19,9.5 19,4.2532949 14.746705,0 9.5,0 4.2532949,0 0,4.2532949 0,9.5 0,14.746705 4.2532949,19 9.5,19 Z"
-       id="Oval-69"
-       inkscape:connector-curvature="0"
-       style="fill:#ececec" />
-    <g
-       id="g4632"
-       transform="translate(-2.3841858e-7,-1)">
-      <rect
-         style="stroke:#9b9b9b;stroke-width:0.91585475;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         y="4.3017478"
-         x="4.6289611"
-         height="10.396504"
-         width="7.7420783"
-         id="rect3745-3" />
-      <rect
-         style="fill:#ececec;fill-opacity:1;stroke:#9b9b9b;stroke-width:0.91585475;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         y="6.3017478"
-         x="6.6289611"
-         height="10.396504"
-         width="7.7420783"
-         id="rect3745" />
-    </g>
-  </g>
-</svg>
diff --git a/res/img/icons-pin.svg b/res/img/icons-pin.svg
deleted file mode 100644
index a6fbf13baa..0000000000
--- a/res/img/icons-pin.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="16px" height="16px" viewbox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <g transform="scale(0.03125)">
-  <path id="svg_2" fill="none" stroke="#76cfa6" stroke-width="40" stroke-linecap="round" stroke-linejoin="round" d="m315.802,402.338c12.73,-33.537 13.503,-69.629 3.623,-102.697l93.245,-103.107l7.831,7.831c10.411,10.409 27.283,10.409 37.691,0c10.41,-10.408 10.41,-27.281 0.001,-37.69l-112.869,-112.867c-10.407,-10.409 -27.279,-10.41 -37.689,-0.001c-10.408,10.41 -10.409,27.283 0.001,37.693l7.833,7.833l-103.107,93.243c-33.069,-9.878 -69.163,-9.107 -102.697,3.626c-4.7,1.785 -8.001,5.646 -9.059,10.604c-1.175,5.473 0.627,11.402 4.697,15.472l184.42,184.421c4.069,4.07 10,5.871 15.472,4.695c4.959,-1.055 8.82,-4.357 10.607,-9.056z"/>
-  <polyline id="svg_3" fill="none" stroke="#76cfa6" stroke-width="40" stroke-linecap="round" stroke-linejoin="round" points="    180.951,297.927 46,466 215.319,332.295   "/>
-  <!--<line id="svg_4" fill="none" stroke="#76cfa6" stroke-width="40" stroke-linecap="round" stroke-linejoin="round" y2="219.549" y1="138.166" x2="255.531" x1="336.915"/>-->
- </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/icons-room-nobg.svg b/res/img/icons-room-nobg.svg
deleted file mode 100644
index 8ca7ab272b..0000000000
--- a/res/img/icons-room-nobg.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xml:space="preserve"
-   style="enable-background:new 0 0 25 25;"
-   viewBox="0 0 25 25"
-   y="0px"
-   x="0px"
-   id="Layer_1"
-   version="1.1"><metadata
-   id="metadata11"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-   id="defs9">
-	
-	
-
-		
-	</defs>
-<path
-   style="fill:#9fa9ba;fill-opacity:1;stroke-width:1.24281836"
-   d="m 16.418416,10.445225 -0.763833,4.003888 h 3.564555 v 1.57729 h -3.819166 l -1.018445,5.095858 H 12.726556 L 13.745,16.026403 H 9.9258345 L 8.9073901,21.122261 H 7.2524182 L 8.2708625,16.026403 H 4.9609188 v -1.57729 H 8.5254735 L 9.416612,10.445225 H 5.9793629 V 8.989265 H 9.6712233 L 10.689667,3.7720766 h 1.782277 L 11.453501,8.989265 h 3.819166 L 16.29111,3.7720766 h 1.654972 L 16.927638,8.989265 h 3.309944 v 1.45596 h -3.819166 m -6.23797,4.125218 h 3.819166 l 0.763832,-4.003888 h -3.819166 l -0.763832,4.003888"
-   id="path3002" />
-</svg>
\ No newline at end of file
diff --git a/res/img/icons-share.svg b/res/img/icons-share.svg
deleted file mode 100644
index aac19080f4..0000000000
--- a/res/img/icons-share.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Capa_1" x="0px" y="0px" viewBox="0 0 481.6 481.6" style="enable-background:new 0 0 481.6 481.6;" xml:space="preserve" width="16px" height="16px">
-<g>
-	<path stroke="#9FA9BA" stroke-width="5" d="M381.6,309.4c-27.7,0-52.4,13.2-68.2,33.6l-132.3-73.9c3.1-8.9,4.8-18.5,4.8-28.4c0-10-1.7-19.5-4.9-28.5l132.2-73.8   c15.7,20.5,40.5,33.8,68.3,33.8c47.4,0,86.1-38.6,86.1-86.1S429,0,381.5,0s-86.1,38.6-86.1,86.1c0,10,1.7,19.6,4.9,28.5   l-132.1,73.8c-15.7-20.6-40.5-33.8-68.3-33.8c-47.4,0-86.1,38.6-86.1,86.1s38.7,86.1,86.2,86.1c27.8,0,52.6-13.3,68.4-33.9   l132.2,73.9c-3.2,9-5,18.7-5,28.7c0,47.4,38.6,86.1,86.1,86.1s86.1-38.6,86.1-86.1S429.1,309.4,381.6,309.4z M381.6,27.1   c32.6,0,59.1,26.5,59.1,59.1s-26.5,59.1-59.1,59.1s-59.1-26.5-59.1-59.1S349.1,27.1,381.6,27.1z M100,299.8   c-32.6,0-59.1-26.5-59.1-59.1s26.5-59.1,59.1-59.1s59.1,26.5,59.1,59.1S132.5,299.8,100,299.8z M381.6,454.5   c-32.6,0-59.1-26.5-59.1-59.1c0-32.6,26.5-59.1,59.1-59.1s59.1,26.5,59.1,59.1C440.7,428,414.2,454.5,381.6,454.5z" fill="#9FA9BA"/>
-</g>
-</svg>
diff --git a/res/img/info.png b/res/img/info.png
deleted file mode 100644
index 699fd64e01..0000000000
Binary files a/res/img/info.png and /dev/null differ
diff --git a/res/img/leave.svg b/res/img/leave.svg
deleted file mode 100644
index 1acbe59313..0000000000
--- a/res/img/leave.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="-1 -1 20 26"
-	 xml:space="preserve">
-<g id="Page-1" sketch:type="MSPage">
-	<g id="Exit-Copy-6" sketch:type="MSLayerGroup">
-		<path id="Rectangle-140_1_" sketch:type="MSShapeGroup" fill="none" stroke="#76CFA6" d="M4.4,0.5h7.5c2.2,0,4,1.8,4,4v14c0,2.2-1.8,4-4,4H4.4
-			c-2.2,0-4-1.8-4-4v-14C0.4,2.3,2.2,0.5,4.4,0.5z"/>
-		<g id="Rectangle-140_2_">
-			<g>
-				<path fill="#76CFA6" d="M12,23H4.5C2,23,0,21,0,18.5v-14C0,2,2,0,4.5,0H12c2.5,0,4.5,2,4.5,4.5v14C16.4,21,14.4,23,12,23z M4.4,1
-					C2.5,1,0.9,2.6,0.9,4.5v14c0,1.9,1.6,3.5,3.5,3.5h7.5c1.9,0,3.5-1.6,3.5-3.5v-14c0-1.9-1.6-3.5-3.5-3.5H4.4z"/>
-				<g>
-					<path fill="none" stroke="#76CFA6" d="M3.2,20.6l8.3-1.8c1.1-0.2,2-1,2-1.7V5.7c0-0.7-0.9-1.4-2-1.7L3.2,2.2"/>
-				</g>
-			</g>
-		</g>
-		<circle id="Oval-605" sketch:type="MSShapeGroup" fill="#76CFA6" cx="10.7" cy="11.1" r="1">
-		</circle>
-	</g>
-</g>
-</svg>
diff --git a/res/img/list-close.png b/res/img/list-close.png
deleted file mode 100644
index 82b322f9d4..0000000000
Binary files a/res/img/list-close.png and /dev/null differ
diff --git a/res/img/list-open.png b/res/img/list-open.png
deleted file mode 100644
index f8c8063197..0000000000
Binary files a/res/img/list-open.png and /dev/null differ
diff --git a/res/img/matrix-m.svg b/res/img/matrix-m.svg
deleted file mode 100644
index ccb1df0fc5..0000000000
--- a/res/img/matrix-m.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 520 520" style="enable-background:new 0 0 520 520;" xml:space="preserve">
-<rect width="100%" height="100%" fill="#FFFFFF"/>
-<path d="M13.7,11.9v496.2h35.7V520H0V0h49.4v11.9H13.7z"/>
-<path d="M166.3,169.2v25.1h0.7c6.7-9.6,14.8-17,24.2-22.2c9.4-5.3,20.3-7.9,32.5-7.9c11.7,0,22.4,2.3,32.1,6.8
-	c9.7,4.5,17,12.6,22.1,24c5.5-8.1,13-15.3,22.4-21.5c9.4-6.2,20.6-9.3,33.5-9.3c9.8,0,18.9,1.2,27.3,3.6c8.4,2.4,15.5,6.2,21.5,11.5
-	c6,5.3,10.6,12.1,14,20.6c3.3,8.5,5,18.7,5,30.7v124.1h-50.9V249.6c0-6.2-0.2-12.1-0.7-17.6c-0.5-5.5-1.8-10.3-3.9-14.3
-	c-2.2-4.1-5.3-7.3-9.5-9.7c-4.2-2.4-9.9-3.6-17-3.6c-7.2,0-13,1.4-17.4,4.1c-4.4,2.8-7.9,6.3-10.4,10.8c-2.5,4.4-4.2,9.4-5,15.1
-	c-0.8,5.6-1.3,11.3-1.3,17v103.3h-50.9v-104c0-5.5-0.1-10.9-0.4-16.3c-0.2-5.4-1.3-10.3-3.1-14.9c-1.8-4.5-4.8-8.2-9-10.9
-	c-4.2-2.7-10.3-4.1-18.5-4.1c-2.4,0-5.6,0.5-9.5,1.6c-3.9,1.1-7.8,3.1-11.5,6.1c-3.7,3-6.9,7.3-9.5,12.9c-2.6,5.6-3.9,13-3.9,22.1
-	v107.6h-50.9V169.2H166.3z"/>
-<path d="M506.3,508.1V11.9h-35.7V0H520v520h-49.4v-11.9H506.3z"/>
-</svg>
diff --git a/res/img/menu.png b/res/img/menu.png
deleted file mode 100755
index b45f88950f..0000000000
Binary files a/res/img/menu.png and /dev/null differ
diff --git a/res/img/modular-bw-logo.svg b/res/img/modular-bw-logo.svg
deleted file mode 100644
index 924a587805..0000000000
--- a/res/img/modular-bw-logo.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<svg height="12" viewBox="0 0 71 12" width="71" xmlns="http://www.w3.org/2000/svg">
-    <g fill="#454545" fill-rule="evenodd">
-        <g transform="translate(18.551433 2)">
-            <path d="m.06753266 7.63333335v-5.66666669h1.65455009v.63333334c.30389695-.5 1.01298984-.83333333 1.65455008-.83333333.81039188 0 1.41818577.33333333 1.68831641.9.43896227-.63333333 1.01298982-.9 1.7896154-.9 1.08052251 0 2.1272787.63333333 2.1272787 2.16666667v3.66666666h-1.68831643v-3.26666666c0-.53333334-.30389694-.96666667-.91169086-.96666667-.60779387 0-.94545718.46666667-.94545718.96666667v3.26666666h-1.72208276v-3.26666666c0-.53333334-.30389696-.96666667-.91169086-.96666667-.60779391 0-.94545719.46666667-.94545719.96666667v3.26666666h-1.7896154z"/>
-            <path d="m16.9844631 4.8c0 1.76666665-1.3168868 3-3.0389695 3-1.6883165 0-3.0389695-1.26666665-3.0389695-3 0-1.76666666 1.350653-3 3.0389695-3 1.7220827 0 3.0389695 1.26666667 3.0389695 3m-1.755849 0c0-.96666666-.6077939-1.4-1.2831205-1.4-.6415602 0-1.2831205.43333334-1.2831205 1.4 0 .93333335.6415603 1.4 1.2831205 1.4.6753266.03333335 1.2831205-.43333335 1.2831205-1.4" fill-rule="nonzero"/>
-            <path d="m30.9974894 7.06666665c-.303897.5-.9454572.7-1.5194848.7-1.3844195 0-2.161045-1-2.161045-2.2v-3.56666665h1.7558491v3.2c0 .53333335.3038969.96666665.9116908.96666665.5740276 0 .9454572-.4.9454572-.96666665v-3.2h1.7558491v4.63333335c0 .5.0337663.9333333.0675327 1h-1.6883165c-.0337663-.1-.0675326-.4-.0675326-.5666667"/>
-            <path d="m43.2209002 6.9c-.2701306.53333335-.8441582.9-1.553251.9-1.6883165 0-2.8363717-1.26666665-2.8363717-3 0-1.66666666 1.0805225-2.96666666 2.8026053-2.96666666 1.0129899 0 1.4857184.56666666 1.5870174.83333333v-.66666667h1.6883166v4.63333335c0 .5333333.0337662.9.0337662 1h-1.6883165c-.0337663-.13333335-.0337663-.43333335-.0337663-.6666667zm-1.3168868-.6c.7090929 0 1.3168868-.53333335 1.3168868-1.5 0-.96666667-.5740275-1.5-1.3168868-1.5-.7428592 0-1.3168868.5-1.3168868 1.5 0 .93333335.6077939 1.5 1.3168868 1.5z" fill-rule="nonzero"/>
-            <path d="m50.8520906 1.9c.6415599 0 1.1480552.5 1.1480552 1.13333334 0 .63333333-.5064953 1.1-1.1480552 1.1-.6415602 0-1.1142889-.5-1.1142889-1.1 0-.66666667.4727287-1.13333334 1.1142889-1.13333334zm-1.7558494 5.73333335h-1.7558491v-5.66666669h1.7558491z" fill-rule="nonzero"/>
-            <path d="m35.083215.266667h1.755849v7.4h-1.755849z"/>
-            <path d="m24.9195503.26666667h-1.7220828v2.16666666c-.1350653-.2-.5740276-.56666667-1.5532511-.56666667-1.6207837 0-2.7688389 1.26666667-2.7688389 2.93333334 0 1.73333335 1.2155878 2.96666665 2.8363716 2.96666665.6753266 0 1.2831204-.3 1.5194848-.66666665 0 .23333335.0337663.46666665.0337663.53333335h1.6883164c0-.13333335-.0337663-.5-.0337663-1zm-3.0052032 5.96666668c-.6753266 0-1.2831205-.4666667-1.2831205-1.40000001 0-.93333334.6077939-1.4 1.2831205-1.4.6753265 0 1.2831204.46666666 1.2831204 1.4 0 .90000001-.6077939 1.40000001-1.2831204 1.40000001z" fill-rule="nonzero"/>
-        </g>
-        <g>
-            <path d="m14.0349329 1.05652174-1.7385268-.97826087-1.7385268.97826087-.0132712 9.88695656 1.751798.9913043 1.7385268-.9782608z"/>
-            <path d="m3.59050092 6-1.751798-.9782609-1.73852679.9782609v4.9434783l1.75179799.9913043 1.7385268-.9913043z"/>
-            <path d="m7.0675545 6.99130435 2.60115457-1.47391305v-1.98260869l-1.73852676-.97826087-.86262781.50869565-3.49032478-1.99565217-1.7385268-.99130435-1.73852679.99130435v1.96956521z"/>
-        </g>
-    </g>
-</svg>
diff --git a/res/img/network-matrix.svg b/res/img/network-matrix.svg
deleted file mode 100644
index bb8278ae39..0000000000
--- a/res/img/network-matrix.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 520 520" style="enable-background:new 0 0 520 520;" xml:space="preserve">
-<path d="M13.7,11.9v496.2h35.7V520H0V0h49.4v11.9H13.7z"/>
-<path d="M166.3,169.2v25.1h0.7c6.7-9.6,14.8-17,24.2-22.2c9.4-5.3,20.3-7.9,32.5-7.9c11.7,0,22.4,2.3,32.1,6.8
-	c9.7,4.5,17,12.6,22.1,24c5.5-8.1,13-15.3,22.4-21.5c9.4-6.2,20.6-9.3,33.5-9.3c9.8,0,18.9,1.2,27.3,3.6c8.4,2.4,15.5,6.2,21.5,11.5
-	c6,5.3,10.6,12.1,14,20.6c3.3,8.5,5,18.7,5,30.7v124.1h-50.9V249.6c0-6.2-0.2-12.1-0.7-17.6c-0.5-5.5-1.8-10.3-3.9-14.3
-	c-2.2-4.1-5.3-7.3-9.5-9.7c-4.2-2.4-9.9-3.6-17-3.6c-7.2,0-13,1.4-17.4,4.1c-4.4,2.8-7.9,6.3-10.4,10.8c-2.5,4.4-4.2,9.4-5,15.1
-	c-0.8,5.6-1.3,11.3-1.3,17v103.3h-50.9v-104c0-5.5-0.1-10.9-0.4-16.3c-0.2-5.4-1.3-10.3-3.1-14.9c-1.8-4.5-4.8-8.2-9-10.9
-	c-4.2-2.7-10.3-4.1-18.5-4.1c-2.4,0-5.6,0.5-9.5,1.6c-3.9,1.1-7.8,3.1-11.5,6.1c-3.7,3-6.9,7.3-9.5,12.9c-2.6,5.6-3.9,13-3.9,22.1
-	v107.6h-50.9V169.2H166.3z"/>
-<path d="M506.3,508.1V11.9h-35.7V0H520v520h-49.4v-11.9H506.3z"/>
-</svg>
diff --git a/res/img/newmessages.png b/res/img/newmessages.png
deleted file mode 100644
index a22156ab21..0000000000
Binary files a/res/img/newmessages.png and /dev/null differ
diff --git a/res/img/placeholder.png b/res/img/placeholder.png
deleted file mode 100644
index 7da32f259c..0000000000
Binary files a/res/img/placeholder.png and /dev/null differ
diff --git a/res/img/react.svg b/res/img/react.svg
deleted file mode 100644
index dd23c41c2c..0000000000
--- a/res/img/react.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="17" viewBox="0 0 18 17">
-    <g fill="none" fill-rule="evenodd">
-        <path fill="#2E2F32" fill-rule="nonzero" d="M13.6 14.5a7.875 7.875 0 1 1 2.183-3h-.818a7.125 7.125 0 1 0-2.62 3H13.6z"/>
-        <g stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round" stroke-width=".75">
-            <path d="M11.5 13h6M14.5 10v6"/>
-        </g>
-        <path stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round" stroke-width=".75" d="M5.5 10s1.125 1.5 3 1.5 3-1.5 3-1.5"/>
-        <path stroke="#2E2F32" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M6.25 6.25h.008M10.75 6.25h.008"/>
-    </g>
-</svg>
diff --git a/res/img/reply.svg b/res/img/reply.svg
deleted file mode 100644
index 540e228883..0000000000
--- a/res/img/reply.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="13" height="8" xmlns="http://www.w3.org/2000/svg">
-  <g stroke="#2E2F32" stroke-width=".75" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-    <path d="M3.167 1L.5 3.545l2.667 2.546"/>
-    <path d="M12.5 7.364V6.09c0-1.406-1.194-2.546-2.667-2.546H.5"/>
-  </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/search.png b/res/img/search.png
deleted file mode 100644
index 2f98d29048..0000000000
Binary files a/res/img/search.png and /dev/null differ
diff --git a/res/img/selected.png b/res/img/selected.png
deleted file mode 100644
index 8931cba75f..0000000000
Binary files a/res/img/selected.png and /dev/null differ
diff --git a/res/img/settings-big.png b/res/img/settings-big.png
deleted file mode 100644
index cb2e0a62d0..0000000000
Binary files a/res/img/settings-big.png and /dev/null differ
diff --git a/res/img/settings.png b/res/img/settings.png
deleted file mode 100644
index 264b3c9bc3..0000000000
Binary files a/res/img/settings.png and /dev/null differ
diff --git a/res/img/sound-indicator.svg b/res/img/sound-indicator.svg
deleted file mode 100644
index 9b8de53d81..0000000000
--- a/res/img/sound-indicator.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="20px" viewBox="-1 -1 23 20" 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>sound_indicator</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(-247.000000, -668.000000)" fill="#FFFFFF">
-            <g id="sound_indicator" sketch:type="MSLayerGroup" transform="translate(247.000000, 668.000000)">
-                <path d="M5.769,6.7284 L7.8,4.6968 L7.8,13.0626 L5.4174,10.68 L1.2,10.68 L1.2,7.08 L5.4174,7.08 L5.769,6.7284 L5.769,6.7284 Z M0,5.88 L0,11.88 L4.9206,11.88 L9,15.9594 L9,1.8 L4.9206,5.88 L0,5.88 L0,5.88 Z" id="Fill-28" sketch:type="MSShapeGroup"></path>
-                <path d="M17.1672,0 L16.2,0.72 C17.9172,3.021 18.9354,5.8728 18.9354,8.9586 C18.9354,12.0438 17.9172,14.8956 16.2,17.196 L17.1672,17.9166 C19.0314,15.417 20.1354,12.3168 20.1354,8.9586 C20.1354,5.6004 19.0314,2.4996 17.1672,0" id="Fill-29" sketch:type="MSShapeGroup"></path>
-                <path d="M14.1606,15.9948 C15.579,14.094 16.4304,11.7462 16.4304,9.1974 C16.4304,6.6486 15.579,4.3008 14.1606,2.4 L13.2,3.1152 C14.469,4.8156 15.2304,6.9168 15.2304,9.1974 C15.2304,11.478 14.4696,13.5786 13.2,15.2796 L14.1606,15.9948" id="Fill-30" sketch:type="MSShapeGroup"></path>
-                <path d="M11.7606,13.5024 C12.732,12.2016 13.314,10.5954 13.314,8.8512 C13.314,7.107 12.732,5.5002 11.7606,4.2 L10.8,4.9152 C11.6214,6.0156 12.114,7.3752 12.114,8.8512 C12.114,10.3272 11.6214,11.6862 10.8,12.7866 L11.7606,13.5024" id="Fill-31" sketch:type="MSShapeGroup"></path>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/spinner.svg b/res/img/spinner.svg
new file mode 100644
index 0000000000..08965e982e
--- /dev/null
+++ b/res/img/spinner.svg
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink= "http://www.w3.org/1999/xlink" preserveAspectRatio="none" viewBox="0 0 375 375" style="background-color:#FFFFFF00; overflow:visible">
+    <title>start</title>
+    <!-- Layers -->
+    <!-- Layer: Icon -->
+    <svg x="188" y="187" width="0.01" height="0.01" style ="overflow:visible" opacity="1">
+        <animate attributeName="x" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 1 1;0 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="188;187.75;187.5"/>
+        <animate attributeName="y" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 1 1;0 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="187;187.25;187.5"/>
+        <g transform="scale(1 1)">
+            <g transform="rotate(0)">
+                <animateTransform attributeName="transform" calcMode="spline" dur="2" fill="freeze" keySplines="0.42 0 1 1;0 0 0.58 1" keyTimes="0;0.5;1"
+                                  repeatCount="indefinite" type="rotate" values="0;180;360"/>
+                <svg x="-100" y="-100" width="200" height="200" style ="overflow:visible" opacity="1">
+                    <animate attributeName="x" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 1 1;0 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="-100;-117.5;-100"/>
+                    <animate attributeName="y" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 1 1;0 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="-100;-117.5;-100"/>
+                    <animate attributeName="width" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 1 1;0 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="200;235;200"/>
+                    <animate attributeName="height" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 1 1;0 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="200;235;200"/>
+                    <g clip-path="">
+                        <g filter="">
+                            <!-- Layer: 1024@2x -->
+                            <svg x="100" y="100" width="0.01" height="0.01" style ="overflow:visible" opacity="1">
+                                <animate attributeName="x" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="100;117.5;100"/>
+                                <animate attributeName="y" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="100;117.5;100"/>
+                                <g transform="scale(1 1)">
+                                    <g transform="rotate(0)">
+                                        <svg x="-100" y="-100" width="200" height="200" style ="overflow:visible" opacity="1">
+                                            <animate attributeName="x" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="-100;-117.5;-100"/>
+                                            <animate attributeName="y" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="-100;-117.5;-100"/>
+                                            <animate attributeName="width" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="200;235;200"/>
+                                            <animate attributeName="height" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="200;235;200"/>
+                                            <g clip-path="">
+                                                <g filter="">
+                                                    <!-- Layer: Path -->
+                                                    <svg x="118" y="46" width="0.01" height="0.01" style ="overflow:visible" opacity="1">
+                                                        <animate attributeName="x" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="118;138.65;118"/>
+                                                        <animate attributeName="y" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="46;54.05;46"/>
+                                                        <g transform="scale(1 1)">
+                                                            <g transform="rotate(0)">
+                                                                <svg x="-46" y="-46" width="92" height="92" style ="overflow:visible" opacity="1">
+                                                                    <animate attributeName="x" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="-46;-54.05;-46"/>
+                                                                    <animate attributeName="y" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="-46;-54.05;-46"/>
+                                                                    <animate attributeName="width" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="92;108.1;92"/>
+                                                                    <animate attributeName="height" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="92;108.1;92"/>
+                                                                    <g clip-path="">
+                                                                        <g filter="">
+                                                                            <path d="M0,12c0,-6.627,5.373,-12,12,-12 44.183,0,80,35.817,80,80 0,6.627,-5.373,12,-12,12 -6.627,0,-12,-5.373,-12,-12 0,-30.928,-25.072,-56,-56,-56 -6.627,0,-12,-5.373,-12,-12zM0,12" fill="#0DBD8B" id="path" stroke="#00000000" stroke-dasharray="0" stroke-dashoffset="0" stroke-miterlimit="10" stroke-width="0">
+                                                                                <animate attributeName="d" calcMode="spline" dur="2s" fill="freeze" href="#path" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="M0,12c0,-6.627,5.373,-12,12,-12 44.183,0,80,35.817,80,80 0,6.627,-5.373,12,-12,12 -6.627,0,-12,-5.373,-12,-12 0,-30.928,-25.072,-56,-56,-56 -6.627,0,-12,-5.373,-12,-12zM0,12;M0,14.1c0,-7.787,6.313,-14.1,14.1,-14.1 51.915,0,94,42.085,94,94 0,7.787,-6.313,14.1,-14.1,14.1 -7.787,0,-14.1,-6.313,-14.1,-14.1 0,-36.34,-29.46,-65.8,-65.8,-65.8 -7.787,0,-14.1,-6.313,-14.1,-14.1zM0,14.1;M0,12c0,-6.627,5.373,-12,12,-12 44.183,0,80,35.817,80,80 0,6.627,-5.373,12,-12,12 -6.627,0,-12,-5.373,-12,-12 0,-30.928,-25.072,-56,-56,-56 -6.627,0,-12,-5.373,-12,-12zM0,12"/>
+                                                                            </path>
+
+                                                                        </g>
+                                                                    </g>
+                                                                </svg>
+                                                            </g>
+                                                        </g>
+                                                    </svg>
+                                                    <!-- Layer: Path -->
+                                                    <svg x="82" y="154" width="0.01" height="0.01" style ="overflow:visible" opacity="1">
+                                                        <animate attributeName="x" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="82;96.35;82"/>
+                                                        <animate attributeName="y" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="154;180.95;154"/>
+                                                        <g transform="scale(1 1)">
+                                                            <g transform="rotate(0)">
+                                                                <svg x="-46" y="-46" width="92" height="92" style ="overflow:visible" opacity="1">
+                                                                    <animate attributeName="x" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="-46;-54.05;-46"/>
+                                                                    <animate attributeName="y" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="-46;-54.05;-46"/>
+                                                                    <animate attributeName="width" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="92;108.1;92"/>
+                                                                    <animate attributeName="height" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="92;108.1;92"/>
+                                                                    <g clip-path="">
+                                                                        <g filter="">
+                                                                            <path d="M92,80c0,6.627,-5.373,12,-12,12 -44.183,0,-80,-35.817,-80,-80 0,-6.627,5.373,-12,12,-12 6.627,0,12,5.373,12,12 0,30.928,25.072,56,56,56 6.627,0,12,5.373,12,12zM92,80" fill="#0DBD8B" id="path_1" stroke="#00000000" stroke-dasharray="0" stroke-dashoffset="0" stroke-miterlimit="10" stroke-width="0">
+                                                                                <animate attributeName="d" calcMode="spline" dur="2s" fill="freeze" href="#path_1" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="M92,80c0,6.627,-5.373,12,-12,12 -44.183,0,-80,-35.817,-80,-80 0,-6.627,5.373,-12,12,-12 6.627,0,12,5.373,12,12 0,30.928,25.072,56,56,56 6.627,0,12,5.373,12,12zM92,80;M108.1,94c0,7.787,-6.313,14.1,-14.1,14.1 -51.915,0,-94,-42.085,-94,-94 0,-7.787,6.313,-14.1,14.1,-14.1 7.787,0,14.1,6.313,14.1,14.1 0,36.34,29.46,65.8,65.8,65.8 7.787,0,14.1,6.313,14.1,14.1zM108.1,94;M92,80c0,6.627,-5.373,12,-12,12 -44.183,0,-80,-35.817,-80,-80 0,-6.627,5.373,-12,12,-12 6.627,0,12,5.373,12,12 0,30.928,25.072,56,56,56 6.627,0,12,5.373,12,12zM92,80"/>
+                                                                            </path>
+
+                                                                        </g>
+                                                                    </g>
+                                                                </svg>
+                                                            </g>
+                                                        </g>
+                                                    </svg>
+                                                    <!-- Layer: Path -->
+                                                    <svg x="46" y="82" width="0.01" height="0.01" style ="overflow:visible" opacity="1">
+                                                        <animate attributeName="x" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="46;54.05;46"/>
+                                                        <animate attributeName="y" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="82;96.35;82"/>
+                                                        <g transform="scale(1 1)">
+                                                            <g transform="rotate(0)">
+                                                                <svg x="-46" y="-46" width="92" height="92" style ="overflow:visible" opacity="1">
+                                                                    <animate attributeName="x" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="-46;-54.05;-46"/>
+                                                                    <animate attributeName="y" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="-46;-54.05;-46"/>
+                                                                    <animate attributeName="width" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="92;108.1;92"/>
+                                                                    <animate attributeName="height" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="92;108.1;92"/>
+                                                                    <g clip-path="">
+                                                                        <g filter="">
+                                                                            <path d="M12,92c-6.627,0,-12,-5.373,-12,-12 0,-44.183,35.817,-80,80,-80 6.627,0,12,5.373,12,12 0,6.627,-5.373,12,-12,12 -30.928,0,-56,25.072,-56,56 0,6.627,-5.373,12,-12,12zM12,92" fill="#0DBD8B" id="path_2" stroke="#00000000" stroke-dasharray="0" stroke-dashoffset="0" stroke-miterlimit="10" stroke-width="0">
+                                                                                <animate attributeName="d" calcMode="spline" dur="2s" fill="freeze" href="#path_2" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="M12,92c-6.627,0,-12,-5.373,-12,-12 0,-44.183,35.817,-80,80,-80 6.627,0,12,5.373,12,12 0,6.627,-5.373,12,-12,12 -30.928,0,-56,25.072,-56,56 0,6.627,-5.373,12,-12,12zM12,92;M14.1,108.1c-7.787,0,-14.1,-6.313,-14.1,-14.1 0,-51.915,42.085,-94,94,-94 7.787,0,14.1,6.313,14.1,14.1 0,7.787,-6.313,14.1,-14.1,14.1 -36.34,0,-65.8,29.46,-65.8,65.8 0,7.787,-6.313,14.1,-14.1,14.1zM14.1,108.1;M12,92c-6.627,0,-12,-5.373,-12,-12 0,-44.183,35.817,-80,80,-80 6.627,0,12,5.373,12,12 0,6.627,-5.373,12,-12,12 -30.928,0,-56,25.072,-56,56 0,6.627,-5.373,12,-12,12zM12,92"/>
+                                                                            </path>
+
+                                                                        </g>
+                                                                    </g>
+                                                                </svg>
+                                                            </g>
+                                                        </g>
+                                                    </svg>
+                                                    <!-- Layer: Path -->
+                                                    <svg x="154" y="118" width="0.01" height="0.01" style ="overflow:visible" opacity="1">
+                                                        <animate attributeName="x" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="154;180.95;154"/>
+                                                        <animate attributeName="y" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="118;138.65;118"/>
+                                                        <g transform="scale(1 1)">
+                                                            <g transform="rotate(0)">
+                                                                <svg x="-46" y="-46" width="92" height="92" style ="overflow:visible" opacity="1">
+                                                                    <animate attributeName="x" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="-46;-54.05;-46"/>
+                                                                    <animate attributeName="y" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="-46;-54.05;-46"/>
+                                                                    <animate attributeName="width" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="92;108.1;92"/>
+                                                                    <animate attributeName="height" calcMode="spline" dur="2s" fill="freeze" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="92;108.1;92"/>
+                                                                    <g clip-path="">
+                                                                        <g filter="">
+                                                                            <path d="M80,0c6.627,0,12,5.373,12,12 0,44.183,-35.817,80,-80,80 -6.627,0,-12,-5.373,-12,-12 0,-6.627,5.373,-12,12,-12 30.928,0,56,-25.072,56,-56 0,-6.627,5.373,-12,12,-12zM80,0" fill="#0DBD8B" id="path_3" stroke="#00000000" stroke-dasharray="0" stroke-dashoffset="0" stroke-miterlimit="10" stroke-width="0">
+                                                                                <animate attributeName="d" calcMode="spline" dur="2s" fill="freeze" href="#path_3" keySplines="0.42 0 0.58 1;0.42 0 0.58 1" keyTimes="0;0.5;1" repeatCount="indefinite" values="M80,0c6.627,0,12,5.373,12,12 0,44.183,-35.817,80,-80,80 -6.627,0,-12,-5.373,-12,-12 0,-6.627,5.373,-12,12,-12 30.928,0,56,-25.072,56,-56 0,-6.627,5.373,-12,12,-12zM80,0;M94,0c7.787,0,14.1,6.313,14.1,14.1 0,51.915,-42.085,94,-94,94 -7.787,0,-14.1,-6.313,-14.1,-14.1 0,-7.787,6.313,-14.1,14.1,-14.1 36.34,0,65.8,-29.46,65.8,-65.8 0,-7.787,6.313,-14.1,14.1,-14.1zM94,0;M80,0c6.627,0,12,5.373,12,12 0,44.183,-35.817,80,-80,80 -6.627,0,-12,-5.373,-12,-12 0,-6.627,5.373,-12,12,-12 30.928,0,56,-25.072,56,-56 0,-6.627,5.373,-12,12,-12zM80,0"/>
+                                                                            </path>
+
+                                                                        </g>
+                                                                    </g>
+                                                                </svg>
+                                                            </g>
+                                                        </g>
+                                                    </svg>
+
+                                                </g>
+                                            </g>
+                                        </svg>
+                                    </g>
+                                </g>
+                            </svg>
+
+                        </g>
+                    </g>
+                </svg>
+            </g>
+        </g>
+    </svg>
+
+
+</svg>
diff --git a/res/img/trans.png b/res/img/trans.png
deleted file mode 100644
index 8ba2310a06..0000000000
Binary files a/res/img/trans.png and /dev/null differ
diff --git a/res/img/typing.png b/res/img/typing.png
deleted file mode 100644
index 066a0ce8fd..0000000000
Binary files a/res/img/typing.png and /dev/null differ
diff --git a/res/img/upload-big.png b/res/img/upload-big.png
deleted file mode 100644
index c11c0c452d..0000000000
Binary files a/res/img/upload-big.png and /dev/null differ
diff --git a/res/img/upload.png b/res/img/upload.png
deleted file mode 100644
index 7457bcd0f1..0000000000
Binary files a/res/img/upload.png and /dev/null differ
diff --git a/res/img/video-mute.svg b/res/img/video-mute.svg
deleted file mode 100644
index 6de60ba39b..0000000000
--- a/res/img/video-mute.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="31px" height="27px" viewBox="-2 -2 31 27" 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>icons_video copy</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(-871.000000, -667.000000)" stroke="#FFFFFF">
-            <g id="icons_video-copy" sketch:type="MSLayerGroup" transform="translate(871.000000, 666.000000)">
-                <g id="Rectangle-20-+-Path-16" transform="translate(0.000000, 0.464286)" sketch:type="MSShapeGroup">
-                    <rect id="Rectangle-20" x="0" y="0.535714286" width="20" height="20" rx="4"></rect>
-                    <path d="M20.75,10.6964286 C20.75,14.0446429 24.188247,15.7371974 24.188247,15.7371974 C25.5057636,16.651593 26.5738219,16.0843085 26.5738219,14.4868066 L26.5738219,6.90605053 C26.5738219,5.30108314 25.4784055,4.70120148 24.188247,5.65565975 C24.188247,5.65565975 20.75,7.34821429 20.75,10.6964286 Z" id="Path-16"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/video-unmute.svg b/res/img/video-unmute.svg
deleted file mode 100644
index a6c6c3b681..0000000000
--- a/res/img/video-unmute.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="31px" height="27px" viewBox="-1 -1 31 27" 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.4 (17249) - http://www.bohemiancoding.com/sketch -->
-    <title>icons_video copy</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(-870.000000, -666.000000)" stroke="#FFFFFF">
-            <g id="icons_video-copy" sketch:type="MSLayerGroup" transform="translate(870.000000, 666.000000)">
-                <g id="Rectangle-20-+-Path-16" transform="translate(1.000000, 0.464286)" sketch:type="MSShapeGroup">
-                    <rect id="Rectangle-20" x="0" y="0.535714286" width="20" height="20" rx="4"></rect>
-                    <path d="M20.75,10.6964286 C20.75,14.0446429 24.188247,15.7371974 24.188247,15.7371974 C25.5057636,16.651593 26.5738219,16.0843085 26.5738219,14.4868066 L26.5738219,6.90605053 C26.5738219,5.30108314 25.4784055,4.70120148 24.188247,5.65565975 C24.188247,5.65565975 20.75,7.34821429 20.75,10.6964286 Z" id="Path-16"></path>
-                </g>
-                <path d="M24,1 L0.00856596586,23.6585766" id="Path-98" sketch:type="MSShapeGroup"></path>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/video.png b/res/img/video.png
deleted file mode 100644
index 2a788f6fa4..0000000000
Binary files a/res/img/video.png and /dev/null differ
diff --git a/res/img/voice-mute.svg b/res/img/voice-mute.svg
deleted file mode 100644
index 336641078e..0000000000
--- a/res/img/voice-mute.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="21px" height="26px" viewBox="-4 -1 21 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>Audio</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(-915.000000, -665.000000)" fill="#FFFFFF">
-            <g id="Audio" sketch:type="MSLayerGroup" transform="translate(915.000000, 665.000000)">
-                <path d="M3.51108197,4.57927869 C3.51108197,2.62701639 5.09940984,1.03868852 7.05206557,1.03868852 C9.00472131,1.03868852 10.5930492,2.62701639 10.5930492,4.57927869 L10.5930492,12.448918 C10.5930492,14.4015738 9.00472131,15.9899016 7.05206557,15.9899016 C5.09940984,15.9899016 3.51108197,14.4015738 3.51108197,12.448918 L3.51108197,4.57927869 L3.51108197,4.57927869 Z M7.05206557,16.7767869 C9.44183607,16.7767869 11.3799344,14.839082 11.3799344,12.448918 L11.3799344,4.57927869 C11.3799344,2.18911475 9.44183607,0.251803279 7.05206557,0.251803279 C4.66229508,0.251803279 2.72419672,2.18911475 2.72419672,4.57927869 L2.72419672,12.448918 C2.72419672,14.839082 4.66229508,16.7767869 7.05206557,16.7767869 Z M12.9517377,8.51409836 L12.9517377,12.448918 C12.9517377,15.703082 10.3042623,18.3505574 7.05009836,18.3505574 C3.79554098,18.3505574 1.14845902,15.703082 1.14845902,12.448918 L1.14845902,8.51409836 L0.36157377,8.51409836 L0.36157377,12.448918 C0.36157377,16.0217705 3.17980328,18.9407213 6.70898361,19.1201311 L6.65862295,19.1201311 L6.65862295,23.080918 L3.11567213,23.080918 L3.11567213,23.8678033 L10.9845246,23.8678033 L10.9845246,23.080918 L7.4455082,23.080918 L7.4455082,19.1201311 L7.39121311,19.1201311 C10.9203934,18.9407213 13.738623,16.0217705 13.738623,12.448918 L13.738623,8.51409836 L12.9517377,8.51409836 Z" id="Fill-16" sketch:type="MSShapeGroup"></path>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/voice-unmute.svg b/res/img/voice-unmute.svg
deleted file mode 100644
index 0d7e6f429f..0000000000
--- a/res/img/voice-unmute.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="21px" height="26px" viewBox="-1 -1 21 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.4 (17249) - http://www.bohemiancoding.com/sketch -->
-    <title>Audio</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(-912.000000, -665.000000)">
-            <g id="Audio" sketch:type="MSLayerGroup" transform="translate(912.000000, 665.000000)">
-                <path d="M6.51108197,4.57927869 C6.51108197,2.62701639 8.09940984,1.03868852 10.0520656,1.03868852 C12.0047213,1.03868852 13.5930492,2.62701639 13.5930492,4.57927869 L13.5930492,12.448918 C13.5930492,14.4015738 12.0047213,15.9899016 10.0520656,15.9899016 C8.09940984,15.9899016 6.51108197,14.4015738 6.51108197,12.448918 L6.51108197,4.57927869 L6.51108197,4.57927869 Z M10.0520656,16.7767869 C12.4418361,16.7767869 14.3799344,14.839082 14.3799344,12.448918 L14.3799344,4.57927869 C14.3799344,2.18911475 12.4418361,0.251803279 10.0520656,0.251803279 C7.66229508,0.251803279 5.72419672,2.18911475 5.72419672,4.57927869 L5.72419672,12.448918 C5.72419672,14.839082 7.66229508,16.7767869 10.0520656,16.7767869 Z M15.9517377,8.51409836 L15.9517377,12.448918 C15.9517377,15.703082 13.3042623,18.3505574 10.0500984,18.3505574 C6.79554098,18.3505574 4.14845902,15.703082 4.14845902,12.448918 L4.14845902,8.51409836 L3.36157377,8.51409836 L3.36157377,12.448918 C3.36157377,16.0217705 6.17980328,18.9407213 9.70898361,19.1201311 L9.65862295,19.1201311 L9.65862295,23.080918 L6.11567213,23.080918 L6.11567213,23.8678033 L13.9845246,23.8678033 L13.9845246,23.080918 L10.4455082,23.080918 L10.4455082,19.1201311 L10.3912131,19.1201311 C13.9203934,18.9407213 16.738623,16.0217705 16.738623,12.448918 L16.738623,8.51409836 L15.9517377,8.51409836 Z" id="Fill-16" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-                <path d="M19,3 L0.272141024,20.6874224" id="Path-98" stroke="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/voice.png b/res/img/voice.png
deleted file mode 100644
index 5ba765b0f4..0000000000
Binary files a/res/img/voice.png and /dev/null differ
diff --git a/res/img/voip-chevron.svg b/res/img/voip-chevron.svg
deleted file mode 100644
index 5f7cbe7153..0000000000
--- a/res/img/voip-chevron.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="22px" height="17px" viewBox="-1 -1 22 17" 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.4 (17249) - http://www.bohemiancoding.com/sketch -->
-    <title>Triangle 1</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(-912.000000, -693.000000)" fill="#76CFA6">
-            <polygon id="Triangle-1" sketch:type="MSShapeGroup" transform="translate(922.000000, 700.500000) scale(1, -1) translate(-922.000000, -700.500000) " points="922 693 932 708 912 708 "></polygon>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/res/img/voip-mute.png b/res/img/voip-mute.png
deleted file mode 100644
index a16d1001e5..0000000000
Binary files a/res/img/voip-mute.png and /dev/null differ
diff --git a/res/img/voip.png b/res/img/voip.png
deleted file mode 100644
index e8f05bcc37..0000000000
Binary files a/res/img/voip.png and /dev/null differ
diff --git a/res/img/warning.png b/res/img/warning.png
deleted file mode 100644
index c5553530a8..0000000000
Binary files a/res/img/warning.png and /dev/null differ
diff --git a/res/img/warning2.png b/res/img/warning2.png
deleted file mode 100644
index db0fd4a897..0000000000
Binary files a/res/img/warning2.png and /dev/null differ
diff --git a/res/img/zoom.png b/res/img/zoom.png
deleted file mode 100644
index f05ea959b4..0000000000
Binary files a/res/img/zoom.png and /dev/null differ
diff --git a/res/themes/dark-custom/css/dark-custom.scss b/res/themes/dark-custom/css/dark-custom.scss
index 03ceef45c6..a5fed6a320 100644
--- a/res/themes/dark-custom/css/dark-custom.scss
+++ b/res/themes/dark-custom/css/dark-custom.scss
@@ -1,7 +1,7 @@
 @import "../../../../res/css/_font-sizes.scss";
-@import "../../light/css/_paths.scss";
-@import "../../light/css/_fonts.scss";
-@import "../../light/css/_light.scss";
-@import "../../dark/css/_dark.scss";
+@import "../../legacy-light/css/_paths.scss";
+@import "../../legacy-light/css/_fonts.scss";
+@import "../../legacy-light/css/_legacy-light.scss";
+@import "../../legacy-dark/css/_legacy-dark.scss";
 @import "../../light-custom/css/_custom.scss";
 @import "../../../../res/css/_components.scss";
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index 6224c0820f..d48abf6a4c 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -1,14 +1,14 @@
 // unified palette
 // try to use these colors when possible
-$bg-color: #181b21;
-$base-color: #15171b;
-$base-text-color: #edf3ff;
-$header-panel-bg-color: #22262e;
+$bg-color: #15191E;
+$base-color: $bg-color;
+$base-text-color: #ffffff;
+$header-panel-bg-color: #20252B;
 $header-panel-border-color: #000000;
-$header-panel-text-primary-color: #a1b2d1;
+$header-panel-text-primary-color: #B9BEC6;
 $header-panel-text-secondary-color: #c8c8cd;
-$text-primary-color: #edf3ff;
-$text-secondary-color: #a1b2d1;
+$text-primary-color: #ffffff;
+$text-secondary-color: #B9BEC6;
 $search-bg-color: #181b21;
 $search-placeholder-color: #61708b;
 $room-highlight-color: #343a46;
@@ -18,6 +18,10 @@ $primary-fg-color: $text-primary-color;
 $primary-bg-color: $bg-color;
 $muted-fg-color: $header-panel-text-primary-color;
 
+// additional text colors
+$secondary-fg-color: #A9B2BC;
+$tertiary-fg-color: #8E99A4;
+
 // used for dialog box text
 $light-fg-color: $header-panel-text-secondary-color;
 
@@ -35,19 +39,20 @@ $info-plinth-fg-color: #888;
 
 $preview-bar-bg-color: $header-panel-bg-color;
 
-$tagpanel-bg-color: $base-color;
+$tagpanel-bg-color: rgba(38, 39, 43, 0.82);
+$inverted-bg-color: $base-color;
 
 // used by AddressSelector
 $selected-color: $room-highlight-color;
 
 // selected for hoverover & selected event tiles
-$event-selected-color: $header-panel-bg-color;
+$event-selected-color: #21262c;
 
 // used for the hairline dividers in RoomView
-$primary-hairline-color: $header-panel-border-color;
+$primary-hairline-color: transparent;
 
 // used for the border of input text fields
-$input-border-color: #e7e7e7;
+$input-border-color: rgba(231, 231, 231, 0.2);
 $input-darker-bg-color: $search-bg-color;
 $input-darker-fg-color: $search-placeholder-color;
 $input-lighter-bg-color: #f2f5f8;
@@ -91,27 +96,38 @@ $settings-subsection-fg-color: $text-secondary-color;
 
 $topleftmenu-color: $text-primary-color;
 $roomheader-color: $text-primary-color;
-$roomheader-addroom-bg-color: #3c4556; // $search-placeholder-color at 0.5 opacity
+$roomheader-bg-color: $bg-color;
+$roomheader-addroom-bg-color: rgba(92, 100, 112, 0.3);
 $roomheader-addroom-fg-color: $text-primary-color;
 $tagpanel-button-color: $header-panel-text-primary-color;
-$roomheader-button-color: $header-panel-text-primary-color;
 $groupheader-button-color: $header-panel-text-primary-color;
 $rightpanel-button-color: $header-panel-text-primary-color;
-$composer-button-color: $header-panel-text-primary-color;
+$icon-button-color: #8E99A4;
 $roomtopic-color: $text-secondary-color;
 $eventtile-meta-color: $roomtopic-color;
 
 $header-divider-color: $header-panel-text-primary-color;
+$composer-e2e-icon-color: $header-panel-text-primary-color;
 
-$roomtile-name-color: $header-panel-text-primary-color;
-$roomtile-selected-color: $text-primary-color;
-$roomtile-notified-color: $text-primary-color;
-$roomtile-selected-bg-color: $room-highlight-color;
-$roomtile-focused-bg-color: $room-highlight-color;
+// ********************
 
-$roomtile-transparent-focused-color: rgba(0, 0, 0, 0.1);
+$theme-button-bg-color: #e3e8f0;
 
-$panel-divider-color: $header-panel-border-color;
+$roomlist-button-bg-color: rgba(141, 151, 165, 0.2); // Buttons include the filter box, explore button, and sublist buttons
+$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;
+
+$roomtile-preview-color: $secondary-fg-color;
+$roomtile-default-badge-bg-color: #61708b;
+$roomtile-selected-bg-color: rgba(141, 151, 165, 0.2);
+
+// ********************
+
+$notice-secondary-color: $roomlist-header-color;
+
+$panel-divider-color: transparent;
 
 $widget-menu-bar-bg-color: $header-panel-bg-color;
 
@@ -180,6 +196,15 @@ $breadcrumb-placeholder-bg-color: #272c35;
 
 $user-tile-hover-bg-color: $header-panel-bg-color;
 
+// Appearance tab colors
+$appearance-tab-border-color: $room-highlight-color;
+
+// blur amounts for left left panel (only for element theme, used in _mods.scss)
+$roomlist-background-blur-amount: 60px;
+$tagpanel-background-blur-amount: 30px;
+
+$composer-shadow-color: rgba(0, 0, 0, 0.28);
+
 // ***** Mixins! *****
 
 @define-mixin mx_DialogButton {
diff --git a/res/themes/dark/css/dark.scss b/res/themes/dark/css/dark.scss
index d81db4595f..6d9dc7352c 100644
--- a/res/themes/dark/css/dark.scss
+++ b/res/themes/dark/css/dark.scss
@@ -2,5 +2,10 @@
 @import "../../light/css/_paths.scss";
 @import "../../light/css/_fonts.scss";
 @import "../../light/css/_light.scss";
+// important this goes before _mods,
+// as $tagpanel-background-blur-amount and
+// $roomlist-background-blur-amount
+// are overridden in _dark.scss
 @import "_dark.scss";
+@import "../../light/css/_mods.scss";
 @import "../../../../res/css/_components.scss";
diff --git a/res/themes/legacy-dark/css/_legacy-dark.scss b/res/themes/legacy-dark/css/_legacy-dark.scss
new file mode 100644
index 0000000000..4ab5f99942
--- /dev/null
+++ b/res/themes/legacy-dark/css/_legacy-dark.scss
@@ -0,0 +1,275 @@
+// unified palette
+// try to use these colors when possible
+$bg-color: #181b21;
+$base-color: #15171b;
+$base-text-color: #edf3ff;
+$header-panel-bg-color: #22262e;
+$header-panel-border-color: #000000;
+$header-panel-text-primary-color: #a1b2d1;
+$header-panel-text-secondary-color: #c8c8cd;
+$text-primary-color: #edf3ff;
+$text-secondary-color: #a1b2d1;
+$search-bg-color: #181b21;
+$search-placeholder-color: #61708b;
+$room-highlight-color: #343a46;
+
+// typical text (dark-on-white in light skin)
+$primary-fg-color: $text-primary-color;
+$secondary-fg-color: $primary-fg-color;
+$tertiary-fg-color: $primary-fg-color;
+$primary-bg-color: $bg-color;
+$muted-fg-color: $header-panel-text-primary-color;
+
+// used for dialog box text
+$light-fg-color: $header-panel-text-secondary-color;
+
+// used for focusing form controls
+$focus-bg-color: $room-highlight-color;
+
+$mention-user-pill-bg-color: $warning-color;
+$other-user-pill-bg-color: $room-highlight-color;
+$rte-room-pill-color: $room-highlight-color;
+$rte-group-pill-color: $room-highlight-color;
+
+// informational plinth
+$info-plinth-bg-color: $header-panel-bg-color;
+$info-plinth-fg-color: #888;
+
+$preview-bar-bg-color: $header-panel-bg-color;
+
+$tagpanel-bg-color: $base-color;
+$inverted-bg-color: $tagpanel-bg-color;
+
+// used by AddressSelector
+$selected-color: $room-highlight-color;
+
+// selected for hoverover & selected event tiles
+$event-selected-color: $header-panel-bg-color;
+
+// used for the hairline dividers in RoomView
+$primary-hairline-color: $header-panel-border-color;
+
+// used for the border of input text fields
+$input-border-color: #e7e7e7;
+$input-darker-bg-color: $search-bg-color;
+$input-darker-fg-color: $search-placeholder-color;
+$input-lighter-bg-color: #f2f5f8;
+$input-lighter-fg-color: $input-darker-fg-color;
+$input-focused-border-color: #238cf5;
+$input-valid-border-color: $accent-color;
+$input-invalid-border-color: $warning-color;
+
+$field-focused-label-bg-color: $bg-color;
+
+// scrollbars
+$scrollbar-thumb-color: rgba(255, 255, 255, 0.2);
+$scrollbar-track-color: transparent;
+
+// context menus
+$menu-border-color: $header-panel-border-color;
+$menu-bg-color: $header-panel-bg-color;
+$menu-box-shadow-color: $bg-color;
+$menu-selected-color: $room-highlight-color;
+
+$avatar-initial-color: #ffffff;
+$avatar-bg-color: $bg-color;
+
+$h3-color: $primary-fg-color;
+
+$dialog-title-fg-color: $base-text-color;
+$dialog-backdrop-color: #000;
+$dialog-shadow-color: rgba(0, 0, 0, 0.48);
+$dialog-close-fg-color: #9fa9ba;
+
+$dialog-background-bg-color: $header-panel-bg-color;
+$lightbox-background-bg-color: #000;
+
+$settings-grey-fg-color: #a2a2a2;
+$settings-profile-placeholder-bg-color: #e7e7e7;
+$settings-profile-overlay-bg-color: #000;
+$settings-profile-overlay-placeholder-bg-color: transparent;
+$settings-profile-overlay-fg-color: #fff;
+$settings-profile-overlay-placeholder-fg-color: #454545;
+$settings-subsection-fg-color: $text-secondary-color;
+
+$topleftmenu-color: $text-primary-color;
+$roomheader-color: $text-primary-color;
+$roomheader-addroom-bg-color: #3c4556; // $search-placeholder-color at 0.5 opacity
+$roomheader-addroom-fg-color: $text-primary-color;
+$tagpanel-button-color: $header-panel-text-primary-color;
+$groupheader-button-color: $header-panel-text-primary-color;
+$rightpanel-button-color: $header-panel-text-primary-color;
+$icon-button-color: $header-panel-text-primary-color;
+$roomtopic-color: $text-secondary-color;
+$eventtile-meta-color: $roomtopic-color;
+
+$header-divider-color: $header-panel-text-primary-color;
+$composer-e2e-icon-color: $header-panel-text-primary-color;
+
+// ********************
+
+$theme-button-bg-color: #e3e8f0;
+
+$roomlist-button-bg-color: #1A1D23; // Buttons include the filter box, explore button, and sublist buttons
+$roomlist-filter-active-bg-color: $roomlist-button-bg-color;
+$roomlist-bg-color: $header-panel-bg-color;
+
+$roomsublist-divider-color: $primary-fg-color;
+
+$roomtile-preview-color: #9e9e9e;
+$roomtile-default-badge-bg-color: #61708b;
+$roomtile-selected-bg-color: #1A1D23;
+
+// ********************
+
+$panel-divider-color: $header-panel-border-color;
+
+$widget-menu-bar-bg-color: $header-panel-bg-color;
+
+// event tile lifecycle
+$event-sending-color: $text-secondary-color;
+
+// event redaction
+$event-redacted-fg-color: #606060;
+$event-redacted-border-color: #000000;
+
+$event-highlight-fg-color: $warning-color;
+$event-highlight-bg-color: #25271F;
+
+// event timestamp
+$event-timestamp-color: $text-secondary-color;
+
+// Tabbed views
+$tab-label-fg-color: $text-primary-color;
+$tab-label-active-fg-color: $text-primary-color;
+$tab-label-bg-color: transparent;
+$tab-label-active-bg-color: $accent-color;
+$tab-label-icon-bg-color: $text-primary-color;
+$tab-label-active-icon-bg-color: $text-primary-color;
+
+// Buttons
+$button-primary-fg-color: #ffffff;
+$button-primary-bg-color: $accent-color;
+$button-secondary-bg-color: transparent;
+$button-danger-fg-color: #ffffff;
+$button-danger-bg-color: $notice-primary-color;
+$button-danger-disabled-fg-color: #ffffff;
+$button-danger-disabled-bg-color: #f5b6bb; // TODO: Verify color
+$button-link-fg-color: $accent-color;
+$button-link-bg-color: transparent;
+
+// Toggle switch
+$togglesw-off-color: $room-highlight-color;
+
+$visual-bell-bg-color: #800;
+
+$room-warning-bg-color: $header-panel-bg-color;
+
+$dark-panel-bg-color: $header-panel-bg-color;
+$panel-gradient: rgba(34, 38, 46, 0), rgba(34, 38, 46, 1);
+
+$message-action-bar-bg-color: $header-panel-bg-color;
+$message-action-bar-fg-color: $header-panel-text-primary-color;
+$message-action-bar-border-color: #616b7f;
+$message-action-bar-hover-border-color: $header-panel-text-primary-color;
+
+$reaction-row-button-bg-color: $header-panel-bg-color;
+$reaction-row-button-border-color: #616b7f;
+$reaction-row-button-hover-border-color: $header-panel-text-primary-color;
+$reaction-row-button-selected-bg-color: #1f6954;
+$reaction-row-button-selected-border-color: $accent-color;
+
+$kbd-border-color: #000000;
+
+$tooltip-timeline-bg-color: $tagpanel-bg-color;
+$tooltip-timeline-fg-color: #ffffff;
+
+$interactive-tooltip-bg-color: $base-color;
+$interactive-tooltip-fg-color: #ffffff;
+
+$breadcrumb-placeholder-bg-color: #272c35;
+
+$user-tile-hover-bg-color: $header-panel-bg-color;
+
+// Appearance tab colors
+$appearance-tab-border-color: $room-highlight-color;
+
+$composer-shadow-color: tranparent;
+
+// ***** Mixins! *****
+
+@define-mixin mx_DialogButton {
+    /* align images in buttons (eg spinners) */
+    vertical-align: middle;
+    border: 0px;
+    border-radius: 4px;
+    font-family: $font-family;
+    font-size: $font-14px;
+    color: $button-fg-color;
+    background-color: $button-bg-color;
+    width: auto;
+    padding: 7px;
+    padding-left: 1.5em;
+    padding-right: 1.5em;
+    cursor: pointer;
+    display: inline-block;
+    outline: none;
+}
+
+@define-mixin mx_DialogButton_danger {
+    background-color: $accent-color;
+}
+
+@define-mixin mx_DialogButton_secondary {
+    // flip colours for the secondary ones
+    font-weight: 600;
+    border: 1px solid $accent-color ! important;
+    color: $accent-color;
+    background-color: $button-secondary-bg-color;
+}
+
+@define-mixin mx_Dialog_link {
+    color: $accent-color;
+    text-decoration: none;
+}
+
+// Nasty hacks to apply a filter to arbitrary monochrome artwork to make it
+// better match the theme.  Typically applied to dark grey 'off' buttons or
+// light grey 'on' buttons.
+.mx_filterFlipColor {
+    filter: invert(1);
+}
+
+// markdown overrides:
+.mx_EventTile_content .markdown-body pre:hover {
+    border-color: #808080 !important; // inverted due to rules below
+}
+.mx_EventTile_content .markdown-body {
+    pre, code {
+        filter: invert(1);
+    }
+
+    pre code {
+        filter: none;
+    }
+
+    table {
+        tr {
+            background-color: #000000;
+        }
+
+        tr:nth-child(2n) {
+            background-color: #080808;
+        }
+    }
+}
+
+// diff highlight colors
+// intentionally swapped to avoid inversion
+.hljs-addition {
+    background: #fdd;
+}
+
+.hljs-deletion {
+    background: #dfd;
+}
diff --git a/res/themes/legacy-dark/css/legacy-dark.scss b/res/themes/legacy-dark/css/legacy-dark.scss
new file mode 100644
index 0000000000..2a4d432d26
--- /dev/null
+++ b/res/themes/legacy-dark/css/legacy-dark.scss
@@ -0,0 +1,6 @@
+@import "../../../../res/css/_font-sizes.scss";
+@import "../../legacy-light/css/_paths.scss";
+@import "../../legacy-light/css/_fonts.scss";
+@import "../../legacy-light/css/_legacy-light.scss";
+@import "_legacy-dark.scss";
+@import "../../../../res/css/_components.scss";
diff --git a/res/themes/legacy-light/css/_fonts.scss b/res/themes/legacy-light/css/_fonts.scss
new file mode 100644
index 0000000000..1bc9b5a4a3
--- /dev/null
+++ b/res/themes/legacy-light/css/_fonts.scss
@@ -0,0 +1,84 @@
+/*
+ * Nunito.
+ * Includes extended Latin and Vietnamese character sets
+ * Current URLs are taken from
+ * https://github.com/alexeiva/NunitoFont/releases/tag/v3.500
+ * ...in order to include cyrillic.
+ *
+ * Previously, they were
+ * https://fonts.googleapis.com/css?family=Nunito:400,400i,600,600i,700,700i&subset=latin-ext,vietnamese
+ *
+ * We explicitly do not include Nunito's italic variants, as they are not italic enough
+ * and it's better to rely on the browser's built-in obliquing behaviour.
+ */
+
+/* the 'src' links are relative to the bundle.css, which is in a subdirectory.
+ */
+@font-face {
+    font-family: 'Nunito';
+    font-style: normal;
+    font-weight: 400;
+    src: url('$(res)/fonts/Nunito/Nunito-Regular.ttf') format('truetype');
+}
+@font-face {
+    font-family: 'Nunito';
+    font-style: normal;
+    font-weight: 600;
+    src: url('$(res)/fonts/Nunito/Nunito-SemiBold.ttf') format('truetype');
+}
+@font-face {
+    font-family: 'Nunito';
+    font-style: normal;
+    font-weight: 700;
+    src: url('$(res)/fonts/Nunito/Nunito-Bold.ttf') format('truetype');
+}
+
+/* latin-ext */
+@font-face {
+    font-family: 'Inconsolata';
+    font-style: normal;
+    font-weight: 400;
+    src: local('Inconsolata Regular'), local('Inconsolata-Regular'), url('$(res)/fonts/Inconsolata/QldKNThLqRwH-OJ1UHjlKGlX5qhExfHwNJU.woff2') format('woff2');
+    unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+    font-family: 'Inconsolata';
+    font-style: normal;
+    font-weight: 400;
+    font-display: swap;
+    src: local('Inconsolata Regular'), local('Inconsolata-Regular'), url('$(res)/fonts/Inconsolata/QldKNThLqRwH-OJ1UHjlKGlZ5qhExfHw.woff2') format('woff2');
+    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin-ext */
+@font-face {
+    font-family: 'Inconsolata';
+    font-style: normal;
+    font-weight: 700;
+    font-display: swap;
+    src: local('Inconsolata Bold'), local('Inconsolata-Bold'), url('$(res)/fonts/Inconsolata/QldXNThLqRwH-OJ1UHjlKGHiw71n5_zaDpwm80E.woff2') format('woff2');
+    unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+    font-family: 'Inconsolata';
+    font-style: normal;
+    font-weight: 700;
+    font-display: swap;
+    src: local('Inconsolata Bold'), local('Inconsolata-Bold'), url('$(res)/fonts/Inconsolata/QldXNThLqRwH-OJ1UHjlKGHiw71p5_zaDpwm.woff2') format('woff2');
+    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* a COLR/CPAL version of Twemoji used for consistent cross-browser emoji
+ * taken from https://github.com/mozilla/twemoji-colr
+ * using the fix from https://github.com/mozilla/twemoji-colr/issues/50 to
+ * work on macOS
+ */
+/*
+// except we now load it dynamically via FontManager to handle browsers
+// which can't render COLR/CPAL still
+@font-face {
+    font-family: "Twemoji Mozilla";
+    src: url('$(res)/fonts/Twemoji_Mozilla/TwemojiMozilla.woff2') format('woff2');
+}
+*/
\ No newline at end of file
diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss
new file mode 100644
index 0000000000..6e66964fdf
--- /dev/null
+++ b/res/themes/legacy-light/css/_legacy-light.scss
@@ -0,0 +1,375 @@
+// XXX: check this?
+/* Nunito lacks combining diacritics, so these will fall through
+   to the next font.  Helevetica's diacritics however do not combine
+   nicely (on OSX, at least) and result in a huge horizontal mess.
+   Arial empirically gets it right, hence prioritising Arial here. */
+/* We fall through to Twemoji for emoji rather than falling through
+   to native Emoji fonts (if any) to ensure cross-browser consistency */
+/* Noto Color Emoji contains digits, in fixed-width, therefore causing
+   digits in flowed text to stand out.
+   TODO: Consider putting all emoji fonts to the end rather than the front. */
+$font-family: Nunito, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', Arial, Helvetica, Sans-Serif, 'Noto Color Emoji';
+
+$monospace-font-family: Inconsolata, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', Courier, monospace, 'Noto Color Emoji';
+
+// unified palette
+// try to use these colors when possible
+$accent-color: #03b381;
+$accent-bg-color: rgba(3, 179, 129, 0.16);
+$notice-primary-color: #ff4b55;
+$notice-primary-bg-color: rgba(255, 75, 85, 0.16);
+$notice-secondary-color: #61708b;
+$header-panel-bg-color: #f3f8fd;
+
+// typical text (dark-on-white in light skin)
+$primary-fg-color: #2e2f32;
+$secondary-fg-color: $primary-fg-color;
+$tertiary-fg-color: $primary-fg-color;
+$primary-bg-color: #ffffff;
+$muted-fg-color: #61708b; // Commonly used in headings and relevant alt text
+
+// used for dialog box text
+$light-fg-color: #747474;
+
+// used for focusing form controls
+$focus-bg-color: #dddddd;
+
+// button UI (white-on-green in light skin)
+$accent-fg-color: #ffffff;
+$accent-color-50pct: rgba(3, 179, 129, 0.5);    //#03b381 in rgb
+$accent-color-darker: #92caad;
+$accent-color-alt: #238cf5;
+
+$selection-fg-color: $primary-bg-color;
+
+$focus-brightness: 105%;
+
+// warning colours
+$warning-color: $notice-primary-color; // red
+$orange-warning-color: #ff8d13; // used for true warnings
+// background colour for warnings
+$warning-bg-color: #df2a8b;
+$info-bg-color: #2a9edf;
+$mention-user-pill-bg-color: $warning-color;
+$other-user-pill-bg-color: rgba(0, 0, 0, 0.1);
+
+// pinned events indicator
+$pinned-unread-color: $notice-primary-color;
+$pinned-color: $notice-secondary-color;
+
+// informational plinth
+$info-plinth-bg-color: #f7f7f7;
+$info-plinth-fg-color: #888;
+
+$preview-bar-bg-color: #f7f7f7;
+
+// left-panel style muted accent color
+$secondary-accent-color: #f2f5f8;
+$tertiary-accent-color: #d3efe1;
+
+$tagpanel-bg-color: #27303a;
+$inverted-bg-color: $tagpanel-bg-color;
+
+// used by RoomDirectory permissions
+$plinth-bg-color: $secondary-accent-color;
+
+// used by RoomDropTarget
+$droptarget-bg-color: rgba(255, 255, 255, 0.5);
+
+// used by AddressSelector
+$selected-color: $secondary-accent-color;
+
+// selected for hoverover & selected event tiles
+$event-selected-color: $header-panel-bg-color;
+
+// used for the hairline dividers in RoomView
+$primary-hairline-color: #e5e5e5;
+
+// used for the border of input text fields
+$input-border-color: #e7e7e7;
+$input-darker-bg-color: #e3e8f0;
+$input-darker-fg-color: #9fa9ba;
+$input-lighter-bg-color: #f2f5f8;
+$input-lighter-fg-color: $input-darker-fg-color;
+$input-focused-border-color: #238cf5;
+$input-valid-border-color: $accent-color;
+$input-invalid-border-color: $warning-color;
+
+$field-focused-label-bg-color: #ffffff;
+
+$button-bg-color: $accent-color;
+$button-fg-color: white;
+
+// apart from login forms, which have stronger border
+$strong-input-border-color: #c7c7c7;
+
+// used for UserSettings EditableText
+$input-underline-color: rgba(151, 151, 151, 0.5);
+$input-fg-color: rgba(74, 74, 74, 0.9);
+// scrollbars
+$scrollbar-thumb-color: rgba(0, 0, 0, 0.2);
+$scrollbar-track-color: transparent;
+// context menus
+$menu-border-color: #e7e7e7;
+$menu-bg-color: #fff;
+$menu-box-shadow-color: rgba(118, 131, 156, 0.6);
+$menu-selected-color: #f5f8fa;
+
+$avatar-initial-color: #ffffff;
+$avatar-bg-color: #ffffff;
+
+$h3-color: #3d3b39;
+
+$dialog-title-fg-color: #45474a;
+$dialog-backdrop-color: rgba(46, 48, 51, 0.38);
+$dialog-shadow-color: rgba(0, 0, 0, 0.48);
+$dialog-close-fg-color: #c1c1c1;
+
+$dialog-background-bg-color: #e9e9e9;
+$lightbox-background-bg-color: #000;
+
+$imagebody-giflabel: rgba(0, 0, 0, 0.7);
+$imagebody-giflabel-border: rgba(0, 0, 0, 0.2);
+$imagebody-giflabel-color: rgba(255, 255, 255, 1);
+
+$greyed-fg-color: #888;
+
+$neutral-badge-color: #dbdbdb;
+
+$preview-widget-bar-color: #ddd;
+$preview-widget-fg-color: $greyed-fg-color;
+
+$blockquote-bar-color: #ddd;
+$blockquote-fg-color: #777;
+
+$settings-grey-fg-color: #a2a2a2;
+$settings-profile-placeholder-bg-color: #e7e7e7;
+$settings-profile-overlay-bg-color: #000;
+$settings-profile-overlay-placeholder-bg-color: transparent;
+$settings-profile-overlay-fg-color: #fff;
+$settings-profile-overlay-placeholder-fg-color: #2e2f32;
+$settings-subsection-fg-color: #61708b;
+
+$voip-decline-color: #f48080;
+$voip-accept-color: #80f480;
+
+$rte-bg-color: #e9e9e9;
+$rte-code-bg-color: rgba(0, 0, 0, 0.04);
+$rte-room-pill-color: #aaa;
+$rte-group-pill-color: #aaa;
+
+$topleftmenu-color: #212121;
+$roomheader-color: #45474a;
+$roomheader-bg-color: $primary-bg-color;
+$roomheader-addroom-bg-color: #91a1c0;
+$roomheader-addroom-fg-color: $accent-fg-color;
+$tagpanel-button-color: #91a1c0;
+$groupheader-button-color: #91a1c0;
+$rightpanel-button-color: #91a1c0;
+$icon-button-color: #91a1c0;
+$roomtopic-color: #9e9e9e;
+$eventtile-meta-color: $roomtopic-color;
+
+$composer-e2e-icon-color: #91a1c0;
+$header-divider-color: #91a1c0;
+
+// ********************
+
+$theme-button-bg-color: #e3e8f0;
+
+$roomlist-button-bg-color: #fff; // Buttons include the filter box, explore button, and sublist buttons
+$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;
+
+$roomtile-preview-color: #9e9e9e;
+$roomtile-default-badge-bg-color: #61708b;
+$roomtile-selected-bg-color: #fff;
+
+$presence-online: $accent-color;
+$presence-away: #d9b072;
+$presence-offline: #e3e8f0;
+
+// ********************
+
+$username-variant1-color: #368bd6;
+$username-variant2-color: #ac3ba8;
+$username-variant3-color: #03b381;
+$username-variant4-color: #e64f7a;
+$username-variant5-color: #ff812d;
+$username-variant6-color: #2dc2c5;
+$username-variant7-color: #5c56f5;
+$username-variant8-color: #74d12c;
+
+$panel-divider-color: #dee1f3;
+
+// ********************
+
+$widget-menu-bar-bg-color: $secondary-accent-color;
+
+// ********************
+
+// both $event-highlight-bg-color and $room-warning-bg-color share this value,
+// so to not make their order dependent on who depends on who, have a shared value
+// defined before both
+$yellow-background: #fff8e3;
+
+// event tile lifecycle
+$event-encrypting-color: #abddbc;
+$event-sending-color: #ddd;
+$event-notsent-color: #f44;
+
+$event-highlight-fg-color: $warning-color;
+$event-highlight-bg-color: $yellow-background;
+
+// event redaction
+$event-redacted-fg-color: #e2e2e2;
+$event-redacted-border-color: #cccccc;
+
+// event timestamp
+$event-timestamp-color: #acacac;
+
+$copy-button-url: "$(res)/img/feather-customised/clipboard.svg";
+
+
+// e2e
+$e2e-verified-color: #76cfa5; // N.B. *NOT* the same as $accent-color
+$e2e-unknown-color: #e8bf37;
+$e2e-unverified-color: #e8bf37;
+$e2e-warning-color: #ba6363;
+
+/*** ImageView ***/
+$lightbox-bg-color: #454545;
+$lightbox-fg-color: #ffffff;
+$lightbox-border-color: #ffffff;
+
+// Tabbed views
+$tab-label-fg-color: #45474a;
+$tab-label-active-fg-color: #ffffff;
+$tab-label-bg-color: transparent;
+$tab-label-active-bg-color: $accent-color;
+$tab-label-icon-bg-color: #454545;
+$tab-label-active-icon-bg-color: $tab-label-active-fg-color;
+
+// Buttons
+$button-primary-fg-color: #ffffff;
+$button-primary-bg-color: $accent-color;
+$button-secondary-bg-color: $accent-fg-color;
+$button-danger-fg-color: #ffffff;
+$button-danger-bg-color: $notice-primary-color;
+$button-danger-disabled-fg-color: #ffffff;
+$button-danger-disabled-bg-color: #f5b6bb; // TODO: Verify color
+$button-link-fg-color: $accent-color;
+$button-link-bg-color: transparent;
+
+$visual-bell-bg-color: #faa;
+
+// Toggle switch
+$togglesw-off-color: #c1c9d6;
+$togglesw-on-color: $accent-color;
+$togglesw-ball-color: #fff;
+
+// Slider
+$slider-selection-color: $accent-color;
+$slider-background-color: #c1c9d6;
+
+$progressbar-color: #000;
+
+$room-warning-bg-color: $yellow-background;
+
+$memberstatus-placeholder-color: $muted-fg-color;
+
+$authpage-bg-color: #2e3649;
+$authpage-modal-bg-color: rgba(255, 255, 255, 0.59);
+$authpage-body-bg-color: #ffffff;
+$authpage-focus-bg-color: #dddddd;
+$authpage-lang-color: #4e5054;
+$authpage-primary-color: #232f32;
+$authpage-secondary-color: #61708b;
+
+$dark-panel-bg-color: $secondary-accent-color;
+$panel-gradient: rgba(242, 245, 248, 0), rgba(242, 245, 248, 1);
+
+$message-action-bar-bg-color: $primary-bg-color;
+$message-action-bar-fg-color: $primary-fg-color;
+$message-action-bar-border-color: #e9edf1;
+$message-action-bar-hover-border-color: $focus-bg-color;
+
+$reaction-row-button-bg-color: $header-panel-bg-color;
+$reaction-row-button-border-color: #e9edf1;
+$reaction-row-button-hover-border-color: $focus-bg-color;
+$reaction-row-button-selected-bg-color: #e9fff9;
+$reaction-row-button-selected-border-color: $accent-color;
+
+$kbd-border-color: $reaction-row-button-border-color;
+
+$tooltip-timeline-bg-color: $tagpanel-bg-color;
+$tooltip-timeline-fg-color: #ffffff;
+
+$interactive-tooltip-bg-color: #27303a;
+$interactive-tooltip-fg-color: #ffffff;
+
+$breadcrumb-placeholder-bg-color: #e8eef5;
+
+$user-tile-hover-bg-color: $header-panel-bg-color;
+
+// FontSlider colors
+$appearance-tab-border-color: $input-darker-bg-color;
+
+$composer-shadow-color: tranparent;
+
+// ***** Mixins! *****
+
+@define-mixin mx_DialogButton {
+    /* align images in buttons (eg spinners) */
+    vertical-align: middle;
+    border: 0px;
+    border-radius: 4px;
+    font-family: $font-family;
+    font-size: $font-14px;
+    color: $button-fg-color;
+    background-color: $button-bg-color;
+    width: auto;
+    padding: 7px;
+    padding-left: 1.5em;
+    padding-right: 1.5em;
+    cursor: pointer;
+    display: inline-block;
+    outline: none;
+}
+
+@define-mixin mx_DialogButton_hover {
+}
+
+@define-mixin mx_DialogButton_danger {
+    background-color: $accent-color;
+}
+
+@define-mixin mx_DialogButton_small {
+    @mixin mx_DialogButton;
+    font-size: $font-15px;
+    padding: 0px 1.5em 0px 1.5em;
+}
+
+@define-mixin mx_DialogButton_secondary {
+    // flip colours for the secondary ones
+    font-weight: 600;
+    border: 1px solid $accent-color ! important;
+    color: $accent-color;
+    background-color: $button-secondary-bg-color;
+}
+
+@define-mixin mx_Dialog_link {
+    color: $accent-color;
+    text-decoration: none;
+}
+
+// diff highlight colors
+.hljs-addition {
+    background: #dfd;
+}
+
+.hljs-deletion {
+    background: #fdd;
+}
diff --git a/res/themes/legacy-light/css/_paths.scss b/res/themes/legacy-light/css/_paths.scss
new file mode 100644
index 0000000000..3944076004
--- /dev/null
+++ b/res/themes/legacy-light/css/_paths.scss
@@ -0,0 +1,3 @@
+// Path from root SCSS file (such as `light.scss`) to `res` dir in the source tree
+// This value is overridden by external themes in `element-web`.
+$res: ../../..;
diff --git a/res/themes/legacy-light/css/legacy-light.scss b/res/themes/legacy-light/css/legacy-light.scss
new file mode 100644
index 0000000000..e39a1765f3
--- /dev/null
+++ b/res/themes/legacy-light/css/legacy-light.scss
@@ -0,0 +1,5 @@
+@import "../../../../res/css/_font-sizes.scss";
+@import "_paths.scss";
+@import "_fonts.scss";
+@import "_legacy-light.scss";
+@import "../../../../res/css/_components.scss";
diff --git a/res/themes/light-custom/css/_custom.scss b/res/themes/light-custom/css/_custom.scss
index 6206496150..b830e86e02 100644
--- a/res/themes/light-custom/css/_custom.scss
+++ b/res/themes/light-custom/css/_custom.scss
@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+$font-family: var(--font-family, $font-family);
+$monospace-font-family: var(--font-family-monospace, $monospace-font-family);
 //
 // --accent-color
 $accent-color: var(--accent-color);
@@ -23,7 +25,6 @@ $button-link-fg-color: var(--accent-color);
 $button-primary-bg-color: var(--accent-color);
 $input-valid-border-color: var(--accent-color);
 $reaction-row-button-selected-border-color: var(--accent-color);
-$roomsublist-chevron-color: var(--accent-color);
 $tab-label-active-bg-color: var(--accent-color);
 $togglesw-on-color: var(--accent-color);
 $username-variant3-color: var(--accent-color);
@@ -38,10 +39,10 @@ $menu-bg-color: var(--timeline-background-color);
 $avatar-bg-color: var(--timeline-background-color);
 $message-action-bar-bg-color: var(--timeline-background-color);
 $primary-bg-color: var(--timeline-background-color);
-$roomtile-focused-bg-color: var(--timeline-background-color);
 $togglesw-ball-color: var(--timeline-background-color);
 $droptarget-bg-color: var(--timeline-background-color-50pct); //still needs alpha at .5
 $authpage-modal-bg-color: var(--timeline-background-color-50pct); //still needs alpha at .59
+$roomheader-bg-color: var(--timeline-background-color);
 //
 // --roomlist-highlights-color
 $roomtile-selected-bg-color: var(--roomlist-highlights-color);
@@ -51,6 +52,7 @@ $interactive-tooltip-bg-color: var(--sidebar-color);
 $tagpanel-bg-color: var(--sidebar-color);
 $tooltip-timeline-bg-color: var(--sidebar-color);
 $dialog-backdrop-color: var(--sidebar-color-50pct);
+$roomlist-button-bg-color: var(--sidebar-color-15pct);
 //
 // --roomlist-background-color
 $header-panel-bg-color: var(--roomlist-background-color);
@@ -60,11 +62,10 @@ $panel-gradient: var(--roomlist-background-color-0pct), var(--roomlist-backgroun
 $dark-panel-bg-color: var(--roomlist-background-color);
 $input-lighter-bg-color: var(--roomlist-background-color);
 $plinth-bg-color: var(--roomlist-background-color);
-$roomsublist-background: var(--roomlist-background-color);
 $secondary-accent-color: var(--roomlist-background-color);
 $selected-color: var(--roomlist-background-color);
 $widget-menu-bar-bg-color: var(--roomlist-background-color);
-$roomtile-badge-fg-color: var(--roomlist-background-color);
+$roomlist-bg-color: var(--roomlist-background-color);
 //
 // --timeline-text-color
 $message-action-bar-fg-color: var(--timeline-text-color);
@@ -81,19 +82,17 @@ $tab-label-fg-color: var(--timeline-text-color);
 // was #4e5054
 $authpage-lang-color: var(--timeline-text-color);
 $roomheader-color: var(--timeline-text-color);
-//
-// --roomlist-text-color
-$roomtile-notified-color: var(--roomlist-text-color);
-$roomtile-selected-color: var(--roomlist-text-color);
-//
 // --roomlist-text-secondary-color
-$roomsublist-label-fg-color: var(--roomlist-text-secondary-color);
-$roomtile-name-color: var(--roomlist-text-secondary-color);
+$roomtile-preview-color: var(--roomlist-text-secondary-color);
+$roomlist-header-color: var(--roomlist-text-secondary-color);
+$roomtile-default-badge-bg-color: var(--roomlist-text-secondary-color);
+
 //
 // --roomlist-separator-color
 $input-darker-bg-color: var(--roomlist-separator-color);
 $panel-divider-color: var(--roomlist-separator-color);// originally #dee1f3, but close enough
 $primary-hairline-color: var(--roomlist-separator-color);// originally #e5e5e5, but close enough
+$roomsublist-divider-color: var(--roomlist-separator-color);
 //
 // --timeline-text-secondary-color
 $authpage-secondary-color: var(--timeline-text-secondary-color);
@@ -124,7 +123,8 @@ $notice-primary-color: var(--warning-color);
 $pinned-unread-color: var(--warning-color);
 $warning-color: var(--warning-color);
 $button-danger-disabled-bg-color: var(--warning-color-50pct); // still needs alpha at 0.5
-
+//
+// --username colors
 $username-variant1-color: var(--username-colors_1, $username-variant1-color);
 $username-variant2-color: var(--username-colors_2, $username-variant2-color);
 $username-variant3-color: var(--username-colors_3, $username-variant3-color);
@@ -133,6 +133,10 @@ $username-variant5-color: var(--username-colors_5, $username-variant5-color);
 $username-variant6-color: var(--username-colors_6, $username-variant6-color);
 $username-variant7-color: var(--username-colors_7, $username-variant7-color);
 $username-variant8-color: var(--username-colors_8, $username-variant8-color);
-
+//
+// --timeline-highlights-color
 $event-selected-color: var(--timeline-highlights-color);
 $event-highlight-bg-color: var(--timeline-highlights-color);
+//
+// redirect some variables away from their hardcoded values in the light theme
+$settings-grey-fg-color: $primary-fg-color;
diff --git a/res/themes/light-custom/css/light-custom.scss b/res/themes/light-custom/css/light-custom.scss
index 4f80647eba..6e9d0ff736 100644
--- a/res/themes/light-custom/css/light-custom.scss
+++ b/res/themes/light-custom/css/light-custom.scss
@@ -1,6 +1,6 @@
 @import "../../../../res/css/_font-sizes.scss";
-@import "../../light/css/_paths.scss";
-@import "../../light/css/_fonts.scss";
-@import "../../light/css/_light.scss";
+@import "../../legacy-light/css/_paths.scss";
+@import "../../legacy-light/css/_fonts.scss";
+@import "../../legacy-light/css/_legacy-light.scss";
 @import "_custom.scss";
 @import "../../../../res/css/_components.scss";
diff --git a/res/themes/light/css/_fonts.scss b/res/themes/light/css/_fonts.scss
index 1bc9b5a4a3..ba64830f15 100644
--- a/res/themes/light/css/_fonts.scss
+++ b/res/themes/light/css/_fonts.scss
@@ -1,36 +1,88 @@
-/*
- * Nunito.
- * Includes extended Latin and Vietnamese character sets
- * Current URLs are taken from
- * https://github.com/alexeiva/NunitoFont/releases/tag/v3.500
- * ...in order to include cyrillic.
- *
- * Previously, they were
- * https://fonts.googleapis.com/css?family=Nunito:400,400i,600,600i,700,700i&subset=latin-ext,vietnamese
- *
- * We explicitly do not include Nunito's italic variants, as they are not italic enough
- * and it's better to rely on the browser's built-in obliquing behaviour.
- */
-
 /* the 'src' links are relative to the bundle.css, which is in a subdirectory.
  */
+
+/* Inter unexpectedly contains various codepoints which collide with emoji, even
+   when variation-16 is applied to request the emoji variant.  From eyeballing
+   the emoji picker, these are: 20e3, 23cf, 24c2, 25a0-25c1, 2665, 2764, 2b06, 2b1c.
+   Therefore we define a unicode-range to load which excludes the glyphs
+   (to avoid having to maintain a fork of Inter). */
+
+$inter-unicode-range: U+0000-20e2,U+20e4-23ce,U+23d0-24c1,U+24c3-259f,U+25c2-2664,U+2666-2763,U+2765-2b05,U+2b07-2b1b,U+2b1d-10FFFF;
+
 @font-face {
-    font-family: 'Nunito';
-    font-style: normal;
-    font-weight: 400;
-    src: url('$(res)/fonts/Nunito/Nunito-Regular.ttf') format('truetype');
+  font-family: 'Inter';
+  font-style:  normal;
+  font-weight: 400;
+  font-display: swap;
+  unicode-range: $inter-unicode-range;
+  src: url("$(res)/fonts/Inter/Inter-Regular.woff2?v=3.13") format("woff2"),
+       url("$(res)/fonts/Inter/Inter-Regular.woff?v=3.13") format("woff");
 }
 @font-face {
-    font-family: 'Nunito';
-    font-style: normal;
-    font-weight: 600;
-    src: url('$(res)/fonts/Nunito/Nunito-SemiBold.ttf') format('truetype');
+  font-family: 'Inter';
+  font-style:  italic;
+  font-weight: 400;
+  font-display: swap;
+  unicode-range: $inter-unicode-range;
+  src: url("$(res)/fonts/Inter/Inter-Italic.woff2?v=3.13") format("woff2"),
+       url("$(res)/fonts/Inter/Inter-Italic.woff?v=3.13") format("woff");
+}
+
+@font-face {
+  font-family: 'Inter';
+  font-style:  normal;
+  font-weight: 500;
+  font-display: swap;
+  unicode-range: $inter-unicode-range;
+  src: url("$(res)/fonts/Inter/Inter-Medium.woff2?v=3.13") format("woff2"),
+       url("$(res)/fonts/Inter/Inter-Medium.woff?v=3.13") format("woff");
 }
 @font-face {
-    font-family: 'Nunito';
-    font-style: normal;
-    font-weight: 700;
-    src: url('$(res)/fonts/Nunito/Nunito-Bold.ttf') format('truetype');
+  font-family: 'Inter';
+  font-style:  italic;
+  font-weight: 500;
+  font-display: swap;
+  unicode-range: $inter-unicode-range;
+  src: url("$(res)/fonts/Inter/Inter-MediumItalic.woff2?v=3.13") format("woff2"),
+       url("$(res)/fonts/Inter/Inter-MediumItalic.woff?v=3.13") format("woff");
+}
+
+@font-face {
+  font-family: 'Inter';
+  font-style:  normal;
+  font-weight: 600;
+  font-display: swap;
+  unicode-range: $inter-unicode-range;
+  src: url("$(res)/fonts/Inter/Inter-SemiBold.woff2?v=3.13") format("woff2"),
+       url("$(res)/fonts/Inter/Inter-SemiBold.woff?v=3.13") format("woff");
+}
+@font-face {
+  font-family: 'Inter';
+  font-style:  italic;
+  font-weight: 600;
+  font-display: swap;
+  unicode-range: $inter-unicode-range;
+  src: url("$(res)/fonts/Inter/Inter-SemiBoldItalic.woff2?v=3.13") format("woff2"),
+       url("$(res)/fonts/Inter/Inter-SemiBoldItalic.woff?v=3.13") format("woff");
+}
+
+@font-face {
+  font-family: 'Inter';
+  font-style:  normal;
+  font-weight: 700;
+  font-display: swap;
+  unicode-range: $inter-unicode-range;
+  src: url("$(res)/fonts/Inter/Inter-Bold.woff2?v=3.13") format("woff2"),
+       url("$(res)/fonts/Inter/Inter-Bold.woff?v=3.13") format("woff");
+}
+@font-face {
+  font-family: 'Inter';
+  font-style:  italic;
+  font-weight: 700;
+  font-display: swap;
+  unicode-range: $inter-unicode-range;
+  src: url("$(res)/fonts/Inter/Inter-BoldItalic.woff2?v=3.13") format("woff2"),
+       url("$(res)/fonts/Inter/Inter-BoldItalic.woff?v=3.13") format("woff");
 }
 
 /* latin-ext */
@@ -68,17 +120,3 @@
     src: local('Inconsolata Bold'), local('Inconsolata-Bold'), url('$(res)/fonts/Inconsolata/QldXNThLqRwH-OJ1UHjlKGHiw71p5_zaDpwm.woff2') format('woff2');
     unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
-
-/* a COLR/CPAL version of Twemoji used for consistent cross-browser emoji
- * taken from https://github.com/mozilla/twemoji-colr
- * using the fix from https://github.com/mozilla/twemoji-colr/issues/50 to
- * work on macOS
- */
-/*
-// except we now load it dynamically via FontManager to handle browsers
-// which can't render COLR/CPAL still
-@font-face {
-    font-family: "Twemoji Mozilla";
-    src: url('$(res)/fonts/Twemoji_Mozilla/TwemojiMozilla.woff2') format('woff2');
-}
-*/
\ No newline at end of file
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index f5f3013354..ceb8d5677c 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -8,21 +8,22 @@
 /* Noto Color Emoji contains digits, in fixed-width, therefore causing
    digits in flowed text to stand out.
    TODO: Consider putting all emoji fonts to the end rather than the front. */
-$font-family: Nunito, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', Arial, Helvetica, Sans-Serif, 'Noto Color Emoji';
+$font-family: Inter, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', Arial, Helvetica, Sans-Serif, 'Noto Color Emoji';
 
 $monospace-font-family: Inconsolata, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', Courier, monospace, 'Noto Color Emoji';
 
 // unified palette
 // try to use these colors when possible
-$accent-color: #03b381;
+$accent-color: #0DBD8B;
 $accent-bg-color: rgba(3, 179, 129, 0.16);
 $notice-primary-color: #ff4b55;
 $notice-primary-bg-color: rgba(255, 75, 85, 0.16);
-$notice-secondary-color: #61708b;
+$primary-fg-color: #2e2f32;
+$secondary-fg-color: #737D8C;
+$tertiary-fg-color: #8D99A5;
 $header-panel-bg-color: #f3f8fd;
 
 // typical text (dark-on-white in light skin)
-$primary-fg-color: #2e2f32;
 $primary-bg-color: #ffffff;
 $muted-fg-color: #61708b; // Commonly used in headings and relevant alt text
 
@@ -34,7 +35,7 @@ $focus-bg-color: #dddddd;
 
 // button UI (white-on-green in light skin)
 $accent-fg-color: #ffffff;
-$accent-color-50pct: rgba(3, 179, 129, 0.5);    //#03b381 in rgb
+$accent-color-50pct: rgba($accent-color, 0.5);
 $accent-color-darker: #92caad;
 $accent-color-alt: #238CF5;
 
@@ -51,10 +52,6 @@ $info-bg-color: #2A9EDF;
 $mention-user-pill-bg-color: $warning-color;
 $other-user-pill-bg-color: rgba(0, 0, 0, 0.1);
 
-// pinned events indicator
-$pinned-unread-color: $notice-primary-color;
-$pinned-color: $notice-secondary-color;
-
 // informational plinth
 $info-plinth-bg-color: #f7f7f7;
 $info-plinth-fg-color: #888;
@@ -65,7 +62,7 @@ $preview-bar-bg-color: #f7f7f7;
 $secondary-accent-color: #f2f5f8;
 $tertiary-accent-color: #d3efe1;
 
-$tagpanel-bg-color: #27303a;
+$tagpanel-bg-color: rgba(232, 232, 232, 0.77);
 
 // used by RoomDirectory permissions
 $plinth-bg-color: $secondary-accent-color;
@@ -77,10 +74,10 @@ $droptarget-bg-color: rgba(255,255,255,0.5);
 $selected-color: $secondary-accent-color;
 
 // selected for hoverover & selected event tiles
-$event-selected-color: $header-panel-bg-color;
+$event-selected-color: #f6f7f8;
 
 // used for the hairline dividers in RoomView
-$primary-hairline-color: #e5e5e5;
+$primary-hairline-color: transparent;
 
 // used for the border of input text fields
 $input-border-color: #e7e7e7;
@@ -157,45 +154,55 @@ $rte-group-pill-color: #aaa;
 
 $topleftmenu-color: #212121;
 $roomheader-color: #45474a;
-$roomheader-addroom-bg-color: #91A1C0;
-$roomheader-addroom-fg-color: $accent-fg-color;
+$roomheader-bg-color: $primary-bg-color;
+$roomheader-addroom-bg-color: rgba(92, 100, 112, 0.2);
+$roomheader-addroom-fg-color: #5c6470;
 $tagpanel-button-color: #91A1C0;
-$roomheader-button-color: #91A1C0;
 $groupheader-button-color: #91A1C0;
 $rightpanel-button-color: #91A1C0;
-$composer-button-color: #91A1C0;
+$icon-button-color: #C1C6CD;
 $roomtopic-color: #9e9e9e;
 $eventtile-meta-color: $roomtopic-color;
 
-$composer-e2e-icon-color: #c9ced6;
+$composer-e2e-icon-color: #91A1C0;
 $header-divider-color: #91A1C0;
 
 // ********************
 
-$roomtile-name-color: #61708b;
-$roomtile-badge-fg-color: $accent-fg-color;
-$roomtile-selected-color: #212121;
-$roomtile-notified-color: #212121;
-$roomtile-selected-bg-color: #fff;
-$roomtile-focused-bg-color: #fff;
+$theme-button-bg-color: #e3e8f0;
+
+$roomlist-button-bg-color: rgba(141, 151, 165, 0.2); // Buttons include the filter box, explore button, and sublist buttons
+$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;
+
+$roomtile-preview-color: $secondary-fg-color;
+$roomtile-default-badge-bg-color: #61708b;
+$roomtile-selected-bg-color: #FFF;
+
+$presence-online: $accent-color;
+$presence-away: #d9b072;
+$presence-offline: #E3E8F0;
+
+// ********************
 
 $username-variant1-color: #368bd6;
 $username-variant2-color: #ac3ba8;
-$username-variant3-color: #03b381;
+$username-variant3-color: #0DBD8B;
 $username-variant4-color: #e64f7a;
 $username-variant5-color: #ff812d;
 $username-variant6-color: #2dc2c5;
 $username-variant7-color: #5c56f5;
 $username-variant8-color: #74d12c;
 
-$roomtile-transparent-focused-color: rgba(0, 0, 0, 0.1);
+$notice-secondary-color: $roomlist-header-color;
 
-$roomsublist-background: $secondary-accent-color;
-$roomsublist-label-fg-color: $roomtile-name-color;
-$roomsublist-label-bg-color: $tertiary-accent-color;
-$roomsublist-chevron-color: $accent-color;
+$panel-divider-color: transparent;
 
-$panel-divider-color: #dee1f3;
+// pinned events indicator
+$pinned-unread-color: $notice-primary-color;
+$pinned-color: $notice-secondary-color;
 
 // ********************
 
@@ -223,7 +230,7 @@ $event-redacted-border-color: #cccccc;
 // event timestamp
 $event-timestamp-color: #acacac;
 
-$copy-button-url: "$(res)/img/icon_copy_message.svg";
+$copy-button-url: "$(res)/img/feather-customised/clipboard.svg";
 
 // e2e
 $e2e-verified-color: #76cfa5; // N.B. *NOT* the same as $accent-color
@@ -262,14 +269,18 @@ $togglesw-off-color: #c1c9d6;
 $togglesw-on-color: $accent-color;
 $togglesw-ball-color: #fff;
 
+// Slider
+$slider-selection-color: $accent-color;
+$slider-background-color: #c1c9d6;
+
 $progressbar-color: #000;
 
 $room-warning-bg-color: $yellow-background;
 
-$memberstatus-placeholder-color: $roomtile-name-color;
+$memberstatus-placeholder-color: $muted-fg-color;
 
 $authpage-bg-color: #2e3649;
-$authpage-modal-bg-color: rgba(255, 255, 255, 0.59);
+$authpage-modal-bg-color: rgba(245, 245, 245, 0.90);
 $authpage-body-bg-color: #ffffff;
 $authpage-focus-bg-color: #dddddd;
 $authpage-lang-color: #4e5054;
@@ -292,7 +303,8 @@ $reaction-row-button-selected-border-color: $accent-color;
 
 $kbd-border-color: $reaction-row-button-border-color;
 
-$tooltip-timeline-bg-color: $tagpanel-bg-color;
+$inverted-bg-color: #27303a;
+$tooltip-timeline-bg-color: $inverted-bg-color;
 $tooltip-timeline-fg-color: #ffffff;
 
 $interactive-tooltip-bg-color: #27303a;
@@ -302,6 +314,15 @@ $breadcrumb-placeholder-bg-color: #e8eef5;
 
 $user-tile-hover-bg-color: $header-panel-bg-color;
 
+// FontSlider colors
+$appearance-tab-border-color: $input-darker-bg-color;
+
+// blur amounts for left left panel (only for element theme, used in _mods.scss)
+$roomlist-background-blur-amount: 40px;
+$tagpanel-background-blur-amount: 20px;
+
+$composer-shadow-color: rgba(0, 0, 0, 0.04);
+
 // ***** Mixins! *****
 
 @define-mixin mx_DialogButton {
diff --git a/res/themes/light/css/_mods.scss b/res/themes/light/css/_mods.scss
new file mode 100644
index 0000000000..9a59acba8e
--- /dev/null
+++ b/res/themes/light/css/_mods.scss
@@ -0,0 +1,32 @@
+// sidebar blurred avatar background
+//
+// if backdrop-filter is supported,
+// set the user avatar (if any) as a background so
+// it can be blurred by the tag panel and room list
+
+@supports (backdrop-filter: none) {
+    .mx_LeftPanel {
+        background-image: var(--avatar-url);
+        background-repeat: no-repeat;
+        background-size: cover;
+        background-position: left top;
+    }
+
+    .mx_TagPanel {
+        backdrop-filter: blur($tagpanel-background-blur-amount);
+    }
+
+    .mx_LeftPanel .mx_LeftPanel_roomListContainer {
+        backdrop-filter: blur($roomlist-background-blur-amount);
+    }
+}
+
+.mx_RoomSublist_showNButton {
+    background-color: transparent !important;
+}
+
+a:hover,
+a:link,
+a:visited {
+    text-decoration: none;
+}
diff --git a/res/themes/light/css/_paths.scss b/res/themes/light/css/_paths.scss
index 0744347826..3944076004 100644
--- a/res/themes/light/css/_paths.scss
+++ b/res/themes/light/css/_paths.scss
@@ -1,3 +1,3 @@
 // Path from root SCSS file (such as `light.scss`) to `res` dir in the source tree
-// This value is overridden by external themes in `riot-web`.
+// This value is overridden by external themes in `element-web`.
 $res: ../../..;
diff --git a/res/themes/light/css/light.scss b/res/themes/light/css/light.scss
index 4f48557648..f31ce5c139 100644
--- a/res/themes/light/css/light.scss
+++ b/res/themes/light/css/light.scss
@@ -2,4 +2,5 @@
 @import "_paths.scss";
 @import "_fonts.scss";
 @import "_light.scss";
+@import "_mods.scss";
 @import "../../../../res/css/_components.scss";
diff --git a/scripts/ci/end-to-end-tests.sh b/scripts/ci/end-to-end-tests.sh
index 1233677db4..7a62c03b12 100755
--- a/scripts/ci/end-to-end-tests.sh
+++ b/scripts/ci/end-to-end-tests.sh
@@ -13,7 +13,7 @@ handle_error() {
 
 trap 'handle_error' ERR
 
-echo "--- Building Riot"
+echo "--- Building Element"
 scripts/ci/layered-riot-web.sh
 cd ../riot-web
 riot_web_dir=`pwd`
diff --git a/scripts/gen-i18n.js b/scripts/gen-i18n.js
index a1823cdf50..91733469f7 100755
--- a/scripts/gen-i18n.js
+++ b/scripts/gen-i18n.js
@@ -18,7 +18,7 @@ limitations under the License.
 
 /**
  * Regenerates the translations en_EN file by walking the source tree and
- * parsing each file with flow-parser. Emits a JSON file with the
+ * parsing each file with the appropriate parser. Emits a JSON file with the
  * translatable strings mapped to themselves in the order they appeared
  * in the files and grouped by the file they appeared in.
  *
@@ -29,8 +29,8 @@ const path = require('path');
 
 const walk = require('walk');
 
-const flowParser = require('flow-parser');
-const estreeWalker = require('estree-walker');
+const parser = require("@babel/parser");
+const traverse = require("@babel/traverse");
 
 const TRANSLATIONS_FUNCS = ['_t', '_td'];
 
@@ -44,17 +44,9 @@ const OUTPUT_FILE = 'src/i18n/strings/en_EN.json';
 // to a project that's actively maintained.
 const SEARCH_PATHS = ['src', 'res'];
 
-const FLOW_PARSER_OPTS = {
-  esproposal_class_instance_fields: true,
-  esproposal_class_static_fields: true,
-  esproposal_decorators: true,
-  esproposal_export_star_as: true,
-  types: true,
-};
-
 function getObjectValue(obj, key) {
     for (const prop of obj.properties) {
-        if (prop.key.type == 'Identifier' && prop.key.name == key) {
+        if (prop.key.type === 'Identifier' && prop.key.name === key) {
             return prop.value;
         }
     }
@@ -62,11 +54,11 @@ function getObjectValue(obj, key) {
 }
 
 function getTKey(arg) {
-    if (arg.type == 'Literal') {
+    if (arg.type === 'Literal' || arg.type === "StringLiteral") {
         return arg.value;
-    } else if (arg.type == 'BinaryExpression' && arg.operator == '+') {
+    } else if (arg.type === 'BinaryExpression' && arg.operator === '+') {
         return getTKey(arg.left) + getTKey(arg.right);
-    } else if (arg.type == 'TemplateLiteral') {
+    } else if (arg.type === 'TemplateLiteral') {
         return arg.quasis.map((q) => {
             return q.value.raw;
         }).join('');
@@ -110,81 +102,112 @@ function getFormatStrings(str) {
 }
 
 function getTranslationsJs(file) {
-    const tree = flowParser.parse(fs.readFileSync(file, { encoding: 'utf8' }), FLOW_PARSER_OPTS);
+    const contents = fs.readFileSync(file, { encoding: 'utf8' });
 
     const trs = new Set();
 
-    estreeWalker.walk(tree, {
-        enter: function(node, parent) {
-            if (
-                node.type == 'CallExpression' &&
-                TRANSLATIONS_FUNCS.includes(node.callee.name)
-            ) {
-                const tKey = getTKey(node.arguments[0]);
-                // This happens whenever we call _t with non-literals (ie. whenever we've
-                // had to use a _td to compensate) so is expected.
-                if (tKey === null) return;
+    try {
+        const plugins = [
+            // https://babeljs.io/docs/en/babel-parser#plugins
+            "classProperties",
+            "objectRestSpread",
+            "throwExpressions",
+            "exportDefaultFrom",
+            "decorators-legacy",
+        ];
 
-                // check the format string against the args
-                // We only check _t: _td has no args
-                if (node.callee.name === '_t') {
-                    try {
-                        const placeholders = getFormatStrings(tKey);
-                        for (const placeholder of placeholders) {
-                            if (node.arguments.length < 2) {
-                                throw new Error(`Placeholder found ('${placeholder}') but no substitutions given`);
-                            }
-                            const value = getObjectValue(node.arguments[1], placeholder);
-                            if (value === null) {
-                                throw new Error(`No value found for placeholder '${placeholder}'`);
-                            }
-                        }
+        if (file.endsWith(".js") || file.endsWith(".jsx")) {
+            // all JS is assumed to be flow or react
+            plugins.push("flow", "jsx");
+        } else if (file.endsWith(".ts")) {
+            // TS can't use JSX unless it's a TSX file (otherwise angle casts fail)
+            plugins.push("typescript");
+        } else if (file.endsWith(".tsx")) {
+            // When the file is a TSX file though, enable JSX parsing
+            plugins.push("typescript", "jsx");
+        }
 
-                        // Validate tag replacements
-                        if (node.arguments.length > 2) {
-                            const tagMap = node.arguments[2];
-                            for (const prop of tagMap.properties || []) {
-                                if (prop.key.type === 'Literal') {
-                                    const tag = prop.key.value;
-                                    // RegExp same as in src/languageHandler.js
-                                    const regexp = new RegExp(`(<${tag}>(.*?)<\\/${tag}>|<${tag}>|<${tag}\\s*\\/>)`);
-                                    if (!tKey.match(regexp)) {
-                                        throw new Error(`No match for ${regexp} in ${tKey}`);
+        const babelParsed = parser.parse(contents, {
+            allowImportExportEverywhere: true,
+            errorRecovery: true,
+            sourceFilename: file,
+            tokens: true,
+            plugins,
+        });
+        traverse.default(babelParsed, {
+            enter: (p) => {
+                const node = p.node;
+                if (p.isCallExpression() && node.callee && TRANSLATIONS_FUNCS.includes(node.callee.name)) {
+                    const tKey = getTKey(node.arguments[0]);
+
+                    // This happens whenever we call _t with non-literals (ie. whenever we've
+                    // had to use a _td to compensate) so is expected.
+                    if (tKey === null) return;
+
+                    // check the format string against the args
+                    // We only check _t: _td has no args
+                    if (node.callee.name === '_t') {
+                        try {
+                            const placeholders = getFormatStrings(tKey);
+                            for (const placeholder of placeholders) {
+                                if (node.arguments.length < 2) {
+                                    throw new Error(`Placeholder found ('${placeholder}') but no substitutions given`);
+                                }
+                                const value = getObjectValue(node.arguments[1], placeholder);
+                                if (value === null) {
+                                    throw new Error(`No value found for placeholder '${placeholder}'`);
+                                }
+                            }
+
+                            // Validate tag replacements
+                            if (node.arguments.length > 2) {
+                                const tagMap = node.arguments[2];
+                                for (const prop of tagMap.properties || []) {
+                                    if (prop.key.type === 'Literal') {
+                                        const tag = prop.key.value;
+                                        // RegExp same as in src/languageHandler.js
+                                        const regexp = new RegExp(`(<${tag}>(.*?)<\\/${tag}>|<${tag}>|<${tag}\\s*\\/>)`);
+                                        if (!tKey.match(regexp)) {
+                                            throw new Error(`No match for ${regexp} in ${tKey}`);
+                                        }
                                     }
                                 }
                             }
-                        }
 
-                    } catch (e) {
-                        console.log();
-                        console.error(`ERROR: ${file}:${node.loc.start.line} ${tKey}`);
-                        console.error(e);
-                        process.exit(1);
-                    }
-                }
-
-                let isPlural = false;
-                if (node.arguments.length > 1 && node.arguments[1].type == 'ObjectExpression') {
-                    const countVal = getObjectValue(node.arguments[1], 'count');
-                    if (countVal) {
-                        isPlural = true;
-                    }
-                }
-
-                if (isPlural) {
-                    trs.add(tKey + "|other");
-                    const plurals = enPlurals[tKey];
-                    if (plurals) {
-                        for (const pluralType of Object.keys(plurals)) {
-                            trs.add(tKey + "|" + pluralType);
+                        } catch (e) {
+                            console.log();
+                            console.error(`ERROR: ${file}:${node.loc.start.line} ${tKey}`);
+                            console.error(e);
+                            process.exit(1);
                         }
                     }
-                } else {
-                    trs.add(tKey);
+
+                    let isPlural = false;
+                    if (node.arguments.length > 1 && node.arguments[1].type === 'ObjectExpression') {
+                        const countVal = getObjectValue(node.arguments[1], 'count');
+                        if (countVal) {
+                            isPlural = true;
+                        }
+                    }
+
+                    if (isPlural) {
+                        trs.add(tKey + "|other");
+                        const plurals = enPlurals[tKey];
+                        if (plurals) {
+                            for (const pluralType of Object.keys(plurals)) {
+                                trs.add(tKey + "|" + pluralType);
+                            }
+                        }
+                    } else {
+                        trs.add(tKey);
+                    }
                 }
-            }
-        }
-    });
+            },
+        });
+    } catch (e) {
+        console.error(e);
+        process.exit(1);
+    }
 
     return trs;
 }
@@ -194,7 +217,7 @@ function getTranslationsOther(file) {
 
     const trs = new Set();
 
-    // Taken from riot-web src/components/structures/HomePage.js
+    // Taken from element-web src/components/structures/HomePage.js
     const translationsRegex = /_t\(['"]([\s\S]*?)['"]\)/mg;
     let matches;
     while (matches = translationsRegex.exec(contents)) {
diff --git a/src/@types/common.ts b/src/@types/common.ts
new file mode 100644
index 0000000000..b887bd4090
--- /dev/null
+++ b/src/@types/common.ts
@@ -0,0 +1,24 @@
+/*
+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 { JSXElementConstructor } from "react";
+
+// Based on https://stackoverflow.com/a/53229857/3532235
+export type Without<T, U> = {[P in Exclude<keyof T, keyof U>] ? : never};
+export type XOR<T, U> = (T | U) extends object ? (Without<T, U> & U) | (Without<U, T> & T) : T | U;
+export type Writeable<T> = { -readonly [P in keyof T]: T[P] };
+
+export type ComponentClass = keyof JSX.IntrinsicElements | JSXElementConstructor<any>;
diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts
index e6e339d067..86ee995a13 100644
--- a/src/@types/global.d.ts
+++ b/src/@types/global.d.ts
@@ -15,18 +15,38 @@ limitations under the License.
 */
 
 import * as ModernizrStatic from "modernizr";
+import ContentMessages from "../ContentMessages";
+import { IMatrixClientPeg } from "../MatrixClientPeg";
+import ToastStore from "../stores/ToastStore";
+import DeviceListener from "../DeviceListener";
+import { RoomListStoreClass } from "../stores/room-list/RoomListStore";
+import { PlatformPeg } from "../PlatformPeg";
+import RoomListLayoutStore from "../stores/room-list/RoomListLayoutStore";
+import {IntegrationManagers} from "../integrations/IntegrationManagers";
+import {ModalManager} from "../Modal";
+import SettingsStore from "../settings/SettingsStore";
+import {ActiveRoomObserver} from "../ActiveRoomObserver";
+import {Notifier} from "../Notifier";
 
 declare global {
     interface Window {
         Modernizr: ModernizrStatic;
+        mxMatrixClientPeg: IMatrixClientPeg;
         Olm: {
             init: () => Promise<void>;
         };
-    }
 
-    // workaround for https://github.com/microsoft/TypeScript/issues/30933
-    interface ObjectConstructor {
-        fromEntries?(xs: [string|number|symbol, any][]): object
+        mxContentMessages: ContentMessages;
+        mxToastStore: ToastStore;
+        mxDeviceListener: DeviceListener;
+        mxRoomListStore: RoomListStoreClass;
+        mxRoomListLayoutStore: RoomListLayoutStore;
+        mxActiveRoomObserver: ActiveRoomObserver;
+        mxPlatformPeg: PlatformPeg;
+        mxIntegrationManagers: typeof IntegrationManagers;
+        singletonModalManager: ModalManager;
+        mxSettingsStore: SettingsStore;
+        mxNotifier: typeof Notifier;
     }
 
     interface Document {
@@ -34,6 +54,10 @@ declare global {
         hasStorageAccess?: () => Promise<boolean>;
     }
 
+    interface Navigator {
+        userLanguage?: string;
+    }
+
     interface StorageEstimate {
         usageDetails?: {[key: string]: number};
     }
@@ -50,4 +74,8 @@ declare global {
     interface PromiseConstructor {
         allSettled<T>(promises: Promise<T>[]): Promise<Array<ISettledFulfilled<T> | ISettledRejected>>;
     }
+
+    interface HTMLAudioElement {
+        type?: string;
+    }
 }
diff --git a/src/@types/polyfill.ts b/src/@types/polyfill.ts
new file mode 100644
index 0000000000..3ce05d9c2f
--- /dev/null
+++ b/src/@types/polyfill.ts
@@ -0,0 +1,38 @@
+/*
+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.
+*/
+
+// This is intended to fix re-resizer because of its unguarded `instanceof TouchEvent` checks.
+export function polyfillTouchEvent() {
+    // Firefox doesn't have touch events without touch devices being present, so create a fake
+    // one we can rely on lying about.
+    if (!window.TouchEvent) {
+        // We have no intention of actually using this, so just lie.
+        window.TouchEvent = class TouchEvent extends UIEvent {
+            public get altKey(): boolean { return false; }
+            public get changedTouches(): any { return []; }
+            public get ctrlKey(): boolean { return false; }
+            public get metaKey(): boolean { return false; }
+            public get shiftKey(): boolean { return false; }
+            public get targetTouches(): any { return []; }
+            public get touches(): any { return []; }
+            public get rotation(): number { return 0.0; }
+            public get scale(): number { return 0.0; }
+            constructor(eventType: string, params?: any) {
+                super(eventType, params);
+            }
+        };
+    }
+}
diff --git a/src/ActiveRoomObserver.js b/src/ActiveRoomObserver.ts
similarity index 52%
rename from src/ActiveRoomObserver.js
rename to src/ActiveRoomObserver.ts
index d6fbb460b5..1126dc9496 100644
--- a/src/ActiveRoomObserver.js
+++ b/src/ActiveRoomObserver.ts
@@ -16,6 +16,8 @@ limitations under the License.
 
 import RoomViewStore from './stores/RoomViewStore';
 
+type Listener = (isActive: boolean) => void;
+
 /**
  * Consumes changes from the RoomViewStore and notifies specific things
  * about when the active room changes. Unlike listening for RoomViewStore
@@ -25,53 +27,57 @@ import RoomViewStore from './stores/RoomViewStore';
  * TODO: If we introduce an observer for something else, factor out
  * the adding / removing of listeners & emitting into a common class.
  */
-class ActiveRoomObserver {
+export class ActiveRoomObserver {
+    private listeners: {[key: string]: Listener[]} = {};
+    private _activeRoomId = RoomViewStore.getRoomId();
+    private readonly roomStoreToken: string;
+
     constructor() {
-        this._listeners = {};
-
-        this._activeRoomId = RoomViewStore.getRoomId();
-        // TODO: We could self-destruct when the last listener goes away, or at least
-        // stop listening.
-        this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate.bind(this));
+        // TODO: We could self-destruct when the last listener goes away, or at least stop listening.
+        this.roomStoreToken = RoomViewStore.addListener(this.onRoomViewStoreUpdate);
     }
 
-    addListener(roomId, listener) {
-        if (!this._listeners[roomId]) this._listeners[roomId] = [];
-        this._listeners[roomId].push(listener);
+    public get activeRoomId(): string {
+        return this._activeRoomId;
     }
 
-    removeListener(roomId, listener) {
-        if (this._listeners[roomId]) {
-            const i = this._listeners[roomId].indexOf(listener);
+    public addListener(roomId, listener) {
+        if (!this.listeners[roomId]) this.listeners[roomId] = [];
+        this.listeners[roomId].push(listener);
+    }
+
+    public removeListener(roomId, listener) {
+        if (this.listeners[roomId]) {
+            const i = this.listeners[roomId].indexOf(listener);
             if (i > -1) {
-                this._listeners[roomId].splice(i, 1);
+                this.listeners[roomId].splice(i, 1);
             }
         } else {
             console.warn("Unregistering unrecognised listener (roomId=" + roomId + ")");
         }
     }
 
-    _emit(roomId) {
-        if (!this._listeners[roomId]) return;
+    private emit(roomId, isActive: boolean) {
+        if (!this.listeners[roomId]) return;
 
-        for (const l of this._listeners[roomId]) {
-            l.call();
+        for (const l of this.listeners[roomId]) {
+            l.call(null, isActive);
         }
     }
 
-    _onRoomViewStoreUpdate() {
+    private onRoomViewStoreUpdate = () => {
         // emit for the old room ID
-        if (this._activeRoomId) this._emit(this._activeRoomId);
+        if (this._activeRoomId) this.emit(this._activeRoomId, false);
 
         // update our cache
         this._activeRoomId = RoomViewStore.getRoomId();
 
         // and emit for the new one
-        if (this._activeRoomId) this._emit(this._activeRoomId);
-    }
+        if (this._activeRoomId) this.emit(this._activeRoomId, true);
+    };
 }
 
-if (global.mx_ActiveRoomObserver === undefined) {
-    global.mx_ActiveRoomObserver = new ActiveRoomObserver();
+if (window.mxActiveRoomObserver === undefined) {
+    window.mxActiveRoomObserver = new ActiveRoomObserver();
 }
-export default global.mx_ActiveRoomObserver;
+export default window.mxActiveRoomObserver;
diff --git a/src/Analytics.js b/src/Analytics.js
index e55612c4f1..9966d0845e 100644
--- a/src/Analytics.js
+++ b/src/Analytics.js
@@ -66,7 +66,10 @@ const customVariables = {
     },
     'App Version': {
         id: 2,
-        expl: _td('The version of Riot'),
+        expl: _td('The version of %(brand)s'),
+        getTextVariables: () => ({
+            brand: SdkConfig.get().brand,
+        }),
         example: '15.0.0',
     },
     'User Type': {
@@ -96,7 +99,10 @@ const customVariables = {
     },
     'Touch Input': {
         id: 8,
-        expl: _td("Whether you're using Riot on a device where touch is the primary input mechanism"),
+        expl: _td("Whether you're using %(brand)s on a device where touch is the primary input mechanism"),
+        getTextVariables: () => ({
+            brand: SdkConfig.get().brand,
+        }),
         example: 'false',
     },
     'Breadcrumbs': {
@@ -106,7 +112,10 @@ const customVariables = {
     },
     'Installed PWA': {
         id: 10,
-        expl: _td("Whether you're using Riot as an installed Progressive Web App"),
+        expl: _td("Whether you're using %(brand)s as an installed Progressive Web App"),
+        getTextVariables: () => ({
+            brand: SdkConfig.get().brand,
+        }),
         example: 'false',
     },
 };
@@ -195,8 +204,11 @@ class Analytics {
 
         this._setVisitVariable('Chosen Language', getCurrentLanguage());
 
-        if (window.location.hostname === 'riot.im') {
+        const hostname = window.location.hostname;
+        if (hostname === 'riot.im') {
             this._setVisitVariable('Instance', window.location.pathname);
+        } else if (hostname.endsWith('.element.io')) {
+            this._setVisitVariable('Instance', hostname.replace('.element.io', ''));
         }
 
         let installedPWA = "unknown";
@@ -356,12 +368,17 @@ class Analytics {
         Modal.createTrackedDialog('Analytics Details', '', ErrorDialog, {
             title: _t('Analytics'),
             description: <div className="mx_AnalyticsModal">
-                <div>
-                    { _t('The information being sent to us to help make Riot better includes:') }
-                </div>
+                <div>{_t('The information being sent to us to help make %(brand)s better includes:', {
+                    brand: SdkConfig.get().brand,
+                })}</div>
                 <table>
                     { rows.map((row) => <tr key={row[0]}>
-                        <td>{ _t(customVariables[row[0]].expl) }</td>
+                        <td>{_t(
+                            customVariables[row[0]].expl,
+                            customVariables[row[0]].getTextVariables ?
+                                customVariables[row[0]].getTextVariables() :
+                                null,
+                        )}</td>
                         { row[1] !== undefined && <td><code>{ row[1] }</code></td> }
                     </tr>) }
                     { otherVariables.map((item, index) =>
diff --git a/src/AsyncWrapper.js b/src/AsyncWrapper.js
index 05054cf63a..94de5df214 100644
--- a/src/AsyncWrapper.js
+++ b/src/AsyncWrapper.js
@@ -41,7 +41,7 @@ export default createReactClass({
     componentDidMount: function() {
         this._unmounted = false;
         // XXX: temporary logging to try to diagnose
-        // https://github.com/vector-im/riot-web/issues/3148
+        // https://github.com/vector-im/element-web/issues/3148
         console.log('Starting load of AsyncWrapper for modal');
         this.props.prom.then((result) => {
             if (this._unmounted) {
diff --git a/src/Avatar.js b/src/Avatar.js
index 8393ce02b2..d76ea6f2c4 100644
--- a/src/Avatar.js
+++ b/src/Avatar.js
@@ -19,6 +19,7 @@ import {MatrixClientPeg} from './MatrixClientPeg';
 import DMRoomMap from './utils/DMRoomMap';
 import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
 
+// Not to be used for BaseAvatar urls as that has similar default avatar fallback already
 export function avatarUrlForMember(member, width, height, resizeMethod) {
     let url;
     if (member && member.getAvatarUrl) {
@@ -81,7 +82,7 @@ function urlForColor(color) {
 const colorToDataURLCache = new Map();
 
 export function defaultAvatarUrlForString(s) {
-    const defaultColors = ['#03b381', '#368bd6', '#ac3ba8'];
+    const defaultColors = ['#0DBD8B', '#368bd6', '#ac3ba8'];
     let total = 0;
     for (let i = 0; i < s.length; ++i) {
         total += s.charCodeAt(i);
diff --git a/src/BasePlatform.js b/src/BasePlatform.js
deleted file mode 100644
index 7214031586..0000000000
--- a/src/BasePlatform.js
+++ /dev/null
@@ -1,195 +0,0 @@
-// @flow
-
-/*
-Copyright 2016 Aviral Dasgupta
-Copyright 2016 OpenMarket Ltd
-Copyright 2018 New Vector Ltd
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-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";
-import dis from './dispatcher';
-import BaseEventIndexManager from './indexing/BaseEventIndexManager';
-
-/**
- * Base class for classes that provide platform-specific functionality
- * eg. Setting an application badge or displaying notifications
- *
- * Instances of this class are provided by the application.
- */
-export default class BasePlatform {
-    constructor() {
-        this.notificationCount = 0;
-        this.errorDidOccur = false;
-
-        dis.register(this._onAction.bind(this));
-    }
-
-    _onAction(payload: Object) {
-        switch (payload.action) {
-            case 'on_client_not_viable':
-            case 'on_logged_out':
-                this.setNotificationCount(0);
-                break;
-        }
-    }
-
-    // Used primarily for Analytics
-    getHumanReadableName(): string {
-        return 'Base Platform';
-    }
-
-    setNotificationCount(count: number) {
-        this.notificationCount = count;
-    }
-
-    setErrorStatus(errorDidOccur: boolean) {
-        this.errorDidOccur = errorDidOccur;
-    }
-
-    /**
-     * Returns true if the platform supports displaying
-     * notifications, otherwise false.
-     * @returns {boolean} whether the platform supports displaying notifications
-     */
-    supportsNotifications(): boolean {
-        return false;
-    }
-
-    /**
-     * Returns true if the application currently has permission
-     * to display notifications. Otherwise false.
-     * @returns {boolean} whether the application has permission to display notifications
-     */
-    maySendNotifications(): boolean {
-        return false;
-    }
-
-    /**
-     * Requests permission to send notifications. Returns
-     * a promise that is resolved when the user has responded
-     * to the request. The promise has a single string argument
-     * that is 'granted' if the user allowed the request or
-     * 'denied' otherwise.
-     */
-    requestNotificationPermission(): Promise<string> {
-    }
-
-    displayNotification(title: string, msg: string, avatarUrl: string, room: Object) {
-    }
-
-    loudNotification(ev: Event, room: Object) {
-    }
-
-    /**
-     * Returns a promise that resolves to a string representing
-     * the current version of the application.
-     */
-    getAppVersion(): Promise<string> {
-        throw new Error("getAppVersion not implemented!");
-    }
-
-    /*
-     * If it's not expected that capturing the screen will work
-     * with getUserMedia, return a string explaining why not.
-     * Otherwise, return null.
-     */
-    screenCaptureErrorString(): string {
-        return "Not implemented";
-    }
-
-    /**
-     * Restarts the application, without neccessarily reloading
-     * any application code
-     */
-    reload() {
-        throw new Error("reload not implemented!");
-    }
-
-    supportsAutoLaunch(): boolean {
-        return false;
-    }
-
-    // XXX: Surely this should be a setting like any other?
-    async getAutoLaunchEnabled(): boolean {
-        return false;
-    }
-
-    async setAutoLaunchEnabled(enabled: boolean): void {
-        throw new Error("Unimplemented");
-    }
-
-    supportsAutoHideMenuBar(): boolean {
-        return false;
-    }
-
-    async getAutoHideMenuBarEnabled(): boolean {
-        return false;
-    }
-
-    async setAutoHideMenuBarEnabled(enabled: boolean): void {
-        throw new Error("Unimplemented");
-    }
-
-    supportsMinimizeToTray(): boolean {
-        return false;
-    }
-
-    async getMinimizeToTrayEnabled(): boolean {
-        return false;
-    }
-
-    async setMinimizeToTrayEnabled(enabled: boolean): void {
-        throw new Error("Unimplemented");
-    }
-
-    /**
-     * Get our platform specific EventIndexManager.
-     *
-     * @return {BaseEventIndexManager} The EventIndex manager for our platform,
-     * can be null if the platform doesn't support event indexing.
-     */
-    getEventIndexingManager(): BaseEventIndexManager | null {
-        return null;
-    }
-
-    setLanguage(preferredLangs: string[]) {}
-
-    getSSOCallbackUrl(hsUrl: string, isUrl: string): URL {
-        const url = new URL(window.location.href);
-        // XXX: at this point, the fragment will always be #/login, which is no
-        // use to anyone. Ideally, we would get the intended fragment from
-        // MatrixChat.screenAfterLogin so that you could follow #/room links etc
-        // through an SSO login.
-        url.hash = "";
-        url.searchParams.set("homeserver", hsUrl);
-        url.searchParams.set("identityServer", isUrl);
-        return url;
-    }
-
-    /**
-     * Begin Single Sign On flows.
-     * @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.
-     */
-    startSingleSignOn(mxClient: MatrixClient, loginType: "sso"|"cas") {
-        const callbackUrl = this.getSSOCallbackUrl(mxClient.getHomeserverUrl(), mxClient.getIdentityServerUrl());
-        window.location.href = mxClient.getSsoLoginUrl(callbackUrl.toString(), loginType); // redirect to SSO
-    }
-
-    onKeyDown(ev: KeyboardEvent): boolean {
-        return false; // no shortcuts implemented
-    }
-}
diff --git a/src/BasePlatform.ts b/src/BasePlatform.ts
new file mode 100644
index 0000000000..4d06c5df73
--- /dev/null
+++ b/src/BasePlatform.ts
@@ -0,0 +1,292 @@
+/*
+Copyright 2016 Aviral Dasgupta
+Copyright 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+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 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";
+
+export const SSO_HOMESERVER_URL_KEY = "mx_sso_hs_url";
+export const SSO_ID_SERVER_URL_KEY = "mx_sso_is_url";
+
+export enum UpdateCheckStatus {
+    Checking = "CHECKING",
+    Error = "ERROR",
+    NotAvailable = "NOTAVAILABLE",
+    Downloading = "DOWNLOADING",
+    Ready = "READY",
+}
+
+const UPDATE_DEFER_KEY = "mx_defer_update";
+
+/**
+ * Base class for classes that provide platform-specific functionality
+ * eg. Setting an application badge or displaying notifications
+ *
+ * Instances of this class are provided by the application.
+ */
+export default abstract class BasePlatform {
+    protected notificationCount = 0;
+    protected errorDidOccur = false;
+
+    constructor() {
+        dis.register(this.onAction);
+        this.startUpdateCheck = this.startUpdateCheck.bind(this);
+    }
+
+    abstract async getConfig(): Promise<{}>;
+
+    abstract getDefaultDeviceDisplayName(): string;
+
+    protected onAction = (payload: ActionPayload) => {
+        switch (payload.action) {
+            case 'on_client_not_viable':
+            case 'on_logged_out':
+                this.setNotificationCount(0);
+                break;
+        }
+    };
+
+    // Used primarily for Analytics
+    abstract getHumanReadableName(): string;
+
+    setNotificationCount(count: number) {
+        this.notificationCount = count;
+    }
+
+    setErrorStatus(errorDidOccur: boolean) {
+        this.errorDidOccur = errorDidOccur;
+    }
+
+    /**
+     * Whether we can call checkForUpdate on this platform build
+     */
+    async canSelfUpdate(): Promise<boolean> {
+        return false;
+    }
+
+    startUpdateCheck() {
+        hideUpdateToast();
+        localStorage.removeItem(UPDATE_DEFER_KEY);
+        dis.dispatch<CheckUpdatesPayload>({
+            action: Action.CheckUpdates,
+            status: UpdateCheckStatus.Checking,
+        });
+    }
+
+    /**
+     * Update the currently running app to the latest available version
+     * and replace this instance of the app with the new version.
+     */
+    installUpdate() {
+    }
+
+    /**
+     * Check if the version update has been deferred and that deferment is still in effect
+     * @param newVersion the version string to check
+     */
+    protected shouldShowUpdate(newVersion: string): boolean {
+        try {
+            const [version, deferUntil] = JSON.parse(localStorage.getItem(UPDATE_DEFER_KEY));
+            return newVersion !== version || Date.now() > deferUntil;
+        } catch (e) {
+            return true;
+        }
+    }
+
+    /**
+     * Ignore the pending update and don't prompt about this version
+     * until the next morning (8am).
+     */
+    deferUpdate(newVersion: string) {
+        const date = new Date(Date.now() + 24 * 60 * 60 * 1000);
+        date.setHours(8, 0, 0, 0); // set to next 8am
+        localStorage.setItem(UPDATE_DEFER_KEY, JSON.stringify([newVersion, date.getTime()]));
+        hideUpdateToast();
+    }
+
+    /**
+     * Returns true if the platform supports displaying
+     * notifications, otherwise false.
+     * @returns {boolean} whether the platform supports displaying notifications
+     */
+    supportsNotifications(): boolean {
+        return false;
+    }
+
+    /**
+     * Returns true if the application currently has permission
+     * to display notifications. Otherwise false.
+     * @returns {boolean} whether the application has permission to display notifications
+     */
+    maySendNotifications(): boolean {
+        return false;
+    }
+
+    /**
+     * Requests permission to send notifications. Returns
+     * a promise that is resolved when the user has responded
+     * to the request. The promise has a single string argument
+     * that is 'granted' if the user allowed the request or
+     * 'denied' otherwise.
+     */
+    abstract requestNotificationPermission(): Promise<string>;
+
+    abstract displayNotification(title: string, msg: string, avatarUrl: string, room: Object);
+
+    loudNotification(ev: Event, room: Object) {
+    }
+
+    clearNotification(notif: Notification) {
+        // Some browsers don't support this, e.g Safari on iOS
+        // https://developer.mozilla.org/en-US/docs/Web/API/Notification/close
+        if (notif.close) {
+            notif.close();
+        }
+    }
+
+    /**
+     * Returns a promise that resolves to a string representing the current version of the application.
+     */
+    abstract getAppVersion(): Promise<string>;
+
+    /*
+     * If it's not expected that capturing the screen will work
+     * with getUserMedia, return a string explaining why not.
+     * Otherwise, return null.
+     */
+    screenCaptureErrorString(): string {
+        return "Not implemented";
+    }
+
+    /**
+     * Restarts the application, without neccessarily reloading
+     * any application code
+     */
+    abstract reload();
+
+    supportsAutoLaunch(): boolean {
+        return false;
+    }
+
+    // XXX: Surely this should be a setting like any other?
+    async getAutoLaunchEnabled(): Promise<boolean> {
+        return false;
+    }
+
+    async setAutoLaunchEnabled(enabled: boolean): Promise<void> {
+        throw new Error("Unimplemented");
+    }
+
+    supportsAutoHideMenuBar(): boolean {
+        return false;
+    }
+
+    async getAutoHideMenuBarEnabled(): Promise<boolean> {
+        return false;
+    }
+
+    async setAutoHideMenuBarEnabled(enabled: boolean): Promise<void> {
+        throw new Error("Unimplemented");
+    }
+
+    supportsMinimizeToTray(): boolean {
+        return false;
+    }
+
+    async getMinimizeToTrayEnabled(): Promise<boolean> {
+        return false;
+    }
+
+    async setMinimizeToTrayEnabled(enabled: boolean): Promise<void> {
+        throw new Error("Unimplemented");
+    }
+
+    /**
+     * Get our platform specific EventIndexManager.
+     *
+     * @return {BaseEventIndexManager} The EventIndex manager for our platform,
+     * can be null if the platform doesn't support event indexing.
+     */
+    getEventIndexingManager(): BaseEventIndexManager | null {
+        return null;
+    }
+
+    setLanguage(preferredLangs: string[]) {}
+
+    protected getSSOCallbackUrl(fragmentAfterLogin: string): URL {
+        const url = new URL(window.location.href);
+        url.hash = fragmentAfterLogin || "";
+        return url;
+    }
+
+    /**
+     * Begin Single Sign On flows.
+     * @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.
+     */
+    startSingleSignOn(mxClient: MatrixClient, loginType: "sso" | "cas", fragmentAfterLogin: 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());
+        }
+        const callbackUrl = this.getSSOCallbackUrl(fragmentAfterLogin);
+        window.location.href = mxClient.getSsoLoginUrl(callbackUrl.toString(), loginType); // redirect to SSO
+    }
+
+    onKeyDown(ev: KeyboardEvent): boolean {
+        return false; // no shortcuts implemented
+    }
+
+    /**
+     * Get a previously stored pickle key.  The pickle key is used for
+     * encrypting libolm objects.
+     * @param {string} userId the user ID for the user that the pickle key is for.
+     * @param {string} userId the device ID that the pickle key is for.
+     * @returns {string|null} the previously stored pickle key, or null if no
+     *     pickle key has been stored.
+     */
+    async getPickleKey(userId: string, deviceId: string): Promise<string | null> {
+        return null;
+    }
+
+    /**
+     * Create and store a pickle key for encrypting libolm objects.
+     * @param {string} userId the user ID for the user that the pickle key is for.
+     * @param {string} userId the device ID that the pickle key is for.
+     * @returns {string|null} the pickle key, or null if the platform does not
+     *     support storing pickle keys.
+     */
+    async createPickleKey(userId: string, deviceId: string): Promise<string | null> {
+        return null;
+    }
+
+    /**
+     * Delete a previously stored pickle key from storage.
+     * @param {string} userId the user ID for the user that the pickle key is for.
+     * @param {string} userId the device ID that the pickle key is for.
+     */
+    async destroyPickleKey(userId: string, deviceId: string): Promise<void> {
+    }
+}
diff --git a/src/CallHandler.js b/src/CallHandler.js
index 2bfe10850a..18f6aeb98a 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -59,14 +59,14 @@ import Modal from './Modal';
 import * as sdk from './index';
 import { _t } from './languageHandler';
 import Matrix from 'matrix-js-sdk';
-import dis from './dispatcher';
-import { showUnknownDeviceDialogForCalls } from './cryptodevices';
+import dis from './dispatcher/dispatcher';
 import WidgetUtils from './utils/WidgetUtils';
 import WidgetEchoStore from './stores/WidgetEchoStore';
-import SettingsStore, { SettingLevel } from './settings/SettingsStore';
+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";
 
 global.mxCalls = {
     //room_id: MatrixCall
@@ -90,7 +90,7 @@ function play(audioId) {
                 // This is usually because the user hasn't interacted with the document,
                 // or chrome doesn't think so and is denying the request. Not sure what
                 // we can really do here...
-                // https://github.com/vector-im/riot-web/issues/7657
+                // https://github.com/vector-im/element-web/issues/7657
                 console.log("Unable to play audio clip", e);
             }
         };
@@ -119,62 +119,22 @@ function pause(audioId) {
     }
 }
 
-function _reAttemptCall(call) {
-    if (call.direction === 'outbound') {
-        dis.dispatch({
-            action: 'place_call',
-            room_id: call.roomId,
-            type: call.type,
-        });
-    } else {
-        call.answer();
-    }
-}
-
 function _setCallListeners(call) {
     call.on("error", function(err) {
         console.error("Call error:", err);
-        if (err.code === 'unknown_devices') {
-            const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-
-            Modal.createTrackedDialog('Call Failed', '', QuestionDialog, {
-                title: _t('Call Failed'),
-                description: _t(
-                    "There are unknown sessions in this room: "+
-                    "if you proceed without verifying them, it will be "+
-                    "possible for someone to eavesdrop on your call.",
-                ),
-                button: _t('Review Sessions'),
-                onFinished: function(confirmed) {
-                    if (confirmed) {
-                        const room = MatrixClientPeg.get().getRoom(call.roomId);
-                        showUnknownDeviceDialogForCalls(
-                            MatrixClientPeg.get(),
-                            room,
-                            () => {
-                                _reAttemptCall(call);
-                            },
-                            call.direction === 'outbound' ? _t("Call Anyway") : _t("Answer Anyway"),
-                            call.direction === 'outbound' ? _t("Call") : _t("Answer"),
-                        );
-                    }
-                },
-            });
-        } else {
-            if (
-                MatrixClientPeg.get().getTurnServers().length === 0 &&
-                SettingsStore.getValue("fallbackICEServerAllowed") === null
-            ) {
-                _showICEFallbackPrompt();
-                return;
-            }
-
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            Modal.createTrackedDialog('Call Failed', '', ErrorDialog, {
-                title: _t('Call Failed'),
-                description: err.message,
-            });
+        if (
+            MatrixClientPeg.get().getTurnServers().length === 0 &&
+            SettingsStore.getValue("fallbackICEServerAllowed") === null
+        ) {
+            _showICEFallbackPrompt();
+            return;
         }
+
+        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+        Modal.createTrackedDialog('Call Failed', '', ErrorDialog, {
+            title: _t('Call Failed'),
+            description: err.message,
+        });
     });
     call.on("hangup", function() {
         _setCallState(undefined, call.roomId, "ended");
@@ -514,15 +474,15 @@ const callHandler = {
 
     /**
      * The conference handler is a module that deals with implementation-specific
-     * multi-party calling implementations. Riot passes in its own which creates
+     * multi-party calling implementations. Element passes in its own which creates
      * a one-to-one call with a freeswitch conference bridge. As of July 2018,
      * the de-facto way of conference calling is a Jitsi widget, so this is
      * deprecated. It reamins here for two reasons:
-     *  1. So Riot still supports joining existing freeswitch conference calls
+     *  1. So Element still supports joining existing freeswitch conference calls
      *     (but doesn't support creating them). After a transition period, we can
      *     remove support for joining them too.
      *  2. To hide the one-to-one rooms that old-style conferencing creates. This
-     *     is much harder to remove: probably either we make Riot leave & forget these
+     *     is much harder to remove: probably either we make Element leave & forget these
      *     rooms after we remove support for joining freeswitch conferences, or we
      *     accept that random rooms with cryptic users will suddently appear for
      *     anyone who's ever used conference calling, or we are stuck with this
diff --git a/src/CallMediaHandler.js b/src/CallMediaHandler.js
index a0364f798a..8d56467c57 100644
--- a/src/CallMediaHandler.js
+++ b/src/CallMediaHandler.js
@@ -15,7 +15,8 @@
 */
 
 import * as Matrix from 'matrix-js-sdk';
-import SettingsStore, {SettingLevel} from "./settings/SettingsStore";
+import SettingsStore from "./settings/SettingsStore";
+import {SettingLevel} from "./settings/SettingLevel";
 
 export default {
     hasAnyLabeledDevices: async function() {
diff --git a/src/ContentMessages.js b/src/ContentMessages.tsx
similarity index 73%
rename from src/ContentMessages.js
rename to src/ContentMessages.tsx
index 34379c029b..6f55a75d0c 100644
--- a/src/ContentMessages.js
+++ b/src/ContentMessages.tsx
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2019 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,20 +16,22 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
-
+import React from "react";
 import extend from './extend';
-import dis from './dispatcher';
+import dis from './dispatcher/dispatcher';
 import {MatrixClientPeg} from './MatrixClientPeg';
+import {MatrixClient} from "matrix-js-sdk/src/client";
 import * as sdk from './index';
 import { _t } from './languageHandler';
 import Modal from './Modal';
 import RoomViewStore from './stores/RoomViewStore';
 import encrypt from "browser-encrypt-attachment";
 import extractPngChunks from "png-chunks-extract";
+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";
 
 const MAX_WIDTH = 800;
 const MAX_HEIGHT = 600;
@@ -39,6 +42,50 @@ const PHYS_HIDPI = [0x00, 0x00, 0x16, 0x25, 0x00, 0x00, 0x16, 0x25, 0x01];
 
 export class UploadCanceledError extends Error {}
 
+type ThumbnailableElement = HTMLImageElement | HTMLVideoElement;
+
+interface IUpload {
+    fileName: string;
+    roomId: string;
+    total: number;
+    loaded: number;
+    promise: Promise<any>;
+    canceled?: boolean;
+}
+
+interface IMediaConfig {
+    "m.upload.size"?: number;
+}
+
+interface IContent {
+    body: string;
+    msgtype: string;
+    info: {
+        size: number;
+        mimetype?: string;
+    };
+    file?: string;
+    url?: string;
+}
+
+interface IThumbnail {
+    info: {
+        thumbnail_info: {
+            w: number;
+            h: number;
+            mimetype: string;
+            size: number;
+        };
+        w: number;
+        h: number;
+    };
+    thumbnail: Blob;
+}
+
+interface IAbortablePromise<T> extends Promise<T> {
+    abort(): void;
+}
+
 /**
  * Create a thumbnail for a image DOM element.
  * The image will be smaller than MAX_WIDTH and MAX_HEIGHT.
@@ -51,13 +98,13 @@ export class UploadCanceledError extends Error {}
  * about the original image and the thumbnail.
  *
  * @param {HTMLElement} element The element to thumbnail.
- * @param {integer} inputWidth The width of the image in the input element.
- * @param {integer} inputHeight the width of the image in the input element.
+ * @param {number} inputWidth The width of the image in the input element.
+ * @param {number} inputHeight the width of the image in the input element.
  * @param {String} mimeType The mimeType to save the blob as.
  * @return {Promise} A promise that resolves with an object with an info key
  *  and a thumbnail key.
  */
-function createThumbnail(element, inputWidth, inputHeight, mimeType) {
+function createThumbnail(element: ThumbnailableElement, inputWidth: number, inputHeight: number, mimeType: string): Promise<IThumbnail> {
     return new Promise((resolve) => {
         let targetWidth = inputWidth;
         let targetHeight = inputHeight;
@@ -98,7 +145,7 @@ function createThumbnail(element, inputWidth, inputHeight, mimeType) {
  * @param {File} imageFile The file to load in an image element.
  * @return {Promise} A promise that resolves with the html image element.
  */
-async function loadImageElement(imageFile) {
+async function loadImageElement(imageFile: File) {
     // Load the file into an html element
     const img = document.createElement("img");
     const objectUrl = URL.createObjectURL(imageFile);
@@ -128,8 +175,7 @@ async function loadImageElement(imageFile) {
             for (const chunk of chunks) {
                 if (chunk.name === 'pHYs') {
                     if (chunk.data.byteLength !== PHYS_HIDPI.length) return;
-                    const hidpi = chunk.data.every((val, i) => val === PHYS_HIDPI[i]);
-                    return hidpi;
+                    return chunk.data.every((val, i) => val === PHYS_HIDPI[i]);
                 }
             }
             return false;
@@ -152,7 +198,7 @@ async function loadImageElement(imageFile) {
  */
 function infoForImageFile(matrixClient, roomId, imageFile) {
     let thumbnailType = "image/png";
-    if (imageFile.type == "image/jpeg") {
+    if (imageFile.type === "image/jpeg") {
         thumbnailType = "image/jpeg";
     }
 
@@ -175,15 +221,15 @@ function infoForImageFile(matrixClient, roomId, imageFile) {
  * @param {File} videoFile The file to load in an video element.
  * @return {Promise} A promise that resolves with the video image element.
  */
-function loadVideoElement(videoFile) {
+function loadVideoElement(videoFile): Promise<HTMLVideoElement> {
     return new Promise((resolve, reject) => {
         // Load the file into an html element
         const video = document.createElement("video");
 
         const reader = new FileReader();
 
-        reader.onload = function(e) {
-            video.src = e.target.result;
+        reader.onload = function(ev) {
+            video.src = ev.target.result as string;
 
             // Once ready, returns its size
             // Wait until we have enough data to thumbnail the first frame.
@@ -231,11 +277,11 @@ function infoForVideoFile(matrixClient, roomId, videoFile) {
  * @return {Promise} A promise that resolves with an ArrayBuffer when the file
  *   is read.
  */
-function readFileAsArrayBuffer(file) {
+function readFileAsArrayBuffer(file: File | Blob): Promise<ArrayBuffer> {
     return new Promise((resolve, reject) => {
         const reader = new FileReader();
         reader.onload = function(e) {
-            resolve(e.target.result);
+            resolve(e.target.result as ArrayBuffer);
         };
         reader.onerror = function(e) {
             reject(e);
@@ -257,11 +303,11 @@ function readFileAsArrayBuffer(file) {
  *  If the file is unencrypted then the object will have a "url" key.
  *  If the file is encrypted then the object will have a "file" key.
  */
-function uploadFile(matrixClient, roomId, file, progressHandler) {
+function uploadFile(matrixClient: MatrixClient, roomId: string, file: File | Blob, progressHandler?: any) {
+    let canceled = false;
     if (matrixClient.isRoomEncrypted(roomId)) {
         // If the room is encrypted then encrypt the file before uploading it.
         // First read the file into memory.
-        let canceled = false;
         let uploadPromise;
         let encryptInfo;
         const prom = readFileAsArrayBuffer(file).then(function(data) {
@@ -278,9 +324,9 @@ function uploadFile(matrixClient, roomId, file, progressHandler) {
                 progressHandler: progressHandler,
                 includeFilename: false,
             });
-
             return uploadPromise;
         }).then(function(url) {
+            if (canceled) throw new UploadCanceledError();
             // If the attachment is encrypted then bundle the URL along
             // with the information needed to decrypt the attachment and
             // add it under a file key.
@@ -290,7 +336,7 @@ function uploadFile(matrixClient, roomId, file, progressHandler) {
             }
             return {"file": encryptInfo};
         });
-        prom.abort = () => {
+        (prom as IAbortablePromise<any>).abort = () => {
             canceled = true;
             if (uploadPromise) MatrixClientPeg.get().cancelUpload(uploadPromise);
         };
@@ -300,55 +346,23 @@ function uploadFile(matrixClient, roomId, file, progressHandler) {
             progressHandler: progressHandler,
         });
         const promise1 = basePromise.then(function(url) {
+            if (canceled) throw new UploadCanceledError();
             // If the attachment isn't encrypted then include the URL directly.
             return {"url": url};
         });
-        // XXX: copy over the abort method to the new promise
-        promise1.abort = basePromise.abort;
+        promise1.abort = () => {
+            canceled = true;
+            MatrixClientPeg.get().cancelUpload(basePromise);
+        };
         return promise1;
     }
 }
 
 export default class ContentMessages {
-    constructor() {
-        this.inprogress = [];
-        this.nextId = 0;
-        this._mediaConfig = null;
-    }
+    private inprogress: IUpload[] = [];
+    private mediaConfig: IMediaConfig = null;
 
-    static sharedInstance() {
-        if (global.mx_ContentMessages === undefined) {
-            global.mx_ContentMessages = new ContentMessages();
-        }
-        return global.mx_ContentMessages;
-    }
-
-    _isFileSizeAcceptable(file) {
-        if (this._mediaConfig !== null &&
-            this._mediaConfig["m.upload.size"] !== undefined &&
-            file.size > this._mediaConfig["m.upload.size"]) {
-            return false;
-        }
-        return true;
-    }
-
-    _ensureMediaConfigFetched() {
-        if (this._mediaConfig !== null) return;
-
-        console.log("[Media Config] Fetching");
-        return MatrixClientPeg.get().getMediaConfig().then((config) => {
-            console.log("[Media Config] Fetched config:", config);
-            return config;
-        }).catch(() => {
-            // Media repo can't or won't report limits, so provide an empty object (no limits).
-            console.log("[Media Config] Could not fetch config, so not limiting uploads.");
-            return {};
-        }).then((config) => {
-            this._mediaConfig = config;
-        });
-    }
-
-    sendStickerContentToRoom(url, roomId, info, text, matrixClient) {
+    sendStickerContentToRoom(url: string, roomId: string, info: string, text: string, matrixClient: MatrixClient) {
         return MatrixClientPeg.get().sendStickerMessage(roomId, url, info, text).catch((e) => {
             console.warn(`Failed to send content with URL ${url} to room ${roomId}`, e);
             throw e;
@@ -356,14 +370,14 @@ export default class ContentMessages {
     }
 
     getUploadLimit() {
-        if (this._mediaConfig !== null && this._mediaConfig["m.upload.size"] !== undefined) {
-            return this._mediaConfig["m.upload.size"];
+        if (this.mediaConfig !== null && this.mediaConfig["m.upload.size"] !== undefined) {
+            return this.mediaConfig["m.upload.size"];
         } else {
             return null;
         }
     }
 
-    async sendContentListToRoom(files, roomId, matrixClient) {
+    async sendContentListToRoom(files: File[], roomId: string, matrixClient: MatrixClient) {
         if (matrixClient.isGuest()) {
             dis.dispatch({action: 'require_registration'});
             return;
@@ -372,32 +386,32 @@ export default class ContentMessages {
         const isQuoting = Boolean(RoomViewStore.getQuotingEvent());
         if (isQuoting) {
             const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-            const shouldUpload = await new Promise((resolve) => {
-                Modal.createTrackedDialog('Upload Reply Warning', '', QuestionDialog, {
-                    title: _t('Replying With Files'),
-                    description: (
-                        <div>{_t(
-                            'At this time it is not possible to reply with a file. ' +
-                            'Would you like to upload this file without replying?',
-                        )}</div>
-                    ),
-                    hasCancelButton: true,
-                    button: _t("Continue"),
-                    onFinished: (shouldUpload) => {
-                        resolve(shouldUpload);
-                    },
-                });
+            const {finished} = Modal.createTrackedDialog<[boolean]>('Upload Reply Warning', '', QuestionDialog, {
+                title: _t('Replying With Files'),
+                description: (
+                    <div>{_t(
+                        'At this time it is not possible to reply with a file. ' +
+                        'Would you like to upload this file without replying?',
+                    )}</div>
+                ),
+                hasCancelButton: true,
+                button: _t("Continue"),
             });
+            const [shouldUpload] = await finished;
             if (!shouldUpload) return;
         }
 
-        await this._ensureMediaConfigFetched();
+        if (!this.mediaConfig) { // hot-path optimization to not flash a spinner if we don't need to
+            const modal = Modal.createDialog(Spinner, null, 'mx_Dialog_spinner');
+            await this.ensureMediaConfigFetched();
+            modal.close();
+        }
 
         const tooBigFiles = [];
         const okFiles = [];
 
         for (let i = 0; i < files.length; ++i) {
-            if (this._isFileSizeAcceptable(files[i])) {
+            if (this.isFileSizeAcceptable(files[i])) {
                 okFiles.push(files[i]);
             } else {
                 tooBigFiles.push(files[i]);
@@ -406,17 +420,12 @@ export default class ContentMessages {
 
         if (tooBigFiles.length > 0) {
             const UploadFailureDialog = sdk.getComponent("dialogs.UploadFailureDialog");
-            const uploadFailureDialogPromise = new Promise((resolve) => {
-                Modal.createTrackedDialog('Upload Failure', '', UploadFailureDialog, {
-                    badFiles: tooBigFiles,
-                    totalFiles: files.length,
-                    contentMessages: this,
-                    onFinished: (shouldContinue) => {
-                        resolve(shouldContinue);
-                    },
-                });
+            const {finished} = Modal.createTrackedDialog<[boolean]>('Upload Failure', '', UploadFailureDialog, {
+                badFiles: tooBigFiles,
+                totalFiles: files.length,
+                contentMessages: this,
             });
-            const shouldContinue = await uploadFailureDialogPromise;
+            const [shouldContinue] = await finished;
             if (!shouldContinue) return;
         }
 
@@ -428,31 +437,47 @@ export default class ContentMessages {
         for (let i = 0; i < okFiles.length; ++i) {
             const file = okFiles[i];
             if (!uploadAll) {
-                const shouldContinue = await new Promise((resolve) => {
-                    Modal.createTrackedDialog('Upload Files confirmation', '', UploadConfirmDialog, {
-                        file,
-                        currentIndex: i,
-                        totalFiles: okFiles.length,
-                        onFinished: (shouldContinue, shouldUploadAll) => {
-                            if (shouldUploadAll) {
-                                uploadAll = true;
-                            }
-                            resolve(shouldContinue);
-                        },
-                    });
+                const {finished} = Modal.createTrackedDialog<[boolean, boolean]>('Upload Files confirmation', '', UploadConfirmDialog, {
+                    file,
+                    currentIndex: i,
+                    totalFiles: okFiles.length,
                 });
+                const [shouldContinue, shouldUploadAll] = await finished;
                 if (!shouldContinue) break;
+                if (shouldUploadAll) {
+                    uploadAll = true;
+                }
             }
-            promBefore = this._sendContentToRoom(file, roomId, matrixClient, promBefore);
+            promBefore = this.sendContentToRoom(file, roomId, matrixClient, promBefore);
         }
     }
 
-    _sendContentToRoom(file, roomId, matrixClient, promBefore) {
-        const content = {
+    getCurrentUploads() {
+        return this.inprogress.filter(u => !u.canceled);
+    }
+
+    cancelUpload(promise: Promise<any>) {
+        let upload: IUpload;
+        for (let i = 0; i < this.inprogress.length; ++i) {
+            if (this.inprogress[i].promise === promise) {
+                upload = this.inprogress[i];
+                break;
+            }
+        }
+        if (upload) {
+            upload.canceled = true;
+            MatrixClientPeg.get().cancelUpload(upload.promise);
+            dis.dispatch({action: 'upload_canceled', upload});
+        }
+    }
+
+    private sendContentToRoom(file: File, roomId: string, matrixClient: MatrixClient, promBefore: Promise<any>) {
+        const content: IContent = {
             body: file.name || 'Attachment',
             info: {
                 size: file.size,
             },
+            msgtype: "", // set later
         };
 
         // if we have a mime type for the file, add it to the message metadata
@@ -461,25 +486,25 @@ export default class ContentMessages {
         }
 
         const prom = new Promise((resolve) => {
-            if (file.type.indexOf('image/') == 0) {
+            if (file.type.indexOf('image/') === 0) {
                 content.msgtype = 'm.image';
-                infoForImageFile(matrixClient, roomId, file).then((imageInfo)=>{
+                infoForImageFile(matrixClient, roomId, file).then((imageInfo) => {
                     extend(content.info, imageInfo);
                     resolve();
-                }, (error)=>{
-                    console.error(error);
+                }, (e) => {
+                    console.error(e);
                     content.msgtype = 'm.file';
                     resolve();
                 });
-            } else if (file.type.indexOf('audio/') == 0) {
+            } else if (file.type.indexOf('audio/') === 0) {
                 content.msgtype = 'm.audio';
                 resolve();
-            } else if (file.type.indexOf('video/') == 0) {
+            } else if (file.type.indexOf('video/') === 0) {
                 content.msgtype = 'm.video';
-                infoForVideoFile(matrixClient, roomId, file).then((videoInfo)=>{
+                infoForVideoFile(matrixClient, roomId, file).then((videoInfo) => {
                     extend(content.info, videoInfo);
                     resolve();
-                }, (error)=>{
+                }, (e) => {
                     content.msgtype = 'm.file';
                     resolve();
                 });
@@ -489,19 +514,23 @@ export default class ContentMessages {
             }
         });
 
-        const upload = {
+        // create temporary abort handler for before the actual upload gets passed off to js-sdk
+        (prom as IAbortablePromise<any>).abort = () => {
+            upload.canceled = true;
+        };
+
+        const upload: IUpload = {
             fileName: file.name || 'Attachment',
             roomId: roomId,
-            total: 0,
+            total: file.size,
             loaded: 0,
+            promise: prom,
         };
         this.inprogress.push(upload);
         dis.dispatch({action: 'upload_started'});
 
         // Focus the composer view
-        dis.dispatch({action: 'focus_composer'});
-
-        let error;
+        dis.fire(Action.FocusComposer);
 
         function onProgress(ev) {
             upload.total = ev.total;
@@ -509,7 +538,9 @@ export default class ContentMessages {
             dis.dispatch({action: 'upload_progress', upload: upload});
         }
 
+        let error;
         return prom.then(function() {
+            if (upload.canceled) throw new UploadCanceledError();
             // XXX: upload.promise must be the promise that
             // is returned by uploadFile as it has an abort()
             // method hacked onto it.
@@ -520,16 +551,17 @@ export default class ContentMessages {
                 content.file = result.file;
                 content.url = result.url;
             });
-        }).then((url) => {
+        }).then(() => {
             // Await previous message being sent into the room
             return promBefore;
         }).then(function() {
+            if (upload.canceled) throw new UploadCanceledError();
             return matrixClient.sendMessage(roomId, content);
         }, function(err) {
             error = err;
             if (!upload.canceled) {
                 let desc = _t("The file '%(fileName)s' failed to upload.", {fileName: upload.fileName});
-                if (err.http_status == 413) {
+                if (err.http_status === 413) {
                     desc = _t(
                         "The file '%(fileName)s' exceeds this homeserver's size limit for uploads",
                         {fileName: upload.fileName},
@@ -542,11 +574,9 @@ export default class ContentMessages {
                 });
             }
         }).finally(() => {
-            const inprogressKeys = Object.keys(this.inprogress);
             for (let i = 0; i < this.inprogress.length; ++i) {
-                const k = inprogressKeys[i];
-                if (this.inprogress[k].promise === upload.promise) {
-                    this.inprogress.splice(k, 1);
+                if (this.inprogress[i].promise === upload.promise) {
+                    this.inprogress.splice(i, 1);
                     break;
                 }
             }
@@ -555,7 +585,7 @@ export default class ContentMessages {
                 // clear the media size limit so we fetch it again next time
                 // we try to upload
                 if (error && error.http_status === 413) {
-                    this._mediaConfig = null;
+                    this.mediaConfig = null;
                 }
                 dis.dispatch({action: 'upload_failed', upload, error});
             } else {
@@ -565,24 +595,35 @@ export default class ContentMessages {
         });
     }
 
-    getCurrentUploads() {
-        return this.inprogress.filter(u => !u.canceled);
+    private isFileSizeAcceptable(file: File) {
+        if (this.mediaConfig !== null &&
+            this.mediaConfig["m.upload.size"] !== undefined &&
+            file.size > this.mediaConfig["m.upload.size"]) {
+            return false;
+        }
+        return true;
     }
 
-    cancelUpload(promise) {
-        const inprogressKeys = Object.keys(this.inprogress);
-        let upload;
-        for (let i = 0; i < this.inprogress.length; ++i) {
-            const k = inprogressKeys[i];
-            if (this.inprogress[k].promise === promise) {
-                upload = this.inprogress[k];
-                break;
-            }
-        }
-        if (upload) {
-            upload.canceled = true;
-            MatrixClientPeg.get().cancelUpload(upload.promise);
-            dis.dispatch({action: 'upload_canceled', upload});
+    private ensureMediaConfigFetched() {
+        if (this.mediaConfig !== null) return;
+
+        console.log("[Media Config] Fetching");
+        return MatrixClientPeg.get().getMediaConfig().then((config) => {
+            console.log("[Media Config] Fetched config:", config);
+            return config;
+        }).catch(() => {
+            // Media repo can't or won't report limits, so provide an empty object (no limits).
+            console.log("[Media Config] Could not fetch config, so not limiting uploads.");
+            return {};
+        }).then((config) => {
+            this.mediaConfig = config;
+        });
+    }
+
+    static sharedInstance() {
+        if (window.mxContentMessages === undefined) {
+            window.mxContentMessages = new ContentMessages();
         }
+        return window.mxContentMessages;
     }
 }
diff --git a/src/CrossSigningManager.js b/src/CrossSigningManager.js
index c37d0f8bf5..676c41d7d7 100644
--- a/src/CrossSigningManager.js
+++ b/src/CrossSigningManager.js
@@ -20,7 +20,6 @@ import {MatrixClientPeg} from './MatrixClientPeg';
 import { deriveKey } from 'matrix-js-sdk/src/crypto/key_passphrase';
 import { decodeRecoveryKey } from 'matrix-js-sdk/src/crypto/recoverykey';
 import { _t } from './languageHandler';
-import SettingsStore from './settings/SettingsStore';
 import {encodeBase64} from "matrix-js-sdk/src/crypto/olmlib";
 
 // This stores the secret storage private keys in memory for the JS SDK. This is
@@ -32,10 +31,7 @@ let secretStorageKeys = {};
 let secretStorageBeingAccessed = false;
 
 function isCachingAllowed() {
-    return (
-        secretStorageBeingAccessed ||
-        SettingsStore.getValue("keepSecretStoragePassphraseForSession")
-    );
+    return secretStorageBeingAccessed;
 }
 
 export class AccessCancelledError extends Error {
@@ -44,25 +40,16 @@ export class AccessCancelledError extends Error {
     }
 }
 
-async function confirmToDismiss(name) {
-    let description;
-    if (name === "m.cross_signing.user_signing") {
-        description = _t("If you cancel now, you won't complete verifying the other user.");
-    } else if (name === "m.cross_signing.self_signing") {
-        description = _t("If you cancel now, you won't complete verifying your other session.");
-    } else {
-        description = _t("If you cancel now, you won't complete your operation.");
-    }
-
+async function confirmToDismiss() {
     const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
     const [sure] = await Modal.createDialog(QuestionDialog, {
         title: _t("Cancel entering passphrase?"),
-        description,
-        danger: true,
-        cancelButton: _t("Enter passphrase"),
-        button: _t("Cancel"),
+        description: _t("Are you sure you want to cancel entering passphrase?"),
+        danger: false,
+        button: _t("Go Back"),
+        cancelButton: _t("Cancel"),
     }).finished;
-    return sure;
+    return !sure;
 }
 
 async function getSecretStorageKey({ keys: keyInfos }, ssssItemName) {
@@ -106,7 +93,7 @@ async function getSecretStorageKey({ keys: keyInfos }, ssssItemName) {
         /* options= */ {
             onBeforeClose: async (reason) => {
                 if (reason === "backgroundClick") {
-                    return confirmToDismiss(ssssItemName);
+                    return confirmToDismiss();
                 }
                 return true;
             },
@@ -142,27 +129,21 @@ const onSecretRequested = async function({
         console.log(`CrossSigningManager: Ignoring request from untrusted device ${deviceId}`);
         return;
     }
-    if (name.startsWith("m.cross_signing")) {
+    if (
+        name === "m.cross_signing.master" ||
+        name === "m.cross_signing.self_signing" ||
+        name === "m.cross_signing.user_signing"
+    ) {
         const callbacks = client.getCrossSigningCacheCallbacks();
         if (!callbacks.getCrossSigningKeyCache) return;
-        /* Explicit enumeration here is deliberate – never share the master key! */
-        if (name === "m.cross_signing.self_signing") {
-            const key = await callbacks.getCrossSigningKeyCache("self_signing");
-            if (!key) {
-                console.log(
-                    `self_signing requested by ${deviceId}, but not found in cache`,
-                );
-            }
-            return key && encodeBase64(key);
-        } else if (name === "m.cross_signing.user_signing") {
-            const key = await callbacks.getCrossSigningKeyCache("user_signing");
-            if (!key) {
-                console.log(
-                    `user_signing requested by ${deviceId}, but not found in cache`,
-                );
-            }
-            return key && encodeBase64(key);
+        const keyId = name.replace("m.cross_signing.", "");
+        const key = await callbacks.getCrossSigningKeyCache(keyId);
+        if (!key) {
+            console.log(
+                `${keyId} requested by ${deviceId}, but not found in cache`,
+            );
         }
+        return key && encodeBase64(key);
     } else if (name === "m.megolm_backup.v1") {
         const key = await client._crypto.getSessionBackupPrivateKey();
         if (!key) {
diff --git a/src/DeviceListener.js b/src/DeviceListener.js
deleted file mode 100644
index d948911d7c..0000000000
--- a/src/DeviceListener.js
+++ /dev/null
@@ -1,306 +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 { MatrixClientPeg } from './MatrixClientPeg';
-import SettingsStore from './settings/SettingsStore';
-import * as sdk from './index';
-import { _t } from './languageHandler';
-import ToastStore from './stores/ToastStore';
-
-const KEY_BACKUP_POLL_INTERVAL = 5 * 60 * 1000;
-const THIS_DEVICE_TOAST_KEY = 'setupencryption';
-const OTHER_DEVICES_TOAST_KEY = 'reviewsessions';
-
-function toastKey(deviceId) {
-    return "unverified_session_" + deviceId;
-}
-
-export default class DeviceListener {
-    static sharedInstance() {
-        if (!global.mx_DeviceListener) global.mx_DeviceListener = new DeviceListener();
-        return global.mx_DeviceListener;
-    }
-
-    constructor() {
-        // device IDs for which the user has dismissed the verify toast ('Later')
-        this._dismissed = new Set();
-        // has the user dismissed any of the various nag toasts to setup encryption on this device?
-        this._dismissedThisDeviceToast = false;
-
-        // cache of the key backup info
-        this._keyBackupInfo = null;
-        this._keyBackupFetchedAt = null;
-
-        // We keep a list of our own device IDs so we can batch ones that were already
-        // there the last time the app launched into a single toast, but display new
-        // ones in their own toasts.
-        this._ourDeviceIdsAtStart = null;
-
-        // The set of device IDs we're currently displaying toasts for
-        this._displayingToastsForDeviceIds = new Set();
-    }
-
-    start() {
-        MatrixClientPeg.get().on('crypto.willUpdateDevices', this._onWillUpdateDevices);
-        MatrixClientPeg.get().on('crypto.devicesUpdated', this._onDevicesUpdated);
-        MatrixClientPeg.get().on('deviceVerificationChanged', this._onDeviceVerificationChanged);
-        MatrixClientPeg.get().on('userTrustStatusChanged', this._onUserTrustStatusChanged);
-        MatrixClientPeg.get().on('crossSigning.keysChanged', this._onCrossSingingKeysChanged);
-        MatrixClientPeg.get().on('accountData', this._onAccountData);
-        MatrixClientPeg.get().on('sync', this._onSync);
-        this._recheck();
-    }
-
-    stop() {
-        if (MatrixClientPeg.get()) {
-            MatrixClientPeg.get().removeListener('crypto.willUpdateDevices', this._onWillUpdateDevices);
-            MatrixClientPeg.get().removeListener('crypto.devicesUpdated', this._onDevicesUpdated);
-            MatrixClientPeg.get().removeListener('deviceVerificationChanged', this._onDeviceVerificationChanged);
-            MatrixClientPeg.get().removeListener('userTrustStatusChanged', this._onUserTrustStatusChanged);
-            MatrixClientPeg.get().removeListener('crossSigning.keysChanged', this._onCrossSingingKeysChanged);
-            MatrixClientPeg.get().removeListener('accountData', this._onAccountData);
-            MatrixClientPeg.get().removeListener('sync', this._onSync);
-        }
-        this._dismissed.clear();
-        this._dismissedThisDeviceToast = false;
-        this._keyBackupInfo = null;
-        this._keyBackupFetchedAt = null;
-    }
-
-    /**
-     * Dismiss notifications about our own unverified devices
-     *
-     * @param {String[]} deviceIds List of device IDs to dismiss notifications for
-     */
-    async dismissUnverifiedSessions(deviceIds) {
-        for (const d of deviceIds) {
-            this._dismissed.add(d);
-        }
-
-        this._recheck();
-    }
-
-    dismissEncryptionSetup() {
-        this._dismissedThisDeviceToast = true;
-        this._recheck();
-    }
-
-    _ensureDeviceIdsAtStartPopulated() {
-        if (this._ourDeviceIdsAtStart === null) {
-            const cli = MatrixClientPeg.get();
-            this._ourDeviceIdsAtStart = new Set(
-                cli.getStoredDevicesForUser(cli.getUserId()).map(d => d.deviceId),
-            );
-        }
-    }
-
-    _onWillUpdateDevices = async (users, initialFetch) => {
-        // If we didn't know about *any* devices before (ie. it's fresh login),
-        // then they are all pre-existing devices, so ignore this and set the
-        // devicesAtStart list to the devices that we see after the fetch.
-        if (initialFetch) return;
-
-        const myUserId = MatrixClientPeg.get().getUserId();
-        if (users.includes(myUserId)) this._ensureDeviceIdsAtStartPopulated();
-
-        // No need to do a recheck here: we just need to get a snapshot of our devices
-        // before we download any new ones.
-    }
-
-    _onDevicesUpdated = (users) => {
-        if (!users.includes(MatrixClientPeg.get().getUserId())) return;
-        this._recheck();
-    }
-
-    _onDeviceVerificationChanged = (userId) => {
-        if (userId !== MatrixClientPeg.get().getUserId()) return;
-        this._recheck();
-    }
-
-    _onUserTrustStatusChanged = (userId, trustLevel) => {
-        if (userId !== MatrixClientPeg.get().getUserId()) return;
-        this._recheck();
-    }
-
-    _onCrossSingingKeysChanged = () => {
-        this._recheck();
-    }
-
-    _onAccountData = (ev) => {
-        // User may have:
-        // * migrated SSSS to symmetric
-        // * uploaded keys to secret storage
-        // * completed secret storage creation
-        // which result in account data changes affecting checks below.
-        if (
-            ev.getType().startsWith('m.secret_storage.') ||
-            ev.getType().startsWith('m.cross_signing.')
-        ) {
-            this._recheck();
-        }
-    }
-
-    _onSync = (state, prevState) => {
-        if (state === 'PREPARED' && prevState === null) this._recheck();
-    }
-
-    // The server doesn't tell us when key backup is set up, so we poll
-    // & cache the result
-    async _getKeyBackupInfo() {
-        const now = (new Date()).getTime();
-        if (!this._keyBackupInfo || this._keyBackupFetchedAt < now - KEY_BACKUP_POLL_INTERVAL) {
-            this._keyBackupInfo = await MatrixClientPeg.get().getKeyBackupVersion();
-            this._keyBackupFetchedAt = now;
-        }
-        return this._keyBackupInfo;
-    }
-
-    async _recheck() {
-        const cli = MatrixClientPeg.get();
-
-        if (
-            !SettingsStore.getValue("feature_cross_signing") ||
-            !await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")
-        ) return;
-
-        if (!cli.isCryptoEnabled()) return;
-        // don't recheck until the initial sync is complete: lots of account data events will fire
-        // while the initial sync is processing and we don't need to recheck on each one of them
-        // (we add a listener on sync to do once check after the initial sync is done)
-        if (!cli.isInitialSyncComplete()) return;
-
-        const crossSigningReady = await cli.isCrossSigningReady();
-
-        if (this._dismissedThisDeviceToast) {
-            ToastStore.sharedInstance().dismissToast(THIS_DEVICE_TOAST_KEY);
-        } else {
-            if (!crossSigningReady) {
-                // make sure our keys are finished downlaoding
-                await cli.downloadKeys([cli.getUserId()]);
-                // cross signing isn't enabled - nag to enable it
-                // There are 3 different toasts for:
-                if (cli.getStoredCrossSigningForUser(cli.getUserId())) {
-                    // Cross-signing on account but this device doesn't trust the master key (verify this session)
-                    ToastStore.sharedInstance().addOrReplaceToast({
-                        key: THIS_DEVICE_TOAST_KEY,
-                        title: _t("Verify this session"),
-                        icon: "verification_warning",
-                        props: {kind: 'verify_this_session'},
-                        component: sdk.getComponent("toasts.SetupEncryptionToast"),
-                    });
-                } else {
-                    const backupInfo = await this._getKeyBackupInfo();
-                    if (backupInfo) {
-                        // No cross-signing on account but key backup available (upgrade encryption)
-                        ToastStore.sharedInstance().addOrReplaceToast({
-                            key: THIS_DEVICE_TOAST_KEY,
-                            title: _t("Encryption upgrade available"),
-                            icon: "verification_warning",
-                            props: {kind: 'upgrade_encryption'},
-                            component: sdk.getComponent("toasts.SetupEncryptionToast"),
-                        });
-                    } else {
-                        // No cross-signing or key backup on account (set up encryption)
-                        ToastStore.sharedInstance().addOrReplaceToast({
-                            key: THIS_DEVICE_TOAST_KEY,
-                            title: _t("Set up encryption"),
-                            icon: "verification_warning",
-                            props: {kind: 'set_up_encryption'},
-                            component: sdk.getComponent("toasts.SetupEncryptionToast"),
-                        });
-                    }
-                }
-            } else if (await cli.secretStorageKeyNeedsUpgrade()) {
-                ToastStore.sharedInstance().addOrReplaceToast({
-                    key: THIS_DEVICE_TOAST_KEY,
-                    title: _t("Encryption upgrade available"),
-                    icon: "verification_warning",
-                    props: {kind: 'upgrade_ssss'},
-                    component: sdk.getComponent("toasts.SetupEncryptionToast"),
-                });
-            } else {
-                // cross-signing is ready, and we don't need to upgrade encryption
-                ToastStore.sharedInstance().dismissToast(THIS_DEVICE_TOAST_KEY);
-            }
-        }
-
-        // This needs to be done after awaiting on downloadKeys() above, so
-        // we make sure we get the devices after the fetch is done.
-        this._ensureDeviceIdsAtStartPopulated();
-
-        // Unverified devices that were there last time the app ran
-        // (technically could just be a boolean: we don't actually
-        // need to remember the device IDs, but for the sake of
-        // symmetry...).
-        const oldUnverifiedDeviceIds = new Set();
-        // Unverified devices that have appeared since then
-        const newUnverifiedDeviceIds = new Set();
-
-        // as long as cross-signing isn't ready,
-        // you can't see or dismiss any device toasts
-        if (crossSigningReady) {
-            const devices = cli.getStoredDevicesForUser(cli.getUserId());
-            for (const device of devices) {
-                if (device.deviceId == cli.deviceId) continue;
-
-                const deviceTrust = await cli.checkDeviceTrust(cli.getUserId(), device.deviceId);
-                if (!deviceTrust.isCrossSigningVerified() && !this._dismissed.has(device.deviceId)) {
-                    if (this._ourDeviceIdsAtStart.has(device.deviceId)) {
-                        oldUnverifiedDeviceIds.add(device.deviceId);
-                    } else {
-                        newUnverifiedDeviceIds.add(device.deviceId);
-                    }
-                }
-            }
-        }
-
-        // Display or hide the batch toast for old unverified sessions
-        if (oldUnverifiedDeviceIds.size > 0) {
-            ToastStore.sharedInstance().addOrReplaceToast({
-                key: OTHER_DEVICES_TOAST_KEY,
-                title: _t("Review where you’re logged in"),
-                icon: "verification_warning",
-                priority: ToastStore.PRIORITY_LOW,
-                props: {
-                    deviceIds: oldUnverifiedDeviceIds,
-                },
-                component: sdk.getComponent("toasts.BulkUnverifiedSessionsToast"),
-            });
-        } else {
-            ToastStore.sharedInstance().dismissToast(OTHER_DEVICES_TOAST_KEY);
-        }
-
-        // Show toasts for new unverified devices if they aren't already there
-        for (const deviceId of newUnverifiedDeviceIds) {
-            ToastStore.sharedInstance().addOrReplaceToast({
-                key: toastKey(deviceId),
-                title: _t("New login. Was this you?"),
-                icon: "verification_warning",
-                props: { deviceId },
-                component: sdk.getComponent("toasts.UnverifiedSessionToast"),
-            });
-        }
-
-        // ...and hide any we don't need any more
-        for (const deviceId of this._displayingToastsForDeviceIds) {
-            if (!newUnverifiedDeviceIds.has(deviceId)) {
-                ToastStore.sharedInstance().dismissToast(toastKey(deviceId));
-            }
-        }
-
-        this._displayingToastsForDeviceIds = newUnverifiedDeviceIds;
-    }
-}
diff --git a/src/DeviceListener.ts b/src/DeviceListener.ts
new file mode 100644
index 0000000000..a37521118f
--- /dev/null
+++ b/src/DeviceListener.ts
@@ -0,0 +1,266 @@
+/*
+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 {MatrixClientPeg} from './MatrixClientPeg';
+import {
+    hideToast as hideBulkUnverifiedSessionsToast,
+    showToast as showBulkUnverifiedSessionsToast,
+} from "./toasts/BulkUnverifiedSessionsToast";
+import {
+    hideToast as hideSetupEncryptionToast,
+    Kind as SetupKind,
+    showToast as showSetupEncryptionToast,
+} from "./toasts/SetupEncryptionToast";
+import {
+    hideToast as hideUnverifiedSessionsToast,
+    showToast as showUnverifiedSessionsToast,
+} from "./toasts/UnverifiedSessionToast";
+import {privateShouldBeEncrypted} from "./createRoom";
+
+const KEY_BACKUP_POLL_INTERVAL = 5 * 60 * 1000;
+
+export default class DeviceListener {
+    // device IDs for which the user has dismissed the verify toast ('Later')
+    private dismissed = new Set<string>();
+    // has the user dismissed any of the various nag toasts to setup encryption on this device?
+    private dismissedThisDeviceToast = false;
+    // cache of the key backup info
+    private keyBackupInfo: object = null;
+    private keyBackupFetchedAt: number = null;
+    // We keep a list of our own device IDs so we can batch ones that were already
+    // there the last time the app launched into a single toast, but display new
+    // ones in their own toasts.
+    private ourDeviceIdsAtStart: Set<string> = null;
+    // The set of device IDs we're currently displaying toasts for
+    private displayingToastsForDeviceIds = new Set<string>();
+
+    static sharedInstance() {
+        if (!window.mxDeviceListener) window.mxDeviceListener = new DeviceListener();
+        return window.mxDeviceListener;
+    }
+
+    start() {
+        MatrixClientPeg.get().on('crypto.willUpdateDevices', this._onWillUpdateDevices);
+        MatrixClientPeg.get().on('crypto.devicesUpdated', this._onDevicesUpdated);
+        MatrixClientPeg.get().on('deviceVerificationChanged', this._onDeviceVerificationChanged);
+        MatrixClientPeg.get().on('userTrustStatusChanged', this._onUserTrustStatusChanged);
+        MatrixClientPeg.get().on('crossSigning.keysChanged', this._onCrossSingingKeysChanged);
+        MatrixClientPeg.get().on('accountData', this._onAccountData);
+        MatrixClientPeg.get().on('sync', this._onSync);
+        this._recheck();
+    }
+
+    stop() {
+        if (MatrixClientPeg.get()) {
+            MatrixClientPeg.get().removeListener('crypto.willUpdateDevices', this._onWillUpdateDevices);
+            MatrixClientPeg.get().removeListener('crypto.devicesUpdated', this._onDevicesUpdated);
+            MatrixClientPeg.get().removeListener('deviceVerificationChanged', this._onDeviceVerificationChanged);
+            MatrixClientPeg.get().removeListener('userTrustStatusChanged', this._onUserTrustStatusChanged);
+            MatrixClientPeg.get().removeListener('crossSigning.keysChanged', this._onCrossSingingKeysChanged);
+            MatrixClientPeg.get().removeListener('accountData', this._onAccountData);
+            MatrixClientPeg.get().removeListener('sync', this._onSync);
+        }
+        this.dismissed.clear();
+        this.dismissedThisDeviceToast = false;
+        this.keyBackupInfo = null;
+        this.keyBackupFetchedAt = null;
+        this.ourDeviceIdsAtStart = null;
+        this.displayingToastsForDeviceIds = new Set();
+    }
+
+    /**
+     * Dismiss notifications about our own unverified devices
+     *
+     * @param {String[]} deviceIds List of device IDs to dismiss notifications for
+     */
+    async dismissUnverifiedSessions(deviceIds: Iterable<string>) {
+        for (const d of deviceIds) {
+            this.dismissed.add(d);
+        }
+
+        this._recheck();
+    }
+
+    dismissEncryptionSetup() {
+        this.dismissedThisDeviceToast = true;
+        this._recheck();
+    }
+
+    _ensureDeviceIdsAtStartPopulated() {
+        if (this.ourDeviceIdsAtStart === null) {
+            const cli = MatrixClientPeg.get();
+            this.ourDeviceIdsAtStart = new Set(
+                cli.getStoredDevicesForUser(cli.getUserId()).map(d => d.deviceId),
+            );
+        }
+    }
+
+    _onWillUpdateDevices = async (users: string[], initialFetch?: boolean) => {
+        // If we didn't know about *any* devices before (ie. it's fresh login),
+        // then they are all pre-existing devices, so ignore this and set the
+        // devicesAtStart list to the devices that we see after the fetch.
+        if (initialFetch) return;
+
+        const myUserId = MatrixClientPeg.get().getUserId();
+        if (users.includes(myUserId)) this._ensureDeviceIdsAtStartPopulated();
+
+        // No need to do a recheck here: we just need to get a snapshot of our devices
+        // before we download any new ones.
+    };
+
+    _onDevicesUpdated = (users: string[]) => {
+        if (!users.includes(MatrixClientPeg.get().getUserId())) return;
+        this._recheck();
+    };
+
+    _onDeviceVerificationChanged = (userId: string) => {
+        if (userId !== MatrixClientPeg.get().getUserId()) return;
+        this._recheck();
+    };
+
+    _onUserTrustStatusChanged = (userId: string) => {
+        if (userId !== MatrixClientPeg.get().getUserId()) return;
+        this._recheck();
+    };
+
+    _onCrossSingingKeysChanged = () => {
+        this._recheck();
+    };
+
+    _onAccountData = (ev) => {
+        // User may have:
+        // * migrated SSSS to symmetric
+        // * uploaded keys to secret storage
+        // * completed secret storage creation
+        // which result in account data changes affecting checks below.
+        if (
+            ev.getType().startsWith('m.secret_storage.') ||
+            ev.getType().startsWith('m.cross_signing.')
+        ) {
+            this._recheck();
+        }
+    };
+
+    _onSync = (state, prevState) => {
+        if (state === 'PREPARED' && prevState === null) this._recheck();
+    };
+
+    // The server doesn't tell us when key backup is set up, so we poll
+    // & cache the result
+    async _getKeyBackupInfo() {
+        const now = (new Date()).getTime();
+        if (!this.keyBackupInfo || this.keyBackupFetchedAt < now - KEY_BACKUP_POLL_INTERVAL) {
+            this.keyBackupInfo = await MatrixClientPeg.get().getKeyBackupVersion();
+            this.keyBackupFetchedAt = now;
+        }
+        return this.keyBackupInfo;
+    }
+
+    private shouldShowSetupEncryptionToast() {
+        // In a default configuration, show the toasts. If the well-known config causes e2ee default to be false
+        // then do not show the toasts until user is in at least one encrypted room.
+        if (privateShouldBeEncrypted()) return true;
+        const cli = MatrixClientPeg.get();
+        return cli && cli.getRooms().some(r => cli.isRoomEncrypted(r.roomId));
+    }
+
+    async _recheck() {
+        const cli = MatrixClientPeg.get();
+
+        if (!await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")) return;
+
+        if (!cli.isCryptoEnabled()) return;
+        // don't recheck until the initial sync is complete: lots of account data events will fire
+        // while the initial sync is processing and we don't need to recheck on each one of them
+        // (we add a listener on sync to do once check after the initial sync is done)
+        if (!cli.isInitialSyncComplete()) return;
+
+        const crossSigningReady = await cli.isCrossSigningReady();
+
+        if (this.dismissedThisDeviceToast || crossSigningReady) {
+            hideSetupEncryptionToast();
+        } else if (this.shouldShowSetupEncryptionToast()) {
+            // make sure our keys are finished downloading
+            await cli.downloadKeys([cli.getUserId()]);
+            // cross signing isn't enabled - nag to enable it
+            // There are 3 different toasts for:
+            if (cli.getStoredCrossSigningForUser(cli.getUserId())) {
+                // Cross-signing on account but this device doesn't trust the master key (verify this session)
+                showSetupEncryptionToast(SetupKind.VERIFY_THIS_SESSION);
+            } else {
+                const backupInfo = await this._getKeyBackupInfo();
+                if (backupInfo) {
+                    // No cross-signing on account but key backup available (upgrade encryption)
+                    showSetupEncryptionToast(SetupKind.UPGRADE_ENCRYPTION);
+                } else {
+                    // No cross-signing or key backup on account (set up encryption)
+                    showSetupEncryptionToast(SetupKind.SET_UP_ENCRYPTION);
+                }
+            }
+        }
+
+        // This needs to be done after awaiting on downloadKeys() above, so
+        // we make sure we get the devices after the fetch is done.
+        this._ensureDeviceIdsAtStartPopulated();
+
+        // Unverified devices that were there last time the app ran
+        // (technically could just be a boolean: we don't actually
+        // need to remember the device IDs, but for the sake of
+        // symmetry...).
+        const oldUnverifiedDeviceIds = new Set<string>();
+        // Unverified devices that have appeared since then
+        const newUnverifiedDeviceIds = new Set<string>();
+
+        // as long as cross-signing isn't ready,
+        // you can't see or dismiss any device toasts
+        if (crossSigningReady) {
+            const devices = cli.getStoredDevicesForUser(cli.getUserId());
+            for (const device of devices) {
+                if (device.deviceId === cli.deviceId) continue;
+
+                const deviceTrust = await cli.checkDeviceTrust(cli.getUserId(), device.deviceId);
+                if (!deviceTrust.isCrossSigningVerified() && !this.dismissed.has(device.deviceId)) {
+                    if (this.ourDeviceIdsAtStart.has(device.deviceId)) {
+                        oldUnverifiedDeviceIds.add(device.deviceId);
+                    } else {
+                        newUnverifiedDeviceIds.add(device.deviceId);
+                    }
+                }
+            }
+        }
+
+        // Display or hide the batch toast for old unverified sessions
+        if (oldUnverifiedDeviceIds.size > 0) {
+            showBulkUnverifiedSessionsToast(oldUnverifiedDeviceIds);
+        } else {
+            hideBulkUnverifiedSessionsToast();
+        }
+
+        // Show toasts for new unverified devices if they aren't already there
+        for (const deviceId of newUnverifiedDeviceIds) {
+            showUnverifiedSessionsToast(deviceId);
+        }
+
+        // ...and hide any we don't need any more
+        for (const deviceId of this.displayingToastsForDeviceIds) {
+            if (!newUnverifiedDeviceIds.has(deviceId)) {
+                hideUnverifiedSessionsToast(deviceId);
+            }
+        }
+
+        this.displayingToastsForDeviceIds = newUnverifiedDeviceIds;
+    }
+}
diff --git a/src/FromWidgetPostMessageApi.js b/src/FromWidgetPostMessageApi.js
index c9793d40f7..d5d7c08d50 100644
--- a/src/FromWidgetPostMessageApi.js
+++ b/src/FromWidgetPostMessageApi.js
@@ -17,7 +17,7 @@ limitations under the License.
 */
 
 import URL from 'url';
-import dis from './dispatcher';
+import dis from './dispatcher/dispatcher';
 import WidgetMessagingEndpoint from './WidgetMessagingEndpoint';
 import ActiveWidgetStore from './stores/ActiveWidgetStore';
 import {MatrixClientPeg} from "./MatrixClientPeg";
@@ -25,6 +25,7 @@ import RoomViewStore from "./stores/RoomViewStore";
 import {IntegrationManagers} from "./integrations/IntegrationManagers";
 import SettingsStore from "./settings/SettingsStore";
 import {Capability} from "./widgets/WidgetApi";
+import {objectClone} from "./utils/objects";
 
 const WIDGET_API_VERSION = '0.0.2'; // Current API version
 const SUPPORTED_WIDGET_API_VERSIONS = [
@@ -196,7 +197,7 @@ export default class FromWidgetPostMessageApi {
             const integId = (data && data.integId) ? data.integId : null;
 
             // TODO: Open the right integration manager for the widget
-            if (SettingsStore.isFeatureEnabled("feature_many_integration_managers")) {
+            if (SettingsStore.getValue("feature_many_integration_managers")) {
                 IntegrationManagers.sharedInstance().openAll(
                     MatrixClientPeg.get().getRoom(RoomViewStore.getRoomId()),
                     `type_${integType}`,
@@ -247,7 +248,7 @@ export default class FromWidgetPostMessageApi {
      * @param  {Object} res   Response data
      */
     sendResponse(event, res) {
-        const data = JSON.parse(JSON.stringify(event.data));
+        const data = objectClone(event.data);
         data.response = res;
         event.source.postMessage(data, event.origin);
     }
@@ -260,7 +261,7 @@ export default class FromWidgetPostMessageApi {
      */
     sendError(event, msg, nestedError) {
         console.error('Action:' + event.data.action + ' failed with message: ' + msg);
-        const data = JSON.parse(JSON.stringify(event.data));
+        const data = objectClone(event.data);
         data.response = {
             error: {
                 message: msg,
diff --git a/src/GroupAddressPicker.js b/src/GroupAddressPicker.js
index 9131a89e5d..e7ae3217bb 100644
--- a/src/GroupAddressPicker.js
+++ b/src/GroupAddressPicker.js
@@ -22,6 +22,7 @@ import { _t } from './languageHandler';
 import {MatrixClientPeg} from './MatrixClientPeg';
 import GroupStore from './stores/GroupStore';
 import {allSettled} from "./utils/promise";
+import StyledCheckbox from './components/views/elements/StyledCheckbox';
 
 export function showGroupInviteDialog(groupId) {
     return new Promise((resolve, reject) => {
@@ -61,19 +62,19 @@ export function showGroupAddRoomDialog(groupId) {
             <div>{ _t("Which rooms would you like to add to this community?") }</div>
         </div>;
 
-        const checkboxContainer = <label className="mx_GroupAddressPicker_checkboxContainer">
-            <input type="checkbox" onChange={onCheckboxClicked} />
-            <div>
-                { _t("Show these rooms to non-members on the community page and room list?") }
-            </div>
-        </label>;
+        const checkboxContainer = <StyledCheckbox
+            className="mx_GroupAddressPicker_checkboxContainer"
+            onChange={onCheckboxClicked}
+        >
+            { _t("Show these rooms to non-members on the community page and room list?") }
+        </StyledCheckbox>;
 
         const AddressPickerDialog = sdk.getComponent("dialogs.AddressPickerDialog");
         Modal.createTrackedDialog('Add Rooms to Group', '', AddressPickerDialog, {
             title: _t("Add rooms to the community"),
             description: description,
             extraNode: checkboxContainer,
-            placeholder: _t("Room name or alias"),
+            placeholder: _t("Room name or address"),
             button: _t("Add to community"),
             pickerType: 'room',
             validAddressTypes: ['mx-room-id'],
diff --git a/src/HtmlUtils.js b/src/HtmlUtils.tsx
similarity index 82%
rename from src/HtmlUtils.js
rename to src/HtmlUtils.tsx
index 34e9e55d25..5d33645bb7 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.tsx
@@ -17,10 +17,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
-
-import ReplyThread from "./components/views/elements/ReplyThread";
-
 import React from 'react';
 import sanitizeHtml from 'sanitize-html';
 import * as linkify from 'linkifyjs';
@@ -28,12 +24,13 @@ import linkifyMatrix from './linkify-matrix';
 import _linkifyElement from 'linkifyjs/element';
 import _linkifyString from 'linkifyjs/string';
 import classNames from 'classnames';
-import {MatrixClientPeg} from './MatrixClientPeg';
+import EMOJIBASE_REGEX from 'emojibase-regex';
 import url from 'url';
 
-import EMOJIBASE_REGEX from 'emojibase-regex';
+import {MatrixClientPeg} from './MatrixClientPeg';
 import {tryTransformPermalinkToLocalHref} from "./utils/permalinks/Permalinks";
 import {SHORTCODE_TO_EMOJI, getEmojiFromUnicode} from "./emoji";
+import ReplyThread from "./components/views/elements/ReplyThread";
 
 linkifyMatrix(linkify);
 
@@ -64,7 +61,7 @@ const PERMITTED_URL_SCHEMES = ['http', 'https', 'ftp', 'mailto', 'magnet'];
  * need emojification.
  * unicodeToImage uses this function.
  */
-function mightContainEmoji(str) {
+function mightContainEmoji(str: string) {
     return SURROGATE_PAIR_PATTERN.test(str) || SYMBOL_PATTERN.test(str);
 }
 
@@ -74,7 +71,7 @@ function mightContainEmoji(str) {
  * @param {String} char The emoji character
  * @return {String} The shortcode (such as :thumbup:)
  */
-export function unicodeToShortcode(char) {
+export function unicodeToShortcode(char: string) {
     const data = getEmojiFromUnicode(char);
     return (data && data.shortcodes ? `:${data.shortcodes[0]}:` : '');
 }
@@ -85,7 +82,7 @@ export function unicodeToShortcode(char) {
  * @param {String} shortcode The shortcode (such as :thumbup:)
  * @return {String} The emoji character; null if none exists
  */
-export function shortcodeToUnicode(shortcode) {
+export function shortcodeToUnicode(shortcode: string) {
     shortcode = shortcode.slice(1, shortcode.length - 1);
     const data = SHORTCODE_TO_EMOJI.get(shortcode);
     return data ? data.unicode : null;
@@ -100,7 +97,7 @@ export function processHtmlForSending(html: string): string {
     }
 
     let contentHTML = "";
-    for (let i=0; i < contentDiv.children.length; i++) {
+    for (let i = 0; i < contentDiv.children.length; i++) {
         const element = contentDiv.children[i];
         if (element.tagName.toLowerCase() === 'p') {
             contentHTML += element.innerHTML;
@@ -122,12 +119,19 @@ export function processHtmlForSending(html: string): string {
  * Given an untrusted HTML string, return a React node with an sanitized version
  * of that HTML.
  */
-export function sanitizedHtmlNode(insaneHtml) {
+export function sanitizedHtmlNode(insaneHtml: string) {
     const saneHtml = sanitizeHtml(insaneHtml, sanitizeHtmlParams);
 
     return <div dangerouslySetInnerHTML={{ __html: saneHtml }} dir="auto" />;
 }
 
+export function sanitizedHtmlNodeInnerText(insaneHtml: string) {
+    const saneHtml = sanitizeHtml(insaneHtml, sanitizeHtmlParams);
+    const contentDiv = document.createElement("div");
+    contentDiv.innerHTML = saneHtml;
+    return contentDiv.innerText;
+}
+
 /**
  * Tests if a URL from an untrusted source may be safely put into the DOM
  * The biggest threat here is javascript: URIs.
@@ -136,7 +140,7 @@ export function sanitizedHtmlNode(insaneHtml) {
  * other places we need to sanitise URLs.
  * @return true if permitted, otherwise false
  */
-export function isUrlPermitted(inputUrl) {
+export function isUrlPermitted(inputUrl: string) {
     try {
         const parsed = url.parse(inputUrl);
         if (!parsed.protocol) return false;
@@ -147,9 +151,9 @@ export function isUrlPermitted(inputUrl) {
     }
 }
 
-const transformTags = { // custom to matrix
+const transformTags: sanitizeHtml.IOptions["transformTags"] = { // custom to matrix
     // add blank targets to all hyperlinks except vector URLs
-    'a': function(tagName, attribs) {
+    'a': function(tagName: string, attribs: sanitizeHtml.Attributes) {
         if (attribs.href) {
             attribs.target = '_blank'; // by default
 
@@ -162,7 +166,7 @@ const transformTags = { // custom to matrix
         attribs.rel = 'noreferrer noopener'; // https://mathiasbynens.github.io/rel-noopener/
         return { tagName, attribs };
     },
-    'img': function(tagName, attribs) {
+    'img': function(tagName: string, attribs: sanitizeHtml.Attributes) {
         // 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.
@@ -176,17 +180,17 @@ const transformTags = { // custom to matrix
         );
         return { tagName, attribs };
     },
-    'code': function(tagName, attribs) {
+    'code': function(tagName: string, attribs: sanitizeHtml.Attributes) {
         if (typeof attribs.class !== 'undefined') {
             // Filter out all classes other than ones starting with language- for syntax highlighting.
             const classes = attribs.class.split(/\s/).filter(function(cl) {
-                return cl.startsWith('language-');
+                return cl.startsWith('language-') && !cl.startsWith('language-_');
             });
             attribs.class = classes.join(' ');
         }
         return { tagName, attribs };
     },
-    '*': function(tagName, attribs) {
+    '*': function(tagName: string, attribs: sanitizeHtml.Attributes) {
         // Delete any style previously assigned, style is an allowedTag for font and span
         // because attributes are stripped after transforming
         delete attribs.style;
@@ -220,7 +224,7 @@ const transformTags = { // custom to matrix
     },
 };
 
-const sanitizeHtmlParams = {
+const sanitizeHtmlParams: sanitizeHtml.IOptions = {
     allowedTags: [
         'font', // custom to matrix for IRC-style font coloring
         'del', // for markdown
@@ -247,16 +251,16 @@ const sanitizeHtmlParams = {
 };
 
 // this is the same as the above except with less rewriting
-const composerSanitizeHtmlParams = Object.assign({}, sanitizeHtmlParams);
-composerSanitizeHtmlParams.transformTags = {
-    'code': transformTags['code'],
-    '*': transformTags['*'],
+const composerSanitizeHtmlParams: sanitizeHtml.IOptions = {
+    ...sanitizeHtmlParams,
+    transformTags: {
+        'code': transformTags['code'],
+        '*': transformTags['*'],
+    },
 };
 
-class BaseHighlighter {
-    constructor(highlightClass, highlightLink) {
-        this.highlightClass = highlightClass;
-        this.highlightLink = highlightLink;
+abstract class BaseHighlighter<T extends React.ReactNode> {
+    constructor(public highlightClass: string, public highlightLink: string) {
     }
 
     /**
@@ -270,47 +274,49 @@ class BaseHighlighter {
      * returns a list of results (strings for HtmlHighligher, react nodes for
      * TextHighlighter).
      */
-    applyHighlights(safeSnippet, safeHighlights) {
+    public applyHighlights(safeSnippet: string, safeHighlights: string[]): T[] {
         let lastOffset = 0;
         let offset;
-        let nodes = [];
+        let nodes: T[] = [];
 
         const safeHighlight = safeHighlights[0];
         while ((offset = safeSnippet.toLowerCase().indexOf(safeHighlight.toLowerCase(), lastOffset)) >= 0) {
             // handle preamble
             if (offset > lastOffset) {
-                var subSnippet = safeSnippet.substring(lastOffset, offset);
-                nodes = nodes.concat(this._applySubHighlights(subSnippet, safeHighlights));
+                const subSnippet = safeSnippet.substring(lastOffset, offset);
+                nodes = nodes.concat(this.applySubHighlights(subSnippet, safeHighlights));
             }
 
             // do highlight. use the original string rather than safeHighlight
             // to preserve the original casing.
             const endOffset = offset + safeHighlight.length;
-            nodes.push(this._processSnippet(safeSnippet.substring(offset, endOffset), true));
+            nodes.push(this.processSnippet(safeSnippet.substring(offset, endOffset), true));
 
             lastOffset = endOffset;
         }
 
         // handle postamble
         if (lastOffset !== safeSnippet.length) {
-            subSnippet = safeSnippet.substring(lastOffset, undefined);
-            nodes = nodes.concat(this._applySubHighlights(subSnippet, safeHighlights));
+            const subSnippet = safeSnippet.substring(lastOffset, undefined);
+            nodes = nodes.concat(this.applySubHighlights(subSnippet, safeHighlights));
         }
         return nodes;
     }
 
-    _applySubHighlights(safeSnippet, safeHighlights) {
+    private applySubHighlights(safeSnippet: string, safeHighlights: string[]): T[] {
         if (safeHighlights[1]) {
             // recurse into this range to check for the next set of highlight matches
             return this.applyHighlights(safeSnippet, safeHighlights.slice(1));
         } else {
             // no more highlights to be found, just return the unhighlighted string
-            return [this._processSnippet(safeSnippet, false)];
+            return [this.processSnippet(safeSnippet, false)];
         }
     }
+
+    protected abstract processSnippet(snippet: string, highlight: boolean): T;
 }
 
-class HtmlHighlighter extends BaseHighlighter {
+class HtmlHighlighter extends BaseHighlighter<string> {
     /* highlight the given snippet if required
      *
      * snippet: content of the span; must have been sanitised
@@ -318,28 +324,23 @@ class HtmlHighlighter extends BaseHighlighter {
      *
      * returns an HTML string
      */
-    _processSnippet(snippet, highlight) {
+    protected processSnippet(snippet: string, highlight: boolean): string {
         if (!highlight) {
             // nothing required here
             return snippet;
         }
 
-        let span = "<span class=\""+this.highlightClass+"\">"
-            + snippet + "</span>";
+        let span = `<span class="${this.highlightClass}">${snippet}</span>`;
 
         if (this.highlightLink) {
-            span = "<a href=\""+encodeURI(this.highlightLink)+"\">"
-                +span+"</a>";
+            span = `<a href="${encodeURI(this.highlightLink)}">${span}</a>`;
         }
         return span;
     }
 }
 
-class TextHighlighter extends BaseHighlighter {
-    constructor(highlightClass, highlightLink) {
-        super(highlightClass, highlightLink);
-        this._key = 0;
-    }
+class TextHighlighter extends BaseHighlighter<React.ReactNode> {
+    private key = 0;
 
     /* create a <span> node to hold the given content
      *
@@ -348,13 +349,12 @@ class TextHighlighter extends BaseHighlighter {
      *
      * returns a React node
      */
-    _processSnippet(snippet, highlight) {
-        const key = this._key++;
+    protected processSnippet(snippet: string, highlight: boolean): React.ReactNode {
+        const key = this.key++;
 
-        let node =
-            <span key={key} className={highlight ? this.highlightClass : null}>
-                { snippet }
-            </span>;
+        let node = <span key={key} className={highlight ? this.highlightClass : null}>
+            { snippet }
+        </span>;
 
         if (highlight && this.highlightLink) {
             node = <a key={key} href={this.highlightLink}>{ node }</a>;
@@ -364,6 +364,20 @@ class TextHighlighter extends BaseHighlighter {
     }
 }
 
+interface IContent {
+    format?: string;
+    formatted_body?: string;
+    body: string;
+}
+
+interface IOpts {
+    highlightLink?: string;
+    disableBigEmoji?: boolean;
+    stripReplyFallback?: boolean;
+    returnString?: boolean;
+    forComposerQuote?: boolean;
+    ref?: React.Ref<any>;
+}
 
 /* turn a matrix event body into html
  *
@@ -378,7 +392,7 @@ class TextHighlighter extends BaseHighlighter {
  * opts.forComposerQuote: optional param to lessen the url rewriting done by sanitization, for quoting into composer
  * opts.ref: React ref to attach to any React components returned (not compatible with opts.returnString)
  */
-export function bodyToHtml(content, highlights, opts={}) {
+export function bodyToHtml(content: IContent, highlights: string[], opts: IOpts = {}) {
     const isHtmlMessage = content.format === "org.matrix.custom.html" && content.formatted_body;
     let bodyHasEmoji = false;
 
@@ -387,9 +401,9 @@ export function bodyToHtml(content, highlights, opts={}) {
         sanitizeParams = composerSanitizeHtmlParams;
     }
 
-    let strippedBody;
-    let safeBody;
-    let isDisplayedWithHtml;
+    let strippedBody: string;
+    let safeBody: string;
+    let isDisplayedWithHtml: boolean;
     // XXX: We sanitize the HTML whilst also highlighting its text nodes, to avoid accidentally trying
     // to highlight HTML tags themselves.  However, this does mean that we don't highlight textnodes which
     // are interrupted by HTML tags (not that we did before) - e.g. foo<span/>bar won't get highlighted
@@ -407,7 +421,7 @@ export function bodyToHtml(content, highlights, opts={}) {
         }
 
         let formattedBody = typeof content.formatted_body === 'string' ? content.formatted_body : null;
-        const plainBody = typeof content.body === 'string' ? content.body : null;
+        const plainBody = typeof content.body === 'string' ? content.body : "";
 
         if (opts.stripReplyFallback && formattedBody) formattedBody = ReplyThread.stripHTMLReply(formattedBody);
         strippedBody = opts.stripReplyFallback ? ReplyThread.stripPlainReply(plainBody) : plainBody;
@@ -471,7 +485,7 @@ export function bodyToHtml(content, highlights, opts={}) {
  * @param {object} [options] Options for linkifyString. Default: linkifyMatrix.options
  * @returns {string} Linkified string
  */
-export function linkifyString(str, options = linkifyMatrix.options) {
+export function linkifyString(str: string, options = linkifyMatrix.options) {
     return _linkifyString(str, options);
 }
 
@@ -482,7 +496,7 @@ export function linkifyString(str, options = linkifyMatrix.options) {
  * @param {object} [options] Options for linkifyElement. Default: linkifyMatrix.options
  * @returns {object}
  */
-export function linkifyElement(element, options = linkifyMatrix.options) {
+export function linkifyElement(element: HTMLElement, options = linkifyMatrix.options) {
     return _linkifyElement(element, options);
 }
 
@@ -493,7 +507,7 @@ export function linkifyElement(element, options = linkifyMatrix.options) {
  * @param {object} [options] Options for linkifyString. Default: linkifyMatrix.options
  * @returns {string}
  */
-export function linkifyAndSanitizeHtml(dirtyHtml, options = linkifyMatrix.options) {
+export function linkifyAndSanitizeHtml(dirtyHtml: string, options = linkifyMatrix.options) {
     return sanitizeHtml(linkifyString(dirtyHtml, options), sanitizeHtmlParams);
 }
 
@@ -504,7 +518,7 @@ export function linkifyAndSanitizeHtml(dirtyHtml, options = linkifyMatrix.option
  * @param {Node} node
  * @returns {bool}
  */
-export function checkBlockNode(node) {
+export function checkBlockNode(node: Node) {
     switch (node.nodeName) {
         case "H1":
         case "H2":
diff --git a/src/IdentityAuthClient.js b/src/IdentityAuthClient.js
index 4a830d6506..fbdb6812ee 100644
--- a/src/IdentityAuthClient.js
+++ b/src/IdentityAuthClient.js
@@ -177,7 +177,7 @@ export default class IdentityAuthClient {
         // appropriately. We already clear storage on sign out, but we'll need
         // additional clearing when changing ISes in settings as part of future
         // privacy work.
-        // See also https://github.com/vector-im/riot-web/issues/10455.
+        // See also https://github.com/vector-im/element-web/issues/10455.
     }
 
     async registerForToken(check=true) {
diff --git a/src/KeyRequestHandler.js b/src/KeyRequestHandler.js
deleted file mode 100644
index ceaff0c54d..0000000000
--- a/src/KeyRequestHandler.js
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
-Copyright 2017 Vector Creations 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.
-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 sdk from './index';
-import Modal from './Modal';
-import SettingsStore from './settings/SettingsStore';
-
-// TODO: We can remove this once cross-signing is the only way.
-// https://github.com/vector-im/riot-web/issues/11908
-export default class KeyRequestHandler {
-    constructor(matrixClient) {
-        this._matrixClient = matrixClient;
-
-        // the user/device for which we currently have a dialog open
-        this._currentUser = null;
-        this._currentDevice = null;
-
-        // userId -> deviceId -> [keyRequest]
-        this._pendingKeyRequests = Object.create(null);
-    }
-
-    handleKeyRequest(keyRequest) {
-        // Ignore own device key requests if cross-signing lab enabled
-        if (SettingsStore.getValue("feature_cross_signing")) {
-            return;
-        }
-
-        const userId = keyRequest.userId;
-        const deviceId = keyRequest.deviceId;
-        const requestId = keyRequest.requestId;
-
-        if (!this._pendingKeyRequests[userId]) {
-            this._pendingKeyRequests[userId] = Object.create(null);
-        }
-        if (!this._pendingKeyRequests[userId][deviceId]) {
-            this._pendingKeyRequests[userId][deviceId] = [];
-        }
-
-        // check if we already have this request
-        const requests = this._pendingKeyRequests[userId][deviceId];
-        if (requests.find((r) => r.requestId === requestId)) {
-            console.log("Already have this key request, ignoring");
-            return;
-        }
-
-        requests.push(keyRequest);
-
-        if (this._currentUser) {
-            // ignore for now
-            console.log("Key request, but we already have a dialog open");
-            return;
-        }
-
-        this._processNextRequest();
-    }
-
-    handleKeyRequestCancellation(cancellation) {
-        // Ignore own device key requests if cross-signing lab enabled
-        if (SettingsStore.getValue("feature_cross_signing")) {
-            return;
-        }
-
-        // see if we can find the request in the queue
-        const userId = cancellation.userId;
-        const deviceId = cancellation.deviceId;
-        const requestId = cancellation.requestId;
-
-        if (userId === this._currentUser && deviceId === this._currentDevice) {
-            console.log(
-                "room key request cancellation for the user we currently have a"
-                + " dialog open for",
-            );
-            // TODO: update the dialog. For now, we just ignore the
-            // cancellation.
-            return;
-        }
-
-        if (!this._pendingKeyRequests[userId]) {
-            return;
-        }
-        const requests = this._pendingKeyRequests[userId][deviceId];
-        if (!requests) {
-            return;
-        }
-        const idx = requests.findIndex((r) => r.requestId === requestId);
-        if (idx < 0) {
-            return;
-        }
-        console.log("Forgetting room key request");
-        requests.splice(idx, 1);
-        if (requests.length === 0) {
-            delete this._pendingKeyRequests[userId][deviceId];
-            if (Object.keys(this._pendingKeyRequests[userId]).length === 0) {
-                delete this._pendingKeyRequests[userId];
-            }
-        }
-    }
-
-    _processNextRequest() {
-        const userId = Object.keys(this._pendingKeyRequests)[0];
-        if (!userId) {
-            return;
-        }
-        const deviceId = Object.keys(this._pendingKeyRequests[userId])[0];
-        if (!deviceId) {
-            return;
-        }
-        console.log(`Starting KeyShareDialog for ${userId}:${deviceId}`);
-
-        const finished = (r) => {
-            this._currentUser = null;
-            this._currentDevice = null;
-
-            if (!this._pendingKeyRequests[userId] || !this._pendingKeyRequests[userId][deviceId]) {
-                // request was removed in the time the dialog was displayed
-                this._processNextRequest();
-                return;
-            }
-
-            if (r) {
-                for (const req of this._pendingKeyRequests[userId][deviceId]) {
-                    req.share();
-                }
-            }
-            delete this._pendingKeyRequests[userId][deviceId];
-            if (Object.keys(this._pendingKeyRequests[userId]).length === 0) {
-                delete this._pendingKeyRequests[userId];
-            }
-
-            this._processNextRequest();
-        };
-
-        const KeyShareDialog = sdk.getComponent("dialogs.KeyShareDialog");
-        Modal.appendTrackedDialog('Key Share', 'Process Next Request', KeyShareDialog, {
-            matrixClient: this._matrixClient,
-            userId: userId,
-            deviceId: deviceId,
-            onFinished: finished,
-        });
-        this._currentUser = userId;
-        this._currentDevice = deviceId;
-    }
-}
-
diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index 1baa6c8e0c..d2de31eb80 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -26,7 +26,7 @@ import Analytics from './Analytics';
 import Notifier from './Notifier';
 import UserActivity from './UserActivity';
 import Presence from './Presence';
-import dis from './dispatcher';
+import dis from './dispatcher/dispatcher';
 import DMRoomMap from './utils/DMRoomMap';
 import Modal from './Modal';
 import * as sdk from './index';
@@ -41,6 +41,10 @@ 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";
+
+const HOMESERVER_URL_KEY = "mx_hs_url";
+const ID_SERVER_URL_KEY = "mx_is_url";
 
 /**
  * Called at startup, to attempt to build a logged-in Matrix session. It tries
@@ -163,14 +167,16 @@ export function attemptTokenLogin(queryParams, defaultDeviceDisplayName) {
         return Promise.resolve(false);
     }
 
-    if (!queryParams.homeserver) {
+    const homeserver = localStorage.getItem(SSO_HOMESERVER_URL_KEY);
+    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");
         return Promise.resolve(false);
     }
 
     return sendLoginRequest(
-        queryParams.homeserver,
-        queryParams.identityServer,
+        homeserver,
+        identityServer,
         "m.login.token", {
             token: queryParams.loginToken,
             initial_device_display_name: defaultDeviceDisplayName,
@@ -256,8 +262,8 @@ function _registerAsGuest(hsUrl, isUrl, defaultDeviceDisplayName) {
  * @returns {Object} Information about the session - see implementation for variables.
  */
 export function getLocalStorageSessionVars() {
-    const hsUrl = localStorage.getItem("mx_hs_url");
-    const isUrl = localStorage.getItem("mx_is_url");
+    const hsUrl = localStorage.getItem(HOMESERVER_URL_KEY);
+    const isUrl = localStorage.getItem(ID_SERVER_URL_KEY);
     const accessToken = localStorage.getItem("mx_access_token");
     const userId = localStorage.getItem("mx_user_id");
     const deviceId = localStorage.getItem("mx_device_id");
@@ -298,6 +304,13 @@ async function _restoreFromLocalStorage(opts) {
             return false;
         }
 
+        const pickleKey = await PlatformPeg.get().getPickleKey(userId, deviceId);
+        if (pickleKey) {
+            console.log("Got pickle key");
+        } else {
+            console.log("No pickle key available");
+        }
+
         console.log(`Restoring session for ${userId}`);
         await _doSetLoggedIn({
             userId: userId,
@@ -306,6 +319,7 @@ async function _restoreFromLocalStorage(opts) {
             homeserverUrl: hsUrl,
             identityServerUrl: isUrl,
             guest: isGuest,
+            pickleKey: pickleKey,
         }, false);
         return true;
     } else {
@@ -348,9 +362,19 @@ async function _handleLoadSessionFailure(e) {
  *
  * @returns {Promise} promise which resolves to the new MatrixClient once it has been started
  */
-export function setLoggedIn(credentials) {
+export async function setLoggedIn(credentials) {
     stopMatrixClient();
-    return _doSetLoggedIn(credentials, true);
+    const pickleKey = credentials.userId && credentials.deviceId
+          ? await PlatformPeg.get().createPickleKey(credentials.userId, credentials.deviceId)
+          : null;
+
+    if (pickleKey) {
+        console.log("Created pickle key");
+    } else {
+        console.log("Pickle key not created");
+    }
+
+    return _doSetLoggedIn(Object.assign({}, credentials, {pickleKey}), true);
 }
 
 /**
@@ -479,14 +503,22 @@ function _showStorageEvictedDialog() {
 class AbortLoginAndRebuildStorage extends Error { }
 
 function _persistCredentialsToLocalStorage(credentials) {
-    localStorage.setItem("mx_hs_url", credentials.homeserverUrl);
+    localStorage.setItem(HOMESERVER_URL_KEY, credentials.homeserverUrl);
     if (credentials.identityServerUrl) {
-        localStorage.setItem("mx_is_url", 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));
 
+    if (credentials.pickleKey) {
+        localStorage.setItem("mx_has_pickle_key", true);
+    } else {
+        if (localStorage.getItem("mx_has_pickle_key")) {
+            console.error("Expected a pickle key, but none provided.  Encryption may not work.");
+        }
+    }
+
     // if we didn't get a deviceId from the login, leave mx_device_id unset,
     // rather than setting it to "undefined".
     //
@@ -516,7 +548,9 @@ export function logout() {
     }
 
     _isLoggingOut = true;
-    MatrixClientPeg.get().logout().then(onLoggedOut,
+    const client = MatrixClientPeg.get();
+    PlatformPeg.get().destroyPickleKey(client.getUserId(), client.getDeviceId());
+    client.logout().then(onLoggedOut,
         (err) => {
             // Just throwing an error here is going to be very unhelpful
             // if you're trying to log out because your server's down and
@@ -575,10 +609,12 @@ async function startMatrixClient(startSyncing=true) {
     // to work).
     dis.dispatch({action: 'will_start_client'}, true);
 
+    // reset things first just in case
+    TypingStore.sharedInstance().reset();
+    ToastStore.sharedInstance().reset();
+
     Notifier.start();
     UserActivity.sharedInstance().start();
-    TypingStore.sharedInstance().reset(); // just in case
-    ToastStore.sharedInstance().reset();
     DMRoomMap.makeShared().start();
     IntegrationManagers.sharedInstance().startWatching();
     ActiveWidgetStore.start();
@@ -608,7 +644,7 @@ async function startMatrixClient(startSyncing=true) {
     }
 
     // Now that we have a MatrixClientPeg, update the Jitsi info
-    await Jitsi.getInstance().update();
+    await Jitsi.getInstance().start();
 
     // dispatch that we finished starting up to wire up any other bits
     // of the matrix client that cannot be set prior to starting up.
diff --git a/src/Login.js b/src/Login.js
index 1590e5ac28..04805b4af9 100644
--- a/src/Login.js
+++ b/src/Login.js
@@ -95,6 +95,8 @@ export default class Login {
             identifier = {
                 type: 'm.id.phone',
                 country: phoneCountry,
+                phone: phoneNumber,
+                // XXX: Synapse historically wanted `number` and not `phone`
                 number: phoneNumber,
             };
         } else if (isEmail) {
diff --git a/src/Markdown.js b/src/Markdown.js
index fb1f8bf0ea..e57507b4de 100644
--- a/src/Markdown.js
+++ b/src/Markdown.js
@@ -99,7 +99,7 @@ export default class Markdown {
             // puts softbreaks in for multiple lines in a blockquote,
             // so if these are just newline characters then the
             // block quote ends up all on one line
-            // (https://github.com/vector-im/riot-web/issues/3154)
+            // (https://github.com/vector-im/element-web/issues/3154)
             softbreak: '<br />',
         });
 
@@ -166,7 +166,7 @@ export default class Markdown {
      * Render the markdown message to plain text. That is, essentially
      * just remove any backslashes escaping what would otherwise be
      * markdown syntax
-     * (to fix https://github.com/vector-im/riot-web/issues/2870).
+     * (to fix https://github.com/vector-im/element-web/issues/2870).
      *
      * N.B. this does **NOT** render arbitrary MD to plain text - only MD
      * which has no formatting.  Otherwise it emits HTML(!).
@@ -175,14 +175,6 @@ export default class Markdown {
         const renderer = new commonmark.HtmlRenderer({safe: false});
         const real_paragraph = renderer.paragraph;
 
-        // The default `out` function only sends the input through an XML
-        // escaping function, which causes messages to be entity encoded,
-        // which we don't want in this case.
-        renderer.out = function(s) {
-            // The `lit` function adds a string literal to the output buffer.
-            this.lit(s);
-        };
-
         renderer.paragraph = function(node, entering) {
             // as with toHTML, only append lines to paragraphs if there are
             // multiple paragraphs
diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.ts
similarity index 73%
rename from src/MatrixClientPeg.js
rename to src/MatrixClientPeg.ts
index 21f05b9759..be16f5fe10 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.ts
@@ -17,8 +17,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixClient, MemoryStore} from 'matrix-js-sdk';
-
+import {MatrixClient} from 'matrix-js-sdk/src/client';
+import {MemoryStore} from 'matrix-js-sdk/src/store/memory';
 import * as utils from 'matrix-js-sdk/src/utils';
 import {EventTimeline} from 'matrix-js-sdk/src/models/event-timeline';
 import {EventTimelineSet} from 'matrix-js-sdk/src/models/event-timeline-set';
@@ -34,37 +34,26 @@ import IdentityAuthClient from './IdentityAuthClient';
 import { crossSigningCallbacks } from './CrossSigningManager';
 import {SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
 
-interface MatrixClientCreds {
-    homeserverUrl: string,
-    identityServerUrl: string,
-    userId: string,
-    deviceId: string,
-    accessToken: string,
-    guest: boolean,
+export interface IMatrixClientCreds {
+    homeserverUrl: string;
+    identityServerUrl: string;
+    userId: string;
+    deviceId: string;
+    accessToken: string;
+    guest: boolean;
+    pickleKey?: string;
 }
 
-/**
- * Wrapper object for handling the js-sdk Matrix Client object in the react-sdk
- * Handles the creation/initialisation of client objects.
- * This module provides a singleton instance of this class so the 'current'
- * Matrix Client object is available easily.
- */
-class _MatrixClientPeg {
-    constructor() {
-        this.matrixClient = null;
-        this._justRegisteredUserId = null;
+// TODO: Move this to the js-sdk
+export interface IOpts {
+    initialSyncLimit?: number;
+    pendingEventOrdering?: "detached" | "chronological";
+    lazyLoadMembers?: boolean;
+    clientWellKnownPollPeriod?: number;
+}
 
-        // These are the default options used when when the
-        // client is started in 'start'. These can be altered
-        // at any time up to after the 'will_start_client'
-        // event is finished processing.
-        this.opts = {
-            initialSyncLimit: 20,
-        };
-        // the credentials used to init the current client object.
-        // used if we tear it down & recreate it with a different store
-        this._currentClientCreds = null;
-    }
+export interface IMatrixClientPeg {
+    opts: IOpts;
 
     /**
      * Sets the script href passed to the IndexedDB web worker
@@ -73,19 +62,23 @@ class _MatrixClientPeg {
      *
      * @param {string} script href to the script to be passed to the web worker
      */
-    setIndexedDbWorkerScript(script) {
-        createMatrixClient.indexedDbWorkerScript = script;
-    }
+    setIndexedDbWorkerScript(script: string): void;
 
-    get(): MatrixClient {
-        return this.matrixClient;
-    }
+    /**
+     * Return the server name of the user's homeserver
+     * Throws an error if unable to deduce the homeserver name
+     * (eg. if the user is not logged in)
+     *
+     * @returns {string} The homeserver name, if present.
+     */
+    getHomeserverName(): string;
 
-    unset() {
-        this.matrixClient = null;
+    get(): MatrixClient;
+    unset(): void;
+    assign(): Promise<any>;
+    start(): Promise<any>;
 
-        MatrixActionCreators.stop();
-    }
+    getCredentials(): IMatrixClientCreds;
 
     /**
      * If we've registered a user ID we set this to the ID of the
@@ -95,9 +88,7 @@ class _MatrixClientPeg {
      *
      * @param {string} uid The user ID of the user we've just registered
      */
-    setJustRegisteredUserId(uid) {
-        this._justRegisteredUserId = uid;
-    }
+    setJustRegisteredUserId(uid: string): void;
 
     /**
      * Returns true if the current user has just been registered by this
@@ -105,23 +96,73 @@ class _MatrixClientPeg {
      *
      * @returns {bool} True if user has just been registered
      */
-    currentUserIsJustRegistered() {
+    currentUserIsJustRegistered(): boolean;
+
+    /**
+     * Replace this MatrixClientPeg's client with a client instance that has
+     * homeserver / identity server URLs and active credentials
+     *
+     * @param {IMatrixClientCreds} creds The new credentials to use.
+     */
+    replaceUsingCreds(creds: IMatrixClientCreds): void;
+}
+
+/**
+ * Wrapper object for handling the js-sdk Matrix Client object in the react-sdk
+ * Handles the creation/initialisation of client objects.
+ * This module provides a singleton instance of this class so the 'current'
+ * Matrix Client object is available easily.
+ */
+class _MatrixClientPeg implements IMatrixClientPeg {
+    // These are the default options used when when the
+    // client is started in 'start'. These can be altered
+    // at any time up to after the 'will_start_client'
+    // event is finished processing.
+    public opts: IOpts = {
+        initialSyncLimit: 20,
+    };
+
+    private matrixClient: MatrixClient = null;
+    private justRegisteredUserId: string;
+
+    // the credentials used to init the current client object.
+    // used if we tear it down & recreate it with a different store
+    private currentClientCreds: IMatrixClientCreds;
+
+    constructor() {
+    }
+
+    public setIndexedDbWorkerScript(script: string): void {
+        createMatrixClient.indexedDbWorkerScript = script;
+    }
+
+    public get(): MatrixClient {
+        return this.matrixClient;
+    }
+
+    public unset(): void {
+        this.matrixClient = null;
+
+        MatrixActionCreators.stop();
+    }
+
+    public setJustRegisteredUserId(uid: string): void {
+        this.justRegisteredUserId = uid;
+    }
+
+    public currentUserIsJustRegistered(): boolean {
         return (
             this.matrixClient &&
-            this.matrixClient.credentials.userId === this._justRegisteredUserId
+            this.matrixClient.credentials.userId === this.justRegisteredUserId
         );
     }
 
-    /*
-     * Replace this MatrixClientPeg's client with a client instance that has
-     * homeserver / identity server URLs and active credentials
-     */
-    replaceUsingCreds(creds: MatrixClientCreds) {
-        this._currentClientCreds = creds;
-        this._createClient(creds);
+    public replaceUsingCreds(creds: IMatrixClientCreds): void {
+        this.currentClientCreds = creds;
+        this.createClient(creds);
     }
 
-    async assign() {
+    public async assign(): Promise<any> {
         for (const dbType of ['indexeddb', 'memory']) {
             try {
                 const promise = this.matrixClient.store.startup();
@@ -132,7 +173,7 @@ class _MatrixClientPeg {
                 if (dbType === 'indexeddb') {
                     console.error('Error starting matrixclient store - falling back to memory store', err);
                     this.matrixClient.store = new MemoryStore({
-                        localStorage: global.localStorage,
+                        localStorage: localStorage,
                     });
                 } else {
                     console.error('Failed to start memory store!', err);
@@ -158,9 +199,7 @@ class _MatrixClientPeg {
                 // The js-sdk found a crypto DB too new for it to use
                 const CryptoStoreTooNewDialog =
                     sdk.getComponent("views.dialogs.CryptoStoreTooNewDialog");
-                Modal.createDialog(CryptoStoreTooNewDialog, {
-                    host: window.location.host,
-                });
+                Modal.createDialog(CryptoStoreTooNewDialog);
             }
             // this can happen for a number of reasons, the most likely being
             // that the olm library was missing. It's not fatal.
@@ -171,6 +210,7 @@ class _MatrixClientPeg {
         // the react sdk doesn't work without this, so don't allow
         opts.pendingEventOrdering = "detached";
         opts.lazyLoadMembers = true;
+        opts.clientWellKnownPollPeriod = 2 * 60 * 60; // 2 hours
 
         // Connect the matrix client to the dispatcher and setting handlers
         MatrixActionCreators.start(this.matrixClient);
@@ -179,7 +219,7 @@ class _MatrixClientPeg {
         return opts;
     }
 
-    async start() {
+    public async start(): Promise<any> {
         const opts = await this.assign();
 
         console.log(`MatrixClientPeg: really starting MatrixClient`);
@@ -187,7 +227,7 @@ class _MatrixClientPeg {
         console.log(`MatrixClientPeg: MatrixClient started`);
     }
 
-    getCredentials(): MatrixClientCreds {
+    public getCredentials(): IMatrixClientCreds {
         return {
             homeserverUrl: this.matrixClient.baseUrl,
             identityServerUrl: this.matrixClient.idBaseUrl,
@@ -198,12 +238,7 @@ class _MatrixClientPeg {
         };
     }
 
-    /*
-     * Return the server name of the user's homeserver
-     * Throws an error if unable to deduce the homeserver name
-     * (eg. if the user is not logged in)
-     */
-    getHomeserverName() {
+    public getHomeserverName(): string {
         const matches = /^@.+:(.+)$/.exec(this.matrixClient.credentials.userId);
         if (matches === null || matches.length < 1) {
             throw new Error("Failed to derive homeserver name from user ID!");
@@ -211,15 +246,17 @@ class _MatrixClientPeg {
         return matches[1];
     }
 
-    _createClient(creds: MatrixClientCreds) {
+    private createClient(creds: IMatrixClientCreds): void {
+        // TODO: Make these opts typesafe with the js-sdk
         const opts = {
             baseUrl: creds.homeserverUrl,
             idBaseUrl: creds.identityServerUrl,
             accessToken: creds.accessToken,
             userId: creds.userId,
             deviceId: creds.deviceId,
+            pickleKey: creds.pickleKey,
             timelineSupport: true,
-            forceTURN: !SettingsStore.getValue('webRtcAllowPeerToPeer', false),
+            forceTURN: !SettingsStore.getValue('webRtcAllowPeerToPeer'),
             fallbackICEServerAllowed: !!SettingsStore.getValue('fallbackICEServerAllowed'),
             verificationMethods: [
                 verificationMethods.SAS,
@@ -228,9 +265,9 @@ class _MatrixClientPeg {
             ],
             unstableClientRelationAggregation: true,
             identityServer: new IdentityAuthClient(),
+            cryptoCallbacks: {},
         };
 
-        opts.cryptoCallbacks = {};
         // 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.
@@ -253,8 +290,8 @@ class _MatrixClientPeg {
     }
 }
 
-if (!global.mxMatrixClientPeg) {
-    global.mxMatrixClientPeg = new _MatrixClientPeg();
+if (!window.mxMatrixClientPeg) {
+    window.mxMatrixClientPeg = new _MatrixClientPeg();
 }
 
-export const MatrixClientPeg = global.mxMatrixClientPeg;
+export const MatrixClientPeg = window.mxMatrixClientPeg;
diff --git a/src/Modal.js b/src/Modal.js
deleted file mode 100644
index de441740f1..0000000000
--- a/src/Modal.js
+++ /dev/null
@@ -1,322 +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 ReactDOM from 'react-dom';
-import Analytics from './Analytics';
-import dis from './dispatcher';
-import {defer} from './utils/promise';
-import AsyncWrapper from './AsyncWrapper';
-
-const DIALOG_CONTAINER_ID = "mx_Dialog_Container";
-const STATIC_DIALOG_CONTAINER_ID = "mx_Dialog_StaticContainer";
-
-class ModalManager {
-    constructor() {
-        this._counter = 0;
-
-        // The modal to prioritise over all others. If this is set, only show
-        // this modal. Remove all other modals from the stack when this modal
-        // is closed.
-        this._priorityModal = null;
-        // The modal to keep open underneath other modals if possible. Useful
-        // for cases like Settings where the modal should remain open while the
-        // user is prompted for more information/errors.
-        this._staticModal = null;
-        // A list of the modals we have stacked up, with the most recent at [0]
-        // Neither the static nor priority modal will be in this list.
-        this._modals = [
-            /* {
-               elem: React component for this dialog
-               onFinished: caller-supplied onFinished callback
-               className: CSS class for the dialog wrapper div
-               } */
-        ];
-
-        this.onBackgroundClick = this.onBackgroundClick.bind(this);
-    }
-
-    hasDialogs() {
-        return this._priorityModal || this._staticModal || this._modals.length > 0;
-    }
-
-    getOrCreateContainer() {
-        let container = document.getElementById(DIALOG_CONTAINER_ID);
-
-        if (!container) {
-            container = document.createElement("div");
-            container.id = DIALOG_CONTAINER_ID;
-            document.body.appendChild(container);
-        }
-
-        return container;
-    }
-
-    getOrCreateStaticContainer() {
-        let container = document.getElementById(STATIC_DIALOG_CONTAINER_ID);
-
-        if (!container) {
-            container = document.createElement("div");
-            container.id = STATIC_DIALOG_CONTAINER_ID;
-            document.body.appendChild(container);
-        }
-
-        return container;
-    }
-
-    createTrackedDialog(analyticsAction, analyticsInfo, ...rest) {
-        Analytics.trackEvent('Modal', analyticsAction, analyticsInfo);
-        return this.createDialog(...rest);
-    }
-
-    appendTrackedDialog(analyticsAction, analyticsInfo, ...rest) {
-        Analytics.trackEvent('Modal', analyticsAction, analyticsInfo);
-        return this.appendDialog(...rest);
-    }
-
-    createDialog(Element, ...rest) {
-        return this.createDialogAsync(Promise.resolve(Element), ...rest);
-    }
-
-    appendDialog(Element, ...rest) {
-        return this.appendDialogAsync(Promise.resolve(Element), ...rest);
-    }
-
-    createTrackedDialogAsync(analyticsAction, analyticsInfo, ...rest) {
-        Analytics.trackEvent('Modal', analyticsAction, analyticsInfo);
-        return this.createDialogAsync(...rest);
-    }
-
-    appendTrackedDialogAsync(analyticsAction, analyticsInfo, ...rest) {
-        Analytics.trackEvent('Modal', analyticsAction, analyticsInfo);
-        return this.appendDialogAsync(...rest);
-    }
-
-    _buildModal(prom, props, className, options) {
-        const modal = {};
-
-        // never call this from onFinished() otherwise it will loop
-        const [closeDialog, onFinishedProm] = this._getCloseFn(modal, props);
-
-        // don't attempt to reuse the same AsyncWrapper for different dialogs,
-        // otherwise we'll get confused.
-        const modalCount = this._counter++;
-
-        // FIXME: If a dialog uses getDefaultProps it clobbers the onFinished
-        // property set here so you can't close the dialog from a button click!
-        modal.elem = (
-            <AsyncWrapper key={modalCount} prom={prom} {...props}
-                          onFinished={closeDialog} />
-        );
-        modal.onFinished = props ? props.onFinished : null;
-        modal.className = className;
-        modal.onBeforeClose = options.onBeforeClose;
-        modal.beforeClosePromise = null;
-        modal.close = closeDialog;
-        modal.closeReason = null;
-
-        return {modal, closeDialog, onFinishedProm};
-    }
-
-    _getCloseFn(modal, props) {
-        const deferred = defer();
-        return [async (...args) => {
-            if (modal.beforeClosePromise) {
-                await modal.beforeClosePromise;
-            } else if (modal.onBeforeClose) {
-                modal.beforeClosePromise = modal.onBeforeClose(modal.closeReason);
-                const shouldClose = await modal.beforeClosePromise;
-                modal.beforeClosePromise = null;
-                if (!shouldClose) {
-                    return;
-                }
-            }
-            deferred.resolve(args);
-            if (props && props.onFinished) props.onFinished.apply(null, args);
-            const i = this._modals.indexOf(modal);
-            if (i >= 0) {
-                this._modals.splice(i, 1);
-            }
-
-            if (this._priorityModal === modal) {
-                this._priorityModal = null;
-
-                // XXX: This is destructive
-                this._modals = [];
-            }
-
-            if (this._staticModal === modal) {
-                this._staticModal = null;
-
-                // XXX: This is destructive
-                this._modals = [];
-            }
-
-            this._reRender();
-        }, deferred.promise];
-    }
-
-    /**
-     * @callback onBeforeClose
-     * @param {string?} reason either "backgroundClick" or null
-     * @return {Promise<bool>} whether the dialog should close
-     */
-
-    /**
-     * Open a modal view.
-     *
-     * This can be used to display a react component which is loaded as an asynchronous
-     * webpack component. To do this, set 'loader' as:
-     *
-     *   (cb) => {
-     *       require(['<module>'], cb);
-     *   }
-     *
-     * @param {Promise} prom   a promise which resolves with a React component
-     *   which will be displayed as the modal view.
-     *
-     * @param {Object} props   properties to pass to the displayed
-     *    component. (We will also pass an 'onFinished' property.)
-     *
-     * @param {String} className   CSS class to apply to the modal wrapper
-     *
-     * @param {boolean} isPriorityModal if true, this modal will be displayed regardless
-     *                                  of other modals that are currently in the stack.
-     *                                  Also, when closed, all modals will be removed
-     *                                  from the stack.
-     * @param {boolean} isStaticModal  if true, this modal will be displayed under other
-     *                                 modals in the stack. When closed, all modals will
-     *                                 also be removed from the stack. This is not compatible
-     *                                 with being a priority modal. Only one modal can be
-     *                                 static at a time.
-     * @param {Object} options? extra options for the dialog
-     * @param {onBeforeClose} options.onBeforeClose a callback to decide whether to close the dialog
-     * @returns {object} Object with 'close' parameter being a function that will close the dialog
-     */
-    createDialogAsync(prom, props, className, isPriorityModal, isStaticModal, options = {}) {
-        const {modal, closeDialog, onFinishedProm} = this._buildModal(prom, props, className, options);
-        if (isPriorityModal) {
-            // XXX: This is destructive
-            this._priorityModal = modal;
-        } else if (isStaticModal) {
-            // This is intentionally destructive
-            this._staticModal = modal;
-        } else {
-            this._modals.unshift(modal);
-        }
-
-        this._reRender();
-        return {
-            close: closeDialog,
-            finished: onFinishedProm,
-        };
-    }
-
-    appendDialogAsync(prom, props, className) {
-        const {modal, closeDialog, onFinishedProm} = this._buildModal(prom, props, className, {});
-
-        this._modals.push(modal);
-        this._reRender();
-        return {
-            close: closeDialog,
-            finished: onFinishedProm,
-        };
-    }
-
-    onBackgroundClick() {
-        const modal = this._getCurrentModal();
-        if (!modal) {
-            return;
-        }
-        // we want to pass a reason to the onBeforeClose
-        // callback, but close is currently defined to
-        // pass all number of arguments to the onFinished callback
-        // so, pass the reason to close through a member variable
-        modal.closeReason = "backgroundClick";
-        modal.close();
-        modal.closeReason = null;
-    }
-
-    _getCurrentModal() {
-        return this._priorityModal ? this._priorityModal : (this._modals[0] || this._staticModal);
-    }
-
-    _reRender() {
-        if (this._modals.length === 0 && !this._priorityModal && !this._staticModal) {
-            // If there is no modal to render, make all of Riot available
-            // to screen reader users again
-            dis.dispatch({
-                action: 'aria_unhide_main_app',
-            });
-            ReactDOM.unmountComponentAtNode(this.getOrCreateContainer());
-            ReactDOM.unmountComponentAtNode(this.getOrCreateStaticContainer());
-            return;
-        }
-
-        // Hide the content outside the modal to screen reader users
-        // so they won't be able to navigate into it and act on it using
-        // screen reader specific features
-        dis.dispatch({
-            action: 'aria_hide_main_app',
-        });
-
-        if (this._staticModal) {
-            const classes = "mx_Dialog_wrapper mx_Dialog_staticWrapper "
-                + (this._staticModal.className ? this._staticModal.className : '');
-
-            const staticDialog = (
-                <div className={classes}>
-                    <div className="mx_Dialog">
-                        { this._staticModal.elem }
-                    </div>
-                    <div className="mx_Dialog_background mx_Dialog_staticBackground" onClick={this.onBackgroundClick}></div>
-                </div>
-            );
-
-            ReactDOM.render(staticDialog, this.getOrCreateStaticContainer());
-        } else {
-            // This is safe to call repeatedly if we happen to do that
-            ReactDOM.unmountComponentAtNode(this.getOrCreateStaticContainer());
-        }
-
-        const modal = this._getCurrentModal();
-        if (modal !== this._staticModal) {
-            const classes = "mx_Dialog_wrapper "
-                + (this._staticModal ? "mx_Dialog_wrapperWithStaticUnder " : '')
-                + (modal.className ? modal.className : '');
-
-            const dialog = (
-                <div className={classes}>
-                    <div className="mx_Dialog">
-                        {modal.elem}
-                    </div>
-                    <div className="mx_Dialog_background" onClick={this.onBackgroundClick}></div>
-                </div>
-            );
-
-            ReactDOM.render(dialog, this.getOrCreateContainer());
-        } else {
-            // This is safe to call repeatedly if we happen to do that
-            ReactDOM.unmountComponentAtNode(this.getOrCreateContainer());
-        }
-    }
-}
-
-if (!global.singletonModalManager) {
-    global.singletonModalManager = new ModalManager();
-}
-export default global.singletonModalManager;
diff --git a/src/Modal.tsx b/src/Modal.tsx
new file mode 100644
index 0000000000..82ed33b794
--- /dev/null
+++ b/src/Modal.tsx
@@ -0,0 +1,383 @@
+/*
+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.
+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 ReactDOM from 'react-dom';
+import classNames from 'classnames';
+
+import Analytics from './Analytics';
+import dis from './dispatcher/dispatcher';
+import {defer} from './utils/promise';
+import AsyncWrapper from './AsyncWrapper';
+
+const DIALOG_CONTAINER_ID = "mx_Dialog_Container";
+const STATIC_DIALOG_CONTAINER_ID = "mx_Dialog_StaticContainer";
+
+interface IModal<T extends any[]> {
+    elem: React.ReactNode;
+    className?: string;
+    beforeClosePromise?: Promise<boolean>;
+    closeReason?: string;
+    onBeforeClose?(reason?: string): Promise<boolean>;
+    onFinished(...args: T): void;
+    close(...args: T): void;
+}
+
+interface IHandle<T extends any[]> {
+    finished: Promise<T>;
+    close(...args: T): void;
+}
+
+interface IProps<T extends any[]> {
+    onFinished?(...args: T): void;
+    // TODO improve typing here once all Modals are TS and we can exhaustively check the props
+    [key: string]: any;
+}
+
+interface IOptions<T extends any[]> {
+    onBeforeClose?: IModal<T>["onBeforeClose"];
+}
+
+type ParametersWithoutFirst<T extends (...args: any) => any> = T extends (a: any, ...args: infer P) => any ? P : never;
+
+export class ModalManager {
+    private counter = 0;
+    // The modal to prioritise over all others. If this is set, only show
+    // this modal. Remove all other modals from the stack when this modal
+    // is closed.
+    private priorityModal: IModal<any> = null;
+    // The modal to keep open underneath other modals if possible. Useful
+    // for cases like Settings where the modal should remain open while the
+    // user is prompted for more information/errors.
+    private staticModal: IModal<any> = null;
+    // A list of the modals we have stacked up, with the most recent at [0]
+    // Neither the static nor priority modal will be in this list.
+    private modals: IModal<any>[] = [];
+
+    private static getOrCreateContainer() {
+        let container = document.getElementById(DIALOG_CONTAINER_ID);
+
+        if (!container) {
+            container = document.createElement("div");
+            container.id = DIALOG_CONTAINER_ID;
+            document.body.appendChild(container);
+        }
+
+        return container;
+    }
+
+    private static getOrCreateStaticContainer() {
+        let container = document.getElementById(STATIC_DIALOG_CONTAINER_ID);
+
+        if (!container) {
+            container = document.createElement("div");
+            container.id = STATIC_DIALOG_CONTAINER_ID;
+            document.body.appendChild(container);
+        }
+
+        return container;
+    }
+
+    public hasDialogs() {
+        return this.priorityModal || this.staticModal || this.modals.length > 0;
+    }
+
+    public createTrackedDialog<T extends any[]>(
+        analyticsAction: string,
+        analyticsInfo: string,
+        ...rest: Parameters<ModalManager["createDialog"]>
+    ) {
+        Analytics.trackEvent('Modal', analyticsAction, analyticsInfo);
+        return this.createDialog<T>(...rest);
+    }
+
+    public appendTrackedDialog<T extends any[]>(
+        analyticsAction: string,
+        analyticsInfo: string,
+        ...rest: Parameters<ModalManager["appendDialog"]>
+    ) {
+        Analytics.trackEvent('Modal', analyticsAction, analyticsInfo);
+        return this.appendDialog<T>(...rest);
+    }
+
+    public createDialog<T extends any[]>(
+        Element: React.ComponentType,
+        ...rest: ParametersWithoutFirst<ModalManager["createDialogAsync"]>
+    ) {
+        return this.createDialogAsync<T>(Promise.resolve(Element), ...rest);
+    }
+
+    public appendDialog<T extends any[]>(
+        Element: React.ComponentType,
+        ...rest: ParametersWithoutFirst<ModalManager["appendDialogAsync"]>
+    ) {
+        return this.appendDialogAsync<T>(Promise.resolve(Element), ...rest);
+    }
+
+    public createTrackedDialogAsync<T extends any[]>(
+        analyticsAction: string,
+        analyticsInfo: string,
+        ...rest: Parameters<ModalManager["appendDialogAsync"]>
+    ) {
+        Analytics.trackEvent('Modal', analyticsAction, analyticsInfo);
+        return this.createDialogAsync<T>(...rest);
+    }
+
+    public appendTrackedDialogAsync<T extends any[]>(
+        analyticsAction: string,
+        analyticsInfo: string,
+        ...rest: Parameters<ModalManager["appendDialogAsync"]>
+    ) {
+        Analytics.trackEvent('Modal', analyticsAction, analyticsInfo);
+        return this.appendDialogAsync<T>(...rest);
+    }
+
+    private buildModal<T extends any[]>(
+        prom: Promise<React.ComponentType>,
+        props?: IProps<T>,
+        className?: string,
+        options?: IOptions<T>
+    ) {
+        const modal: IModal<T> = {
+            onFinished: props ? props.onFinished : null,
+            onBeforeClose: options.onBeforeClose,
+            beforeClosePromise: null,
+            closeReason: null,
+            className,
+
+            // these will be set below but we need an object reference to pass to getCloseFn before we can do that
+            elem: null,
+            close: null,
+        };
+
+        // never call this from onFinished() otherwise it will loop
+        const [closeDialog, onFinishedProm] = this.getCloseFn<T>(modal, props);
+
+        // don't attempt to reuse the same AsyncWrapper for different dialogs,
+        // otherwise we'll get confused.
+        const modalCount = this.counter++;
+
+        // FIXME: If a dialog uses getDefaultProps it clobbers the onFinished
+        // property set here so you can't close the dialog from a button click!
+        modal.elem = <AsyncWrapper key={modalCount} prom={prom} {...props} onFinished={closeDialog} />;
+        modal.close = closeDialog;
+
+        return {modal, closeDialog, onFinishedProm};
+    }
+
+    private getCloseFn<T extends any[]>(
+        modal: IModal<T>,
+        props: IProps<T>
+    ): [IHandle<T>["close"], IHandle<T>["finished"]] {
+        const deferred = defer<T>();
+        return [async (...args: T) => {
+            if (modal.beforeClosePromise) {
+                await modal.beforeClosePromise;
+            } else if (modal.onBeforeClose) {
+                modal.beforeClosePromise = modal.onBeforeClose(modal.closeReason);
+                const shouldClose = await modal.beforeClosePromise;
+                modal.beforeClosePromise = null;
+                if (!shouldClose) {
+                    return;
+                }
+            }
+            deferred.resolve(args);
+            if (props && props.onFinished) props.onFinished.apply(null, args);
+            const i = this.modals.indexOf(modal);
+            if (i >= 0) {
+                this.modals.splice(i, 1);
+            }
+
+            if (this.priorityModal === modal) {
+                this.priorityModal = null;
+
+                // XXX: This is destructive
+                this.modals = [];
+            }
+
+            if (this.staticModal === modal) {
+                this.staticModal = null;
+
+                // XXX: This is destructive
+                this.modals = [];
+            }
+
+            this.reRender();
+        }, deferred.promise];
+    }
+
+    /**
+     * @callback onBeforeClose
+     * @param {string?} reason either "backgroundClick" or null
+     * @return {Promise<bool>} whether the dialog should close
+     */
+
+    /**
+     * Open a modal view.
+     *
+     * This can be used to display a react component which is loaded as an asynchronous
+     * webpack component. To do this, set 'loader' as:
+     *
+     *   (cb) => {
+     *       require(['<module>'], cb);
+     *   }
+     *
+     * @param {Promise} prom   a promise which resolves with a React component
+     *   which will be displayed as the modal view.
+     *
+     * @param {Object} props   properties to pass to the displayed
+     *    component. (We will also pass an 'onFinished' property.)
+     *
+     * @param {String} className   CSS class to apply to the modal wrapper
+     *
+     * @param {boolean} isPriorityModal if true, this modal will be displayed regardless
+     *                                  of other modals that are currently in the stack.
+     *                                  Also, when closed, all modals will be removed
+     *                                  from the stack.
+     * @param {boolean} isStaticModal  if true, this modal will be displayed under other
+     *                                 modals in the stack. When closed, all modals will
+     *                                 also be removed from the stack. This is not compatible
+     *                                 with being a priority modal. Only one modal can be
+     *                                 static at a time.
+     * @param {Object} options? extra options for the dialog
+     * @param {onBeforeClose} options.onBeforeClose a callback to decide whether to close the dialog
+     * @returns {object} Object with 'close' parameter being a function that will close the dialog
+     */
+    private createDialogAsync<T extends any[]>(
+        prom: Promise<React.ComponentType>,
+        props?: IProps<T>,
+        className?: string,
+        isPriorityModal = false,
+        isStaticModal = false,
+        options: IOptions<T> = {}
+    ): IHandle<T> {
+        const {modal, closeDialog, onFinishedProm} = this.buildModal<T>(prom, props, className, options);
+        if (isPriorityModal) {
+            // XXX: This is destructive
+            this.priorityModal = modal;
+        } else if (isStaticModal) {
+            // This is intentionally destructive
+            this.staticModal = modal;
+        } else {
+            this.modals.unshift(modal);
+        }
+
+        this.reRender();
+        return {
+            close: closeDialog,
+            finished: onFinishedProm,
+        };
+    }
+
+    private appendDialogAsync<T extends any[]>(
+        prom: Promise<React.ComponentType>,
+        props?: IProps<T>,
+        className?: string
+    ): IHandle<T> {
+        const {modal, closeDialog, onFinishedProm} = this.buildModal<T>(prom, props, className, {});
+
+        this.modals.push(modal);
+        this.reRender();
+        return {
+            close: closeDialog,
+            finished: onFinishedProm,
+        };
+    }
+
+    private onBackgroundClick = () => {
+        const modal = this.getCurrentModal();
+        if (!modal) {
+            return;
+        }
+        // we want to pass a reason to the onBeforeClose
+        // callback, but close is currently defined to
+        // pass all number of arguments to the onFinished callback
+        // so, pass the reason to close through a member variable
+        modal.closeReason = "backgroundClick";
+        modal.close();
+        modal.closeReason = null;
+    };
+
+    private getCurrentModal(): IModal<any> {
+        return this.priorityModal ? this.priorityModal : (this.modals[0] || this.staticModal);
+    }
+
+    private reRender() {
+        if (this.modals.length === 0 && !this.priorityModal && !this.staticModal) {
+            // If there is no modal to render, make all of Element available
+            // to screen reader users again
+            dis.dispatch({
+                action: 'aria_unhide_main_app',
+            });
+            ReactDOM.unmountComponentAtNode(ModalManager.getOrCreateContainer());
+            ReactDOM.unmountComponentAtNode(ModalManager.getOrCreateStaticContainer());
+            return;
+        }
+
+        // Hide the content outside the modal to screen reader users
+        // so they won't be able to navigate into it and act on it using
+        // screen reader specific features
+        dis.dispatch({
+            action: 'aria_hide_main_app',
+        });
+
+        if (this.staticModal) {
+            const classes = classNames("mx_Dialog_wrapper mx_Dialog_staticWrapper", this.staticModal.className);
+
+            const staticDialog = (
+                <div className={classes}>
+                    <div className="mx_Dialog">
+                        { this.staticModal.elem }
+                    </div>
+                    <div className="mx_Dialog_background mx_Dialog_staticBackground" onClick={this.onBackgroundClick} />
+                </div>
+            );
+
+            ReactDOM.render(staticDialog, ModalManager.getOrCreateStaticContainer());
+        } else {
+            // This is safe to call repeatedly if we happen to do that
+            ReactDOM.unmountComponentAtNode(ModalManager.getOrCreateStaticContainer());
+        }
+
+        const modal = this.getCurrentModal();
+        if (modal !== this.staticModal) {
+            const classes = classNames("mx_Dialog_wrapper", modal.className, {
+                mx_Dialog_wrapperWithStaticUnder: this.staticModal,
+            });
+
+            const dialog = (
+                <div className={classes}>
+                    <div className="mx_Dialog">
+                        {modal.elem}
+                    </div>
+                    <div className="mx_Dialog_background" onClick={this.onBackgroundClick} />
+                </div>
+            );
+
+            ReactDOM.render(dialog, ModalManager.getOrCreateContainer());
+        } else {
+            // This is safe to call repeatedly if we happen to do that
+            ReactDOM.unmountComponentAtNode(ModalManager.getOrCreateContainer());
+        }
+    }
+}
+
+if (!window.singletonModalManager) {
+    window.singletonModalManager = new ModalManager();
+}
+export default window.singletonModalManager;
diff --git a/src/Notifier.js b/src/Notifier.ts
similarity index 87%
rename from src/Notifier.js
rename to src/Notifier.ts
index ec92840998..473de6c161 100644
--- a/src/Notifier.js
+++ b/src/Notifier.ts
@@ -2,6 +2,7 @@
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
 Copyright 2017 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,16 +17,22 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixClientPeg} from './MatrixClientPeg';
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { Room } from "matrix-js-sdk/src/models/room";
+
+import { MatrixClientPeg } from './MatrixClientPeg';
+import SdkConfig from './SdkConfig';
 import PlatformPeg from './PlatformPeg';
 import * as TextForEvent from './TextForEvent';
 import Analytics from './Analytics';
 import * as Avatar from './Avatar';
-import dis from './dispatcher';
+import dis from './dispatcher/dispatcher';
 import * as sdk from './index';
 import { _t } from './languageHandler';
 import Modal from './Modal';
-import SettingsStore, {SettingLevel} from "./settings/SettingsStore";
+import SettingsStore from "./settings/SettingsStore";
+import { hideToast as hideNotificationsToast } from "./toasts/DesktopNotificationsToast";
+import {SettingLevel} from "./settings/SettingLevel";
 
 /*
  * Dispatches:
@@ -49,7 +56,7 @@ const typehandlers = {
     },
 };
 
-const Notifier = {
+export const Notifier = {
     notifsByRoom: {},
 
     // A list of event IDs that we've received but need to wait until
@@ -57,14 +64,14 @@ const Notifier = {
     // or not
     pendingEncryptedEventIds: [],
 
-    notificationMessageForEvent: function(ev) {
+    notificationMessageForEvent: function(ev: MatrixEvent) {
         if (typehandlers.hasOwnProperty(ev.getContent().msgtype)) {
             return typehandlers[ev.getContent().msgtype](ev);
         }
         return TextForEvent.textForEvent(ev);
     },
 
-    _displayPopupNotification: function(ev, room) {
+    _displayPopupNotification: function(ev: MatrixEvent, room: Room) {
         const plaf = PlatformPeg.get();
         if (!plaf) {
             return;
@@ -119,7 +126,7 @@ const Notifier = {
         }
     },
 
-    getSoundForRoom: async function(roomId) {
+    getSoundForRoom: function(roomId: string) {
         // We do no caching here because the SDK caches setting
         // and the browser will cache the sound.
         const content = SettingsStore.getValue("notificationSound", roomId);
@@ -147,12 +154,13 @@ const Notifier = {
         };
     },
 
-    _playAudioNotification: async function(ev, room) {
-        const sound = await this.getSoundForRoom(room.roomId);
+    _playAudioNotification: async function(ev: MatrixEvent, room: Room) {
+        const sound = this.getSoundForRoom(room.roomId);
         console.log(`Got sound ${sound && sound.name || "default"} for ${room.roomId}`);
 
         try {
-            const selector = document.querySelector(sound ? `audio[src='${sound.url}']` : "#messageAudio");
+            const selector =
+                document.querySelector<HTMLAudioElement>(sound ? `audio[src='${sound.url}']` : "#messageAudio");
             let audioElement = selector;
             if (!selector) {
                 if (!sound) {
@@ -201,7 +209,7 @@ const Notifier = {
         return plaf && plaf.supportsNotifications();
     },
 
-    setEnabled: function(enable, callback) {
+    setEnabled: function(enable: boolean, callback?: () => void) {
         const plaf = PlatformPeg.get();
         if (!plaf) return;
 
@@ -223,10 +231,11 @@ const Notifier = {
                 if (result !== 'granted') {
                     // The permission request was dismissed or denied
                     // TODO: Support alternative branding in messaging
+                    const brand = SdkConfig.get().brand;
                     const description = result === 'denied'
-                        ? _t('Riot does not have permission to send you notifications - ' +
-                            'please check your browser settings')
-                        : _t('Riot was not given permission to send notifications - please try again');
+                        ? _t('%(brand)s does not have permission to send you notifications - ' +
+                            'please check your browser settings', { brand })
+                        : _t('%(brand)s was not given permission to send notifications - please try again', { brand });
                     const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
                     Modal.createTrackedDialog('Unable to enable Notifications', result, ErrorDialog, {
                         title: _t('Unable to enable Notifications'),
@@ -270,24 +279,20 @@ const Notifier = {
     },
 
     isAudioEnabled: function() {
-        return this.isEnabled() && SettingsStore.getValue("audioNotificationsEnabled");
+        // We don't route Audio via the HTML Notifications API so it is possible regardless of other things
+        return SettingsStore.getValue("audioNotificationsEnabled");
     },
 
-    setToolbarHidden: function(hidden, persistent = true) {
+    setToolbarHidden: function(hidden: boolean, persistent = true) {
         this.toolbarHidden = hidden;
 
         Analytics.trackEvent('Notifier', 'Set Toolbar Hidden', hidden);
 
-        // XXX: why are we dispatching this here?
-        // this is nothing to do with notifier_enabled
-        dis.dispatch({
-            action: "notifier_enabled",
-            value: this.isEnabled(),
-        });
+        hideNotificationsToast();
 
         // update the info to localStorage for persistent settings
         if (persistent && global.localStorage) {
-            global.localStorage.setItem("notifications_hidden", hidden);
+            global.localStorage.setItem("notifications_hidden", String(hidden));
         }
     },
 
@@ -310,7 +315,7 @@ const Notifier = {
         return this.toolbarHidden;
     },
 
-    onSyncStateChange: function(state) {
+    onSyncStateChange: function(state: string) {
         if (state === "SYNCING") {
             this.isSyncing = true;
         } else if (state === "STOPPED" || state === "ERROR") {
@@ -318,7 +323,7 @@ const Notifier = {
         }
     },
 
-    onEvent: function(ev) {
+    onEvent: function(ev: MatrixEvent) {
         if (!this.isSyncing) return; // don't alert for any messages initially
         if (ev.sender && ev.sender.userId === MatrixClientPeg.get().credentials.userId) return;
 
@@ -336,7 +341,7 @@ const Notifier = {
         this._evaluateEvent(ev);
     },
 
-    onEventDecrypted: function(ev) {
+    onEventDecrypted: function(ev: MatrixEvent) {
         // 'decrypted' means the decryption process has finished: it may have failed,
         // in which case it might decrypt soon if the keys arrive
         if (ev.isDecryptionFailure()) return;
@@ -348,7 +353,7 @@ const Notifier = {
         this._evaluateEvent(ev);
     },
 
-    onRoomReceipt: function(ev, room) {
+    onRoomReceipt: function(ev: MatrixEvent, room: Room) {
         if (room.getUnreadNotificationCount() === 0) {
             // ideally we would clear each notification when it was read,
             // but we have no way, given a read receipt, to know whether
@@ -381,8 +386,8 @@ const Notifier = {
     },
 };
 
-if (!global.mxNotifier) {
-    global.mxNotifier = Notifier;
+if (!window.mxNotifier) {
+    window.mxNotifier = Notifier;
 }
 
-export default global.mxNotifier;
+export default window.mxNotifier;
diff --git a/src/PasswordReset.js b/src/PasswordReset.js
index 320599f6d9..9472ddc633 100644
--- a/src/PasswordReset.js
+++ b/src/PasswordReset.js
@@ -84,8 +84,14 @@ export default class PasswordReset {
 
         try {
             await this.client.setPassword({
+                // Note: Though this sounds like a login type for identity servers only, it
+                // has a dual purpose of being used for homeservers too.
                 type: "m.login.email.identity",
+                // TODO: Remove `threepid_creds` once servers support proper UIA
+                // See https://github.com/matrix-org/synapse/issues/5665
+                // See https://github.com/matrix-org/matrix-doc/issues/2220
                 threepid_creds: creds,
+                threepidCreds: creds,
             }, this.password);
         } catch (err) {
             if (err.httpStatus === 401) {
diff --git a/src/PlatformPeg.js b/src/PlatformPeg.ts
similarity index 80%
rename from src/PlatformPeg.js
rename to src/PlatformPeg.ts
index 34131fde7d..1d2b813ebc 100644
--- a/src/PlatformPeg.js
+++ b/src/PlatformPeg.ts
@@ -1,5 +1,6 @@
 /*
 Copyright 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,6 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import BasePlatform from "./BasePlatform";
+
 /*
  * Holds the current Platform object used by the code to do anything
  * specific to the platform we're running on (eg. web, electron)
@@ -21,10 +24,8 @@ limitations under the License.
  * This allows the app layer to set a Platform without necessarily
  * having to have a MatrixChat object
  */
-class PlatformPeg {
-    constructor() {
-        this.platform = null;
-    }
+export class PlatformPeg {
+    platform: BasePlatform = null;
 
     /**
      * Returns the current Platform object for the application.
@@ -39,12 +40,12 @@ class PlatformPeg {
      * application.
      * This should be an instance of a class extending BasePlatform.
      */
-    set(plaf) {
+    set(plaf: BasePlatform) {
         this.platform = plaf;
     }
 }
 
-if (!global.mxPlatformPeg) {
-    global.mxPlatformPeg = new PlatformPeg();
+if (!window.mxPlatformPeg) {
+    window.mxPlatformPeg = new PlatformPeg();
 }
-export default global.mxPlatformPeg;
+export default window.mxPlatformPeg;
diff --git a/src/Presence.js b/src/Presence.js
index 2fc13a090b..42bca35f96 100644
--- a/src/Presence.js
+++ b/src/Presence.js
@@ -17,7 +17,7 @@ limitations under the License.
 */
 
 import {MatrixClientPeg} from "./MatrixClientPeg";
-import dis from "./dispatcher";
+import dis from "./dispatcher/dispatcher";
 import Timer from './utils/Timer';
 
  // Time in ms after that a user is considered as unavailable/away
diff --git a/src/Registration.js b/src/Registration.js
index ca162bac03..9c0264c067 100644
--- a/src/Registration.js
+++ b/src/Registration.js
@@ -20,7 +20,7 @@ limitations under the License.
  * registration code.
  */
 
-import dis from './dispatcher';
+import dis from './dispatcher/dispatcher';
 import * as sdk from './index';
 import Modal from './Modal';
 import { _t } from './languageHandler';
@@ -52,7 +52,7 @@ export async function startAnyRegistrationFlow(options) {
     // caution though.
 
     // XXX: ILAG is disabled for now,
-    // see https://github.com/vector-im/riot-web/issues/8222
+    // see https://github.com/vector-im/element-web/issues/8222
 
     // const flows = await _getRegistrationFlows();
     // const hasIlagFlow = flows.some((flow) => {
diff --git a/src/Resend.js b/src/Resend.js
index 6d6c18cf27..5638313306 100644
--- a/src/Resend.js
+++ b/src/Resend.js
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 import {MatrixClientPeg} from './MatrixClientPeg';
-import dis from './dispatcher';
+import dis from './dispatcher/dispatcher';
 import { EventStatus } from 'matrix-js-sdk';
 
 export default class Resend {
@@ -45,7 +45,7 @@ export default class Resend {
             });
         }, function(err) {
             // XXX: temporary logging to try to diagnose
-            // https://github.com/vector-im/riot-web/issues/3148
+            // https://github.com/vector-im/element-web/issues/3148
             console.log('Resend got send failure: ' + err.name + '(' + err + ')');
 
             dis.dispatch({
diff --git a/src/RoomNotifs.js b/src/RoomNotifs.js
index c67acaf314..a86c521ac4 100644
--- a/src/RoomNotifs.js
+++ b/src/RoomNotifs.js
@@ -34,32 +34,12 @@ export function shouldShowMentionBadge(roomNotifState) {
     return MENTION_BADGE_STATES.includes(roomNotifState);
 }
 
-export function countRoomsWithNotif(rooms) {
-    return rooms.reduce((result, room, index) => {
-        const roomNotifState = getRoomNotifsState(room.roomId);
-        const highlight = room.getUnreadNotificationCount('highlight') > 0;
-        const notificationCount = room.getUnreadNotificationCount();
-
-        const notifBadges = notificationCount > 0 && shouldShowNotifBadge(roomNotifState);
-        const mentionBadges = highlight && shouldShowMentionBadge(roomNotifState);
-        const isInvite = room.hasMembershipState(MatrixClientPeg.get().credentials.userId, 'invite');
-        const badges = notifBadges || mentionBadges || isInvite;
-
-        if (badges) {
-            result.count++;
-            if (highlight) {
-                result.highlight = true;
-            }
-        }
-        return result;
-    }, {count: 0, highlight: false});
-}
-
 export function aggregateNotificationCount(rooms) {
-    return rooms.reduce((result, room, index) => {
+    return rooms.reduce((result, room) => {
         const roomNotifState = getRoomNotifsState(room.roomId);
         const highlight = room.getUnreadNotificationCount('highlight') > 0;
-        const notificationCount = room.getUnreadNotificationCount();
+        // use helper method to include highlights in the previous version of the room
+        const notificationCount = getUnreadNotificationCount(room);
 
         const notifBadges = notificationCount > 0 && shouldShowNotifBadge(roomNotifState);
         const mentionBadges = highlight && shouldShowMentionBadge(roomNotifState);
diff --git a/src/RoomNotifsTypes.ts b/src/RoomNotifsTypes.ts
new file mode 100644
index 0000000000..0e7093e434
--- /dev/null
+++ b/src/RoomNotifsTypes.ts
@@ -0,0 +1,24 @@
+/*
+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 {
+    ALL_MESSAGES,
+    ALL_MESSAGES_LOUD,
+    MENTIONS_ONLY,
+    MUTE,
+} from "./RoomNotifs";
+
+export type Volume = ALL_MESSAGES_LOUD | ALL_MESSAGES | MENTIONS_ONLY | MUTE;
diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index 9731e42825..896e27d92c 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -174,7 +174,7 @@ Request:
 Response:
 [
     {
-        // TODO: Enable support for m.widget event type (https://github.com/vector-im/riot-web/issues/13111)
+        // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
         type: "im.vector.modular.widgets",
         state_key: "wid1",
         content: {
@@ -193,7 +193,7 @@ Example:
     room_id: "!foo:bar",
     response: [
         {
-            // TODO: Enable support for m.widget event type (https://github.com/vector-im/riot-web/issues/13111)
+            // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
             type: "im.vector.modular.widgets",
             state_key: "wid1",
             content: {
@@ -238,22 +238,23 @@ Example:
 
 import {MatrixClientPeg} from './MatrixClientPeg';
 import { MatrixEvent } from 'matrix-js-sdk';
-import dis from './dispatcher';
+import dis from './dispatcher/dispatcher';
 import WidgetUtils from './utils/WidgetUtils';
 import RoomViewStore from './stores/RoomViewStore';
 import { _t } from './languageHandler';
 import {IntegrationManagers} from "./integrations/IntegrationManagers";
 import {WidgetType} from "./widgets/WidgetType";
+import {objectClone} from "./utils/objects";
 
 function sendResponse(event, res) {
-    const data = JSON.parse(JSON.stringify(event.data));
+    const data = objectClone(event.data);
     data.response = res;
     event.source.postMessage(data, event.origin);
 }
 
 function sendError(event, msg, nestedError) {
     console.error("Action:" + event.data.action + " failed with message: " + msg);
-    const data = JSON.parse(JSON.stringify(event.data));
+    const data = objectClone(event.data);
     data.response = {
         error: {
             message: msg,
diff --git a/src/SdkConfig.ts b/src/SdkConfig.ts
index 400d29a20f..b914aaaf6d 100644
--- a/src/SdkConfig.ts
+++ b/src/SdkConfig.ts
@@ -1,6 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -20,6 +20,8 @@ export interface ConfigOptions {
 }
 
 export const DEFAULTS: ConfigOptions = {
+    // Brand name of the app
+    brand: "Element",
     // URL to a page we show in an iframe to configure integrations
     integrations_ui_url: "https://scalar.vector.im/",
     // Base URL to the REST interface of the integrations server
diff --git a/src/Searching.js b/src/Searching.js
index 663328fe41..b1507e6a49 100644
--- a/src/Searching.js
+++ b/src/Searching.js
@@ -17,25 +17,71 @@ limitations under the License.
 import EventIndexPeg from "./indexing/EventIndexPeg";
 import {MatrixClientPeg} from "./MatrixClientPeg";
 
-function serverSideSearch(term, roomId = undefined) {
-    let filter;
-    if (roomId !== undefined) {
-        // XXX: it's unintuitive that the filter for searching doesn't have
-        // the same shape as the v2 filter API :(
-        filter = {
-            rooms: [roomId],
-        };
-    }
+const SEARCH_LIMIT = 10;
 
-    const searchPromise = MatrixClientPeg.get().searchRoomEvents({
-        filter,
-        term,
-    });
+async function serverSideSearch(term, roomId = undefined) {
+    const client = MatrixClientPeg.get();
 
-    return searchPromise;
+    const filter = {
+        limit: SEARCH_LIMIT,
+    };
+
+    if (roomId !== undefined) filter.rooms = [roomId];
+
+    const body = {
+        search_categories: {
+            room_events: {
+                search_term: term,
+                filter: filter,
+                order_by: "recent",
+                event_context: {
+                    before_limit: 1,
+                    after_limit: 1,
+                    include_profile: true,
+                },
+            },
+        },
+    };
+
+    const response = await client.search({body: body});
+
+    const result = {
+        response: response,
+        query: body,
+    };
+
+    return result;
+}
+
+async function serverSideSearchProcess(term, roomId = undefined) {
+    const client = MatrixClientPeg.get();
+    const result = await serverSideSearch(term, roomId);
+
+    // The js-sdk method backPaginateRoomEventsSearch() uses _query internally
+    // so we're reusing the concept here since we wan't to delegate the
+    // pagination back to backPaginateRoomEventsSearch() in some cases.
+    const searchResult = {
+        _query: result.query,
+        results: [],
+        highlights: [],
+    };
+
+    return client._processRoomEventsSearch(searchResult, result.response);
+}
+
+function compareEvents(a, b) {
+    const aEvent = a.result;
+    const bEvent = b.result;
+
+    if (aEvent.origin_server_ts > bEvent.origin_server_ts) return -1;
+    if (aEvent.origin_server_ts < bEvent.origin_server_ts) return 1;
+
+    return 0;
 }
 
 async function combinedSearch(searchTerm) {
+    const client = MatrixClientPeg.get();
+
     // Create two promises, one for the local search, one for the
     // server-side search.
     const serverSidePromise = serverSideSearch(searchTerm);
@@ -48,37 +94,59 @@ async function combinedSearch(searchTerm) {
     const localResult = await localPromise;
     const serverSideResult = await serverSidePromise;
 
-    // Combine the search results into one result.
-    const result = {};
+    const serverQuery = serverSideResult.query;
+    const serverResponse = serverSideResult.response;
 
-    // Our localResult and serverSideResult are both ordered by
-    // recency separately, when we combine them the order might not
-    // be the right one so we need to sort them.
-    const compare = (a, b) => {
-        const aEvent = a.context.getEvent().event;
-        const bEvent = b.context.getEvent().event;
+    const localQuery = localResult.query;
+    const localResponse = localResult.response;
 
-        if (aEvent.origin_server_ts >
-            bEvent.origin_server_ts) return -1;
-        if (aEvent.origin_server_ts <
-            bEvent.origin_server_ts) return 1;
-        return 0;
+    // Store our queries for later on so we can support pagination.
+    //
+    // We're reusing _query here again to not introduce separate code paths and
+    // concepts for our different pagination methods. We're storing the
+    // server-side next batch separately since the query is the json body of
+    // the request and next_batch needs to be a query parameter.
+    //
+    // We can't put it in the final result that _processRoomEventsSearch()
+    // returns since that one can be either a server-side one, a local one or a
+    // fake one to fetch the remaining cached events. See the docs for
+    // combineEvents() for an explanation why we need to cache events.
+    const emptyResult = {
+        seshatQuery: localQuery,
+        _query: serverQuery,
+        serverSideNextBatch: serverResponse.next_batch,
+        cachedEvents: [],
+        oldestEventFrom: "server",
+        results: [],
+        highlights: [],
     };
 
-    result.count = localResult.count + serverSideResult.count;
-    result.results = localResult.results.concat(
-        serverSideResult.results).sort(compare);
-    result.highlights = localResult.highlights.concat(
-        serverSideResult.highlights);
+    // Combine our results.
+    const combinedResult = combineResponses(emptyResult, localResponse, serverResponse.search_categories.room_events);
+
+    // Let the client process the combined result.
+    const response = {
+        search_categories: {
+            room_events: combinedResult,
+        },
+    };
+
+    const result = client._processRoomEventsSearch(emptyResult, response);
+
+    // Restore our encryption info so we can properly re-verify the events.
+    restoreEncryptionInfo(result.results);
 
     return result;
 }
 
-async function localSearch(searchTerm, roomId = undefined) {
+async function localSearch(searchTerm, roomId = undefined, processResult = true) {
+    const eventIndex = EventIndexPeg.get();
+
     const searchArgs = {
         search_term: searchTerm,
         before_limit: 1,
         after_limit: 1,
+        limit: SEARCH_LIMIT,
         order_by_recency: true,
         room_id: undefined,
     };
@@ -87,6 +155,19 @@ async function localSearch(searchTerm, roomId = undefined) {
         searchArgs.room_id = roomId;
     }
 
+    const localResult = await eventIndex.search(searchArgs);
+
+    searchArgs.next_batch = localResult.next_batch;
+
+    const result = {
+        response: localResult,
+        query: searchArgs,
+    };
+
+    return result;
+}
+
+async function localSearchProcess(searchTerm, roomId = undefined) {
     const emptyResult = {
         results: [],
         highlights: [],
@@ -94,9 +175,34 @@ async function localSearch(searchTerm, roomId = undefined) {
 
     if (searchTerm === "") return emptyResult;
 
+    const result = await localSearch(searchTerm, roomId);
+
+    emptyResult.seshatQuery = result.query;
+
+    const response = {
+        search_categories: {
+            room_events: result.response,
+        },
+    };
+
+    const processedResult = MatrixClientPeg.get()._processRoomEventsSearch(emptyResult, response);
+    // Restore our encryption info so we can properly re-verify the events.
+    restoreEncryptionInfo(processedResult.results);
+
+    return processedResult;
+}
+
+async function localPagination(searchResult) {
     const eventIndex = EventIndexPeg.get();
 
+    const searchArgs = searchResult.seshatQuery;
+
     const localResult = await eventIndex.search(searchArgs);
+    searchResult.seshatQuery.next_batch = localResult.next_batch;
+
+    // We only need to restore the encryption state for the new results, so
+    // remember how many of them we got.
+    const newResultCount = localResult.results.length;
 
     const response = {
         search_categories: {
@@ -104,8 +210,324 @@ async function localSearch(searchTerm, roomId = undefined) {
         },
     };
 
-    const result = MatrixClientPeg.get()._processRoomEventsSearch(
-        emptyResult, response);
+    const result = MatrixClientPeg.get()._processRoomEventsSearch(searchResult, response);
+
+    // Restore our encryption info so we can properly re-verify the events.
+    const newSlice = result.results.slice(Math.max(result.results.length - newResultCount, 0));
+    restoreEncryptionInfo(newSlice);
+
+    searchResult.pendingRequest = null;
+
+    return result;
+}
+
+function compareOldestEvents(firstResults, secondResults) {
+    try {
+        const oldestFirstEvent = firstResults.results[firstResults.results.length - 1].result;
+        const oldestSecondEvent = secondResults.results[secondResults.results.length - 1].result;
+
+        if (oldestFirstEvent.origin_server_ts <= oldestSecondEvent.origin_server_ts) {
+            return -1;
+        } else {
+            return 1;
+        }
+    } catch {
+        return 0;
+    }
+}
+
+function combineEventSources(previousSearchResult, response, a, b) {
+    // Merge event sources and sort the events.
+    const combinedEvents = a.concat(b).sort(compareEvents);
+    // Put half of the events in the response, and cache the other half.
+    response.results = combinedEvents.slice(0, SEARCH_LIMIT);
+    previousSearchResult.cachedEvents = combinedEvents.slice(SEARCH_LIMIT);
+}
+
+/**
+ * Combine the events from our event sources into a sorted result
+ *
+ * This method will first be called from the combinedSearch() method. In this
+ * case we will fetch SEARCH_LIMIT events from the server and the local index.
+ *
+ * The method will put the SEARCH_LIMIT newest events from the server and the
+ * local index in the results part of the response, the rest will be put in the
+ * cachedEvents field of the previousSearchResult (in this case an empty search
+ * result).
+ *
+ * Every subsequent call will be made from the combinedPagination() method, in
+ * this case we will combine the cachedEvents and the next SEARCH_LIMIT events
+ * from either the server or the local index.
+ *
+ * Since we have two event sources and we need to sort the results by date we
+ * need keep on looking for the oldest event. We are implementing a variation of
+ * a sliding window.
+ *
+ * The event sources are here represented as two sorted lists where the smallest
+ * number represents the newest event. The two lists need to be merged in a way
+ * that preserves the sorted property so they can be shown as one search result.
+ * We first fetch SEARCH_LIMIT events from both sources.
+ *
+ * If we set SEARCH_LIMIT to 3:
+ *
+ *  Server events [01, 02, 04, 06, 07, 08, 11, 13]
+ *                |01, 02, 04|
+ *  Local events  [03, 05, 09, 10, 12, 14, 15, 16]
+ *                |03, 05, 09|
+ *
+ *  We note that the oldest event is from the local index, and we combine the
+ *  results:
+ *
+ *  Server window [01, 02, 04]
+ *  Local window  [03, 05, 09]
+ *
+ *  Combined events [01, 02, 03, 04, 05, 09]
+ *
+ *  We split the combined result in the part that we want to present and a part
+ *  that will be cached.
+ *
+ *  Presented events [01, 02, 03]
+ *  Cached events    [04, 05, 09]
+ *
+ *  We slide the window for the server since the oldest event is from the local
+ *  index.
+ *
+ *  Server events [01, 02, 04, 06, 07, 08, 11, 13]
+ *                            |06, 07, 08|
+ *  Local events  [03, 05, 09, 10, 12, 14, 15, 16]
+ *                |XX, XX, XX|
+ *  Cached events [04, 05, 09]
+ *
+ *  We note that the oldest event is from the server and we combine the new
+ *  server events with the cached ones.
+ *
+ *  Cached events [04, 05, 09]
+ *  Server events [06, 07, 08]
+ *
+ *  Combined events [04, 05, 06, 07, 08, 09]
+ *
+ *  We split again.
+ *
+ *  Presented events [04, 05, 06]
+ *  Cached events    [07, 08, 09]
+ *
+ *  We slide the local window, the oldest event is on the server.
+ *
+ *  Server events [01, 02, 04, 06, 07, 08, 11, 13]
+ *                            |XX, XX, XX|
+ *  Local events  [03, 05, 09, 10, 12, 14, 15, 16]
+ *                            |10, 12, 14|
+ *
+ *  Cached events [07, 08, 09]
+ *  Local events  [10, 12, 14]
+ *  Combined events [07, 08, 09, 10, 12, 14]
+ *
+ *  Presented events [07, 08, 09]
+ *  Cached events    [10, 12, 14]
+ *
+ *  Next up we slide the server window again.
+ *
+ *  Server events [01, 02, 04, 06, 07, 08, 11, 13]
+ *                                        |11, 13|
+ *  Local events  [03, 05, 09, 10, 12, 14, 15, 16]
+ *                            |XX, XX, XX|
+ *
+ *  Cached events [10, 12, 14]
+ *  Server events [11, 13]
+ *  Combined events [10, 11, 12, 13, 14]
+ *
+ *  Presented events [10, 11, 12]
+ *  Cached events    [13, 14]
+ *
+ *  We have one source exhausted, we fetch the rest of our events from the other
+ *  source and combine it with our cached events.
+ *
+ *
+ * @param {object} previousSearchResult A search result from a previous search
+ * call.
+ * @param {object} localEvents An unprocessed search result from the event
+ * index.
+ * @param {object} serverEvents An unprocessed search result from the server.
+ *
+ * @return {object} A response object that combines the events from the
+ * different event sources.
+ *
+ */
+function combineEvents(previousSearchResult, localEvents = undefined, serverEvents = undefined) {
+    const response = {};
+
+    const cachedEvents = previousSearchResult.cachedEvents;
+    let oldestEventFrom = previousSearchResult.oldestEventFrom;
+    response.highlights = previousSearchResult.highlights;
+
+    if (localEvents && serverEvents) {
+        // 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.
+        if (compareOldestEvents(localEvents, serverEvents) < 0) {
+            oldestEventFrom = "local";
+        }
+
+        combineEventSources(previousSearchResult, response, localEvents.results, serverEvents.results);
+        response.highlights = localEvents.highlights.concat(serverEvents.highlights);
+    } else if (localEvents) {
+        // This is a pagination call fetching more events from the local index,
+        // meaning that our oldest event was on the server.
+        // Change the source of the oldest event if our local event is older
+        // than the cached one.
+        if (compareOldestEvents(localEvents, cachedEvents) < 0) {
+            oldestEventFrom = "local";
+        }
+        combineEventSources(previousSearchResult, response, localEvents.results, cachedEvents);
+    } else if (serverEvents) {
+        // 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
+        // than the cached one.
+        if (compareOldestEvents(serverEvents, cachedEvents) < 0) {
+            oldestEventFrom = "server";
+        }
+        combineEventSources(previousSearchResult, response, serverEvents.results, cachedEvents);
+    } else {
+        // This is a pagination call where we exhausted both of our event
+        // sources, let's push the remaining cached events.
+        response.results = cachedEvents;
+        previousSearchResult.cachedEvents = [];
+    }
+
+    previousSearchResult.oldestEventFrom = oldestEventFrom;
+
+    return response;
+}
+
+/**
+ * Combine the local and server search responses
+ *
+ * @param {object} previousSearchResult A search result from a previous search
+ * call.
+ * @param {object} localEvents An unprocessed search result from the event
+ * index.
+ * @param {object} serverEvents An unprocessed search result from the server.
+ *
+ * @return {object} A response object that combines the events from the
+ * different event sources.
+ */
+function combineResponses(previousSearchResult, localEvents = undefined, serverEvents = undefined) {
+    // Combine our events first.
+    const response = combineEvents(previousSearchResult, localEvents, serverEvents);
+
+    // Our first search will contain counts from both sources, subsequent
+    // pagination requests will fetch responses only from one of the sources, so
+    // reuse the first count when we're paginating.
+    if (previousSearchResult.count) {
+        response.count = previousSearchResult.count;
+    } else {
+        response.count = localEvents.count + serverEvents.count;
+    }
+
+    // Update our next batch tokens for the given search sources.
+    if (localEvents) {
+        previousSearchResult.seshatQuery.next_batch = localEvents.next_batch;
+    }
+    if (serverEvents) {
+        previousSearchResult.serverSideNextBatch = serverEvents.next_batch;
+    }
+
+    // Set the response next batch token to one of the tokens from the sources,
+    // this makes sure that if we exhaust one of the sources we continue with
+    // the other one.
+    if (previousSearchResult.seshatQuery.next_batch) {
+        response.next_batch = previousSearchResult.seshatQuery.next_batch;
+    } else if (previousSearchResult.serverSideNextBatch) {
+        response.next_batch = previousSearchResult.serverSideNextBatch;
+    }
+
+    // We collected all search results from the server as well as from Seshat,
+    // we still have some events cached that we'll want to display on the next
+    // pagination request.
+    //
+    // Provide a fake next batch token for that case.
+    if (!response.next_batch && previousSearchResult.cachedEvents.length > 0) {
+        response.next_batch = "cached";
+    }
+
+    return response;
+}
+
+function restoreEncryptionInfo(searchResultSlice) {
+    for (let i = 0; i < searchResultSlice.length; i++) {
+        const timeline = searchResultSlice[i].context.getTimeline();
+
+        for (let j = 0; j < timeline.length; j++) {
+            const ev = timeline[j];
+
+            if (ev.event.curve25519Key) {
+                ev.makeEncrypted(
+                    "m.room.encrypted",
+                    { algorithm: ev.event.algorithm },
+                    ev.event.curve25519Key,
+                    ev.event.ed25519Key,
+                );
+                ev._forwardingCurve25519KeyChain = ev.event.forwardingCurve25519KeyChain;
+
+                delete ev.event.curve25519Key;
+                delete ev.event.ed25519Key;
+                delete ev.event.algorithm;
+                delete ev.event.forwardingCurve25519KeyChain;
+            }
+        }
+    }
+}
+
+async function combinedPagination(searchResult) {
+    const eventIndex = EventIndexPeg.get();
+    const client = MatrixClientPeg.get();
+
+    const searchArgs = searchResult.seshatQuery;
+    const oldestEventFrom = searchResult.oldestEventFrom;
+
+    let localResult;
+    let serverSideResult;
+
+    // Fetch events from the local index if we have a token for itand if it's
+    // the local indexes turn or the server has exhausted its results.
+    if (searchArgs.next_batch && (!searchResult.serverSideNextBatch || oldestEventFrom === "server")) {
+        localResult = await eventIndex.search(searchArgs);
+    }
+
+    // Fetch events from the server if we have a token for it and if it's the
+    // local indexes turn or the local index has exhausted its results.
+    if (searchResult.serverSideNextBatch && (oldestEventFrom === "local" || !searchArgs.next_batch)) {
+        const body = {body: searchResult._query, next_batch: searchResult.serverSideNextBatch};
+        serverSideResult = await client.search(body);
+    }
+
+    let serverEvents;
+
+    if (serverSideResult) {
+        serverEvents = serverSideResult.search_categories.room_events;
+    }
+
+    // Combine our events.
+    const combinedResult = combineResponses(searchResult, localResult, serverEvents);
+
+    const response = {
+        search_categories: {
+            room_events: combinedResult,
+        },
+    };
+
+    const oldResultCount = searchResult.results.length;
+
+    // Let the client process the combined result.
+    const result = client._processRoomEventsSearch(searchResult, response);
+
+    // Restore our encryption info so we can properly re-verify the events.
+    const newResultCount = result.results.length - oldResultCount;
+    const newSlice = result.results.slice(Math.max(result.results.length - newResultCount, 0));
+    restoreEncryptionInfo(newSlice);
+
+    searchResult.pendingRequest = null;
 
     return result;
 }
@@ -117,11 +539,11 @@ function eventIndexSearch(term, roomId = undefined) {
         if (MatrixClientPeg.get().isRoomEncrypted(roomId)) {
             // The search is for a single encrypted room, use our local
             // search method.
-            searchPromise = localSearch(term, roomId);
+            searchPromise = localSearchProcess(term, roomId);
         } else {
             // The search is for a single non-encrypted room, use the
             // server-side search.
-            searchPromise = serverSideSearch(term, roomId);
+            searchPromise = serverSideSearchProcess(term, roomId);
         }
     } else {
         // Search across all rooms, combine a server side search and a
@@ -132,9 +554,45 @@ function eventIndexSearch(term, roomId = undefined) {
     return searchPromise;
 }
 
+function eventIndexSearchPagination(searchResult) {
+    const client = MatrixClientPeg.get();
+
+    const seshatQuery = searchResult.seshatQuery;
+    const serverQuery = searchResult._query;
+
+    if (!seshatQuery) {
+        // This is a search in a non-encrypted room. Do the normal server-side
+        // pagination.
+        return client.backPaginateRoomEventsSearch(searchResult);
+    } else if (!serverQuery) {
+        // This is a search in a encrypted room. Do a local pagination.
+        const promise = localPagination(searchResult);
+        searchResult.pendingRequest = promise;
+
+        return promise;
+    } else {
+        // We have both queries around, this is a search across all rooms so a
+        // combined pagination needs to be done.
+        const promise = combinedPagination(searchResult);
+        searchResult.pendingRequest = promise;
+
+        return promise;
+    }
+}
+
+export function searchPagination(searchResult) {
+    const eventIndex = EventIndexPeg.get();
+    const client = MatrixClientPeg.get();
+
+    if (searchResult.pendingRequest) return searchResult.pendingRequest;
+
+    if (eventIndex === null) return client.backPaginateRoomEventsSearch(searchResult);
+    else return eventIndexSearchPagination(searchResult);
+}
+
 export default function eventSearch(term, roomId = undefined) {
     const eventIndex = EventIndexPeg.get();
 
-    if (eventIndex === null) return serverSideSearch(term, roomId);
+    if (eventIndex === null) return serverSideSearchProcess(term, roomId);
     else return eventIndexSearch(term, roomId);
 }
diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index bd7e60e2f4..50a49ccf1c 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -21,7 +21,7 @@ limitations under the License.
 import * as React from 'react';
 
 import {MatrixClientPeg} from './MatrixClientPeg';
-import dis from './dispatcher';
+import dis from './dispatcher/dispatcher';
 import * as sdk from './index';
 import {_t, _td} from './languageHandler';
 import Modal from './Modal';
@@ -40,6 +40,10 @@ import { Jitsi } from "./widgets/Jitsi";
 import { parseFragment as parseHtml } from "parse5";
 import sendBugReport from "./rageshake/submit-rageshake";
 import SdkConfig from "./SdkConfig";
+import { ensureDMExists } from "./createRoom";
+import { ViewUserPayload } from "./dispatcher/payloads/ViewUserPayload";
+import { Action } from "./dispatcher/actions";
+import { EffectiveMembership, getEffectiveMembership } from "./utils/membership";
 
 // XXX: workaround for https://github.com/microsoft/TypeScript/issues/31816
 interface HTMLInputEvent extends Event {
@@ -115,7 +119,7 @@ export class Command {
 
     run(roomId: string, args: string, cmd: string) {
         // if it has no runFn then its an ignored/nop command (autocomplete only) e.g `/me`
-        if (!this.runFn) return;
+        if (!this.runFn) return reject(_t("Command error"));
         return this.runFn.bind(this)(roomId, args, cmd);
     }
 
@@ -365,6 +369,7 @@ export const Commands = [
             Modal.createTrackedDialog('Slash Commands', 'Topic', InfoDialog, {
                 title: room.name,
                 description: <div dangerouslySetInnerHTML={{ __html: topicHtml }} />,
+                hasCloseButton: true,
             });
             return success();
         },
@@ -396,14 +401,16 @@ export const Commands = [
                     // If we need an identity server but don't have one, things
                     // get a bit more complex here, but we try to show something
                     // meaningful.
-                    let finished = Promise.resolve();
+                    let prom = Promise.resolve();
                     if (
                         getAddressType(address) === 'email' &&
                         !MatrixClientPeg.get().getIdentityServerUrl()
                     ) {
                         const defaultIdentityServerUrl = getDefaultIdentityServerUrl();
                         if (defaultIdentityServerUrl) {
-                            ({ finished } = Modal.createTrackedDialog('Slash Commands', 'Identity server',
+                            const { finished } = Modal.createTrackedDialog<[boolean]>(
+                                'Slash Commands',
+                                'Identity server',
                                 QuestionDialog, {
                                     title: _t("Use an identity server"),
                                     description: <p>{_t(
@@ -416,9 +423,9 @@ export const Commands = [
                                     )}</p>,
                                     button: _t("Continue"),
                                 },
-                            ));
+                            );
 
-                            finished = finished.then(([useDefault]: any) => {
+                            prom = finished.then(([useDefault]) => {
                                 if (useDefault) {
                                     useDefaultIdentityServer();
                                     return;
@@ -430,7 +437,7 @@ export const Commands = [
                         }
                     }
                     const inviter = new MultiInviter(roomId);
-                    return success(finished.then(() => {
+                    return success(prom.then(() => {
                         return inviter.invite([address]);
                     }).then(() => {
                         if (inviter.getCompletionState(address) !== "invited") {
@@ -446,8 +453,8 @@ export const Commands = [
     new Command({
         command: 'join',
         aliases: ['j', 'goto'],
-        args: '<room-alias>',
-        description: _td('Joins room with given alias'),
+        args: '<room-address>',
+        description: _td('Joins room with given address'),
         runFn: function(_, args) {
             if (args) {
                 // Note: we support 2 versions of this command. The first is
@@ -472,7 +479,7 @@ export const Commands = [
                     const parsedUrl = new URL(params[0]);
                     const hostname = parsedUrl.host || parsedUrl.hostname; // takes first non-falsey value
 
-                    // if we're using a Riot permalink handler, this will catch it before we get much further.
+                    // if we're using a Element permalink handler, this will catch it before we get much further.
                     // see below where we make assumptions about parsing the URL.
                     if (isPermalinkHost(hostname)) {
                         isPermalink = true;
@@ -491,8 +498,7 @@ export const Commands = [
                     });
                     return success();
                 } else if (params[0][0] === '!') {
-                    const roomId = params[0];
-                    const viaServers = params.splice(0);
+                    const [roomId, ...viaServers] = params;
 
                     dis.dispatch({
                         action: 'view_room',
@@ -558,7 +564,7 @@ export const Commands = [
     }),
     new Command({
         command: 'part',
-        args: '[<room-alias>]',
+        args: '[<room-address>]',
         description: _td('Leave room'),
         runFn: function(roomId, args) {
             const cli = MatrixClientPeg.get();
@@ -590,7 +596,7 @@ export const Commands = [
                         }
                         if (targetRoomId) break;
                     }
-                    if (!targetRoomId) return reject(_t('Unrecognised room alias:') + ' ' + roomAlias);
+                    if (!targetRoomId) return reject(_t('Unrecognised room address:') + ' ' + roomAlias);
                 }
             }
 
@@ -657,7 +663,7 @@ export const Commands = [
             if (args) {
                 const cli = MatrixClientPeg.get();
 
-                const matches = args.match(/^(\S+)$/);
+                const matches = args.match(/^(@[^:]+:\S+)$/);
                 if (matches) {
                     const userId = matches[1];
                     const ignoredUsers = cli.getIgnoredUsers();
@@ -687,7 +693,7 @@ export const Commands = [
             if (args) {
                 const cli = MatrixClientPeg.get();
 
-                const matches = args.match(/^(\S+)$/);
+                const matches = args.match(/(^@[^:]+:\S+$)/);
                 if (matches) {
                     const userId = matches[1];
                     const ignoredUsers = cli.getIgnoredUsers();
@@ -727,9 +733,11 @@ export const Commands = [
                         const cli = MatrixClientPeg.get();
                         const room = cli.getRoom(roomId);
                         if (!room) return reject(_t("Command failed"));
-
+                        const member = room.getMember(userId);
+                        if (!member || getEffectiveMembership(member.membership) === EffectiveMembership.Leave) {
+                            return reject(_t("Could not find user in room"));
+                        }
                         const powerLevelEvent = room.currentState.getStateEvents('m.room.power_levels', '');
-                        if (!powerLevelEvent.getContent().users[args]) return reject(_t("Could not find user in room"));
                         return success(cli.setPowerLevel(roomId, userId, powerLevel, powerLevelEvent));
                     }
                 }
@@ -941,8 +949,10 @@ export const Commands = [
             }
 
             const member = MatrixClientPeg.get().getRoom(roomId).getMember(userId);
-            dis.dispatch({
-                action: 'view_user',
+            dis.dispatch<ViewUserPayload>({
+                action: Action.ViewUser,
+                // XXX: We should be using a real member object and not assuming what the
+                // receiver wants.
                 member: member || {userId},
             });
             return success();
@@ -970,6 +980,52 @@ export const Commands = [
         },
         category: CommandCategories.advanced,
     }),
+    new Command({
+        command: "query",
+        description: _td("Opens chat with the given user"),
+        args: "<user-id>",
+        runFn: function(roomId, userId) {
+            if (!userId || !userId.startsWith("@") || !userId.includes(":")) {
+                return reject(this.getUsage());
+            }
+
+            return success((async () => {
+                dis.dispatch({
+                    action: 'view_room',
+                    room_id: await ensureDMExists(MatrixClientPeg.get(), userId),
+                });
+            })());
+        },
+        category: CommandCategories.actions,
+    }),
+    new Command({
+        command: "msg",
+        description: _td("Sends a message to the given user"),
+        args: "<user-id> <message>",
+        runFn: function(_, args) {
+            if (args) {
+                // matches the first whitespace delimited group and then the rest of the string
+                const matches = args.match(/^(\S+?)(?: +(.*))?$/s);
+                if (matches) {
+                    const [userId, msg] = matches.slice(1);
+                    if (msg && userId && userId.startsWith("@") && userId.includes(":")) {
+                        return success((async () => {
+                            const cli = MatrixClientPeg.get();
+                            const roomId = await ensureDMExists(cli, userId);
+                            dis.dispatch({
+                                action: 'view_room',
+                                room_id: roomId,
+                            });
+                            cli.sendTextMessage(roomId, msg);
+                        })());
+                    }
+                }
+            }
+
+            return reject(this.getUsage());
+        },
+        category: CommandCategories.actions,
+    }),
 
     // Command definitions for autocompletion ONLY:
     // /me is special because its not handled by SlashCommands.js and is instead done inside the Composer classes
@@ -995,7 +1051,7 @@ export function parseCommandString(input) {
     // trim any trailing whitespace, as it can confuse the parser for
     // IRC-style commands
     input = input.replace(/\s+$/, '');
-    if (input[0] !== '/') return null; // not a command
+    if (input[0] !== '/') return {}; // not a command
 
     const bits = input.match(/^(\S+?)(?: +((.|\n)*))?$/);
     let cmd;
diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 3607d7a676..c55380bd9b 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -345,7 +345,7 @@ function textForCallHangupEvent(event) {
         } else if (eventContent.reason === "invite_timeout") {
             reason = _t('(no answer)');
         } else if (eventContent.reason === "user hangup") {
-            // workaround for https://github.com/vector-im/riot-web/issues/5178
+            // 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
@@ -603,7 +603,7 @@ const stateHandlers = {
     'm.room.guest_access': textForGuestAccessEvent,
     'm.room.related_groups': textForRelatedGroupsEvent,
 
-    // TODO: Enable support for m.widget event type (https://github.com/vector-im/riot-web/issues/13111)
+    // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
     'im.vector.modular.widgets': textForWidgetEvent,
 };
 
diff --git a/src/Tinter.js b/src/Tinter.js
index 24a4d25a00..ca5a460e16 100644
--- a/src/Tinter.js
+++ b/src/Tinter.js
@@ -327,7 +327,7 @@ class Tinter {
                 // Vector Green as its primary color?
                 // --richvdh
 
-                // Yes, tinting assumes that you are using the Riot skin for now.
+                // Yes, tinting assumes that you are using the Element skin for now.
                 // The right solution will be to move the CSS over to react-sdk.
                 // And yes, the default assets for the base skin might as well use
                 // Vector Green as any other colour.
diff --git a/src/Unread.js b/src/Unread.js
index ca713b05e4..cf131cac00 100644
--- a/src/Unread.js
+++ b/src/Unread.js
@@ -52,10 +52,10 @@ export function doesRoomHaveUnreadMessages(room) {
 
     // as we don't send RRs for our own messages, make sure we special case that
     // if *we* sent the last message into the room, we consider it not unread!
-    // Should fix: https://github.com/vector-im/riot-web/issues/3263
-    //             https://github.com/vector-im/riot-web/issues/2427
+    // Should fix: https://github.com/vector-im/element-web/issues/3263
+    //             https://github.com/vector-im/element-web/issues/2427
     // ...and possibly some of the others at
-    //             https://github.com/vector-im/riot-web/issues/3363
+    //             https://github.com/vector-im/element-web/issues/3363
     if (room.timeline.length &&
         room.timeline[room.timeline.length - 1].sender &&
         room.timeline[room.timeline.length - 1].sender.userId === myUserId) {
diff --git a/src/UserActivity.js b/src/UserActivity.js
index 0d1b4d0cc0..0174aebaf5 100644
--- a/src/UserActivity.js
+++ b/src/UserActivity.js
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import dis from './dispatcher';
+import dis from './dispatcher/dispatcher';
 import Timer from './utils/Timer';
 
 // important these are larger than the timeouts of timers
diff --git a/src/VectorConferenceHandler.js b/src/VectorConferenceHandler.js
index 180dad876b..c10bc659ae 100644
--- a/src/VectorConferenceHandler.js
+++ b/src/VectorConferenceHandler.js
@@ -19,13 +19,13 @@ import {createNewMatrixCall as jsCreateNewMatrixCall, Room} from "matrix-js-sdk"
 import CallHandler from './CallHandler';
 import {MatrixClientPeg} from "./MatrixClientPeg";
 
-// FIXME: this is Riot (Vector) specific code, but will be removed shortly when
-// we switch over to jitsi entirely for video conferencing.
+// FIXME: this is Element specific code, but will be removed shortly when we
+// switch over to Jitsi entirely for video conferencing.
 
-// FIXME: This currently forces Vector to try to hit the matrix.org AS for conferencing.
-// This is bad because it prevents people running their own ASes from being used.
-// This isn't permanent and will be customisable in the future: see the proposal
-// at docs/conferencing.md for more info.
+// FIXME: This currently forces Element to try to hit the matrix.org AS for
+// conferencing. This is bad because it prevents people running their own ASes
+// from being used. This isn't permanent and will be customisable in the future:
+// see the proposal at docs/conferencing.md for more info.
 const USER_PREFIX = "fs_";
 const DOMAIN = "matrix.org";
 
diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index 5f877bd48a..6aed08c39d 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -41,9 +41,18 @@ if (!global.mxToWidgetMessaging) {
 const OUTBOUND_API_NAME = 'toWidget';
 
 export default class WidgetMessaging {
-    constructor(widgetId, widgetUrl, isUserWidget, target) {
+    /**
+     * @param {string} widgetId The widget's ID
+     * @param {string} wurl The raw URL of the widget as in the event (the 'wURL')
+     * @param {string} renderedUrl The url used in the widget's iframe (either similar to the wURL
+     *     or a different URL of the clients choosing if it is using its own impl).
+     * @param {bool} isUserWidget If true, the widget is a user widget, otherwise it's a room widget
+     * @param {object} target Where widget messages should be sent (eg. the iframe object)
+     */
+    constructor(widgetId, wurl, renderedUrl, isUserWidget, target) {
         this.widgetId = widgetId;
-        this.widgetUrl = widgetUrl;
+        this.wurl = wurl;
+        this.renderedUrl = renderedUrl;
         this.isUserWidget = isUserWidget;
         this.target = target;
         this.fromWidget = global.mxFromWidgetMessaging;
@@ -67,7 +76,7 @@ export default class WidgetMessaging {
                     console.error(err._error);
                 }
                 // Potential XSS attack if 'msg' is not appropriately sanitized,
-                // as it is untrusted input by our parent window (which we assume is Riot).
+                // as it is untrusted input by our parent window (which we assume is Element).
                 // We can't aggressively sanitize [A-z0-9] since it might be a translation.
                 throw new Error(msg);
             }
@@ -87,6 +96,17 @@ export default class WidgetMessaging {
         });
     }
 
+    /**
+     * Tells the widget that it should terminate now.
+     * @returns {Promise<*>} Resolves when widget has acknowledged the message.
+     */
+    terminate() {
+        return this.messageToWidget({
+            api: OUTBOUND_API_NAME,
+            action: KnownWidgetActions.Terminate,
+        });
+    }
+
     /**
      * Request a screenshot from a widget
      * @return {Promise} To be resolved with screenshot data when it has been generated
@@ -128,19 +148,19 @@ export default class WidgetMessaging {
     }
 
     start() {
-        this.fromWidget.addEndpoint(this.widgetId, this.widgetUrl);
+        this.fromWidget.addEndpoint(this.widgetId, this.renderedUrl);
         this.fromWidget.addListener("get_openid", this._onOpenIdRequest);
     }
 
     stop() {
-        this.fromWidget.removeEndpoint(this.widgetId, this.widgetUrl);
+        this.fromWidget.removeEndpoint(this.widgetId, this.renderedUrl);
         this.fromWidget.removeListener("get_openid", this._onOpenIdRequest);
     }
 
     async _onOpenIdRequest(ev, rawEv) {
         if (ev.widgetId !== this.widgetId) return; // not interesting
 
-        const widgetSecurityKey = WidgetUtils.getWidgetSecurityKey(this.widgetId, this.widgetUrl, this.isUserWidget);
+        const widgetSecurityKey = WidgetUtils.getWidgetSecurityKey(this.widgetId, this.wurl, this.isUserWidget);
 
         const settings = SettingsStore.getValue("widgetOpenIDPermissions");
         if (settings.deny && settings.deny.includes(widgetSecurityKey)) {
@@ -161,7 +181,7 @@ export default class WidgetMessaging {
         // Actually ask for permission to send the user's data
         Modal.createTrackedDialog("OpenID widget permissions", '',
             WidgetOpenIDPermissionsDialog, {
-                widgetUrl: this.widgetUrl,
+                widgetUrl: this.wurl,
                 widgetId: this.widgetId,
                 isUserWidget: this.isUserWidget,
 
diff --git a/src/accessibility/KeyboardShortcuts.tsx b/src/accessibility/KeyboardShortcuts.tsx
index bcbf3d6810..f527ab4a14 100644
--- a/src/accessibility/KeyboardShortcuts.tsx
+++ b/src/accessibility/KeyboardShortcuts.tsx
@@ -34,6 +34,7 @@ export enum Categories {
     CALLS = "Calls",
     COMPOSER = "Composer",
     ROOM_LIST = "Room List",
+    ROOM = "Room",
     AUTOCOMPLETE = "Autocomplete",
 }
 
@@ -142,6 +143,34 @@ const shortcuts: Record<Categories, IShortcut[]> = {
         },
     ],
 
+    [Categories.ROOM]: [
+        {
+            keybinds: [{
+                key: Key.PAGE_UP,
+            }, {
+                key: Key.PAGE_DOWN,
+            }],
+            description: _td("Scroll up/down in the timeline"),
+        }, {
+            keybinds: [{
+                key: Key.ESCAPE,
+            }],
+            description: _td("Dismiss read marker and jump to bottom"),
+        }, {
+            keybinds: [{
+                modifiers: [Modifiers.SHIFT],
+                key: Key.PAGE_UP,
+            }],
+                description: _td("Jump to oldest unread message"),
+        }, {
+            keybinds: [{
+                modifiers: [CMD_OR_CTRL, Modifiers.SHIFT],
+                key: Key.U,
+            }],
+            description: _td("Upload a file"),
+        }
+    ],
+
     [Categories.ROOM_LIST]: [
         {
             keybinds: [{
@@ -181,13 +210,6 @@ const shortcuts: Record<Categories, IShortcut[]> = {
 
     [Categories.NAVIGATION]: [
         {
-            keybinds: [{
-                key: Key.PAGE_UP,
-            }, {
-                key: Key.PAGE_DOWN,
-            }],
-            description: _td("Scroll up/down in the timeline"),
-        }, {
             keybinds: [{
                 modifiers: [Modifiers.ALT, Modifiers.SHIFT],
                 key: Key.ARROW_UP,
@@ -257,10 +279,11 @@ const shortcuts: Record<Categories, IShortcut[]> = {
 
 const categoryOrder = [
     Categories.COMPOSER,
-    Categories.CALLS,
-    Categories.ROOM_LIST,
     Categories.AUTOCOMPLETE,
+    Categories.ROOM,
+    Categories.ROOM_LIST,
     Categories.NAVIGATION,
+    Categories.CALLS,
 ];
 
 interface IModal {
diff --git a/src/accessibility/RovingTabIndex.js b/src/accessibility/RovingTabIndex.tsx
similarity index 79%
rename from src/accessibility/RovingTabIndex.js
rename to src/accessibility/RovingTabIndex.tsx
index b481f08fe2..5a650d4b6e 100644
--- a/src/accessibility/RovingTabIndex.js
+++ b/src/accessibility/RovingTabIndex.tsx
@@ -22,9 +22,12 @@ import React, {
     useMemo,
     useRef,
     useReducer,
+    Reducer,
+    Dispatch,
 } from "react";
-import PropTypes from "prop-types";
+
 import {Key} from "../Keyboard";
+import {FocusHandler, Ref} from "./roving/types";
 
 /**
  * Module to simplify implementing the Roving TabIndex accessibility technique
@@ -41,7 +44,17 @@ import {Key} from "../Keyboard";
 
 const DOCUMENT_POSITION_PRECEDING = 2;
 
-const RovingTabIndexContext = createContext({
+export interface IState {
+    activeRef: Ref;
+    refs: Ref[];
+}
+
+interface IContext {
+    state: IState;
+    dispatch: Dispatch<IAction>;
+}
+
+const RovingTabIndexContext = createContext<IContext>({
     state: {
         activeRef: null,
         refs: [], // list of refs in DOM order
@@ -50,16 +63,22 @@ const RovingTabIndexContext = createContext({
 });
 RovingTabIndexContext.displayName = "RovingTabIndexContext";
 
-// TODO use a TypeScript type here
-const types = {
-    REGISTER: "REGISTER",
-    UNREGISTER: "UNREGISTER",
-    SET_FOCUS: "SET_FOCUS",
-};
+enum Type {
+    Register = "REGISTER",
+    Unregister = "UNREGISTER",
+    SetFocus = "SET_FOCUS",
+}
 
-const reducer = (state, action) => {
+interface IAction {
+    type: Type;
+    payload: {
+        ref: Ref;
+    };
+}
+
+const reducer = (state: IState, action: IAction) => {
     switch (action.type) {
-        case types.REGISTER: {
+        case Type.Register: {
             if (state.refs.length === 0) {
                 // Our list of refs was empty, set activeRef to this first item
                 return {
@@ -92,7 +111,7 @@ const reducer = (state, action) => {
                 ],
             };
         }
-        case types.UNREGISTER: {
+        case Type.Unregister: {
             // filter out the ref which we are removing
             const refs = state.refs.filter(r => r !== action.payload.ref);
 
@@ -117,7 +136,7 @@ const reducer = (state, action) => {
                 refs,
             };
         }
-        case types.SET_FOCUS: {
+        case Type.SetFocus: {
             // update active ref
             return {
                 ...state,
@@ -129,13 +148,21 @@ const reducer = (state, action) => {
     }
 };
 
-export const RovingTabIndexProvider = ({children, handleHomeEnd, onKeyDown}) => {
-    const [state, dispatch] = useReducer(reducer, {
+interface IProps {
+    handleHomeEnd?: boolean;
+    children(renderProps: {
+        onKeyDownHandler(ev: React.KeyboardEvent);
+    });
+    onKeyDown?(ev: React.KeyboardEvent, state: IState);
+}
+
+export const RovingTabIndexProvider: React.FC<IProps> = ({children, handleHomeEnd, onKeyDown}) => {
+    const [state, dispatch] = useReducer<Reducer<IState, IAction>>(reducer, {
         activeRef: null,
         refs: [],
     });
 
-    const context = useMemo(() => ({state, dispatch}), [state]);
+    const context = useMemo<IContext>(() => ({state, dispatch}), [state]);
 
     const onKeyDownHandler = useCallback((ev) => {
         let handled = false;
@@ -163,7 +190,7 @@ export const RovingTabIndexProvider = ({children, handleHomeEnd, onKeyDown}) =>
             ev.preventDefault();
             ev.stopPropagation();
         } else if (onKeyDown) {
-            return onKeyDown(ev);
+            return onKeyDown(ev, state);
         }
     }, [context.state, onKeyDown, handleHomeEnd]);
 
@@ -171,19 +198,15 @@ export const RovingTabIndexProvider = ({children, handleHomeEnd, onKeyDown}) =>
         { children({onKeyDownHandler}) }
     </RovingTabIndexContext.Provider>;
 };
-RovingTabIndexProvider.propTypes = {
-    handleHomeEnd: PropTypes.bool,
-    onKeyDown: PropTypes.func,
-};
 
 // Hook to register a roving tab index
 // inputRef parameter specifies the ref to use
 // 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) => {
+export const useRovingTabIndex = (inputRef: Ref): [FocusHandler, boolean, Ref] => {
     const context = useContext(RovingTabIndexContext);
-    let ref = useRef(null);
+    let ref = useRef<HTMLElement>(null);
 
     if (inputRef) {
         // if we are given a ref, use it instead of ours
@@ -193,13 +216,13 @@ export const useRovingTabIndex = (inputRef) => {
     // setup (after refs)
     useLayoutEffect(() => {
         context.dispatch({
-            type: types.REGISTER,
+            type: Type.Register,
             payload: {ref},
         });
         // teardown
         return () => {
             context.dispatch({
-                type: types.UNREGISTER,
+                type: Type.Unregister,
                 payload: {ref},
             });
         };
@@ -207,7 +230,7 @@ export const useRovingTabIndex = (inputRef) => {
 
     const onFocus = useCallback(() => {
         context.dispatch({
-            type: types.SET_FOCUS,
+            type: Type.SetFocus,
             payload: {ref},
         });
     }, [ref, context]);
@@ -216,9 +239,7 @@ export const useRovingTabIndex = (inputRef) => {
     return [onFocus, isActive, ref];
 };
 
-// Wrapper to allow use of useRovingTabIndex outside of React Functional Components.
-export const RovingTabIndexWrapper = ({children, inputRef}) => {
-    const [onFocus, isActive, ref] = useRovingTabIndex(inputRef);
-    return children({onFocus, isActive, ref});
-};
-
+// re-export the semantic helper components for simplicity
+export {RovingTabIndexWrapper} from "./roving/RovingTabIndexWrapper";
+export {RovingAccessibleButton} from "./roving/RovingAccessibleButton";
+export {RovingAccessibleTooltipButton} from "./roving/RovingAccessibleTooltipButton";
diff --git a/src/accessibility/Toolbar.tsx b/src/accessibility/Toolbar.tsx
new file mode 100644
index 0000000000..0e968461a8
--- /dev/null
+++ b/src/accessibility/Toolbar.tsx
@@ -0,0 +1,69 @@
+/*
+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 {IState, RovingTabIndexProvider} from "./RovingTabIndex";
+import {Key} from "../Keyboard";
+
+interface IProps extends Omit<React.HTMLProps<HTMLDivElement>, "onKeyDown"> {
+}
+
+// This component implements the Toolbar design pattern from the WAI-ARIA Authoring Practices guidelines.
+// https://www.w3.org/TR/wai-aria-practices-1.1/#toolbar
+// All buttons passed in children must use RovingTabIndex to set `onFocus`, `isActive`, `ref`
+const Toolbar: React.FC<IProps> = ({children, ...props}) => {
+    const onKeyDown = (ev: React.KeyboardEvent, state: IState) => {
+        const target = ev.target as HTMLElement;
+        let handled = true;
+
+        switch (ev.key) {
+            case Key.ARROW_UP:
+            case Key.ARROW_DOWN:
+                if (target.hasAttribute('aria-haspopup')) {
+                    target.click();
+                }
+                break;
+
+            case Key.ARROW_LEFT:
+            case Key.ARROW_RIGHT:
+                if (state.refs.length > 0) {
+                    const i = state.refs.findIndex(r => r === state.activeRef);
+                    const delta = ev.key === Key.ARROW_RIGHT ? 1 : -1;
+                    state.refs.slice((i + delta) % state.refs.length)[0].current.focus();
+                }
+                break;
+
+            // HOME and END are handled by RovingTabIndexProvider
+
+            default:
+                handled = false;
+        }
+
+        if (handled) {
+            ev.preventDefault();
+            ev.stopPropagation();
+        }
+    };
+
+    return <RovingTabIndexProvider handleHomeEnd={true} onKeyDown={onKeyDown}>
+        {({onKeyDownHandler}) => <div {...props} onKeyDown={onKeyDownHandler} role="toolbar">
+            { children }
+        </div>}
+    </RovingTabIndexProvider>;
+};
+
+export default Toolbar;
diff --git a/src/accessibility/context_menu/ContextMenuButton.tsx b/src/accessibility/context_menu/ContextMenuButton.tsx
new file mode 100644
index 0000000000..e211a4c933
--- /dev/null
+++ b/src/accessibility/context_menu/ContextMenuButton.tsx
@@ -0,0 +1,51 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 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 AccessibleButton from "../../components/views/elements/AccessibleButton";
+
+interface IProps extends React.ComponentProps<typeof AccessibleButton> {
+    label?: string;
+    // whether or not the context menu is currently open
+    isExpanded: boolean;
+}
+
+// Semantic component for representing the AccessibleButton which launches a <ContextMenu />
+export const ContextMenuButton: React.FC<IProps> = ({
+    label,
+    isExpanded,
+    children,
+    onClick,
+    onContextMenu,
+    ...props
+}) => {
+    return (
+        <AccessibleButton
+            {...props}
+            onClick={onClick}
+            onContextMenu={onContextMenu || onClick}
+            title={label}
+            aria-label={label}
+            aria-haspopup={true}
+            aria-expanded={isExpanded}
+        >
+            { children }
+        </AccessibleButton>
+    );
+};
diff --git a/src/accessibility/context_menu/ContextMenuTooltipButton.tsx b/src/accessibility/context_menu/ContextMenuTooltipButton.tsx
new file mode 100644
index 0000000000..abc5412100
--- /dev/null
+++ b/src/accessibility/context_menu/ContextMenuTooltipButton.tsx
@@ -0,0 +1,47 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 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 AccessibleTooltipButton from "../../components/views/elements/AccessibleTooltipButton";
+
+interface IProps extends React.ComponentProps<typeof AccessibleTooltipButton>  {
+    // whether or not the context menu is currently open
+    isExpanded: boolean;
+}
+
+// Semantic component for representing the AccessibleButton which launches a <ContextMenu />
+export const ContextMenuTooltipButton: React.FC<IProps> = ({
+    isExpanded,
+    children,
+    onClick,
+    onContextMenu,
+    ...props
+}) => {
+    return (
+        <AccessibleTooltipButton
+            {...props}
+            onClick={onClick}
+            onContextMenu={onContextMenu || onClick}
+            aria-haspopup={true}
+            aria-expanded={isExpanded}
+        >
+            { children }
+        </AccessibleTooltipButton>
+    );
+};
diff --git a/src/accessibility/context_menu/MenuGroup.tsx b/src/accessibility/context_menu/MenuGroup.tsx
new file mode 100644
index 0000000000..9334e17a18
--- /dev/null
+++ b/src/accessibility/context_menu/MenuGroup.tsx
@@ -0,0 +1,30 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 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";
+
+interface IProps extends React.HTMLAttributes<HTMLDivElement> {
+    label: string;
+}
+
+// Semantic component for representing a role=group for grouping menu radios/checkboxes
+export const MenuGroup: React.FC<IProps> = ({children, label, ...props}) => {
+    return <div {...props} role="group" aria-label={label}>
+        { children }
+    </div>;
+};
diff --git a/src/components/views/rooms/RoomDropTarget.js b/src/accessibility/context_menu/MenuItem.tsx
similarity index 53%
rename from src/components/views/rooms/RoomDropTarget.js
rename to src/accessibility/context_menu/MenuItem.tsx
index 61b7ca6d59..64233e51ad 100644
--- a/src/components/views/rooms/RoomDropTarget.js
+++ b/src/accessibility/context_menu/MenuItem.tsx
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd
 Copyright 2019 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,21 +16,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
-import createReactClass from 'create-react-class';
+import React from "react";
 
-export default createReactClass({
-    displayName: 'RoomDropTarget',
+import AccessibleButton from "../../components/views/elements/AccessibleButton";
+
+interface IProps extends React.ComponentProps<typeof AccessibleButton> {
+    label?: string;
+}
+
+// Semantic component for representing a role=menuitem
+export const MenuItem: React.FC<IProps> = ({children, label, ...props}) => {
+    return (
+        <AccessibleButton {...props} role="menuitem" tabIndex={-1} aria-label={label}>
+            { children }
+        </AccessibleButton>
+    );
+};
 
-    render: function() {
-        return (
-            <div className="mx_RoomDropTarget_container">
-                <div className="mx_RoomDropTarget">
-                    <div className="mx_RoomDropTarget_label">
-                        { this.props.label }
-                    </div>
-                </div>
-            </div>
-        );
-    },
-});
diff --git a/src/accessibility/context_menu/MenuItemCheckbox.tsx b/src/accessibility/context_menu/MenuItemCheckbox.tsx
new file mode 100644
index 0000000000..5eb8cc4819
--- /dev/null
+++ b/src/accessibility/context_menu/MenuItemCheckbox.tsx
@@ -0,0 +1,43 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 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 AccessibleButton from "../../components/views/elements/AccessibleButton";
+
+interface IProps extends React.ComponentProps<typeof AccessibleButton> {
+    label?: string;
+    active: boolean;
+}
+
+// Semantic component for representing a role=menuitemcheckbox
+export const MenuItemCheckbox: React.FC<IProps> = ({children, label, active, disabled, ...props}) => {
+    return (
+        <AccessibleButton
+            {...props}
+            role="menuitemcheckbox"
+            aria-checked={active}
+            aria-disabled={disabled}
+            disabled={disabled}
+            tabIndex={-1}
+            aria-label={label}
+        >
+            { children }
+        </AccessibleButton>
+    );
+};
diff --git a/src/accessibility/context_menu/MenuItemRadio.tsx b/src/accessibility/context_menu/MenuItemRadio.tsx
new file mode 100644
index 0000000000..472f13ff14
--- /dev/null
+++ b/src/accessibility/context_menu/MenuItemRadio.tsx
@@ -0,0 +1,43 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 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 AccessibleButton from "../../components/views/elements/AccessibleButton";
+
+interface IProps extends React.ComponentProps<typeof AccessibleButton> {
+    label?: string;
+    active: boolean;
+}
+
+// Semantic component for representing a role=menuitemradio
+export const MenuItemRadio: React.FC<IProps> = ({children, label, active, disabled, ...props}) => {
+    return (
+        <AccessibleButton
+            {...props}
+            role="menuitemradio"
+            aria-checked={active}
+            aria-disabled={disabled}
+            disabled={disabled}
+            tabIndex={-1}
+            aria-label={label}
+        >
+            { children }
+        </AccessibleButton>
+    );
+};
diff --git a/src/accessibility/context_menu/StyledMenuItemCheckbox.tsx b/src/accessibility/context_menu/StyledMenuItemCheckbox.tsx
new file mode 100644
index 0000000000..d373f892c9
--- /dev/null
+++ b/src/accessibility/context_menu/StyledMenuItemCheckbox.tsx
@@ -0,0 +1,64 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 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 {Key} from "../../Keyboard";
+import StyledCheckbox from "../../components/views/elements/StyledCheckbox";
+
+interface IProps extends React.ComponentProps<typeof StyledCheckbox> {
+    label?: string;
+    onChange(); // we handle keyup/down ourselves so lose the ChangeEvent
+    onClose(): void; // gets called after onChange on Key.ENTER
+}
+
+// Semantic component for representing a styled role=menuitemcheckbox
+export const StyledMenuItemCheckbox: React.FC<IProps> = ({children, label, onChange, onClose, ...props}) => {
+    const onKeyDown = (e: React.KeyboardEvent) => {
+        if (e.key === Key.ENTER || e.key === Key.SPACE) {
+            e.stopPropagation();
+            e.preventDefault();
+            onChange();
+            // Implements https://www.w3.org/TR/wai-aria-practices/#keyboard-interaction-12
+            if (e.key === Key.ENTER) {
+                onClose();
+            }
+        }
+    };
+    const onKeyUp = (e: React.KeyboardEvent) => {
+        // prevent the input default handler as we handle it on keydown to match
+        // https://www.w3.org/TR/wai-aria-practices/examples/menubar/menubar-2/menubar-2.html
+        if (e.key === Key.SPACE || e.key === Key.ENTER) {
+            e.stopPropagation();
+            e.preventDefault();
+        }
+    };
+    return (
+        <StyledCheckbox
+            {...props}
+            role="menuitemcheckbox"
+            tabIndex={-1}
+            aria-label={label}
+            onChange={onChange}
+            onKeyDown={onKeyDown}
+            onKeyUp={onKeyUp}
+        >
+            { children }
+        </StyledCheckbox>
+    );
+};
diff --git a/src/accessibility/context_menu/StyledMenuItemRadio.tsx b/src/accessibility/context_menu/StyledMenuItemRadio.tsx
new file mode 100644
index 0000000000..5e5aa90a38
--- /dev/null
+++ b/src/accessibility/context_menu/StyledMenuItemRadio.tsx
@@ -0,0 +1,64 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 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 {Key} from "../../Keyboard";
+import StyledRadioButton from "../../components/views/elements/StyledRadioButton";
+
+interface IProps extends React.ComponentProps<typeof StyledRadioButton> {
+    label?: string;
+    onChange(); // we handle keyup/down ourselves so lose the ChangeEvent
+    onClose(): void; // gets called after onChange on Key.ENTER
+}
+
+// Semantic component for representing a styled role=menuitemradio
+export const StyledMenuItemRadio: React.FC<IProps> = ({children, label, onChange, onClose, ...props}) => {
+    const onKeyDown = (e: React.KeyboardEvent) => {
+        if (e.key === Key.ENTER || e.key === Key.SPACE) {
+            e.stopPropagation();
+            e.preventDefault();
+            onChange();
+            // Implements https://www.w3.org/TR/wai-aria-practices/#keyboard-interaction-12
+            if (e.key === Key.ENTER) {
+                onClose();
+            }
+        }
+    };
+    const onKeyUp = (e: React.KeyboardEvent) => {
+        // prevent the input default handler as we handle it on keydown to match
+        // https://www.w3.org/TR/wai-aria-practices/examples/menubar/menubar-2/menubar-2.html
+        if (e.key === Key.SPACE || e.key === Key.ENTER) {
+            e.stopPropagation();
+            e.preventDefault();
+        }
+    };
+    return (
+        <StyledRadioButton
+            {...props}
+            role="menuitemradio"
+            tabIndex={-1}
+            aria-label={label}
+            onChange={onChange}
+            onKeyDown={onKeyDown}
+            onKeyUp={onKeyUp}
+        >
+            { children }
+        </StyledRadioButton>
+    );
+};
diff --git a/src/accessibility/roving/RovingAccessibleButton.tsx b/src/accessibility/roving/RovingAccessibleButton.tsx
new file mode 100644
index 0000000000..3473ef1bc9
--- /dev/null
+++ b/src/accessibility/roving/RovingAccessibleButton.tsx
@@ -0,0 +1,32 @@
+/*
+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 "../../components/views/elements/AccessibleButton";
+import {useRovingTabIndex} from "../RovingTabIndex";
+import {Ref} from "./types";
+
+interface IProps extends Omit<React.ComponentProps<typeof AccessibleButton>, "onFocus" | "inputRef" | "tabIndex"> {
+    inputRef?: Ref;
+}
+
+// Wrapper to allow use of useRovingTabIndex for simple AccessibleButtons outside of React Functional Components.
+export const RovingAccessibleButton: React.FC<IProps> = ({inputRef, ...props}) => {
+    const [onFocus, isActive, ref] = useRovingTabIndex(inputRef);
+    return <AccessibleButton {...props} onFocus={onFocus} inputRef={ref} tabIndex={isActive ? 0 : -1} />;
+};
+
diff --git a/src/accessibility/roving/RovingAccessibleTooltipButton.tsx b/src/accessibility/roving/RovingAccessibleTooltipButton.tsx
new file mode 100644
index 0000000000..cc824fef22
--- /dev/null
+++ b/src/accessibility/roving/RovingAccessibleTooltipButton.tsx
@@ -0,0 +1,32 @@
+/*
+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 AccessibleTooltipButton from "../../components/views/elements/AccessibleTooltipButton";
+import {useRovingTabIndex} from "../RovingTabIndex";
+import {Ref} from "./types";
+
+interface IProps extends Omit<React.ComponentProps<typeof AccessibleTooltipButton>, "onFocus" | "inputRef" | "tabIndex"> {
+    inputRef?: Ref;
+}
+
+// Wrapper to allow use of useRovingTabIndex for simple AccessibleTooltipButtons outside of React Functional Components.
+export const RovingAccessibleTooltipButton: React.FC<IProps> = ({inputRef, ...props}) => {
+    const [onFocus, isActive, ref] = useRovingTabIndex(inputRef);
+    return <AccessibleTooltipButton {...props} onFocus={onFocus} inputRef={ref} tabIndex={isActive ? 0 : -1} />;
+};
+
diff --git a/src/accessibility/roving/RovingTabIndexWrapper.tsx b/src/accessibility/roving/RovingTabIndexWrapper.tsx
new file mode 100644
index 0000000000..c826b74497
--- /dev/null
+++ b/src/accessibility/roving/RovingTabIndexWrapper.tsx
@@ -0,0 +1,36 @@
+/*
+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 "../../components/views/elements/AccessibleButton";
+import {useRovingTabIndex} from "../RovingTabIndex";
+import {FocusHandler, Ref} from "./types";
+
+interface IProps {
+    inputRef?: Ref;
+    children(renderProps: {
+        onFocus: FocusHandler;
+        isActive: boolean;
+        ref: Ref;
+    });
+}
+
+// Wrapper to allow use of useRovingTabIndex outside of React Functional Components.
+export const RovingTabIndexWrapper: React.FC<IProps> = ({children, inputRef}) => {
+    const [onFocus, isActive, ref] = useRovingTabIndex(inputRef);
+    return children({onFocus, isActive, ref});
+};
diff --git a/src/accessibility/roving/types.ts b/src/accessibility/roving/types.ts
new file mode 100644
index 0000000000..f0a43e5fb8
--- /dev/null
+++ b/src/accessibility/roving/types.ts
@@ -0,0 +1,21 @@
+/*
+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 {RefObject} from "react";
+
+export type Ref = RefObject<HTMLElement>;
+
+export type FocusHandler = () => void;
diff --git a/src/actions/GroupActions.js b/src/actions/GroupActions.js
deleted file mode 100644
index 006c2da5b8..0000000000
--- a/src/actions/GroupActions.js
+++ /dev/null
@@ -1,34 +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 { asyncAction } from './actionCreators';
-
-const GroupActions = {};
-
-/**
- * Creates an action thunk that will do an asynchronous request to fetch
- * the groups to which a user is joined.
- *
- * @param {MatrixClient} matrixClient the matrix client to query.
- * @returns {function} an action thunk that will dispatch actions
- *                     indicating the status of the request.
- * @see asyncAction
- */
-GroupActions.fetchJoinedGroups = function(matrixClient) {
-    return asyncAction('GroupActions.fetchJoinedGroups', () => matrixClient.getJoinedGroups());
-};
-
-export default GroupActions;
diff --git a/src/actions/GroupActions.ts b/src/actions/GroupActions.ts
new file mode 100644
index 0000000000..81470d1221
--- /dev/null
+++ b/src/actions/GroupActions.ts
@@ -0,0 +1,34 @@
+/*
+Copyright 2017 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+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 { asyncAction } from './actionCreators';
+import { AsyncActionPayload } from "../dispatcher/payloads";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+
+export default class GroupActions {
+    /**
+     * Creates an action thunk that will do an asynchronous request to fetch
+     * the groups to which a user is joined.
+     *
+     * @param {MatrixClient} matrixClient the matrix client to query.
+     * @returns {AsyncActionPayload} An async action payload.
+     * @see asyncAction
+     */
+    public static fetchJoinedGroups(matrixClient: MatrixClient): AsyncActionPayload {
+        return asyncAction('GroupActions.fetchJoinedGroups', () => matrixClient.getJoinedGroups(), null);
+    }
+}
diff --git a/src/actions/MatrixActionCreators.js b/src/actions/MatrixActionCreators.js
index c89ec44435..93a4fcf07c 100644
--- a/src/actions/MatrixActionCreators.js
+++ b/src/actions/MatrixActionCreators.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import dis from '../dispatcher';
+import dis from '../dispatcher/dispatcher';
 
 // TODO: migrate from sync_state to MatrixActions.sync so that more js-sdk events
 //       become dispatches in the same place.
diff --git a/src/actions/RoomListActions.js b/src/actions/RoomListActions.js
deleted file mode 100644
index 10a3848dda..0000000000
--- a/src/actions/RoomListActions.js
+++ /dev/null
@@ -1,145 +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 { asyncAction } from './actionCreators';
-import RoomListStore, {TAG_DM} from '../stores/RoomListStore';
-import Modal from '../Modal';
-import * as Rooms from '../Rooms';
-import { _t } from '../languageHandler';
-import * as sdk from '../index';
-
-const RoomListActions = {};
-
-/**
- * Creates an action thunk that will do an asynchronous request to
- * tag room.
- *
- * @param {MatrixClient} matrixClient the matrix client to set the
- *                                    account data on.
- * @param {Room} room the room to tag.
- * @param {string} oldTag the tag to remove (unless oldTag ==== newTag)
- * @param {string} newTag the tag with which to tag the room.
- * @param {?number} oldIndex the previous position of the room in the
- *                           list of rooms.
- * @param {?number} newIndex the new position of the room in the list
- *                           of rooms.
- * @returns {function} an action thunk.
- * @see asyncAction
- */
-RoomListActions.tagRoom = function(matrixClient, room, oldTag, newTag, oldIndex, newIndex) {
-    let metaData = null;
-
-    // Is the tag ordered manually?
-    if (newTag && !newTag.match(/^(m\.lowpriority|im\.vector\.fake\.(invite|recent|direct|archived))$/)) {
-        const lists = RoomListStore.getRoomLists();
-        const newList = [...lists[newTag]];
-
-        newList.sort((a, b) => a.tags[newTag].order - b.tags[newTag].order);
-
-        // If the room was moved "down" (increasing index) in the same list we
-        // need to use the orders of the tiles with indices shifted by +1
-        const offset = (
-            newTag === oldTag && oldIndex < newIndex
-        ) ? 1 : 0;
-
-        const indexBefore = offset + newIndex - 1;
-        const indexAfter = offset + newIndex;
-
-        const prevOrder = indexBefore <= 0 ?
-            0 : newList[indexBefore].tags[newTag].order;
-        const nextOrder = indexAfter >= newList.length ?
-            1 : newList[indexAfter].tags[newTag].order;
-
-        metaData = {
-            order: (prevOrder + nextOrder) / 2.0,
-        };
-    }
-
-    return asyncAction('RoomListActions.tagRoom', () => {
-        const promises = [];
-        const roomId = room.roomId;
-
-        // Evil hack to get DMs behaving
-        if ((oldTag === undefined && newTag === TAG_DM) ||
-            (oldTag === TAG_DM && newTag === undefined)
-        ) {
-            return Rooms.guessAndSetDMRoom(
-                room, newTag === TAG_DM,
-            ).catch((err) => {
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                console.error("Failed to set direct chat tag " + err);
-                Modal.createTrackedDialog('Failed to set direct chat tag', '', ErrorDialog, {
-                    title: _t('Failed to set direct chat tag'),
-                    description: ((err && err.message) ? err.message : _t('Operation failed')),
-                });
-            });
-        }
-
-        const hasChangedSubLists = oldTag !== newTag;
-
-        // More evilness: We will still be dealing with moving to favourites/low prio,
-        // but we avoid ever doing a request with TAG_DM.
-        //
-        // if we moved lists, remove the old tag
-        if (oldTag && oldTag !== TAG_DM &&
-            hasChangedSubLists
-        ) {
-            const promiseToDelete = matrixClient.deleteRoomTag(
-                roomId, oldTag,
-            ).catch(function(err) {
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                console.error("Failed to remove tag " + oldTag + " from room: " + err);
-                Modal.createTrackedDialog('Failed to remove tag from room', '', ErrorDialog, {
-                    title: _t('Failed to remove tag %(tagName)s from room', {tagName: oldTag}),
-                    description: ((err && err.message) ? err.message : _t('Operation failed')),
-                });
-            });
-
-            promises.push(promiseToDelete);
-        }
-
-        // if we moved lists or the ordering changed, add the new tag
-        if (newTag && newTag !== TAG_DM &&
-            (hasChangedSubLists || metaData)
-        ) {
-            // metaData is the body of the PUT to set the tag, so it must
-            // at least be an empty object.
-            metaData = metaData || {};
-
-            const promiseToAdd = matrixClient.setRoomTag(roomId, newTag, metaData).catch(function(err) {
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                console.error("Failed to add tag " + newTag + " to room: " + err);
-                Modal.createTrackedDialog('Failed to add tag to room', '', ErrorDialog, {
-                    title: _t('Failed to add tag %(tagName)s to room', {tagName: newTag}),
-                    description: ((err && err.message) ? err.message : _t('Operation failed')),
-                });
-
-                throw err;
-            });
-
-            promises.push(promiseToAdd);
-        }
-
-        return Promise.all(promises);
-    }, () => {
-        // For an optimistic update
-        return {
-            room, oldTag, newTag, metaData,
-        };
-    });
-};
-
-export default RoomListActions;
diff --git a/src/actions/RoomListActions.ts b/src/actions/RoomListActions.ts
new file mode 100644
index 0000000000..88946ee26f
--- /dev/null
+++ b/src/actions/RoomListActions.ts
@@ -0,0 +1,153 @@
+/*
+Copyright 2018 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+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 { asyncAction } from './actionCreators';
+import Modal from '../Modal';
+import * as Rooms from '../Rooms';
+import { _t } from '../languageHandler';
+import * as sdk from '../index';
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { AsyncActionPayload } from "../dispatcher/payloads";
+import RoomListStore from "../stores/room-list/RoomListStore";
+import { SortAlgorithm } from "../stores/room-list/algorithms/models";
+import { DefaultTagID } from "../stores/room-list/models";
+
+export default class RoomListActions {
+    /**
+     * Creates an action thunk that will do an asynchronous request to
+     * tag room.
+     *
+     * @param {MatrixClient} matrixClient the matrix client to set the
+     *                                    account data on.
+     * @param {Room} room the room to tag.
+     * @param {string} oldTag the tag to remove (unless oldTag ==== newTag)
+     * @param {string} newTag the tag with which to tag the room.
+     * @param {?number} oldIndex the previous position of the room in the
+     *                           list of rooms.
+     * @param {?number} newIndex the new position of the room in the list
+     *                           of rooms.
+     * @returns {AsyncActionPayload} an async action payload
+     * @see asyncAction
+     */
+    public static tagRoom(
+        matrixClient: MatrixClient, room: Room,
+        oldTag: string, newTag: string,
+        oldIndex: number | null, newIndex: number | null,
+    ): AsyncActionPayload {
+        let metaData = null;
+
+        // Is the tag ordered manually?
+        const store = RoomListStore.instance;
+        if (newTag && store.getTagSorting(newTag) === SortAlgorithm.Manual) {
+            const newList = [...store.orderedLists[newTag]];
+
+            newList.sort((a, b) => a.tags[newTag].order - b.tags[newTag].order);
+
+            // If the room was moved "down" (increasing index) in the same list we
+            // need to use the orders of the tiles with indices shifted by +1
+            const offset = (
+                newTag === oldTag && oldIndex < newIndex
+            ) ? 1 : 0;
+
+            const indexBefore = offset + newIndex - 1;
+            const indexAfter = offset + newIndex;
+
+            const prevOrder = indexBefore <= 0 ?
+                0 : newList[indexBefore].tags[newTag].order;
+            const nextOrder = indexAfter >= newList.length ?
+                1 : newList[indexAfter].tags[newTag].order;
+
+            metaData = {
+                order: (prevOrder + nextOrder) / 2.0,
+            };
+        }
+
+        return asyncAction('RoomListActions.tagRoom', () => {
+            const promises = [];
+            const roomId = room.roomId;
+
+            // Evil hack to get DMs behaving
+            if ((oldTag === undefined && newTag === DefaultTagID.DM) ||
+                (oldTag === DefaultTagID.DM && newTag === undefined)
+            ) {
+                return Rooms.guessAndSetDMRoom(
+                    room, newTag === DefaultTagID.DM,
+                ).catch((err) => {
+                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                    console.error("Failed to set direct chat tag " + err);
+                    Modal.createTrackedDialog('Failed to set direct chat tag', '', ErrorDialog, {
+                        title: _t('Failed to set direct chat tag'),
+                        description: ((err && err.message) ? err.message : _t('Operation failed')),
+                    });
+                });
+            }
+
+            const hasChangedSubLists = oldTag !== newTag;
+
+            // More evilness: We will still be dealing with moving to favourites/low prio,
+            // but we avoid ever doing a request with TAG_DM.
+            //
+            // if we moved lists, remove the old tag
+            if (oldTag && oldTag !== DefaultTagID.DM &&
+                hasChangedSubLists
+            ) {
+                const promiseToDelete = matrixClient.deleteRoomTag(
+                    roomId, oldTag,
+                ).catch(function(err) {
+                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                    console.error("Failed to remove tag " + oldTag + " from room: " + err);
+                    Modal.createTrackedDialog('Failed to remove tag from room', '', ErrorDialog, {
+                        title: _t('Failed to remove tag %(tagName)s from room', {tagName: oldTag}),
+                        description: ((err && err.message) ? err.message : _t('Operation failed')),
+                    });
+                });
+
+                promises.push(promiseToDelete);
+            }
+
+            // if we moved lists or the ordering changed, add the new tag
+            if (newTag && newTag !== DefaultTagID.DM &&
+                (hasChangedSubLists || metaData)
+            ) {
+                // metaData is the body of the PUT to set the tag, so it must
+                // at least be an empty object.
+                metaData = metaData || {};
+
+                const promiseToAdd = matrixClient.setRoomTag(roomId, newTag, metaData).catch(function(err) {
+                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                    console.error("Failed to add tag " + newTag + " to room: " + err);
+                    Modal.createTrackedDialog('Failed to add tag to room', '', ErrorDialog, {
+                        title: _t('Failed to add tag %(tagName)s to room', {tagName: newTag}),
+                        description: ((err && err.message) ? err.message : _t('Operation failed')),
+                    });
+
+                    throw err;
+                });
+
+                promises.push(promiseToAdd);
+            }
+
+            return Promise.all(promises);
+        }, () => {
+            // For an optimistic update
+            return {
+                room, oldTag, newTag, metaData,
+            };
+        });
+    }
+}
diff --git a/src/actions/TagOrderActions.js b/src/actions/TagOrderActions.js
deleted file mode 100644
index a257ff16d8..0000000000
--- a/src/actions/TagOrderActions.js
+++ /dev/null
@@ -1,109 +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 Analytics from '../Analytics';
-import { asyncAction } from './actionCreators';
-import TagOrderStore from '../stores/TagOrderStore';
-
-const TagOrderActions = {};
-
-/**
- * Creates an action thunk that will do an asynchronous request to
- * move a tag in TagOrderStore to destinationIx.
- *
- * @param {MatrixClient} matrixClient the matrix client to set the
- *                                    account data on.
- * @param {string} tag the tag to move.
- * @param {number} destinationIx the new position of the tag.
- * @returns {function} an action thunk that will dispatch actions
- *                     indicating the status of the request.
- * @see asyncAction
- */
-TagOrderActions.moveTag = function(matrixClient, tag, destinationIx) {
-    // Only commit tags if the state is ready, i.e. not null
-    let tags = TagOrderStore.getOrderedTags();
-    let removedTags = TagOrderStore.getRemovedTagsAccountData() || [];
-    if (!tags) {
-        return;
-    }
-
-    tags = tags.filter((t) => t !== tag);
-    tags = [...tags.slice(0, destinationIx), tag, ...tags.slice(destinationIx)];
-
-    removedTags = removedTags.filter((t) => t !== tag);
-
-    const storeId = TagOrderStore.getStoreId();
-
-    return asyncAction('TagOrderActions.moveTag', () => {
-        Analytics.trackEvent('TagOrderActions', 'commitTagOrdering');
-        return matrixClient.setAccountData(
-            'im.vector.web.tag_ordering',
-            {tags, removedTags, _storeId: storeId},
-        );
-    }, () => {
-        // For an optimistic update
-        return {tags, removedTags};
-    });
-};
-
-/**
- * Creates an action thunk that will do an asynchronous request to
- * label a tag as removed in im.vector.web.tag_ordering account data.
- *
- * The reason this is implemented with new state `removedTags` is that
- * we incrementally and initially populate `tags` with groups that
- * have been joined. If we remove a group from `tags`, it will just
- * get added (as it looks like a group we've recently joined).
- *
- * NB: If we ever support adding of tags (which is planned), we should
- * take special care to remove the tag from `removedTags` when we add
- * it.
- *
- * @param {MatrixClient} matrixClient the matrix client to set the
- *                                    account data on.
- * @param {string} tag the tag to remove.
- * @returns {function} an action thunk that will dispatch actions
- *                     indicating the status of the request.
- * @see asyncAction
- */
-TagOrderActions.removeTag = function(matrixClient, tag) {
-    // Don't change tags, just removedTags
-    const tags = TagOrderStore.getOrderedTags();
-    const removedTags = TagOrderStore.getRemovedTagsAccountData() || [];
-
-    if (removedTags.includes(tag)) {
-        // Return a thunk that doesn't do anything, we don't even need
-        // an asynchronous action here, the tag is already removed.
-        return () => {};
-    }
-
-    removedTags.push(tag);
-
-    const storeId = TagOrderStore.getStoreId();
-
-    return asyncAction('TagOrderActions.removeTag', () => {
-        Analytics.trackEvent('TagOrderActions', 'removeTag');
-        return matrixClient.setAccountData(
-            'im.vector.web.tag_ordering',
-            {tags, removedTags, _storeId: storeId},
-        );
-    }, () => {
-        // For an optimistic update
-        return {removedTags};
-    });
-};
-
-export default TagOrderActions;
diff --git a/src/actions/TagOrderActions.ts b/src/actions/TagOrderActions.ts
new file mode 100644
index 0000000000..c203172874
--- /dev/null
+++ b/src/actions/TagOrderActions.ts
@@ -0,0 +1,110 @@
+/*
+Copyright 2017 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+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 Analytics from '../Analytics';
+import { asyncAction } from './actionCreators';
+import TagOrderStore from '../stores/TagOrderStore';
+import { AsyncActionPayload } from "../dispatcher/payloads";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+
+export default class TagOrderActions {
+    /**
+     * Creates an action thunk that will do an asynchronous request to
+     * move a tag in TagOrderStore to destinationIx.
+     *
+     * @param {MatrixClient} matrixClient the matrix client to set the
+     * account data on.
+     * @param {string} tag the tag to move.
+     * @param {number} destinationIx the new position of the tag.
+     * @returns {AsyncActionPayload} an async action payload that will
+     * dispatch actions indicating the status of the request.
+     * @see asyncAction
+     */
+    public static moveTag(matrixClient: MatrixClient, tag: string, destinationIx: number): AsyncActionPayload {
+        // Only commit tags if the state is ready, i.e. not null
+        let tags = TagOrderStore.getOrderedTags();
+        let removedTags = TagOrderStore.getRemovedTagsAccountData() || [];
+        if (!tags) {
+            return;
+        }
+
+        tags = tags.filter((t) => t !== tag);
+        tags = [...tags.slice(0, destinationIx), tag, ...tags.slice(destinationIx)];
+
+        removedTags = removedTags.filter((t) => t !== tag);
+
+        const storeId = TagOrderStore.getStoreId();
+
+        return asyncAction('TagOrderActions.moveTag', () => {
+            Analytics.trackEvent('TagOrderActions', 'commitTagOrdering');
+            return matrixClient.setAccountData(
+                'im.vector.web.tag_ordering',
+                {tags, removedTags, _storeId: storeId},
+            );
+        }, () => {
+            // For an optimistic update
+            return {tags, removedTags};
+        });
+    }
+
+    /**
+     * Creates an action thunk that will do an asynchronous request to
+     * label a tag as removed in im.vector.web.tag_ordering account data.
+     *
+     * The reason this is implemented with new state `removedTags` is that
+     * we incrementally and initially populate `tags` with groups that
+     * have been joined. If we remove a group from `tags`, it will just
+     * get added (as it looks like a group we've recently joined).
+     *
+     * NB: If we ever support adding of tags (which is planned), we should
+     * take special care to remove the tag from `removedTags` when we add
+     * it.
+     *
+     * @param {MatrixClient} matrixClient the matrix client to set the
+     * account data on.
+     * @param {string} tag the tag to remove.
+     * @returns {function} an async action payload that will dispatch
+     * actions indicating the status of the request.
+     * @see asyncAction
+     */
+    public static removeTag(matrixClient: MatrixClient, tag: string): AsyncActionPayload {
+        // Don't change tags, just removedTags
+        const tags = TagOrderStore.getOrderedTags();
+        const removedTags = TagOrderStore.getRemovedTagsAccountData() || [];
+
+        if (removedTags.includes(tag)) {
+            // Return a thunk that doesn't do anything, we don't even need
+            // an asynchronous action here, the tag is already removed.
+            return new AsyncActionPayload(() => {});
+        }
+
+        removedTags.push(tag);
+
+        const storeId = TagOrderStore.getStoreId();
+
+        return asyncAction('TagOrderActions.removeTag', () => {
+            Analytics.trackEvent('TagOrderActions', 'removeTag');
+            return matrixClient.setAccountData(
+                'im.vector.web.tag_ordering',
+                {tags, removedTags, _storeId: storeId},
+            );
+        }, () => {
+            // For an optimistic update
+            return {removedTags};
+        });
+    }
+}
diff --git a/src/actions/actionCreators.js b/src/actions/actionCreators.ts
similarity index 76%
rename from src/actions/actionCreators.js
rename to src/actions/actionCreators.ts
index 967ce609e7..c789e3cd07 100644
--- a/src/actions/actionCreators.js
+++ b/src/actions/actionCreators.ts
@@ -1,5 +1,6 @@
 /*
 Copyright 2017 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,6 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { AsyncActionPayload } from "../dispatcher/payloads";
+
 /**
  * Create an action thunk that will dispatch actions indicating the current
  * status of the Promise returned by fn.
@@ -25,9 +28,9 @@ limitations under the License.
  * @param {function?} pendingFn a function that returns an object to assign
  *                              to the `request` key of the ${id}.pending
  *                              payload.
- * @returns {function} an action thunk - a function that uses its single
- *                     argument as a dispatch function to dispatch the
- *                     following actions:
+ * @returns {AsyncActionPayload} an async action payload. Includes a function
+ *                     that uses its single argument as a dispatch function
+ *                     to dispatch the following actions:
  *                         `${id}.pending` and either
  *                         `${id}.success` or
  *                         `${id}.failure`.
@@ -41,12 +44,11 @@ limitations under the License.
  *                     result is the result of the promise returned by
  *                     `fn`.
  */
-export function asyncAction(id, fn, pendingFn) {
-    return (dispatch) => {
+export function asyncAction(id: string, fn: () => Promise<any>, pendingFn: () => any | null): AsyncActionPayload {
+    const helper = (dispatch) => {
         dispatch({
             action: id + '.pending',
-            request:
-                typeof pendingFn === 'function' ? pendingFn() : undefined,
+            request: typeof pendingFn === 'function' ? pendingFn() : undefined,
         });
         fn().then((result) => {
             dispatch({action: id + '.success', result});
@@ -54,4 +56,5 @@ export function asyncAction(id, fn, pendingFn) {
             dispatch({action: id + '.failure', err});
         });
     };
+    return new AsyncActionPayload(helper);
 }
diff --git a/src/async-components/views/dialogs/EncryptedEventDialog.js b/src/async-components/views/dialogs/EncryptedEventDialog.js
deleted file mode 100644
index 9eb4439816..0000000000
--- a/src/async-components/views/dialogs/EncryptedEventDialog.js
+++ /dev/null
@@ -1,206 +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 createReactClass from 'create-react-class';
-import PropTypes from 'prop-types';
-import { _t } from '../../../languageHandler';
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import {Key} from "../../../Keyboard";
-import * as sdk from "../../../index";
-
-// XXX: This component is not cross-signing aware.
-// https://github.com/vector-im/riot-web/issues/11752 tracks either updating this
-// component or taking it out to pasture.
-export default createReactClass({
-    displayName: 'EncryptedEventDialog',
-
-    propTypes: {
-        event: PropTypes.object.isRequired,
-        onFinished: PropTypes.func.isRequired,
-    },
-
-    getInitialState: function() {
-        return { device: null };
-    },
-
-    componentDidMount: function() {
-        this._unmounted = false;
-        const client = MatrixClientPeg.get();
-
-        // first try to load the device from our store.
-        //
-        this.refreshDevice().then((dev) => {
-            if (dev) {
-                return dev;
-            }
-
-            // tell the client to try to refresh the device list for this user
-            return client.downloadKeys([this.props.event.getSender()], true).then(() => {
-                return this.refreshDevice();
-            });
-        }).then((dev) => {
-            if (this._unmounted) {
-                return;
-            }
-
-            this.setState({ device: dev });
-            client.on("deviceVerificationChanged", this.onDeviceVerificationChanged);
-        }, (err)=>{
-            console.log("Error downloading devices", err);
-        });
-    },
-
-    componentWillUnmount: function() {
-        this._unmounted = true;
-        const client = MatrixClientPeg.get();
-        if (client) {
-            client.removeListener("deviceVerificationChanged", this.onDeviceVerificationChanged);
-        }
-    },
-
-    refreshDevice: function() {
-        // Promise.resolve to handle transition from static result to promise; can be removed
-        // in future
-        return Promise.resolve(MatrixClientPeg.get().getEventSenderDeviceInfo(this.props.event));
-    },
-
-    onDeviceVerificationChanged: function(userId, device) {
-        if (userId === this.props.event.getSender()) {
-            this.refreshDevice().then((dev) => {
-                this.setState({ device: dev });
-            });
-        }
-    },
-
-    onKeyDown: function(e) {
-        if (e.key === Key.ESCAPE) {
-            e.stopPropagation();
-            e.preventDefault();
-            this.props.onFinished(false);
-        }
-    },
-
-    _renderDeviceInfo: function() {
-        const device = this.state.device;
-        if (!device) {
-            return (<i>{ _t('unknown device') }</i>);
-        }
-
-        let verificationStatus = (<b>{ _t('NOT verified') }</b>);
-        if (device.isBlocked()) {
-            verificationStatus = (<b>{ _t('Blacklisted') }</b>);
-        } else if (device.isVerified()) {
-            verificationStatus = _t('verified');
-        }
-
-        return (
-            <table>
-                <tbody>
-                    <tr>
-                        <td>{ _t('Name') }</td>
-                        <td>{ device.getDisplayName() }</td>
-                    </tr>
-                    <tr>
-                        <td>{ _t('Device ID') }</td>
-                        <td><code>{ device.deviceId }</code></td>
-                    </tr>
-                    <tr>
-                        <td>{ _t('Verification') }</td>
-                        <td>{ verificationStatus }</td>
-                    </tr>
-                    <tr>
-                        <td>{ _t('Ed25519 fingerprint') }</td>
-                        <td><code>{ device.getFingerprint() }</code></td>
-                    </tr>
-                </tbody>
-            </table>
-        );
-    },
-
-    _renderEventInfo: function() {
-        const event = this.props.event;
-
-        return (
-            <table>
-                <tbody>
-                    <tr>
-                        <td>{ _t('User ID') }</td>
-                        <td>{ event.getSender() }</td>
-                    </tr>
-                    <tr>
-                        <td>{ _t('Curve25519 identity key') }</td>
-                        <td><code>{ event.getSenderKey() || <i>{ _t('none') }</i> }</code></td>
-                    </tr>
-                    <tr>
-                        <td>{ _t('Claimed Ed25519 fingerprint key') }</td>
-                        <td><code>{ event.getKeysClaimed().ed25519 || <i>{ _t('none') }</i> }</code></td>
-                    </tr>
-                    <tr>
-                        <td>{ _t('Algorithm') }</td>
-                        <td>{ event.getWireContent().algorithm || <i>{ _t('unencrypted') }</i> }</td>
-                    </tr>
-                {
-                    event.getContent().msgtype === 'm.bad.encrypted' ? (
-                    <tr>
-                        <td>{ _t('Decryption error') }</td>
-                        <td>{ event.getContent().body }</td>
-                    </tr>
-                    ) : null
-                }
-                    <tr>
-                        <td>{ _t('Session ID') }</td>
-                        <td><code>{ event.getWireContent().session_id || <i>{ _t('none') }</i> }</code></td>
-                    </tr>
-                </tbody>
-            </table>
-        );
-    },
-
-    render: function() {
-        const DeviceVerifyButtons = sdk.getComponent('elements.DeviceVerifyButtons');
-
-        let buttons = null;
-        if (this.state.device) {
-            buttons = (
-                <DeviceVerifyButtons device={this.state.device}
-                    userId={this.props.event.getSender()}
-                />
-            );
-        }
-
-        return (
-            <div className="mx_EncryptedEventDialog" onKeyDown={this.onKeyDown}>
-                <div className="mx_Dialog_title">
-                    { _t('End-to-end encryption information') }
-                </div>
-                <div className="mx_Dialog_content">
-                    <h4>{ _t('Event information') }</h4>
-                    { this._renderEventInfo() }
-
-                    <h4>{ _t('Sender session information') }</h4>
-                    { this._renderDeviceInfo() }
-                </div>
-                <div className="mx_Dialog_buttons">
-                    <button className="mx_Dialog_primary" onClick={this.props.onFinished} autoFocus={true}>
-                        { _t('OK') }
-                    </button>
-                    { buttons }
-                </div>
-            </div>
-        );
-    },
-});
diff --git a/src/async-components/views/dialogs/ExportE2eKeysDialog.js b/src/async-components/views/dialogs/ExportE2eKeysDialog.js
index 7ec9da39de..a92578a547 100644
--- a/src/async-components/views/dialogs/ExportE2eKeysDialog.js
+++ b/src/async-components/views/dialogs/ExportE2eKeysDialog.js
@@ -84,7 +84,7 @@ export default createReactClass({
             const blob = new Blob([f], {
                 type: 'text/plain;charset=us-ascii',
             });
-            FileSaver.saveAs(blob, 'riot-keys.txt');
+            FileSaver.saveAs(blob, 'element-keys.txt');
             this.props.onFinished(true);
         }).catch((e) => {
             console.error("Error exporting e2e keys:", e);
diff --git a/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
index 120b086ef6..de50feaedb 100644
--- a/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/DisableEventIndexDialog.js
@@ -17,11 +17,13 @@ limitations under the License.
 import React from 'react';
 import * as sdk from '../../../../index';
 import PropTypes from 'prop-types';
-import dis from "../../../../dispatcher";
+import dis from "../../../../dispatcher/dispatcher";
 import { _t } from '../../../../languageHandler';
 
-import SettingsStore, {SettingLevel} from "../../../../settings/SettingsStore";
+import SettingsStore from "../../../../settings/SettingsStore";
 import EventIndexPeg from "../../../../indexing/EventIndexPeg";
+import {Action} from "../../../../dispatcher/actions";
+import {SettingLevel} from "../../../../settings/SettingLevel";
 
 /*
  * Allows the user to disable the Event Index.
@@ -47,7 +49,7 @@ export default class DisableEventIndexDialog extends React.Component {
         await SettingsStore.setValue('enableEventIndexing', null, SettingLevel.DEVICE, false);
         await EventIndexPeg.deleteEventIndex();
         this.props.onFinished();
-        dis.dispatch({ action: 'view_user_settings' });
+        dis.fire(Action.ViewUserSettings);
     }
 
     render() {
diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
index bb2cf7f0b8..be3368b87b 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
@@ -18,11 +18,13 @@ import React from 'react';
 import * as sdk from '../../../../index';
 import PropTypes from 'prop-types';
 import { _t } from '../../../../languageHandler';
-import SettingsStore, {SettingLevel} from "../../../../settings/SettingsStore";
+import SdkConfig from '../../../../SdkConfig';
+import SettingsStore from "../../../../settings/SettingsStore";
 
 import Modal from '../../../../Modal';
 import {formatBytes, formatCountLong} from "../../../../utils/FormattingUtils";
 import EventIndexPeg from "../../../../indexing/EventIndexPeg";
+import {SettingLevel} from "../../../../settings/SettingLevel";
 
 /*
  * Allows the user to introspect the event index state and disable it.
@@ -134,8 +136,10 @@ export default class ManageEventIndexDialog extends React.Component {
     };
 
     render() {
-        let crawlerState;
+        const brand = SdkConfig.get().brand;
+        const Field = sdk.getComponent('views.elements.Field');
 
+        let crawlerState;
         if (this.state.currentRoom === null) {
             crawlerState = _t("Not currently indexing messages for any room.");
         } else {
@@ -144,17 +148,15 @@ export default class ManageEventIndexDialog extends React.Component {
             );
         }
 
-        const Field = sdk.getComponent('views.elements.Field');
-
         const doneRooms = Math.max(0, (this.state.roomCount - this.state.crawlingRoomsCount));
 
         const eventIndexingSettings = (
             <div>
-                {
-                    _t( "Riot is securely caching encrypted messages locally for them " +
-                        "to appear in search results:",
-                    )
-                }
+                {_t(
+                    "%(brand)s is securely caching encrypted messages locally for them " +
+                    "to appear in search results:",
+                    { brand },
+                )}
                 <div className='mx_SettingsTab_subsectionText'>
                     {crawlerState}<br />
                     {_t("Space used:")} {formatBytes(this.state.eventIndexSize, 0)}<br />
diff --git a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index e4e39400f6..c3aef9109a 100644
--- a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -15,17 +15,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
+import React, {createRef} from 'react';
 import FileSaver from 'file-saver';
 import * as sdk from '../../../../index';
 import {MatrixClientPeg} from '../../../../MatrixClientPeg';
 import PropTypes from 'prop-types';
-import { scorePassword } from '../../../../utils/PasswordScorer';
-import { _t } from '../../../../languageHandler';
+import {_t, _td} from '../../../../languageHandler';
 import { accessSecretStorage } from '../../../../CrossSigningManager';
-import SettingsStore from '../../../../settings/SettingsStore';
 import AccessibleButton from "../../../../components/views/elements/AccessibleButton";
 import {copyNode} from "../../../../utils/strings";
+import PassphraseField from "../../../../components/views/auth/PassphraseField";
 
 const PHASE_PASSPHRASE = 0;
 const PHASE_PASSPHRASE_CONFIRM = 1;
@@ -36,7 +35,6 @@ const PHASE_DONE = 5;
 const PHASE_OPTOUT_CONFIRM = 6;
 
 const PASSWORD_MIN_SCORE = 4; // So secure, many characters, much complex, wow, etc, etc.
-const PASSPHRASE_FEEDBACK_DELAY = 500; // How long after keystroke to offer passphrase feedback, ms.
 
 /*
  * Walks the user through the process of creating an e2e key backup
@@ -52,25 +50,23 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
 
         this._recoveryKeyNode = null;
         this._keyBackupInfo = null;
-        this._setZxcvbnResultTimeout = null;
 
         this.state = {
             secureSecretStorage: null,
             phase: PHASE_PASSPHRASE,
             passPhrase: '',
+            passPhraseValid: false,
             passPhraseConfirm: '',
             copied: false,
             downloaded: false,
-            zxcvbnResult: null,
         };
+
+        this._passphraseField = createRef();
     }
 
     async componentDidMount() {
         const cli = MatrixClientPeg.get();
-        const secureSecretStorage = (
-            SettingsStore.getValue("feature_cross_signing") &&
-            await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")
-        );
+        const secureSecretStorage = await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing");
         this.setState({ secureSecretStorage });
 
         // If we're using secret storage, skip ahead to the backing up step, as
@@ -81,12 +77,6 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
         }
     }
 
-    componentWillUnmount() {
-        if (this._setZxcvbnResultTimeout !== null) {
-            clearTimeout(this._setZxcvbnResultTimeout);
-        }
-    }
-
     _collectRecoveryKeyNode = (n) => {
         this._recoveryKeyNode = n;
     }
@@ -180,22 +170,16 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
 
     _onPassPhraseNextClick = async (e) => {
         e.preventDefault();
+        if (!this._passphraseField.current) return; // unmounting
 
-        // If we're waiting for the timeout before updating the result at this point,
-        // skip ahead and do it now, otherwise we'll deny the attempt to proceed
-        // even if the user entered a valid passphrase
-        if (this._setZxcvbnResultTimeout !== null) {
-            clearTimeout(this._setZxcvbnResultTimeout);
-            this._setZxcvbnResultTimeout = null;
-            await new Promise((resolve) => {
-                this.setState({
-                    zxcvbnResult: scorePassword(this.state.passPhrase),
-                }, resolve);
-            });
-        }
-        if (this._passPhraseIsValid()) {
-            this.setState({phase: PHASE_PASSPHRASE_CONFIRM});
+        await this._passphraseField.current.validate({ allowEmpty: false });
+        if (!this._passphraseField.current.state.valid) {
+            this._passphraseField.current.focus();
+            this._passphraseField.current.validate({ allowEmpty: false, focused: true });
+            return;
         }
+
+        this.setState({phase: PHASE_PASSPHRASE_CONFIRM});
     };
 
     _onPassPhraseConfirmNextClick = async (e) => {
@@ -214,9 +198,9 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
     _onSetAgainClick = () => {
         this.setState({
             passPhrase: '',
+            passPhraseValid: false,
             passPhraseConfirm: '',
             phase: PHASE_PASSPHRASE,
-            zxcvbnResult: null,
         });
     }
 
@@ -226,23 +210,16 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
         });
     }
 
+    _onPassPhraseValidate = (result) => {
+        this.setState({
+            passPhraseValid: result.valid,
+        });
+    };
+
     _onPassPhraseChange = (e) => {
         this.setState({
             passPhrase: e.target.value,
         });
-
-        if (this._setZxcvbnResultTimeout !== null) {
-            clearTimeout(this._setZxcvbnResultTimeout);
-        }
-        this._setZxcvbnResultTimeout = setTimeout(() => {
-            this._setZxcvbnResultTimeout = null;
-            this.setState({
-                // precompute this and keep it in state: zxcvbn is fast but
-                // we use it in a couple of different places so no point recomputing
-                // it unnecessarily.
-                zxcvbnResult: scorePassword(this.state.passPhrase),
-            });
-        }, PASSPHRASE_FEEDBACK_DELAY);
     }
 
     _onPassPhraseConfirmChange = (e) => {
@@ -251,35 +228,9 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
         });
     }
 
-    _passPhraseIsValid() {
-        return this.state.zxcvbnResult && this.state.zxcvbnResult.score >= PASSWORD_MIN_SCORE;
-    }
-
     _renderPhasePassPhrase() {
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
 
-        let strengthMeter;
-        let helpText;
-        if (this.state.zxcvbnResult) {
-            if (this.state.zxcvbnResult.score >= PASSWORD_MIN_SCORE) {
-                helpText = _t("Great! This recovery passphrase looks strong enough.");
-            } else {
-                const suggestions = [];
-                for (let i = 0; i < this.state.zxcvbnResult.feedback.suggestions.length; ++i) {
-                    suggestions.push(<div key={i}>{this.state.zxcvbnResult.feedback.suggestions[i]}</div>);
-                }
-                const suggestionBlock = <div>{suggestions.length > 0 ? suggestions : _t("Keep going...")}</div>;
-
-                helpText = <div>
-                    {this.state.zxcvbnResult.feedback.warning}
-                    {suggestionBlock}
-                </div>;
-            }
-            strengthMeter = <div>
-                <progress max={PASSWORD_MIN_SCORE} value={this.state.zxcvbnResult.score} />
-            </div>;
-        }
-
         return <form onSubmit={this._onPassPhraseNextClick}>
             <p>{_t(
                 "<b>Warning</b>: You should only set up key backup from a trusted computer.", {},
@@ -293,17 +244,19 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
 
             <div className="mx_CreateKeyBackupDialog_primaryContainer">
                 <div className="mx_CreateKeyBackupDialog_passPhraseContainer">
-                    <input type="password"
-                        onChange={this._onPassPhraseChange}
-                        value={this.state.passPhrase}
+                    <PassphraseField
                         className="mx_CreateKeyBackupDialog_passPhraseInput"
-                        placeholder={_t("Enter a recovery passphrase...")}
+                        onChange={this._onPassPhraseChange}
+                        minScore={PASSWORD_MIN_SCORE}
+                        value={this.state.passPhrase}
+                        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.")}
                     />
-                    <div className="mx_CreateKeyBackupDialog_passPhraseHelp">
-                        {strengthMeter}
-                        {helpText}
-                    </div>
                 </div>
             </div>
 
@@ -311,7 +264,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
                 primaryButton={_t('Next')}
                 onPrimaryButtonClick={this._onPassPhraseNextClick}
                 hasCancel={false}
-                disabled={!this._passPhraseIsValid()}
+                disabled={!this.state.passPhraseValid}
             />
 
             <details>
@@ -327,17 +280,20 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
         let matchText;
+        let changeText;
         if (this.state.passPhraseConfirm === this.state.passPhrase) {
             matchText = _t("That matches!");
+            changeText = _t("Use a different passphrase?");
         } else if (!this.state.passPhrase.startsWith(this.state.passPhraseConfirm)) {
             // only tell them they're wrong if they've actually gone wrong.
-            // Security concious readers will note that if you left riot-web unattended
+            // Security concious readers will note that if you left element-web unattended
             // on this screen, this would make it easy for a malicious person to guess
             // your passphrase one letter at a time, but they could get this faster by
             // just opening the browser's developer tools and reading it.
             // Note that not having typed anything at all will not hit this clause and
             // fall through so empty box === no hint.
             matchText = _t("That doesn't match.");
+            changeText = _t("Go back to set it again.");
         }
 
         let passPhraseMatch = null;
@@ -346,7 +302,7 @@ export default class CreateKeyBackupDialog extends React.PureComponent {
                 <div>{matchText}</div>
                 <div>
                     <AccessibleButton element="span" className="mx_linkButton" onClick={this._onSetAgainClick}>
-                        {_t("Go back to set it again.")}
+                        {changeText}
                     </AccessibleButton>
                 </div>
             </div>;
diff --git a/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js b/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
index 9e2264a960..74552a5c08 100644
--- a/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
+++ b/src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
@@ -19,9 +19,10 @@ import React from "react";
 import PropTypes from "prop-types";
 import * as sdk from "../../../../index";
 import {MatrixClientPeg} from '../../../../MatrixClientPeg';
-import dis from "../../../../dispatcher";
+import dis from "../../../../dispatcher/dispatcher";
 import { _t } from "../../../../languageHandler";
 import Modal from "../../../../Modal";
+import {Action} from "../../../../dispatcher/actions";
 
 export default class NewRecoveryMethodDialog extends React.PureComponent {
     static propTypes = {
@@ -36,7 +37,7 @@ export default class NewRecoveryMethodDialog extends React.PureComponent {
 
     onGoToSettingsClick = () => {
         this.props.onFinished();
-        dis.dispatch({ action: 'view_user_settings' });
+        dis.fire(Action.ViewUserSettings);
     }
 
     onSetupClick = async () => {
diff --git a/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js b/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
index c5222dafd5..cda353e717 100644
--- a/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
+++ b/src/async-components/views/dialogs/keybackup/RecoveryMethodRemovedDialog.js
@@ -18,9 +18,10 @@ limitations under the License.
 import React from "react";
 import PropTypes from "prop-types";
 import * as sdk from "../../../../index";
-import dis from "../../../../dispatcher";
+import dis from "../../../../dispatcher/dispatcher";
 import { _t } from "../../../../languageHandler";
 import Modal from "../../../../Modal";
+import {Action} from "../../../../dispatcher/actions";
 
 export default class RecoveryMethodRemovedDialog extends React.PureComponent {
     static propTypes = {
@@ -29,7 +30,7 @@ export default class RecoveryMethodRemovedDialog extends React.PureComponent {
 
     onGoToSettingsClick = () => {
         this.props.onFinished();
-        dis.dispatch({ action: 'view_user_settings' });
+        dis.fire(Action.ViewUserSettings);
     }
 
     onSetupClick = () => {
diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 2c05f231e7..53b3033330 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -15,30 +15,37 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
+import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import * as sdk from '../../../../index';
 import {MatrixClientPeg} from '../../../../MatrixClientPeg';
-import { scorePassword } from '../../../../utils/PasswordScorer';
 import FileSaver from 'file-saver';
-import { _t } from '../../../../languageHandler';
+import {_t, _td} from '../../../../languageHandler';
 import Modal from '../../../../Modal';
 import { promptForBackupPassphrase } from '../../../../CrossSigningManager';
 import {copyNode} from "../../../../utils/strings";
+import {SSOAuthEntry} from "../../../../components/views/auth/InteractiveAuthEntryComponents";
+import PassphraseField from "../../../../components/views/auth/PassphraseField";
+import StyledRadioButton from '../../../../components/views/elements/StyledRadioButton';
+import AccessibleButton from "../../../../components/views/elements/AccessibleButton";
+import DialogButtons from "../../../../components/views/elements/DialogButtons";
+import InlineSpinner from "../../../../components/views/elements/InlineSpinner";
 
 const PHASE_LOADING = 0;
 const PHASE_LOADERROR = 1;
-const PHASE_MIGRATE = 2;
-const PHASE_PASSPHRASE = 3;
-const PHASE_PASSPHRASE_CONFIRM = 4;
-const PHASE_SHOWKEY = 5;
-const PHASE_KEEPITSAFE = 6;
-const PHASE_STORING = 7;
-const PHASE_DONE = 8;
-const PHASE_CONFIRM_SKIP = 9;
+const PHASE_CHOOSE_KEY_PASSPHRASE = 2;
+const PHASE_MIGRATE = 3;
+const PHASE_PASSPHRASE = 4;
+const PHASE_PASSPHRASE_CONFIRM = 5;
+const PHASE_SHOWKEY = 6;
+const PHASE_STORING = 8;
+const PHASE_CONFIRM_SKIP = 10;
 
 const PASSWORD_MIN_SCORE = 4; // So secure, many characters, much complex, wow, etc, etc.
-const PASSPHRASE_FEEDBACK_DELAY = 500; // How long after keystroke to offer passphrase feedback, ms.
+
+// these end up as strings from being values in the radio buttons, so just use strings
+const CREATE_STORAGE_OPTION_KEY = 'key';
+const CREATE_STORAGE_OPTION_PASSPHRASE = 'passphrase';
 
 /*
  * Walks the user through the process of creating a passphrase to guard Secure
@@ -61,16 +68,16 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
         this._recoveryKey = null;
         this._recoveryKeyNode = null;
-        this._setZxcvbnResultTimeout = null;
         this._backupKey = null;
 
         this.state = {
             phase: PHASE_LOADING,
             passPhrase: '',
+            passPhraseValid: false,
             passPhraseConfirm: '',
             copied: false,
             downloaded: false,
-            zxcvbnResult: null,
+            setPassphrase: false,
             backupInfo: null,
             backupSigStatus: null,
             // does the server offer a UI auth flow with just m.login.password
@@ -78,10 +85,12 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             canUploadKeysWithPasswordOnly: null,
             accountPassword: props.accountPassword || "",
             accountPasswordCorrect: null,
-            // status of the key backup toggle switch
-            useKeyBackup: true,
+
+            passPhraseKeySelected: CREATE_STORAGE_OPTION_KEY,
         };
 
+        this._passphraseField = createRef();
+
         this._fetchBackupInfo();
         if (this.state.accountPassword) {
             // If we have an account password in memory, let's simplify and
@@ -98,9 +107,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
     componentWillUnmount() {
         MatrixClientPeg.get().removeListener('crypto.keyBackupStatus', this._onKeyBackupStatusChange);
-        if (this._setZxcvbnResultTimeout !== null) {
-            clearTimeout(this._setZxcvbnResultTimeout);
-        }
     }
 
     async _fetchBackupInfo() {
@@ -112,7 +118,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
             );
 
             const { force } = this.props;
-            const phase = (backupInfo && !force) ? PHASE_MIGRATE : PHASE_PASSPHRASE;
+            const phase = (backupInfo && !force) ? PHASE_MIGRATE : PHASE_CHOOSE_KEY_PASSPHRASE;
 
             this.setState({
                 phase,
@@ -154,14 +160,33 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         if (this.state.phase === PHASE_MIGRATE) this._fetchBackupInfo();
     }
 
+    _onKeyPassphraseChange = e => {
+        this.setState({
+            passPhraseKeySelected: e.target.value,
+        });
+    }
+
     _collectRecoveryKeyNode = (n) => {
         this._recoveryKeyNode = n;
     }
 
-    _onUseKeyBackupChange = (enabled) => {
-        this.setState({
-            useKeyBackup: enabled,
-        });
+    _onChooseKeyPassphraseFormSubmit = async () => {
+        if (this.state.passPhraseKeySelected === CREATE_STORAGE_OPTION_KEY) {
+            this._recoveryKey =
+                await MatrixClientPeg.get().createRecoveryKeyFromPassphrase();
+            this.setState({
+                copied: false,
+                downloaded: false,
+                setPassphrase: false,
+                phase: PHASE_SHOWKEY,
+            });
+        } else {
+            this.setState({
+                copied: false,
+                downloaded: false,
+                phase: PHASE_PASSPHRASE,
+            });
+        }
     }
 
     _onMigrateFormSubmit = (e) => {
@@ -178,7 +203,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         if (successful) {
             this.setState({
                 copied: true,
-                phase: PHASE_KEEPITSAFE,
             });
         }
     }
@@ -191,7 +215,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
         this.setState({
             downloaded: true,
-            phase: PHASE_KEEPITSAFE,
         });
     }
 
@@ -203,18 +226,39 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                     type: 'm.id.user',
                     user: MatrixClientPeg.get().getUserId(),
                 },
-                // https://github.com/matrix-org/synapse/issues/5665
+                // TODO: Remove `user` once servers support proper UIA
+                // See https://github.com/matrix-org/synapse/issues/5665
                 user: MatrixClientPeg.get().getUserId(),
                 password: this.state.accountPassword,
             });
         } else {
             const InteractiveAuthDialog = sdk.getComponent("dialogs.InteractiveAuthDialog");
+
+            const dialogAesthetics = {
+                [SSOAuthEntry.PHASE_PREAUTH]: {
+                    title: _t("Use Single Sign On to continue"),
+                    body: _t("To continue, use Single Sign On to prove your identity."),
+                    continueText: _t("Single Sign On"),
+                    continueKind: "primary",
+                },
+                [SSOAuthEntry.PHASE_POSTAUTH]: {
+                    title: _t("Confirm encryption setup"),
+                    body: _t("Click the button below to confirm setting up encryption."),
+                    continueText: _t("Confirm"),
+                    continueKind: "primary",
+                },
+            };
+
             const { finished } = Modal.createTrackedDialog(
                 'Cross-signing keys dialog', '', InteractiveAuthDialog,
                 {
                     title: _t("Setting up keys"),
                     matrixClient: MatrixClientPeg.get(),
                     makeRequest,
+                    aestheticsForStagePhases: {
+                        [SSOAuthEntry.LOGIN_TYPE]: dialogAesthetics,
+                        [SSOAuthEntry.UNSTABLE_LOGIN_TYPE]: dialogAesthetics,
+                    },
                 },
             );
             const [confirmed] = await finished;
@@ -236,6 +280,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
         try {
             if (force) {
+                console.log("Forcing secret storage reset"); // log something so we can debug this later
                 await cli.bootstrapSecretStorage({
                     authUploadDeviceSigningKeys: this._doBootstrapUIAuth,
                     createSecretStorageKey: async () => this._recoveryKey,
@@ -247,7 +292,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                     authUploadDeviceSigningKeys: this._doBootstrapUIAuth,
                     createSecretStorageKey: async () => this._recoveryKey,
                     keyBackupInfo: this.state.backupInfo,
-                    setupNewKeyBackup: !this.state.backupInfo && this.state.useKeyBackup,
+                    setupNewKeyBackup: !this.state.backupInfo,
                     getKeyBackupPassphrase: () => {
                         // We may already have the backup key if we earlier went
                         // through the restore backup path, so pass it along
@@ -259,9 +304,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                     },
                 });
             }
-            this.setState({
-                phase: PHASE_DONE,
-            });
+            this.props.onFinished(true);
         } catch (e) {
             if (this.state.canUploadKeysWithPasswordOnly && e.httpStatus === 401 && e.data.flows) {
                 this.setState({
@@ -315,42 +358,30 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         this._fetchBackupInfo();
     }
 
-    _onSkipSetupClick = () => {
+    _onShowKeyContinueClick = () => {
+        this._bootstrapSecretStorage();
+    }
+
+    _onCancelClick = () => {
         this.setState({phase: PHASE_CONFIRM_SKIP});
     }
 
-    _onSetUpClick = () => {
-        this.setState({phase: PHASE_PASSPHRASE});
-    }
-
-    _onSkipPassPhraseClick = async () => {
-        this._recoveryKey =
-            await MatrixClientPeg.get().createRecoveryKeyFromPassphrase();
-        this.setState({
-            copied: false,
-            downloaded: false,
-            phase: PHASE_SHOWKEY,
-        });
+    _onGoBackClick = () => {
+        this.setState({phase: PHASE_CHOOSE_KEY_PASSPHRASE});
     }
 
     _onPassPhraseNextClick = async (e) => {
         e.preventDefault();
+        if (!this._passphraseField.current) return; // unmounting
 
-        // If we're waiting for the timeout before updating the result at this point,
-        // skip ahead and do it now, otherwise we'll deny the attempt to proceed
-        // even if the user entered a valid passphrase
-        if (this._setZxcvbnResultTimeout !== null) {
-            clearTimeout(this._setZxcvbnResultTimeout);
-            this._setZxcvbnResultTimeout = null;
-            await new Promise((resolve) => {
-                this.setState({
-                    zxcvbnResult: scorePassword(this.state.passPhrase),
-                }, resolve);
-            });
-        }
-        if (this._passPhraseIsValid()) {
-            this.setState({phase: PHASE_PASSPHRASE_CONFIRM});
+        await this._passphraseField.current.validate({ allowEmpty: false });
+        if (!this._passphraseField.current.state.valid) {
+            this._passphraseField.current.focus();
+            this._passphraseField.current.validate({ allowEmpty: false, focused: true });
+            return;
         }
+
+        this.setState({phase: PHASE_PASSPHRASE_CONFIRM});
     };
 
     _onPassPhraseConfirmNextClick = async (e) => {
@@ -363,6 +394,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         this.setState({
             copied: false,
             downloaded: false,
+            setPassphrase: true,
             phase: PHASE_SHOWKEY,
         });
     }
@@ -370,35 +402,22 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
     _onSetAgainClick = () => {
         this.setState({
             passPhrase: '',
+            passPhraseValid: false,
             passPhraseConfirm: '',
             phase: PHASE_PASSPHRASE,
-            zxcvbnResult: null,
         });
     }
 
-    _onKeepItSafeBackClick = () => {
+    _onPassPhraseValidate = (result) => {
         this.setState({
-            phase: PHASE_SHOWKEY,
+            passPhraseValid: result.valid,
         });
-    }
+    };
 
     _onPassPhraseChange = (e) => {
         this.setState({
             passPhrase: e.target.value,
         });
-
-        if (this._setZxcvbnResultTimeout !== null) {
-            clearTimeout(this._setZxcvbnResultTimeout);
-        }
-        this._setZxcvbnResultTimeout = setTimeout(() => {
-            this._setZxcvbnResultTimeout = null;
-            this.setState({
-                // precompute this and keep it in state: zxcvbn is fast but
-                // we use it in a couple of different places so no point recomputing
-                // it unnecessarily.
-                zxcvbnResult: scorePassword(this.state.passPhrase),
-            });
-        }, PASSPHRASE_FEEDBACK_DELAY);
     }
 
     _onPassPhraseConfirmChange = (e) => {
@@ -407,23 +426,61 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         });
     }
 
-    _passPhraseIsValid() {
-        return this.state.zxcvbnResult && this.state.zxcvbnResult.score >= PASSWORD_MIN_SCORE;
-    }
-
     _onAccountPasswordChange = (e) => {
         this.setState({
             accountPassword: e.target.value,
         });
     }
 
+    _renderPhaseChooseKeyPassphrase() {
+        return <form onSubmit={this._onChooseKeyPassphraseFormSubmit}>
+            <p className="mx_CreateSecretStorageDialog_centeredBody">{_t(
+                "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}>
+                <StyledRadioButton
+                    key={CREATE_STORAGE_OPTION_KEY}
+                    value={CREATE_STORAGE_OPTION_KEY}
+                    name="keyPassphrase"
+                    checked={this.state.passPhraseKeySelected === CREATE_STORAGE_OPTION_KEY}
+                    outlined
+                >
+                    <div className="mx_CreateSecretStorageDialog_optionTitle">
+                        <span className="mx_CreateSecretStorageDialog_optionIcon mx_CreateSecretStorageDialog_optionIcon_secureBackup"></span>
+                        {_t("Generate a Security Key")}
+                    </div>
+                    <div>{_t("We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.")}</div>
+                </StyledRadioButton>
+                <StyledRadioButton
+                    key={CREATE_STORAGE_OPTION_PASSPHRASE}
+                    value={CREATE_STORAGE_OPTION_PASSPHRASE}
+                    name="keyPassphrase"
+                    checked={this.state.passPhraseKeySelected === CREATE_STORAGE_OPTION_PASSPHRASE}
+                    outlined
+                >
+                    <div className="mx_CreateSecretStorageDialog_optionTitle">
+                        <span className="mx_CreateSecretStorageDialog_optionIcon mx_CreateSecretStorageDialog_optionIcon_securePhrase"></span>
+                        {_t("Enter a Security Phrase")}
+                    </div>
+                    <div>{_t("Use a secret phrase only you know, and optionally save a Security Key to use for backup.")}</div>
+                </StyledRadioButton>
+            </div>
+            <DialogButtons
+                primaryButton={_t("Continue")}
+                onPrimaryButtonClick={this._onChooseKeyPassphraseFormSubmit}
+                onCancel={this._onCancelClick}
+                hasCancel={true}
+            />
+        </form>;
+    }
+
     _renderPhaseMigrate() {
         // TODO: This is a temporary screen so people who have the labs flag turned on and
         // click the button are aware they're making a change to their account.
         // Once we're confident enough in this (and it's supported enough) we can do
         // it automatically.
-        // https://github.com/vector-im/riot-web/issues/11696
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+        // https://github.com/vector-im/element-web/issues/11696
         const Field = sdk.getComponent('views.elements.Field');
 
         let authPrompt;
@@ -436,7 +493,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                     label={_t("Password")}
                     value={this.state.accountPassword}
                     onChange={this._onAccountPasswordChange}
-                    flagInvalid={this.state.accountPasswordCorrect === false}
+                    forceValidity={this.state.accountPasswordCorrect === false ? false : null}
                     autoFocus={true}
                 /></div>
             </div>;
@@ -464,7 +521,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 hasCancel={false}
                 primaryDisabled={this.state.canUploadKeysWithPasswordOnly && !this.state.accountPassword}
             >
-                <button type="button" className="danger" onClick={this._onSkipSetupClick}>
+                <button type="button" className="danger" onClick={this._onCancelClick}>
                     {_t('Skip')}
                 </button>
             </DialogButtons>
@@ -472,102 +529,60 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
     }
 
     _renderPhasePassPhrase() {
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-        const Field = sdk.getComponent('views.elements.Field');
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        const LabelledToggleSwitch = sdk.getComponent('views.elements.LabelledToggleSwitch');
-
-        let strengthMeter;
-        let helpText;
-        if (this.state.zxcvbnResult) {
-            if (this.state.zxcvbnResult.score >= PASSWORD_MIN_SCORE) {
-                helpText = _t("Great! This recovery passphrase looks strong enough.");
-            } else {
-                // We take the warning from zxcvbn or failing that, the first
-                // suggestion. In practice The first is generally the most relevant
-                // and it's probably better to present the user with one thing to
-                // improve about their password than a whole collection - it can
-                // spit out a warning and multiple suggestions which starts getting
-                // very information-dense.
-                const suggestion = (
-                    this.state.zxcvbnResult.feedback.warning ||
-                    this.state.zxcvbnResult.feedback.suggestions[0]
-                );
-                const suggestionBlock = <div>{suggestion || _t("Keep going...")}</div>;
-
-                helpText = <div>
-                    {suggestionBlock}
-                </div>;
-            }
-            strengthMeter = <div>
-                <progress max={PASSWORD_MIN_SCORE} value={this.state.zxcvbnResult.score} />
-            </div>;
-        }
-
         return <form onSubmit={this._onPassPhraseNextClick}>
             <p>{_t(
-                "Set a recovery passphrase to secure encrypted information and recover it if you log out. " +
-                "This should be different to 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.",
             )}</p>
 
             <div className="mx_CreateSecretStorageDialog_passPhraseContainer">
-                <Field
-                    type="password"
+                <PassphraseField
                     className="mx_CreateSecretStorageDialog_passPhraseField"
                     onChange={this._onPassPhraseChange}
+                    minScore={PASSWORD_MIN_SCORE}
                     value={this.state.passPhrase}
-                    label={_t("Enter a recovery passphrase")}
+                    onValidate={this._onPassPhraseValidate}
+                    fieldRef={this._passphraseField}
                     autoFocus={true}
-                    autoComplete="new-password"
+                    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.")}
                 />
-                <div className="mx_CreateSecretStorageDialog_passPhraseHelp">
-                    {strengthMeter}
-                    {helpText}
-                </div>
             </div>
 
-            <LabelledToggleSwitch
-                label={ _t("Back up encrypted message keys")}
-                onChange={this._onUseKeyBackupChange} value={this.state.useKeyBackup}
-            />
-
             <DialogButtons
                 primaryButton={_t('Continue')}
                 onPrimaryButtonClick={this._onPassPhraseNextClick}
                 hasCancel={false}
-                disabled={!this._passPhraseIsValid()}
+                disabled={!this.state.passPhraseValid}
             >
                 <button type="button"
-                    onClick={this._onSkipSetupClick}
+                    onClick={this._onCancelClick}
                     className="danger"
-                >{_t("Skip")}</button>
+                >{_t("Cancel")}</button>
             </DialogButtons>
-
-            <details>
-                <summary>{_t("Advanced")}</summary>
-                <AccessibleButton kind='primary' onClick={this._onSkipPassPhraseClick} >
-                    {_t("Set up with a recovery key")}
-                </AccessibleButton>
-            </details>
         </form>;
     }
 
     _renderPhasePassPhraseConfirm() {
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         const Field = sdk.getComponent('views.elements.Field');
 
         let matchText;
+        let changeText;
         if (this.state.passPhraseConfirm === this.state.passPhrase) {
             matchText = _t("That matches!");
+            changeText = _t("Use a different passphrase?");
         } else if (!this.state.passPhrase.startsWith(this.state.passPhraseConfirm)) {
             // only tell them they're wrong if they've actually gone wrong.
-            // Security concious readers will note that if you left riot-web unattended
+            // Security concious readers will note that if you left element-web unattended
             // on this screen, this would make it easy for a malicious person to guess
             // your passphrase one letter at a time, but they could get this faster by
             // just opening the browser's developer tools and reading it.
             // Note that not having typed anything at all will not hit this clause and
             // fall through so empty box === no hint.
             matchText = _t("That doesn't match.");
+            changeText = _t("Go back to set it again.");
         }
 
         let passPhraseMatch = null;
@@ -576,12 +591,11 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 <div>{matchText}</div>
                 <div>
                     <AccessibleButton element="span" className="mx_linkButton" onClick={this._onSetAgainClick}>
-                        {_t("Go back to set it again.")}
+                        {changeText}
                     </AccessibleButton>
                 </div>
             </div>;
         }
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <form onSubmit={this._onPassPhraseConfirmNextClick}>
             <p>{_t(
                 "Enter your recovery passphrase a second time to confirm it.",
@@ -607,7 +621,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 disabled={this.state.passPhrase !== this.state.passPhraseConfirm}
             >
                 <button type="button"
-                    onClick={this._onSkipSetupClick}
+                    onClick={this._onCancelClick}
                     className="danger"
                 >{_t("Skip")}</button>
             </DialogButtons>
@@ -615,66 +629,48 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
     }
 
     _renderPhaseShowKey() {
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
+        let continueButton;
+        if (this.state.phase === PHASE_SHOWKEY) {
+            continueButton = <DialogButtons primaryButton={_t("Continue")}
+                disabled={!this.state.downloaded && !this.state.copied && !this.state.setPassphrase}
+                onPrimaryButtonClick={this._onShowKeyContinueClick}
+                hasCancel={false}
+            />;
+        } else {
+            continueButton = <div className="mx_CreateSecretStorageDialog_continueSpinner">
+                <InlineSpinner />
+            </div>;
+        }
         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.",
-            )}</p>
-            <p>{_t(
-                "Keep a copy of it somewhere secure, like a password manager or even a safe.",
+                "Store your Security Key somewhere safe, like a password manager or a safe, " +
+                "as it’s used to safeguard your encrypted data.",
             )}</p>
             <div className="mx_CreateSecretStorageDialog_primaryContainer">
-                <div className="mx_CreateSecretStorageDialog_recoveryKeyHeader">
-                    {_t("Your recovery key")}
-                </div>
                 <div className="mx_CreateSecretStorageDialog_recoveryKeyContainer">
                     <div className="mx_CreateSecretStorageDialog_recoveryKey">
                         <code ref={this._collectRecoveryKeyNode}>{this._recoveryKey.encodedPrivateKey}</code>
                     </div>
                     <div className="mx_CreateSecretStorageDialog_recoveryKeyButtons">
+                        <AccessibleButton kind='primary' className="mx_Dialog_primary"
+                            onClick={this._onDownloadClick}
+                            disabled={this.state.phase === PHASE_STORING}
+                        >
+                            {_t("Download")}
+                        </AccessibleButton>
+                        <span>{_t("or")}</span>
                         <AccessibleButton
                             kind='primary'
                             className="mx_Dialog_primary mx_CreateSecretStorageDialog_recoveryKeyButtons_copyBtn"
                             onClick={this._onCopyClick}
+                            disabled={this.state.phase === PHASE_STORING}
                         >
-                            {_t("Copy")}
-                        </AccessibleButton>
-                        <AccessibleButton kind='primary' className="mx_Dialog_primary" onClick={this._onDownloadClick}>
-                            {_t("Download")}
+                            {this.state.copied ? _t("Copied!") : _t("Copy")}
                         </AccessibleButton>
                     </div>
                 </div>
             </div>
-        </div>;
-    }
-
-    _renderPhaseKeepItSafe() {
-        let introText;
-        if (this.state.copied) {
-            introText = _t(
-                "Your recovery 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.",
-                {}, {b: s => <b>{s}</b>},
-            );
-        }
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-        return <div>
-            {introText}
-            <ul>
-                <li>{_t("<b>Print it</b> and store it somewhere safe", {}, {b: s => <b>{s}</b>})}</li>
-                <li>{_t("<b>Save it</b> on a USB key or backup drive", {}, {b: s => <b>{s}</b>})}</li>
-                <li>{_t("<b>Copy it</b> to your personal cloud storage", {}, {b: s => <b>{s}</b>})}</li>
-            </ul>
-            <DialogButtons primaryButton={_t("Continue")}
-                onPrimaryButtonClick={this._bootstrapSecretStorage}
-                hasCancel={false}>
-                <button onClick={this._onKeepItSafeBackClick}>{_t("Back")}</button>
-            </DialogButtons>
+            {continueButton}
         </div>;
     }
 
@@ -686,7 +682,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
     }
 
     _renderPhaseLoadError() {
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return <div>
             <p>{_t("Unable to query secret storage status")}</p>
             <div className="mx_Dialog_buttons">
@@ -699,53 +694,39 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         </div>;
     }
 
-    _renderPhaseDone() {
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+    _renderPhaseSkipConfirm() {
         return <div>
             <p>{_t(
-                "You can now verify your other devices, " +
-                "and other users to keep your chats safe.",
+                "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.",
+            )}</p>
+            <p>{_t(
+                "You can also set up Secure Backup & manage your keys in Settings.",
             )}</p>
-            <DialogButtons primaryButton={_t('OK')}
-                onPrimaryButtonClick={this._onDone}
-                hasCancel={false}
-            />
-        </div>;
-    }
-
-    _renderPhaseSkipConfirm() {
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-        return <div>
-            {_t(
-                "Without completing security on this session, it won’t have " +
-                "access to encrypted messages.",
-        )}
             <DialogButtons primaryButton={_t('Go back')}
-                onPrimaryButtonClick={this._onSetUpClick}
+                onPrimaryButtonClick={this._onGoBackClick}
                 hasCancel={false}
             >
-                <button type="button" className="danger" onClick={this._onCancel}>{_t('Skip')}</button>
+                <button type="button" className="danger" onClick={this._onCancel}>{_t('Cancel')}</button>
             </DialogButtons>
         </div>;
     }
 
     _titleForPhase(phase) {
         switch (phase) {
+            case PHASE_CHOOSE_KEY_PASSPHRASE:
+                return _t('Set up Secure backup');
             case PHASE_MIGRATE:
                 return _t('Upgrade your encryption');
             case PHASE_PASSPHRASE:
-                return _t('Set up encryption');
+                return _t('Set a Security Phrase');
             case PHASE_PASSPHRASE_CONFIRM:
-                return _t('Confirm recovery passphrase');
+                return _t('Confirm Security Phrase');
             case PHASE_CONFIRM_SKIP:
                 return _t('Are you sure?');
             case PHASE_SHOWKEY:
-            case PHASE_KEEPITSAFE:
-                return _t('Make a copy of your recovery key');
+                return _t('Save your Security Key');
             case PHASE_STORING:
                 return _t('Setting up keys');
-            case PHASE_DONE:
-                return _t("You're done!");
             default:
                 return '';
         }
@@ -756,7 +737,6 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
 
         let content;
         if (this.state.error) {
-            const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
             content = <div>
                 <p>{_t("Unable to set up secret storage")}</p>
                 <div className="mx_Dialog_buttons">
@@ -775,6 +755,9 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 case PHASE_LOADERROR:
                     content = this._renderPhaseLoadError();
                     break;
+                case PHASE_CHOOSE_KEY_PASSPHRASE:
+                    content = this._renderPhaseChooseKeyPassphrase();
+                    break;
                 case PHASE_MIGRATE:
                     content = this._renderPhaseMigrate();
                     break;
@@ -787,31 +770,40 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 case PHASE_SHOWKEY:
                     content = this._renderPhaseShowKey();
                     break;
-                case PHASE_KEEPITSAFE:
-                    content = this._renderPhaseKeepItSafe();
-                    break;
                 case PHASE_STORING:
                     content = this._renderBusyPhase();
                     break;
-                case PHASE_DONE:
-                    content = this._renderPhaseDone();
-                    break;
                 case PHASE_CONFIRM_SKIP:
                     content = this._renderPhaseSkipConfirm();
                     break;
             }
         }
 
-        let headerImage;
-        if (this._titleForPhase(this.state.phase)) {
-            headerImage = require("../../../../../res/img/e2e/normal.svg");
+        let titleClass = null;
+        switch (this.state.phase) {
+            case PHASE_PASSPHRASE:
+            case PHASE_PASSPHRASE_CONFIRM:
+                titleClass = [
+                    'mx_CreateSecretStorageDialog_titleWithIcon',
+                    'mx_CreateSecretStorageDialog_securePhraseTitle',
+                ];
+                break;
+            case PHASE_SHOWKEY:
+                titleClass = [
+                    'mx_CreateSecretStorageDialog_titleWithIcon',
+                    'mx_CreateSecretStorageDialog_secureBackupTitle',
+                ];
+                break;
+            case PHASE_CHOOSE_KEY_PASSPHRASE:
+                titleClass = 'mx_CreateSecretStorageDialog_centeredTitle';
+                break;
         }
 
         return (
             <BaseDialog className='mx_CreateSecretStorageDialog'
                 onFinished={this.props.onFinished}
                 title={this._titleForPhase(this.state.phase)}
-                headerImage={headerImage}
+                titleClass={titleClass}
                 hasCancel={this.props.hasCancel && [PHASE_PASSPHRASE].includes(this.state.phase)}
                 fixedWidth={false}
             >
diff --git a/src/autocomplete/Autocompleter.ts b/src/autocomplete/Autocompleter.ts
index 8384eb9d4f..2615736e09 100644
--- a/src/autocomplete/Autocompleter.ts
+++ b/src/autocomplete/Autocompleter.ts
@@ -35,15 +35,15 @@ export interface ISelectionRange {
 
 export interface ICompletion {
     type: "at-room" | "command" | "community" | "room" | "user";
-    completion: string,
+    completion: string;
     completionId?: string;
-    component?: ReactElement,
-    range: ISelectionRange,
-    command?: string,
+    component?: ReactElement;
+    range: ISelectionRange;
+    command?: string;
     suffix?: string;
     // If provided, apply a LINK entity to the completion with the
     // data = { url: href }.
-    href?: string,
+    href?: string;
 }
 
 const PROVIDERS = [
diff --git a/src/autocomplete/CommunityProvider.tsx b/src/autocomplete/CommunityProvider.tsx
index 3edb1ff81d..f34fee890e 100644
--- a/src/autocomplete/CommunityProvider.tsx
+++ b/src/autocomplete/CommunityProvider.tsx
@@ -53,7 +53,7 @@ export default class CommunityProvider extends AutocompleteProvider {
         const BaseAvatar = sdk.getComponent('views.avatars.BaseAvatar');
 
         // Disable autocompletions when composing commands because of various issues
-        // (see https://github.com/vector-im/riot-web/issues/4762)
+        // (see https://github.com/vector-im/element-web/issues/4762)
         if (/^(\/join|\/leave)/.test(query)) {
             return [];
         }
@@ -90,11 +90,12 @@ export default class CommunityProvider extends AutocompleteProvider {
                 type: "community",
                 href: makeGroupPermalink(groupId),
                 component: (
-                    <PillCompletion initialComponent={
+                    <PillCompletion title={name} description={groupId}>
                         <BaseAvatar name={name || groupId}
-                                    width={24} height={24}
+                                    width={24}
+                                    height={24}
                                     url={avatarUrl ? cli.mxcUrlToHttp(avatarUrl, 24, 24) : null} />
-                    } title={name} description={groupId} />
+                    </PillCompletion>
                 ),
                 range,
             }))
diff --git a/src/autocomplete/Components.tsx b/src/autocomplete/Components.tsx
index 19a7a969d6..6ac2f4db14 100644
--- a/src/autocomplete/Components.tsx
+++ b/src/autocomplete/Components.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
+import React, {forwardRef} from 'react';
 import classNames from 'classnames';
 
 /* These were earlier stateless functional components but had to be converted
@@ -30,50 +30,37 @@ interface ITextualCompletionProps {
     className?: string;
 }
 
-export class TextualCompletion extends React.PureComponent<ITextualCompletionProps> {
-    render() {
-        const {
-            title,
-            subtitle,
-            description,
-            className,
-            ...restProps
-        } = this.props;
-        return (
-            <div className={classNames('mx_Autocomplete_Completion_block', className)} role="option" {...restProps}>
-                <span className="mx_Autocomplete_Completion_title">{ title }</span>
-                <span className="mx_Autocomplete_Completion_subtitle">{ subtitle }</span>
-                <span className="mx_Autocomplete_Completion_description">{ description }</span>
-            </div>
-        );
-    }
+export const TextualCompletion = forwardRef<ITextualCompletionProps, any>((props, ref) => {
+    const {title, subtitle, description, className, ...restProps} = props;
+    return (
+        <div {...restProps}
+             className={classNames('mx_Autocomplete_Completion_block', className)}
+             role="option"
+             ref={ref}
+        >
+            <span className="mx_Autocomplete_Completion_title">{ title }</span>
+            <span className="mx_Autocomplete_Completion_subtitle">{ subtitle }</span>
+            <span className="mx_Autocomplete_Completion_description">{ description }</span>
+        </div>
+    );
+});
+
+interface IPillCompletionProps extends ITextualCompletionProps {
+    children?: React.ReactNode;
 }
 
-interface IPillCompletionProps {
-    title?: string;
-    subtitle?: string;
-    description?: string;
-    initialComponent?: React.ReactNode,
-    className?: string;
-}
-
-export class PillCompletion extends React.PureComponent<IPillCompletionProps> {
-    render() {
-        const {
-            title,
-            subtitle,
-            description,
-            initialComponent,
-            className,
-            ...restProps
-        } = this.props;
-        return (
-            <div className={classNames('mx_Autocomplete_Completion_pill', className)} role="option" {...restProps}>
-                { initialComponent }
-                <span className="mx_Autocomplete_Completion_title">{ title }</span>
-                <span className="mx_Autocomplete_Completion_subtitle">{ subtitle }</span>
-                <span className="mx_Autocomplete_Completion_description">{ description }</span>
-            </div>
-        );
-    }
-}
+export const PillCompletion = forwardRef<IPillCompletionProps, any>((props, ref) => {
+    const {title, subtitle, description, className, children, ...restProps} = props;
+    return (
+        <div {...restProps}
+             className={classNames('mx_Autocomplete_Completion_pill', className)}
+             role="option"
+             ref={ref}
+        >
+            { children }
+            <span className="mx_Autocomplete_Completion_title">{ title }</span>
+            <span className="mx_Autocomplete_Completion_subtitle">{ subtitle }</span>
+            <span className="mx_Autocomplete_Completion_description">{ description }</span>
+        </div>
+    );
+});
diff --git a/src/autocomplete/EmojiProvider.tsx b/src/autocomplete/EmojiProvider.tsx
index b67e26117b..147d68f5ff 100644
--- a/src/autocomplete/EmojiProvider.tsx
+++ b/src/autocomplete/EmojiProvider.tsx
@@ -34,7 +34,8 @@ import EMOTICON_REGEX from 'emojibase-regex/emoticon';
 const LIMIT = 20;
 
 // Match for ascii-style ";-)" emoticons or ":wink:" shortcodes provided by emojibase
-const EMOJI_REGEX = new RegExp('(' + EMOTICON_REGEX.source + '|:[+-\\w]*:?)$', 'g');
+// anchored to only match from the start of parts otherwise it'll show emoji suggestions whilst typing matrix IDs
+const EMOJI_REGEX = new RegExp('(' + EMOTICON_REGEX.source + '|(?:^|\\s):[+-\\w]*:?)$', 'g');
 
 interface IEmojiShort {
     emoji: IEmoji;
@@ -69,7 +70,7 @@ export default class EmojiProvider extends AutocompleteProvider {
 
     constructor() {
         super(EMOJI_REGEX);
-        this.matcher = new QueryMatcher(EMOJI_SHORTNAMES, {
+        this.matcher = new QueryMatcher<IEmojiShort>(EMOJI_SHORTNAMES, {
             keys: ['emoji.emoticon', 'shortname'],
             funcs: [
                 (o) => o.emoji.shortcodes.length > 1 ? o.emoji.shortcodes.slice(1).map(s => `:${s}:`).join(" ") : "", // aliases
@@ -121,9 +122,9 @@ export default class EmojiProvider extends AutocompleteProvider {
                 return {
                     completion: unicode,
                     component: (
-                        <PillCompletion title={shortname} aria-label={unicode} initialComponent={
-                            <span style={{maxWidth: '1em'}}>{ unicode }</span>
-                        } />
+                        <PillCompletion title={shortname} aria-label={unicode}>
+                            <span>{ unicode }</span>
+                        </PillCompletion>
                     ),
                     range,
                 };
diff --git a/src/autocomplete/NotifProvider.tsx b/src/autocomplete/NotifProvider.tsx
index b217612b0e..ef1823c0ca 100644
--- a/src/autocomplete/NotifProvider.tsx
+++ b/src/autocomplete/NotifProvider.tsx
@@ -48,7 +48,9 @@ export default class NotifProvider extends AutocompleteProvider {
                 type: "at-room",
                 suffix: ' ',
                 component: (
-                    <PillCompletion initialComponent={<RoomAvatar width={24} height={24} room={this.room} />} title="@room" description={_t("Notify the whole room")} />
+                    <PillCompletion title="@room" description={_t("Notify the whole room")}>
+                        <RoomAvatar width={24} height={24} room={this.room} />
+                    </PillCompletion>
                 ),
                 range,
             }];
diff --git a/src/autocomplete/QueryMatcher.ts b/src/autocomplete/QueryMatcher.ts
index 95bcfb25ef..9c91414556 100644
--- a/src/autocomplete/QueryMatcher.ts
+++ b/src/autocomplete/QueryMatcher.ts
@@ -17,26 +17,24 @@ limitations under the License.
 */
 
 import _at from 'lodash/at';
-import _flatMap from 'lodash/flatMap';
-import _sortBy from 'lodash/sortBy';
 import _uniq from 'lodash/uniq';
-
-function stripDiacritics(str: string): string {
-    return str.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
-}
+import {removeHiddenChars} from "matrix-js-sdk/src/utils";
 
 interface IOptions<T extends {}> {
     keys: Array<string | keyof T>;
     funcs?: Array<(T) => string>;
     shouldMatchWordsOnly?: boolean;
     shouldMatchPrefix?: boolean;
+    // whether to apply unhomoglyph and strip diacritics to fuzz up the search. Defaults to true
+    fuzzy?: boolean;
 }
 
 /**
  * Simple search matcher that matches any results with the query string anywhere
  * in the search string. Returns matches in the order the query string appears
- * in the search key, earliest first, then in the order the items appeared in
- * the source array.
+ * in the search key, earliest first, then in the order the search key appears
+ * in the provided array of keys, then in the order the items appeared in the
+ * source array.
  *
  * @param {Object[]} objects Initial list of objects. Equivalent to calling
  *     setObjects() after construction
@@ -45,16 +43,12 @@ interface IOptions<T extends {}> {
  * @param {function[]} options.funcs List of functions that when called with the
  *     object as an arg will return a string to use as an index
  */
-export default class QueryMatcher<T> {
+export default class QueryMatcher<T extends Object> {
     private _options: IOptions<T>;
-    private _keys: IOptions<T>["keys"];
-    private _funcs: Required<IOptions<T>["funcs"]>;
-    private _items: Map<string, T[]>;
+    private _items: Map<string, {object: T, keyWeight: number}[]>;
 
     constructor(objects: T[], options: IOptions<T> = { keys: [] }) {
         this._options = options;
-        this._keys = options.keys;
-        this._funcs = options.funcs || [];
 
         this.setObjects(objects);
 
@@ -75,57 +69,82 @@ export default class QueryMatcher<T> {
         this._items = new Map();
 
         for (const object of objects) {
-            const keyValues = _at(object, this._keys);
+            // Need to use unsafe coerce here because the objects can have any
+            // type for their values. We assume that those values who's keys have
+            // been specified will be string. Also, we cannot infer all the
+            // types of the keys of the objects at compile.
+            const keyValues = _at<string>(<any>object, this._options.keys);
 
-            for (const f of this._funcs) {
-                keyValues.push(f(object));
+            if (this._options.funcs) {
+                for (const f of this._options.funcs) {
+                    keyValues.push(f(object));
+                }
             }
 
-            for (const keyValue of keyValues) {
+            for (const [index, keyValue] of Object.entries(keyValues)) {
                 if (!keyValue) continue; // skip falsy keyValues
-                const key = stripDiacritics(keyValue).toLowerCase();
+                const key = this.processQuery(keyValue);
                 if (!this._items.has(key)) {
                     this._items.set(key, []);
                 }
-                this._items.get(key).push(object);
+                this._items.get(key).push({
+                    keyWeight: Number(index),
+                    object,
+                });
             }
         }
     }
 
     match(query: string): T[] {
-        query = stripDiacritics(query).toLowerCase();
+        query = this.processQuery(query);
         if (this._options.shouldMatchWordsOnly) {
             query = query.replace(/[^\w]/g, '');
         }
         if (query.length === 0) {
             return [];
         }
-        const results = [];
+        const matches = [];
         // Iterate through the map & check each key.
         // ES6 Map iteration order is defined to be insertion order, so results
         // here will come out in the order they were put in.
-        for (const key of this._items.keys()) {
+        for (const [key, candidates] of this._items.entries()) {
             let resultKey = key;
             if (this._options.shouldMatchWordsOnly) {
                 resultKey = resultKey.replace(/[^\w]/g, '');
             }
             const index = resultKey.indexOf(query);
             if (index !== -1 && (!this._options.shouldMatchPrefix || index === 0)) {
-                results.push({key, index});
+                matches.push(
+                    ...candidates.map((candidate) => ({index, ...candidate})),
+                );
             }
         }
 
-        // Sort them by where the query appeared in the search key
-        // lodash sortBy is a stable sort, so results where the query
-        // appeared in the same place will retain their order with
-        // respect to each other.
-        const sortedResults = _sortBy(results, (candidate) => {
-            return candidate.index;
+        // Sort matches by where the query appeared in the search key, then by
+        // where the matched key appeared in the provided array of keys.
+        matches.sort((a, b) => {
+            if (a.index < b.index) {
+                return -1;
+            } else if (a.index === b.index) {
+                if (a.keyWeight < b.keyWeight) {
+                    return -1;
+                } else if (a.keyWeight === b.keyWeight) {
+                    return 0;
+                }
+            }
+
+            return 1;
         });
 
-        // Now map the keys to the result objects. Each result object is a list, so
-        // flatMap will flatten those lists out into a single list. Also remove any
-        // duplicates.
-        return _uniq(_flatMap(sortedResults, (candidate) => this._items.get(candidate.key)));
+        // Now map the keys to the result objects. Also remove any duplicates.
+        return _uniq(matches.map((match) => match.object));
+    }
+
+    private processQuery(query: string): string {
+        if (this._options.fuzzy !== false) {
+            // lower case both the input and the output for consistency
+            return removeHiddenChars(query.toLowerCase()).toLowerCase();
+        }
+        return query.toLowerCase();
     }
 }
diff --git a/src/autocomplete/RoomProvider.tsx b/src/autocomplete/RoomProvider.tsx
index 01e770407c..b18b2d132c 100644
--- a/src/autocomplete/RoomProvider.tsx
+++ b/src/autocomplete/RoomProvider.tsx
@@ -25,9 +25,9 @@ import {MatrixClientPeg} from '../MatrixClientPeg';
 import QueryMatcher from './QueryMatcher';
 import {PillCompletion} from './Components';
 import * as sdk from '../index';
-import _sortBy from 'lodash/sortBy';
 import {makeRoomPermalink} from "../utils/permalinks/Permalinks";
 import {ICompletion, ISelectionRange} from "./Autocompleter";
+import { uniqBy, sortBy } from 'lodash';
 
 const ROOM_REGEX = /\B#\S*/g;
 
@@ -91,10 +91,11 @@ export default class RoomProvider extends AutocompleteProvider {
             this.matcher.setObjects(matcherObjects);
             const matchedString = command[0];
             completions = this.matcher.match(matchedString);
-            completions = _sortBy(completions, [
+            completions = sortBy(completions, [
                 (c) => score(matchedString, c.displayedAlias),
                 (c) => c.displayedAlias.length,
             ]);
+            completions = uniqBy(completions, (match) => match.room);
             completions = completions.map((room) => {
                 return {
                     completion: room.displayedAlias,
@@ -103,7 +104,9 @@ export default class RoomProvider extends AutocompleteProvider {
                     suffix: ' ',
                     href: makeRoomPermalink(room.displayedAlias),
                     component: (
-                        <PillCompletion initialComponent={<RoomAvatar width={24} height={24} room={room.room} />} title={room.room.name} description={room.displayedAlias} />
+                        <PillCompletion title={room.room.name} description={room.displayedAlias}>
+                            <RoomAvatar width={24} height={24} room={room.room} />
+                        </PillCompletion>
                     ),
                     range,
                 };
@@ -115,7 +118,7 @@ export default class RoomProvider extends AutocompleteProvider {
     }
 
     getName() {
-        return '💬 ' + _t('Rooms');
+        return _t('Rooms');
     }
 
     renderCompletions(completions: React.ReactNode[]): React.ReactNode {
diff --git a/src/autocomplete/UserProvider.tsx b/src/autocomplete/UserProvider.tsx
index 1680eb5d54..c957b5e597 100644
--- a/src/autocomplete/UserProvider.tsx
+++ b/src/autocomplete/UserProvider.tsx
@@ -125,10 +125,9 @@ export default class UserProvider extends AutocompleteProvider {
                     suffix: (selection.beginning && range.start === 0) ? ': ' : ' ',
                     href: makeUserPermalink(user.userId),
                     component: (
-                        <PillCompletion
-                            initialComponent={<MemberAvatar member={user} width={24} height={24} />}
-                            title={displayName}
-                            description={user.userId} />
+                        <PillCompletion title={displayName} description={user.userId}>
+                            <MemberAvatar member={user} width={24} height={24} />
+                        </PillCompletion>
                     ),
                     range,
                 };
@@ -138,7 +137,7 @@ export default class UserProvider extends AutocompleteProvider {
     }
 
     getName(): string {
-        return '👥 ' + _t('Users');
+        return _t('Users');
     }
 
     _makeUsers() {
diff --git a/src/components/structures/AutoHideScrollbar.js b/src/components/structures/AutoHideScrollbar.js
index 04323bb548..14f7c9ca83 100644
--- a/src/components/structures/AutoHideScrollbar.js
+++ b/src/components/structures/AutoHideScrollbar.js
@@ -38,12 +38,13 @@ export default class AutoHideScrollbar extends React.Component {
 
     render() {
         return (<div
-                    ref={this._collectContainerRef}
-                    style={this.props.style}
-                    className={["mx_AutoHideScrollbar", this.props.className].join(" ")}
-                    onScroll={this.props.onScroll}
-                    onWheel={this.props.onWheel}
-                >
+            ref={this._collectContainerRef}
+            style={this.props.style}
+            className={["mx_AutoHideScrollbar", this.props.className].join(" ")}
+            onScroll={this.props.onScroll}
+            onWheel={this.props.onWheel}
+            tabIndex={this.props.tabIndex}
+        >
             { this.props.children }
         </div>);
     }
diff --git a/src/components/structures/CompatibilityPage.js b/src/components/structures/CompatibilityPage.js
index 9a3fdb5f39..1fa6068675 100644
--- a/src/components/structures/CompatibilityPage.js
+++ b/src/components/structures/CompatibilityPage.js
@@ -1,7 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -20,6 +20,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import { _t } from '../../languageHandler';
+import SdkConfig from '../../SdkConfig';
 
 export default createReactClass({
     displayName: 'CompatibilityPage',
@@ -38,14 +39,25 @@ export default createReactClass({
     },
 
     render: function() {
+        const brand = SdkConfig.get().brand;
+
         return (
         <div className="mx_CompatibilityPage">
             <div className="mx_CompatibilityPage_box">
-                <p>{ _t("Sorry, your browser is <b>not</b> able to run Riot.", {}, { 'b': (sub) => <b>{sub}</b> }) } </p>
+                <p>{_t(
+                    "Sorry, your browser is <b>not</b> able to run %(brand)s.",
+                    {
+                        brand,
+                    },
+                    {
+                        'b': (sub) => <b>{sub}</b>,
+                    })
+                }</p>
                 <p>
                 { _t(
-                    "Riot uses many advanced browser features, some of which are not available " +
+                    "%(brand)s uses many advanced browser features, some of which are not available " +
                     "or experimental in your current browser.",
+                    { brand },
                 ) }
                 </p>
                 <p>
diff --git a/src/components/structures/ContextMenu.js b/src/components/structures/ContextMenu.tsx
similarity index 64%
rename from src/components/structures/ContextMenu.js
rename to src/components/structures/ContextMenu.tsx
index 98b0867ccc..587ae2cb6b 100644
--- a/src/components/structures/ContextMenu.js
+++ b/src/components/structures/ContextMenu.tsx
@@ -16,13 +16,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {useRef, useState} from 'react';
-import ReactDOM from 'react-dom';
-import PropTypes from 'prop-types';
-import classNames from 'classnames';
+import React, {CSSProperties, useRef, useState} from "react";
+import ReactDOM from "react-dom";
+import classNames from "classnames";
+
 import {Key} from "../../Keyboard";
-import * as sdk from "../../index";
-import AccessibleButton from "../views/elements/AccessibleButton";
+import {Writeable} from "../../@types/common";
 
 // Shamelessly ripped off Modal.js.  There's probably a better way
 // of doing reusable widgets like dialog boxes & menus where we go and
@@ -30,8 +29,8 @@ import AccessibleButton from "../views/elements/AccessibleButton";
 
 const ContextualMenuContainerId = "mx_ContextualMenu_Container";
 
-function getOrCreateContainer() {
-    let container = document.getElementById(ContextualMenuContainerId);
+function getOrCreateContainer(): HTMLDivElement {
+    let container = document.getElementById(ContextualMenuContainerId) as HTMLDivElement;
 
     if (!container) {
         container = document.createElement("div");
@@ -43,50 +42,70 @@ function getOrCreateContainer() {
 }
 
 const ARIA_MENU_ITEM_ROLES = new Set(["menuitem", "menuitemcheckbox", "menuitemradio"]);
+
+interface IPosition {
+    top?: number;
+    bottom?: number;
+    left?: number;
+    right?: number;
+}
+
+export enum ChevronFace {
+    Top = "top",
+    Bottom = "bottom",
+    Left = "left",
+    Right = "right",
+    None = "none",
+}
+
+export interface IProps extends IPosition {
+    menuWidth?: number;
+    menuHeight?: number;
+
+    chevronOffset?: number;
+    chevronFace?: ChevronFace;
+
+    menuPaddingTop?: number;
+    menuPaddingBottom?: number;
+    menuPaddingLeft?: number;
+    menuPaddingRight?: number;
+
+    zIndex?: number;
+
+    // If true, insert an invisible screen-sized element behind the menu that when clicked will close it.
+    hasBackground?: boolean;
+    // whether this context menu should be focus managed. If false it must handle itself
+    managed?: boolean;
+
+    // Function to be called on menu close
+    onFinished();
+    // on resize callback
+    windowResize?();
+}
+
+interface IState {
+    contextMenuElem: HTMLDivElement;
+}
+
 // Generic ContextMenu Portal wrapper
 // all options inside the menu should be of role=menuitem/menuitemcheckbox/menuitemradiobutton and have tabIndex={-1}
 // this will allow the ContextMenu to manage its own focus using arrow keys as per the ARIA guidelines.
-export class ContextMenu extends React.Component {
-    static propTypes = {
-        top: PropTypes.number,
-        bottom: PropTypes.number,
-        left: PropTypes.number,
-        right: PropTypes.number,
-        menuWidth: PropTypes.number,
-        menuHeight: PropTypes.number,
-        chevronOffset: PropTypes.number,
-        chevronFace: PropTypes.string, // top, bottom, left, right or none
-        // Function to be called on menu close
-        onFinished: PropTypes.func.isRequired,
-        menuPaddingTop: PropTypes.number,
-        menuPaddingRight: PropTypes.number,
-        menuPaddingBottom: PropTypes.number,
-        menuPaddingLeft: PropTypes.number,
-        zIndex: PropTypes.number,
-
-        // If true, insert an invisible screen-sized element behind the
-        // menu that when clicked will close it.
-        hasBackground: PropTypes.bool,
-
-        // on resize callback
-        windowResize: PropTypes.func,
-
-        managed: PropTypes.bool, // whether this context menu should be focus managed. If false it must handle itself
-    };
+export class ContextMenu extends React.PureComponent<IProps, IState> {
+    private initialFocus: HTMLElement;
 
     static defaultProps = {
         hasBackground: true,
         managed: true,
     };
 
-    constructor() {
-        super();
+    constructor(props, context) {
+        super(props, context);
         this.state = {
             contextMenuElem: null,
         };
 
         // persist what had focus when we got initialized so we can return it after
-        this.initialFocus = document.activeElement;
+        this.initialFocus = document.activeElement as HTMLElement;
     }
 
     componentWillUnmount() {
@@ -94,7 +113,7 @@ export class ContextMenu extends React.Component {
         this.initialFocus.focus();
     }
 
-    collectContextMenuRect = (element) => {
+    private collectContextMenuRect = (element) => {
         // We don't need to clean up when unmounting, so ignore
         if (!element) return;
 
@@ -111,11 +130,12 @@ export class ContextMenu extends React.Component {
         });
     };
 
-    onContextMenu = (e) => {
+    private onContextMenu = (e) => {
         if (this.props.onFinished) {
             this.props.onFinished();
 
             e.preventDefault();
+            e.stopPropagation();
             const x = e.clientX;
             const y = e.clientY;
 
@@ -133,7 +153,20 @@ export class ContextMenu extends React.Component {
         }
     };
 
-    _onMoveFocus = (element, up) => {
+    private onContextMenuPreventBubbling = (e) => {
+        // stop propagation so that any context menu handlers don't leak out of this context menu
+        // but do not inhibit the default browser menu
+        e.stopPropagation();
+    };
+
+    // Prevent clicks on the background from going through to the component which opened the menu.
+    private onFinished = (ev: React.MouseEvent) => {
+        ev.stopPropagation();
+        ev.preventDefault();
+        if (this.props.onFinished) this.props.onFinished();
+    };
+
+    private onMoveFocus = (element: Element, up: boolean) => {
         let descending = false; // are we currently descending or ascending through the DOM tree?
 
         do {
@@ -167,25 +200,25 @@ export class ContextMenu extends React.Component {
         } while (element && !ARIA_MENU_ITEM_ROLES.has(element.getAttribute("role")));
 
         if (element) {
-            element.focus();
+            (element as HTMLElement).focus();
         }
     };
 
-    _onMoveFocusHomeEnd = (element, up) => {
+    private onMoveFocusHomeEnd = (element: Element, up: boolean) => {
         let results = element.querySelectorAll('[role^="menuitem"]');
         if (!results) {
             results = element.querySelectorAll('[tab-index]');
         }
         if (results && results.length) {
             if (up) {
-                results[0].focus();
+                (results[0] as HTMLElement).focus();
             } else {
-                results[results.length - 1].focus();
+                (results[results.length - 1] as HTMLElement).focus();
             }
         }
     };
 
-    _onKeyDown = (ev) => {
+    private onKeyDown = (ev: React.KeyboardEvent) => {
         if (!this.props.managed) {
             if (ev.key === Key.ESCAPE) {
                 this.props.onFinished();
@@ -200,19 +233,22 @@ export class ContextMenu extends React.Component {
         switch (ev.key) {
             case Key.TAB:
             case Key.ESCAPE:
+            // close on left and right arrows too for when it is a context menu on a <Toolbar />
+            case Key.ARROW_LEFT:
+            case Key.ARROW_RIGHT:
                 this.props.onFinished();
                 break;
             case Key.ARROW_UP:
-                this._onMoveFocus(ev.target, true);
+                this.onMoveFocus(ev.target as Element, true);
                 break;
             case Key.ARROW_DOWN:
-                this._onMoveFocus(ev.target, false);
+                this.onMoveFocus(ev.target as Element, false);
                 break;
             case Key.HOME:
-                this._onMoveFocusHomeEnd(this.state.contextMenuElem, true);
+                this.onMoveFocusHomeEnd(this.state.contextMenuElem, true);
                 break;
             case Key.END:
-                this._onMoveFocusHomeEnd(this.state.contextMenuElem, false);
+                this.onMoveFocusHomeEnd(this.state.contextMenuElem, false);
                 break;
             default:
                 handled = false;
@@ -225,9 +261,8 @@ export class ContextMenu extends React.Component {
         }
     };
 
-    renderMenu(hasBackground=this.props.hasBackground) {
-        const position = {};
-        let chevronFace = null;
+    protected renderMenu(hasBackground = this.props.hasBackground) {
+        const position: Partial<Writeable<DOMRect>> = {};
         const props = this.props;
 
         if (props.top) {
@@ -236,23 +271,24 @@ export class ContextMenu extends React.Component {
             position.bottom = props.bottom;
         }
 
+        let chevronFace: ChevronFace;
         if (props.left) {
             position.left = props.left;
-            chevronFace = 'left';
+            chevronFace = ChevronFace.Left;
         } else {
             position.right = props.right;
-            chevronFace = 'right';
+            chevronFace = ChevronFace.Right;
         }
 
         const contextMenuRect = this.state.contextMenuElem ? this.state.contextMenuElem.getBoundingClientRect() : null;
 
-        const chevronOffset = {};
+        const chevronOffset: CSSProperties = {};
         if (props.chevronFace) {
             chevronFace = props.chevronFace;
         }
-        const hasChevron = chevronFace && chevronFace !== "none";
+        const hasChevron = chevronFace && chevronFace !== ChevronFace.None;
 
-        if (chevronFace === 'top' || chevronFace === 'bottom') {
+        if (chevronFace === ChevronFace.Top || chevronFace === ChevronFace.Bottom) {
             chevronOffset.left = props.chevronOffset;
         } else if (position.top !== undefined) {
             const target = position.top;
@@ -282,13 +318,13 @@ export class ContextMenu extends React.Component {
             'mx_ContextualMenu_right': !hasChevron && position.right,
             'mx_ContextualMenu_top': !hasChevron && position.top,
             'mx_ContextualMenu_bottom': !hasChevron && position.bottom,
-            'mx_ContextualMenu_withChevron_left': chevronFace === 'left',
-            'mx_ContextualMenu_withChevron_right': chevronFace === 'right',
-            'mx_ContextualMenu_withChevron_top': chevronFace === 'top',
-            'mx_ContextualMenu_withChevron_bottom': chevronFace === 'bottom',
+            'mx_ContextualMenu_withChevron_left': chevronFace === ChevronFace.Left,
+            'mx_ContextualMenu_withChevron_right': chevronFace === ChevronFace.Right,
+            'mx_ContextualMenu_withChevron_top': chevronFace === ChevronFace.Top,
+            'mx_ContextualMenu_withChevron_bottom': chevronFace === ChevronFace.Bottom,
         });
 
-        const menuStyle = {};
+        const menuStyle: CSSProperties = {};
         if (props.menuWidth) {
             menuStyle.width = props.menuWidth;
         }
@@ -319,13 +355,28 @@ export class ContextMenu extends React.Component {
         let background;
         if (hasBackground) {
             background = (
-                <div className="mx_ContextualMenu_background" style={wrapperStyle} onClick={props.onFinished} onContextMenu={this.onContextMenu} />
+                <div
+                    className="mx_ContextualMenu_background"
+                    style={wrapperStyle}
+                    onClick={this.onFinished}
+                    onContextMenu={this.onContextMenu}
+                />
             );
         }
 
         return (
-            <div className="mx_ContextualMenu_wrapper" style={{...position, ...wrapperStyle}} onKeyDown={this._onKeyDown}>
-                <div className={menuClasses} style={menuStyle} ref={this.collectContextMenuRect} role={this.props.managed ? "menu" : undefined}>
+            <div
+                className="mx_ContextualMenu_wrapper"
+                style={{...position, ...wrapperStyle}}
+                onKeyDown={this.onKeyDown}
+                onContextMenu={this.onContextMenuPreventBubbling}
+            >
+                <div
+                    className={menuClasses}
+                    style={menuStyle}
+                    ref={this.collectContextMenuRect}
+                    role={this.props.managed ? "menu" : undefined}
+                >
                     { chevron }
                     { props.children }
                 </div>
@@ -334,91 +385,13 @@ export class ContextMenu extends React.Component {
         );
     }
 
-    render() {
+    render(): React.ReactChild {
         return ReactDOM.createPortal(this.renderMenu(), getOrCreateContainer());
     }
 }
 
-// Semantic component for representing the AccessibleButton which launches a <ContextMenu />
-export const ContextMenuButton = ({ label, isExpanded, children, ...props }) => {
-    const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-    return (
-        <AccessibleButton {...props} title={label} aria-label={label} aria-haspopup={true} aria-expanded={isExpanded}>
-            { children }
-        </AccessibleButton>
-    );
-};
-ContextMenuButton.propTypes = {
-    ...AccessibleButton.propTypes,
-    label: PropTypes.string,
-    isExpanded: PropTypes.bool.isRequired, // whether or not the context menu is currently open
-};
-
-// Semantic component for representing a role=menuitem
-export const MenuItem = ({children, label, ...props}) => {
-    const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-    return (
-        <AccessibleButton {...props} role="menuitem" tabIndex={-1} aria-label={label}>
-            { children }
-        </AccessibleButton>
-    );
-};
-MenuItem.propTypes = {
-    ...AccessibleButton.propTypes,
-    label: PropTypes.string, // optional
-    className: PropTypes.string, // optional
-    onClick: PropTypes.func.isRequired,
-};
-
-// Semantic component for representing a role=group for grouping menu radios/checkboxes
-export const MenuGroup = ({children, label, ...props}) => {
-    return <div {...props} role="group" aria-label={label}>
-        { children }
-    </div>;
-};
-MenuGroup.propTypes = {
-    label: PropTypes.string.isRequired,
-    className: PropTypes.string, // optional
-};
-
-// Semantic component for representing a role=menuitemcheckbox
-export const MenuItemCheckbox = ({children, label, active=false, disabled=false, ...props}) => {
-    const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-    return (
-        <AccessibleButton {...props} role="menuitemcheckbox" aria-checked={active} aria-disabled={disabled} tabIndex={-1} aria-label={label}>
-            { children }
-        </AccessibleButton>
-    );
-};
-MenuItemCheckbox.propTypes = {
-    ...AccessibleButton.propTypes,
-    label: PropTypes.string, // optional
-    active: PropTypes.bool.isRequired,
-    disabled: PropTypes.bool, // optional
-    className: PropTypes.string, // optional
-    onClick: PropTypes.func.isRequired,
-};
-
-// Semantic component for representing a role=menuitemradio
-export const MenuItemRadio = ({children, label, active=false, disabled=false, ...props}) => {
-    const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-    return (
-        <AccessibleButton {...props} role="menuitemradio" aria-checked={active} aria-disabled={disabled} tabIndex={-1} aria-label={label}>
-            { children }
-        </AccessibleButton>
-    );
-};
-MenuItemRadio.propTypes = {
-    ...AccessibleButton.propTypes,
-    label: PropTypes.string, // optional
-    active: PropTypes.bool.isRequired,
-    disabled: PropTypes.bool, // optional
-    className: PropTypes.string, // optional
-    onClick: PropTypes.func.isRequired,
-};
-
 // Placement method for <ContextMenu /> to position context menu to right of elementRect with chevronOffset
-export const toRightOf = (elementRect, chevronOffset=12) => {
+export const toRightOf = (elementRect: DOMRect, 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
@@ -426,8 +399,8 @@ export const toRightOf = (elementRect, chevronOffset=12) => {
 };
 
 // Placement method for <ContextMenu /> to position context menu right-aligned and flowing to the left of elementRect
-export const aboveLeftOf = (elementRect, chevronFace="none") => {
-    const menuOptions = { chevronFace };
+export const aboveLeftOf = (elementRect: DOMRect, chevronFace = ChevronFace.None) => {
+    const menuOptions: IPosition & { chevronFace: ChevronFace } = { chevronFace };
 
     const buttonRight = elementRect.right + window.pageXOffset;
     const buttonBottom = elementRect.bottom + window.pageYOffset;
@@ -485,3 +458,13 @@ export function createMenu(ElementClass, props) {
 
     return {close: onFinished};
 }
+
+// re-export the semantic helper components for simplicity
+export {ContextMenuButton} from "../../accessibility/context_menu/ContextMenuButton";
+export {ContextMenuTooltipButton} from "../../accessibility/context_menu/ContextMenuTooltipButton";
+export {MenuGroup} from "../../accessibility/context_menu/MenuGroup";
+export {MenuItem} from "../../accessibility/context_menu/MenuItem";
+export {MenuItemCheckbox} from "../../accessibility/context_menu/MenuItemCheckbox";
+export {MenuItemRadio} from "../../accessibility/context_menu/MenuItemRadio";
+export {StyledMenuItemCheckbox} from "../../accessibility/context_menu/StyledMenuItemCheckbox";
+export {StyledMenuItemRadio} from "../../accessibility/context_menu/StyledMenuItemRadio";
diff --git a/src/components/structures/CustomRoomTagPanel.js b/src/components/structures/CustomRoomTagPanel.js
index 6e392ea505..a79bdafeb5 100644
--- a/src/components/structures/CustomRoomTagPanel.js
+++ b/src/components/structures/CustomRoomTagPanel.js
@@ -18,7 +18,7 @@ import React from 'react';
 import CustomRoomTagStore from '../../stores/CustomRoomTagStore';
 import AutoHideScrollbar from './AutoHideScrollbar';
 import * as sdk from '../../index';
-import dis from '../../dispatcher';
+import dis from '../../dispatcher/dispatcher';
 import classNames from 'classnames';
 import * as FormattingUtils from '../../utils/FormattingUtils';
 
@@ -72,17 +72,17 @@ class CustomRoomTagTile extends React.Component {
         const tag = this.props.tag;
         const avatarHeight = 40;
         const className = classNames({
-            CustomRoomTagPanel_tileSelected: tag.selected,
+            "CustomRoomTagPanel_tileSelected": tag.selected,
         });
         const name = tag.name;
-        const badge = tag.badge;
+        const badgeNotifState = tag.badgeNotifState;
         let badgeElement;
-        if (badge) {
+        if (badgeNotifState) {
             const badgeClasses = classNames({
                 "mx_TagTile_badge": true,
-                "mx_TagTile_badgeHighlight": badge.highlight,
+                "mx_TagTile_badgeHighlight": badgeNotifState.hasMentions,
             });
-            badgeElement = (<div className={badgeClasses}>{FormattingUtils.formatCount(badge.count)}</div>);
+            badgeElement = (<div className={badgeClasses}>{FormattingUtils.formatCount(badgeNotifState.count)}</div>);
         }
 
         return (
diff --git a/src/components/structures/EmbeddedPage.js b/src/components/structures/EmbeddedPage.js
index 0aababf030..49ba3d1227 100644
--- a/src/components/structures/EmbeddedPage.js
+++ b/src/components/structures/EmbeddedPage.js
@@ -23,7 +23,7 @@ import PropTypes from 'prop-types';
 import request from 'browser-request';
 import { _t } from '../../languageHandler';
 import sanitizeHtml from 'sanitize-html';
-import dis from '../../dispatcher';
+import dis from '../../dispatcher/dispatcher';
 import {MatrixClientPeg} from '../../MatrixClientPeg';
 import classnames from 'classnames';
 import MatrixClientContext from "../../contexts/MatrixClientContext";
diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index f8c03be864..d873dd4094 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -210,6 +210,11 @@ const FilePanel = createReactClass({
         const TimelinePanel = sdk.getComponent("structures.TimelinePanel");
         const Loader = sdk.getComponent("elements.Spinner");
 
+        const emptyState = (<div className="mx_RightPanel_empty mx_FilePanel_empty">
+            <h2>{_t('No files visible in this room')}</h2>
+            <p>{_t('Attach files from chat or just drag and drop them anywhere in a room.')}</p>
+        </div>);
+
         if (this.state.timelineSet) {
             // console.log("rendering TimelinePanel for timelineSet " + this.state.timelineSet.room.roomId + " " +
             //             "(" + this.state.timelineSet._timelines.join(", ") + ")" + " with key " + this.props.roomId);
@@ -223,7 +228,7 @@ const FilePanel = createReactClass({
                         onPaginationRequest={this.onPaginationRequest}
                         tileShape="file_grid"
                         resizeNotifier={this.props.resizeNotifier}
-                        empty={_t('There are no visible files in this room')}
+                        empty={emptyState}
                     />
                 </div>
             );
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 3b32e5c907..2e2fa25169 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -21,7 +21,7 @@ import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import {MatrixClientPeg} from '../../MatrixClientPeg';
 import * as sdk from '../../index';
-import dis from '../../dispatcher';
+import dis from '../../dispatcher/dispatcher';
 import { getHostingLink } from '../../utils/HostingLink';
 import { sanitizedHtmlNode } from '../../HtmlUtils';
 import { _t, _td } from '../../languageHandler';
@@ -92,7 +92,7 @@ const CategoryRoomList = createReactClass({
         Modal.createTrackedDialog('Add Rooms to Group Summary', '', AddressPickerDialog, {
             title: _t('Add rooms to the community summary'),
             description: _t("Which rooms would you like to add to this summary?"),
-            placeholder: _t("Room name or alias"),
+            placeholder: _t("Room name or address"),
             button: _t("Add to summary"),
             pickerType: 'room',
             validAddressTypes: ['mx-room-id'],
@@ -1003,9 +1003,10 @@ export default createReactClass({
                     this.state.inviterProfile.avatarUrl, 36, 36,
                 ) : null;
 
-            let inviterName = group.inviter.userId;
+            const inviter = group.inviter || {};
+            let inviterName = inviter.userId;
             if (this.state.inviterProfile) {
-                inviterName = this.state.inviterProfile.displayName || group.inviter.userId;
+                inviterName = this.state.inviterProfile.displayName || inviter.userId;
             }
             return <div className="mx_GroupView_membershipSection mx_GroupView_membershipSection_invited">
                 <div className="mx_GroupView_membershipSubSection">
@@ -1016,7 +1017,7 @@ export default createReactClass({
                             height={36}
                         />
                         { _t("%(inviter)s has invited you to join this community", {
-                            inviter: inviterName,
+                            inviter: inviterName || _t("Someone"),
                         }) }
                     </div>
                     <div className="mx_GroupView_membership_buttonContainer">
diff --git a/src/components/structures/HomePage.tsx b/src/components/structures/HomePage.tsx
index ddf9cd6d00..a42032c9fe 100644
--- a/src/components/structures/HomePage.tsx
+++ b/src/components/structures/HomePage.tsx
@@ -21,10 +21,11 @@ import { getHomePageUrl } from "../../utils/pages";
 import { _t } from "../../languageHandler";
 import SdkConfig from "../../SdkConfig";
 import * as sdk from "../../index";
-import dis from "../../dispatcher";
+import dis from "../../dispatcher/dispatcher";
+import { Action } from "../../dispatcher/actions";
 
 const onClickSendDm = () => dis.dispatch({action: 'view_create_chat'});
-const onClickExplore = () => dis.dispatch({action: 'view_room_directory'});
+const onClickExplore = () => dis.fire(Action.ViewRoomDirectory);
 const onClickNewRoom = () => dis.dispatch({action: 'view_create_room'});
 
 const HomePage = () => {
@@ -37,7 +38,7 @@ const HomePage = () => {
     }
 
     const brandingConfig = config.branding;
-    let logoUrl = "themes/riot/img/logos/riot-logo.svg";
+    let logoUrl = "themes/element/img/logos/element-logo.svg";
     if (brandingConfig && brandingConfig.authHeaderLogoUrl) {
         logoUrl = brandingConfig.authHeaderLogoUrl;
     }
@@ -45,8 +46,8 @@ const HomePage = () => {
     const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
     return <AutoHideScrollbar className="mx_HomePage mx_HomePage_default">
         <div className="mx_HomePage_default_wrapper">
-            <img src={logoUrl} alt="Riot" />
-            <h1>{ _t("Welcome to %(appName)s", { appName: config.brand || "Riot" }) }</h1>
+            <img src={logoUrl} alt={config.brand || "Element"} />
+            <h1>{ _t("Welcome to %(appName)s", { appName: config.brand || "Element" }) }</h1>
             <h4>{ _t("Liberate your communication") }</h4>
             <div className="mx_HomePage_default_buttons">
                 <AccessibleButton onClick={onClickSendDm} className="mx_HomePage_button_sendDm">
diff --git a/src/components/structures/IndicatorScrollbar.js b/src/components/structures/IndicatorScrollbar.js
index 05ad4f7561..cd5510de9d 100644
--- a/src/components/structures/IndicatorScrollbar.js
+++ b/src/components/structures/IndicatorScrollbar.js
@@ -158,7 +158,7 @@ export default class IndicatorScrollbar extends React.Component {
             }
 
             // don't mess with the horizontal scroll for trackpad users
-            // See https://github.com/vector-im/riot-web/issues/10005
+            // See https://github.com/vector-im/element-web/issues/10005
             if (this._likelyTrackpadUser) {
                 return;
             }
@@ -192,7 +192,7 @@ export default class IndicatorScrollbar extends React.Component {
             ref={this._collectScrollerComponent}
             wrappedRef={this._collectScroller}
             onWheel={this.onMouseWheel}
-            {... this.props}
+            {...this.props}
         >
             { leftOverflowIndicator }
             { this.props.children }
diff --git a/src/components/structures/InteractiveAuth.js b/src/components/structures/InteractiveAuth.js
index 351e3bbad0..fa7860ccef 100644
--- a/src/components/structures/InteractiveAuth.js
+++ b/src/components/structures/InteractiveAuth.js
@@ -203,7 +203,7 @@ export default createReactClass({
         // the UI layer, so we ignore this signal and show a spinner until
         // there's a new screen to show the user. This is implemented by setting
         // `busy: false` in `_authStateUpdated`.
-        // See also https://github.com/vector-im/riot-web/issues/12546
+        // See also https://github.com/vector-im/element-web/issues/12546
     },
 
     _setFocus: function() {
diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
deleted file mode 100644
index a9cd12199b..0000000000
--- a/src/components/structures/LeftPanel.js
+++ /dev/null
@@ -1,302 +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 from 'react';
-import createReactClass from 'create-react-class';
-import PropTypes from 'prop-types';
-import classNames from 'classnames';
-import { Key } from '../../Keyboard';
-import * as sdk from '../../index';
-import dis from '../../dispatcher';
-import * as VectorConferenceHandler from '../../VectorConferenceHandler';
-import SettingsStore from '../../settings/SettingsStore';
-import {_t} from "../../languageHandler";
-import Analytics from "../../Analytics";
-
-
-const LeftPanel = createReactClass({
-    displayName: 'LeftPanel',
-
-    // NB. If you add props, don't forget to update
-    // shouldComponentUpdate!
-    propTypes: {
-        collapsed: PropTypes.bool.isRequired,
-    },
-
-    getInitialState: function() {
-        return {
-            searchFilter: '',
-            breadcrumbs: false,
-        };
-    },
-
-    // TODO: [REACT-WARNING] Move this to constructor
-    UNSAFE_componentWillMount: function() {
-        this.focusedElement = null;
-
-        this._breadcrumbsWatcherRef = SettingsStore.watchSetting(
-            "breadcrumbs", null, this._onBreadcrumbsChanged);
-        this._tagPanelWatcherRef = SettingsStore.watchSetting(
-            "TagPanel.enableTagPanel", null, () => this.forceUpdate());
-
-        const useBreadcrumbs = !!SettingsStore.getValue("breadcrumbs");
-        Analytics.setBreadcrumbs(useBreadcrumbs);
-        this.setState({breadcrumbs: useBreadcrumbs});
-    },
-
-    componentWillUnmount: function() {
-        SettingsStore.unwatchSetting(this._breadcrumbsWatcherRef);
-        SettingsStore.unwatchSetting(this._tagPanelWatcherRef);
-    },
-
-    shouldComponentUpdate: function(nextProps, nextState) {
-        // MatrixChat will update whenever the user switches
-        // rooms, but propagating this change all the way down
-        // the react tree is quite slow, so we cut this off
-        // here. The RoomTiles listen for the room change
-        // events themselves to know when to update.
-        // We just need to update if any of these things change.
-        if (
-            this.props.collapsed !== nextProps.collapsed ||
-            this.props.disabled !== nextProps.disabled
-        ) {
-            return true;
-        }
-
-        if (this.state.searchFilter !== nextState.searchFilter) {
-            return true;
-        }
-        if (this.state.searchExpanded !== nextState.searchExpanded) {
-            return true;
-        }
-
-        return false;
-    },
-
-    componentDidUpdate(prevProps, prevState) {
-        if (prevState.breadcrumbs !== this.state.breadcrumbs) {
-            Analytics.setBreadcrumbs(this.state.breadcrumbs);
-        }
-    },
-
-    _onBreadcrumbsChanged: function(settingName, roomId, level, valueAtLevel, value) {
-        // Features are only possible at a single level, so we can get away with using valueAtLevel.
-        // The SettingsStore runs on the same tick as the update, so `value` will be wrong.
-        this.setState({breadcrumbs: valueAtLevel});
-
-        // For some reason the setState doesn't trigger a render of the component, so force one.
-        // Probably has to do with the change happening outside of a change detector cycle.
-        this.forceUpdate();
-    },
-
-    _onFocus: function(ev) {
-        this.focusedElement = ev.target;
-    },
-
-    _onBlur: function(ev) {
-        this.focusedElement = null;
-    },
-
-    _onFilterKeyDown: function(ev) {
-        if (!this.focusedElement) return;
-
-        switch (ev.key) {
-            // On enter of rooms filter select and activate first room if such one exists
-            case Key.ENTER: {
-                const firstRoom = ev.target.closest(".mx_LeftPanel").querySelector(".mx_RoomTile");
-                if (firstRoom) {
-                    firstRoom.click();
-                }
-                break;
-            }
-        }
-    },
-
-    _onKeyDown: function(ev) {
-        if (!this.focusedElement) return;
-
-        switch (ev.key) {
-            case Key.ARROW_UP:
-                this._onMoveFocus(ev, true, true);
-                break;
-            case Key.ARROW_DOWN:
-                this._onMoveFocus(ev, false, true);
-                break;
-        }
-    },
-
-    _onMoveFocus: function(ev, up, trap) {
-        let element = this.focusedElement;
-
-        // unclear why this isn't needed
-        // var descending = (up == this.focusDirection) ? this.focusDescending : !this.focusDescending;
-        // this.focusDirection = up;
-
-        let descending = false; // are we currently descending or ascending through the DOM tree?
-        let classes;
-
-        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) {
-                classes = element.classList;
-            }
-        } while (element && !(
-            classes.contains("mx_RoomTile") ||
-            classes.contains("mx_RoomSubList_label") ||
-            classes.contains("mx_LeftPanel_filterRooms")));
-
-        if (element) {
-            ev.stopPropagation();
-            ev.preventDefault();
-            element.focus();
-            this.focusedElement = element;
-        } else if (trap) {
-            // if navigation is via up/down arrow-keys, trap in the widget so it doesn't send to composer
-            ev.stopPropagation();
-            ev.preventDefault();
-        }
-    },
-
-    onSearch: function(term) {
-        this.setState({ searchFilter: term });
-    },
-
-    onSearchCleared: function(source) {
-        if (source === "keyboard") {
-            dis.dispatch({action: 'focus_composer'});
-        }
-        this.setState({searchExpanded: false});
-    },
-
-    collectRoomList: function(ref) {
-        this._roomList = ref;
-    },
-
-    _onSearchFocus: function() {
-        this.setState({searchExpanded: true});
-    },
-
-    _onSearchBlur: function(event) {
-        if (event.target.value.length === 0) {
-            this.setState({searchExpanded: false});
-        }
-    },
-
-    render: function() {
-        const RoomList = sdk.getComponent('rooms.RoomList');
-        const RoomBreadcrumbs = sdk.getComponent('rooms.RoomBreadcrumbs');
-        const TagPanel = sdk.getComponent('structures.TagPanel');
-        const CustomRoomTagPanel = sdk.getComponent('structures.CustomRoomTagPanel');
-        const TopLeftMenuButton = sdk.getComponent('structures.TopLeftMenuButton');
-        const SearchBox = sdk.getComponent('structures.SearchBox');
-        const CallPreview = sdk.getComponent('voip.CallPreview');
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-
-        const tagPanelEnabled = SettingsStore.getValue("TagPanel.enableTagPanel");
-        let tagPanelContainer;
-
-        const isCustomTagsEnabled = SettingsStore.isFeatureEnabled("feature_custom_tags");
-
-        if (tagPanelEnabled) {
-            tagPanelContainer = (<div className="mx_LeftPanel_tagPanelContainer">
-                <TagPanel />
-                { isCustomTagsEnabled ? <CustomRoomTagPanel /> : undefined }
-            </div>);
-        }
-
-        const containerClasses = classNames(
-            "mx_LeftPanel_container", "mx_fadable",
-            {
-                "collapsed": this.props.collapsed,
-                "mx_LeftPanel_container_hasTagPanel": tagPanelEnabled,
-                "mx_fadable_faded": this.props.disabled,
-            },
-        );
-
-        let exploreButton;
-        if (!this.props.collapsed) {
-            exploreButton = (
-                <div className={classNames("mx_LeftPanel_explore", {"mx_LeftPanel_explore_hidden": this.state.searchExpanded})}>
-                    <AccessibleButton onClick={() => dis.dispatch({action: 'view_room_directory'})}>{_t("Explore")}</AccessibleButton>
-                </div>
-            );
-        }
-
-        const searchBox = (<SearchBox
-            className="mx_LeftPanel_filterRooms"
-            enableRoomSearchFocus={true}
-            blurredPlaceholder={ _t('Filter') }
-            placeholder={ _t('Filter rooms…') }
-            onKeyDown={this._onFilterKeyDown}
-            onSearch={ this.onSearch }
-            onCleared={ this.onSearchCleared }
-            onFocus={this._onSearchFocus}
-            onBlur={this._onSearchBlur}
-            collapsed={this.props.collapsed} />);
-
-        let breadcrumbs;
-        if (this.state.breadcrumbs) {
-            breadcrumbs = (<RoomBreadcrumbs collapsed={this.props.collapsed} />);
-        }
-
-        return (
-            <div className={containerClasses}>
-                { tagPanelContainer }
-                <aside className="mx_LeftPanel dark-panel">
-                    <TopLeftMenuButton collapsed={this.props.collapsed} />
-                    { breadcrumbs }
-                    <CallPreview ConferenceHandler={VectorConferenceHandler} />
-                    <div className="mx_LeftPanel_exploreAndFilterRow" onKeyDown={this._onKeyDown} onFocus={this._onFocus} onBlur={this._onBlur}>
-                        { exploreButton }
-                        { searchBox }
-                    </div>
-                    <RoomList
-                        onKeyDown={this._onKeyDown}
-                        onFocus={this._onFocus}
-                        onBlur={this._onBlur}
-                        ref={this.collectRoomList}
-                        resizeNotifier={this.props.resizeNotifier}
-                        collapsed={this.props.collapsed}
-                        searchFilter={this.state.searchFilter}
-                        ConferenceHandler={VectorConferenceHandler} />
-                </aside>
-            </div>
-        );
-    },
-});
-
-export default LeftPanel;
diff --git a/src/components/structures/LeftPanel.tsx b/src/components/structures/LeftPanel.tsx
new file mode 100644
index 0000000000..899dfe222d
--- /dev/null
+++ b/src/components/structures/LeftPanel.tsx
@@ -0,0 +1,430 @@
+/*
+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 { createRef } from "react";
+import TagPanel from "./TagPanel";
+import CustomRoomTagPanel from "./CustomRoomTagPanel";
+import classNames from "classnames";
+import dis from "../../dispatcher/dispatcher";
+import { _t } from "../../languageHandler";
+import RoomList from "../views/rooms/RoomList";
+import { HEADER_HEIGHT } from "../views/rooms/RoomSublist";
+import { Action } from "../../dispatcher/actions";
+import UserMenu from "./UserMenu";
+import RoomSearch from "./RoomSearch";
+import RoomBreadcrumbs from "../views/rooms/RoomBreadcrumbs";
+import { BreadcrumbsStore } from "../../stores/BreadcrumbsStore";
+import { UPDATE_EVENT } from "../../stores/AsyncStore";
+import ResizeNotifier from "../../utils/ResizeNotifier";
+import SettingsStore from "../../settings/SettingsStore";
+import RoomListStore, { LISTS_UPDATE_EVENT } from "../../stores/room-list/RoomListStore";
+import {Key} from "../../Keyboard";
+import IndicatorScrollbar from "../structures/IndicatorScrollbar";
+import AccessibleTooltipButton from "../views/elements/AccessibleTooltipButton";
+import { OwnProfileStore } from "../../stores/OwnProfileStore";
+import { MatrixClientPeg } from "../../MatrixClientPeg";
+import RoomListNumResults from "../views/rooms/RoomListNumResults";
+
+interface IProps {
+    isMinimized: boolean;
+    resizeNotifier: ResizeNotifier;
+}
+
+interface IState {
+    showBreadcrumbs: boolean;
+    showTagPanel: boolean;
+}
+
+// List of CSS classes which should be included in keyboard navigation within the room list
+const cssClasses = [
+    "mx_RoomSearch_input",
+    "mx_RoomSearch_icon", // minimized <RoomSearch />
+    "mx_RoomSublist_headerText",
+    "mx_RoomTile",
+    "mx_RoomSublist_showNButton",
+];
+
+export default class LeftPanel extends React.Component<IProps, IState> {
+    private listContainerRef: React.RefObject<HTMLDivElement> = createRef();
+    private tagPanelWatcherRef: string;
+    private bgImageWatcherRef: string;
+    private focusedElement = null;
+    private isDoingStickyHeaders = false;
+
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            showBreadcrumbs: BreadcrumbsStore.instance.visible,
+            showTagPanel: SettingsStore.getValue('TagPanel.enableTagPanel'),
+        };
+
+        BreadcrumbsStore.instance.on(UPDATE_EVENT, this.onBreadcrumbsUpdate);
+        RoomListStore.instance.on(LISTS_UPDATE_EVENT, this.onBreadcrumbsUpdate);
+        OwnProfileStore.instance.on(UPDATE_EVENT, this.onBackgroundImageUpdate);
+        this.bgImageWatcherRef = SettingsStore.watchSetting(
+            "RoomList.backgroundImage", null, this.onBackgroundImageUpdate);
+        this.tagPanelWatcherRef = SettingsStore.watchSetting("TagPanel.enableTagPanel", null, () => {
+            this.setState({showTagPanel: SettingsStore.getValue("TagPanel.enableTagPanel")});
+        });
+
+        // We watch the middle panel because we don't actually get resized, the middle panel does.
+        // We listen to the noisy channel to avoid choppy reaction times.
+        this.props.resizeNotifier.on("middlePanelResizedNoisy", this.onResize);
+    }
+
+    public componentWillUnmount() {
+        SettingsStore.unwatchSetting(this.tagPanelWatcherRef);
+        SettingsStore.unwatchSetting(this.bgImageWatcherRef);
+        BreadcrumbsStore.instance.off(UPDATE_EVENT, this.onBreadcrumbsUpdate);
+        RoomListStore.instance.off(LISTS_UPDATE_EVENT, this.onBreadcrumbsUpdate);
+        OwnProfileStore.instance.off(UPDATE_EVENT, this.onBackgroundImageUpdate);
+        this.props.resizeNotifier.off("middlePanelResizedNoisy", this.onResize);
+    }
+
+    private onExplore = () => {
+        dis.fire(Action.ViewRoomDirectory);
+    };
+
+    private onBreadcrumbsUpdate = () => {
+        const newVal = BreadcrumbsStore.instance.visible;
+        if (newVal !== this.state.showBreadcrumbs) {
+            this.setState({showBreadcrumbs: newVal});
+
+            // Update the sticky headers too as the breadcrumbs will be popping in or out.
+            if (!this.listContainerRef.current) return; // ignore: no headers to sticky
+            this.handleStickyHeaders(this.listContainerRef.current);
+        }
+    };
+
+    private onBackgroundImageUpdate = () => {
+        // Note: we do this in the LeftPanel as it uses this variable most prominently.
+        const avatarSize = 32; // arbitrary
+        let avatarUrl = OwnProfileStore.instance.getHttpAvatarUrl(avatarSize);
+        const settingBgMxc = SettingsStore.getValue("RoomList.backgroundImage");
+        if (settingBgMxc) {
+            avatarUrl = MatrixClientPeg.get().mxcUrlToHttp(settingBgMxc, avatarSize, avatarSize);
+        }
+        const avatarUrlProp = `url(${avatarUrl})`;
+        if (document.body.style.getPropertyValue("--avatar-url") !== avatarUrlProp) {
+            document.body.style.setProperty("--avatar-url", avatarUrlProp);
+        }
+    };
+
+    private handleStickyHeaders(list: HTMLDivElement) {
+        if (this.isDoingStickyHeaders) return;
+        this.isDoingStickyHeaders = true;
+        window.requestAnimationFrame(() => {
+            this.doStickyHeaders(list);
+            this.isDoingStickyHeaders = false;
+        });
+    }
+
+    private doStickyHeaders(list: HTMLDivElement) {
+        const topEdge = list.scrollTop;
+        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 headerStickyWidth = list.clientWidth - headerRightMargin;
+
+        // We track which styles we want on a target before making the changes to avoid
+        // excessive layout updates.
+        const targetStyles = new Map<HTMLDivElement, {
+            stickyTop?: boolean;
+            stickyBottom?: boolean;
+            makeInvisible?: boolean;
+        }>();
+
+        let lastTopHeader;
+        let firstBottomHeader;
+        for (const sublist of sublists) {
+            const header = sublist.querySelector<HTMLDivElement>(".mx_RoomSublist_stickable");
+            header.style.removeProperty("display"); // always clear display:none first
+
+            // When an element is <=40% off screen, make it take over
+            const offScreenFactor = 0.4;
+            const isOffTop = (sublist.offsetTop + (offScreenFactor * HEADER_HEIGHT)) <= topEdge;
+            const isOffBottom = (sublist.offsetTop + (offScreenFactor * HEADER_HEIGHT)) >= bottomEdge;
+
+            if (isOffTop || sublist === sublists[0]) {
+                targetStyles.set(header, { stickyTop: true });
+                if (lastTopHeader) {
+                    lastTopHeader.style.display = "none";
+                    targetStyles.set(lastTopHeader, { makeInvisible: true });
+                }
+                lastTopHeader = header;
+            } else if (isOffBottom && !firstBottomHeader) {
+                targetStyles.set(header, { stickyBottom: true });
+                firstBottomHeader = header;
+            } else {
+                targetStyles.set(header, {}); // nothing == clear
+            }
+        }
+
+        // Run over the style changes and make them reality. We check to see if we're about to
+        // cause a no-op update, as adding/removing properties that are/aren't there cause
+        // layout updates.
+        for (const header of targetStyles.keys()) {
+            const style = targetStyles.get(header);
+
+            if (style.makeInvisible) {
+                // we will have already removed the 'display: none', so add it back.
+                header.style.display = "none";
+                continue; // nothing else to do, even if sticky somehow
+            }
+
+            if (style.stickyTop) {
+                if (!header.classList.contains("mx_RoomSublist_headerContainer_stickyTop")) {
+                    header.classList.add("mx_RoomSublist_headerContainer_stickyTop");
+                }
+
+                const newTop = `${list.parentElement.offsetTop}px`;
+                if (header.style.top !== newTop) {
+                    header.style.top = newTop;
+                }
+            } else {
+                if (header.classList.contains("mx_RoomSublist_headerContainer_stickyTop")) {
+                    header.classList.remove("mx_RoomSublist_headerContainer_stickyTop");
+                }
+                if (header.style.top) {
+                    header.style.removeProperty('top');
+                }
+            }
+
+            if (style.stickyBottom) {
+                if (!header.classList.contains("mx_RoomSublist_headerContainer_stickyBottom")) {
+                    header.classList.add("mx_RoomSublist_headerContainer_stickyBottom");
+                }
+            } else {
+                if (header.classList.contains("mx_RoomSublist_headerContainer_stickyBottom")) {
+                    header.classList.remove("mx_RoomSublist_headerContainer_stickyBottom");
+                }
+            }
+
+            if (style.stickyTop || style.stickyBottom) {
+                if (!header.classList.contains("mx_RoomSublist_headerContainer_sticky")) {
+                    header.classList.add("mx_RoomSublist_headerContainer_sticky");
+                }
+
+                const newWidth = `${headerStickyWidth}px`;
+                if (header.style.width !== newWidth) {
+                    header.style.width = newWidth;
+                }
+            } else if (!style.stickyTop && !style.stickyBottom) {
+                if (header.classList.contains("mx_RoomSublist_headerContainer_sticky")) {
+                    header.classList.remove("mx_RoomSublist_headerContainer_sticky");
+                }
+                if (header.style.width) {
+                    header.style.removeProperty('width');
+                }
+            }
+        }
+
+        // add appropriate sticky classes to wrapper so it has
+        // the necessary top/bottom padding to put the sticky header in
+        const listWrapper = list.parentElement; // .mx_LeftPanel_roomListWrapper
+        if (lastTopHeader) {
+            listWrapper.classList.add("mx_LeftPanel_roomListWrapper_stickyTop");
+        } else {
+            listWrapper.classList.remove("mx_LeftPanel_roomListWrapper_stickyTop");
+        }
+        if (firstBottomHeader) {
+            listWrapper.classList.add("mx_LeftPanel_roomListWrapper_stickyBottom");
+        } else {
+            listWrapper.classList.remove("mx_LeftPanel_roomListWrapper_stickyBottom");
+        }
+    }
+
+    private onScroll = (ev: React.MouseEvent<HTMLDivElement>) => {
+        const list = ev.target as HTMLDivElement;
+        this.handleStickyHeaders(list);
+    };
+
+    private onResize = () => {
+        if (!this.listContainerRef.current) return; // ignore: no headers to sticky
+        this.handleStickyHeaders(this.listContainerRef.current);
+    };
+
+    private onFocus = (ev: React.FocusEvent) => {
+        this.focusedElement = ev.target;
+    };
+
+    private onBlur = () => {
+        this.focusedElement = null;
+    };
+
+    private onKeyDown = (ev: React.KeyboardEvent) => {
+        if (!this.focusedElement) return;
+
+        switch (ev.key) {
+            case Key.ARROW_UP:
+            case Key.ARROW_DOWN:
+                ev.stopPropagation();
+                ev.preventDefault();
+                this.onMoveFocus(ev.key === Key.ARROW_UP);
+                break;
+        }
+    };
+
+    private onEnter = () => {
+        const firstRoom = this.listContainerRef.current.querySelector<HTMLDivElement>(".mx_RoomTile");
+        if (firstRoom) {
+            firstRoom.click();
+            return true; // to get the field to clear
+        }
+    };
+
+    private onMoveFocus = (up: boolean) => {
+        let element = this.focusedElement;
+
+        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) {
+                classes = element.classList;
+            }
+        } while (element && !cssClasses.some(c => classes.contains(c)));
+
+        if (element) {
+            element.focus();
+            this.focusedElement = element;
+        }
+    };
+
+    private renderHeader(): React.ReactNode {
+        return (
+            <div className="mx_LeftPanel_userHeader">
+                <UserMenu isMinimized={this.props.isMinimized} />
+            </div>
+        );
+    }
+
+    private renderBreadcrumbs(): React.ReactNode {
+        if (this.state.showBreadcrumbs && !this.props.isMinimized) {
+            return (
+                <IndicatorScrollbar
+                    className="mx_LeftPanel_breadcrumbsContainer mx_AutoHideScrollbar"
+                    verticalScrollsHorizontally={true}
+                    // Firefox sometimes makes this element focusable due to
+                    // overflow:scroll;, so force it out of tab order.
+                    tabIndex={-1}
+                >
+                    <RoomBreadcrumbs />
+                </IndicatorScrollbar>
+            );
+        }
+    }
+
+    private renderSearchExplore(): React.ReactNode {
+        return (
+            <div
+                className="mx_LeftPanel_filterContainer"
+                onFocus={this.onFocus}
+                onBlur={this.onBlur}
+                onKeyDown={this.onKeyDown}
+            >
+                <RoomSearch
+                    isMinimized={this.props.isMinimized}
+                    onVerticalArrow={this.onKeyDown}
+                    onEnter={this.onEnter}
+                />
+                <AccessibleTooltipButton
+                    className="mx_LeftPanel_exploreButton"
+                    onClick={this.onExplore}
+                    title={_t("Explore rooms")}
+                />
+            </div>
+        );
+    }
+
+    public render(): React.ReactNode {
+        const tagPanel = !this.state.showTagPanel ? null : (
+            <div className="mx_LeftPanel_tagPanelContainer">
+                <TagPanel/>
+                {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}
+            onResize={this.onResize}
+        />;
+
+        const containerClasses = classNames({
+            "mx_LeftPanel": true,
+            "mx_LeftPanel_hasTagPanel": !!tagPanel,
+            "mx_LeftPanel_minimized": this.props.isMinimized,
+        });
+
+        const roomListClasses = classNames(
+            "mx_LeftPanel_actualRoomListContainer",
+            "mx_AutoHideScrollbar",
+        );
+
+        return (
+            <div className={containerClasses}>
+                {tagPanel}
+                <aside className="mx_LeftPanel_roomListContainer">
+                    {this.renderHeader()}
+                    {this.renderSearchExplore()}
+                    {this.renderBreadcrumbs()}
+                    <RoomListNumResults />
+                    <div className="mx_LeftPanel_roomListWrapper">
+                        <div
+                            className={roomListClasses}
+                            onScroll={this.onScroll}
+                            ref={this.listContainerRef}
+                            // Firefox sometimes makes this element focusable due to
+                            // overflow:scroll;, so force it out of tab order.
+                            tabIndex={-1}
+                        >
+                            {roomList}
+                        </div>
+                    </div>
+                </aside>
+            </div>
+        );
+    }
+}
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 9de2aac8e9..d7f2c73a0b 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -19,7 +19,6 @@ limitations under the License.
 import * as React from 'react';
 import * as PropTypes from 'prop-types';
 import { MatrixClient } from 'matrix-js-sdk/src/client';
-import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
 import { DragDropContext } from 'react-beautiful-dnd';
 
 import {Key, isOnlyCtrlOrCmdKeyEvent, isOnlyCtrlOrCmdIgnoreShiftKeyEvent} from '../../Keyboard';
@@ -27,11 +26,10 @@ import PageTypes from '../../PageTypes';
 import CallMediaHandler from '../../CallMediaHandler';
 import { fixupColorFonts } from '../../utils/FontManager';
 import * as sdk from '../../index';
-import dis from '../../dispatcher';
+import dis from '../../dispatcher/dispatcher';
 import sessionStore from '../../stores/SessionStore';
-import {MatrixClientPeg, MatrixClientCreds} from '../../MatrixClientPeg';
+import {MatrixClientPeg, IMatrixClientCreds} from '../../MatrixClientPeg';
 import SettingsStore from "../../settings/SettingsStore";
-import RoomListStore from "../../stores/RoomListStore";
 
 import TagOrderActions from '../../actions/TagOrderActions';
 import RoomListActions from '../../actions/RoomListActions';
@@ -42,6 +40,23 @@ import * as KeyboardShortcuts from "../../accessibility/KeyboardShortcuts";
 import HomePage from "./HomePage";
 import ResizeNotifier from "../../utils/ResizeNotifier";
 import PlatformPeg from "../../PlatformPeg";
+import { DefaultTagID } from "../../stores/room-list/models";
+import {
+    showToast as showSetPasswordToast,
+    hideToast as hideSetPasswordToast
+} from "../../toasts/SetPasswordToast";
+import {
+    showToast as showServerLimitToast,
+    hideToast as hideServerLimitToast
+} from "../../toasts/ServerLimitToast";
+import { Action } from "../../dispatcher/actions";
+import LeftPanel from "./LeftPanel";
+import CallContainer from '../views/voip/CallContainer';
+import { ViewRoomDeltaPayload } from "../../dispatcher/payloads/ViewRoomDeltaPayload";
+import RoomListStore from "../../stores/room-list/RoomListStore";
+import NonUrgentToastContainer from "./NonUrgentToastContainer";
+import { ToggleRightPanelPayload } from "../../dispatcher/payloads/ToggleRightPanelPayload";
+
 // 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.
 // NB. this is just for server notices rather than pinned messages in general.
@@ -56,7 +71,7 @@ function canElementReceiveInput(el) {
 
 interface IProps {
     matrixClient: MatrixClient;
-    onRegistered: (credentials: MatrixClientCreds) => Promise<MatrixClient>;
+    onRegistered: (credentials: IMatrixClientCreds) => Promise<MatrixClient>;
     viaServers?: string[];
     hideToSRUsers: boolean;
     resizeNotifier: ResizeNotifier;
@@ -64,10 +79,6 @@ interface IProps {
     initialEventPixelOffset: number;
     leftDisabled: boolean;
     rightDisabled: boolean;
-    showCookieBar: boolean;
-    hasNewVersion: boolean;
-    userHasGeneratedPassword: boolean;
-    showNotifierToolbar: boolean;
     page_type: string;
     autoJoin: boolean;
     thirdPartyInvite?: object;
@@ -75,7 +86,6 @@ interface IProps {
     currentRoomId: string;
     ConferenceHandler?: object;
     collapseLhs: boolean;
-    checkingForUpdate: boolean;
     config: {
         piwik: {
             policyUrl: string;
@@ -85,19 +95,26 @@ interface IProps {
     currentUserId?: string;
     currentGroupId?: string;
     currentGroupIsNew?: boolean;
-    version?: string;
-    newVersion?: string;
-    newVersionReleaseNotes?: string;
 }
+
+interface IUsageLimit {
+    limit_type: "monthly_active_user" | string;
+    admin_contact?: string;
+}
+
 interface IState {
     mouseDown?: {
         x: number;
         y: number;
     };
-    syncErrorData: any;
+    syncErrorData?: {
+        error: {
+            data: IUsageLimit;
+            errcode: string;
+        };
+    };
+    usageLimitEventContent?: IUsageLimit;
     useCompactLayout: boolean;
-    serverNoticeEvents: MatrixEvent[];
-    userHasGeneratedPassword: boolean;
 }
 
 /**
@@ -109,7 +126,7 @@ interface IState {
  *
  * Components mounted below us can access the matrix client via the react context.
  */
-class LoggedInView extends React.PureComponent<IProps, IState> {
+class LoggedInView extends React.Component<IProps, IState> {
     static displayName = 'LoggedInView';
 
     static propTypes = {
@@ -132,6 +149,7 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
     protected readonly _resizeContainer: React.RefObject<ResizeHandle>;
     protected readonly _sessionStore: sessionStore;
     protected readonly _sessionStoreToken: { remove: () => void };
+    protected readonly _compactLayoutWatcherRef: string;
     protected resizer: Resizer;
 
     constructor(props, context) {
@@ -140,11 +158,8 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
         this.state = {
             mouseDown: undefined,
             syncErrorData: undefined,
-            userHasGeneratedPassword: false,
             // use compact timeline view
             useCompactLayout: SettingsStore.getValue('useCompactLayout'),
-            // any currently active server notice events
-            serverNoticeEvents: [],
         };
 
         // stash the MatrixClient in case we log out before we are unmounted
@@ -166,6 +181,10 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
         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();
@@ -178,23 +197,12 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
         this._loadResizerPreferences();
     }
 
-    componentDidUpdate(prevProps, prevState) {
-        // attempt to guess when a banner was opened or closed
-        if (
-            (prevProps.showCookieBar !== this.props.showCookieBar) ||
-            (prevProps.hasNewVersion !== this.props.hasNewVersion) ||
-            (prevState.userHasGeneratedPassword !== this.state.userHasGeneratedPassword) ||
-            (prevProps.showNotifierToolbar !== this.props.showNotifierToolbar)
-        ) {
-            this.props.resizeNotifier.notifyBannersChanged();
-        }
-    }
-
     componentWillUnmount() {
         document.removeEventListener('keydown', this._onNativeKeyDown, false);
         this._matrixClient.removeListener("accountData", this.onAccountData);
         this._matrixClient.removeListener("sync", this.onSync);
         this._matrixClient.removeListener("RoomState.events", this.onRoomStateEvents);
+        SettingsStore.unwatchSetting(this._compactLayoutWatcherRef);
         if (this._sessionStoreToken) {
             this._sessionStoreToken.remove();
         }
@@ -219,9 +227,11 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
     };
 
     _setStateFromSessionStore = () => {
-        this.setState({
-            userHasGeneratedPassword: Boolean(this._sessionStore.getCachedPassword()),
-        });
+        if (this._sessionStore.getCachedPassword()) {
+            showSetPasswordToast();
+        } else {
+            hideSetPasswordToast();
+        }
     };
 
     _createResizer() {
@@ -262,16 +272,17 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
     }
 
     onAccountData = (event) => {
-        if (event.getType() === "im.vector.web.settings") {
-            this.setState({
-                useCompactLayout: event.getContent().useCompactLayout,
-            });
-        }
         if (event.getType() === "m.ignored_user_list") {
             dis.dispatch({action: "ignore_state_changed"});
         }
     };
 
+    onCompactLayoutChanged = (setting, roomId, level, valueAtLevel, newValue) => {
+        this.setState({
+            useCompactLayout: valueAtLevel,
+        });
+    };
+
     onSync = (syncState, oldSyncState, data) => {
         const oldErrCode = (
             this.state.syncErrorData &&
@@ -293,22 +304,37 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
 
         if (oldSyncState === 'PREPARED' && syncState === 'SYNCING') {
             this._updateServerNoticeEvents();
+        } else {
+            this._calculateServerLimitToast(this.state.syncErrorData, this.state.usageLimitEventContent);
         }
     };
 
     onRoomStateEvents = (ev, state) => {
-        const roomLists = RoomListStore.getRoomLists();
-        if (roomLists['m.server_notice'] && roomLists['m.server_notice'].some(r => r.roomId === ev.getRoomId())) {
+        const serverNoticeList = RoomListStore.instance.orderedLists[DefaultTagID.ServerNotice];
+        if (serverNoticeList && serverNoticeList.some(r => r.roomId === ev.getRoomId())) {
             this._updateServerNoticeEvents();
         }
     };
 
-    _updateServerNoticeEvents = async () => {
-        const roomLists = RoomListStore.getRoomLists();
-        if (!roomLists['m.server_notice']) return [];
+    _calculateServerLimitToast(syncErrorData: IState["syncErrorData"], usageLimitEventContent?: IUsageLimit) {
+        const error = syncErrorData && syncErrorData.error && syncErrorData.error.errcode === "M_RESOURCE_LIMIT_EXCEEDED";
+        if (error) {
+            usageLimitEventContent = syncErrorData.error.data;
+        }
 
-        const pinnedEvents = [];
-        for (const room of roomLists['m.server_notice']) {
+        if (usageLimitEventContent) {
+            showServerLimitToast(usageLimitEventContent.limit_type, usageLimitEventContent.admin_contact, error);
+        } else {
+            hideServerLimitToast();
+        }
+    }
+
+    _updateServerNoticeEvents = async () => {
+        const serverNoticeList = RoomListStore.instance.orderedLists[DefaultTagID.ServerNotice];
+        if (!serverNoticeList) return [];
+
+        const events = [];
+        for (const room of serverNoticeList) {
             const pinStateEvent = room.currentState.getStateEvents("m.room.pinned_events", "");
 
             if (!pinStateEvent || !pinStateEvent.getContent().pinned) continue;
@@ -317,12 +343,19 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
             for (const eventId of pinnedEventIds) {
                 const timeline = await this._matrixClient.getEventTimeline(room.getUnfilteredTimelineSet(), eventId, 0);
                 const event = timeline.getEvents().find(ev => ev.getId() === eventId);
-                if (event) pinnedEvents.push(event);
+                if (event) events.push(event);
             }
         }
-        this.setState({
-            serverNoticeEvents: pinnedEvents,
+
+        const usageLimitEvent = events.find((e) => {
+            return (
+                e && e.getType() === 'm.room.message' &&
+                e.getContent()['server_notice_type'] === 'm.server_notice.usage_limit_reached'
+            );
         });
+        const usageLimitEventContent = usageLimitEvent && usageLimitEvent.getContent();
+        this._calculateServerLimitToast(this.state.syncErrorData, usageLimitEventContent);
+        this.setState({ usageLimitEventContent });
     };
 
     _onPaste = (ev) => {
@@ -337,7 +370,7 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
             // refocusing during a paste event will make the
             // paste end up in the newly focused element,
             // so dispatch synchronously before paste happens
-            dis.dispatch({action: 'focus_composer'}, true);
+            dis.fire(Action.FocusComposer, true);
         }
     };
 
@@ -379,20 +412,6 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
     };
 
     _onKeyDown = (ev) => {
-            /*
-            // Remove this for now as ctrl+alt = alt-gr so this breaks keyboards which rely on alt-gr for numbers
-            // Will need to find a better meta key if anyone actually cares about using this.
-            if (ev.altKey && ev.ctrlKey && ev.keyCode > 48 && ev.keyCode < 58) {
-                dis.dispatch({
-                    action: 'view_indexed_room',
-                    roomIndex: ev.keyCode - 49,
-                });
-                ev.stopPropagation();
-                ev.preventDefault();
-                return;
-            }
-            */
-
         let handled = false;
         const ctrlCmdOnly = isOnlyCtrlOrCmdKeyEvent(ev);
         const hasModifier = ev.altKey || ev.ctrlKey || ev.metaKey || ev.shiftKey;
@@ -429,9 +448,7 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
                 // composer, so CTRL+` it is
 
                 if (ctrlCmdOnly) {
-                    dis.dispatch({
-                        action: 'toggle_top_left_menu',
-                    });
+                    dis.fire(Action.ToggleUserMenu);
                     handled = true;
                 }
                 break;
@@ -446,8 +463,8 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
             case Key.ARROW_UP:
             case Key.ARROW_DOWN:
                 if (ev.altKey && !ev.ctrlKey && !ev.metaKey) {
-                    dis.dispatch({
-                        action: 'view_room_delta',
+                    dis.dispatch<ViewRoomDeltaPayload>({
+                        action: Action.ViewRoomDelta,
                         delta: ev.key === Key.ARROW_UP ? -1 : 1,
                         unread: ev.shiftKey,
                     });
@@ -457,8 +474,8 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
 
             case Key.PERIOD:
                 if (ctrlCmdOnly && (this.props.page_type === "room_view" || this.props.page_type === "group_view")) {
-                    dis.dispatch({
-                        action: 'toggle_right_panel',
+                    dis.dispatch<ToggleRightPanelPayload>({
+                        action: Action.ToggleRightPanel,
                         type: this.props.page_type === "room_view" ? "room" : "group",
                     });
                     handled = true;
@@ -487,7 +504,7 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
 
             if (!isClickShortcut && ev.key !== Key.TAB && !canElementReceiveInput(ev.target)) {
                 // synchronous dispatch so we focus before key generates input
-                dis.dispatch({action: 'focus_composer'}, true);
+                dis.fire(Action.FocusComposer, true);
                 ev.stopPropagation();
                 // we should *not* preventDefault() here as
                 // that would prevent typing in the now-focussed composer
@@ -579,7 +596,7 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
         const maxRadius = 5; // People shouldn't be straying too far, hopefully
 
         // Note: we track how far the user moved their mouse to help
-        // combat against https://github.com/vector-im/riot-web/issues/7158
+        // combat against https://github.com/vector-im/element-web/issues/7158
 
         if (distance < maxRadius) {
             // This is probably a real click, and not a drag
@@ -592,18 +609,11 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
     };
 
     render() {
-        const LeftPanel = sdk.getComponent('structures.LeftPanel');
         const RoomView = sdk.getComponent('structures.RoomView');
         const UserView = sdk.getComponent('structures.UserView');
         const GroupView = sdk.getComponent('structures.GroupView');
         const MyGroups = sdk.getComponent('structures.MyGroups');
         const ToastContainer = sdk.getComponent('structures.ToastContainer');
-        const MatrixToolbar = sdk.getComponent('globals.MatrixToolbar');
-        const CookieBar = sdk.getComponent('globals.CookieBar');
-        const NewVersionBar = sdk.getComponent('globals.NewVersionBar');
-        const UpdateCheckBar = sdk.getComponent('globals.UpdateCheckBar');
-        const PasswordNagBar = sdk.getComponent('globals.PasswordNagBar');
-        const ServerLimitBar = sdk.getComponent('globals.ServerLimitBar');
 
         let pageElement;
 
@@ -647,50 +657,18 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
                 break;
         }
 
-        const usageLimitEvent = this.state.serverNoticeEvents.find((e) => {
-            return (
-                e && e.getType() === 'm.room.message' &&
-                e.getContent()['server_notice_type'] === 'm.server_notice.usage_limit_reached'
-            );
-        });
-
-        let topBar;
-        if (this.state.syncErrorData && this.state.syncErrorData.error.errcode === 'M_RESOURCE_LIMIT_EXCEEDED') {
-            topBar = <ServerLimitBar kind='hard'
-                adminContact={this.state.syncErrorData.error.data.admin_contact}
-                limitType={this.state.syncErrorData.error.data.limit_type}
-            />;
-        } else if (usageLimitEvent) {
-            topBar = <ServerLimitBar kind='soft'
-                adminContact={usageLimitEvent.getContent().admin_contact}
-                limitType={usageLimitEvent.getContent().limit_type}
-            />;
-        } else if (this.props.showCookieBar &&
-            this.props.config.piwik &&
-            navigator.doNotTrack !== "1"
-        ) {
-            const policyUrl = this.props.config.piwik.policyUrl || null;
-            topBar = <CookieBar policyUrl={policyUrl} />;
-        } else if (this.props.hasNewVersion) {
-            topBar = <NewVersionBar version={this.props.version} newVersion={this.props.newVersion}
-                                    releaseNotes={this.props.newVersionReleaseNotes}
-            />;
-        } else if (this.props.checkingForUpdate) {
-            topBar = <UpdateCheckBar {...this.props.checkingForUpdate} />;
-        } else if (this.state.userHasGeneratedPassword) {
-            topBar = <PasswordNagBar />;
-        } else if (this.props.showNotifierToolbar) {
-            topBar = <MatrixToolbar />;
-        }
-
         let bodyClasses = 'mx_MatrixChat';
-        if (topBar) {
-            bodyClasses += ' mx_MatrixChat_toolbarShowing';
-        }
         if (this.state.useCompactLayout) {
             bodyClasses += ' mx_MatrixChat_useCompactLayout';
         }
 
+        const leftPanel = (
+            <LeftPanel
+                isMinimized={this.props.collapseLhs || false}
+                resizeNotifier={this.props.resizeNotifier}
+            />
+        );
+
         return (
             <MatrixClientContext.Provider value={this._matrixClient}>
                 <div
@@ -701,20 +679,17 @@ class LoggedInView extends React.PureComponent<IProps, IState> {
                     onMouseDown={this._onMouseDown}
                     onMouseUp={this._onMouseUp}
                 >
-                    { topBar }
                     <ToastContainer />
                     <DragDropContext onDragEnd={this._onDragEnd}>
                         <div ref={this._resizeContainer} className={bodyClasses}>
-                            <LeftPanel
-                                resizeNotifier={this.props.resizeNotifier}
-                                collapsed={this.props.collapseLhs || false}
-                                disabled={this.props.leftDisabled}
-                            />
+                            { leftPanel }
                             <ResizeHandle />
                             { pageElement }
                         </div>
                     </DragDropContext>
                 </div>
+                <CallContainer />
+                <NonUrgentToastContainer />
             </MatrixClientContext.Provider>
         );
     }
diff --git a/src/components/structures/MainSplit.js b/src/components/structures/MainSplit.js
index 7c66f21a04..800ed76bb9 100644
--- a/src/components/structures/MainSplit.js
+++ b/src/components/structures/MainSplit.js
@@ -16,77 +16,24 @@ limitations under the License.
 */
 
 import React from 'react';
-import ResizeHandle from '../views/elements/ResizeHandle';
-import {Resizer, FixedDistributor} from '../../resizer';
+import { Resizable } from 're-resizable';
 
 export default class MainSplit extends React.Component {
-    constructor(props) {
-        super(props);
-        this._setResizeContainerRef = this._setResizeContainerRef.bind(this);
-        this._onResized = this._onResized.bind(this);
+    _onResized = (event, direction, refToElement, delta) => {
+        window.localStorage.setItem("mx_rhs_size", this._loadSidePanelSize().width + delta.width);
     }
 
-    _onResized(size) {
-        window.localStorage.setItem("mx_rhs_size", size);
-        if (this.props.resizeNotifier) {
-            this.props.resizeNotifier.notifyRightHandleResized();
-        }
-    }
+    _loadSidePanelSize() {
+        let rhsSize = parseInt(window.localStorage.getItem("mx_rhs_size"), 10);
 
-    _createResizer() {
-        const classNames = {
-            handle: "mx_ResizeHandle",
-            vertical: "mx_ResizeHandle_vertical",
-            reverse: "mx_ResizeHandle_reverse",
-        };
-        const resizer = new Resizer(
-            this.resizeContainer,
-            FixedDistributor,
-            {onResized: this._onResized},
-        );
-        resizer.setClassNames(classNames);
-        let rhsSize = window.localStorage.getItem("mx_rhs_size");
-        if (rhsSize !== null) {
-            rhsSize = parseInt(rhsSize, 10);
-        } else {
+        if (isNaN(rhsSize)) {
             rhsSize = 350;
         }
-        resizer.forHandleAt(0).resize(rhsSize);
 
-        resizer.attach();
-        this.resizer = resizer;
-    }
-
-    _setResizeContainerRef(div) {
-        this.resizeContainer = div;
-    }
-
-    componentDidMount() {
-        if (this.props.panel) {
-            this._createResizer();
-        }
-    }
-
-    componentWillUnmount() {
-        if (this.resizer) {
-            this.resizer.detach();
-            this.resizer = null;
-        }
-    }
-
-    componentDidUpdate(prevProps) {
-        const wasPanelSet = this.props.panel && !prevProps.panel;
-        const wasPanelCleared = !this.props.panel && prevProps.panel;
-
-        if (this.resizeContainer && wasPanelSet) {
-            // The resizer can only be created when **both** expanded and the panel is
-            // set. Once both are true, the container ref will mount, which is required
-            // for the resizer to work.
-            this._createResizer();
-        } else if (this.resizer && wasPanelCleared) {
-            this.resizer.detach();
-            this.resizer = null;
-        }
+        return {
+            height: "100%",
+            width: rhsSize,
+        };
     }
 
     render() {
@@ -97,13 +44,29 @@ export default class MainSplit extends React.Component {
 
         let children;
         if (hasResizer) {
-            children = <React.Fragment>
-                <ResizeHandle reverse={true} />
+            children = <Resizable
+                defaultSize={this._loadSidePanelSize()}
+                minWidth={264}
+                maxWidth="50%"
+                enable={{
+                    top: false,
+                    right: false,
+                    bottom: false,
+                    left: true,
+                    topRight: false,
+                    bottomRight: false,
+                    bottomLeft: false,
+                    topLeft: false,
+                }}
+                onResizeStop={this._onResized}
+                className="mx_RightPanel_ResizeWrapper"
+                handleClasses={{left: "mx_RightPanel_ResizeHandle"}}
+            >
                 { panelView }
-            </React.Fragment>;
+            </Resizable>;
         }
 
-        return <div className="mx_MainSplit" ref={hasResizer ? this._setResizeContainerRef : undefined}>
+        return <div className="mx_MainSplit">
             { bodyView }
             { children }
         </div>;
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 05354fa5f2..ce96847d28 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -17,12 +17,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, {createRef} from 'react';
-import {InvalidStoreError} from "matrix-js-sdk/src/errors";
-import {RoomMember} from "matrix-js-sdk/src/models/room-member";
-import {MatrixEvent} from "matrix-js-sdk/src/models/event";
-import { isCryptoAvailable } from 'matrix-js-sdk/src/crypto';
-
+import React, { createRef } from 'react';
+// @ts-ignore - XXX: no idea why this import fails
+import * as Matrix from "matrix-js-sdk";
+import { InvalidStoreError } from "matrix-js-sdk/src/errors";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 // focus-visible is a Polyfill for the :focus-visible CSS pseudo-attribute used by _AccessibleButton.scss
 import 'focus-visible';
 // what-input helps improve keyboard accessibility
@@ -30,17 +30,17 @@ import 'what-input';
 
 import Analytics from "../../Analytics";
 import { DecryptionFailureTracker } from "../../DecryptionFailureTracker";
-import {MatrixClientPeg} from "../../MatrixClientPeg";
+import { MatrixClientPeg } from "../../MatrixClientPeg";
 import PlatformPeg from "../../PlatformPeg";
 import SdkConfig from "../../SdkConfig";
 import * as RoomListSorter from "../../RoomListSorter";
-import dis from "../../dispatcher";
+import dis from "../../dispatcher/dispatcher";
 import Notifier from '../../Notifier';
 
 import Modal from "../../Modal";
 import Tinter from "../../Tinter";
 import * as sdk from '../../index';
-import { showStartChatInviteDialog, showRoomInviteDialog } from '../../RoomInvite';
+import { showRoomInviteDialog, showStartChatInviteDialog } from '../../RoomInvite';
 import * as Rooms from '../../Rooms';
 import linkifyMatrix from "../../linkify-matrix";
 import * as Lifecycle from '../../Lifecycle';
@@ -50,23 +50,32 @@ import PageTypes from '../../PageTypes';
 import { getHomePageUrl } from '../../utils/pages';
 
 import createRoom from "../../createRoom";
-import KeyRequestHandler from '../../KeyRequestHandler';
-import { _t, getCurrentLanguage } from '../../languageHandler';
-import SettingsStore, {SettingLevel} from "../../settings/SettingsStore";
+import {_t, _td, getCurrentLanguage} from '../../languageHandler';
+import SettingsStore from "../../settings/SettingsStore";
 import ThemeController from "../../settings/controllers/ThemeController";
 import { startAnyRegistrationFlow } from "../../Registration.js";
 import { messageForSyncError } from '../../utils/ErrorUtils';
 import ResizeNotifier from "../../utils/ResizeNotifier";
-import { ValidatedServerConfig } from "../../utils/AutoDiscoveryUtils";
-import AutoDiscoveryUtils from "../../utils/AutoDiscoveryUtils";
+import AutoDiscoveryUtils, { ValidatedServerConfig } from "../../utils/AutoDiscoveryUtils";
 import DMRoomMap from '../../utils/DMRoomMap';
-import { countRoomsWithNotif } from '../../RoomNotifs';
-import { ThemeWatcher } from "../../theme";
+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 } from "../../utils/promise";
 import ToastStore from "../../stores/ToastStore";
 import * as StorageManager from "../../utils/StorageManager";
 import type LoggedInViewType from "./LoggedInView";
+import { ViewUserPayload } from "../../dispatcher/payloads/ViewUserPayload";
+import { Action } from "../../dispatcher/actions";
+import {
+    showToast as showAnalyticsToast,
+    hideToast as hideAnalyticsToast
+} from "../../toasts/AnalyticsToast";
+import {showToast as showNotificationsToast} from "../../toasts/DesktopNotificationsToast";
+import { OpenToTabPayload } from "../../dispatcher/payloads/OpenToTabPayload";
+import ErrorDialog from "../views/dialogs/ErrorDialog";
+import { RoomNotificationStateStore } from "../../stores/notifications/RoomNotificationStateStore";
+import { SettingLevel } from "../../settings/SettingLevel";
 
 /** constants for MatrixChat.state.view */
 export enum Views {
@@ -107,7 +116,7 @@ export enum Views {
 // re-dispatched. NOTE: some actions are non-trivial and would require
 // re-factoring to be included in this list in future.
 const ONBOARDING_FLOW_STARTERS = [
-    'view_user_settings',
+    Action.ViewUserSettings,
     'view_create_chat',
     'view_create_room',
     'view_create_group',
@@ -145,9 +154,9 @@ interface IProps { // TODO type things better
     // Represents the screen to display as a result of parsing the initial window.location
     initialScreenAfterLogin?: IScreen;
     // displayname, if any, to set on the device when logging in/registering.
-    defaultDeviceDisplayName?: string,
+    defaultDeviceDisplayName?: string;
     // A function that makes a registration URL
-    makeRegistrationUrl: (object) => string,
+    makeRegistrationUrl: (object) => string;
 }
 
 interface IState {
@@ -168,12 +177,6 @@ interface IState {
     leftDisabled: boolean;
     middleDisabled: boolean;
     // the right panel's disabled state is tracked in its store.
-    version?: string;
-    newVersion?: string;
-    hasNewVersion: boolean;
-    newVersionReleaseNotes?: string;
-    checkingForUpdate?: string; // updateCheckStatusEnum
-    showCookieBar: boolean;
     // Parameters used in the registration dance with the IS
     register_client_secret?: string;
     register_session_id?: string;
@@ -183,7 +186,6 @@ interface IState {
     hideToSRUsers: boolean;
     syncError?: Error;
     resizeNotifier: ResizeNotifier;
-    showNotifierToolbar: boolean;
     serverConfig?: ValidatedServerConfig;
     ready: boolean;
     thirdPartyInvite?: object;
@@ -216,6 +218,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     private readonly loggedInView: React.RefObject<LoggedInViewType>;
     private readonly dispatcherRef: any;
     private readonly themeWatcher: ThemeWatcher;
+    private readonly fontWatcher: FontWatcher;
 
     constructor(props, context) {
         super(props, context);
@@ -226,17 +229,10 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             leftDisabled: false,
             middleDisabled: false,
 
-            hasNewVersion: false,
-            newVersionReleaseNotes: null,
-            checkingForUpdate: null,
-
-            showCookieBar: false,
-
             hideToSRUsers: false,
 
             syncError: null, // If the current syncing status is ERROR, the error object, otherwise null.
             resizeNotifier: new ResizeNotifier(),
-            showNotifierToolbar: false,
             ready: false,
         };
 
@@ -283,8 +279,11 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         this.accountPasswordTimer = null;
 
         this.dispatcherRef = dis.register(this.onAction);
+
         this.themeWatcher = new ThemeWatcher();
+        this.fontWatcher = new FontWatcher();
         this.themeWatcher.start();
+        this.fontWatcher.start();
 
         this.focusComposer = false;
 
@@ -334,12 +333,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             });
         }
 
-        if (SettingsStore.getValue("showCookieBar")) {
-            this.setState({
-                showCookieBar: true,
-            });
-        }
-
         if (SettingsStore.getValue("analyticsOptIn")) {
             Analytics.enable();
         }
@@ -358,7 +351,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             Analytics.trackPageChange(durationMs);
         }
         if (this.focusComposer) {
-            dis.dispatch({action: 'focus_composer'});
+            dis.fire(Action.FocusComposer);
             this.focusComposer = false;
         }
     }
@@ -367,6 +360,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         Lifecycle.stopMatrixClient();
         dis.unregister(this.dispatcherRef);
         this.themeWatcher.stop();
+        this.fontWatcher.stop();
         window.removeEventListener('resize', this.handleResize);
         this.state.resizeNotifier.removeListener("middlePanelResized", this.dispatchTimelineResize);
 
@@ -421,7 +415,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             return;
         }
         this.pageChanging = true;
-        performance.mark('riot_MatrixChat_page_change_start');
+        performance.mark('element_MatrixChat_page_change_start');
     }
 
     stopPageChangeTimer() {
@@ -433,15 +427,15 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             return;
         }
         this.pageChanging = false;
-        performance.mark('riot_MatrixChat_page_change_stop');
+        performance.mark('element_MatrixChat_page_change_stop');
         performance.measure(
-            'riot_MatrixChat_page_change_delta',
-            'riot_MatrixChat_page_change_start',
-            'riot_MatrixChat_page_change_stop',
+            'element_MatrixChat_page_change_delta',
+            'element_MatrixChat_page_change_start',
+            'element_MatrixChat_page_change_stop',
         );
-        performance.clearMarks('riot_MatrixChat_page_change_start');
-        performance.clearMarks('riot_MatrixChat_page_change_stop');
-        const measurement = performance.getEntriesByName('riot_MatrixChat_page_change_delta').pop();
+        performance.clearMarks('element_MatrixChat_page_change_start');
+        performance.clearMarks('element_MatrixChat_page_change_stop');
+        const measurement = performance.getEntriesByName('element_MatrixChat_page_change_delta').pop();
 
         // In practice, sometimes the entries list is empty, so we get no measurement
         if (!measurement) return null;
@@ -468,7 +462,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
     onAction = (payload) => {
         // console.log(`MatrixClientPeg.onAction: ${payload.action}`);
-        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
 
         // Start the onboarding process for certain actions
@@ -562,6 +555,9 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             case 'leave_room':
                 this.leaveRoom(payload.room_id);
                 break;
+            case 'forget_room':
+                this.forgetRoom(payload.room_id);
+                break;
             case 'reject_invite':
                 Modal.createTrackedDialog('Reject invitation', '', QuestionDialog, {
                     title: _t('Reject invitation'),
@@ -604,33 +600,30 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 }
                 break;
             }
-            case 'view_prev_room':
-                this.viewNextRoom(-1);
-                break;
             case 'view_next_room':
                 this.viewNextRoom(1);
                 break;
-            case 'view_indexed_room':
-                this.viewIndexedRoom(payload.roomIndex);
-                break;
-            case 'view_user_settings': {
+            case Action.ViewUserSettings: {
+                const tabPayload = payload as OpenToTabPayload;
                 const UserSettingsDialog = sdk.getComponent("dialogs.UserSettingsDialog");
-                Modal.createTrackedDialog('User settings', '', UserSettingsDialog, {},
-                    /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
+                Modal.createTrackedDialog('User settings', '', UserSettingsDialog,
+                    {initialTabId: tabPayload.initialTabId},
+                    /*className=*/null, /*isPriority=*/false, /*isStatic=*/true
+                );
 
                 // View the welcome or home page if we need something to look at
                 this.viewSomethingBehindModal();
                 break;
             }
             case 'view_create_room':
-                this.createRoom();
+                this.createRoom(payload.public);
                 break;
             case 'view_create_group': {
                 const CreateGroupDialog = sdk.getComponent("dialogs.CreateGroupDialog");
                 Modal.createTrackedDialog('Create Community', '', CreateGroupDialog);
                 break;
             }
-            case 'view_room_directory': {
+            case Action.ViewRoomDirectory: {
                 const RoomDirectory = sdk.getComponent("structures.RoomDirectory");
                 Modal.createTrackedDialog('Room directory', '', RoomDirectory, {},
                     'mx_RoomDirectory_dialogWrapper', false, true);
@@ -680,18 +673,19 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     dis.dispatch({action: 'view_my_groups'});
                 }
                 break;
-            case 'notifier_enabled':
-                this.setState({showNotifierToolbar: Notifier.shouldShowToolbar()});
-                break;
             case 'hide_left_panel':
                 this.setState({
                     collapseLhs: true,
+                }, () => {
+                    this.state.resizeNotifier.notifyLeftHandleResized();
                 });
                 break;
             case 'focus_room_filter': // for CtrlOrCmd+K to work by expanding the left panel first
             case 'show_left_panel':
                 this.setState({
                     collapseLhs: false,
+                }, () => {
+                    this.state.resizeNotifier.notifyLeftHandleResized();
                 });
                 break;
             case 'panel_disable': {
@@ -730,15 +724,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             case 'client_started':
                 this.onClientStarted();
                 break;
-            case 'new_version':
-                this.onVersion(
-                    payload.currentVersion, payload.newVersion,
-                    payload.releaseNotes,
-                );
-                break;
-            case 'check_updates':
-                this.setState({ checkingForUpdate: payload.value });
-                break;
             case 'send_event':
                 this.onSendEvent(payload.room_id, payload.event);
                 break;
@@ -755,19 +740,13 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             case 'accept_cookies':
                 SettingsStore.setValue("analyticsOptIn", null, SettingLevel.DEVICE, true);
                 SettingsStore.setValue("showCookieBar", null, SettingLevel.DEVICE, false);
-
-                this.setState({
-                    showCookieBar: false,
-                });
+                hideAnalyticsToast();
                 Analytics.enable();
                 break;
             case 'reject_cookies':
                 SettingsStore.setValue("analyticsOptIn", null, SettingLevel.DEVICE, false);
                 SettingsStore.setValue("showCookieBar", null, SettingLevel.DEVICE, false);
-
-                this.setState({
-                    showCookieBar: false,
-                });
+                hideAnalyticsToast();
                 break;
         }
     };
@@ -835,19 +814,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         });
     }
 
-    // TODO: Move to RoomViewStore
-    private viewIndexedRoom(roomIndex: number) {
-        const allRooms = RoomListSorter.mostRecentActivityFirst(
-            MatrixClientPeg.get().getRooms(),
-        );
-        if (allRooms[roomIndex]) {
-            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
@@ -926,9 +892,20 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         });
     }
 
-    private viewGroup(payload) {
+    private async viewGroup(payload) {
         const groupId = payload.group_id;
+
+        // Wait for the first sync to complete
+        if (!this.firstSyncComplete) {
+            if (!this.firstSyncPromise) {
+                console.warn('Cannot view a group before first sync. group_id:', groupId);
+                return;
+            }
+            await this.firstSyncPromise.promise;
+        }
+
         this.setState({
+            view: Views.LOGGED_IN,
             currentGroupId: groupId,
             currentGroupIsNew: payload.group_is_new,
         });
@@ -1012,9 +989,9 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         }).close;
     }
 
-    private async createRoom() {
+    private async createRoom(defaultPublic = false) {
         const CreateRoomDialog = sdk.getComponent('dialogs.CreateRoomDialog');
-        const modal = Modal.createTrackedDialog('Create Room', '', CreateRoomDialog);
+        const modal = Modal.createTrackedDialog('Create Room', '', CreateRoomDialog, { defaultPublic });
 
         const [shouldCreate, opts] = await modal.finished;
         if (shouldCreate) {
@@ -1091,7 +1068,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
     private leaveRoom(roomId: string) {
         const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         const roomToLeave = MatrixClientPeg.get().getRoom(roomId);
         const warnings = this.leaveRoomWarnings(roomId);
 
@@ -1155,6 +1131,21 @@ 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
+            if (this.state.currentRoomId === roomId) {
+                dis.dispatch({ action: "view_next_room" });
+            }
+        }).catch((err) => {
+            const errCode = err.errcode || _td("unknown error code");
+            Modal.createTrackedDialog("Failed to forget room", '', ErrorDialog, {
+                title: _t("Failed to forget room %(errCode)s", {errCode}),
+                description: ((err && err.message) ? err.message : _t("Operation failed")),
+            });
+        });
+    }
+
     /**
      * Starts a chat with the welcome user, if the user doesn't already have one
      * @returns {string} The room ID of the new room, or null if no room was created
@@ -1245,6 +1236,10 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         }
 
         StorageManager.tryPersistStorage();
+
+        if (SettingsStore.getValue("showCookieBar") && this.props.config.piwik && navigator.doNotTrack !== "1") {
+            showAnalyticsToast(this.props.config.piwik && this.props.config.piwik.policyUrl);
+        }
     }
 
     private showScreenAfterLogin() {
@@ -1328,7 +1323,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         // state (each of which can be 10s of MBs) for each DISJOINT timeline. This is
         // particularly noticeable when there are lots of 'limited' /sync responses
         // such as when laptops unsleep.
-        // https://github.com/vector-im/riot-web/issues/3307#issuecomment-282895568
+        // https://github.com/vector-im/element-web/issues/3307#issuecomment-282895568
         cli.setCanResetTimelineCallback((roomId) => {
             console.log("Request to reset timeline in room ", roomId, " viewing:", this.state.currentRoomId);
             if (roomId !== this.state.currentRoomId) {
@@ -1339,7 +1334,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             // this if we are not scrolled up in the view. To find out, delegate to
             // the timeline panel. If the timeline panel doesn't exist, then we assume
             // it is safe to reset the timeline.
-            if (!this.loggedInView.current || !this.loggedInView.current) {
+            if (!this.loggedInView.current) {
                 return true;
             }
             return this.loggedInView.current.canResetTimelineInRoom(roomId);
@@ -1372,10 +1367,13 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             this.firstSyncComplete = true;
             this.firstSyncPromise.resolve();
 
-            dis.dispatch({action: 'focus_composer'});
+            if (Notifier.shouldShowToolbar()) {
+                showNotificationsToast();
+            }
+
+            dis.fire(Action.FocusComposer);
             this.setState({
                 ready: true,
-                showNotifierToolbar: Notifier.shouldShowToolbar(),
             });
         });
         cli.on('Call.incoming', function(call) {
@@ -1396,7 +1394,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 return;
             }
 
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Signed out', '', ErrorDialog, {
                 title: _t('Signed Out'),
                 description: _t('For security, this session has been signed out. Please sign in again.'),
@@ -1454,16 +1451,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         cli.on("Session.logged_out", () => dft.stop());
         cli.on("Event.decrypted", (e, err) => dft.eventDecrypted(e, err));
 
-        // TODO: We can remove this once cross-signing is the only way.
-        // https://github.com/vector-im/riot-web/issues/11908
-        const krh = new KeyRequestHandler(cli);
-        cli.on("crypto.roomKeyRequest", (req) => {
-            krh.handleKeyRequest(req);
-        });
-        cli.on("crypto.roomKeyRequestCancellation", (req) => {
-            krh.handleKeyRequestCancellation(req);
-        });
-
         cli.on("Room", (room) => {
             if (MatrixClientPeg.get().isCryptoEnabled()) {
                 const blacklistEnabled = SettingsStore.getValueAt(
@@ -1476,19 +1463,20 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             }
         });
         cli.on("crypto.warning", (type) => {
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             switch (type) {
                 case 'CRYPTO_WARNING_OLD_VERSION_DETECTED':
+                    const brand = SdkConfig.get().brand;
                     Modal.createTrackedDialog('Crypto migrated', '', ErrorDialog, {
                         title: _t('Old cryptography data detected'),
                         description: _t(
-                            "Data from an older version of Riot has been detected. " +
+                            "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 },
                         ),
                     });
                     break;
@@ -1534,13 +1522,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         });
 
         cli.on("crypto.verification.request", request => {
-            const isFlagOn = SettingsStore.getValue("feature_cross_signing");
-
-            if (!isFlagOn && !request.channel.deviceId) {
-                request.cancel({code: "m.invalid_message", reason: "This client has cross-signing disabled"});
-                return;
-            }
-
             if (request.verifier) {
                 const IncomingSasDialog = sdk.getComponent("views.dialogs.IncomingSasDialog");
                 Modal.createTrackedDialog('Incoming Verification', '', IncomingSasDialog, {
@@ -1553,7 +1534,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     icon: "verification",
                     props: {request},
                     component: sdk.getComponent("toasts.VerificationRequestToast"),
-                    priority: ToastStore.PRIORITY_REALTIME,
+                    priority: 90,
                 });
             }
         });
@@ -1583,9 +1564,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             // be aware of will be signalled through the room shield
             // changing colour. More advanced behaviour will come once
             // we implement more settings.
-            cli.setGlobalErrorOnUnknownDevices(
-                !SettingsStore.getValue("feature_cross_signing"),
-            );
+            cli.setGlobalErrorOnUnknownDevices(false);
         }
     }
 
@@ -1621,9 +1600,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 action: 'view_create_room',
             });
         } else if (screen === 'settings') {
-            dis.dispatch({
-                action: 'view_user_settings',
-            });
+            dis.fire(Action.ViewUserSettings);
         } else if (screen === 'welcome') {
             dis.dispatch({
                 action: 'view_welcome_page',
@@ -1638,9 +1615,20 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 action: 'require_registration',
             });
         } else if (screen === 'directory') {
-            dis.dispatch({
-                action: 'view_room_directory',
-            });
+            dis.fire(Action.ViewRoomDirectory);
+        } else if (screen === "start_sso" || screen === "start_cas") {
+            // TODO if logged in, skip SSO
+            let cli = MatrixClientPeg.get();
+            if (!cli) {
+                const {hsUrl, isUrl} = this.props.serverConfig;
+                cli = Matrix.createClient({
+                    baseUrl: hsUrl,
+                    idBaseUrl: isUrl,
+                });
+            }
+
+            const type = screen === "start_sso" ? "sso" : "cas";
+            PlatformPeg.get().startSingleSignOn(cli, type, this.getFragmentAfterLogin());
         } else if (screen === 'groups') {
             dis.dispatch({
                 action: 'view_my_groups',
@@ -1673,7 +1661,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             // of the app, we coerce the eventId to be undefined where applicable.
             if (!eventId) eventId = undefined;
 
-            // TODO: Handle encoded room/event IDs: https://github.com/vector-im/riot-web/issues/9149
+            // TODO: Handle encoded room/event IDs: https://github.com/vector-im/element-web/issues/9149
 
             // FIXME: sort_out caseConsistency
             const thirdPartyInvite = {
@@ -1755,8 +1743,8 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
         const member = new RoomMember(null, userId);
         if (!member) { return; }
-        dis.dispatch({
-            action: 'view_user',
+        dis.dispatch<ViewUserPayload>({
+            action: Action.ViewUser,
             member: member,
         });
     }
@@ -1829,16 +1817,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         this.showScreen("settings");
     };
 
-    onVersion(current: string, latest: string, releaseNotes?: string) {
-        this.setState({
-            version: current,
-            newVersion: latest,
-            hasNewVersion: current !== latest,
-            newVersionReleaseNotes: releaseNotes,
-            checkingForUpdate: null,
-        });
-    }
-
     onSendEvent(roomId: string, event: MatrixEvent) {
         const cli = MatrixClientPeg.get();
         if (!cli) {
@@ -1863,23 +1841,24 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         } else {
             subtitle = `${this.subTitleStatus} ${subtitle}`;
         }
-        document.title = `${SdkConfig.get().brand || 'Riot'} ${subtitle}`;
+        document.title = `${SdkConfig.get().brand} ${subtitle}`;
     }
 
     updateStatusIndicator(state: string, prevState: string) {
-        const notifCount = countRoomsWithNotif(MatrixClientPeg.get().getRooms()).count;
+        const notificationState = RoomNotificationStateStore.instance.globalState;
+        const numUnreadRooms = notificationState.numUnreadStates; // we know that states === rooms here
 
         if (PlatformPeg.get()) {
             PlatformPeg.get().setErrorStatus(state === 'ERROR');
-            PlatformPeg.get().setNotificationCount(notifCount);
+            PlatformPeg.get().setNotificationCount(numUnreadRooms);
         }
 
         this.subTitleStatus = '';
         if (state === "ERROR") {
             this.subTitleStatus += `[${_t("Offline")}] `;
         }
-        if (notifCount > 0) {
-            this.subTitleStatus += `[${notifCount}]`;
+        if (numUnreadRooms > 0) {
+            this.subTitleStatus += `[${numUnreadRooms}]`;
         }
 
         this.setPageSubtitle();
@@ -1909,60 +1888,42 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             this.accountPasswordTimer = null;
         }, 60 * 5 * 1000);
 
-        // Wait for the client to be logged in (but not started)
-        // which is enough to ask the server about account data.
-        const loggedIn = new Promise(resolve => {
-            const actionHandlerRef = dis.register(payload => {
-                if (payload.action !== "on_logged_in") {
-                    return;
-                }
-                dis.unregister(actionHandlerRef);
-                resolve();
-            });
-        });
-
-        // Create and start the client in the background
-        const setLoggedInPromise = Lifecycle.setLoggedIn(credentials);
-        await loggedIn;
+        // Create and start the client
+        await Lifecycle.setLoggedIn(credentials);
 
         const cli = MatrixClientPeg.get();
-        // We're checking `isCryptoAvailable` here instead of `isCryptoEnabled`
-        // because the client hasn't been started yet.
-        const cryptoAvailable = isCryptoAvailable();
-        if (!cryptoAvailable) {
+        const cryptoEnabled = cli.isCryptoEnabled();
+        if (!cryptoEnabled) {
             this.onLoggedIn();
         }
 
-        this.setState({ pendingInitialSync: true });
-        await this.firstSyncPromise.promise;
-
-        if (!cryptoAvailable) {
-            this.setState({ pendingInitialSync: false });
-            return setLoggedInPromise;
+        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()]));
         }
 
-        // Test for the master cross-signing key in SSSS as a quick proxy for
-        // whether cross-signing has been set up on the account.
-        const masterKeyInStorage = !!cli.getAccountData("m.cross_signing.master");
-        if (masterKeyInStorage) {
-            // Auto-enable cross-signing for the new session when key found in
-            // secret storage.
-            SettingsStore.setValue("feature_cross_signing", null, SettingLevel.DEVICE, true);
+        // 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 (
-            SettingsStore.getValue("feature_cross_signing") &&
-            await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")
-        ) {
-            // This will only work if the feature is set to 'enable' in the config,
-            // since it's too early in the lifecycle for users to have turned the
-            // labs flag on.
+        } else if (await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")) {
             this.setStateForNewView({ view: Views.E2E_SETUP });
         } else {
             this.onLoggedIn();
         }
         this.setState({ pendingInitialSync: false });
-
-        return setLoggedInPromise;
     };
 
     // complete security / e2e setup has finished
@@ -1970,9 +1931,20 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         this.onLoggedIn();
     };
 
-    render() {
-        // console.log(`Rendering MatrixChat with view ${this.state.view}`);
+    getFragmentAfterLogin() {
+        let fragmentAfterLogin = "";
+        const initialScreenAfterLogin = this.props.initialScreenAfterLogin;
+        if (initialScreenAfterLogin &&
+            // XXX: workaround for https://github.com/vector-im/element-web/issues/11643 causing a login-loop
+            !["welcome", "login", "register", "start_sso", "start_cas"].includes(initialScreenAfterLogin.screen)
+        ) {
+            fragmentAfterLogin = `/${initialScreenAfterLogin.screen}`;
+        }
+        return fragmentAfterLogin;
+    }
 
+    render() {
+        const fragmentAfterLogin = this.getFragmentAfterLogin();
         let view;
 
         if (this.state.view === Views.LOADING) {
@@ -2028,7 +2000,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                         onCloseAllSettings={this.onCloseAllSettings}
                         onRegistered={this.onRegistered}
                         currentRoomId={this.state.currentRoomId}
-                        showCookieBar={this.state.showCookieBar}
                     />
                 );
             } else {
@@ -2052,7 +2023,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             }
         } else if (this.state.view === Views.WELCOME) {
             const Welcome = sdk.getComponent('auth.Welcome');
-            view = <Welcome {...this.getServerProperties()} />;
+            view = <Welcome />;
         } else if (this.state.view === Views.REGISTER) {
             const Registration = sdk.getComponent('structures.auth.Registration');
             view = (
@@ -2091,6 +2062,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     defaultDeviceDisplayName={this.props.defaultDeviceDisplayName}
                     onForgotPasswordClick={this.onForgotPasswordClick}
                     onServerConfigChange={this.onServerConfigChange}
+                    fragmentAfterLogin={fragmentAfterLogin}
                     {...this.getServerProperties()}
                 />
             );
@@ -2100,6 +2072,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                 <SoftLogout
                     realQueryParams={this.props.realQueryParams}
                     onTokenLoginCompleted={this.props.onTokenLoginCompleted}
+                    fragmentAfterLogin={fragmentAfterLogin}
                 />
             );
         } else {
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 6fbfdb504b..230d136e04 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -29,10 +29,35 @@ import SettingsStore from '../../settings/SettingsStore';
 import {_t} from "../../languageHandler";
 import {haveTileForEvent} from "../views/rooms/EventTile";
 import {textForEvent} from "../../TextForEvent";
+import IRCTimelineProfileResizer from "../views/elements/IRCTimelineProfileResizer";
 
 const CONTINUATION_MAX_INTERVAL = 5 * 60 * 1000; // 5 minutes
 const continuedTypes = ['m.sticker', 'm.room.message'];
 
+// check if there is a previous event and it has the same sender as this event
+// and the types are the same/is in continuedTypes and the time between them is <= CONTINUATION_MAX_INTERVAL
+function shouldFormContinuation(prevEvent, mxEvent) {
+    // sanity check inputs
+    if (!prevEvent || !prevEvent.sender || !mxEvent.sender) return false;
+    // check if within the max continuation period
+    if (mxEvent.getTs() - prevEvent.getTs() > CONTINUATION_MAX_INTERVAL) return false;
+
+    // Some events should appear as continuations from previous events of different types.
+    if (mxEvent.getType() !== prevEvent.getType() &&
+        (!continuedTypes.includes(mxEvent.getType()) ||
+            !continuedTypes.includes(prevEvent.getType()))) return false;
+
+    // Check if the sender is the same and hasn't changed their displayname/avatar between these events
+    if (mxEvent.sender.userId !== prevEvent.sender.userId ||
+        mxEvent.sender.name !== prevEvent.sender.name ||
+        mxEvent.sender.getMxcAvatarUrl() !== prevEvent.sender.getMxcAvatarUrl()) return false;
+
+    // if we don't have tile for previous event then it was shown by showHiddenEvents and has no SenderProfile
+    if (!haveTileForEvent(prevEvent)) return false;
+
+    return true;
+}
+
 const isMembershipChange = (e) => e.getType() === 'm.room.member' || e.getType() === 'm.room.third_party_invite';
 
 /* (almost) stateless UI component which builds the event tiles in the room timeline.
@@ -107,10 +132,14 @@ 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,
     };
 
-    constructor() {
-        super();
+    // Force props to be loaded for useIRCLayout
+    constructor(props) {
+        super(props);
 
         this.state = {
             // previous positions the read marker has been in, so we can
@@ -317,9 +346,9 @@ export default class MessagePanel extends React.Component {
         }
     }
 
-    _isUnmounting() {
+    _isUnmounting = () => {
         return !this._isMounted;
-    }
+    };
 
     // TODO: Implement granular (per-room) hide options
     _shouldShowEvent(mxEv) {
@@ -359,8 +388,11 @@ export default class MessagePanel extends React.Component {
             }
 
             return (
-                <li key={"readMarker_"+eventId} ref={this._readMarkerNode}
-                      className="mx_RoomView_myReadMarker_container">
+                <li key={"readMarker_"+eventId}
+                    ref={this._readMarkerNode}
+                    className="mx_RoomView_myReadMarker_container"
+                    data-scroll-tokens={eventId}
+                >
                     { hr }
                 </li>
             );
@@ -510,39 +542,6 @@ export default class MessagePanel extends React.Component {
 
         const isEditing = this.props.editState &&
             this.props.editState.getEvent().getId() === mxEv.getId();
-        // is this a continuation of the previous message?
-        let continuation = false;
-
-        // Some events should appear as continuations from previous events of
-        // different types.
-
-        const eventTypeContinues =
-            prevEvent !== null &&
-            continuedTypes.includes(mxEv.getType()) &&
-            continuedTypes.includes(prevEvent.getType());
-
-        // if there is a previous event and it has the same sender as this event
-        // and the types are the same/is in continuedTypes and the time between them is <= CONTINUATION_MAX_INTERVAL
-        if (prevEvent !== null && prevEvent.sender && mxEv.sender && mxEv.sender.userId === prevEvent.sender.userId &&
-            // if we don't have tile for previous event then it was shown by showHiddenEvents and has no SenderProfile
-            haveTileForEvent(prevEvent) && (mxEv.getType() === prevEvent.getType() || eventTypeContinues) &&
-            (mxEv.getTs() - prevEvent.getTs() <= CONTINUATION_MAX_INTERVAL)) {
-            continuation = true;
-        }
-
-/*
-        // Work out if this is still a continuation, as we are now showing commands
-        // and /me messages with their own little avatar. The case of a change of
-        // event type (commands) is handled above, but we need to handle the /me
-        // messages seperately as they have a msgtype of 'm.emote' but are classed
-        // as normal messages
-        if (prevEvent !== null && prevEvent.sender && mxEv.sender
-                && mxEv.sender.userId === prevEvent.sender.userId
-                && mxEv.getType() == prevEvent.getType()
-                && prevEvent.getContent().msgtype === 'm.emote') {
-            continuation = false;
-        }
-*/
 
         // local echoes have a fake date, which could even be yesterday. Treat them
         // as 'today' for the date separators.
@@ -554,12 +553,15 @@ export default class MessagePanel extends React.Component {
         }
 
         // do we need a date separator since the last event?
-        if (this._wantsDateSeparator(prevEvent, eventDate)) {
+        const wantsDateSeparator = this._wantsDateSeparator(prevEvent, eventDate);
+        if (wantsDateSeparator) {
             const dateSeparator = <li key={ts1}><DateSeparator key={ts1} ts={ts1} /></li>;
             ret.push(dateSeparator);
-            continuation = false;
         }
 
+        // is this a continuation of the previous message?
+        const continuation = !wantsDateSeparator && shouldFormContinuation(prevEvent, mxEv);
+
         const eventId = mxEv.getId();
         const highlight = (eventId === this.props.highlightedEventId);
 
@@ -569,12 +571,10 @@ export default class MessagePanel extends React.Component {
 
         const readReceipts = this._readReceiptsByEvent[eventId];
 
-        // Dev note: `this._isUnmounting.bind(this)` is important - it ensures that
-        // the function is run in the context of this class and not EventTile, therefore
-        // ensuring the right `this._mounted` variable is used by read receipts (which
-        // don't update their position if we, the MessagePanel, is unmounting).
+        // use txnId as key if available so that we don't remount during sending
         ret.push(
-            <li key={eventId}
+            <li
+                key={mxEv.getTxnId() || eventId}
                 ref={this._collectEventNode.bind(this, eventId)}
                 data-scroll-tokens={scrollToken}
             >
@@ -588,7 +588,7 @@ export default class MessagePanel extends React.Component {
                         readReceipts={readReceipts}
                         readReceiptMap={this._readReceiptMap}
                         showUrlPreview={this.props.showUrlPreview}
-                        checkUnmounting={this._isUnmounting.bind(this)}
+                        checkUnmounting={this._isUnmounting}
                         eventSendStatus={mxEv.getAssociatedStatus()}
                         tileShape={this.props.tileShape}
                         isTwelveHour={this.props.isTwelveHour}
@@ -597,6 +597,7 @@ export default class MessagePanel extends React.Component {
                         isSelectedEvent={highlight}
                         getRelationsForEvent={this.props.getRelationsForEvent}
                         showReactions={this.props.showReactions}
+                        useIRCLayout={this.props.useIRCLayout}
                     />
                 </TileErrorBoundary>
             </li>,
@@ -792,6 +793,15 @@ export default class MessagePanel extends React.Component {
             );
         }
 
+        let ircResizer = null;
+        if (this.props.useIRCLayout) {
+            ircResizer = <IRCTimelineProfileResizer
+                minWidth={20}
+                maxWidth={600}
+                roomId={this.props.room ? this.props.room.roomId : null}
+            />;
+        }
+
         return (
             <ErrorBoundary>
                 <ScrollPanel
@@ -804,6 +814,7 @@ export default class MessagePanel extends React.Component {
                     style={style}
                     stickyBottom={this.props.stickyBottom}
                     resizeNotifier={this.props.resizeNotifier}
+                    fixedChildren={ircResizer}
                 >
                     { topSpinner }
                     { this._getEventTiles() }
diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js
index f179cab6ad..7043c7f38a 100644
--- a/src/components/structures/MyGroups.js
+++ b/src/components/structures/MyGroups.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2017 Vector Creations Ltd
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
+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.
@@ -19,7 +20,8 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import * as sdk from '../../index';
 import { _t } from '../../languageHandler';
-import dis from '../../dispatcher';
+import SdkConfig from '../../SdkConfig';
+import dis from '../../dispatcher/dispatcher';
 import AccessibleButton from '../views/elements/AccessibleButton';
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import AutoHideScrollbar from "./AutoHideScrollbar";
@@ -60,6 +62,7 @@ export default createReactClass({
     },
 
     render: function() {
+        const brand = SdkConfig.get().brand;
         const Loader = sdk.getComponent("elements.Spinner");
         const SimpleRoomHeader = sdk.getComponent('rooms.SimpleRoomHeader');
         const GroupTile = sdk.getComponent("groups.GroupTile");
@@ -77,7 +80,8 @@ export default createReactClass({
                     <div className="mx_MyGroups_microcopy">
                         <p>
                             { _t(
-                                "Did you know: you can use communities to filter your Riot.im experience!",
+                                "Did you know: you can use communities to filter your %(brand)s experience!",
+                                { brand },
                             ) }
                         </p>
                         <p>
diff --git a/src/components/structures/NonUrgentToastContainer.tsx b/src/components/structures/NonUrgentToastContainer.tsx
new file mode 100644
index 0000000000..8d415df4dd
--- /dev/null
+++ b/src/components/structures/NonUrgentToastContainer.tsx
@@ -0,0 +1,63 @@
+/*
+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 { ComponentClass } from "../../@types/common";
+import NonUrgentToastStore from "../../stores/NonUrgentToastStore";
+import { UPDATE_EVENT } from "../../stores/AsyncStore";
+
+interface IProps {
+}
+
+interface IState {
+    toasts: ComponentClass[],
+}
+
+export default class NonUrgentToastContainer extends React.PureComponent<IProps, IState> {
+    public constructor(props, context) {
+        super(props, context);
+
+        this.state = {
+            toasts: NonUrgentToastStore.instance.components,
+        };
+
+        NonUrgentToastStore.instance.on(UPDATE_EVENT, this.onUpdateToasts);
+    }
+
+    public componentWillUnmount() {
+        NonUrgentToastStore.instance.off(UPDATE_EVENT, this.onUpdateToasts);
+    }
+
+    private onUpdateToasts = () => {
+        this.setState({toasts: NonUrgentToastStore.instance.components});
+    };
+
+    public render() {
+        const toasts = this.state.toasts.map((t, i) => {
+            return (
+                <div className="mx_NonUrgentToastContainer_toast" key={`toast-${i}`}>
+                    {React.createElement(t, {})}
+                </div>
+            );
+        });
+
+        return (
+            <div className="mx_NonUrgentToastContainer" role="alert">
+                {toasts}
+            </div>
+        );
+    }
+}
diff --git a/src/components/structures/NotificationPanel.js b/src/components/structures/NotificationPanel.js
index c1a0ec9c4b..c1f78cffda 100644
--- a/src/components/structures/NotificationPanel.js
+++ b/src/components/structures/NotificationPanel.js
@@ -36,6 +36,11 @@ const NotificationPanel = createReactClass({
         const TimelinePanel = sdk.getComponent("structures.TimelinePanel");
         const Loader = sdk.getComponent("elements.Spinner");
 
+        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>
+        </div>);
+
         const timelineSet = MatrixClientPeg.get().getNotifTimelineSet();
         if (timelineSet) {
             return (
@@ -46,7 +51,7 @@ const NotificationPanel = createReactClass({
                         timelineSet={timelineSet}
                         showUrlPreview={false}
                         tileShape="notif"
-                        empty={_t('You have no visible notifications')}
+                        empty={emptyState}
                     />
                 </div>
             );
diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 3fec5aa25f..a4e3254e4c 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -22,14 +22,14 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import * as sdk from '../../index';
-import dis from '../../dispatcher';
+import dis from '../../dispatcher/dispatcher';
 import RateLimitedFunc from '../../ratelimitedfunc';
 import { showGroupInviteDialog, showGroupAddRoomDialog } from '../../GroupAddressPicker';
 import GroupStore from '../../stores/GroupStore';
-import SettingsStore from "../../settings/SettingsStore";
-import {RIGHT_PANEL_PHASES, RIGHT_PANEL_PHASES_NO_ARGS} from "../../stores/RightPanelStorePhases";
+import {RightPanelPhases, RIGHT_PANEL_PHASES_NO_ARGS} from "../../stores/RightPanelStorePhases";
 import RightPanelStore from "../../stores/RightPanelStore";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
+import {Action} from "../../dispatcher/actions";
 
 export default class RightPanel extends React.Component {
     static get propTypes() {
@@ -75,8 +75,8 @@ export default class RightPanel extends React.Component {
         const userForPanel = this._getUserForPanel();
         if (this.props.groupId) {
             if (!RIGHT_PANEL_PHASES_NO_ARGS.includes(rps.groupPanelPhase)) {
-                dis.dispatch({action: "set_right_panel_phase", phase: RIGHT_PANEL_PHASES.GroupMemberList});
-                return RIGHT_PANEL_PHASES.GroupMemberList;
+                dis.dispatch({action: Action.SetRightPanelPhase, phase: RightPanelPhases.GroupMemberList});
+                return RightPanelPhases.GroupMemberList;
             }
             return rps.groupPanelPhase;
         } else if (userForPanel) {
@@ -98,11 +98,11 @@ export default class RightPanel extends React.Component {
             ) {
                 return rps.roomPanelPhase;
             }
-            return RIGHT_PANEL_PHASES.RoomMemberInfo;
+            return RightPanelPhases.RoomMemberInfo;
         } else {
             if (!RIGHT_PANEL_PHASES_NO_ARGS.includes(rps.roomPanelPhase)) {
-                dis.dispatch({action: "set_right_panel_phase", phase: RIGHT_PANEL_PHASES.RoomMemberList});
-                return RIGHT_PANEL_PHASES.RoomMemberList;
+                dis.dispatch({action: Action.SetRightPanelPhase, phase: RightPanelPhases.RoomMemberList});
+                return RightPanelPhases.RoomMemberList;
             }
             return rps.roomPanelPhase;
         }
@@ -149,7 +149,7 @@ export default class RightPanel extends React.Component {
     onInviteToGroupButtonClick() {
         showGroupInviteDialog(this.props.groupId).then(() => {
             this.setState({
-                phase: RIGHT_PANEL_PHASES.GroupMemberList,
+                phase: RightPanelPhases.GroupMemberList,
             });
         });
     }
@@ -165,9 +165,9 @@ export default class RightPanel extends React.Component {
             return;
         }
         // redraw the badge on the membership list
-        if (this.state.phase === RIGHT_PANEL_PHASES.RoomMemberList && member.roomId === this.props.roomId) {
+        if (this.state.phase === RightPanelPhases.RoomMemberList && member.roomId === this.props.roomId) {
             this._delayedUpdate();
-        } else if (this.state.phase === RIGHT_PANEL_PHASES.RoomMemberInfo && member.roomId === this.props.roomId &&
+        } else if (this.state.phase === RightPanelPhases.RoomMemberInfo && member.roomId === this.props.roomId &&
                 member.userId === this.state.member.userId) {
             // refresh the member info (e.g. new power level)
             this._delayedUpdate();
@@ -175,7 +175,7 @@ export default class RightPanel extends React.Component {
     }
 
     onAction(payload) {
-        if (payload.action === "after_right_panel_phase_change") {
+        if (payload.action === Action.AfterRightPanelPhaseChange) {
             this.setState({
                 phase: payload.phase,
                 groupRoomId: payload.groupRoomId,
@@ -188,113 +188,88 @@ export default class RightPanel extends React.Component {
         }
     }
 
+    onCloseUserInfo = () => {
+        // 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.
+        if (this.props.user) {
+            // If we have a user prop then we're displaying a user from the 'user' page type
+            // in LoggedInView, so need to change the page type to close the panel (we switch
+            // to the home page which is not obviously the correct thing to do, but I'm not sure
+            // anything else is - we could hide the close button altogether?)
+            dis.dispatch({
+                action: "view_home_page",
+            });
+        } 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.
+            dis.dispatch({
+                action: Action.ViewUser,
+                member: this.state.phase === RightPanelPhases.EncryptionPanel ? this.state.member : null,
+            });
+        }
+    };
+
     render() {
         const MemberList = sdk.getComponent('rooms.MemberList');
-        const MemberInfo = sdk.getComponent('rooms.MemberInfo');
         const UserInfo = sdk.getComponent('right_panel.UserInfo');
         const ThirdPartyMemberInfo = sdk.getComponent('rooms.ThirdPartyMemberInfo');
         const NotificationPanel = sdk.getComponent('structures.NotificationPanel');
         const FilePanel = sdk.getComponent('structures.FilePanel');
 
         const GroupMemberList = sdk.getComponent('groups.GroupMemberList');
-        const GroupMemberInfo = sdk.getComponent('groups.GroupMemberInfo');
         const GroupRoomList = sdk.getComponent('groups.GroupRoomList');
         const GroupRoomInfo = sdk.getComponent('groups.GroupRoomInfo');
 
         let panel = <div />;
 
         switch (this.state.phase) {
-            case RIGHT_PANEL_PHASES.RoomMemberList:
+            case RightPanelPhases.RoomMemberList:
                 if (this.props.roomId) {
                     panel = <MemberList roomId={this.props.roomId} key={this.props.roomId} />;
                 }
                 break;
-            case RIGHT_PANEL_PHASES.GroupMemberList:
+            case RightPanelPhases.GroupMemberList:
                 if (this.props.groupId) {
                     panel = <GroupMemberList groupId={this.props.groupId} key={this.props.groupId} />;
                 }
                 break;
-            case RIGHT_PANEL_PHASES.GroupRoomList:
+            case RightPanelPhases.GroupRoomList:
                 panel = <GroupRoomList groupId={this.props.groupId} key={this.props.groupId} />;
                 break;
-            case RIGHT_PANEL_PHASES.RoomMemberInfo:
-            case RIGHT_PANEL_PHASES.EncryptionPanel:
-                if (SettingsStore.getValue("feature_cross_signing")) {
-                    const 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.
-                        if (this.props.user) {
-                            // If we have a user prop then we're displaying a user from the 'user' page type
-                            // in LoggedInView, so need to change the page type to close the panel (we switch
-                            // to the home page which is not obviosuly the correct thing to do, but I'm not sure
-                            // anything else is - we could hide the close button altogether?)
-                            dis.dispatch({
-                                action: "view_home_page",
-                            });
-                        } else {
-                            // Otherwise we have got our user from RoomViewStore which means we're being shown
-                            // within a room, 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.
-                            dis.dispatch({
-                                action: "view_user",
-                                member: this.state.phase === RIGHT_PANEL_PHASES.EncryptionPanel ?
-                                    this.state.member : null,
-                            });
-                        }
-                    };
-                    panel = <UserInfo
-                        user={this.state.member}
-                        roomId={this.props.roomId}
-                        key={this.props.roomId || this.state.member.userId}
-                        onClose={onClose}
-                        phase={this.state.phase}
-                        verificationRequest={this.state.verificationRequest}
-                        verificationRequestPromise={this.state.verificationRequestPromise}
-                    />;
-                } else {
-                    panel = <MemberInfo
-                        member={this.state.member}
-                        key={this.props.roomId || this.state.member.userId}
-                    />;
-                }
+            case RightPanelPhases.RoomMemberInfo:
+            case RightPanelPhases.EncryptionPanel:
+                panel = <UserInfo
+                    user={this.state.member}
+                    roomId={this.props.roomId}
+                    key={this.props.roomId || this.state.member.userId}
+                    onClose={this.onCloseUserInfo}
+                    phase={this.state.phase}
+                    verificationRequest={this.state.verificationRequest}
+                    verificationRequestPromise={this.state.verificationRequestPromise}
+                />;
                 break;
-            case RIGHT_PANEL_PHASES.Room3pidMemberInfo:
+            case RightPanelPhases.Room3pidMemberInfo:
                 panel = <ThirdPartyMemberInfo event={this.state.event} key={this.props.roomId} />;
                 break;
-            case RIGHT_PANEL_PHASES.GroupMemberInfo:
-                if (SettingsStore.getValue("feature_cross_signing")) {
-                    const onClose = () => {
-                        dis.dispatch({
-                            action: "view_user",
-                            member: null,
-                        });
-                    };
-                    panel = <UserInfo
-                        user={this.state.member}
-                        groupId={this.props.groupId}
-                        key={this.state.member.userId}
-                        onClose={onClose} />;
-                } else {
-                    panel = (
-                        <GroupMemberInfo
-                            groupMember={this.state.member}
-                            groupId={this.props.groupId}
-                            key={this.state.member.user_id}
-                        />
-                    );
-                }
+            case RightPanelPhases.GroupMemberInfo:
+                panel = <UserInfo
+                    user={this.state.member}
+                    groupId={this.props.groupId}
+                    key={this.state.member.userId}
+                    onClose={this.onCloseUserInfo} />;
                 break;
-            case RIGHT_PANEL_PHASES.GroupRoomInfo:
+            case RightPanelPhases.GroupRoomInfo:
                 panel = <GroupRoomInfo
                     groupRoomId={this.state.groupRoomId}
                     groupId={this.props.groupId}
                     key={this.state.groupRoomId} />;
                 break;
-            case RIGHT_PANEL_PHASES.NotificationPanel:
+            case RightPanelPhases.NotificationPanel:
                 panel = <NotificationPanel />;
                 break;
-            case RIGHT_PANEL_PHASES.FilePanel:
+            case RightPanelPhases.FilePanel:
                 panel = <FilePanel roomId={this.props.roomId} resizeNotifier={this.props.resizeNotifier} />;
                 break;
         }
diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index 0b07c10c8a..5b12dae7df 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -1,7 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -20,11 +20,12 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import {MatrixClientPeg} from "../../MatrixClientPeg";
 import * as sdk from "../../index";
-import dis from "../../dispatcher";
+import dis from "../../dispatcher/dispatcher";
 import Modal from "../../Modal";
 import { linkifyAndSanitizeHtml } from '../../HtmlUtils';
 import PropTypes from 'prop-types';
 import { _t } from '../../languageHandler';
+import SdkConfig from '../../SdkConfig';
 import { instanceForInstanceId, protocolNameForInstanceId } from '../../utils/DirectoryUtils';
 import Analytics from '../../Analytics';
 import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
@@ -74,7 +75,7 @@ export default createReactClass({
             this.protocols = response;
             this.setState({protocolsLoading: false});
         }, (err) => {
-            console.warn(`error loading thirdparty protocols: ${err}`);
+            console.warn(`error loading third party protocols: ${err}`);
             this.setState({protocolsLoading: false});
             if (MatrixClientPeg.get().isGuest()) {
                 // Guests currently aren't allowed to use this API, so
@@ -83,10 +84,12 @@ export default createReactClass({
                 return;
             }
             track('Failed to get protocol list from homeserver');
+            const brand = SdkConfig.get().brand;
             this.setState({
                 error: _t(
-                    'Riot failed to get the protocol list from the homeserver. ' +
+                    '%(brand)s failed to get the protocol list from the homeserver. ' +
                     'The homeserver may be too old to support third party networks.',
+                    { brand },
                 ),
             });
         });
@@ -173,12 +176,13 @@ export default createReactClass({
 
             console.error("Failed to get publicRooms: %s", JSON.stringify(err));
             track('Failed to get public room list');
+            const brand = SdkConfig.get().brand;
             this.setState({
                 loading: false,
-                error:
-                    `${_t('Riot failed to get the public room list.')} ` +
-                    `${(err && err.message) ? err.message : _t('The homeserver may be unavailable or overloaded.')}`
-                ,
+                error: (
+                    _t('%(brand)s failed to get the public room list.', { brand }) +
+                    (err && err.message) ? err.message : _t('The homeserver may be unavailable or overloaded.')
+                ),
             });
         });
     },
@@ -199,7 +203,7 @@ export default createReactClass({
 
         let desc;
         if (alias) {
-            desc = _t('Delete the room alias %(alias)s and remove %(name)s from the directory?', {alias: alias, name: name});
+            desc = _t('Delete the room address %(alias)s and remove %(name)s from the directory?', {alias, name});
         } else {
             desc = _t('Remove %(name)s from the directory?', {name: name});
         }
@@ -216,7 +220,7 @@ export default createReactClass({
 
                 MatrixClientPeg.get().setRoomDirectoryVisibility(room.room_id, 'private').then(() => {
                     if (!alias) return;
-                    step = _t('delete the alias.');
+                    step = _t('delete the address.');
                     return MatrixClientPeg.get().deleteAlias(alias);
                 }).then(() => {
                     modal.close();
@@ -314,9 +318,10 @@ export default createReactClass({
             const fields = protocolName ? this._getFieldsForThirdPartyLocation(alias, this.protocols[protocolName], instance) : null;
             if (!fields) {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                const brand = SdkConfig.get().brand;
                 Modal.createTrackedDialog('Unable to join network', '', ErrorDialog, {
                     title: _t('Unable to join network'),
-                    description: _t('Riot does not know how to join a room on this network'),
+                    description: _t('%(brand)s does not know how to join a room on this network', { brand }),
                 });
                 return;
             }
@@ -367,7 +372,10 @@ export default createReactClass({
 
     onCreateRoomClick: function(room) {
         this.props.onFinished();
-        dis.dispatch({action: 'view_create_room'});
+        dis.dispatch({
+            action: 'view_create_room',
+            public: true,
+        });
     },
 
     showRoomAlias: function(alias, autoJoin=false) {
diff --git a/src/components/structures/RoomSearch.tsx b/src/components/structures/RoomSearch.tsx
new file mode 100644
index 0000000000..f6b8d42c30
--- /dev/null
+++ b/src/components/structures/RoomSearch.tsx
@@ -0,0 +1,185 @@
+/*
+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 { createRef } from "react";
+import classNames from "classnames";
+import defaultDispatcher from "../../dispatcher/dispatcher";
+import { _t } from "../../languageHandler";
+import { ActionPayload } from "../../dispatcher/payloads";
+import { throttle } from 'lodash';
+import { Key } from "../../Keyboard";
+import AccessibleButton from "../views/elements/AccessibleButton";
+import { Action } from "../../dispatcher/actions";
+import RoomListStore from "../../stores/room-list/RoomListStore";
+import { NameFilterCondition } from "../../stores/room-list/filters/NameFilterCondition";
+
+interface IProps {
+    isMinimized: boolean;
+    onVerticalArrow(ev: React.KeyboardEvent): void;
+    onEnter(ev: React.KeyboardEvent): boolean;
+}
+
+interface IState {
+    query: string;
+    focused: boolean;
+}
+
+export default class RoomSearch extends React.PureComponent<IProps, IState> {
+    private dispatcherRef: string;
+    private inputRef: React.RefObject<HTMLInputElement> = createRef();
+    private searchFilter: NameFilterCondition = new NameFilterCondition();
+
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            query: "",
+            focused: false,
+        };
+
+        this.dispatcherRef = defaultDispatcher.register(this.onAction);
+    }
+
+    public componentDidUpdate(prevProps: Readonly<IProps>, prevState: Readonly<IState>): void {
+        if (prevState.query !== this.state.query) {
+            const hadSearch = !!this.searchFilter.search.trim();
+            const haveSearch = !!this.state.query.trim();
+            this.searchFilter.search = this.state.query;
+            if (!hadSearch && haveSearch) {
+                // started a new filter - add the condition
+                RoomListStore.instance.addFilter(this.searchFilter);
+            } else if (hadSearch && !haveSearch) {
+                // cleared a filter - remove the condition
+                RoomListStore.instance.removeFilter(this.searchFilter);
+            } // else the filter hasn't changed enough for us to care here
+        }
+    }
+
+    public componentWillUnmount() {
+        defaultDispatcher.unregister(this.dispatcherRef);
+    }
+
+    private onAction = (payload: ActionPayload) => {
+        if (payload.action === 'view_room' && payload.clear_search) {
+            this.clearInput();
+        } else if (payload.action === 'focus_room_filter' && this.inputRef.current) {
+            this.inputRef.current.focus();
+        }
+    };
+
+    private clearInput = () => {
+        if (!this.inputRef.current) return;
+        this.inputRef.current.value = "";
+        this.onChange();
+    };
+
+    private openSearch = () => {
+        defaultDispatcher.dispatch({action: "show_left_panel"});
+        defaultDispatcher.dispatch({action: "focus_room_filter"});
+    };
+
+    private onChange = () => {
+        if (!this.inputRef.current) return;
+        this.setState({query: this.inputRef.current.value});
+    };
+
+    private onFocus = (ev: React.FocusEvent<HTMLInputElement>) => {
+        this.setState({focused: true});
+        ev.target.select();
+    };
+
+    private onBlur = (ev: React.FocusEvent<HTMLInputElement>) => {
+        this.setState({focused: false});
+    };
+
+    private onKeyDown = (ev: React.KeyboardEvent) => {
+        if (ev.key === Key.ESCAPE) {
+            this.clearInput();
+            defaultDispatcher.fire(Action.FocusComposer);
+        } else if (ev.key === Key.ARROW_UP || ev.key === Key.ARROW_DOWN) {
+            this.props.onVerticalArrow(ev);
+        } else if (ev.key === Key.ENTER) {
+            const shouldClear = this.props.onEnter(ev);
+            if (shouldClear) {
+                // wrap in set immediate to delay it so that we don't clear the filter & then change room
+                setImmediate(() => {
+                    this.clearInput();
+                });
+            }
+        }
+    };
+
+    public render(): React.ReactNode {
+        const classes = classNames({
+            'mx_RoomSearch': true,
+            'mx_RoomSearch_hasQuery': this.state.query,
+            'mx_RoomSearch_focused': this.state.focused,
+            'mx_RoomSearch_minimized': this.props.isMinimized,
+        });
+
+        const inputClasses = classNames({
+            'mx_RoomSearch_input': true,
+            'mx_RoomSearch_inputExpanded': this.state.query || this.state.focused,
+        });
+
+        let icon = (
+            <div className='mx_RoomSearch_icon'/>
+        );
+        let input = (
+            <input
+                type="text"
+                ref={this.inputRef}
+                className={inputClasses}
+                value={this.state.query}
+                onFocus={this.onFocus}
+                onBlur={this.onBlur}
+                onChange={this.onChange}
+                onKeyDown={this.onKeyDown}
+                placeholder={_t("Search")}
+                autoComplete="off"
+            />
+        );
+        let clearButton = (
+            <AccessibleButton
+                tabIndex={-1}
+                title={_t("Clear filter")}
+                className="mx_RoomSearch_clearButton"
+                onClick={this.clearInput}
+            />
+        );
+
+        if (this.props.isMinimized) {
+            icon = (
+                <AccessibleButton
+                    title={_t("Search rooms")}
+                    className="mx_RoomSearch_icon"
+                    onClick={this.openSearch}
+                />
+            );
+            input = null;
+            clearButton = null;
+        }
+
+        return (
+            <div className={classes}>
+                {icon}
+                {input}
+                {clearButton}
+            </div>
+        );
+    }
+}
diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index 639f38a119..3171dbccbe 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -24,9 +24,9 @@ import { _t, _td } from '../../languageHandler';
 import * as sdk from '../../index';
 import {MatrixClientPeg} from '../../MatrixClientPeg';
 import Resend from '../../Resend';
-import * as cryptodevices from '../../cryptodevices';
-import dis from '../../dispatcher';
+import dis from '../../dispatcher/dispatcher';
 import {messageForResourceLimitError, messageForSendError} from '../../utils/ErrorUtils';
+import {Action} from "../../dispatcher/actions";
 
 const STATUS_BAR_HIDDEN = 0;
 const STATUS_BAR_EXPANDED = 1;
@@ -126,25 +126,14 @@ export default createReactClass({
         });
     },
 
-    _onSendWithoutVerifyingClick: function() {
-        cryptodevices.getUnknownDevicesForRoom(MatrixClientPeg.get(), this.props.room).then((devices) => {
-            cryptodevices.markAllDevicesKnown(MatrixClientPeg.get(), devices);
-            Resend.resendUnsentEvents(this.props.room);
-        });
-    },
-
     _onResendAllClick: function() {
         Resend.resendUnsentEvents(this.props.room);
-        dis.dispatch({action: 'focus_composer'});
+        dis.fire(Action.FocusComposer);
     },
 
     _onCancelAllClick: function() {
         Resend.cancelUnsentEvents(this.props.room);
-        dis.dispatch({action: 'focus_composer'});
-    },
-
-    _onShowDevicesClick: function() {
-        cryptodevices.showUnknownDeviceDialogForMessages(MatrixClientPeg.get(), this.props.room);
+        dis.fire(Action.FocusComposer);
     },
 
     _onRoomLocalEchoUpdated: function(event, room, oldEventId, oldStatus) {
@@ -184,7 +173,7 @@ export default createReactClass({
         if (this.props.hasActiveCall) {
             const TintableSvg = sdk.getComponent("elements.TintableSvg");
             return (
-                <TintableSvg src={require("../../../res/img/sound-indicator.svg")} width="23" height="20" />
+                <TintableSvg src={require("../../../res/img/element-icons/room/in-call.svg")} width="23" height="20" />
             );
         }
 
@@ -213,82 +202,65 @@ export default createReactClass({
         if (!unsentMessages.length) return null;
 
         let title;
-        let content;
 
-        const hasUDE = unsentMessages.some((m) => {
-            return m.error && m.error.name === "UnknownDeviceError";
-        });
-
-        if (hasUDE) {
-            title = _t("Message not sent due to unknown sessions being present");
-            content = _t(
-                "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.",
+        let consentError = null;
+        let resourceLimitError = null;
+        for (const m of unsentMessages) {
+            if (m.error && m.error.errcode === 'M_CONSENT_NOT_GIVEN') {
+                consentError = m.error;
+                break;
+            } else if (m.error && m.error.errcode === 'M_RESOURCE_LIMIT_EXCEEDED') {
+                resourceLimitError = m.error;
+                break;
+            }
+        }
+        if (consentError) {
+            title = _t(
+                "You can't send any messages until you review and agree to " +
+                "<consentLink>our terms and conditions</consentLink>.",
                 {},
                 {
-                    'showSessionsText': (sub) => <a className="mx_RoomStatusBar_resend_link" key="resend" onClick={this._onShowDevicesClick}>{ sub }</a>,
-                    'sendAnywayText': (sub) => <a className="mx_RoomStatusBar_resend_link" key="sendAnyway" onClick={this._onSendWithoutVerifyingClick}>{ sub }</a>,
-                    'cancelText': (sub) => <a className="mx_RoomStatusBar_resend_link" key="cancel" onClick={this._onCancelAllClick}>{ sub }</a>,
+                    'consentLink': (sub) =>
+                        <a href={consentError.data && consentError.data.consent_uri} target="_blank">
+                            { sub }
+                        </a>,
                 },
             );
+        } else if (resourceLimitError) {
+            title = messageForResourceLimitError(
+                resourceLimitError.data.limit_type,
+                resourceLimitError.data.admin_contact, {
+                'monthly_active_user': _td(
+                    "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.",
+                ),
+                '': _td(
+                    "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.",
+                ),
+            });
+        } else if (
+            unsentMessages.length === 1 &&
+            unsentMessages[0].error &&
+            unsentMessages[0].error.data &&
+            unsentMessages[0].error.data.error
+        ) {
+            title = messageForSendError(unsentMessages[0].error.data) || unsentMessages[0].error.data.error;
         } else {
-            let consentError = null;
-            let resourceLimitError = null;
-            for (const m of unsentMessages) {
-                if (m.error && m.error.errcode === 'M_CONSENT_NOT_GIVEN') {
-                    consentError = m.error;
-                    break;
-                } else if (m.error && m.error.errcode === 'M_RESOURCE_LIMIT_EXCEEDED') {
-                    resourceLimitError = m.error;
-                    break;
-                }
-            }
-            if (consentError) {
-                title = _t(
-                    "You can't send any messages until you review and agree to " +
-                    "<consentLink>our terms and conditions</consentLink>.",
-                    {},
-                    {
-                        'consentLink': (sub) =>
-                            <a href={consentError.data && consentError.data.consent_uri} target="_blank">
-                                { sub }
-                            </a>,
-                    },
-                );
-            } else if (resourceLimitError) {
-                title = messageForResourceLimitError(
-                    resourceLimitError.data.limit_type,
-                    resourceLimitError.data.admin_contact, {
-                    'monthly_active_user': _td(
-                        "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.",
-                    ),
-                    '': _td(
-                        "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.",
-                    ),
-                });
-            } else if (
-                unsentMessages.length === 1 &&
-                unsentMessages[0].error &&
-                unsentMessages[0].error.data &&
-                unsentMessages[0].error.data.error
-            ) {
-                title = messageForSendError(unsentMessages[0].error.data) || unsentMessages[0].error.data.error;
-            } else {
-                title = _t('%(count)s of your messages have not been sent.', { count: unsentMessages.length });
-            }
-            content = _t("%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. " +
-               "You can also select individual messages to resend or cancel.",
-                { count: unsentMessages.length },
-                {
-                    'resendText': (sub) =>
-                        <a className="mx_RoomStatusBar_resend_link" key="resend" onClick={this._onResendAllClick}>{ sub }</a>,
-                    'cancelText': (sub) =>
-                        <a className="mx_RoomStatusBar_resend_link" key="cancel" onClick={this._onCancelAllClick}>{ sub }</a>,
-                },
-            );
+            title = _t('%(count)s of your messages have not been sent.', { count: unsentMessages.length });
         }
 
+        const content = _t("%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> " +
+            "now. You can also select individual messages to resend or cancel.",
+            { count: unsentMessages.length },
+            {
+                'resendText': (sub) =>
+                    <a className="mx_RoomStatusBar_resend_link" key="resend" onClick={this._onResendAllClick}>{ sub }</a>,
+                'cancelText': (sub) =>
+                    <a className="mx_RoomStatusBar_resend_link" key="cancel" onClick={this._onCancelAllClick}>{ sub }</a>,
+            },
+        );
+
         return <div className="mx_RoomStatusBar_connectionLostBar">
             <img src={require("../../../res/img/feather-customised/warning-triangle.svg")} width="24" height="24" title={_t("Warning")} alt="" />
             <div>
diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
deleted file mode 100644
index 1e3e15b4ec..0000000000
--- a/src/components/structures/RoomSubList.js
+++ /dev/null
@@ -1,460 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations Ltd
-Copyright 2018, 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, {createRef} from 'react';
-import classNames from 'classnames';
-import * as sdk from '../../index';
-import dis from '../../dispatcher';
-import * as Unread from '../../Unread';
-import * as RoomNotifs from '../../RoomNotifs';
-import * as FormattingUtils from '../../utils/FormattingUtils';
-import IndicatorScrollbar from './IndicatorScrollbar';
-import {Key} from '../../Keyboard';
-import { Group } from 'matrix-js-sdk';
-import PropTypes from 'prop-types';
-import RoomTile from "../views/rooms/RoomTile";
-import LazyRenderList from "../views/elements/LazyRenderList";
-import {_t} from "../../languageHandler";
-import {RovingTabIndexWrapper} from "../../accessibility/RovingTabIndex";
-import toRem from "../../utils/rem";
-
-// turn this on for drop & drag console debugging galore
-const debug = false;
-
-export default class RoomSubList extends React.PureComponent {
-    static displayName = 'RoomSubList';
-    static debug = debug;
-
-    static propTypes = {
-        list: PropTypes.arrayOf(PropTypes.object).isRequired,
-        label: PropTypes.string.isRequired,
-        tagName: PropTypes.string,
-        addRoomLabel: PropTypes.string,
-
-        // passed through to RoomTile and used to highlight room with `!` regardless of notifications count
-        isInvite: PropTypes.bool,
-
-        startAsHidden: PropTypes.bool,
-        showSpinner: PropTypes.bool, // true to show a spinner if 0 elements when expanded
-        collapsed: PropTypes.bool.isRequired, // is LeftPanel collapsed?
-        onHeaderClick: PropTypes.func,
-        incomingCall: PropTypes.object,
-        extraTiles: PropTypes.arrayOf(PropTypes.node), // extra elements added beneath tiles
-        forceExpand: PropTypes.bool,
-    };
-
-    static defaultProps = {
-        onHeaderClick: function() {
-        }, // NOP
-        extraTiles: [],
-        isInvite: false,
-    };
-
-    static getDerivedStateFromProps(props, state) {
-        return {
-            listLength: props.list.length,
-            scrollTop: props.list.length === state.listLength ? state.scrollTop : 0,
-        };
-    }
-
-    constructor(props) {
-        super(props);
-
-        this.state = {
-            hidden: this.props.startAsHidden || false,
-            // some values to get LazyRenderList starting
-            scrollerHeight: 800,
-            scrollTop: 0,
-            // React 16's getDerivedStateFromProps(props, state) doesn't give the previous props so
-            // we have to store the length of the list here so we can see if it's changed or not...
-            listLength: null,
-        };
-
-        this._header = createRef();
-        this._subList = createRef();
-        this._scroller = createRef();
-        this._headerButton = createRef();
-    }
-
-    componentDidMount() {
-        this.dispatcherRef = dis.register(this.onAction);
-    }
-
-    componentWillUnmount() {
-        dis.unregister(this.dispatcherRef);
-    }
-
-    // The header is collapsible if it is hidden or not stuck
-    // The dataset elements are added in the RoomList _initAndPositionStickyHeaders method
-    isCollapsibleOnClick() {
-        const stuck = this._header.current.dataset.stuck;
-        if (!this.props.forceExpand && (this.state.hidden || stuck === undefined || stuck === "none")) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    onAction = (payload) => {
-        switch (payload.action) {
-            case 'on_room_read':
-                // XXX: Previously RoomList would forceUpdate whenever on_room_read is dispatched,
-                // but this is no longer true, so we must do it here (and can apply the small
-                // optimisation of checking that we care about the room being read).
-                //
-                // Ultimately we need to transition to a state pushing flow where something
-                // explicitly notifies the components concerned that the notif count for a room
-                // has change (e.g. a Flux store).
-                if (this.props.list.some((r) => r.roomId === payload.roomId)) {
-                    this.forceUpdate();
-                }
-                break;
-
-            case 'view_room':
-                if (this.state.hidden && !this.props.forceExpand && payload.show_room_tile &&
-                    this.props.list.some((r) => r.roomId === payload.room_id)
-                ) {
-                    this.toggle();
-                }
-        }
-    };
-
-    toggle = () => {
-        if (this.isCollapsibleOnClick()) {
-            // The header isCollapsible, so the click is to be interpreted as collapse and truncation logic
-            const isHidden = !this.state.hidden;
-            this.setState({hidden: isHidden}, () => {
-                this.props.onHeaderClick(isHidden);
-            });
-        } else {
-            // The header is stuck, so the click is to be interpreted as a scroll to the header
-            this.props.onHeaderClick(this.state.hidden, this._header.current.dataset.originalPosition);
-        }
-    };
-
-    onClick = (ev) => {
-        this.toggle();
-    };
-
-    onHeaderKeyDown = (ev) => {
-        switch (ev.key) {
-            case Key.ARROW_LEFT:
-                // On ARROW_LEFT collapse the room sublist
-                if (!this.state.hidden && !this.props.forceExpand) {
-                    this.onClick();
-                }
-                ev.stopPropagation();
-                break;
-            case Key.ARROW_RIGHT: {
-                ev.stopPropagation();
-                if (this.state.hidden && !this.props.forceExpand) {
-                    // sublist is collapsed, expand it
-                    this.onClick();
-                } else if (!this.props.forceExpand) {
-                    // sublist is expanded, go to first room
-                    const element = this._subList.current && this._subList.current.querySelector(".mx_RoomTile");
-                    if (element) {
-                        element.focus();
-                    }
-                }
-                break;
-            }
-        }
-    };
-
-    onKeyDown = (ev) => {
-        switch (ev.key) {
-            // On ARROW_LEFT go to the sublist header
-            case Key.ARROW_LEFT:
-                ev.stopPropagation();
-                this._headerButton.current.focus();
-                break;
-            // Consume ARROW_RIGHT so it doesn't cause focus to get sent to composer
-            case Key.ARROW_RIGHT:
-                ev.stopPropagation();
-        }
-    };
-
-    onRoomTileClick = (roomId, ev) => {
-        dis.dispatch({
-            action: 'view_room',
-            show_room_tile: true, // to make sure the room gets scrolled into view
-            room_id: roomId,
-            clear_search: (ev && (ev.key === Key.ENTER || ev.key === Key.SPACE)),
-        });
-    };
-
-    _updateSubListCount = () => {
-        // Force an update by setting the state to the current state
-        // Doing it this way rather than using forceUpdate(), so that the shouldComponentUpdate()
-        // method is honoured
-        this.setState(this.state);
-    };
-
-    makeRoomTile = (room) => {
-        return <RoomTile
-            room={room}
-            roomSubList={this}
-            tagName={this.props.tagName}
-            key={room.roomId}
-            collapsed={this.props.collapsed || false}
-            unread={Unread.doesRoomHaveUnreadMessages(room)}
-            highlight={this.props.isInvite || RoomNotifs.getUnreadNotificationCount(room, 'highlight') > 0}
-            notificationCount={RoomNotifs.getUnreadNotificationCount(room)}
-            isInvite={this.props.isInvite}
-            refreshSubList={this._updateSubListCount}
-            incomingCall={null}
-            onClick={this.onRoomTileClick}
-        />;
-    };
-
-    _onNotifBadgeClick = (e) => {
-        // prevent the roomsublist collapsing
-        e.preventDefault();
-        e.stopPropagation();
-        const room = this.props.list.find(room => RoomNotifs.getRoomHasBadge(room));
-        if (room) {
-            dis.dispatch({
-                action: 'view_room',
-                room_id: room.roomId,
-            });
-        }
-    };
-
-    _onInviteBadgeClick = (e) => {
-        // prevent the roomsublist collapsing
-        e.preventDefault();
-        e.stopPropagation();
-        // switch to first room in sortedList as that'll be the top of the list for the user
-        if (this.props.list && this.props.list.length > 0) {
-            dis.dispatch({
-                action: 'view_room',
-                room_id: this.props.list[0].roomId,
-            });
-        } else if (this.props.extraTiles && this.props.extraTiles.length > 0) {
-            // Group Invites are different in that they are all extra tiles and not rooms
-            // XXX: this is a horrible special case because Group Invite sublist is a hack
-            if (this.props.extraTiles[0].props && this.props.extraTiles[0].props.group instanceof Group) {
-                dis.dispatch({
-                    action: 'view_group',
-                    group_id: this.props.extraTiles[0].props.group.groupId,
-                });
-            }
-        }
-    };
-
-    onAddRoom = (e) => {
-        e.stopPropagation();
-        if (this.props.onAddRoom) this.props.onAddRoom();
-    };
-
-    _getHeaderJsx(isCollapsed) {
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        const AccessibleTooltipButton = sdk.getComponent('elements.AccessibleTooltipButton');
-        const subListNotifications = !this.props.isInvite ?
-            RoomNotifs.aggregateNotificationCount(this.props.list) :
-            {count: 0, highlight: true};
-        const subListNotifCount = subListNotifications.count;
-        const subListNotifHighlight = subListNotifications.highlight;
-
-        // When collapsed, allow a long hover on the header to show user
-        // the full tag name and room count
-        let title;
-        if (this.props.collapsed) {
-            title = this.props.label;
-        }
-
-        let incomingCall;
-        if (this.props.incomingCall) {
-            // We can assume that if we have an incoming call then it is for this list
-            const IncomingCallBox = sdk.getComponent("voip.IncomingCallBox");
-            incomingCall =
-                <IncomingCallBox className="mx_RoomSubList_incomingCall" incomingCall={this.props.incomingCall} />;
-        }
-
-        const len = this.props.list.length + this.props.extraTiles.length;
-        let chevron;
-        if (len) {
-            const chevronClasses = classNames({
-                'mx_RoomSubList_chevron': true,
-                'mx_RoomSubList_chevronRight': isCollapsed,
-                'mx_RoomSubList_chevronDown': !isCollapsed,
-            });
-            chevron = (<div className={chevronClasses} />);
-        }
-
-        return <RovingTabIndexWrapper inputRef={this._headerButton}>
-            {({onFocus, isActive, ref}) => {
-                const tabIndex = isActive ? 0 : -1;
-
-                let badge;
-                if (!this.props.collapsed) {
-                    const badgeClasses = classNames({
-                        'mx_RoomSubList_badge': true,
-                        'mx_RoomSubList_badgeHighlight': subListNotifHighlight,
-                    });
-                    // Wrap the contents in a div and apply styles to the child div so that the browser default outline works
-                    if (subListNotifCount > 0) {
-                        badge = (
-                            <AccessibleButton
-                                tabIndex={tabIndex}
-                                className={badgeClasses}
-                                onClick={this._onNotifBadgeClick}
-                                aria-label={_t("Jump to first unread room.")}
-                            >
-                                <div>
-                                    { FormattingUtils.formatCount(subListNotifCount) }
-                                </div>
-                            </AccessibleButton>
-                        );
-                    } else if (this.props.isInvite && this.props.list.length) {
-                        // no notifications but highlight anyway because this is an invite badge
-                        badge = (
-                            <AccessibleButton
-                                tabIndex={tabIndex}
-                                className={badgeClasses}
-                                onClick={this._onInviteBadgeClick}
-                                aria-label={_t("Jump to first invite.")}
-                            >
-                                <div>
-                                    { this.props.list.length }
-                                </div>
-                            </AccessibleButton>
-                        );
-                    }
-                }
-
-                let addRoomButton;
-                if (this.props.onAddRoom) {
-                    addRoomButton = (
-                        <AccessibleTooltipButton
-                            tabIndex={tabIndex}
-                            onClick={this.onAddRoom}
-                            className="mx_RoomSubList_addRoom"
-                            title={this.props.addRoomLabel || _t("Add room")}
-                        />
-                    );
-                }
-
-                return (
-                    <div className="mx_RoomSubList_labelContainer" title={title} ref={this._header} onKeyDown={this.onHeaderKeyDown}>
-                        <AccessibleButton
-                            onFocus={onFocus}
-                            tabIndex={tabIndex}
-                            inputRef={ref}
-                            onClick={this.onClick}
-                            className="mx_RoomSubList_label"
-                            aria-expanded={!isCollapsed}
-                            role="treeitem"
-                            aria-level="1"
-                        >
-                            { chevron }
-                            <span>{this.props.label}</span>
-                            { incomingCall }
-                        </AccessibleButton>
-                        { badge }
-                        { addRoomButton }
-                    </div>
-                );
-            } }
-        </RovingTabIndexWrapper>;
-    }
-
-    checkOverflow = () => {
-        if (this._scroller.current) {
-            this._scroller.current.checkOverflow();
-        }
-    };
-
-    setHeight = (height) => {
-        if (this._subList.current) {
-            this._subList.current.style.height = toRem(height);
-        }
-        this._updateLazyRenderHeight(height);
-    };
-
-    _updateLazyRenderHeight(height) {
-        this.setState({scrollerHeight: height});
-    }
-
-    _onScroll = () => {
-        this.setState({scrollTop: this._scroller.current.getScrollTop()});
-    };
-
-    _canUseLazyListRendering() {
-        // for now disable lazy rendering as they are already rendered tiles
-        // not rooms like props.list we pass to LazyRenderList
-        return !this.props.extraTiles || !this.props.extraTiles.length;
-    }
-
-    render() {
-        const len = this.props.list.length + this.props.extraTiles.length;
-        const isCollapsed = this.state.hidden && !this.props.forceExpand;
-
-        const subListClasses = classNames({
-            "mx_RoomSubList": true,
-            "mx_RoomSubList_hidden": len && isCollapsed,
-            "mx_RoomSubList_nonEmpty": len && !isCollapsed,
-        });
-
-        let content;
-        if (len) {
-            if (isCollapsed) {
-                // no body
-            } else if (this._canUseLazyListRendering()) {
-                content = (
-                    <IndicatorScrollbar ref={this._scroller} className="mx_RoomSubList_scroll" onScroll={this._onScroll}>
-                        <LazyRenderList
-                            scrollTop={this.state.scrollTop }
-                            height={ this.state.scrollerHeight }
-                            renderItem={ this.makeRoomTile }
-                            itemHeight={34}
-                            items={ this.props.list } />
-                    </IndicatorScrollbar>
-                );
-            } else {
-                const roomTiles = this.props.list.map(r => this.makeRoomTile(r));
-                const tiles = roomTiles.concat(this.props.extraTiles);
-                content = (
-                    <IndicatorScrollbar ref={this._scroller} className="mx_RoomSubList_scroll" onScroll={this._onScroll}>
-                        { tiles }
-                    </IndicatorScrollbar>
-                );
-            }
-        } else {
-            if (this.props.showSpinner && !isCollapsed) {
-                const Loader = sdk.getComponent("elements.Spinner");
-                content = <Loader />;
-            }
-        }
-
-        return (
-            <div
-                ref={this._subList}
-                className={subListClasses}
-                role="group"
-                aria-label={this.props.label}
-                onKeyDown={this.onKeyDown}
-            >
-                { this._getHeaderJsx(isCollapsed) }
-                { content }
-            </div>
-        );
-    }
-}
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 69a2e54a2c..a79e5b0aa8 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -34,27 +34,29 @@ import ContentMessages from '../../ContentMessages';
 import Modal from '../../Modal';
 import * as sdk from '../../index';
 import CallHandler from '../../CallHandler';
-import dis from '../../dispatcher';
+import dis from '../../dispatcher/dispatcher';
 import Tinter from '../../Tinter';
 import rate_limited_func from '../../ratelimitedfunc';
 import * as ObjectUtils from '../../ObjectUtils';
 import * as Rooms from '../../Rooms';
-import eventSearch from '../../Searching';
+import eventSearch, {searchPagination} from '../../Searching';
 
-import {isOnlyCtrlOrCmdKeyEvent, Key} from '../../Keyboard';
+import {isOnlyCtrlOrCmdIgnoreShiftKeyEvent, isOnlyCtrlOrCmdKeyEvent, 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, {SettingLevel} from "../../settings/SettingsStore";
+import SettingsStore from "../../settings/SettingsStore";
 import AccessibleButton from "../views/elements/AccessibleButton";
 import RightPanelStore from "../../stores/RightPanelStore";
 import {haveTileForEvent} from "../views/rooms/EventTile";
 import RoomContext from "../../contexts/RoomContext";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import { shieldStatusForRoom } from '../../utils/ShieldUtils';
+import {Action} from "../../dispatcher/actions";
+import {SettingLevel} from "../../settings/SettingLevel";
 
 const DEBUG = false;
 let debuglog = function() {};
@@ -164,6 +166,10 @@ export default createReactClass({
 
             canReact: false,
             canReply: false,
+
+            useIRCLayout: SettingsStore.getValue("useIRCLayout"),
+
+            matrixClientIsReady: this.context && this.context.isInitialSyncComplete(),
         };
     },
 
@@ -193,6 +199,8 @@ export default createReactClass({
 
         this._roomView = createRef();
         this._searchResultsPanel = createRef();
+
+        this._layoutWatcherRef = SettingsStore.watchSetting("useIRCLayout", null, this.onLayoutChange);
     },
 
     _onReadReceiptsChange: function() {
@@ -232,7 +240,8 @@ export default createReactClass({
             initialEventId: RoomViewStore.getInitialEventId(),
             isInitialEventHighlighted: RoomViewStore.isInitialEventHighlighted(),
             forwardingEvent: RoomViewStore.getForwardingEvent(),
-            shouldPeek: RoomViewStore.shouldPeek(),
+            // we should only peek once we have a ready client
+            shouldPeek: this.state.matrixClientIsReady && RoomViewStore.shouldPeek(),
             showingPinned: SettingsStore.getValue("PinnedEvents.isOpen", roomId),
             showReadReceipts: SettingsStore.getValue("showReadReceipts", roomId),
         };
@@ -242,7 +251,7 @@ export default createReactClass({
             this.context.stopPeeking();
         }
 
-        // Temporary logging to diagnose https://github.com/vector-im/riot-web/issues/4307
+        // Temporary logging to diagnose https://github.com/vector-im/element-web/issues/4307
         console.log(
             'RVS update:',
             newState.roomId,
@@ -532,6 +541,14 @@ export default createReactClass({
         // no need to do this as Dir & Settings are now overlays. It just burnt CPU.
         // console.log("Tinter.tint from RoomView.unmount");
         // Tinter.tint(); // reset colourscheme
+
+        SettingsStore.unwatchSetting(this._layoutWatcherRef);
+    },
+
+    onLayoutChange: function() {
+        this.setState({
+            useIRCLayout: SettingsStore.getValue("useIRCLayout"),
+        });
     },
 
     _onRightPanelStoreUpdate: function() {
@@ -588,6 +605,18 @@ export default createReactClass({
                     handled = true;
                 }
                 break;
+            case Key.PAGE_UP:
+                if (!ev.altKey && !ev.ctrlKey && ev.shiftKey && !ev.metaKey) {
+                    this.jumpToReadMarker();
+                    handled = true;
+                }
+                break;
+            case Key.U.toUpperCase():
+                if (isOnlyCtrlOrCmdIgnoreShiftKeyEvent(ev) && ev.shiftKey) {
+                    dis.dispatch({ action: "upload_file" })
+                    handled = true;
+                }
+                break;
         }
 
         if (handled) {
@@ -669,6 +698,16 @@ export default createReactClass({
                     });
                 }
                 break;
+            case 'sync_state':
+                if (!this.state.matrixClientIsReady) {
+                    this.setState({
+                        matrixClientIsReady: this.context && this.context.isInitialSyncComplete(),
+                    }, () => {
+                        // send another "initial" RVS update to trigger peeking if needed
+                        this._onRoomViewStoreUpdate(true);
+                    });
+                }
+                break;
         }
     },
 
@@ -842,15 +881,6 @@ export default createReactClass({
             });
             return;
         }
-        if (!SettingsStore.getValue("feature_cross_signing")) {
-            room.hasUnverifiedDevices().then((hasUnverifiedDevices) => {
-                this.setState({
-                    e2eStatus: hasUnverifiedDevices ? "warning" : "verified",
-                });
-            });
-            debuglog("e2e check is warning/verified only as cross-signing is off");
-            return;
-        }
 
         /* At this point, the user has encryption on and cross-signing on */
         this.setState({
@@ -1007,8 +1037,7 @@ export default createReactClass({
 
         if (this.state.searchResults.next_batch) {
             debuglog("requesting more search results");
-            const searchPromise = this.context.backPaginateRoomEventsSearch(
-                this.state.searchResults);
+            const searchPromise = searchPagination(this.state.searchResults);
             return this._handleSearchResult(searchPromise);
         } else {
             debuglog("no more search results");
@@ -1049,7 +1078,7 @@ export default createReactClass({
             // Do this by indicating our intention to join
 
             // XXX: ILAG is disabled for now,
-            // see https://github.com/vector-im/riot-web/issues/8222
+            // see https://github.com/vector-im/element-web/issues/8222
             dis.dispatch({action: 'require_registration'});
             // dis.dispatch({
             //     action: 'will_join',
@@ -1134,7 +1163,7 @@ export default createReactClass({
             ev.dataTransfer.files, this.state.room.roomId, this.context,
         );
         this.setState({ draggingFile: false });
-        dis.dispatch({action: 'focus_composer'});
+        dis.fire(Action.FocusComposer);
     },
 
     onDragLeaveOrEnd: function(ev) {
@@ -1285,6 +1314,14 @@ export default createReactClass({
             const mxEv = result.context.getEvent();
             const roomId = mxEv.getRoomId();
             const room = this.context.getRoom(roomId);
+            if (!room) {
+                // if we do not have the room in js-sdk stores then hide it as we cannot easily show it
+                // As per the spec, an all rooms search can create this condition,
+                // it happens with Seshat but not Synapse.
+                // It will make the result count not match the displayed count.
+                console.log("Hiding search result from an unknown room", roomId);
+                continue;
+            }
 
             if (!haveTileForEvent(mxEv)) {
                 // XXX: can this ever happen? It will make the result count
@@ -1293,16 +1330,9 @@ export default createReactClass({
             }
 
             if (this.state.searchScope === 'All') {
-                if (roomId != lastRoomId) {
-
-                    // XXX: if we've left the room, we might not know about
-                    // it. We should tell the js sdk to go and find out about
-                    // it. But that's not an issue currently, as synapse only
-                    // returns results for rooms we're joined to.
-                    const roomName = room ? room.name : _t("Unknown room %(roomId)s", { roomId: roomId });
-
+                if (roomId !== lastRoomId) {
                     ret.push(<li key={mxEv.getId() + "-room"}>
-                                 <h2>{ _t("Room") }: { roomName }</h2>
+                                 <h2>{ _t("Room") }: { room.name }</h2>
                              </li>);
                     lastRoomId = roomId;
                 }
@@ -1340,7 +1370,7 @@ export default createReactClass({
                 event: null,
             });
         }
-        dis.dispatch({action: 'focus_composer'});
+        dis.fire(Action.FocusComposer);
     },
 
     onLeaveClick: function() {
@@ -1351,15 +1381,9 @@ export default createReactClass({
     },
 
     onForgetClick: function() {
-        this.context.forget(this.state.room.roomId).then(function() {
-            dis.dispatch({ action: 'view_next_room' });
-        }, function(err) {
-            const errCode = err.errcode || _t("unknown error code");
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            Modal.createTrackedDialog('Failed to forget room', '', ErrorDialog, {
-                title: _t("Error"),
-                description: _t("Failed to forget room %(errCode)s", { errCode: errCode }),
-            });
+        dis.dispatch({
+            action: 'forget_room',
+            room_id: this.state.room.roomId,
         });
     },
 
@@ -1429,9 +1453,7 @@ export default createReactClass({
         // using /leave rather than /join. In the short term though, we
         // just ignore them.
         // https://github.com/vector-im/vector-web/issues/1134
-        dis.dispatch({
-            action: 'view_room_directory',
-        });
+        dis.fire(Action.ViewRoomDirectory);
     },
 
     onSearchClick: function() {
@@ -1451,7 +1473,7 @@ export default createReactClass({
     // jump down to the bottom of this room, where new events are arriving
     jumpToLiveTimeline: function() {
         this._messagePanel.jumpToLiveTimeline();
-        dis.dispatch({action: 'focus_composer'});
+        dis.fire(Action.FocusComposer);
     },
 
     // jump up to wherever our read marker is
@@ -1651,14 +1673,16 @@ export default createReactClass({
         const ErrorBoundary = sdk.getComponent("elements.ErrorBoundary");
 
         if (!this.state.room) {
-            const loading = this.state.roomLoading || this.state.peekLoading;
+            const loading = !this.state.matrixClientIsReady || this.state.roomLoading || this.state.peekLoading;
             if (loading) {
+                // Assume preview loading if we don't have a ready client or a room ID (still resolving the alias)
+                const previewLoading = !this.state.matrixClientIsReady || !this.state.roomId || this.state.peekLoading;
                 return (
                     <div className="mx_RoomView">
                         <ErrorBoundary>
                             <RoomPreviewBar
                                 canPreview={false}
-                                previewLoading={this.state.peekLoading}
+                                previewLoading={previewLoading && !this.state.roomLoadError}
                                 error={this.state.roomLoadError}
                                 loading={loading}
                                 joining={this.state.joining}
@@ -1683,7 +1707,8 @@ export default createReactClass({
                 return (
                     <div className="mx_RoomView">
                         <ErrorBoundary>
-                            <RoomPreviewBar onJoinClick={this.onJoinButtonClicked}
+                            <RoomPreviewBar
+                                onJoinClick={this.onJoinButtonClicked}
                                 onForgetClick={this.onForgetClick}
                                 onRejectClick={this.onRejectThreepidInviteButtonClicked}
                                 canPreview={false} error={this.state.roomLoadError}
@@ -1717,8 +1742,11 @@ export default createReactClass({
             } else {
                 const myUserId = this.context.credentials.userId;
                 const myMember = this.state.room.getMember(myUserId);
-                const inviteEvent = myMember.events.member;
-                var inviterName = inviteEvent.sender ? inviteEvent.sender.name : inviteEvent.getSender();
+                const inviteEvent = myMember ? myMember.events.member : null;
+                let inviterName = _t("Unknown");
+                if (inviteEvent) {
+                    inviterName = inviteEvent.sender ? inviteEvent.sender.name : inviteEvent.getSender();
+                }
 
                 // We deliberately don't try to peek into invites, even if we have permission to peek
                 // as they could be a spam vector.
@@ -1786,6 +1814,7 @@ export default createReactClass({
         );
 
         const showRoomRecoveryReminder = (
+            this.context.isCryptoEnabled() &&
             SettingsStore.getValue("showRoomRecoveryReminder") &&
             this.context.isRoomEncrypted(this.state.room.roomId) &&
             this.context.getKeyBackupEnabled() === false
@@ -1884,6 +1913,7 @@ export default createReactClass({
                     disabled={this.props.disabled}
                     showApps={this.state.showApps}
                     e2eStatus={this.state.e2eStatus}
+                    resizeNotifier={this.props.resizeNotifier}
                     permalinkCreator={this._getPermalinkCreatorForRoom(this.state.room)}
                 />;
         }
@@ -1899,25 +1929,29 @@ export default createReactClass({
         }
 
         if (inCall) {
-            let zoomButton; let voiceMuteButton; let videoMuteButton;
+            let zoomButton; let videoMuteButton;
 
             if (call.type === "video") {
                 zoomButton = (
                     <div className="mx_RoomView_voipButton" onClick={this.onFullscreenClick} title={_t("Fill screen")}>
-                        <TintableSvg src={require("../../../res/img/fullscreen.svg")} width="29" height="22" style={{ marginTop: 1, marginRight: 4 }} />
+                        <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={call.isLocalVideoMuted() ? require("../../../res/img/video-unmute.svg") : require("../../../res/img/video-mute.svg")}
+                        <TintableSvg src={call.isLocalVideoMuted() ?
+                            require("../../../res/img/element-icons/call/video-muted.svg") :
+                            require("../../../res/img/element-icons/call/video-call.svg")}
                              alt={call.isLocalVideoMuted() ? _t("Click to unmute video") : _t("Click to mute video")}
-                             width="31" height="27" />
+                             width="" height="27" />
                     </div>;
             }
-            voiceMuteButton =
+            const voiceMuteButton =
                 <div className="mx_RoomView_voipButton" onClick={this.onMuteAudioClick}>
-                    <TintableSvg src={call.isMicrophoneMuted() ? require("../../../res/img/voice-unmute.svg") : require("../../../res/img/voice-mute.svg")}
+                    <TintableSvg src={call.isMicrophoneMuted() ?
+                        require("../../../res/img/element-icons/call/voice-muted.svg") :
+                        require("../../../res/img/element-icons/call/voice-unmuted.svg")}
                          alt={call.isMicrophoneMuted() ? _t("Click to unmute audio") : _t("Click to mute audio")}
                          width="21" height="26" />
                 </div>;
@@ -1929,7 +1963,6 @@ export default createReactClass({
                     { videoMuteButton }
                     { zoomButton }
                     { statusBar }
-                    <TintableSvg className="mx_RoomView_voipChevron" src={require("../../../res/img/voip-chevron.svg")} width="22" height="17" />
                 </div>;
         }
 
@@ -1944,8 +1977,9 @@ export default createReactClass({
                 searchResultsPanel = (<div className="mx_RoomView_messagePanel mx_RoomView_messagePanelSearchSpinner" />);
             } else {
                 searchResultsPanel = (
-                    <ScrollPanel ref={this._searchResultsPanel}
-                        className="mx_RoomView_messagePanel mx_RoomView_searchResultsPanel"
+                    <ScrollPanel
+                        ref={this._searchResultsPanel}
+                        className="mx_RoomView_messagePanel mx_RoomView_searchResultsPanel mx_GroupLayout"
                         onFillRequest={this.onSearchResultsFillRequest}
                         resizeNotifier={this.props.resizeNotifier}
                     >
@@ -1965,6 +1999,13 @@ export default createReactClass({
             highlightedEventId = this.state.initialEventId;
         }
 
+        const messagePanelClassNames = classNames(
+            "mx_RoomView_messagePanel",
+            {
+                "mx_IRCLayout": this.state.useIRCLayout,
+                "mx_GroupLayout": !this.state.useIRCLayout,
+            });
+
         // console.info("ShowUrlPreview for %s is %s", this.state.room.roomId, this.state.showUrlPreview);
         const messagePanel = (
             <TimelinePanel
@@ -1980,11 +2021,12 @@ export default createReactClass({
                 onScroll={this.onMessageListScroll}
                 onReadMarkerUpdated={this._updateTopUnreadMessagesBar}
                 showUrlPreview = {this.state.showUrlPreview}
-                className="mx_RoomView_messagePanel"
+                className={messagePanelClassNames}
                 membersLoaded={this.state.membersLoaded}
                 permalinkCreator={this._getPermalinkCreatorForRoom(this.state.room)}
                 resizeNotifier={this.props.resizeNotifier}
                 showReactions={true}
+                useIRCLayout={this.state.useIRCLayout}
             />);
 
         let topUnreadMessagesBar = null;
@@ -2001,6 +2043,7 @@ export default createReactClass({
         if (!this.state.atEndOfLiveTimeline && !this.state.searchResults) {
             const JumpToBottomButton = sdk.getComponent('rooms.JumpToBottomButton');
             jumpToBottom = (<JumpToBottomButton
+                highlight={this.state.room.getUnreadNotificationCount('highlight') > 0}
                 numUnreadMessages={this.state.numUnreadMessages}
                 onScrollToBottomClick={this.jumpToLiveTimeline}
             />);
diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index 4f44c1a169..51113f4f56 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -144,6 +144,11 @@ export default createReactClass({
         /* resizeNotifier: ResizeNotifier to know when middle column has changed size
          */
         resizeNotifier: PropTypes.object,
+
+        /* fixedChildren: allows for children to be passed which are rendered outside
+         * of the wrapper
+         */
+        fixedChildren: PropTypes.node,
     },
 
     getDefaultProps: function() {
@@ -643,7 +648,9 @@ export default createReactClass({
 
         if (scrollState.stuckAtBottom) {
             const sn = this._getScrollNode();
-            sn.scrollTop = sn.scrollHeight;
+            if (sn.scrollTop !== sn.scrollHeight) {
+                sn.scrollTop = sn.scrollHeight;
+            }
         } else if (scrollState.trackedScrollToken) {
             const itemlist = this._itemlist.current;
             const trackedNode = this._getTrackedNode();
@@ -652,7 +659,10 @@ export default createReactClass({
                 const bottomDiff = newBottomOffset - scrollState.bottomOffset;
                 this._bottomGrowth += bottomDiff;
                 scrollState.bottomOffset = newBottomOffset;
-                itemlist.style.height = `${this._getListHeight()}px`;
+                const newHeight = `${this._getListHeight()}px`;
+                if (itemlist.style.height !== newHeight) {
+                    itemlist.style.height = newHeight;
+                }
                 debuglog("balancing height because messages below viewport grew by", bottomDiff);
             }
         }
@@ -689,12 +699,16 @@ export default createReactClass({
         const height = Math.max(minHeight, contentHeight);
         this._pages = Math.ceil(height / PAGE_SIZE);
         this._bottomGrowth = 0;
-        const newHeight = this._getListHeight();
+        const newHeight = `${this._getListHeight()}px`;
 
         const scrollState = this.scrollState;
         if (scrollState.stuckAtBottom) {
-            itemlist.style.height = `${newHeight}px`;
-            sn.scrollTop = sn.scrollHeight;
+            if (itemlist.style.height !== newHeight) {
+                itemlist.style.height = newHeight;
+            }
+            if (sn.scrollTop !== sn.scrollHeight){
+                sn.scrollTop = sn.scrollHeight;
+            }
             debuglog("updateHeight to", newHeight);
         } else if (scrollState.trackedScrollToken) {
             const trackedNode = this._getTrackedNode();
@@ -704,7 +718,9 @@ export default createReactClass({
             // the currently filled piece of the timeline
             if (trackedNode) {
                 const oldTop = trackedNode.offsetTop;
-                itemlist.style.height = `${newHeight}px`;
+                if (itemlist.style.height !== newHeight) {
+                    itemlist.style.height = newHeight;
+                }
                 const newTop = trackedNode.offsetTop;
                 const topDiff = newTop - oldTop;
                 // important to scroll by a relative amount as
@@ -881,6 +897,7 @@ export default createReactClass({
         return (<AutoHideScrollbar wrappedRef={this._collectScroll}
                 onScroll={this.onScroll}
                 className={`mx_ScrollPanel ${this.props.className}`} style={this.props.style}>
+                    { this.props.fixedChildren }
                     <div className="mx_RoomView_messageListWrapper">
                         <ol ref={this._itemlist} className="mx_RoomView_MessageList" aria-live="polite" role="list">
                             { this.props.children }
diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js
index 0f3f8a6be9..7e9d290bce 100644
--- a/src/components/structures/SearchBox.js
+++ b/src/components/structures/SearchBox.js
@@ -19,7 +19,7 @@ import React, {createRef} from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import { Key } from '../../Keyboard';
-import dis from '../../dispatcher';
+import dis from '../../dispatcher/dispatcher';
 import { throttle } from 'lodash';
 import AccessibleButton from '../../components/views/elements/AccessibleButton';
 import classNames from 'classnames';
diff --git a/src/components/structures/TabbedView.tsx b/src/components/structures/TabbedView.tsx
index c0e0e58db8..704dbf8832 100644
--- a/src/components/structures/TabbedView.tsx
+++ b/src/components/structures/TabbedView.tsx
@@ -27,25 +27,20 @@ import { ReactNode } from "react";
  * Represents a tab for the TabbedView.
  */
 export class Tab {
-    public label: string;
-    public icon: string;
-    public body: React.ReactNode;
-
     /**
      * Creates a new tab.
-     * @param {string} tabLabel The untranslated tab label.
-     * @param {string} tabIconClass The class for the tab icon. This should be a simple mask.
-     * @param {React.ReactNode} tabJsx The JSX for the tab container.
+     * @param {string} id The tab's ID.
+     * @param {string} label The untranslated tab label.
+     * @param {string} icon The class for the tab icon. This should be a simple mask.
+     * @param {React.ReactNode} body The JSX for the tab container.
      */
-    constructor(tabLabel: string, tabIconClass: string, tabJsx: React.ReactNode) {
-        this.label = tabLabel;
-        this.icon = tabIconClass;
-        this.body = tabJsx;
+    constructor(public id: string, public label: string, public icon: string, public body: React.ReactNode) {
     }
 }
 
 interface IProps {
     tabs: Tab[];
+    initialTabId?: string;
 }
 
 interface IState {
@@ -53,16 +48,17 @@ interface IState {
 }
 
 export default class TabbedView extends React.Component<IProps, IState> {
-    static propTypes = {
-        // The tabs to show
-        tabs: PropTypes.arrayOf(PropTypes.instanceOf(Tab)).isRequired,
-    };
-
     constructor(props: IProps) {
         super(props);
 
+        let activeTabIndex = 0;
+        if (props.initialTabId) {
+            const tabIndex = props.tabs.findIndex(t => t.id === props.initialTabId);
+            if (tabIndex >= 0) activeTabIndex = tabIndex;
+        }
+
         this.state = {
-            activeTabIndex: 0,
+            activeTabIndex,
         };
     }
 
diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 6642cce098..4f8a051e62 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -22,7 +22,7 @@ import TagOrderStore from '../../stores/TagOrderStore';
 import GroupActions from '../../actions/GroupActions';
 
 import * as sdk from '../../index';
-import dis from '../../dispatcher';
+import dis from '../../dispatcher/dispatcher';
 import { _t } from '../../languageHandler';
 
 import { Droppable } from 'react-beautiful-dnd';
@@ -141,7 +141,7 @@ const TagPanel = createReactClass({
             <AutoHideScrollbar
                 className="mx_TagPanel_scroller"
                 // XXX: Use onMouseDown as a workaround for https://github.com/atlassian/react-beautiful-dnd/issues/273
-                // instead of onClick. Otherwise we experience https://github.com/vector-im/riot-web/issues/6253
+                // instead of onClick. Otherwise we experience https://github.com/vector-im/element-web/issues/6253
                 onMouseDown={this.onMouseDown}
             >
                 <Droppable
diff --git a/src/components/structures/TagPanelButtons.js b/src/components/structures/TagPanelButtons.js
deleted file mode 100644
index 93a596baa3..0000000000
--- a/src/components/structures/TagPanelButtons.js
+++ /dev/null
@@ -1,59 +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 createReactClass from 'create-react-class';
-import * as sdk from '../../index';
-import dis from '../../dispatcher';
-import Modal from '../../Modal';
-import { _t } from '../../languageHandler';
-
-const TagPanelButtons = createReactClass({
-    displayName: 'TagPanelButtons',
-
-
-    componentDidMount: function() {
-        this._dispatcherRef = dis.register(this._onAction);
-    },
-
-    componentWillUnmount() {
-        if (this._dispatcherRef) {
-            dis.unregister(this._dispatcherRef);
-            this._dispatcherRef = null;
-        }
-    },
-
-    _onAction(payload) {
-        if (payload.action === "show_redesign_feedback_dialog") {
-            const RedesignFeedbackDialog =
-                sdk.getComponent("views.dialogs.RedesignFeedbackDialog");
-            Modal.createTrackedDialog('Report bugs & give feedback', '', RedesignFeedbackDialog);
-        }
-    },
-
-    render() {
-        const GroupsButton = sdk.getComponent('elements.GroupsButton');
-        const ActionButton = sdk.getComponent("elements.ActionButton");
-
-        return (<div className="mx_TagPanelButtons">
-            <GroupsButton />
-            <ActionButton
-                className="mx_TagPanelButtons_report" action="show_redesign_feedback_dialog"
-                label={_t("Report bugs & give feedback")} tooltip={true} />
-        </div>);
-    },
-});
-export default TagPanelButtons;
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 6a08cd78eb..2313b60ab1 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -29,7 +29,7 @@ import {MatrixClientPeg} from "../../MatrixClientPeg";
 import * as ObjectUtils from "../../ObjectUtils";
 import UserActivity from "../../UserActivity";
 import Modal from "../../Modal";
-import dis from "../../dispatcher";
+import dis from "../../dispatcher/dispatcher";
 import * as sdk from "../../index";
 import { Key } from '../../Keyboard';
 import Timer from '../../utils/Timer';
@@ -112,6 +112,9 @@ const TimelinePanel = createReactClass({
 
         // whether to show reactions for an event
         showReactions: PropTypes.bool,
+
+        // whether to use the irc layout
+        useIRCLayout: PropTypes.bool,
     },
 
     statics: {
@@ -795,6 +798,9 @@ const TimelinePanel = createReactClass({
                 readMarkerVisible: false,
             });
         }
+
+        // Send the updated read marker (along with read receipt) to the server
+        this.sendReadReceipt();
     },
 
 
@@ -1180,7 +1186,7 @@ const TimelinePanel = createReactClass({
             if (!timeline) {
                 // Somehow, it seems to be possible for live events to not have
                 // a timeline, even though that should not happen. :(
-                // https://github.com/vector-im/riot-web/issues/12120
+                // https://github.com/vector-im/element-web/issues/12120
                 console.warn(
                     `Event ${events[i].getId()} in room ${room.roomId} is live, ` +
                     `but it does not have a timeline`,
@@ -1447,6 +1453,7 @@ const TimelinePanel = createReactClass({
                 getRelationsForEvent={this.getRelationsForEvent}
                 editState={this.state.editState}
                 showReactions={this.props.showReactions}
+                useIRCLayout={this.props.useIRCLayout}
             />
         );
     },
diff --git a/src/components/structures/ToastContainer.js b/src/components/structures/ToastContainer.tsx
similarity index 69%
rename from src/components/structures/ToastContainer.js
rename to src/components/structures/ToastContainer.tsx
index 283fbdd96a..84473031fa 100644
--- a/src/components/structures/ToastContainer.js
+++ b/src/components/structures/ToastContainer.tsx
@@ -15,14 +15,21 @@ limitations under the License.
 */
 
 import * as React from "react";
-import { _t } from '../../languageHandler';
-import ToastStore from "../../stores/ToastStore";
+import ToastStore, {IToast} from "../../stores/ToastStore";
 import classNames from "classnames";
 
-export default class ToastContainer extends React.Component {
-    constructor() {
-        super();
-        this.state = {toasts: ToastStore.sharedInstance().getToasts()};
+interface IState {
+    toasts: IToast<any>[];
+    countSeen: number;
+}
+
+export default class ToastContainer extends React.Component<{}, IState> {
+    constructor(props, context) {
+        super(props, context);
+        this.state = {
+            toasts: ToastStore.sharedInstance().getToasts(),
+            countSeen: ToastStore.sharedInstance().getCountSeen(),
+        };
 
         // Start listening here rather than in componentDidMount because
         // toasts may dismiss themselves in their didMount if they find
@@ -36,7 +43,10 @@ export default class ToastContainer extends React.Component {
     }
 
     _onToastStoreUpdate = () => {
-        this.setState({toasts: ToastStore.sharedInstance().getToasts()});
+        this.setState({
+            toasts: ToastStore.sharedInstance().getToasts(),
+            countSeen: ToastStore.sharedInstance().getCountSeen(),
+        });
     };
 
     render() {
@@ -50,14 +60,21 @@ export default class ToastContainer extends React.Component {
                 "mx_Toast_hasIcon": icon,
                 [`mx_Toast_icon_${icon}`]: icon,
             });
-            const countIndicator = isStacked ? _t(" (1/%(totalCount)s)", {totalCount}) : null;
+
+            let countIndicator;
+            if (isStacked || this.state.countSeen > 0) {
+                countIndicator = ` (${this.state.countSeen + 1}/${this.state.countSeen + totalCount})`;
+            }
 
             const toastProps = Object.assign({}, props, {
                 key,
                 toastKey: key,
             });
             toast = (<div className={toastClasses}>
-                <h2>{title}{countIndicator}</h2>
+                <div className="mx_Toast_title">
+                    <h2>{title}</h2>
+                    <span>{countIndicator}</span>
+                </div>
                 <div className="mx_Toast_body">{React.createElement(component, toastProps)}</div>
             </div>);
         }
diff --git a/src/components/structures/TopLeftMenuButton.js b/src/components/structures/TopLeftMenuButton.js
deleted file mode 100644
index ebd7aaae89..0000000000
--- a/src/components/structures/TopLeftMenuButton.js
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
-Copyright 2018 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 TopLeftMenu from '../views/context_menus/TopLeftMenu';
-import BaseAvatar from '../views/avatars/BaseAvatar';
-import {MatrixClientPeg} from '../../MatrixClientPeg';
-import * as Avatar from '../../Avatar';
-import { _t } from '../../languageHandler';
-import dis from "../../dispatcher";
-import {ContextMenu, ContextMenuButton} from "./ContextMenu";
-
-const AVATAR_SIZE = 28;
-
-export default class TopLeftMenuButton extends React.Component {
-    static propTypes = {
-        collapsed: PropTypes.bool.isRequired,
-    };
-
-    static displayName = 'TopLeftMenuButton';
-
-    constructor() {
-        super();
-        this.state = {
-            menuDisplayed: false,
-            profileInfo: null,
-        };
-    }
-
-    async _getProfileInfo() {
-        const cli = MatrixClientPeg.get();
-        const userId = cli.getUserId();
-        const profileInfo = await cli.getProfileInfo(userId);
-        const avatarUrl = Avatar.avatarUrlForUser(
-            {avatarUrl: profileInfo.avatar_url},
-            AVATAR_SIZE, AVATAR_SIZE, "crop");
-
-        return {
-            userId,
-            name: profileInfo.displayname,
-            avatarUrl,
-        };
-    }
-
-    async componentDidMount() {
-        this._dispatcherRef = dis.register(this.onAction);
-
-        try {
-            const profileInfo = await this._getProfileInfo();
-            this.setState({profileInfo});
-        } catch (ex) {
-            console.log("could not fetch profile");
-            console.error(ex);
-        }
-    }
-
-    componentWillUnmount() {
-        dis.unregister(this._dispatcherRef);
-    }
-
-    onAction = (payload) => {
-        // For accessibility
-        if (payload.action === "toggle_top_left_menu") {
-            if (this._buttonRef) this._buttonRef.click();
-        }
-    };
-
-    _getDisplayName() {
-        if (MatrixClientPeg.get().isGuest()) {
-            return _t("Guest");
-        } else if (this.state.profileInfo) {
-            return this.state.profileInfo.name;
-        } else {
-            return MatrixClientPeg.get().getUserId();
-        }
-    }
-
-    openMenu = (e) => {
-        e.preventDefault();
-        e.stopPropagation();
-        this.setState({ menuDisplayed: true });
-    };
-
-    closeMenu = () => {
-        this.setState({
-            menuDisplayed: false,
-        });
-    };
-
-    render() {
-        const cli = MatrixClientPeg.get().getUserId();
-
-        const name = this._getDisplayName();
-        let nameElement;
-        let chevronElement;
-        if (!this.props.collapsed) {
-            nameElement = <div className="mx_TopLeftMenuButton_name">
-                { name }
-            </div>;
-            chevronElement = <span className="mx_TopLeftMenuButton_chevron" />;
-        }
-
-        let contextMenu;
-        if (this.state.menuDisplayed) {
-            const elementRect = this._buttonRef.getBoundingClientRect();
-
-            contextMenu = (
-                <ContextMenu
-                    chevronFace="none"
-                    left={elementRect.left}
-                    top={elementRect.top + elementRect.height}
-                    onFinished={this.closeMenu}
-                >
-                    <TopLeftMenu displayName={name} userId={cli} onFinished={this.closeMenu} />
-                </ContextMenu>
-            );
-        }
-
-        return <React.Fragment>
-            <ContextMenuButton
-                className="mx_TopLeftMenuButton"
-                onClick={this.openMenu}
-                inputRef={(r) => this._buttonRef = r}
-                label={_t("Your profile")}
-                isExpanded={this.state.menuDisplayed}
-            >
-                <BaseAvatar
-                    idName={MatrixClientPeg.get().getUserId()}
-                    name={name}
-                    url={this.state.profileInfo && this.state.profileInfo.avatarUrl}
-                    width={AVATAR_SIZE}
-                    height={AVATAR_SIZE}
-                    resizeMethod="crop"
-                />
-                { nameElement }
-                { chevronElement }
-            </ContextMenuButton>
-
-            { contextMenu }
-        </React.Fragment>;
-    }
-}
diff --git a/src/components/structures/UploadBar.js b/src/components/structures/UploadBar.js
index 1aec63f04e..421d1d79a7 100644
--- a/src/components/structures/UploadBar.js
+++ b/src/components/structures/UploadBar.js
@@ -19,7 +19,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import ContentMessages from '../../ContentMessages';
-import dis from "../../dispatcher";
+import dis from "../../dispatcher/dispatcher";
 import filesize from "filesize";
 import { _t } from '../../languageHandler';
 
diff --git a/src/components/structures/UserMenu.tsx b/src/components/structures/UserMenu.tsx
new file mode 100644
index 0000000000..e782618872
--- /dev/null
+++ b/src/components/structures/UserMenu.tsx
@@ -0,0 +1,344 @@
+/*
+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 { MatrixClientPeg } from "../../MatrixClientPeg";
+import defaultDispatcher 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 { OpenToTabPayload } from "../../dispatcher/payloads/OpenToTabPayload";
+import RedesignFeedbackDialog from "../views/dialogs/RedesignFeedbackDialog";
+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 SdkConfig from "../../SdkConfig";
+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, {
+    IconizedContextMenuOption,
+    IconizedContextMenuOptionList
+} from "../views/context_menus/IconizedContextMenu";
+
+interface IProps {
+    isMinimized: boolean;
+}
+
+type PartialDOMRect = Pick<DOMRect, "width" | "left" | "top" | "height">;
+
+interface IState {
+    contextMenuPosition: PartialDOMRect;
+    isDarkTheme: boolean;
+}
+
+export default class UserMenu extends React.Component<IProps, IState> {
+    private dispatcherRef: string;
+    private themeWatcherRef: string;
+    private buttonRef: React.RefObject<HTMLButtonElement> = createRef();
+
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            contextMenuPosition: null,
+            isDarkTheme: this.isUserOnDarkTheme(),
+        };
+
+        OwnProfileStore.instance.on(UPDATE_EVENT, this.onProfileUpdate);
+    }
+
+    private get hasHomePage(): boolean {
+        return !!getHomePageUrl(SdkConfig.get());
+    }
+
+    public componentDidMount() {
+        this.dispatcherRef = defaultDispatcher.register(this.onAction);
+        this.themeWatcherRef = SettingsStore.watchSetting("theme", null, this.onThemeChanged);
+    }
+
+    public componentWillUnmount() {
+        if (this.themeWatcherRef) SettingsStore.unwatchSetting(this.themeWatcherRef);
+        if (this.dispatcherRef) defaultDispatcher.unregister(this.dispatcherRef);
+        OwnProfileStore.instance.off(UPDATE_EVENT, this.onProfileUpdate);
+    }
+
+    private isUserOnDarkTheme(): boolean {
+        const theme = SettingsStore.getValue("theme");
+        if (theme.startsWith("custom-")) {
+            return getCustomTheme(theme.substring("custom-".length)).is_dark;
+        }
+        return theme === "dark";
+    }
+
+    private onProfileUpdate = async () => {
+        // the store triggered an update, so force a layout update. We don't
+        // have any state to store here for that to magically happen.
+        this.forceUpdate();
+    };
+
+    private onThemeChanged = () => {
+        this.setState({isDarkTheme: this.isUserOnDarkTheme()});
+    };
+
+    private onAction = (ev: ActionPayload) => {
+        if (ev.action !== Action.ToggleUserMenu) return; // not interested
+
+        if (this.state.contextMenuPosition) {
+            this.setState({contextMenuPosition: null});
+        } else {
+            if (this.buttonRef.current) this.buttonRef.current.click();
+        }
+    };
+
+    private onOpenMenuClick = (ev: React.MouseEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+        const target = ev.target as HTMLButtonElement;
+        this.setState({contextMenuPosition: target.getBoundingClientRect()});
+    };
+
+    private onContextMenu = (ev: React.MouseEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+        this.setState({
+            contextMenuPosition: {
+                left: ev.clientX,
+                top: ev.clientY,
+                width: 20,
+                height: 0,
+            },
+        });
+    };
+
+    private onCloseMenu = () => {
+        this.setState({contextMenuPosition: null});
+    };
+
+    private onSwitchThemeClick = (ev: React.MouseEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        // Disable system theme matching if the user hits this button
+        SettingsStore.setValue("use_system_theme", null, SettingLevel.DEVICE, false);
+
+        const newTheme = this.state.isDarkTheme ? "light" : "dark";
+        SettingsStore.setValue("theme", null, SettingLevel.DEVICE, newTheme); // set at same level as Appearance tab
+    };
+
+    private onSettingsOpen = (ev: ButtonEvent, tabId: string) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        const payload: OpenToTabPayload = {action: Action.ViewUserSettings, initialTabId: tabId};
+        defaultDispatcher.dispatch(payload);
+        this.setState({contextMenuPosition: null}); // also close the menu
+    };
+
+    private onShowArchived = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        // TODO: Archived room view: https://github.com/vector-im/element-web/issues/14038
+        // Note: You'll need to uncomment the button too.
+        console.log("TODO: Show archived rooms");
+    };
+
+    private onProvideFeedback = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        Modal.createTrackedDialog('Report bugs & give feedback', '', RedesignFeedbackDialog);
+        this.setState({contextMenuPosition: null}); // also close the menu
+    };
+
+    private onSignOutClick = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        Modal.createTrackedDialog('Logout from LeftPanel', '', LogoutDialog);
+        this.setState({contextMenuPosition: null}); // also close the menu
+    };
+
+    private onHomeClick = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        defaultDispatcher.dispatch({action: 'view_home_page'});
+    };
+
+    private renderContextMenu = (): React.ReactNode => {
+        if (!this.state.contextMenuPosition) return null;
+
+        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>
+                            ),
+                        },
+                    )}
+                </div>
+            );
+        }
+
+        let homeButton = null;
+        if (this.hasHomePage) {
+            homeButton = (
+                <IconizedContextMenuOption
+                    iconClassName="mx_UserMenu_iconHome"
+                    label={_t("Home")}
+                    onClick={this.onHomeClick}
+                />
+            );
+        }
+
+        return <IconizedContextMenu
+            // -20 to overlap the context menu by just over the width of the `...` icon and make it look connected
+            left={this.state.contextMenuPosition.width + this.state.contextMenuPosition.left - 20}
+            top={this.state.contextMenuPosition.top + this.state.contextMenuPosition.height}
+            onFinished={this.onCloseMenu}
+            className="mx_UserMenu_contextMenu"
+        >
+            <div className="mx_UserMenu_contextMenu_header">
+                <div className="mx_UserMenu_contextMenu_name">
+                        <span className="mx_UserMenu_contextMenu_displayName">
+                            {OwnProfileStore.instance.displayName}
+                        </span>
+                    <span className="mx_UserMenu_contextMenu_userId">
+                            {MatrixClientPeg.get().getUserId()}
+                        </span>
+                </div>
+                <AccessibleTooltipButton
+                    className="mx_UserMenu_contextMenu_themeButton"
+                    onClick={this.onSwitchThemeClick}
+                    title={this.state.isDarkTheme ? _t("Switch to light mode") : _t("Switch to dark mode")}
+                >
+                    <img
+                        src={require("../../../res/img/element-icons/roomlist/dark-light-mode.svg")}
+                        alt={_t("Switch theme")}
+                        width={16}
+                    />
+                </AccessibleTooltipButton>
+            </div>
+            {hostingLink}
+            <IconizedContextMenuOptionList>
+                {homeButton}
+                <IconizedContextMenuOption
+                    iconClassName="mx_UserMenu_iconBell"
+                    label={_t("Notification settings")}
+                    onClick={(e) => this.onSettingsOpen(e, USER_NOTIFICATIONS_TAB)}
+                />
+                <IconizedContextMenuOption
+                    iconClassName="mx_UserMenu_iconLock"
+                    label={_t("Security & privacy")}
+                    onClick={(e) => this.onSettingsOpen(e, USER_SECURITY_TAB)}
+                />
+                <IconizedContextMenuOption
+                    iconClassName="mx_UserMenu_iconSettings"
+                    label={_t("All settings")}
+                    onClick={(e) => this.onSettingsOpen(e, null)}
+                />
+                {/* <IconizedContextMenuOption
+                    iconClassName="mx_UserMenu_iconArchive"
+                    label={_t("Archived rooms")}
+                    onClick={this.onShowArchived}
+                /> */}
+                <IconizedContextMenuOption
+                    iconClassName="mx_UserMenu_iconMessage"
+                    label={_t("Feedback")}
+                    onClick={this.onProvideFeedback}
+                />
+            </IconizedContextMenuOptionList>
+            <IconizedContextMenuOptionList red>
+                <IconizedContextMenuOption
+                    iconClassName="mx_UserMenu_iconSignOut"
+                    label={_t("Sign out")}
+                    onClick={this.onSignOutClick}
+                />
+            </IconizedContextMenuOptionList>
+        </IconizedContextMenu>;
+    };
+
+    public render() {
+        const avatarSize = 32; // should match border-radius of the avatar
+
+        let name = <span className="mx_UserMenu_userName">{OwnProfileStore.instance.displayName}</span>;
+        let buttons = (
+            <span className="mx_UserMenu_headerButtons">
+                {/* masked image in CSS */}
+            </span>
+        );
+        if (this.props.isMinimized) {
+            name = null;
+            buttons = null;
+        }
+
+        const classes = classNames({
+            'mx_UserMenu': true,
+            'mx_UserMenu_minimized': this.props.isMinimized,
+        });
+
+        return (
+            <React.Fragment>
+                <ContextMenuButton
+                    className={classes}
+                    onClick={this.onOpenMenuClick}
+                    inputRef={this.buttonRef}
+                    label={_t("User menu")}
+                    isExpanded={!!this.state.contextMenuPosition}
+                    onContextMenu={this.onContextMenu}
+                >
+                    <div className="mx_UserMenu_row">
+                        <span className="mx_UserMenu_userAvatarContainer">
+                            <BaseAvatar
+                                idName={MatrixClientPeg.get().getUserId()}
+                                name={OwnProfileStore.instance.displayName || MatrixClientPeg.get().getUserId()}
+                                url={OwnProfileStore.instance.getHttpAvatarUrl(avatarSize)}
+                                width={avatarSize}
+                                height={avatarSize}
+                                resizeMethod="crop"
+                                className="mx_UserMenu_userAvatar"
+                            />
+                        </span>
+                        {name}
+                        {buttons}
+                    </div>
+                </ContextMenuButton>
+                {this.renderContextMenu()}
+            </React.Fragment>
+        );
+    }
+}
diff --git a/src/components/structures/UserView.js b/src/components/structures/UserView.js
index c4fba137cc..694592af88 100644
--- a/src/components/structures/UserView.js
+++ b/src/components/structures/UserView.js
@@ -22,6 +22,7 @@ import {MatrixClientPeg} from "../../MatrixClientPeg";
 import * as sdk from "../../index";
 import Modal from '../../Modal';
 import { _t } from '../../languageHandler';
+import HomePage from "./HomePage";
 
 export default class UserView extends React.Component {
     static get propTypes() {
@@ -42,7 +43,10 @@ export default class UserView extends React.Component {
     }
 
     componentDidUpdate(prevProps) {
-        if (prevProps.userId !== this.props.userId) {
+        // XXX: We shouldn't need to null check the userId here, but we declare
+        // it as optional and MatrixChat sometimes fires in a way which results
+        // in an NPE when we try to update the profile info.
+        if (prevProps.userId !== this.props.userId && this.props.userId) {
             this._loadProfileInfo();
         }
     }
@@ -76,7 +80,7 @@ export default class UserView extends React.Component {
             const RightPanel = sdk.getComponent('structures.RightPanel');
             const MainSplit = sdk.getComponent('structures.MainSplit');
             const panel = <RightPanel user={this.state.member} />;
-            return (<MainSplit panel={panel}><div style={{flex: "1"}} /></MainSplit>);
+            return (<MainSplit panel={panel}><HomePage /></MainSplit>);
         } else {
             return (<div />);
         }
diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index 5d3cb69417..3bc363f863 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -285,7 +285,7 @@ export default createReactClass({
                 // We'd like to rely on new props coming in via `onServerConfigChange`
                 // so that we know the servers have definitely updated before clearing
                 // the busy state. In the case of a full MXID that resolves to the same
-                // HS as Riot's default HS though, there may not be any server change.
+                // 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
                 // busy state for its own liveness check.
@@ -355,7 +355,8 @@ export default createReactClass({
             ev.preventDefault();
             ev.stopPropagation();
             const ssoKind = step === 'm.login.sso' ? 'sso' : 'cas';
-            PlatformPeg.get().startSingleSignOn(this._loginLogic.createTemporaryClient(), ssoKind);
+            PlatformPeg.get().startSingleSignOn(this._loginLogic.createTemporaryClient(), ssoKind,
+                this.props.fragmentAfterLogin);
         } else {
             // Don't intercept - just go through to the register page
             this.onRegisterClick(ev);
@@ -614,8 +615,8 @@ export default createReactClass({
         }
         // 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 riot. On electron, this actually
-        // opens the SSO page in the electron app itself due to
+        // 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
@@ -628,7 +629,9 @@ export default createReactClass({
                 <SSOButton
                     className="mx_Login_sso_link mx_Login_submit"
                     matrixClient={this._loginLogic.createTemporaryClient()}
-                    loginType={loginType} />
+                    loginType={loginType}
+                    fragmentAfterLogin={this.props.fragmentAfterLogin}
+                />
             </div>
         );
     },
diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js
index c74f6ed6e3..13e48f6287 100644
--- a/src/components/structures/auth/Registration.js
+++ b/src/components/structures/auth/Registration.js
@@ -32,7 +32,7 @@ import * as Lifecycle from '../../../Lifecycle';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import AuthPage from "../../views/auth/AuthPage";
 import Login from "../../../Login";
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 
 // Phases
 // Show controls to configure server details
@@ -243,10 +243,14 @@ export default createReactClass({
             });
         };
         try {
-            await this._makeRegisterRequest({});
-            // This should never succeed since we specified an empty
-            // auth object.
-            console.log("Expecting 401 from register request but got success!");
+            // We do the first registration request ourselves to discover whether we need to
+            // 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);
+                // This should never succeed since we specified no auth object.
+                console.log("Expecting 401 from register request but got success!");
+            }
         } catch (e) {
             if (e.httpStatus === 401) {
                 this.setState({
@@ -258,7 +262,7 @@ export default createReactClass({
                 // the user off to the login page to figure their account out.
                 try {
                     const loginLogic = new Login(hsUrl, isUrl, null, {
-                        defaultDeviceDisplayName: "riot login check", // We shouldn't ever be used
+                        defaultDeviceDisplayName: "Element login check", // We shouldn't ever be used
                     });
                     const flows = await loginLogic.getFlows();
                     const hasSsoFlow = flows.find(f => f.type === 'm.login.sso' || f.type === 'm.login.cas');
@@ -267,6 +271,7 @@ export default createReactClass({
                         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: [],
@@ -373,7 +378,7 @@ export default createReactClass({
         }
 
         if (response.access_token) {
-            const cli = await this.props.onLoggedIn({
+            await this.props.onLoggedIn({
                 userId: response.user_id,
                 deviceId: response.device_id,
                 homeserverUrl: this.state.matrixClient.getHomeserverUrl(),
@@ -381,7 +386,7 @@ export default createReactClass({
                 accessToken: response.access_token,
             }, this.state.formVals.password);
 
-            this._setupPushers(cli);
+            this._setupPushers();
             // we're still busy until we get unmounted: don't show the registration form again
             newState.busy = true;
         } else {
@@ -392,10 +397,11 @@ export default createReactClass({
         this.setState(newState);
     },
 
-    _setupPushers: function(matrixClient) {
+    _setupPushers: function() {
         if (!this.props.brand) {
             return Promise.resolve();
         }
+        const matrixClient = MatrixClientPeg.get();
         return matrixClient.getPushers().then((resp)=>{
             const pushers = resp.pushers;
             for (let i = 0; i < pushers.length; ++i) {
diff --git a/src/components/structures/auth/SetupEncryptionBody.js b/src/components/structures/auth/SetupEncryptionBody.js
index 26534c6e02..6d090936e5 100644
--- a/src/components/structures/auth/SetupEncryptionBody.js
+++ b/src/components/structures/auth/SetupEncryptionBody.js
@@ -17,6 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
+import SdkConfig from '../../../SdkConfig';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import * as sdk from '../../../index';
 import {
@@ -28,6 +29,14 @@ import {
     PHASE_FINISHED,
 } from '../../../stores/SetupEncryptionStore';
 
+function keyHasPassphrase(keyInfo) {
+    return (
+        keyInfo.passphrase &&
+        keyInfo.passphrase.salt &&
+        keyInfo.passphrase.iterations
+    );
+}
+
 export default class SetupEncryptionBody extends React.Component {
     static propTypes = {
         onFinished: PropTypes.func.isRequired,
@@ -108,6 +117,23 @@ export default class SetupEncryptionBody extends React.Component {
                 member={MatrixClientPeg.get().getUser(this.state.verificationRequest.otherUserId)}
             />;
         } else if (phase === PHASE_INTRO) {
+            const store = SetupEncryptionStore.sharedInstance();
+            let recoveryKeyPrompt;
+            if (store.keyInfo && keyHasPassphrase(store.keyInfo)) {
+                recoveryKeyPrompt = _t("Use Recovery Key or Passphrase");
+            } else if (store.keyInfo) {
+                recoveryKeyPrompt = _t("Use Recovery Key");
+            }
+
+            let useRecoveryKeyButton;
+            if (recoveryKeyPrompt) {
+                useRecoveryKeyButton = <AccessibleButton kind="link" onClick={this._onUsePassphraseClick}>
+                    {recoveryKeyPrompt}
+                </AccessibleButton>;
+            }
+
+            const brand = SdkConfig.get().brand;
+
             return (
                 <div>
                     <p>{_t(
@@ -115,25 +141,24 @@ export default class SetupEncryptionBody extends React.Component {
                         "granting it access to encrypted messages.",
                     )}</p>
                     <p>{_t(
-                        "This requires the latest Riot on your other devices:",
+                        "This requires the latest %(brand)s on your other devices:",
+                        { brand },
                     )}</p>
 
                     <div className="mx_CompleteSecurity_clients">
                         <div className="mx_CompleteSecurity_clients_desktop">
-                            <div>Riot Web</div>
-                            <div>Riot Desktop</div>
+                            <div>{_t("%(brand)s Web", { brand })}</div>
+                            <div>{_t("%(brand)s Desktop", { brand })}</div>
                         </div>
                         <div className="mx_CompleteSecurity_clients_mobile">
-                            <div>Riot iOS</div>
-                            <div>Riot X for Android</div>
+                            <div>{_t("%(brand)s iOS", { brand })}</div>
+                            <div>{_t("%(brand)s Android", { brand })}</div>
                         </div>
                         <p>{_t("or another cross-signing capable Matrix client")}</p>
                     </div>
 
                     <div className="mx_CompleteSecurity_actionRow">
-                        <AccessibleButton kind="link" onClick={this._onUsePassphraseClick}>
-                            {_t("Use Recovery Passphrase or Key")}
-                        </AccessibleButton>
+                        {useRecoveryKeyButton}
                         <AccessibleButton kind="danger" onClick={this.onSkipClick}>
                             {_t("Skip")}
                         </AccessibleButton>
diff --git a/src/components/structures/auth/SoftLogout.js b/src/components/structures/auth/SoftLogout.js
index 08ab7e8a61..a539c8c9ee 100644
--- a/src/components/structures/auth/SoftLogout.js
+++ b/src/components/structures/auth/SoftLogout.js
@@ -18,13 +18,14 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from '../../../languageHandler';
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import * as Lifecycle from '../../../Lifecycle';
 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";
 
 const LOGIN_VIEW = {
     LOADING: 1,
@@ -43,7 +44,7 @@ const FLOWS_TO_VIEWS = {
 export default class SoftLogout extends React.Component {
     static propTypes = {
         // Query parameters from MatrixChat
-        realQueryParams: PropTypes.object, // {homeserver, identityServer, loginToken}
+        realQueryParams: PropTypes.object, // {loginToken}
 
         // Called when the SSO login completes
         onTokenLoginCompleted: PropTypes.func,
@@ -71,7 +72,7 @@ export default class SoftLogout extends React.Component {
 
         this._initLogin();
 
-        MatrixClientPeg.get().flagAllGroupSessionsForBackup().then(remaining => {
+        MatrixClientPeg.get().countSessionsNeedingBackup().then(remaining => {
             this.setState({keyBackupNeeded: remaining > 0});
         });
     }
@@ -90,7 +91,7 @@ export default class SoftLogout extends React.Component {
 
     async _initLogin() {
         const queryParams = this.props.realQueryParams;
-        const hasAllParams = queryParams && queryParams['homeserver'] && queryParams['loginToken'];
+        const hasAllParams = queryParams && queryParams['loginToken'];
         if (hasAllParams) {
             this.setState({loginView: LOGIN_VIEW.LOADING});
             this.trySsoLogin();
@@ -157,8 +158,8 @@ export default class SoftLogout extends React.Component {
     async trySsoLogin() {
         this.setState({busy: true});
 
-        const hsUrl = this.props.realQueryParams['homeserver'];
-        const isUrl = this.props.realQueryParams['identityServer'] || MatrixClientPeg.get().getIdentityServerUrl();
+        const hsUrl = localStorage.getItem(SSO_HOMESERVER_URL_KEY);
+        const isUrl = localStorage.getItem(SSO_ID_SERVER_URL_KEY) || MatrixClientPeg.get().getIdentityServerUrl();
         const loginType = "m.login.token";
         const loginParams = {
             token: this.props.realQueryParams['loginToken'],
@@ -244,7 +245,9 @@ export default class SoftLogout extends React.Component {
                     <p>{introText}</p>
                     <SSOButton
                         matrixClient={MatrixClientPeg.get()}
-                        loginType={this.state.loginView === LOGIN_VIEW.CAS ? "cas" : "sso"} />
+                        loginType={this.state.loginView === LOGIN_VIEW.CAS ? "cas" : "sso"}
+                        fragmentAfterLogin={this.props.fragmentAfterLogin}
+                    />
                 </div>
             );
         }
diff --git a/src/components/views/auth/CountryDropdown.js b/src/components/views/auth/CountryDropdown.js
index 14a974668b..37b1967c48 100644
--- a/src/components/views/auth/CountryDropdown.js
+++ b/src/components/views/auth/CountryDropdown.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 
 import * as sdk from '../../../index';
 
-import { COUNTRIES } from '../../../phonenumber';
+import {COUNTRIES, getEmojiFlag} from '../../../phonenumber';
 import SdkConfig from "../../../SdkConfig";
 import { _t } from "../../../languageHandler";
 
@@ -80,7 +80,7 @@ export default class CountryDropdown extends React.Component {
     }
 
     _flagImgForIso2(iso2) {
-        return <img src={require(`../../../../res/img/flags/${iso2}.png`)} />;
+        return <div className="mx_Dropdown_option_emoji">{ getEmojiFlag(iso2) }</div>;
     }
 
     _getShortOption(iso2) {
diff --git a/src/components/views/auth/CustomServerDialog.js b/src/components/views/auth/CustomServerDialog.js
index 024951e6c0..7b2c8f88aa 100644
--- a/src/components/views/auth/CustomServerDialog.js
+++ b/src/components/views/auth/CustomServerDialog.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -18,11 +18,13 @@ limitations under the License.
 import React from 'react';
 import createReactClass from 'create-react-class';
 import { _t } from '../../../languageHandler';
+import SdkConfig from '../../../SdkConfig';
 
 export default createReactClass({
     displayName: 'CustomServerDialog',
 
     render: function() {
+        const brand = SdkConfig.get().brand;
         return (
             <div className="mx_ErrorDialog">
                 <div className="mx_Dialog_title">
@@ -32,8 +34,9 @@ export default createReactClass({
                     <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 this app with an existing Matrix account on a " +
+                        "allows you to use %(brand)s with an existing Matrix account on a " +
                         "different homeserver.",
+                        { brand },
                     )}</p>
                 </div>
                 <div className="mx_Dialog_buttons">
diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js
index 327451be17..7080eb3602 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -109,7 +109,7 @@ export const PasswordAuthEntry = createReactClass({
         this.props.submitAuthDict({
             type: PasswordAuthEntry.LOGIN_TYPE,
             // TODO: Remove `user` once servers support proper UIA
-            // See https://github.com/vector-im/riot-web/issues/10312
+            // See https://github.com/vector-im/element-web/issues/10312
             user: this.props.matrixClient.credentials.userId,
             identifier: {
                 type: "m.id.user",
@@ -355,6 +355,7 @@ export const TermsAuthEntry = createReactClass({
             allChecked = allChecked && checked;
 
             checkboxes.push(
+                // XXX: replace with StyledCheckbox
                 <label key={"policy_checkbox_" + policy.id} className="mx_InteractiveAuthEntryComponents_termsPolicy">
                     <input type="checkbox" onChange={() => this._togglePolicy(policy.id)} checked={checked} />
                     <a href={policy.url} target="_blank" rel="noreferrer noopener">{ policy.name }</a>
@@ -412,14 +413,14 @@ export const EmailIdentityAuthEntry = createReactClass({
         this.props.onPhaseChange(DEFAULT_PHASE);
     },
 
-    getInitialState: function() {
-        return {
-            requestingToken: false,
-        };
-    },
-
     render: function() {
-        if (this.state.requestingToken) {
+        // This component is now only displayed once the token has been requested,
+        // so we know the email has been sent. It can also get loaded after the user
+        // has clicked the validation link if the server takes a while to propagate
+        // the validation internally. If we're in the session spawned from clicking
+        // the validation link, we won't know the email address, so if we don't have it,
+        // assume that the link has been clicked and the server will realise when we poll.
+        if (this.props.inputs.emailAddress === undefined) {
             const Loader = sdk.getComponent("elements.Spinner");
             return <Loader />;
         } else {
@@ -537,7 +538,8 @@ export const MsisdnAuthEntry = createReactClass({
                 this.props.submitAuthDict({
                     type: MsisdnAuthEntry.LOGIN_TYPE,
                     // TODO: Remove `threepid_creds` once servers support proper UIA
-                    // See https://github.com/vector-im/riot-web/issues/10312
+                    // See https://github.com/vector-im/element-web/issues/10312
+                    // See https://github.com/matrix-org/matrix-doc/issues/2220
                     threepid_creds: creds,
                     threepidCreds: creds,
                 });
diff --git a/src/components/views/auth/LanguageSelector.js b/src/components/views/auth/LanguageSelector.js
index 83db5d225b..0738ee43e4 100644
--- a/src/components/views/auth/LanguageSelector.js
+++ b/src/components/views/auth/LanguageSelector.js
@@ -16,10 +16,11 @@ limitations under the License.
 
 import SdkConfig from "../../../SdkConfig";
 import {getCurrentLanguage} from "../../../languageHandler";
-import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
+import SettingsStore from "../../../settings/SettingsStore";
 import PlatformPeg from "../../../PlatformPeg";
 import * as sdk from '../../../index';
 import React from 'react';
+import {SettingLevel} from "../../../settings/SettingLevel";
 
 function onChange(newLang) {
     if (getCurrentLanguage() !== newLang) {
diff --git a/src/components/views/auth/ModularServerConfig.js b/src/components/views/auth/ModularServerConfig.js
index 1216202a23..28fd16379d 100644
--- a/src/components/views/auth/ModularServerConfig.js
+++ b/src/components/views/auth/ModularServerConfig.js
@@ -23,7 +23,8 @@ import AutoDiscoveryUtils from "../../../utils/AutoDiscoveryUtils";
 import * as ServerType from '../../views/auth/ServerTypeSelector';
 import ServerConfig from "./ServerConfig";
 
-const MODULAR_URL = 'https://modular.im/?utm_source=riot-web&utm_medium=web&utm_campaign=riot-web-authentication';
+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?
 
@@ -94,10 +95,10 @@ export default class ModularServerConfig extends ServerConfig {
 
         return (
             <div className="mx_ServerConfig">
-                <h3>{_t("Your Modular server")}</h3>
+                <h3>{_t("Your server")}</h3>
                 {_t(
-                    "Enter the location of your Modular homeserver. It may use your own " +
-                    "domain name or be a subdomain of <a>modular.im</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>.",
                     {}, {
                         a: sub => <a href={MODULAR_URL} target="_blank" rel="noreferrer noopener">
                             {sub}
diff --git a/src/components/views/auth/PassphraseField.tsx b/src/components/views/auth/PassphraseField.tsx
new file mode 100644
index 0000000000..2f5064447e
--- /dev/null
+++ b/src/components/views/auth/PassphraseField.tsx
@@ -0,0 +1,125 @@
+/*
+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, {PureComponent, RefCallback, RefObject} from "react";
+import classNames from "classnames";
+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";
+
+interface IProps {
+    autoFocus?: boolean;
+    id?: string;
+    className?: string;
+    minScore: 0 | 1 | 2 | 3 | 4;
+    value: string;
+    fieldRef?: RefCallback<Field> | RefObject<Field>;
+
+    label?: string;
+    labelEnterPassword?: string;
+    labelStrongPassword?: string;
+    labelAllowedButUnsafe?: string;
+
+    onChange(ev: React.FormEvent<HTMLElement>);
+    onValidate(result: IValidationResult);
+}
+
+interface IState {
+    complexity: zxcvbn.ZXCVBNResult;
+}
+
+class PassphraseField extends PureComponent<IProps, IState> {
+    static defaultProps = {
+        label: _td("Password"),
+        labelEnterPassword: _td("Enter password"),
+        labelStrongPassword: _td("Nice, strong password!"),
+        labelAllowedButUnsafe: _td("Password is allowed, but unsafe"),
+    };
+
+    state = { complexity: null };
+
+    public readonly validate = withValidation<this>({
+        description: function() {
+            const complexity = this.state.complexity;
+            const score = complexity ? complexity.score : 0;
+            return <progress className="mx_PassphraseField_progress" max={4} value={score} />;
+        },
+        rules: [
+            {
+                key: "required",
+                test: ({ value, allowEmpty }) => allowEmpty || !!value,
+                invalid: () => _t(this.props.labelEnterPassword),
+            },
+            {
+                key: "complexity",
+                test: async function({ value }) {
+                    if (!value) {
+                        return false;
+                    }
+                    const { scorePassword } = await import('../../../utils/PasswordScorer');
+                    const complexity = scorePassword(value);
+                    this.setState({ complexity });
+                    const safe = complexity.score >= this.props.minScore;
+                    const allowUnsafe = SdkConfig.get()["dangerously_allow_unsafe_and_insecure_passwords"];
+                    return allowUnsafe || safe;
+                },
+                valid: function() {
+                    // Unsafe passwords that are valid are only possible through a
+                    // configuration flag. We'll print some helper text to signal
+                    // to the user that their password is allowed, but unsafe.
+                    if (this.state.complexity.score >= this.props.minScore) {
+                        return _t(this.props.labelStrongPassword);
+                    }
+                    return _t(this.props.labelAllowedButUnsafe);
+                },
+                invalid: function() {
+                    const complexity = this.state.complexity;
+                    if (!complexity) {
+                        return null;
+                    }
+                    const { feedback } = complexity;
+                    return feedback.warning || feedback.suggestions[0] || _t("Keep going...");
+                },
+            },
+        ],
+    });
+
+    onValidate = async (fieldState: IFieldState) => {
+        const result = await this.validate(fieldState);
+        this.props.onValidate(result);
+        return result;
+    };
+
+    render() {
+        return <Field
+            id={this.props.id}
+            autoFocus={this.props.autoFocus}
+            className={classNames("mx_PassphraseField", this.props.className)}
+            ref={this.props.fieldRef}
+            type="password"
+            autoComplete="new-password"
+            label={_t(this.props.label)}
+            value={this.props.value}
+            onChange={this.props.onChange}
+            onValidate={this.onValidate}
+        />;
+    }
+}
+
+export default PassphraseField;
diff --git a/src/components/views/auth/PasswordLogin.js b/src/components/views/auth/PasswordLogin.js
index 790c837497..3bd9b557bc 100644
--- a/src/components/views/auth/PasswordLogin.js
+++ b/src/components/views/auth/PasswordLogin.js
@@ -238,7 +238,7 @@ export default class PasswordLogin extends React.Component {
                     type="text"
                     label={_t("Phone")}
                     value={this.state.phoneNumber}
-                    prefix={phoneCountry}
+                    prefixComponent={phoneCountry}
                     onChange={this.onPhoneNumberChanged}
                     onBlur={this.onPhoneNumberBlur}
                     disabled={this.props.disableSubmit}
diff --git a/src/components/views/auth/RegistrationForm.js b/src/components/views/auth/RegistrationForm.js
index f1624bc9e5..17c65fa94e 100644
--- a/src/components/views/auth/RegistrationForm.js
+++ b/src/components/views/auth/RegistrationForm.js
@@ -29,6 +29,7 @@ import SdkConfig from '../../../SdkConfig';
 import { SAFE_LOCALPART_REGEX } from '../../../Registration';
 import withValidation from '../elements/Validation';
 import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
+import PassphraseField from "./PassphraseField";
 
 const FIELD_EMAIL = 'field_email';
 const FIELD_PHONE_NUMBER = 'field_phone_number';
@@ -76,9 +77,8 @@ export default createReactClass({
             email: this.props.defaultEmail || "",
             phoneNumber: this.props.defaultPhoneNumber || "",
             password: this.props.defaultPassword || "",
-            passwordConfirm: "",
+            passwordConfirm: this.props.defaultPassword || "",
             passwordComplexity: null,
-            passwordSafe: false,
         };
     },
 
@@ -264,65 +264,10 @@ export default createReactClass({
         });
     },
 
-    async onPasswordValidate(fieldState) {
-        const result = await this.validatePasswordRules(fieldState);
+    onPasswordValidate(result) {
         this.markFieldValid(FIELD_PASSWORD, result.valid);
-        return result;
     },
 
-    validatePasswordRules: withValidation({
-        description: function() {
-            const complexity = this.state.passwordComplexity;
-            const score = complexity ? complexity.score : 0;
-            return <progress
-                className="mx_AuthBody_passwordScore"
-                max={PASSWORD_MIN_SCORE}
-                value={score}
-            />;
-        },
-        rules: [
-            {
-                key: "required",
-                test: ({ value, allowEmpty }) => allowEmpty || !!value,
-                invalid: () => _t("Enter password"),
-            },
-            {
-                key: "complexity",
-                test: async function({ value }) {
-                    if (!value) {
-                        return false;
-                    }
-                    const { scorePassword } = await import('../../../utils/PasswordScorer');
-                    const complexity = scorePassword(value);
-                    const safe = complexity.score >= PASSWORD_MIN_SCORE;
-                    const allowUnsafe = SdkConfig.get()["dangerously_allow_unsafe_and_insecure_passwords"];
-                    this.setState({
-                        passwordComplexity: complexity,
-                        passwordSafe: safe,
-                    });
-                    return allowUnsafe || safe;
-                },
-                valid: function() {
-                    // Unsafe passwords that are valid are only possible through a
-                    // configuration flag. We'll print some helper text to signal
-                    // to the user that their password is allowed, but unsafe.
-                    if (!this.state.passwordSafe) {
-                        return _t("Password is allowed, but unsafe");
-                    }
-                    return _t("Nice, strong password!");
-                },
-                invalid: function() {
-                    const complexity = this.state.passwordComplexity;
-                    if (!complexity) {
-                        return null;
-                    }
-                    const { feedback } = complexity;
-                    return feedback.warning || feedback.suggestions[0] || _t("Keep going...");
-                },
-            },
-        ],
-    }),
-
     onPasswordConfirmChange(ev) {
         this.setState({
             passwordConfirm: ev.target.value,
@@ -484,13 +429,10 @@ export default createReactClass({
     },
 
     renderPassword() {
-        const Field = sdk.getComponent('elements.Field');
-        return <Field
+        return <PassphraseField
             id="mx_RegistrationForm_password"
-            ref={field => this[FIELD_PASSWORD] = field}
-            type="password"
-            autoComplete="new-password"
-            label={_t("Password")}
+            fieldRef={field => this[FIELD_PASSWORD] = field}
+            minScore={PASSWORD_MIN_SCORE}
             value={this.state.password}
             onChange={this.onPasswordChange}
             onValidate={this.onPasswordValidate}
@@ -531,7 +473,7 @@ export default createReactClass({
             type="text"
             label={phoneLabel}
             value={this.state.phoneNumber}
-            prefix={phoneCountry}
+            prefixComponent={phoneCountry}
             onChange={this.onPhoneNumberChange}
             onValidate={this.onPhoneNumberValidate}
         />;
diff --git a/src/components/views/auth/ServerTypeSelector.js b/src/components/views/auth/ServerTypeSelector.js
index fe29b7f76c..71e7ac7f0e 100644
--- a/src/components/views/auth/ServerTypeSelector.js
+++ b/src/components/views/auth/ServerTypeSelector.js
@@ -22,7 +22,8 @@ import classnames from 'classnames';
 import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils";
 import {makeType} from "../../../utils/TypeUtils";
 
-const MODULAR_URL = 'https://modular.im/?utm_source=riot-web&utm_medium=web&utm_campaign=riot-web-authentication';
+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';
@@ -44,7 +45,7 @@ export const TYPES = {
     PREMIUM: {
         id: PREMIUM,
         label: () => _t('Premium'),
-        logo: () => <img src={require('../../../../res/img/modular-bw-logo.svg')} />,
+        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}
diff --git a/src/components/views/auth/Welcome.js b/src/components/views/auth/Welcome.js
index 7cbcf65d3c..5a30a02490 100644
--- a/src/components/views/auth/Welcome.js
+++ b/src/components/views/auth/Welcome.js
@@ -18,9 +18,7 @@ import React from 'react';
 import * as sdk from '../../../index';
 import SdkConfig from '../../../SdkConfig';
 import AuthPage from "./AuthPage";
-import * as Matrix from "matrix-js-sdk";
 import {_td} from "../../../languageHandler";
-import PlatformPeg from "../../../PlatformPeg";
 
 // translatable strings for Welcome pages
 _td("Sign in with SSO");
@@ -39,14 +37,6 @@ export default class Welcome extends React.PureComponent {
             pageUrl = 'welcome.html';
         }
 
-        const {hsUrl, isUrl} = this.props.serverConfig;
-        const tmpClient = Matrix.createClient({
-            baseUrl: hsUrl,
-            idBaseUrl: isUrl,
-        });
-        const plaf = PlatformPeg.get();
-        const callbackUrl = plaf.getSSOCallbackUrl(tmpClient.getHomeserverUrl(), tmpClient.getIdentityServerUrl());
-
         return (
             <AuthPage>
                 <div className="mx_Welcome">
@@ -54,8 +44,8 @@ export default class Welcome extends React.PureComponent {
                         className="mx_WelcomePage"
                         url={pageUrl}
                         replaceMap={{
-                            "$riot:ssoUrl": tmpClient.getSsoLoginUrl(callbackUrl.toString(), "sso"),
-                            "$riot:casUrl": tmpClient.getSsoLoginUrl(callbackUrl.toString(), "cas"),
+                            "$riot:ssoUrl": "#/start_sso",
+                            "$riot:casUrl": "#/start_cas",
                         }}
                     />
                     <LanguageSelector />
diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
deleted file mode 100644
index 81fbc08c0f..0000000000
--- a/src/components/views/avatars/BaseAvatar.js
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2018 New Vector Ltd
-Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
-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 createReactClass from 'create-react-class';
-import * as AvatarLogic from '../../../Avatar';
-import SettingsStore from "../../../settings/SettingsStore";
-import AccessibleButton from '../elements/AccessibleButton';
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import toRem from "../../../utils/rem";
-
-export default createReactClass({
-    displayName: 'BaseAvatar',
-
-    propTypes: {
-        name: PropTypes.string.isRequired, // The name (first initial used as default)
-        idName: PropTypes.string, // ID for generating hash colours
-        title: PropTypes.string, // onHover title text
-        url: PropTypes.string, // highest priority of them all, shortcut to set in urls[0]
-        urls: PropTypes.array, // [highest_priority, ... , lowest_priority]
-        width: PropTypes.number,
-        height: PropTypes.number,
-        // XXX resizeMethod not actually used.
-        resizeMethod: PropTypes.string,
-        defaultToInitialLetter: PropTypes.bool, // true to add default url
-        inputRef: PropTypes.oneOfType([
-            // Either a function
-            PropTypes.func,
-            // Or the instance of a DOM native element
-            PropTypes.shape({ current: PropTypes.instanceOf(Element) }),
-        ]),
-    },
-
-    statics: {
-        contextType: MatrixClientContext,
-    },
-
-    getDefaultProps: function() {
-        return {
-            width: 40,
-            height: 40,
-            resizeMethod: 'crop',
-            defaultToInitialLetter: true,
-        };
-    },
-
-    getInitialState: function() {
-        return this._getState(this.props);
-    },
-
-    componentDidMount() {
-        this.unmounted = false;
-        this.context.on('sync', this.onClientSync);
-    },
-
-    componentWillUnmount() {
-        this.unmounted = true;
-        this.context.removeListener('sync', this.onClientSync);
-    },
-
-    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    UNSAFE_componentWillReceiveProps: function(nextProps) {
-        // work out if we need to call setState (if the image URLs array has changed)
-        const newState = this._getState(nextProps);
-        const newImageUrls = newState.imageUrls;
-        const oldImageUrls = this.state.imageUrls;
-        if (newImageUrls.length !== oldImageUrls.length) {
-            this.setState(newState); // detected a new entry
-        } else {
-            // check each one to see if they are the same
-            for (let i = 0; i < newImageUrls.length; i++) {
-                if (oldImageUrls[i] !== newImageUrls[i]) {
-                    this.setState(newState); // detected a diff
-                    break;
-                }
-            }
-        }
-    },
-
-    onClientSync: function(syncState, prevState) {
-        if (this.unmounted) return;
-
-        // Consider the client reconnected if there is no error with syncing.
-        // This means the state could be RECONNECTING, SYNCING, PREPARED or CATCHUP.
-        const reconnected = syncState !== "ERROR" && prevState !== syncState;
-        if (reconnected &&
-            // Did we fall back?
-            this.state.urlsIndex > 0
-        ) {
-            // Start from the highest priority URL again
-            this.setState({
-                urlsIndex: 0,
-            });
-        }
-    },
-
-    _getState: function(props) {
-        // work out the full set of urls to try to load. This is formed like so:
-        // imageUrls: [ props.url, props.urls, default image ]
-
-        let urls = [];
-        if (!SettingsStore.getValue("lowBandwidth")) {
-            urls = props.urls || [];
-
-            if (props.url) {
-                urls.unshift(props.url); // put in urls[0]
-            }
-        }
-
-        let defaultImageUrl = null;
-        if (props.defaultToInitialLetter) {
-            defaultImageUrl = AvatarLogic.defaultAvatarUrlForString(
-                props.idName || props.name,
-            );
-            urls.push(defaultImageUrl); // lowest priority
-        }
-
-        // deduplicate URLs
-        urls = Array.from(new Set(urls));
-
-        return {
-            imageUrls: urls,
-            defaultImageUrl: defaultImageUrl,
-            urlsIndex: 0,
-        };
-    },
-
-    onError: function(ev) {
-        const nextIndex = this.state.urlsIndex + 1;
-        if (nextIndex < this.state.imageUrls.length) {
-            // try the next one
-            this.setState({
-                urlsIndex: nextIndex,
-            });
-        }
-    },
-
-    render: function() {
-        const imageUrl = this.state.imageUrls[this.state.urlsIndex];
-
-        const {
-            name, idName, title, url, urls, width, height, resizeMethod,
-            defaultToInitialLetter, onClick, inputRef,
-            ...otherProps
-        } = this.props;
-
-        if (imageUrl === this.state.defaultImageUrl) {
-            const initialLetter = AvatarLogic.getInitialLetter(name);
-            const textNode = (
-                <span className="mx_BaseAvatar_initial" aria-hidden="true"
-                    style={{
-                        fontSize: toRem(width * 0.65),
-                        width: toRem(width),
-                        lineHeight: toRem(height),
-                    }}
-                >
-                    { initialLetter }
-                </span>
-            );
-            const imgNode = (
-                <img className="mx_BaseAvatar_image" src={imageUrl}
-                    alt="" title={title} onError={this.onError}
-                    aria-hidden="true"
-                    style={{
-                        width: toRem(width),
-                        height: toRem(height)
-                    }} />
-            );
-            if (onClick != null) {
-                return (
-                    <AccessibleButton element='span' className="mx_BaseAvatar"
-                        onClick={onClick} inputRef={inputRef} {...otherProps}
-                    >
-                        { textNode }
-                        { imgNode }
-                    </AccessibleButton>
-                );
-            } else {
-                return (
-                    <span className="mx_BaseAvatar" ref={inputRef} {...otherProps}>
-                        { textNode }
-                        { imgNode }
-                    </span>
-                );
-            }
-        }
-        if (onClick != null) {
-            return (
-                <AccessibleButton
-                    className="mx_BaseAvatar mx_BaseAvatar_image"
-                    element='img'
-                    src={imageUrl}
-                    onClick={onClick}
-                    onError={this.onError}
-                    style={{
-                        width: toRem(width),
-                        height: toRem(height),
-                    }}
-                    title={title} alt=""
-                    inputRef={inputRef}
-                    {...otherProps} />
-            );
-        } else {
-            return (
-                <img
-                    className="mx_BaseAvatar mx_BaseAvatar_image"
-                    src={imageUrl}
-                    onError={this.onError}
-                    style={{
-                        width: toRem(width),
-                        height: toRem(height),
-                    }}
-                    title={title} alt=""
-                    ref={inputRef}
-                    {...otherProps} />
-            );
-        }
-    },
-});
diff --git a/src/components/views/avatars/BaseAvatar.tsx b/src/components/views/avatars/BaseAvatar.tsx
new file mode 100644
index 0000000000..4c6fde19eb
--- /dev/null
+++ b/src/components/views/avatars/BaseAvatar.tsx
@@ -0,0 +1,199 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd
+Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
+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, {useCallback, useContext, useEffect, useMemo, useState} from 'react';
+import classNames from 'classnames';
+import * as AvatarLogic from '../../../Avatar';
+import SettingsStore from "../../../settings/SettingsStore";
+import AccessibleButton from '../elements/AccessibleButton';
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {useEventEmitter} from "../../../hooks/useEventEmitter";
+import {toPx} from "../../../utils/units";
+
+interface IProps {
+    name: string; // The name (first initial used as default)
+    idName?: string; // ID for generating hash colours
+    title?: string; // onHover title text
+    url?: string; // highest priority of them all, shortcut to set in urls[0]
+    urls?: string[]; // [highest_priority, ... , lowest_priority]
+    width?: number;
+    height?: number;
+    // XXX: resizeMethod not actually used.
+    resizeMethod?: string;
+    defaultToInitialLetter?: boolean; // true to add default url
+    onClick?: React.MouseEventHandler;
+    inputRef?: React.RefObject<HTMLImageElement & HTMLSpanElement>;
+    className?: string;
+}
+
+const useImageUrl = ({url, urls}): [string, () => void] => {
+    const [imageUrls, setUrls] = useState<string[]>([]);
+    const [urlsIndex, setIndex] = useState<number>();
+
+    const onError = useCallback(() => {
+        setIndex(i => i + 1); // try the next one
+    }, []);
+    const memoizedUrls = useMemo(() => urls, [JSON.stringify(urls)]); // eslint-disable-line react-hooks/exhaustive-deps
+
+    useEffect(() => {
+        // work out the full set of urls to try to load. This is formed like so:
+        // imageUrls: [ props.url, ...props.urls ]
+
+        let _urls = [];
+        if (!SettingsStore.getValue("lowBandwidth")) {
+            _urls = memoizedUrls || [];
+
+            if (url) {
+                _urls.unshift(url); // put in urls[0]
+            }
+        }
+
+        // deduplicate URLs
+        _urls = Array.from(new Set(_urls));
+
+        setIndex(0);
+        setUrls(_urls);
+    }, [url, memoizedUrls]); // eslint-disable-line react-hooks/exhaustive-deps
+
+    const cli = useContext(MatrixClientContext);
+    const onClientSync = useCallback((syncState, prevState) => {
+        // Consider the client reconnected if there is no error with syncing.
+        // This means the state could be RECONNECTING, SYNCING, PREPARED or CATCHUP.
+        const reconnected = syncState !== "ERROR" && prevState !== syncState;
+        if (reconnected) {
+            setIndex(0);
+        }
+    }, []);
+    useEventEmitter(cli, "sync", onClientSync);
+
+    const imageUrl = imageUrls[urlsIndex];
+    return [imageUrl, onError];
+};
+
+const BaseAvatar = (props: IProps) => {
+    const {
+        name,
+        idName,
+        title,
+        url,
+        urls,
+        width = 40,
+        height = 40,
+        resizeMethod = "crop", // eslint-disable-line no-unused-vars
+        defaultToInitialLetter = true,
+        onClick,
+        inputRef,
+        className,
+        ...otherProps
+    } = props;
+
+    const [imageUrl, onError] = useImageUrl({url, urls});
+
+    if (!imageUrl && defaultToInitialLetter) {
+        const initialLetter = AvatarLogic.getInitialLetter(name);
+        const textNode = (
+            <span
+                className="mx_BaseAvatar_initial"
+                aria-hidden="true"
+                style={{
+                    fontSize: toPx(width * 0.65),
+                    width: toPx(width),
+                    lineHeight: toPx(height),
+                }}
+            >
+                { initialLetter }
+            </span>
+        );
+        const imgNode = (
+            <img
+                className="mx_BaseAvatar_image"
+                src={AvatarLogic.defaultAvatarUrlForString(idName || name)}
+                alt=""
+                title={title}
+                onError={onError}
+                style={{
+                    width: toPx(width),
+                    height: toPx(height),
+                }}
+                aria-hidden="true" />
+        );
+
+        if (onClick) {
+            return (
+                <AccessibleButton
+                    {...otherProps}
+                    element="span"
+                    className={classNames("mx_BaseAvatar", className)}
+                    onClick={onClick}
+                    inputRef={inputRef}
+                >
+                    { textNode }
+                    { imgNode }
+                </AccessibleButton>
+            );
+        } else {
+            return (
+                <span
+                    className={classNames("mx_BaseAvatar", className)}
+                    ref={inputRef}
+                    {...otherProps}
+                    role="presentation"
+                >
+                    { textNode }
+                    { imgNode }
+                </span>
+            );
+        }
+    }
+
+    if (onClick) {
+        return (
+            <AccessibleButton
+                className={classNames("mx_BaseAvatar mx_BaseAvatar_image", className)}
+                element='img'
+                src={imageUrl}
+                onClick={onClick}
+                onError={onError}
+                style={{
+                    width: toPx(width),
+                    height: toPx(height),
+                }}
+                title={title} alt=""
+                inputRef={inputRef}
+                {...otherProps} />
+        );
+    } else {
+        return (
+            <img
+                className={classNames("mx_BaseAvatar mx_BaseAvatar_image", className)}
+                src={imageUrl}
+                onError={onError}
+                style={{
+                    width: toPx(width),
+                    height: toPx(height),
+                }}
+                title={title} alt=""
+                ref={inputRef}
+                {...otherProps} />
+        );
+    }
+};
+
+export default BaseAvatar;
+export type BaseAvatarType = React.FC<IProps>;
diff --git a/src/components/views/avatars/DecoratedRoomAvatar.tsx b/src/components/views/avatars/DecoratedRoomAvatar.tsx
new file mode 100644
index 0000000000..e6dadf676c
--- /dev/null
+++ b/src/components/views/avatars/DecoratedRoomAvatar.tsx
@@ -0,0 +1,208 @@
+/*
+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 classNames from "classnames";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { User } from "matrix-js-sdk/src/models/user";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+
+import { TagID } from '../../../stores/room-list/models';
+import RoomAvatar from "./RoomAvatar";
+import NotificationBadge from '../rooms/NotificationBadge';
+import { RoomNotificationStateStore } from "../../../stores/notifications/RoomNotificationStateStore";
+import { NotificationState } from "../../../stores/notifications/NotificationState";
+import {isPresenceEnabled} from "../../../utils/presence";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import {_t} from "../../../languageHandler";
+import TextWithTooltip from "../elements/TextWithTooltip";
+import DMRoomMap from "../../../utils/DMRoomMap";
+
+interface IProps {
+    room: Room;
+    avatarSize: number;
+    tag: TagID;
+    displayBadge?: boolean;
+    forceCount?: boolean;
+    oobData?: object;
+    viewAvatarOnClick?: boolean;
+}
+
+interface IState {
+    notificationState?: NotificationState;
+    icon: Icon;
+}
+
+enum Icon {
+    // Note: the names here are used in CSS class names
+    None = "NONE", // ... except this one
+    Globe = "GLOBE",
+    PresenceOnline = "ONLINE",
+    PresenceAway = "AWAY",
+    PresenceOffline = "OFFLINE",
+}
+
+function tooltipText(variant: Icon) {
+    switch (variant) {
+        case Icon.Globe:
+            return _t("This room is public");
+        case Icon.PresenceOnline:
+            return _t("Online");
+        case Icon.PresenceAway:
+            return _t("Away");
+        case Icon.PresenceOffline:
+            return _t("Offline");
+    }
+}
+
+export default class DecoratedRoomAvatar extends React.PureComponent<IProps, IState> {
+    private _dmUser: User;
+    private isUnmounted = false;
+    private isWatchingTimeline = false;
+
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            notificationState: RoomNotificationStateStore.instance.getRoomState(this.props.room),
+            icon: this.calculateIcon(),
+        };
+    }
+
+    public componentWillUnmount() {
+        this.isUnmounted = true;
+        if (this.isWatchingTimeline) this.props.room.off('Room.timeline', this.onRoomTimeline);
+        this.dmUser = null; // clear listeners, if any
+    }
+
+    private get isPublicRoom(): boolean {
+        const joinRules = this.props.room.currentState.getStateEvents("m.room.join_rules", "");
+        const joinRule = joinRules && joinRules.getContent().join_rule;
+        return joinRule === 'public';
+    }
+
+    private get dmUser(): User {
+        return this._dmUser;
+    }
+
+    private set dmUser(val: User) {
+        const oldUser = this._dmUser;
+        this._dmUser = val;
+        if (oldUser && oldUser !== this._dmUser) {
+            oldUser.off('User.currentlyActive', this.onPresenceUpdate);
+            oldUser.off('User.presence', this.onPresenceUpdate);
+        }
+        if (this._dmUser && oldUser !== this._dmUser) {
+            this._dmUser.on('User.currentlyActive', this.onPresenceUpdate);
+            this._dmUser.on('User.presence', this.onPresenceUpdate);
+        }
+    }
+
+    private onRoomTimeline = (ev: MatrixEvent, room: Room) => {
+        if (this.isUnmounted) return;
+
+        // apparently these can happen?
+        if (!room) return;
+        if (this.props.room.roomId !== room.roomId) return;
+
+        if (ev.getType() === 'm.room.join_rules' || ev.getType() === 'm.room.member') {
+            this.setState({icon: this.calculateIcon()});
+        }
+    };
+
+    private onPresenceUpdate = () => {
+        if (this.isUnmounted) return;
+
+        let newIcon = this.getPresenceIcon();
+        if (newIcon !== this.state.icon) this.setState({icon: newIcon});
+    };
+
+    private getPresenceIcon(): Icon {
+        if (!this.dmUser) return Icon.None;
+
+        let icon = Icon.None;
+
+        const isOnline = this.dmUser.currentlyActive || this.dmUser.presence === 'online';
+        if (isOnline) {
+            icon = Icon.PresenceOnline;
+        } else if (this.dmUser.presence === 'offline') {
+            icon = Icon.PresenceOffline;
+        } else if (this.dmUser.presence === 'unavailable') {
+            icon = Icon.PresenceAway;
+        }
+
+        return icon;
+    }
+
+    private calculateIcon(): Icon {
+        let icon = Icon.None;
+
+        // We look at the DMRoomMap and not the tag here so that we don't exclude DMs in Favourites
+        const otherUserId = DMRoomMap.shared().getUserIdForRoomId(this.props.room.roomId);
+        if (otherUserId && this.props.room.getJoinedMemberCount() === 2) {
+            // Track presence, if available
+            if (isPresenceEnabled()) {
+                if (otherUserId) {
+                    this.dmUser = MatrixClientPeg.get().getUser(otherUserId);
+                    icon = this.getPresenceIcon();
+                }
+            }
+        } else {
+            // Track publicity
+            icon = this.isPublicRoom ? Icon.Globe : Icon.None;
+            if (!this.isWatchingTimeline) {
+                this.props.room.on('Room.timeline', this.onRoomTimeline);
+                this.isWatchingTimeline = true;
+            }
+        }
+        return icon;
+    }
+
+    public render(): React.ReactNode {
+        let badge: React.ReactNode;
+        if (this.props.displayBadge) {
+            badge = <NotificationBadge
+                notification={this.state.notificationState}
+                forceCount={this.props.forceCount}
+                roomId={this.props.room.roomId}
+            />;
+        }
+
+        let icon;
+        if (this.state.icon !== Icon.None) {
+            icon = <TextWithTooltip
+                tooltip={tooltipText(this.state.icon)}
+                class={`mx_DecoratedRoomAvatar_icon mx_DecoratedRoomAvatar_icon_${this.state.icon.toLowerCase()}`}
+            />;
+        }
+
+        const classes = classNames("mx_DecoratedRoomAvatar", {
+            mx_DecoratedRoomAvatar_cutout: icon,
+        });
+
+        return <div className={classes}>
+            <RoomAvatar
+                room={this.props.room}
+                width={this.props.avatarSize}
+                height={this.props.avatarSize}
+                oobData={this.props.oobData}
+                viewAvatarOnClick={this.props.viewAvatarOnClick}
+            />
+            {icon}
+            {badge}
+        </div>;
+    }
+}
diff --git a/src/components/views/avatars/GroupAvatar.js b/src/components/views/avatars/GroupAvatar.tsx
similarity index 64%
rename from src/components/views/avatars/GroupAvatar.js
rename to src/components/views/avatars/GroupAvatar.tsx
index 0da57bcb99..e55e2e6fac 100644
--- a/src/components/views/avatars/GroupAvatar.js
+++ b/src/components/views/avatars/GroupAvatar.tsx
@@ -15,43 +15,36 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import createReactClass from 'create-react-class';
-import * as sdk from '../../../index';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
+import BaseAvatar from './BaseAvatar';
 
-export default createReactClass({
-    displayName: 'GroupAvatar',
+export interface IProps {
+        groupId?: string;
+        groupName?: string;
+        groupAvatarUrl?: string;
+        width?: number;
+        height?: number;
+        resizeMethod?: string;
+        onClick?: React.MouseEventHandler;
+}
 
-    propTypes: {
-        groupId: PropTypes.string,
-        groupName: PropTypes.string,
-        groupAvatarUrl: PropTypes.string,
-        width: PropTypes.number,
-        height: PropTypes.number,
-        resizeMethod: PropTypes.string,
-        onClick: PropTypes.func,
-    },
+export default class GroupAvatar extends React.Component<IProps> {
+    public static defaultProps = {
+        width: 36,
+        height: 36,
+        resizeMethod: 'crop',
+    };
 
-    getDefaultProps: function() {
-        return {
-            width: 36,
-            height: 36,
-            resizeMethod: 'crop',
-        };
-    },
-
-    getGroupAvatarUrl: function() {
+    getGroupAvatarUrl() {
         return MatrixClientPeg.get().mxcUrlToHttp(
             this.props.groupAvatarUrl,
             this.props.width,
             this.props.height,
             this.props.resizeMethod,
         );
-    },
+    }
 
-    render: function() {
-        const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
+    render() {
         // extract the props we use from props so we can pass any others through
         // should consider adding this as a global rule in js-sdk?
         /*eslint no-unused-vars: ["error", { "ignoreRestSiblings": true }]*/
@@ -65,5 +58,5 @@ export default createReactClass({
                 {...otherProps}
             />
         );
-    },
-});
+    }
+}
diff --git a/src/components/views/avatars/MemberAvatar.js b/src/components/views/avatars/MemberAvatar.tsx
similarity index 50%
rename from src/components/views/avatars/MemberAvatar.js
rename to src/components/views/avatars/MemberAvatar.tsx
index 826aa5fddf..1d23d85b0f 100644
--- a/src/components/views/avatars/MemberAvatar.js
+++ b/src/components/views/avatars/MemberAvatar.tsx
@@ -16,55 +16,62 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import createReactClass from 'create-react-class';
-import * as Avatar from '../../../Avatar';
-import * as sdk from "../../../index";
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
+import {Action} from "../../../dispatcher/actions";
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import BaseAvatar from "./BaseAvatar";
 
-export default createReactClass({
-    displayName: 'MemberAvatar',
+interface IProps {
+    // TODO: replace with correct type
+    member: any;
+    fallbackUserId: string;
+    width: number;
+    height: number;
+    resizeMethod: string;
+    // The onClick to give the avatar
+    onClick: React.MouseEventHandler;
+    // Whether the onClick of the avatar should be overriden to dispatch `Action.ViewUser`
+    viewUserOnClick: boolean;
+    title: string;
+}
 
-    propTypes: {
-        member: PropTypes.object,
-        fallbackUserId: PropTypes.string,
-        width: PropTypes.number,
-        height: PropTypes.number,
-        resizeMethod: PropTypes.string,
-        // The onClick to give the avatar
-        onClick: PropTypes.func,
-        // Whether the onClick of the avatar should be overriden to dispatch 'view_user'
-        viewUserOnClick: PropTypes.bool,
-        title: PropTypes.string,
-    },
+interface IState {
+    name: string;
+    title: string;
+    imageUrl?: string;
+}
 
-    getDefaultProps: function() {
-        return {
-            width: 40,
-            height: 40,
-            resizeMethod: 'crop',
-            viewUserOnClick: false,
-        };
-    },
+export default class MemberAvatar extends React.Component<IProps, IState> {
+    public static defaultProps = {
+        width: 40,
+        height: 40,
+        resizeMethod: 'crop',
+        viewUserOnClick: false,
+    };
 
-    getInitialState: function() {
-        return this._getState(this.props);
-    },
+    constructor(props: IProps) {
+        super(props);
 
-    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    UNSAFE_componentWillReceiveProps: function(nextProps) {
-        this.setState(this._getState(nextProps));
-    },
+        this.state = MemberAvatar.getState(props);
+    }
 
-    _getState: function(props) {
+    public static getDerivedStateFromProps(nextProps: IProps): IState {
+        return MemberAvatar.getState(nextProps);
+    }
+
+    private static getState(props: IProps): IState {
         if (props.member && props.member.name) {
             return {
                 name: props.member.name,
                 title: props.title || props.member.userId,
-                imageUrl: Avatar.avatarUrlForMember(props.member,
-                                             props.width,
-                                             props.height,
-                                             props.resizeMethod),
+                imageUrl: props.member.getAvatarUrl(
+                    MatrixClientPeg.get().getHomeserverUrl(),
+                    Math.floor(props.width * window.devicePixelRatio),
+                    Math.floor(props.height * window.devicePixelRatio),
+                    props.resizeMethod,
+                    false,
+                    false,
+                ),
             };
         } else if (props.fallbackUserId) {
             return {
@@ -74,18 +81,16 @@ export default createReactClass({
         } else {
             console.error("MemberAvatar called somehow with null member or fallbackUserId");
         }
-    },
-
-    render: function() {
-        const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
+    }
 
+    render() {
         let {member, fallbackUserId, onClick, viewUserOnClick, ...otherProps} = this.props;
         const userId = member ? member.userId : fallbackUserId;
 
         if (viewUserOnClick) {
             onClick = () => {
                 dis.dispatch({
-                    action: 'view_user',
+                    action: Action.ViewUser,
                     member: this.props.member,
                 });
             };
@@ -95,5 +100,5 @@ export default createReactClass({
             <BaseAvatar {...otherProps} name={this.state.name} title={this.state.title}
                 idName={userId} url={this.state.imageUrl} onClick={onClick} />
         );
-    },
-});
+    }
+}
diff --git a/src/components/views/avatars/MemberStatusMessageAvatar.js b/src/components/views/avatars/MemberStatusMessageAvatar.js
index eef3f86d9a..d5d927106c 100644
--- a/src/components/views/avatars/MemberStatusMessageAvatar.js
+++ b/src/components/views/avatars/MemberStatusMessageAvatar.js
@@ -53,7 +53,7 @@ export default class MemberStatusMessageAvatar extends React.Component {
         if (this.props.member.userId !== MatrixClientPeg.get().getUserId()) {
             throw new Error("Cannot use MemberStatusMessageAvatar on anyone but the logged in user");
         }
-        if (!SettingsStore.isFeatureEnabled("feature_custom_status")) {
+        if (!SettingsStore.getValue("feature_custom_status")) {
             return;
         }
         const { user } = this.props.member;
@@ -105,7 +105,7 @@ export default class MemberStatusMessageAvatar extends React.Component {
             resizeMethod={this.props.resizeMethod}
         />;
 
-        if (!SettingsStore.isFeatureEnabled("feature_custom_status")) {
+        if (!SettingsStore.getValue("feature_custom_status")) {
             return avatar;
         }
 
diff --git a/src/components/views/avatars/PulsedAvatar.tsx b/src/components/views/avatars/PulsedAvatar.tsx
new file mode 100644
index 0000000000..94a6c87687
--- /dev/null
+++ b/src/components/views/avatars/PulsedAvatar.tsx
@@ -0,0 +1,28 @@
+/*
+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';
+
+interface IProps {
+}
+
+const PulsedAvatar: React.FC<IProps> = (props) => {
+    return <div className="mx_PulsedAvatar">
+        {props.children}
+    </div>;
+};
+
+export default PulsedAvatar;
\ No newline at end of file
diff --git a/src/components/views/avatars/RoomAvatar.js b/src/components/views/avatars/RoomAvatar.tsx
similarity index 56%
rename from src/components/views/avatars/RoomAvatar.js
rename to src/components/views/avatars/RoomAvatar.tsx
index a72d318b8d..3317ed3a60 100644
--- a/src/components/views/avatars/RoomAvatar.js
+++ b/src/components/views/avatars/RoomAvatar.tsx
@@ -13,90 +13,96 @@ 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 createReactClass from 'create-react-class';
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import React from 'react';
+import Room from 'matrix-js-sdk/src/models/room';
+import {getHttpUriForMxc} from 'matrix-js-sdk/src/content-repo';
+
+import BaseAvatar from './BaseAvatar';
+import ImageView from '../elements/ImageView';
+import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';
-import * as sdk from "../../../index";
 import * as Avatar from '../../../Avatar';
-import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
-
-export default createReactClass({
-    displayName: 'RoomAvatar',
 
+interface IProps {
     // 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)
-    propTypes: {
-        room: PropTypes.object,
-        oobData: PropTypes.object,
-        width: PropTypes.number,
-        height: PropTypes.number,
-        resizeMethod: PropTypes.string,
-        viewAvatarOnClick: PropTypes.bool,
-    },
+    room?: Room;
+    // TODO: type when js-sdk has types
+    oobData?: any;
+    width?: number;
+    height?: number;
+    resizeMethod?: string;
+    viewAvatarOnClick?: boolean;
+}
 
-    getDefaultProps: function() {
-        return {
-            width: 36,
-            height: 36,
-            resizeMethod: 'crop',
-            oobData: {},
+interface IState {
+    urls: string[];
+}
+
+export default class RoomAvatar extends React.Component<IProps, IState> {
+    public static defaultProps = {
+        width: 36,
+        height: 36,
+        resizeMethod: 'crop',
+        oobData: {},
+    };
+
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            urls: RoomAvatar.getImageUrls(this.props),
         };
-    },
+    }
 
-    getInitialState: function() {
-        return {
-            urls: this.getImageUrls(this.props),
-        };
-    },
-
-    componentDidMount: function() {
+    public componentDidMount() {
         MatrixClientPeg.get().on("RoomState.events", this.onRoomStateEvents);
-    },
+    }
 
-    componentWillUnmount: function() {
+    public componentWillUnmount() {
         const cli = MatrixClientPeg.get();
         if (cli) {
             cli.removeListener("RoomState.events", this.onRoomStateEvents);
         }
-    },
+    }
 
-    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    UNSAFE_componentWillReceiveProps: function(newProps) {
-        this.setState({
-            urls: this.getImageUrls(newProps),
-        });
-    },
+    public static getDerivedStateFromProps(nextProps: IProps): IState {
+        return {
+            urls: RoomAvatar.getImageUrls(nextProps),
+        };
+    }
 
-    onRoomStateEvents: function(ev) {
+    // TODO: type when js-sdk has types
+    private onRoomStateEvents = (ev: any) => {
         if (!this.props.room ||
             ev.getRoomId() !== this.props.room.roomId ||
             ev.getType() !== 'm.room.avatar'
         ) return;
 
         this.setState({
-            urls: this.getImageUrls(this.props),
+            urls: RoomAvatar.getImageUrls(this.props),
         });
-    },
+    };
 
-    getImageUrls: function(props) {
+    private static getImageUrls(props: IProps): string[] {
         return [
             getHttpUriForMxc(
                 MatrixClientPeg.get().getHomeserverUrl(),
+                // Default props don't play nicely with getDerivedStateFromProps
+                //props.oobData !== undefined ? props.oobData.avatarUrl : {},
                 props.oobData.avatarUrl,
                 Math.floor(props.width * window.devicePixelRatio),
                 Math.floor(props.height * window.devicePixelRatio),
                 props.resizeMethod,
             ), // highest priority
-            this.getRoomAvatarUrl(props),
+            RoomAvatar.getRoomAvatarUrl(props),
         ].filter(function(url) {
-            return (url != null && url != "");
+            return (url !== null && url !== "");
         });
-    },
+    }
 
-    getRoomAvatarUrl: function(props) {
+    private static getRoomAvatarUrl(props: IProps): string {
         if (!props.room) return null;
 
         return Avatar.avatarUrlForRoom(
@@ -105,35 +111,32 @@ export default createReactClass({
             Math.floor(props.height * window.devicePixelRatio),
             props.resizeMethod,
         );
-    },
+    }
 
-    onRoomAvatarClick: function() {
+    private onRoomAvatarClick = () => {
         const avatarUrl = this.props.room.getAvatarUrl(
             MatrixClientPeg.get().getHomeserverUrl(),
             null, null, null, false);
-        const ImageView = sdk.getComponent("elements.ImageView");
         const params = {
             src: avatarUrl,
             name: this.props.room.name,
         };
 
         Modal.createDialog(ImageView, params, "mx_Dialog_lightbox");
-    },
+    };
 
-    render: function() {
-        const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
-
-        /*eslint no-unused-vars: ["error", { "ignoreRestSiblings": true }]*/
+    public render() {
         const {room, oobData, viewAvatarOnClick, ...otherProps} = this.props;
 
         const roomName = room ? room.name : oobData.name;
 
         return (
-            <BaseAvatar {...otherProps} name={roomName}
+            <BaseAvatar {...otherProps}
+                name={roomName}
                 idName={room ? room.roomId : null}
                 urls={this.state.urls}
-                onClick={this.props.viewAvatarOnClick ? this.onRoomAvatarClick : null}
-                disabled={!this.state.urls[0]} />
+                onClick={viewAvatarOnClick && this.state.urls[0] ? this.onRoomAvatarClick : null}
+            />
         );
-    },
-});
+    }
+}
diff --git a/src/components/views/context_menus/IconizedContextMenu.tsx b/src/components/views/context_menus/IconizedContextMenu.tsx
new file mode 100644
index 0000000000..b3ca9fde6f
--- /dev/null
+++ b/src/components/views/context_menus/IconizedContextMenu.tsx
@@ -0,0 +1,124 @@
+/*
+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 classNames from "classnames";
+
+import {
+    ChevronFace,
+    ContextMenu,
+    IProps as IContextMenuProps,
+    MenuItem,
+    MenuItemCheckbox, MenuItemRadio,
+} from "../../structures/ContextMenu";
+
+interface IProps extends IContextMenuProps {
+    className?: string;
+    compact?: boolean;
+}
+
+interface IOptionListProps {
+    first?: boolean;
+    red?: boolean;
+    className?: string;
+}
+
+interface IOptionProps extends React.ComponentProps<typeof MenuItem> {
+    iconClassName: string;
+}
+
+interface ICheckboxProps extends React.ComponentProps<typeof MenuItemCheckbox> {
+    iconClassName: string;
+}
+
+interface IRadioProps extends React.ComponentProps<typeof MenuItemRadio> {
+    iconClassName: string;
+}
+
+export const IconizedContextMenuRadio: React.FC<IRadioProps> = ({
+    label,
+    iconClassName,
+    active,
+    className,
+    ...props
+}) => {
+    return <MenuItemRadio
+        {...props}
+        className={classNames(className, {
+            mx_IconizedContextMenu_active: active,
+        })}
+        active={active}
+        label={label}
+    >
+        <span className={classNames("mx_IconizedContextMenu_icon", iconClassName)} />
+        <span className="mx_IconizedContextMenu_label">{label}</span>
+        {active && <span className="mx_IconizedContextMenu_icon mx_IconizedContextMenu_checked" />}
+    </MenuItemRadio>;
+};
+
+export const IconizedContextMenuCheckbox: React.FC<ICheckboxProps> = ({
+    label,
+    iconClassName,
+    active,
+    className,
+    ...props
+}) => {
+    return <MenuItemCheckbox
+        {...props}
+        className={classNames(className, {
+            mx_IconizedContextMenu_active: active,
+        })}
+        active={active}
+        label={label}
+    >
+        <span className={classNames("mx_IconizedContextMenu_icon", iconClassName)} />
+        <span className="mx_IconizedContextMenu_label">{label}</span>
+        {active && <span className="mx_IconizedContextMenu_icon mx_IconizedContextMenu_checked" />}
+    </MenuItemCheckbox>;
+};
+
+export const IconizedContextMenuOption: React.FC<IOptionProps> = ({label, iconClassName, ...props}) => {
+    return <MenuItem {...props} label={label}>
+        <span className={classNames("mx_IconizedContextMenu_icon", iconClassName)} />
+        <span className="mx_IconizedContextMenu_label">{label}</span>
+    </MenuItem>;
+};
+
+export const IconizedContextMenuOptionList: React.FC<IOptionListProps> = ({first, red, className, children}) => {
+    const classes = classNames("mx_IconizedContextMenu_optionList", className, {
+        mx_IconizedContextMenu_optionList_notFirst: !first,
+        mx_IconizedContextMenu_optionList_red: red,
+    });
+
+    return <div className={classes}>
+        {children}
+    </div>;
+};
+
+const IconizedContextMenu: React.FC<IProps> = ({className, children, compact, ...props}) => {
+    const classes = classNames("mx_IconizedContextMenu", className, {
+        mx_IconizedContextMenu_compact: compact,
+    });
+
+    return <ContextMenu chevronFace={ChevronFace.None} {...props}>
+        <div className={classes}>
+            { children }
+        </div>
+    </ContextMenu>;
+};
+
+export default IconizedContextMenu;
+
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index 452489aa65..6fa54058a0 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -23,7 +23,7 @@ import createReactClass from 'create-react-class';
 import {EventStatus} from 'matrix-js-sdk';
 
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
@@ -81,7 +81,7 @@ export default createReactClass({
         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
-        if (!SettingsStore.isFeatureEnabled("feature_pinning")) canPin = false;
+        if (!SettingsStore.getValue("feature_pinning")) canPin = false;
 
         this.setState({canRedact, canPin});
     },
@@ -116,11 +116,6 @@ export default createReactClass({
         this.closeMenu();
     },
 
-    e2eInfoClicked: function() {
-        this.props.e2eInfoCallback();
-        this.closeMenu();
-    },
-
     onReportEventClick: function() {
         const ReportEventDialog = sdk.getComponent("dialogs.ReportEventDialog");
         Modal.createTrackedDialog('Report Event', '', ReportEventDialog, {
@@ -130,22 +125,24 @@ export default createReactClass({
     },
 
     onViewSourceClick: function() {
+        const ev = this.props.mxEvent.replacingEvent() || this.props.mxEvent;
         const ViewSource = sdk.getComponent('structures.ViewSource');
         Modal.createTrackedDialog('View Event Source', '', ViewSource, {
-            roomId: this.props.mxEvent.getRoomId(),
-            eventId: this.props.mxEvent.getId(),
-            content: this.props.mxEvent.event,
+            roomId: ev.getRoomId(),
+            eventId: ev.getId(),
+            content: ev.event,
         }, 'mx_Dialog_viewsource');
         this.closeMenu();
     },
 
     onViewClearSourceClick: function() {
+        const ev = this.props.mxEvent.replacingEvent() || this.props.mxEvent;
         const ViewSource = sdk.getComponent('structures.ViewSource');
         Modal.createTrackedDialog('View Clear Event Source', '', ViewSource, {
-            roomId: this.props.mxEvent.getRoomId(),
-            eventId: this.props.mxEvent.getId(),
+            roomId: ev.getRoomId(),
+            eventId: ev.getId(),
             // FIXME: _clearEvent is private
-            content: this.props.mxEvent._clearEvent,
+            content: ev._clearEvent,
         }, 'mx_Dialog_viewsource');
         this.closeMenu();
     },
@@ -463,15 +460,6 @@ export default createReactClass({
             );
         }
 
-        let e2eInfo;
-        if (this.props.e2eInfoCallback) {
-            e2eInfo = (
-                <MenuItem className="mx_MessageContextMenu_field" onClick={this.e2eInfoClicked}>
-                    { _t('End-to-end encryption information') }
-                </MenuItem>
-            );
-        }
-
         let reportEventButton;
         if (mxEvent.getSender() !== me) {
             reportEventButton = (
@@ -498,7 +486,6 @@ export default createReactClass({
                 { quoteButton }
                 { externalURLButton }
                 { collapseReplyThread }
-                { e2eInfo }
                 { reportEventButton }
             </div>
         );
diff --git a/src/components/views/context_menus/RoomTileContextMenu.js b/src/components/views/context_menus/RoomTileContextMenu.js
index d281656bbe..b08cf3be60 100644
--- a/src/components/views/context_menus/RoomTileContextMenu.js
+++ b/src/components/views/context_menus/RoomTileContextMenu.js
@@ -24,7 +24,7 @@ import classNames from 'classnames';
 import * as sdk from '../../../index';
 import { _t, _td } from '../../../languageHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import DMRoomMap from '../../../utils/DMRoomMap';
 import * as Rooms from '../../../Rooms';
 import * as RoomNotifs from '../../../RoomNotifs';
diff --git a/src/components/views/context_menus/TagTileContextMenu.js b/src/components/views/context_menus/TagTileContextMenu.js
index 7313a278cc..8d690483a8 100644
--- a/src/components/views/context_menus/TagTileContextMenu.js
+++ b/src/components/views/context_menus/TagTileContextMenu.js
@@ -18,9 +18,8 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import TagOrderActions from '../../../actions/TagOrderActions';
-import * as sdk from '../../../index';
 import {MenuItem} from "../../structures/ContextMenu";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
@@ -54,21 +53,12 @@ export default class TagTileContextMenu extends React.Component {
     }
 
     render() {
-        const TintableSvg = sdk.getComponent("elements.TintableSvg");
-
         return <div>
-            <MenuItem className="mx_TagTileContextMenu_item" onClick={this._onViewCommunityClick}>
-                <TintableSvg
-                    className="mx_TagTileContextMenu_item_icon"
-                    src={require("../../../../res/img/icons-groups.svg")}
-                    width="15"
-                    height="15"
-                />
+            <MenuItem className="mx_TagTileContextMenu_item mx_TagTileContextMenu_viewCommunity" onClick={this._onViewCommunityClick}>
                 { _t('View Community') }
             </MenuItem>
             <hr className="mx_TagTileContextMenu_separator" role="separator" />
-            <MenuItem className="mx_TagTileContextMenu_item" onClick={this._onRemoveClick}>
-                <img className="mx_TagTileContextMenu_item_icon" src={require("../../../../res/img/icon_context_delete.svg")} width="15" height="15" alt="" />
+            <MenuItem className="mx_TagTileContextMenu_item mx_TagTileContextMenu_hideCommunity" onClick={this._onRemoveClick}>
                 { _t('Hide') }
             </MenuItem>
         </div>;
diff --git a/src/components/views/context_menus/TopLeftMenu.js b/src/components/views/context_menus/TopLeftMenu.js
index 4448ecd041..ec99c63724 100644
--- a/src/components/views/context_menus/TopLeftMenu.js
+++ b/src/components/views/context_menus/TopLeftMenu.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import { _t } from '../../../languageHandler';
 import LogoutDialog from "../dialogs/LogoutDialog";
 import Modal from "../../../Modal";
@@ -27,6 +27,7 @@ import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {MenuItem} from "../../structures/ContextMenu";
 import * as sdk from "../../../index";
 import {getHomePageUrl} from "../../../utils/pages";
+import {Action} from "../../../dispatcher/actions";
 
 export default class TopLeftMenu extends React.Component {
     static propTypes = {
@@ -134,7 +135,7 @@ export default class TopLeftMenu extends React.Component {
     }
 
     openSettings() {
-        dis.dispatch({action: 'view_user_settings'});
+        dis.fire(Action.ViewUserSettings);
         this.closeMenu();
     }
 
diff --git a/src/components/views/create_room/CreateRoomButton.js b/src/components/views/create_room/CreateRoomButton.js
deleted file mode 100644
index adf3972eff..0000000000
--- a/src/components/views/create_room/CreateRoomButton.js
+++ /dev/null
@@ -1,44 +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 from 'react';
-import PropTypes from 'prop-types';
-import createReactClass from 'create-react-class';
-import { _t } from '../../../languageHandler';
-
-export default createReactClass({
-    displayName: 'CreateRoomButton',
-    propTypes: {
-        onCreateRoom: PropTypes.func,
-    },
-
-    getDefaultProps: function() {
-        return {
-            onCreateRoom: function() {},
-        };
-    },
-
-    onClick: function() {
-        this.props.onCreateRoom();
-    },
-
-    render: function() {
-        return (
-            <button className="mx_CreateRoomButton" onClick={this.onClick}>{ _t("Create Room") }</button>
-        );
-    },
-});
diff --git a/src/components/views/create_room/RoomAlias.js b/src/components/views/create_room/RoomAlias.js
index bc5dec1468..5bdfdde08d 100644
--- a/src/components/views/create_room/RoomAlias.js
+++ b/src/components/views/create_room/RoomAlias.js
@@ -98,7 +98,7 @@ export default createReactClass({
 
     render: function() {
         return (
-            <input type="text" className="mx_RoomAlias" placeholder={_t("Alias (optional)")}
+            <input type="text" className="mx_RoomAlias" placeholder={_t("Address (optional)")}
                 onChange={this.onValueChanged} onFocus={this.onFocus} onBlur={this.onBlur}
                 value={this.props.alias} />
         );
diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js
index 451ec9cfde..8ddd89dc65 100644
--- a/src/components/views/dialogs/AddressPickerDialog.js
+++ b/src/components/views/dialogs/AddressPickerDialog.js
@@ -24,7 +24,7 @@ import createReactClass from 'create-react-class';
 import { _t, _td } from '../../../languageHandler';
 import * as sdk from '../../../index';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import { addressTypes, getAddressType } from '../../../UserAddress.js';
 import GroupStore from '../../../stores/GroupStore';
 import * as Email from '../../../email';
@@ -33,6 +33,7 @@ import { getDefaultIdentityServerUrl, useDefaultIdentityServer } from '../../../
 import { abbreviateUrl } from '../../../utils/UrlUtils';
 import {sleep} from "../../../utils/promise";
 import {Key} from "../../../Keyboard";
+import {Action} from "../../../dispatcher/actions";
 
 const TRUNCATE_QUERY_LIST = 40;
 const QUERY_USER_DIRECTORY_DEBOUNCE_MS = 200;
@@ -615,7 +616,7 @@ export default createReactClass({
 
     onManageSettingsClick(e) {
         e.preventDefault();
-        dis.dispatch({ action: 'view_user_settings' });
+        dis.fire(Action.ViewUserSettings);
         this.onCancel();
     },
 
diff --git a/src/components/views/dialogs/AskInviteAnywayDialog.js b/src/components/views/dialogs/AskInviteAnywayDialog.js
index 120ad8deca..7a12d2bd20 100644
--- a/src/components/views/dialogs/AskInviteAnywayDialog.js
+++ b/src/components/views/dialogs/AskInviteAnywayDialog.js
@@ -19,8 +19,8 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
-import {SettingLevel} from "../../../settings/SettingsStore";
 import SettingsStore from "../../../settings/SettingsStore";
+import {SettingLevel} from "../../../settings/SettingLevel";
 
 export default createReactClass({
     propTypes: {
diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js
index 67d70aabe4..353298032c 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -75,8 +75,12 @@ export default createReactClass({
         // If provided, this is used to add a aria-describedby attribute
         contentId: PropTypes.string,
 
-        // optional additional class for the title element
-        titleClass: PropTypes.string,
+        // optional additional class for the title element (basically anything that can be passed to classnames)
+        titleClass: PropTypes.oneOfType([
+            PropTypes.string,
+            PropTypes.object,
+            PropTypes.arrayOf(PropTypes.string),
+        ]),
     },
 
     getDefaultProps: function() {
@@ -144,6 +148,7 @@ export default createReactClass({
                 >
                     <div className={classNames('mx_Dialog_header', {
                         'mx_Dialog_headerWithButton': !!this.props.headerButton,
+                        'mx_Dialog_headerWithCancel': !!cancelButton,
                     })}>
                         <div className={classNames('mx_Dialog_title', this.props.titleClass)} id='mx_BaseDialog_title'>
                             {headerImage}
diff --git a/src/components/views/dialogs/BugReportDialog.js b/src/components/views/dialogs/BugReportDialog.js
index 9bb716fe3f..d001d3993d 100644
--- a/src/components/views/dialogs/BugReportDialog.js
+++ b/src/components/views/dialogs/BugReportDialog.js
@@ -23,7 +23,8 @@ import * as sdk from '../../../index';
 import SdkConfig from '../../../SdkConfig';
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
-import sendBugReport from '../../../rageshake/submit-rageshake';
+import sendBugReport, {downloadBugReport} from '../../../rageshake/submit-rageshake';
+import AccessibleButton from "../elements/AccessibleButton";
 
 export default class BugReportDialog extends React.Component {
     constructor(props) {
@@ -35,6 +36,8 @@ export default class BugReportDialog extends React.Component {
             issueUrl: "",
             text: "",
             progress: null,
+            downloadBusy: false,
+            downloadProgress: null,
         };
         this._unmounted = false;
         this._onSubmit = this._onSubmit.bind(this);
@@ -43,6 +46,7 @@ export default class BugReportDialog extends React.Component {
         this._onIssueUrlChange = this._onIssueUrlChange.bind(this);
         this._onSendLogsChange = this._onSendLogsChange.bind(this);
         this._sendProgressCallback = this._sendProgressCallback.bind(this);
+        this._downloadProgressCallback = this._downloadProgressCallback.bind(this);
     }
 
     componentWillUnmount() {
@@ -95,6 +99,31 @@ export default class BugReportDialog extends React.Component {
         });
     }
 
+    _onDownload = async (ev) => {
+        this.setState({ downloadBusy: true });
+        this._downloadProgressCallback(_t("Preparing to download logs"));
+
+        try {
+            await downloadBugReport({
+                sendLogs: true,
+                progressCallback: this._downloadProgressCallback,
+                label: this.props.label,
+            });
+
+            this.setState({
+                downloadBusy: false,
+                downloadProgress: null,
+            });
+        } catch (err) {
+            if (!this._unmounted) {
+                this.setState({
+                    downloadBusy: false,
+                    downloadProgress: _t("Failed to send logs: ") + `${err.message}`,
+                });
+            }
+        }
+    };
+
     _onTextChange(ev) {
         this.setState({ text: ev.target.value });
     }
@@ -114,6 +143,13 @@ export default class BugReportDialog extends React.Component {
         this.setState({progress: progress});
     }
 
+    _downloadProgressCallback(downloadProgress) {
+        if (this._unmounted) {
+            return;
+        }
+        this.setState({ downloadProgress });
+    }
+
     render() {
         const Loader = sdk.getComponent("elements.Spinner");
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
@@ -166,20 +202,28 @@ export default class BugReportDialog extends React.Component {
                             {
                                 a: (sub) => <a
                                     target="_blank"
-                                    href="https://github.com/vector-im/riot-web/issues/new"
+                                    href="https://github.com/vector-im/element-web/issues/new"
                                 >
                                     { sub }
                                 </a>,
                             },
                         ) }
                     </b></p>
+
+                    <div className="mx_BugReportDialog_download">
+                        <AccessibleButton onClick={this._onDownload} kind="link" disabled={this.state.downloadBusy}>
+                            { _t("Download logs") }
+                        </AccessibleButton>
+                        {this.state.downloadProgress && <span>{this.state.downloadProgress} ...</span>}
+                    </div>
+
                     <Field
                         type="text"
                         className="mx_BugReportDialog_field_input"
                         label={_t("GitHub issue")}
                         onChange={this._onIssueUrlChange}
                         value={this.state.issueUrl}
-                        placeholder="https://github.com/vector-im/riot-web/issues/..."
+                        placeholder="https://github.com/vector-im/element-web/issues/..."
                     />
                     <Field
                         className="mx_BugReportDialog_field_input"
diff --git a/src/components/views/dialogs/ChangelogDialog.js b/src/components/views/dialogs/ChangelogDialog.js
index ab284cdb2e..50bc13cff5 100644
--- a/src/components/views/dialogs/ChangelogDialog.js
+++ b/src/components/views/dialogs/ChangelogDialog.js
@@ -21,7 +21,7 @@ import * as sdk from '../../../index';
 import request from 'browser-request';
 import { _t } from '../../../languageHandler';
 
-const REPOS = ['vector-im/riot-web', 'matrix-org/matrix-react-sdk', 'matrix-org/matrix-js-sdk'];
+const REPOS = ['vector-im/element-web', 'matrix-org/matrix-react-sdk', 'matrix-org/matrix-js-sdk'];
 
 export default class ChangelogDialog extends React.Component {
     constructor(props) {
diff --git a/src/components/views/dialogs/CreateGroupDialog.js b/src/components/views/dialogs/CreateGroupDialog.js
index d465ef26a2..10285ccee0 100644
--- a/src/components/views/dialogs/CreateGroupDialog.js
+++ b/src/components/views/dialogs/CreateGroupDialog.js
@@ -18,7 +18,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 
diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index 74e006354b..ce7ac6e59c 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -24,19 +24,20 @@ import withValidation from '../elements/Validation';
 import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {Key} from "../../../Keyboard";
-import SettingsStore from "../../../settings/SettingsStore";
+import {privateShouldBeEncrypted} from "../../../createRoom";
 
 export default createReactClass({
     displayName: 'CreateRoomDialog',
     propTypes: {
         onFinished: PropTypes.func.isRequired,
+        defaultPublic: PropTypes.bool,
     },
 
     getInitialState() {
         const config = SdkConfig.get();
         return {
-            isPublic: false,
-            isEncrypted: true,
+            isPublic: this.props.defaultPublic || false,
+            isEncrypted: privateShouldBeEncrypted(),
             name: "",
             topic: "",
             alias: "",
@@ -65,7 +66,7 @@ export default createReactClass({
             createOpts.creation_content = {'m.federate': false};
         }
 
-        if (!this.state.isPublic && SettingsStore.getValue("feature_cross_signing")) {
+        if (!this.state.isPublic) {
             opts.encryption = this.state.isEncrypted;
         }
 
@@ -180,7 +181,7 @@ export default createReactClass({
         let publicPrivateLabel;
         let aliasField;
         if (this.state.isPublic) {
-            publicPrivateLabel = (<p>{_t("Set a room alias to easily share your room with other people.")}</p>);
+            publicPrivateLabel = (<p>{_t("Set a room address to easily share your room with other people.")}</p>);
             const domain = MatrixClientPeg.get().getDomain();
             aliasField = (
                 <div className="mx_CreateRoomDialog_aliasContainer">
@@ -192,7 +193,14 @@ export default createReactClass({
         }
 
         let e2eeSection;
-        if (!this.state.isPublic && SettingsStore.getValue("feature_cross_signing")) {
+        if (!this.state.isPublic) {
+            let microcopy;
+            if (privateShouldBeEncrypted()) {
+                microcopy = _t("You can’t disable this later. Bridges & most bots won’t work yet.");
+            } else {
+                microcopy = _t("Your server admin has disabled end-to-end encryption by default " +
+                    "in private rooms & Direct Messages.");
+            }
             e2eeSection = <React.Fragment>
                 <LabelledToggleSwitch
                     label={ _t("Enable end-to-end encryption")}
@@ -200,7 +208,7 @@ export default createReactClass({
                     value={this.state.isEncrypted}
                     className='mx_CreateRoomDialog_e2eSwitch' // for end-to-end tests
                 />
-                <p>{ _t("You can’t disable this later. Bridges & most bots won’t work yet.") }</p>
+                <p>{ microcopy }</p>
             </React.Fragment>;
         }
 
diff --git a/src/components/views/dialogs/CryptoStoreTooNewDialog.js b/src/components/views/dialogs/CryptoStoreTooNewDialog.js
index 11e202b0cc..6336c635e4 100644
--- a/src/components/views/dialogs/CryptoStoreTooNewDialog.js
+++ b/src/components/views/dialogs/CryptoStoreTooNewDialog.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,11 +17,14 @@ limitations under the License.
 
 import React from 'react';
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import { _t } from '../../../languageHandler';
+import SdkConfig from '../../../SdkConfig';
 import Modal from '../../../Modal';
 
 export default (props) => {
+    const brand = SdkConfig.get().brand;
+
     const _onLogoutClicked = () => {
         const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         Modal.createTrackedDialog('Logout e2e db too new', '', QuestionDialog, {
@@ -28,7 +32,8 @@ export default (props) => {
             description: _t(
                 "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 " +
-                "Riot to do this",
+                "%(brand)s to do this",
+                { brand },
             ),
             button: _t("Sign out"),
             focus: false,
@@ -42,10 +47,11 @@ export default (props) => {
     };
 
     const description =
-        _t("You've previously used a newer version of Riot on %(host)s. " +
+        _t(
+            "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. ",
-            {host: props.host},
+            "need to sign out and back in again.",
+            { brand },
         );
 
     const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
diff --git a/src/components/views/dialogs/DeactivateAccountDialog.js b/src/components/views/dialogs/DeactivateAccountDialog.js
index b269ec2fdb..fca8c42546 100644
--- a/src/components/views/dialogs/DeactivateAccountDialog.js
+++ b/src/components/views/dialogs/DeactivateAccountDialog.js
@@ -25,6 +25,7 @@ import * as Lifecycle from '../../../Lifecycle';
 import { _t } from '../../../languageHandler';
 import InteractiveAuth, {ERROR_USER_CANCELLED} from "../../structures/InteractiveAuth";
 import {DEFAULT_PHASE, PasswordAuthEntry, SSOAuthEntry} from "../auth/InteractiveAuthEntryComponents";
+import StyledCheckbox from "../elements/StyledCheckbox";
 
 export default class DeactivateAccountDialog extends React.Component {
     constructor(props) {
@@ -34,6 +35,7 @@ export default class DeactivateAccountDialog extends React.Component {
             shouldErase: false,
             errStr: null,
             authData: null, // for UIA
+            authEnabled: true, // see usages for information
 
             // A few strings that are passed to InteractiveAuth for design or are displayed
             // next to the InteractiveAuth component.
@@ -42,21 +44,7 @@ export default class DeactivateAccountDialog extends React.Component {
             continueKind: null,
         };
 
-        MatrixClientPeg.get().deactivateAccount(null, false).then(r => {
-            // If we got here, oops. The server didn't require any auth.
-            // Our application lifecycle will catch the error and do the logout bits.
-            // We'll try to log something in an vain attempt to record what happened (storage
-            // is also obliterated on logout).
-            console.warn("User's account got deactivated without confirmation: Server had no auth");
-            this.setState({errStr: _t("Server did not require any authentication")});
-        }).catch(e => {
-            if (e && e.httpStatus === 401 && e.data) {
-                // Valid UIA response
-                this.setState({authData: e.data});
-            } else {
-                this.setState({errStr: _t("Server did not return valid authentication information.")});
-            }
-        });
+        this._initAuth(/* shouldErase= */false);
     }
 
     _onStagePhaseChange = (stage, phase) => {
@@ -124,13 +112,40 @@ export default class DeactivateAccountDialog extends React.Component {
     _onEraseFieldChange = (ev) => {
         this.setState({
             shouldErase: ev.target.checked,
+
+            // Disable the auth form because we're going to have to reinitialize the auth
+            // information. We do this because we can't modify the parameters in the UIA
+            // session, and the user will have selected something which changes the request.
+            // Therefore, we throw away the last auth session and try a new one.
+            authEnabled: false,
         });
+
+        // As mentioned above, set up for auth again to get updated UIA session info
+        this._initAuth(/* shouldErase= */ev.target.checked);
     };
 
     _onCancel() {
         this.props.onFinished(false);
     }
 
+    _initAuth(shouldErase) {
+        MatrixClientPeg.get().deactivateAccount(null, shouldErase).then(r => {
+            // If we got here, oops. The server didn't require any auth.
+            // Our application lifecycle will catch the error and do the logout bits.
+            // We'll try to log something in an vain attempt to record what happened (storage
+            // is also obliterated on logout).
+            console.warn("User's account got deactivated without confirmation: Server had no auth");
+            this.setState({errStr: _t("Server did not require any authentication")});
+        }).catch(e => {
+            if (e && e.httpStatus === 401 && e.data) {
+                // Valid UIA response
+                this.setState({authData: e.data, authEnabled: true});
+            } else {
+                this.setState({errStr: _t("Server did not return valid authentication information.")});
+            }
+        });
+    }
+
     render() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
 
@@ -142,7 +157,7 @@ export default class DeactivateAccountDialog extends React.Component {
         }
 
         let auth = <div>{_t("Loading...")}</div>;
-        if (this.state.authData) {
+        if (this.state.authData && this.state.authEnabled) {
             auth = (
                 <div>
                     {this.state.bodyText}
@@ -195,21 +210,18 @@ export default class DeactivateAccountDialog extends React.Component {
 
                     <div className="mx_DeactivateAccountDialog_input_section">
                         <p>
-                            <label htmlFor="mx_DeactivateAccountDialog_erase_account_input">
-                                <input
-                                    id="mx_DeactivateAccountDialog_erase_account_input"
-                                    type="checkbox"
-                                    checked={this.state.shouldErase}
-                                    onChange={this._onEraseFieldChange}
-                                />
-                                { _t(
+                            <StyledCheckbox
+                                checked={this.state.shouldErase}
+                                onChange={this._onEraseFieldChange}
+                            >
+                                {_t(
                                     "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: (sub) => <b>{ sub }</b> },
-                                ) }
-                            </label>
+                                )}
+                            </StyledCheckbox>
                         </p>
 
                         {error}
diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js
deleted file mode 100644
index a3f9430476..0000000000
--- a/src/components/views/dialogs/DeviceVerifyDialog.js
+++ /dev/null
@@ -1,377 +0,0 @@
-/*
-Copyright 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations Ltd
-Copyright 2019 New Vector Ltd
-Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import * as sdk from '../../../index';
-import * as FormattingUtils from '../../../utils/FormattingUtils';
-import { _t } from '../../../languageHandler';
-import {verificationMethods} from 'matrix-js-sdk/src/crypto';
-import {ensureDMExists} from "../../../createRoom";
-import dis from "../../../dispatcher";
-import SettingsStore from '../../../settings/SettingsStore';
-import {SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
-import VerificationQREmojiOptions from "../verification/VerificationQREmojiOptions";
-
-const MODE_LEGACY = 'legacy';
-const MODE_SAS = 'sas';
-
-const PHASE_START = 0;
-const PHASE_WAIT_FOR_PARTNER_TO_ACCEPT = 1;
-const PHASE_PICK_VERIFICATION_OPTION = 2;
-const PHASE_SHOW_SAS = 3;
-const PHASE_WAIT_FOR_PARTNER_TO_CONFIRM = 4;
-const PHASE_VERIFIED = 5;
-const PHASE_CANCELLED = 6;
-
-export default class DeviceVerifyDialog extends React.Component {
-    static propTypes = {
-        userId: PropTypes.string.isRequired,
-        device: PropTypes.object.isRequired,
-        onFinished: PropTypes.func.isRequired,
-    };
-
-    constructor() {
-        super();
-        this._verifier = null;
-        this._showSasEvent = null;
-        this._request = null;
-        this.state = {
-            phase: PHASE_START,
-            mode: MODE_SAS,
-            sasVerified: false,
-        };
-    }
-
-    componentWillUnmount() {
-        if (this._verifier) {
-            this._verifier.removeListener('show_sas', this._onVerifierShowSas);
-            this._verifier.cancel('User cancel');
-        }
-    }
-
-    _onSwitchToLegacyClick = () => {
-        if (this._verifier) {
-            this._verifier.removeListener('show_sas', this._onVerifierShowSas);
-            this._verifier.cancel('User cancel');
-            this._verifier = null;
-        }
-        this.setState({mode: MODE_LEGACY});
-    }
-
-    _onSwitchToSasClick = () => {
-        this.setState({mode: MODE_SAS});
-    }
-
-    _onCancelClick = () => {
-        this.props.onFinished(false);
-    }
-
-    _onUseSasClick = async () => {
-        try {
-            this._verifier = this._request.beginKeyVerification(verificationMethods.SAS);
-            this._verifier.on('show_sas', this._onVerifierShowSas);
-            // throws upon cancellation
-            await this._verifier.verify();
-            this.setState({phase: PHASE_VERIFIED});
-            this._verifier.removeListener('show_sas', this._onVerifierShowSas);
-            this._verifier = null;
-        } catch (e) {
-            console.log("Verification failed", e);
-            this.setState({
-                phase: PHASE_CANCELLED,
-            });
-            this._verifier = null;
-            this._request = null;
-        }
-    };
-
-    _onLegacyFinished = (confirm) => {
-        if (confirm) {
-            MatrixClientPeg.get().setDeviceVerified(
-                this.props.userId, this.props.device.deviceId, true,
-            );
-        }
-        this.props.onFinished(confirm);
-    }
-
-    _onSasRequestClick = async () => {
-        this.setState({
-            phase: PHASE_WAIT_FOR_PARTNER_TO_ACCEPT,
-        });
-        const client = MatrixClientPeg.get();
-        const verifyingOwnDevice = this.props.userId === client.getUserId();
-        try {
-            if (!verifyingOwnDevice && SettingsStore.getValue("feature_cross_signing")) {
-                const roomId = await ensureDMExistsAndOpen(this.props.userId);
-                // throws upon cancellation before having started
-                const request = await client.requestVerificationDM(
-                    this.props.userId, roomId,
-                );
-                await request.waitFor(r => r.ready || r.started);
-                if (request.ready) {
-                    this._verifier = request.beginKeyVerification(verificationMethods.SAS);
-                } else {
-                    this._verifier = request.verifier;
-                }
-            } else if (verifyingOwnDevice && SettingsStore.getValue("feature_cross_signing")) {
-                this._request = await client.requestVerification(this.props.userId, [
-                    verificationMethods.SAS,
-                    SHOW_QR_CODE_METHOD,
-                    verificationMethods.RECIPROCATE_QR_CODE,
-                ]);
-
-                await this._request.waitFor(r => r.ready || r.started);
-                this.setState({phase: PHASE_PICK_VERIFICATION_OPTION});
-            } else {
-                this._verifier = client.beginKeyVerification(
-                    verificationMethods.SAS, this.props.userId, this.props.device.deviceId,
-                );
-            }
-            if (!this._verifier) return;
-            this._verifier.on('show_sas', this._onVerifierShowSas);
-            // throws upon cancellation
-            await this._verifier.verify();
-            this.setState({phase: PHASE_VERIFIED});
-            this._verifier.removeListener('show_sas', this._onVerifierShowSas);
-            this._verifier = null;
-        } catch (e) {
-            console.log("Verification failed", e);
-            this.setState({
-                phase: PHASE_CANCELLED,
-            });
-            this._verifier = null;
-        }
-    }
-
-    _onSasMatchesClick = () => {
-        this._showSasEvent.confirm();
-        this.setState({
-            phase: PHASE_WAIT_FOR_PARTNER_TO_CONFIRM,
-        });
-    }
-
-    _onVerifiedDoneClick = () => {
-        this.props.onFinished(true);
-    }
-
-    _onVerifierShowSas = (e) => {
-        this._showSasEvent = e;
-        this.setState({
-            phase: PHASE_SHOW_SAS,
-        });
-    }
-
-    _renderSasVerification() {
-        let body;
-        switch (this.state.phase) {
-            case PHASE_START:
-                body = this._renderVerificationPhaseStart();
-                break;
-            case PHASE_WAIT_FOR_PARTNER_TO_ACCEPT:
-                body = this._renderVerificationPhaseWaitAccept();
-                break;
-            case PHASE_PICK_VERIFICATION_OPTION:
-                body = this._renderVerificationPhasePick();
-                break;
-            case PHASE_SHOW_SAS:
-                body = this._renderSasVerificationPhaseShowSas();
-                break;
-            case PHASE_WAIT_FOR_PARTNER_TO_CONFIRM:
-                body = this._renderSasVerificationPhaseWaitForPartnerToConfirm();
-                break;
-            case PHASE_VERIFIED:
-                body = this._renderVerificationPhaseVerified();
-                break;
-            case PHASE_CANCELLED:
-                body = this._renderVerificationPhaseCancelled();
-                break;
-        }
-
-        const BaseDialog = sdk.getComponent("dialogs.BaseDialog");
-        return (
-            <BaseDialog
-                title={_t("Verify session")}
-                onFinished={this._onCancelClick}
-            >
-                {body}
-            </BaseDialog>
-        );
-    }
-
-    _renderVerificationPhaseStart() {
-        const AccessibleButton = sdk.getComponent('views.elements.AccessibleButton');
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-        return (
-            <div>
-                <AccessibleButton
-                    element="span" className="mx_linkButton" onClick={this._onSwitchToLegacyClick}
-                >
-                    {_t("Use Legacy Verification (for older clients)")}
-                </AccessibleButton>
-                <p>
-                    { _t("Verify by comparing a short text string.") }
-                </p>
-                <p>
-                    {_t("To be secure, do this in person or use a trusted way to communicate.")}
-                </p>
-                <DialogButtons
-                    primaryButton={_t('Begin Verifying')}
-                    hasCancel={true}
-                    onPrimaryButtonClick={this._onSasRequestClick}
-                    onCancel={this._onCancelClick}
-                />
-            </div>
-        );
-    }
-
-    _renderVerificationPhaseWaitAccept() {
-        const Spinner = sdk.getComponent("views.elements.Spinner");
-        const AccessibleButton = sdk.getComponent('views.elements.AccessibleButton');
-
-        return (
-            <div>
-                <Spinner />
-                <p>{_t("Waiting for partner to accept...")}</p>
-                <p>{_t(
-                    "Nothing appearing? Not all clients support interactive verification yet. " +
-                    "<button>Use legacy verification</button>.",
-                    {}, {button: sub => <AccessibleButton element='span' className="mx_linkButton"
-                        onClick={this._onSwitchToLegacyClick}
-                    >
-                        {sub}
-                    </AccessibleButton>},
-                )}</p>
-            </div>
-        );
-    }
-
-    _renderVerificationPhasePick() {
-        return <VerificationQREmojiOptions
-            request={this._request}
-            onCancel={this._onCancelClick}
-            onStartEmoji={this._onUseSasClick}
-        />;
-    }
-
-    _renderSasVerificationPhaseShowSas() {
-        const VerificationShowSas = sdk.getComponent('views.verification.VerificationShowSas');
-        return <VerificationShowSas
-            sas={this._showSasEvent.sas}
-            onCancel={this._onCancelClick}
-            onDone={this._onSasMatchesClick}
-            isSelf={MatrixClientPeg.get().getUserId() === this.props.userId}
-            onStartEmoji={this._onUseSasClick}
-            inDialog={true}
-        />;
-    }
-
-    _renderSasVerificationPhaseWaitForPartnerToConfirm() {
-        const Spinner = sdk.getComponent('views.elements.Spinner');
-        return <div>
-            <Spinner />
-            <p>{_t(
-                "Waiting for %(userId)s to confirm...", {userId: this.props.userId},
-            )}</p>
-        </div>;
-    }
-
-    _renderVerificationPhaseVerified() {
-        const VerificationComplete = sdk.getComponent('views.verification.VerificationComplete');
-        return <VerificationComplete onDone={this._onVerifiedDoneClick} />;
-    }
-
-    _renderVerificationPhaseCancelled() {
-        const VerificationCancelled = sdk.getComponent('views.verification.VerificationCancelled');
-        return <VerificationCancelled onDone={this._onCancelClick} />;
-    }
-
-    _renderLegacyVerification() {
-        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-        const AccessibleButton = sdk.getComponent('views.elements.AccessibleButton');
-
-        let text;
-        if (MatrixClientPeg.get().getUserId() === this.props.userId) {
-            text = _t("To verify that this session can be trusted, please check that the key you see " +
-                "in User Settings on that device matches the key below:");
-        } else {
-            text = _t("To verify that this session can be trusted, please contact its owner using some other " +
-                "means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings " +
-                "for this session matches the key below:");
-        }
-
-        const key = FormattingUtils.formatCryptoKey(this.props.device.getFingerprint());
-        const body = (
-            <div>
-                <AccessibleButton
-                    element="span" className="mx_linkButton" onClick={this._onSwitchToSasClick}
-                >
-                    {_t("Use two-way text verification")}
-                </AccessibleButton>
-                <p>
-                    { text }
-                </p>
-                <div className="mx_DeviceVerifyDialog_cryptoSection">
-                    <ul>
-                        <li><label>{ _t("Session name") }:</label> <span>{ this.props.device.getDisplayName() }</span></li>
-                        <li><label>{ _t("Session ID") }:</label> <span><code>{ this.props.device.deviceId }</code></span></li>
-                        <li><label>{ _t("Session key") }:</label> <span><code><b>{ key }</b></code></span></li>
-                    </ul>
-                </div>
-                <p>
-                    { _t("If it matches, press the verify button below. " +
-                        "If it doesn't, then someone else is intercepting this session " +
-                        "and you probably want to press the blacklist button instead.") }
-                </p>
-            </div>
-        );
-
-        return (
-            <QuestionDialog
-                title={_t("Verify session")}
-                description={body}
-                button={_t("I verify that the keys match")}
-                onFinished={this._onLegacyFinished}
-            />
-        );
-    }
-
-    render() {
-        if (this.state.mode === MODE_LEGACY) {
-            return this._renderLegacyVerification();
-        } else {
-            return <div>
-                {this._renderSasVerification()}
-            </div>;
-        }
-    }
-}
-
-async function ensureDMExistsAndOpen(userId) {
-    const roomId = await ensureDMExists(MatrixClientPeg.get(), userId);
-    // don't use andView and spinner in createRoom, together, they cause this dialog to close and reopen,
-    // we causes us to loose the verifier and restart, and we end up having two verification requests
-    dis.dispatch({
-        action: 'view_room',
-        room_id: roomId,
-        should_peek: false,
-    });
-    return roomId;
-}
diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 08817cdfee..a0c5375843 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
 import SyntaxHighlight from '../elements/SyntaxHighlight';
 import { _t } from '../../../languageHandler';
-import { Room } from "matrix-js-sdk";
+import { Room, MatrixEvent } from "matrix-js-sdk";
 import Field from "../elements/Field";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {useEventEmitter} from "../../../hooks/useEventEmitter";
@@ -327,6 +327,8 @@ class RoomStateExplorer extends React.PureComponent {
 
     static contextType = MatrixClientContext;
 
+    roomStateEvents: Map<string, Map<string, MatrixEvent>>;
+
     constructor(props) {
         super(props);
 
@@ -412,30 +414,26 @@ class RoomStateExplorer extends React.PureComponent {
         if (this.state.eventType === null) {
             list = <FilteredList query={this.state.queryEventType} onChange={this.onQueryEventType}>
                 {
-                    Object.keys(this.roomStateEvents).map((evType) => {
-                        const stateGroup = this.roomStateEvents[evType];
-                        const stateKeys = Object.keys(stateGroup);
-
+                    Array.from(this.roomStateEvents.entries()).map(([eventType, allStateKeys]) => {
                         let onClickFn;
-                        if (stateKeys.length === 1 && stateKeys[0] === '') {
-                            onClickFn = this.onViewSourceClick(stateGroup[stateKeys[0]]);
+                        if (allStateKeys.size === 1 && allStateKeys.has("")) {
+                            onClickFn = this.onViewSourceClick(allStateKeys.get(""));
                         } else {
-                            onClickFn = this.browseEventType(evType);
+                            onClickFn = this.browseEventType(eventType);
                         }
 
-                        return <button className={classes} key={evType} onClick={onClickFn}>
-                            { evType }
+                        return <button className={classes} key={eventType} onClick={onClickFn}>
+                            {eventType}
                         </button>;
                     })
                 }
             </FilteredList>;
         } else {
-            const stateGroup = this.roomStateEvents[this.state.eventType];
+            const stateGroup = this.roomStateEvents.get(this.state.eventType);
 
             list = <FilteredList query={this.state.queryStateKey} onChange={this.onQueryStateKey}>
                 {
-                    Object.keys(stateGroup).map((stateKey) => {
-                        const ev = stateGroup[stateKey];
+                    Array.from(stateGroup.entries()).map(([stateKey, ev]) => {
                         return <button className={classes} key={stateKey} onClick={this.onViewSourceClick(ev)}>
                             { stateKey }
                         </button>;
diff --git a/src/components/views/dialogs/IntegrationsDisabledDialog.js b/src/components/views/dialogs/IntegrationsDisabledDialog.js
index 1ca638f0ab..7c996fbeab 100644
--- a/src/components/views/dialogs/IntegrationsDisabledDialog.js
+++ b/src/components/views/dialogs/IntegrationsDisabledDialog.js
@@ -18,7 +18,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../languageHandler";
 import * as sdk from "../../../index";
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
+import {Action} from "../../../dispatcher/actions";
 
 export default class IntegrationsDisabledDialog extends React.Component {
     static propTypes = {
@@ -31,7 +32,7 @@ export default class IntegrationsDisabledDialog extends React.Component {
 
     _onOpenSettingsClick = () => {
         this.props.onFinished();
-        dis.dispatch({action: "view_user_settings"});
+        dis.fire(Action.ViewUserSettings);
     };
 
     render() {
diff --git a/src/components/views/dialogs/IntegrationsImpossibleDialog.js b/src/components/views/dialogs/IntegrationsImpossibleDialog.js
index f12e4232be..68bedc711d 100644
--- a/src/components/views/dialogs/IntegrationsImpossibleDialog.js
+++ b/src/components/views/dialogs/IntegrationsImpossibleDialog.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -17,6 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../languageHandler";
+import SdkConfig from "../../../SdkConfig";
 import * as sdk from "../../../index";
 
 export default class IntegrationsImpossibleDialog extends React.Component {
@@ -29,6 +30,7 @@ export default class IntegrationsImpossibleDialog extends React.Component {
     };
 
     render() {
+        const brand = SdkConfig.get().brand;
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
 
@@ -39,8 +41,9 @@ export default class IntegrationsImpossibleDialog extends React.Component {
                 <div className='mx_IntegrationsImpossibleDialog_content'>
                     <p>
                         {_t(
-                            "Your Riot doesn't allow you to use an Integration Manager to do this. " +
+                            "Your %(brand)s doesn't allow you to use an Integration Manager to do this. " +
                             "Please contact an admin.",
+                            { brand },
                         )}
                     </p>
                 </div>
diff --git a/src/components/views/dialogs/InteractiveAuthDialog.js b/src/components/views/dialogs/InteractiveAuthDialog.js
index af5dc5108c..b06ce63ecd 100644
--- a/src/components/views/dialogs/InteractiveAuthDialog.js
+++ b/src/components/views/dialogs/InteractiveAuthDialog.js
@@ -25,6 +25,7 @@ import { _t } from '../../../languageHandler';
 
 import AccessibleButton from '../elements/AccessibleButton';
 import {ERROR_USER_CANCELLED} from "../../structures/InteractiveAuth";
+import {SSOAuthEntry} from "../auth/InteractiveAuthEntryComponents";
 
 export default createReactClass({
     displayName: 'InteractiveAuthDialog',
@@ -66,6 +67,8 @@ export default createReactClass({
         //         }
         //     }
         // }
+        //
+        // Default is defined in _getDefaultDialogAesthetics()
         aestheticsForStagePhases: PropTypes.object,
     },
 
@@ -79,6 +82,28 @@ export default createReactClass({
         };
     },
 
+    _getDefaultDialogAesthetics: function() {
+        const ssoAesthetics = {
+            [SSOAuthEntry.PHASE_PREAUTH]: {
+                title: _t("Use Single Sign On to continue"),
+                body: _t("To continue, use Single Sign On to prove your identity."),
+                continueText: _t("Single Sign On"),
+                continueKind: "primary",
+            },
+            [SSOAuthEntry.PHASE_POSTAUTH]: {
+                title: _t("Confirm to continue"),
+                body: _t("Click the button below to confirm your identity."),
+                continueText: _t("Confirm"),
+                continueKind: "primary",
+            },
+        };
+
+        return {
+            [SSOAuthEntry.LOGIN_TYPE]: ssoAesthetics,
+            [SSOAuthEntry.UNSTABLE_LOGIN_TYPE]: ssoAesthetics,
+        };
+    },
+
     _onAuthFinished: function(success, result) {
         if (success) {
             this.props.onFinished(true, result);
@@ -113,9 +138,10 @@ export default createReactClass({
         let body = this.state.authError ? null : this.props.body;
         let continueText = null;
         let continueKind = null;
-        if (!this.state.authError && this.props.aestheticsForStagePhases) {
-            if (this.props.aestheticsForStagePhases[this.state.uiaStage]) {
-                const aesthetics = this.props.aestheticsForStagePhases[this.state.uiaStage][this.state.uiaStagePhase];
+        const dialogAesthetics = this.props.aestheticsForStagePhases || this._getDefaultDialogAesthetics();
+        if (!this.state.authError && dialogAesthetics) {
+            if (dialogAesthetics[this.state.uiaStage]) {
+                const aesthetics = dialogAesthetics[this.state.uiaStage][this.state.uiaStagePhase];
                 if (aesthetics && aesthetics.title) title = aesthetics.title;
                 if (aesthetics && aesthetics.body) body = aesthetics.body;
                 if (aesthetics && aesthetics.continueText) continueText = aesthetics.continueText;
diff --git a/src/components/views/dialogs/InviteDialog.js b/src/components/views/dialogs/InviteDialog.js
index e48c6866bf..c90811ed5a 100644
--- a/src/components/views/dialogs/InviteDialog.js
+++ b/src/components/views/dialogs/InviteDialog.js
@@ -27,15 +27,19 @@ import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
 import * as Email from "../../../email";
 import {getDefaultIdentityServerUrl, useDefaultIdentityServer} from "../../../utils/IdentityServerUtils";
 import {abbreviateUrl} from "../../../utils/UrlUtils";
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 import IdentityAuthClient from "../../../IdentityAuthClient";
 import Modal from "../../../Modal";
 import {humanizeTime} from "../../../utils/humanize";
-import createRoom, {canEncryptToAllUsers} from "../../../createRoom";
+import createRoom, {canEncryptToAllUsers, privateShouldBeEncrypted} from "../../../createRoom";
 import {inviteMultipleToRoom} from "../../../RoomInvite";
-import SettingsStore from '../../../settings/SettingsStore';
-import RoomListStore, {TAG_DM} from "../../../stores/RoomListStore";
 import {Key} from "../../../Keyboard";
+import {Action} from "../../../dispatcher/actions";
+import {DefaultTagID} from "../../../stores/room-list/models";
+import RoomListStore from "../../../stores/room-list/RoomListStore";
+
+// 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";
@@ -343,10 +347,9 @@ export default class InviteDialog extends React.PureComponent {
     _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 TAG_DM so we don't miss anything. Sometimes the
+        // Also pull in all the rooms tagged as DefaultTagID.DM so we don't miss anything. Sometimes the
         // room list doesn't tag the room for the DMRoomMap, but does for the room list.
-        const taggedRooms = RoomListStore.getRoomLists();
-        const dmTaggedRooms = taggedRooms[TAG_DM];
+        const dmTaggedRooms = RoomListStore.instance.orderedLists[DefaultTagID.DM] || [];
         const myUserId = MatrixClientPeg.get().getUserId();
         for (const dmRoom of dmTaggedRooms) {
             const otherMembers = dmRoom.getJoinedMembers().filter(u => u.userId !== myUserId);
@@ -574,7 +577,7 @@ export default class InviteDialog extends React.PureComponent {
 
         const createRoomOptions = {inlineErrors: true};
 
-        if (SettingsStore.getValue("feature_cross_signing")) {
+        if (privateShouldBeEncrypted()) {
             // Check whether all users have uploaded device keys before.
             // If so, enable encryption in the new room.
             const has3PidMembers = targets.some(t => t instanceof ThreepidMember);
@@ -902,7 +905,7 @@ export default class InviteDialog extends React.PureComponent {
 
     _onManageSettingsClick = (e) => {
         e.preventDefault();
-        dis.dispatch({ action: 'view_user_settings' });
+        dis.fire(Action.ViewUserSettings);
         this.props.onFinished();
     };
 
@@ -1070,9 +1073,8 @@ export default class InviteDialog extends React.PureComponent {
         let buttonText;
         let goButtonFn;
 
+        const userId = MatrixClientPeg.get().getUserId();
         if (this.props.kind === KIND_DM) {
-            const userId = MatrixClientPeg.get().getUserId();
-
             title = _t("Direct Messages");
             helpText = _t(
                 "Start a conversation with someone using their name, username (like <userId/>) or email address.",
@@ -1086,9 +1088,11 @@ export default class InviteDialog extends React.PureComponent {
         } else { // KIND_INVITE
             title = _t("Invite to this room");
             helpText = _t(
-                "If you can't find someone, ask them for their username (e.g. @user:server.com) or " +
-                "<a>share this room</a>.", {},
+                "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>,
                 },
diff --git a/src/components/views/dialogs/KeyShareDialog.js b/src/components/views/dialogs/KeyShareDialog.js
deleted file mode 100644
index 8ef36bb59f..0000000000
--- a/src/components/views/dialogs/KeyShareDialog.js
+++ /dev/null
@@ -1,178 +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 Modal from '../../../Modal';
-import React from 'react';
-import createReactClass from 'create-react-class';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
-
-import { _t, _td } from '../../../languageHandler';
-
-// TODO: We can remove this once cross-signing is the only way.
-// https://github.com/vector-im/riot-web/issues/11908
-
-/**
- * Dialog which asks the user whether they want to share their keys with
- * an unverified device.
- *
- * onFinished is called with `true` if the key should be shared, `false` if it
- * should not, and `undefined` if the dialog is cancelled. (In other words:
- * truthy: do the key share. falsy: don't share the keys).
- */
-export default createReactClass({
-    propTypes: {
-        matrixClient: PropTypes.object.isRequired,
-        userId: PropTypes.string.isRequired,
-        deviceId: PropTypes.string.isRequired,
-        onFinished: PropTypes.func.isRequired,
-    },
-
-    getInitialState: function() {
-        return {
-            deviceInfo: null,
-            wasNewDevice: false,
-        };
-    },
-
-    componentDidMount: function() {
-        this._unmounted = false;
-        const userId = this.props.userId;
-        const deviceId = this.props.deviceId;
-
-        // give the client a chance to refresh the device list
-        this.props.matrixClient.downloadKeys([userId], false).then((r) => {
-            if (this._unmounted) { return; }
-
-            const deviceInfo = r[userId][deviceId];
-
-            if (!deviceInfo) {
-                console.warn(`No details found for session ${userId}:${deviceId}`);
-
-                this.props.onFinished(false);
-                return;
-            }
-
-            const wasNewDevice = !deviceInfo.isKnown();
-
-            this.setState({
-                deviceInfo: deviceInfo,
-                wasNewDevice: wasNewDevice,
-            });
-
-            // if the device was new before, it's not any more.
-            if (wasNewDevice) {
-                this.props.matrixClient.setDeviceKnown(
-                    userId,
-                    deviceId,
-                    true,
-                );
-            }
-        });
-    },
-
-    componentWillUnmount: function() {
-        this._unmounted = true;
-    },
-
-
-    _onVerifyClicked: function() {
-        const DeviceVerifyDialog = sdk.getComponent('views.dialogs.DeviceVerifyDialog');
-
-        console.log("KeyShareDialog: Starting verify dialog");
-        Modal.createTrackedDialog('Key Share', 'Starting dialog', DeviceVerifyDialog, {
-            userId: this.props.userId,
-            device: this.state.deviceInfo,
-            onFinished: (verified) => {
-                if (verified) {
-                    // can automatically share the keys now.
-                    this.props.onFinished(true);
-                }
-            },
-        }, null, /* priority = */ false, /* static = */ true);
-    },
-
-    _onShareClicked: function() {
-        console.log("KeyShareDialog: User clicked 'share'");
-        this.props.onFinished(true);
-    },
-
-    _onIgnoreClicked: function() {
-        console.log("KeyShareDialog: User clicked 'ignore'");
-        this.props.onFinished(false);
-    },
-
-    _renderContent: function() {
-        const displayName = this.state.deviceInfo.getDisplayName() ||
-            this.state.deviceInfo.deviceId;
-
-        let text;
-        if (this.state.wasNewDevice) {
-            text = _td("You added a new session '%(displayName)s', which is"
-                + " requesting encryption keys.");
-        } else {
-            text = _td("Your unverified session '%(displayName)s' is requesting"
-                + " encryption keys.");
-        }
-        text = _t(text, {displayName: displayName});
-
-        return (
-            <div id='mx_Dialog_content'>
-                <p>{ text }</p>
-
-                <div className="mx_Dialog_buttons">
-                    <button onClick={this._onVerifyClicked} autoFocus="true">
-                        { _t('Start verification') }
-                    </button>
-                    <button onClick={this._onShareClicked}>
-                        { _t('Share without verifying') }
-                    </button>
-                    <button onClick={this._onIgnoreClicked}>
-                        { _t('Ignore request') }
-                    </button>
-                </div>
-            </div>
-        );
-    },
-
-    render: function() {
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const Spinner = sdk.getComponent('views.elements.Spinner');
-
-        let content;
-
-        if (this.state.deviceInfo) {
-            content = this._renderContent();
-        } else {
-            content = (
-                <div id='mx_Dialog_content'>
-                    <p>{ _t('Loading session info...') }</p>
-                    <Spinner />
-                </div>
-            );
-        }
-
-        return (
-            <BaseDialog className='mx_KeyShareRequestDialog'
-                onFinished={this.props.onFinished}
-                title={_t('Encryption key request')}
-                contentId='mx_Dialog_content'
-            >
-                { content }
-            </BaseDialog>
-        );
-    },
-});
diff --git a/src/components/views/dialogs/KeySignatureUploadFailedDialog.js b/src/components/views/dialogs/KeySignatureUploadFailedDialog.js
index e59f77fce9..25eb7a90d2 100644
--- a/src/components/views/dialogs/KeySignatureUploadFailedDialog.js
+++ b/src/components/views/dialogs/KeySignatureUploadFailedDialog.js
@@ -17,6 +17,7 @@ limitations under the License.
 import React, {useState, useCallback, useRef} from 'react';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
+import SdkConfig from '../../../SdkConfig';
 
 export default function KeySignatureUploadFailedDialog({
         failures,
@@ -65,9 +66,10 @@ export default function KeySignatureUploadFailedDialog({
     let body;
     if (!success && !cancelled && continuation && retry > 0) {
         const reason = causes.get(source) || defaultCause;
+        const brand = SdkConfig.get().brand;
 
         body = (<div>
-            <p>{_t("Riot encountered an error during upload of:")}</p>
+            <p>{_t("%(brand)s encountered an error during upload of:", { brand })}</p>
             <p>{reason}</p>
             {retrying && <Spinner />}
             <pre>{JSON.stringify(failures, null, 2)}</pre>
diff --git a/src/components/views/dialogs/LazyLoadingDisabledDialog.js b/src/components/views/dialogs/LazyLoadingDisabledDialog.js
index d128d8dedd..cae9510742 100644
--- a/src/components/views/dialogs/LazyLoadingDisabledDialog.js
+++ b/src/components/views/dialogs/LazyLoadingDisabledDialog.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,17 +18,28 @@ limitations under the License.
 import React from 'react';
 import QuestionDialog from './QuestionDialog';
 import { _t } from '../../../languageHandler';
+import SdkConfig from '../../../SdkConfig';
 
 export default (props) => {
-    const description1 =
-        _t("You've previously used Riot 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, " +
-            "Riot needs to resync your account.",
-            {host: props.host});
-    const description2 = _t("If the other version of Riot is still open in another tab, " +
-            "please close it as using Riot on the same host with both " +
-            "lazy loading enabled and disabled simultaneously will cause issues.");
+    const brand = SdkConfig.get().brand;
+    const description1 = _t(
+        "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,
+            host: props.host,
+        },
+    );
+    const description2 = _t(
+        "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,
+        },
+    );
 
     return (<QuestionDialog
         hasCancelButton={false}
diff --git a/src/components/views/dialogs/LazyLoadingResyncDialog.js b/src/components/views/dialogs/LazyLoadingResyncDialog.js
index 125d2a9928..378306dc2f 100644
--- a/src/components/views/dialogs/LazyLoadingResyncDialog.js
+++ b/src/components/views/dialogs/LazyLoadingResyncDialog.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2018 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,15 +18,21 @@ limitations under the License.
 import React from 'react';
 import QuestionDialog from './QuestionDialog';
 import { _t } from '../../../languageHandler';
+import SdkConfig from '../../../SdkConfig';
 
 export default (props) => {
+    const brand = SdkConfig.get().brand;
     const description =
-        _t("Riot now uses 3-5x less memory, by only loading information about other users"
-        + " when needed. Please wait whilst we resynchronise with the server!");
+        _t(
+            "%(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 },
+        );
 
     return (<QuestionDialog
         hasCancelButton={false}
-        title={_t("Updating Riot")}
+        title={_t("Updating %(brand)s", { brand })}
         description={<div>{description}</div>}
         button={_t("OK")}
         onFinished={props.onFinished}
diff --git a/src/components/views/dialogs/LogoutDialog.js b/src/components/views/dialogs/LogoutDialog.js
index 23a6692b39..930acaa0b8 100644
--- a/src/components/views/dialogs/LogoutDialog.js
+++ b/src/components/views/dialogs/LogoutDialog.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import Modal from '../../../Modal';
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 
diff --git a/src/components/views/dialogs/RedesignFeedbackDialog.js b/src/components/views/dialogs/RedesignFeedbackDialog.js
index 8f345bdd92..51b71ac6cb 100644
--- a/src/components/views/dialogs/RedesignFeedbackDialog.js
+++ b/src/components/views/dialogs/RedesignFeedbackDialog.js
@@ -19,9 +19,9 @@ import QuestionDialog from './QuestionDialog';
 import { _t } from '../../../languageHandler';
 
 export default (props) => {
-    const existingIssuesUrl = "https://github.com/vector-im/riot-web/issues" +
+    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/riot-web/issues/new";
+    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, " +
diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js
index c5f807b23c..613708e436 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.js
+++ b/src/components/views/dialogs/RoomSettingsDialog.js
@@ -27,9 +27,16 @@ import NotificationSettingsTab from "../settings/tabs/room/NotificationSettingsT
 import BridgeSettingsTab from "../settings/tabs/room/BridgeSettingsTab";
 import * as sdk from "../../../index";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 import SettingsStore from "../../../settings/SettingsStore";
 
+export const ROOM_GENERAL_TAB = "ROOM_GENERAL_TAB";
+export const ROOM_SECURITY_TAB = "ROOM_SECURITY_TAB";
+export const ROOM_ROLES_TAB = "ROOM_ROLES_TAB";
+export const ROOM_NOTIFICATIONS_TAB = "ROOM_NOTIFICATIONS_TAB";
+export const ROOM_BRIDGES_TAB = "ROOM_BRIDGES_TAB";
+export const ROOM_ADVANCED_TAB = "ROOM_ADVANCED_TAB";
+
 export default class RoomSettingsDialog extends React.Component {
     static propTypes = {
         roomId: PropTypes.string.isRequired,
@@ -56,28 +63,33 @@ export default class RoomSettingsDialog extends React.Component {
         const tabs = [];
 
         tabs.push(new Tab(
+            ROOM_GENERAL_TAB,
             _td("General"),
             "mx_RoomSettingsDialog_settingsIcon",
             <GeneralRoomSettingsTab roomId={this.props.roomId} />,
         ));
         tabs.push(new Tab(
+            ROOM_SECURITY_TAB,
             _td("Security & Privacy"),
             "mx_RoomSettingsDialog_securityIcon",
             <SecurityRoomSettingsTab roomId={this.props.roomId} />,
         ));
         tabs.push(new Tab(
+            ROOM_ROLES_TAB,
             _td("Roles & Permissions"),
             "mx_RoomSettingsDialog_rolesIcon",
             <RolesRoomSettingsTab roomId={this.props.roomId} />,
         ));
         tabs.push(new Tab(
+            ROOM_NOTIFICATIONS_TAB,
             _td("Notifications"),
             "mx_RoomSettingsDialog_notificationsIcon",
             <NotificationSettingsTab roomId={this.props.roomId} />,
         ));
 
-        if (SettingsStore.isFeatureEnabled("feature_bridge_state")) {
+        if (SettingsStore.getValue("feature_bridge_state")) {
             tabs.push(new Tab(
+                ROOM_BRIDGES_TAB,
                 _td("Bridges"),
                 "mx_RoomSettingsDialog_bridgesIcon",
                 <BridgeSettingsTab roomId={this.props.roomId} />,
@@ -85,6 +97,7 @@ export default class RoomSettingsDialog extends React.Component {
         }
 
         tabs.push(new Tab(
+            ROOM_ADVANCED_TAB,
             _td("Advanced"),
             "mx_RoomSettingsDialog_warningIcon",
             <AdvancedRoomSettingsTab roomId={this.props.roomId} closeSettingsFn={this.props.onFinished} />,
diff --git a/src/components/views/dialogs/RoomUpgradeWarningDialog.js b/src/components/views/dialogs/RoomUpgradeWarningDialog.js
index 02534c5b35..c83528c5ba 100644
--- a/src/components/views/dialogs/RoomUpgradeWarningDialog.js
+++ b/src/components/views/dialogs/RoomUpgradeWarningDialog.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -17,6 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../languageHandler";
+import SdkConfig from "../../../SdkConfig";
 import * as sdk from "../../../index";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
@@ -63,6 +64,7 @@ export default class RoomUpgradeWarningDialog extends React.Component {
     };
 
     render() {
+        const brand = SdkConfig.get().brand;
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
 
@@ -96,8 +98,11 @@ export default class RoomUpgradeWarningDialog extends React.Component {
                     <p>
                         {_t(
                             "This usually only affects how the room is processed on the server. If you're " +
-                            "having problems with your Riot, please <a>report a bug</a>.",
-                            {}, {
+                            "having problems with your %(brand)s, please <a>report a bug</a>.",
+                            {
+                                brand,
+                            },
+                            {
                                 "a": (sub) => {
                                     return <a href='#' onClick={this._openBugReportDialog}>{sub}</a>;
                                 },
diff --git a/src/components/views/dialogs/ServerOfflineDialog.tsx b/src/components/views/dialogs/ServerOfflineDialog.tsx
new file mode 100644
index 0000000000..f6767dcb8d
--- /dev/null
+++ b/src/components/views/dialogs/ServerOfflineDialog.tsx
@@ -0,0 +1,124 @@
+/*
+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 { EchoStore } from "../../../stores/local-echo/EchoStore";
+import { formatTime } from "../../../DateUtils";
+import SettingsStore from "../../../settings/SettingsStore";
+import { RoomEchoContext } from "../../../stores/local-echo/RoomEchoContext";
+import RoomAvatar from "../avatars/RoomAvatar";
+import { TransactionStatus } from "../../../stores/local-echo/EchoTransaction";
+import Spinner from "../elements/Spinner";
+import AccessibleButton from "../elements/AccessibleButton";
+import { UPDATE_EVENT } from "../../../stores/AsyncStore";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+
+interface IProps {
+    onFinished: (bool) => void;
+}
+
+export default class ServerOfflineDialog extends React.PureComponent<IProps> {
+    public componentDidMount() {
+        EchoStore.instance.on(UPDATE_EVENT, this.onEchosUpdated);
+    }
+
+    public componentWillUnmount() {
+        EchoStore.instance.off(UPDATE_EVENT, this.onEchosUpdated);
+    }
+
+    private onEchosUpdated = () => {
+        this.forceUpdate(); // no state to worry about
+    };
+
+    private renderTimeline(): React.ReactElement[] {
+        return EchoStore.instance.contexts.map((c, i) => {
+            if (!c.firstFailedTime) return null; // not useful
+            if (!(c instanceof RoomEchoContext)) throw new Error("Cannot render unknown context: " + c);
+            const header = (
+                <div className="mx_ServerOfflineDialog_content_context_timeline_header">
+                    <RoomAvatar width={24} height={24} room={c.room} />
+                    <span>{c.room.name}</span>
+                </div>
+            );
+            const entries = c.transactions
+                .filter(t => t.status === TransactionStatus.Error || t.didPreviouslyFail)
+                .map((t, j) => {
+                    let button = <Spinner w={19} h={19} />;
+                    if (t.status === TransactionStatus.Error) {
+                        button = (
+                            <AccessibleButton kind="link" onClick={() => t.run()}>{_t("Resend")}</AccessibleButton>
+                        );
+                    }
+                    return (
+                        <div className="mx_ServerOfflineDialog_content_context_txn" key={`txn-${j}`}>
+                            <span className="mx_ServerOfflineDialog_content_context_txn_desc">
+                                {t.auditName}
+                            </span>
+                            {button}
+                        </div>
+                    );
+                });
+            return (
+                <div className="mx_ServerOfflineDialog_content_context" key={`context-${i}`}>
+                    <div className="mx_ServerOfflineDialog_content_context_timestamp">
+                        {formatTime(c.firstFailedTime, SettingsStore.getValue("showTwelveHourTimestamps"))}
+                    </div>
+                    <div className="mx_ServerOfflineDialog_content_context_timeline">
+                        {header}
+                        {entries}
+                    </div>
+                </div>
+            )
+        });
+    }
+
+    public render() {
+        let timeline = this.renderTimeline().filter(c => !!c); // remove nulls for next check
+        if (timeline.length === 0) {
+            timeline = [<div key={1}>{_t("You're all caught up.")}</div>];
+        }
+
+        const serverName = MatrixClientPeg.getHomeserverName();
+        return <BaseDialog title={_t("Server isn't responding")}
+            className='mx_ServerOfflineDialog'
+            contentId='mx_Dialog_content'
+            onFinished={this.props.onFinished}
+            hasCancel={true}
+        >
+            <div className="mx_ServerOfflineDialog_content">
+                <p>{_t(
+                    "Your server isn't responding to some of your requests. " +
+                    "Below are some of the most likely reasons.",
+                )}</p>
+                <ul>
+                    <li>{_t("The server (%(serverName)s) took too long to respond.", {serverName})}</li>
+                    <li>{_t("Your firewall or anti-virus is blocking the request.")}</li>
+                    <li>{_t("A browser extension is preventing the request.")}</li>
+                    <li>{_t("The server is offline.")}</li>
+                    <li>{_t("The server has denied your request.")}</li>
+                    <li>{_t("Your area is experiencing difficulties connecting to the internet.")}</li>
+                    <li>{_t("A connection error occurred while trying to contact the server.")}</li>
+                    <li>{_t("The server is not configured to indicate what the problem is (CORS).")}</li>
+                </ul>
+                <hr />
+                <h2>{_t("Recent changes that have not yet been received")}</h2>
+                {timeline}
+            </div>
+        </BaseDialog>;
+    }
+}
diff --git a/src/components/views/dialogs/SessionRestoreErrorDialog.js b/src/components/views/dialogs/SessionRestoreErrorDialog.js
index 935faf0cad..3706172085 100644
--- a/src/components/views/dialogs/SessionRestoreErrorDialog.js
+++ b/src/components/views/dialogs/SessionRestoreErrorDialog.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2017 Vector Creations Ltd
 Copyright 2018 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -56,6 +57,7 @@ export default createReactClass({
     },
 
     render: function() {
+        const brand = SdkConfig.get().brand;
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
 
@@ -94,9 +96,10 @@ export default createReactClass({
                     <p>{ _t("We encountered an error trying to restore your previous session.") }</p>
 
                     <p>{ _t(
-                        "If you have previously used a more recent version of Riot, your 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 },
                      ) }</p>
 
                     <p>{ _t(
diff --git a/src/components/views/dialogs/ShareDialog.tsx b/src/components/views/dialogs/ShareDialog.tsx
index 375cb65b5f..dc2a987f13 100644
--- a/src/components/views/dialogs/ShareDialog.tsx
+++ b/src/components/views/dialogs/ShareDialog.tsx
@@ -24,11 +24,13 @@ import {RoomMember} from "matrix-js-sdk/src/models/room-member";
 import {MatrixEvent} from "matrix-js-sdk/src/models/event";
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
-import QRCode from 'qrcode-react';
+import QRCode from "../elements/QRCode";
 import {RoomPermalinkCreator, makeGroupPermalink, makeUserPermalink} from "../../../utils/permalinks/Permalinks";
 import * as ContextMenu from "../../structures/ContextMenu";
 import {toRightOf} from "../../structures/ContextMenu";
 import {copyPlaintext, selectText} from "../../../utils/strings";
+import StyledCheckbox from '../elements/StyledCheckbox';
+import AccessibleTooltipButton from '../elements/AccessibleTooltipButton';
 
 const socials = [
     {
@@ -168,13 +170,12 @@ export default class ShareDialog extends React.PureComponent<IProps, IState> {
             const events = this.props.target.getLiveTimeline().getEvents();
             if (events.length > 0) {
                 checkbox = <div>
-                    <input type="checkbox"
-                           id="mx_ShareDialog_checkbox"
-                           checked={this.state.linkSpecificEvent}
-                           onChange={this.onLinkSpecificEventCheckboxClick} />
-                    <label htmlFor="mx_ShareDialog_checkbox">
+                    <StyledCheckbox
+                        checked={this.state.linkSpecificEvent}
+                        onChange={this.onLinkSpecificEventCheckboxClick}
+                    >
                         { _t('Link to most recent message') }
-                    </label>
+                    </StyledCheckbox>
                 </div>;
             }
         } else if (this.props.target instanceof User || this.props.target instanceof RoomMember) {
@@ -184,13 +185,12 @@ export default class ShareDialog extends React.PureComponent<IProps, IState> {
         } else if (this.props.target instanceof MatrixEvent) {
             title = _t('Share Room Message');
             checkbox = <div>
-                <input type="checkbox"
-                       id="mx_ShareDialog_checkbox"
+                <StyledCheckbox
                        checked={this.state.linkSpecificEvent}
-                       onClick={this.onLinkSpecificEventCheckboxClick} />
-                <label htmlFor="mx_ShareDialog_checkbox">
+                       onClick={this.onLinkSpecificEventCheckboxClick}
+                >
                     { _t('Link to selected message') }
-                </label>
+                </StyledCheckbox>
             </div>;
         }
 
@@ -211,17 +211,18 @@ export default class ShareDialog extends React.PureComponent<IProps, IState> {
                     >
                         { matrixToUrl }
                     </a>
-                    <a href={matrixToUrl} className="mx_ShareDialog_matrixto_copy" onClick={this.onCopyClick}>
-                        { _t('COPY') }
-                        <div>&nbsp;</div>
-                    </a>
+                    <AccessibleTooltipButton
+                        title={_t("Copy")}
+                        onClick={this.onCopyClick}
+                        className="mx_ShareDialog_matrixto_copy"
+                    />
                 </div>
                 { checkbox }
                 <hr />
 
                 <div className="mx_ShareDialog_split">
                     <div className="mx_ShareDialog_qrcode_container">
-                        <QRCode value={matrixToUrl} size={256} logoWidth={48} logo={require("../../../../res/img/matrix-m.svg")} />
+                        <QRCode data={matrixToUrl} width={256} />
                     </div>
                     <div className="mx_ShareDialog_social_container">
                         { socials.map((social) => (
diff --git a/src/components/views/dialogs/UnknownDeviceDialog.js b/src/components/views/dialogs/UnknownDeviceDialog.js
deleted file mode 100644
index 4cad13b047..0000000000
--- a/src/components/views/dialogs/UnknownDeviceDialog.js
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
-Copyright 2017 Vector Creations Ltd
-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 createReactClass from 'create-react-class';
-import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import { _t } from '../../../languageHandler';
-import SettingsStore from "../../../settings/SettingsStore";
-import { markAllDevicesKnown } from '../../../cryptodevices';
-
-function UserUnknownDeviceList(props) {
-    const MemberDeviceInfo = sdk.getComponent('rooms.MemberDeviceInfo');
-    const {userId, userDevices} = props;
-
-    const deviceListEntries = Object.keys(userDevices).map((deviceId) =>
-        <li key={deviceId}><MemberDeviceInfo device={userDevices[deviceId]} userId={userId} showDeviceId={true} /></li>,
-    );
-
-    return (
-        <ul className="mx_UnknownDeviceDialog_deviceList">
-            { deviceListEntries }
-        </ul>
-    );
-}
-
-UserUnknownDeviceList.propTypes = {
-    userId: PropTypes.string.isRequired,
-
-    // map from deviceid -> deviceinfo
-    userDevices: PropTypes.object.isRequired,
-};
-
-
-function UnknownDeviceList(props) {
-    const {devices} = props;
-
-    const userListEntries = Object.keys(devices).map((userId) =>
-        <li key={userId}>
-            <p>{ userId }:</p>
-            <UserUnknownDeviceList userId={userId} userDevices={devices[userId]} />
-        </li>,
-    );
-
-    return <ul>{ userListEntries }</ul>;
-}
-
-UnknownDeviceList.propTypes = {
-    // map from userid -> deviceid -> deviceinfo
-    devices: PropTypes.object.isRequired,
-};
-
-
-export default createReactClass({
-    displayName: 'UnknownDeviceDialog',
-
-    propTypes: {
-        room: PropTypes.object.isRequired,
-
-        // map from userid -> deviceid -> deviceinfo or null if devices are not yet loaded
-        devices: PropTypes.object,
-
-        onFinished: PropTypes.func.isRequired,
-
-        // Label for the button that marks all devices known and tries the send again
-        sendAnywayLabel: PropTypes.string.isRequired,
-
-        // Label for the button that to send the event if you've verified all devices
-        sendLabel: PropTypes.string.isRequired,
-
-        // function to retry the request once all devices are verified / known
-        onSend: PropTypes.func.isRequired,
-    },
-
-    componentDidMount: function() {
-        MatrixClientPeg.get().on("deviceVerificationChanged", this._onDeviceVerificationChanged);
-    },
-
-    componentWillUnmount: function() {
-        if (MatrixClientPeg.get()) {
-            MatrixClientPeg.get().removeListener("deviceVerificationChanged", this._onDeviceVerificationChanged);
-        }
-    },
-
-    _onDeviceVerificationChanged: function(userId, deviceId, deviceInfo) {
-        if (this.props.devices[userId] && this.props.devices[userId][deviceId]) {
-            // XXX: Mutating props :/
-            this.props.devices[userId][deviceId] = deviceInfo;
-            this.forceUpdate();
-        }
-    },
-
-    _onDismissClicked: function() {
-        this.props.onFinished();
-    },
-
-    _onSendAnywayClicked: function() {
-        markAllDevicesKnown(MatrixClientPeg.get(), this.props.devices);
-
-        this.props.onFinished();
-        this.props.onSend();
-    },
-
-    _onSendClicked: function() {
-        this.props.onFinished();
-        this.props.onSend();
-    },
-
-    render: function() {
-        if (this.props.devices === null) {
-            const Spinner = sdk.getComponent("elements.Spinner");
-            return <Spinner />;
-        }
-
-        let warning;
-        if (SettingsStore.getValue("blacklistUnverifiedDevices", this.props.room.roomId)) {
-            warning = (
-                <h4>
-                    { _t("You are currently blacklisting unverified sessions; to send " +
-                    "messages to these sessions you must verify them.") }
-                </h4>
-            );
-        } else {
-            warning = (
-                <div>
-                    <p>
-                        { _t("We recommend you go through the verification process " +
-                            "for each session to confirm they belong to their legitimate owner, " +
-                            "but you can resend the message without verifying if you prefer.") }
-                    </p>
-                </div>
-            );
-        }
-
-        let haveUnknownDevices = false;
-        Object.keys(this.props.devices).forEach((userId) => {
-            Object.keys(this.props.devices[userId]).map((deviceId) => {
-                const device = this.props.devices[userId][deviceId];
-                if (device.isUnverified() && !device.isKnown()) {
-                    haveUnknownDevices = true;
-                }
-            });
-        });
-        const sendButtonOnClick = haveUnknownDevices ? this._onSendAnywayClicked : this._onSendClicked;
-        const sendButtonLabel = haveUnknownDevices ? this.props.sendAnywayLabel : this.props.sendAnywayLabel;
-
-        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-        return (
-            <BaseDialog className='mx_UnknownDeviceDialog'
-                onFinished={this.props.onFinished}
-                title={_t('Room contains unknown sessions')}
-                contentId='mx_Dialog_content'
-            >
-                <div className="mx_Dialog_content" id='mx_Dialog_content'>
-                    <h4>
-                        { _t('"%(RoomName)s" contains sessions that you haven\'t seen before.', {RoomName: this.props.room.name}) }
-                    </h4>
-                    { warning }
-                    { _t("Unknown sessions") }:
-
-                    <UnknownDeviceList devices={this.props.devices} />
-                </div>
-                <DialogButtons primaryButton={sendButtonLabel}
-                    onPrimaryButtonClick={sendButtonOnClick}
-                    onCancel={this._onDismissClicked} />
-            </BaseDialog>
-        );
-        // XXX: do we want to give the user the option to enable blacklistUnverifiedDevices for this room (or globally) at this point?
-        // It feels like confused users will likely turn it on and then disappear in a cloud of UISIs...
-    },
-});
diff --git a/src/components/views/dialogs/UploadConfirmDialog.js b/src/components/views/dialogs/UploadConfirmDialog.js
index 28f2183eb0..e3521eb282 100644
--- a/src/components/views/dialogs/UploadConfirmDialog.js
+++ b/src/components/views/dialogs/UploadConfirmDialog.js
@@ -84,7 +84,7 @@ export default class UploadConfirmDialog extends React.Component {
             preview = <div>
                 <div>
                     <img className="mx_UploadConfirmDialog_fileIcon"
-                        src={require("../../../../res/img/files.png")}
+                        src={require("../../../../res/img/feather-customised/files.svg")}
                     />
                     {this.props.file.name} ({filesize(this.props.file.size)})
                 </div>
diff --git a/src/components/views/dialogs/UserSettingsDialog.js b/src/components/views/dialogs/UserSettingsDialog.js
index 210773c524..ffde03fe31 100644
--- a/src/components/views/dialogs/UserSettingsDialog.js
+++ b/src/components/views/dialogs/UserSettingsDialog.js
@@ -22,6 +22,7 @@ import {_t, _td} from "../../../languageHandler";
 import GeneralUserSettingsTab from "../settings/tabs/user/GeneralUserSettingsTab";
 import SettingsStore from "../../../settings/SettingsStore";
 import LabsUserSettingsTab from "../settings/tabs/user/LabsUserSettingsTab";
+import AppearanceUserSettingsTab from "../settings/tabs/user/AppearanceUserSettingsTab";
 import SecurityUserSettingsTab from "../settings/tabs/user/SecurityUserSettingsTab";
 import NotificationUserSettingsTab from "../settings/tabs/user/NotificationUserSettingsTab";
 import PreferencesUserSettingsTab from "../settings/tabs/user/PreferencesUserSettingsTab";
@@ -32,16 +33,28 @@ import * as sdk from "../../../index";
 import SdkConfig from "../../../SdkConfig";
 import MjolnirUserSettingsTab from "../settings/tabs/user/MjolnirUserSettingsTab";
 
+export const USER_GENERAL_TAB = "USER_GENERAL_TAB";
+export const USER_APPEARANCE_TAB = "USER_APPEARANCE_TAB";
+export const USER_FLAIR_TAB = "USER_FLAIR_TAB";
+export const USER_NOTIFICATIONS_TAB = "USER_NOTIFICATIONS_TAB";
+export const USER_PREFERENCES_TAB = "USER_PREFERENCES_TAB";
+export const USER_VOICE_TAB = "USER_VOICE_TAB";
+export const USER_SECURITY_TAB = "USER_SECURITY_TAB";
+export const USER_LABS_TAB = "USER_LABS_TAB";
+export const USER_MJOLNIR_TAB = "USER_MJOLNIR_TAB";
+export const USER_HELP_TAB = "USER_HELP_TAB";
+
 export default class UserSettingsDialog extends React.Component {
     static propTypes = {
         onFinished: PropTypes.func.isRequired,
+        initialTabId: PropTypes.string,
     };
 
     constructor() {
         super();
 
         this.state = {
-            mjolnirEnabled: SettingsStore.isFeatureEnabled("feature_mjolnir"),
+            mjolnirEnabled: SettingsStore.getValue("feature_mjolnir"),
         };
     }
 
@@ -62,37 +75,50 @@ export default class UserSettingsDialog extends React.Component {
         const tabs = [];
 
         tabs.push(new Tab(
+            USER_GENERAL_TAB,
             _td("General"),
             "mx_UserSettingsDialog_settingsIcon",
             <GeneralUserSettingsTab closeSettingsFn={this.props.onFinished} />,
         ));
         tabs.push(new Tab(
+            USER_APPEARANCE_TAB,
+            _td("Appearance"),
+            "mx_UserSettingsDialog_appearanceIcon",
+            <AppearanceUserSettingsTab />,
+        ));
+        tabs.push(new Tab(
+            USER_FLAIR_TAB,
             _td("Flair"),
             "mx_UserSettingsDialog_flairIcon",
             <FlairUserSettingsTab />,
         ));
         tabs.push(new Tab(
+            USER_NOTIFICATIONS_TAB,
             _td("Notifications"),
             "mx_UserSettingsDialog_bellIcon",
             <NotificationUserSettingsTab />,
         ));
         tabs.push(new Tab(
+            USER_PREFERENCES_TAB,
             _td("Preferences"),
             "mx_UserSettingsDialog_preferencesIcon",
             <PreferencesUserSettingsTab />,
         ));
         tabs.push(new Tab(
+            USER_VOICE_TAB,
             _td("Voice & Video"),
             "mx_UserSettingsDialog_voiceIcon",
             <VoiceUserSettingsTab />,
         ));
         tabs.push(new Tab(
+            USER_SECURITY_TAB,
             _td("Security & Privacy"),
             "mx_UserSettingsDialog_securityIcon",
             <SecurityUserSettingsTab closeSettingsFn={this.props.onFinished} />,
         ));
-        if (SdkConfig.get()['showLabsSettings'] || SettingsStore.getLabsFeatures().length > 0) {
+        if (SdkConfig.get()['showLabsSettings']) {
             tabs.push(new Tab(
+                USER_LABS_TAB,
                 _td("Labs"),
                 "mx_UserSettingsDialog_labsIcon",
                 <LabsUserSettingsTab />,
@@ -100,12 +126,14 @@ export default class UserSettingsDialog extends React.Component {
         }
         if (this.state.mjolnirEnabled) {
             tabs.push(new Tab(
+                USER_MJOLNIR_TAB,
                 _td("Ignored users"),
                 "mx_UserSettingsDialog_mjolnirIcon",
                 <MjolnirUserSettingsTab />,
             ));
         }
         tabs.push(new Tab(
+            USER_HELP_TAB,
             _td("Help & About"),
             "mx_UserSettingsDialog_helpIcon",
             <HelpUserSettingsTab closeSettingsFn={this.props.onFinished} />,
@@ -121,7 +149,7 @@ export default class UserSettingsDialog extends React.Component {
             <BaseDialog className='mx_UserSettingsDialog' hasCancel={true}
                         onFinished={this.props.onFinished} title={_t("Settings")}>
                 <div className='ms_SettingsDialog_content'>
-                    <TabbedView tabs={this._getTabs()} />
+                    <TabbedView tabs={this._getTabs()} initialTabId={this.props.initialTabId} />
                 </div>
             </BaseDialog>
         );
diff --git a/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.js b/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.js
index 162cb4736a..42a5304f13 100644
--- a/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.js
+++ b/src/components/views/dialogs/WidgetOpenIDPermissionsDialog.js
@@ -17,10 +17,11 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../languageHandler";
-import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
+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";
 
 export default class WidgetOpenIDPermissionsDialog extends React.Component {
     static propTypes = {
diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index f1008dfcb0..dd34dfbbf0 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -20,7 +20,6 @@ import PropTypes from 'prop-types';
 import * as sdk from '../../../../index';
 import {MatrixClientPeg} from '../../../../MatrixClientPeg';
 import { MatrixClient } from 'matrix-js-sdk';
-import Modal from '../../../../Modal';
 import { _t } from '../../../../languageHandler';
 import { accessSecretStorage } from '../../../../CrossSigningManager';
 
@@ -89,14 +88,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
 
     _onResetRecoveryClick = () => {
         this.props.onFinished(false);
-        Modal.createTrackedDialogAsync('Key Backup', 'Key Backup',
-            import('../../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog'),
-            {
-                onFinished: () => {
-                    this._loadBackupStatus();
-                },
-            }, null, /* priority = */ false, /* static = */ true,
-        );
+        accessSecretStorage(() => {}, /* forceReset = */ true);
     }
 
     _onRecoveryKeyChange = (e) => {
@@ -193,7 +185,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             // `accessSecretStorage` may prompt for storage access as needed.
             const recoverInfo = await accessSecretStorage(async () => {
                 return MatrixClientPeg.get().restoreKeyBackupWithSecretStorage(
-                    this.state.backupInfo,
+                    this.state.backupInfo, undefined, undefined,
                     { progressCallback: this._progressCallback },
                 );
             });
@@ -235,8 +227,10 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
             loadError: null,
         });
         try {
-            const backupInfo = await MatrixClientPeg.get().getKeyBackupVersion();
-            const backupKeyStored = await MatrixClientPeg.get().isKeyBackupKeyStored();
+            const cli = MatrixClientPeg.get();
+            const backupInfo = await cli.getKeyBackupVersion();
+            const has4S = await cli.hasSecretStorageKey();
+            const backupKeyStored = has4S && await cli.isKeyBackupKeyStored();
             this.setState({
                 backupInfo,
                 backupKeyStored,
diff --git a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
index e2ceadfbb9..5c01a6907f 100644
--- a/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
+++ b/src/components/views/dialogs/secretstorage/AccessSecretStorageDialog.js
@@ -15,13 +15,24 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { debounce } from 'lodash';
+import classNames from 'classnames';
 import React from 'react';
 import PropTypes from "prop-types";
 import * as sdk from '../../../../index';
 import {MatrixClientPeg} from '../../../../MatrixClientPeg';
+import Field from '../../elements/Field';
+import AccessibleButton from '../../elements/AccessibleButton';
 
 import { _t } from '../../../../languageHandler';
-import { accessSecretStorage } from '../../../../CrossSigningManager';
+
+// Maximum acceptable size of a key file. It's 59 characters including the spaces we encode,
+// so this should be plenty and allow for people putting extra whitespace in the file because
+// maybe that's a thing people would do?
+const KEY_FILE_MAX_SIZE = 128;
+
+// Don't shout at the user that their key is invalid every time they type a key: wait a short time
+const VALIDATION_THROTTLE_MS = 200;
 
 /*
  * Access Secure Secret Storage by requesting the user's passphrase.
@@ -36,9 +47,14 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
 
     constructor(props) {
         super(props);
+
+        this._fileUpload = React.createRef();
+
         this.state = {
             recoveryKey: "",
-            recoveryKeyValid: false,
+            recoveryKeyValid: null,
+            recoveryKeyCorrect: null,
+            recoveryKeyFileError: null,
             forceRecoveryKey: false,
             passPhrase: '',
             keyMatches: null,
@@ -55,18 +71,89 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
         });
     }
 
-    _onResetRecoveryClick = () => {
-        // Re-enter the access flow, but resetting storage this time around.
-        this.props.onFinished(false);
-        accessSecretStorage(() => {}, /* forceReset = */ true);
+    _validateRecoveryKeyOnChange = debounce(() => {
+        this._validateRecoveryKey();
+    }, VALIDATION_THROTTLE_MS);
+
+    async _validateRecoveryKey() {
+        if (this.state.recoveryKey === '') {
+            this.setState({
+                recoveryKeyValid: null,
+                recoveryKeyCorrect: null,
+            });
+            return;
+        }
+
+        try {
+            const cli = MatrixClientPeg.get();
+            const decodedKey = cli.keyBackupKeyFromRecoveryKey(this.state.recoveryKey);
+            const correct = await cli.checkSecretStorageKey(
+                decodedKey, this.props.keyInfo,
+            );
+            this.setState({
+                recoveryKeyValid: true,
+                recoveryKeyCorrect: correct,
+            });
+        } catch (e) {
+            this.setState({
+                recoveryKeyValid: false,
+                recoveryKeyCorrect: false,
+            });
+        }
     }
 
     _onRecoveryKeyChange = (e) => {
         this.setState({
             recoveryKey: e.target.value,
-            recoveryKeyValid: MatrixClientPeg.get().isValidRecoveryKey(e.target.value),
-            keyMatches: null,
+            recoveryKeyFileError: null,
         });
+
+        // also clear the file upload control so that the user can upload the same file
+        // the did before (otherwise the onchange wouldn't fire)
+        if (this._fileUpload.current) this._fileUpload.current.value = null;
+
+        // We don't use Field's validation here because a) we want it in a separate place rather
+        // than in a tooltip and b) we want it to display feedback based on the uploaded file
+        // as well as the text box. Ideally we would refactor Field's validation logic so we could
+        // re-use some of it.
+        this._validateRecoveryKeyOnChange();
+    }
+
+    _onRecoveryKeyFileChange = async e => {
+        if (e.target.files.length === 0) return;
+
+        const f = e.target.files[0];
+
+        if (f.size > KEY_FILE_MAX_SIZE) {
+            this.setState({
+                recoveryKeyFileError: true,
+                recoveryKeyCorrect: false,
+                recoveryKeyValid: false,
+            });
+        } else {
+            const contents = await f.text();
+            // test it's within the base58 alphabet. We could be more strict here, eg. require the
+            // right number of characters, but it's really just to make sure that what we're reading is
+            // text because we'll put it in the text field.
+            if (/^[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz\s]+$/.test(contents)) {
+                this.setState({
+                    recoveryKeyFileError: null,
+                    recoveryKey: contents.trim(),
+                });
+                this._validateRecoveryKey();
+            } else {
+                this.setState({
+                    recoveryKeyFileError: true,
+                    recoveryKeyCorrect: false,
+                    recoveryKeyValid: false,
+                    recoveryKey: '',
+                });
+            }
+        }
+    }
+
+    _onRecoveryKeyFileUploadClick = () => {
+        this._fileUpload.current.click();
     }
 
     _onPassPhraseNext = async (e) => {
@@ -106,6 +193,20 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
         });
     }
 
+    getKeyValidationText() {
+        if (this.state.recoveryKeyFileError) {
+            return _t("Wrong file type");
+        } else if (this.state.recoveryKeyCorrect) {
+            return _t("Looks good!");
+        } else if (this.state.recoveryKeyValid) {
+            return _t("Wrong Recovery Key");
+        } else if (this.state.recoveryKeyValid === null) {
+            return '';
+        } else {
+            return _t("Invalid Recovery Key");
+        }
+    }
+
     render() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
 
@@ -118,10 +219,12 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
 
         let content;
         let title;
+        let titleClass;
         if (hasPassphrase && !this.state.forceRecoveryKey) {
             const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
             const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-            title = _t("Enter recovery passphrase");
+            title = _t("Security Phrase");
+            titleClass = ['mx_AccessSecretStorageDialog_titleWithIcon mx_AccessSecretStorageDialog_securePhraseTitle'];
 
             let keyStatus;
             if (this.state.keyMatches === false) {
@@ -137,12 +240,15 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
 
             content = <div>
                 <p>{_t(
-                    "<b>Warning</b>: You should only do this on a trusted computer.", {},
-                    { b: sub => <b>{sub}</b> },
-                )}</p>
-                <p>{_t(
-                    "Access your secure message history and your cross-signing " +
-                    "identity for verifying other sessions by entering your recovery passphrase.",
+                    "Enter your Security Phrase or <button>Use your Security Key</button> to continue.", {},
+                    {
+                        button: s => <AccessibleButton className="mx_linkButton"
+                            element="span"
+                            onClick={this._onUseRecoveryKeyClick}
+                        >
+                            {s}
+                        </AccessibleButton>,
+                    },
                 )}</p>
 
                 <form className="mx_AccessSecretStorageDialog_primaryContainer" onSubmit={this._onPassPhraseNext}>
@@ -153,10 +259,11 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
                         value={this.state.passPhrase}
                         autoFocus={true}
                         autoComplete="new-password"
+                        placeholder={_t("Security Phrase")}
                     />
                     {keyStatus}
                     <DialogButtons
-                        primaryButton={_t('Next')}
+                        primaryButton={_t('Continue')}
                         onPrimaryButtonClick={this._onPassPhraseNext}
                         hasCancel={true}
                         onCancel={this._onCancel}
@@ -164,87 +271,61 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
                         primaryDisabled={this.state.passPhrase.length === 0}
                     />
                 </form>
-                {_t(
-                    "If you've forgotten your recovery passphrase you can "+
-                    "<button1>use your recovery key</button1> or " +
-                    "<button2>set up new recovery options</button2>."
-                , {}, {
-                    button1: s => <AccessibleButton className="mx_linkButton"
-                        element="span"
-                        onClick={this._onUseRecoveryKeyClick}
-                    >
-                        {s}
-                    </AccessibleButton>,
-                    button2: s => <AccessibleButton className="mx_linkButton"
-                        element="span"
-                        onClick={this._onResetRecoveryClick}
-                    >
-                        {s}
-                    </AccessibleButton>,
-                })}
             </div>;
         } else {
-            title = _t("Enter recovery key");
+            title = _t("Security Key");
+            titleClass = ['mx_AccessSecretStorageDialog_titleWithIcon mx_AccessSecretStorageDialog_secureBackupTitle'];
             const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
-            const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
-            let keyStatus;
-            if (this.state.recoveryKey.length === 0) {
-                keyStatus = <div className="mx_AccessSecretStorageDialog_keyStatus" />;
-            } else if (this.state.keyMatches === false) {
-                keyStatus = <div className="mx_AccessSecretStorageDialog_keyStatus">
-                    {"\uD83D\uDC4E "}{_t(
-                        "Unable to access secret storage. " +
-                        "Please verify that you entered the correct recovery key.",
-                    )}
-                </div>;
-            } else if (this.state.recoveryKeyValid) {
-                keyStatus = <div className="mx_AccessSecretStorageDialog_keyStatus">
-                    {"\uD83D\uDC4D "}{_t("This looks like a valid recovery key!")}
-                </div>;
-            } else {
-                keyStatus = <div className="mx_AccessSecretStorageDialog_keyStatus">
-                    {"\uD83D\uDC4E "}{_t("Not a valid recovery key")}
-                </div>;
-            }
+            const feedbackClasses = classNames({
+                'mx_AccessSecretStorageDialog_recoveryKeyFeedback': true,
+                'mx_AccessSecretStorageDialog_recoveryKeyFeedback_valid': this.state.recoveryKeyCorrect === true,
+                'mx_AccessSecretStorageDialog_recoveryKeyFeedback_invalid': this.state.recoveryKeyCorrect === false,
+            });
+            const recoveryKeyFeedback = <div className={feedbackClasses}>
+                {this.getKeyValidationText()}
+            </div>;
 
             content = <div>
-                <p>{_t(
-                    "<b>Warning</b>: You should only do this on a trusted computer.", {},
-                    { b: sub => <b>{sub}</b> },
-                )}</p>
-                <p>{_t(
-                    "Access your secure message history and your cross-signing " +
-                    "identity for verifying other sessions by entering your recovery key.",
-                )}</p>
+                <p>{_t("Use your Security Key to continue.")}</p>
 
-                <form className="mx_AccessSecretStorageDialog_primaryContainer" onSubmit={this._onRecoveryKeyNext}>
-                    <input className="mx_AccessSecretStorageDialog_recoveryKeyInput"
-                        onChange={this._onRecoveryKeyChange}
-                        value={this.state.recoveryKey}
-                        autoFocus={true}
-                    />
-                    {keyStatus}
+                <form className="mx_AccessSecretStorageDialog_primaryContainer" onSubmit={this._onRecoveryKeyNext} spellCheck={false}>
+                    <div className="mx_AccessSecretStorageDialog_recoveryKeyEntry">
+                        <div className="mx_AccessSecretStorageDialog_recoveryKeyEntry_textInput">
+                            <Field
+                                type="text"
+                                label={_t('Security Key')}
+                                value={this.state.recoveryKey}
+                                onChange={this._onRecoveryKeyChange}
+                                forceValidity={this.state.recoveryKeyCorrect}
+                            />
+                        </div>
+                        <span className="mx_AccessSecretStorageDialog_recoveryKeyEntry_entryControlSeparatorText">
+                            {_t("or")}
+                        </span>
+                        <div>
+                            <input type="file"
+                                className="mx_AccessSecretStorageDialog_recoveryKeyEntry_fileInput"
+                                ref={this._fileUpload}
+                                onChange={this._onRecoveryKeyFileChange}
+                            />
+                            <AccessibleButton kind="primary" onClick={this._onRecoveryKeyFileUploadClick}>
+                                {_t("Upload")}
+                            </AccessibleButton>
+                        </div>
+                    </div>
+                    {recoveryKeyFeedback}
                     <DialogButtons
-                        primaryButton={_t('Next')}
+                        primaryButton={_t('Continue')}
                         onPrimaryButtonClick={this._onRecoveryKeyNext}
                         hasCancel={true}
+                        cancelButton={_t("Go Back")}
+                        cancelButtonClass='danger'
                         onCancel={this._onCancel}
                         focus={false}
                         primaryDisabled={!this.state.recoveryKeyValid}
                     />
                 </form>
-                {_t(
-                    "If you've forgotten your recovery key you can "+
-                    "<button>set up new recovery options</button>."
-                , {}, {
-                    button: s => <AccessibleButton className="mx_linkButton"
-                        element="span"
-                        onClick={this._onResetRecoveryClick}
-                    >
-                        {s}
-                    </AccessibleButton>,
-                })}
             </div>;
         }
 
@@ -252,6 +333,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
             <BaseDialog className='mx_AccessSecretStorageDialog'
                 onFinished={this.props.onFinished}
                 title={title}
+                titleClass={titleClass}
             >
             <div>
                 {content}
diff --git a/src/components/views/elements/AccessibleButton.js b/src/components/views/elements/AccessibleButton.tsx
similarity index 67%
rename from src/components/views/elements/AccessibleButton.js
rename to src/components/views/elements/AccessibleButton.tsx
index d708a44ab2..ae822204df 100644
--- a/src/components/views/elements/AccessibleButton.js
+++ b/src/components/views/elements/AccessibleButton.tsx
@@ -15,9 +15,36 @@
  */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 
 import {Key} from '../../../Keyboard';
+import classnames from 'classnames';
+
+export type ButtonEvent = React.MouseEvent<Element> | React.KeyboardEvent<Element>;
+
+/**
+ * children: React's magic prop. Represents all children given to the element.
+ * element:  (optional) The base element type. "div" by default.
+ * onClick:  (required) Event handler for button activation. Should be
+ *           implemented exactly like a normal onClick handler.
+ */
+interface IProps extends React.InputHTMLAttributes<Element> {
+    inputRef?: React.Ref<Element>;
+    element?: string;
+    // The kind of button, similar to how Bootstrap works.
+    // See available classes for AccessibleButton for options.
+    kind?: string;
+    // The ARIA role
+    role?: string;
+    // The tabIndex
+    tabIndex?: number;
+    disabled?: boolean;
+    className?: string;
+    onClick?(e?: ButtonEvent): void;
+}
+
+interface IAccessibleButtonProps extends React.InputHTMLAttributes<Element> {
+    ref?: React.Ref<Element>;
+}
 
 /**
  * AccessibleButton is a generic wrapper for any element that should be treated
@@ -27,11 +54,19 @@ import {Key} from '../../../Keyboard';
  * @param {Object} props  react element properties
  * @returns {Object} rendered react
  */
-export default function AccessibleButton(props) {
-    const {element, onClick, children, kind, disabled, ...restProps} = props;
-
+export default function AccessibleButton({
+    element,
+    onClick,
+    children,
+    kind,
+    disabled,
+    inputRef,
+    className,
+    ...restProps
+}: IProps) {
+    const newProps: IAccessibleButtonProps = restProps;
     if (!disabled) {
-        restProps.onClick = onClick;
+        newProps.onClick = onClick;
         // We need to consume enter onKeyDown and space onKeyUp
         // otherwise we are risking also activating other keyboard focusable elements
         // that might receive focus as a result of the AccessibleButtonClick action
@@ -39,7 +74,7 @@ export default function AccessibleButton(props) {
         // And divs which we report as role button to assistive technologies.
         // Browsers handle space and enter keypresses differently and we are only adjusting to the
         // inconsistencies here
-        restProps.onKeyDown = function(e) {
+        newProps.onKeyDown = (e) => {
             if (e.key === Key.ENTER) {
                 e.stopPropagation();
                 e.preventDefault();
@@ -50,7 +85,7 @@ export default function AccessibleButton(props) {
                 e.preventDefault();
             }
         };
-        restProps.onKeyUp = function(e) {
+        newProps.onKeyUp = (e) => {
             if (e.key === Key.SPACE) {
                 e.stopPropagation();
                 e.preventDefault();
@@ -64,57 +99,26 @@ export default function AccessibleButton(props) {
     }
 
     // Pass through the ref - used for keyboard shortcut access to some buttons
-    restProps.ref = restProps.inputRef;
-    delete restProps.inputRef;
+    newProps.ref = inputRef;
 
-    restProps.className = (restProps.className ? restProps.className + " " : "") + "mx_AccessibleButton";
-
-    if (kind) {
-        // We apply a hasKind class to maintain backwards compatibility with
-        // buttons which might not know about kind and break
-        restProps.className += " mx_AccessibleButton_hasKind mx_AccessibleButton_kind_" + kind;
-    }
-
-    if (disabled) {
-        restProps.className += " mx_AccessibleButton_disabled";
-        restProps["aria-disabled"] = true;
-    }
+    newProps.className = classnames(
+        "mx_AccessibleButton",
+        className,
+        {
+            "mx_AccessibleButton_hasKind": kind,
+            [`mx_AccessibleButton_kind_${kind}`]: kind,
+            "mx_AccessibleButton_disabled": disabled,
+        },
+    );
 
+    // React.createElement expects InputHTMLAttributes
     return React.createElement(element, restProps, children);
 }
 
-/**
- * children: React's magic prop. Represents all children given to the element.
- * element:  (optional) The base element type. "div" by default.
- * onClick:  (required) Event handler for button activation. Should be
- *           implemented exactly like a normal onClick handler.
- */
-AccessibleButton.propTypes = {
-    children: PropTypes.node,
-    inputRef: PropTypes.oneOfType([
-        // Either a function
-        PropTypes.func,
-        // Or the instance of a DOM native element
-        PropTypes.shape({ current: PropTypes.instanceOf(Element) }),
-    ]),
-    element: PropTypes.string,
-    onClick: PropTypes.func.isRequired,
-
-    // The kind of button, similar to how Bootstrap works.
-    // See available classes for AccessibleButton for options.
-    kind: PropTypes.string,
-    // The ARIA role
-    role: PropTypes.string,
-    // The tabIndex
-    tabIndex: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
-
-    disabled: PropTypes.bool,
-};
-
 AccessibleButton.defaultProps = {
     element: 'div',
     role: 'button',
-    tabIndex: "0",
+    tabIndex: 0,
 };
 
 AccessibleButton.displayName = "AccessibleButton";
diff --git a/src/components/views/elements/AccessibleTooltipButton.js b/src/components/views/elements/AccessibleTooltipButton.tsx
similarity index 50%
rename from src/components/views/elements/AccessibleTooltipButton.js
rename to src/components/views/elements/AccessibleTooltipButton.tsx
index 6c84c6ab7e..0388c565ad 100644
--- a/src/components/views/elements/AccessibleTooltipButton.js
+++ b/src/components/views/elements/AccessibleTooltipButton.tsx
@@ -16,47 +16,66 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
+import classNames from 'classnames';
 
 import AccessibleButton from "./AccessibleButton";
-import * as sdk from "../../../index";
+import Tooltip from './Tooltip';
 
-export default class AccessibleTooltipButton extends React.PureComponent {
-    static propTypes = {
-        ...AccessibleButton.propTypes,
-        // The tooltip to render on hover
-        title: PropTypes.string.isRequired,
-    };
+interface ITooltipProps extends React.ComponentProps<typeof AccessibleButton> {
+    title: string;
+    tooltip?: React.ReactNode;
+    tooltipClassName?: string;
+    forceHide?: boolean;
+}
 
-    state = {
-        hover: false,
-    };
+interface IState {
+    hover: boolean;
+}
+
+export default class AccessibleTooltipButton extends React.PureComponent<ITooltipProps, IState> {
+    constructor(props: ITooltipProps) {
+        super(props);
+        this.state = {
+            hover: false,
+        };
+    }
+
+    componentDidUpdate(prevProps: Readonly<ITooltipProps>) {
+        if (!prevProps.forceHide && this.props.forceHide && this.state.hover) {
+            this.setState({
+                hover: false,
+            });
+        }
+    }
 
     onMouseOver = () => {
+        if (this.props.forceHide) return;
         this.setState({
             hover: true,
         });
     };
 
-    onMouseOut = () => {
+    onMouseLeave = () => {
         this.setState({
             hover: false,
         });
     };
 
     render() {
-        const Tooltip = sdk.getComponent("elements.Tooltip");
-        const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
-
-        const {title, children, ...props} = this.props;
+        const {title, tooltip, children, tooltipClassName, ...props} = this.props;
 
         const tip = this.state.hover ? <Tooltip
             className="mx_AccessibleTooltipButton_container"
-            tooltipClassName="mx_AccessibleTooltipButton_tooltip"
-            label={title}
+            tooltipClassName={classNames("mx_AccessibleTooltipButton_tooltip", tooltipClassName)}
+            label={tooltip || title}
         /> : <div />;
         return (
-            <AccessibleButton {...props} onMouseOver={this.onMouseOver} onMouseOut={this.onMouseOut} aria-label={title}>
+            <AccessibleButton
+                {...props}
+                onMouseOver={this.onMouseOver}
+                onMouseLeave={this.onMouseLeave}
+                aria-label={title}
+            >
                 { children }
                 { tip }
             </AccessibleButton>
diff --git a/src/components/views/elements/ActionButton.js b/src/components/views/elements/ActionButton.js
index d2277bd69a..7536d66653 100644
--- a/src/components/views/elements/ActionButton.js
+++ b/src/components/views/elements/ActionButton.js
@@ -18,7 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import AccessibleButton from './AccessibleButton';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import * as sdk from '../../../index';
 import Analytics from '../../../Analytics';
 
diff --git a/src/components/views/elements/AddressTile.js b/src/components/views/elements/AddressTile.js
index 36af5059fc..e5ea2e5d20 100644
--- a/src/components/views/elements/AddressTile.js
+++ b/src/components/views/elements/AddressTile.js
@@ -58,18 +58,6 @@ export default createReactClass({
             imgUrls.push(require("../../../../res/img/icon-email-user.svg"));
         }
 
-        // Removing networks for now as they're not really supported
-        /*
-        var network;
-        if (this.props.networkUrl !== "") {
-            network = (
-                <div className="mx_AddressTile_network">
-                    <BaseAvatar width={25} height={25} name={this.props.networkName} title="Riot" url={this.props.networkUrl} />
-                </div>
-            );
-        }
-        */
-
         const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
         const TintableSvg = sdk.getComponent("elements.TintableSvg");
 
diff --git a/src/components/views/elements/AppPermission.js b/src/components/views/elements/AppPermission.js
index b96001b106..ec8bffc32f 100644
--- a/src/components/views/elements/AppPermission.js
+++ b/src/components/views/elements/AppPermission.js
@@ -1,7 +1,7 @@
 /*
 Copyright 2017 Vector Creations Ltd
 Copyright 2018, 2019 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -21,6 +21,7 @@ import PropTypes from 'prop-types';
 import url from 'url';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
+import SdkConfig from '../../../SdkConfig';
 import WidgetUtils from "../../../utils/WidgetUtils";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 
@@ -76,6 +77,7 @@ export default class AppPermission extends React.Component {
     }
 
     render() {
+        const brand = SdkConfig.get().brand;
         const AccessibleButton = sdk.getComponent("views.elements.AccessibleButton");
         const MemberAvatar = sdk.getComponent("views.avatars.MemberAvatar");
         const BaseAvatar = sdk.getComponent("views.avatars.BaseAvatar");
@@ -96,7 +98,7 @@ export default class AppPermission extends React.Component {
                     <li>{_t("Your avatar URL")}</li>
                     <li>{_t("Your user ID")}</li>
                     <li>{_t("Your theme")}</li>
-                    <li>{_t("Riot URL")}</li>
+                    <li>{_t("%(brand)s URL", { brand })}</li>
                     <li>{_t("Room ID")}</li>
                     <li>{_t("Widget ID")}</li>
                 </ul>
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 61d36723d3..1c55177fb1 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -29,16 +29,19 @@ import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
 import AppPermission from './AppPermission';
 import AppWarning from './AppWarning';
-import MessageSpinner from './MessageSpinner';
+import Spinner from './Spinner';
 import WidgetUtils from '../../../utils/WidgetUtils';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import ActiveWidgetStore from '../../../stores/ActiveWidgetStore';
 import classNames from 'classnames';
 import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
-import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
+import SettingsStore from "../../../settings/SettingsStore";
 import {aboveLeftOf, ContextMenu, ContextMenuButton} from "../../structures/ContextMenu";
 import PersistedElement from "./PersistedElement";
 import {WidgetType} from "../../../widgets/WidgetType";
+import {Capability} from "../../../widgets/WidgetApi";
+import {sleep} from "../../../utils/promise";
+import {SettingLevel} from "../../../settings/SettingLevel";
 
 const ALLOWED_APP_URL_SCHEMES = ['https:', 'http:'];
 const ENABLE_REACT_PERF = false;
@@ -308,16 +311,16 @@ export default class AppTile extends React.Component {
             this.props.onEditClick();
         } else {
             // TODO: Open the right manager for the widget
-            if (SettingsStore.isFeatureEnabled("feature_many_integration_managers")) {
+            if (SettingsStore.getValue("feature_many_integration_managers")) {
                 IntegrationManagers.sharedInstance().openAll(
                     this.props.room,
-                    'type_' + this.props.type,
+                    'type_' + this.props.app.type,
                     this.props.app.id,
                 );
             } else {
                 IntegrationManagers.sharedInstance().getPrimaryManager().open(
                     this.props.room,
-                    'type_' + this.props.type,
+                    'type_' + this.props.app.type,
                     this.props.app.id,
                 );
             }
@@ -341,23 +344,37 @@ export default class AppTile extends React.Component {
     /**
      * Ends all widget interaction, such as cancelling calls and disabling webcams.
      * @private
+     * @returns {Promise<*>} Resolves when the widget is terminated, or timeout passed.
      */
     _endWidgetActions() {
-        // HACK: This is a really dirty way to ensure that Jitsi cleans up
-        // its hold on the webcam. Without this, the widget holds a media
-        // stream open, even after death. See https://github.com/vector-im/riot-web/issues/7351
-        if (this._appFrame.current) {
-            // In practice we could just do `+= ''` to trick the browser
-            // into thinking the URL changed, however I can foresee this
-            // being optimized out by a browser. Instead, we'll just point
-            // the iframe at a page that is reasonably safe to use in the
-            // event the iframe doesn't wink away.
-            // This is relative to where the Riot instance is located.
-            this._appFrame.current.src = 'about:blank';
+        let terminationPromise;
+
+        if (this._hasCapability(Capability.ReceiveTerminate)) {
+            // Wait for widget to terminate within a timeout
+            const timeout = 2000;
+            const messaging = ActiveWidgetStore.getWidgetMessaging(this.props.app.id);
+            terminationPromise = Promise.race([messaging.terminate(), sleep(timeout)]);
+        } else {
+            terminationPromise = Promise.resolve();
         }
 
-        // Delete the widget from the persisted store for good measure.
-        PersistedElement.destroyElement(this._persistKey);
+        return terminationPromise.finally(() => {
+            // HACK: This is a really dirty way to ensure that Jitsi cleans up
+            // its hold on the webcam. Without this, the widget holds a media
+            // stream open, even after death. See https://github.com/vector-im/element-web/issues/7351
+            if (this._appFrame.current) {
+                // In practice we could just do `+= ''` to trick the browser
+                // into thinking the URL changed, however I can foresee this
+                // being optimized out by a browser. Instead, we'll just point
+                // the iframe at a page that is reasonably safe to use in the
+                // event the iframe doesn't wink away.
+                // This is relative to where the Element instance is located.
+                this._appFrame.current.src = 'about:blank';
+            }
+
+            // Delete the widget from the persisted store for good measure.
+            PersistedElement.destroyElement(this._persistKey);
+        });
     }
 
     /* If user has permission to modify widgets, delete the widget,
@@ -381,12 +398,12 @@ export default class AppTile extends React.Component {
                     }
                     this.setState({deleting: true});
 
-                    this._endWidgetActions();
-
-                    WidgetUtils.setRoomWidget(
-                        this.props.room.roomId,
-                        this.props.app.id,
-                    ).catch((e) => {
+                    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");
 
@@ -424,13 +441,13 @@ export default class AppTile extends React.Component {
     _setupWidgetMessaging() {
         // FIXME: There's probably no reason to do this here: it should probably be done entirely
         // in ActiveWidgetStore.
-
-        // We use the app's URL over the rendered URL so that anything the widget does which could
-        // lead to requesting a "security key" will pass accordingly. The only other thing this URL
-        // is used for is to determine the origin we're talking to, and therefore we don't need the
-        // fully templated URL.
         const widgetMessaging = new WidgetMessaging(
-            this.props.app.id, this.props.app.url, this.props.userWidget, this._appFrame.current.contentWindow);
+            this.props.app.id,
+            this.props.app.url,
+            this._getRenderedUrl(),
+            this.props.userWidget,
+            this._appFrame.current.contentWindow,
+        );
         ActiveWidgetStore.setWidgetMessaging(this.props.app.id, widgetMessaging);
         widgetMessaging.getCapabilities().then((requestedCapabilities) => {
             console.log(`Widget ${this.props.app.id} requested capabilities: ` + requestedCapabilities);
@@ -669,6 +686,17 @@ export default class AppTile extends React.Component {
     }
 
     _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) {
+            this._endWidgetActions().then(() => {
+                if (this._appFrame.current) {
+                    // Reload iframe
+                    this._appFrame.current.src = this._getRenderedUrl();
+                    this.setState({});
+                }
+            });
+        }
         // Using Object.assign workaround as the following opens in a new window instead of a new tab.
         // window.open(this._getPopoutUrl(), '_blank', 'noopener=yes');
         Object.assign(document.createElement('a'),
@@ -677,6 +705,7 @@ export default class AppTile extends React.Component {
 
     _onReloadWidgetClick() {
         // Reload iframe in this way to avoid cross-origin restrictions
+        // eslint-disable-next-line no-self-assign
         this._appFrame.current.src = this._appFrame.current.src;
     }
 
@@ -698,7 +727,7 @@ export default class AppTile extends React.Component {
 
         // 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 riot client: anything
+        // this would only be for content hosted on the same origin as the element client: anything
         // hosted on the same origin as the client will get the same access as if you clicked
         // a link to it.
         const sandboxFlags = "allow-forms allow-popups allow-popups-to-escape-sandbox "+
@@ -713,7 +742,7 @@ export default class AppTile extends React.Component {
         if (this.props.show) {
             const loadingElement = (
                 <div className="mx_AppLoading_spinner_fadeIn">
-                    <MessageSpinner msg='Loading...' />
+                    <Spinner message={_t("Loading...")} />
                 </div>
             );
             if (!this.state.hasPermissionToLoad) {
@@ -897,7 +926,7 @@ AppTile.propTypes = {
     // 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 riot to get new widget content.
+    // 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
diff --git a/src/components/views/elements/CreateRoomButton.js b/src/components/views/elements/CreateRoomButton.js
deleted file mode 100644
index 1410bdabdb..0000000000
--- a/src/components/views/elements/CreateRoomButton.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 CreateRoomButton = function(props) {
-    const ActionButton = sdk.getComponent('elements.ActionButton');
-    return (
-        <ActionButton action="view_create_room"
-            mouseOverAction={props.callout ? "callout_create_room" : null}
-            label={_t("Create new room")}
-            iconPath={require("../../../../res/img/icons-create-room.svg")}
-            size={props.size}
-            tooltip={props.tooltip}
-        />
-    );
-};
-
-CreateRoomButton.propTypes = {
-    size: PropTypes.string,
-    tooltip: PropTypes.bool,
-};
-
-export default CreateRoomButton;
diff --git a/src/components/views/elements/DNDTagTile.js b/src/components/views/elements/DNDTagTile.js
index 7aa642986b..67572d4508 100644
--- a/src/components/views/elements/DNDTagTile.js
+++ b/src/components/views/elements/DNDTagTile.js
@@ -19,8 +19,22 @@ import TagTile from './TagTile';
 
 import React from 'react';
 import { Draggable } from 'react-beautiful-dnd';
+import { ContextMenu, toRightOf, useContextMenu } from "../../structures/ContextMenu";
+import * as sdk from '../../../index';
 
 export default function DNDTagTile(props) {
+    const [menuDisplayed, handle, openMenu, closeMenu] = useContextMenu();
+
+    let contextMenu = null;
+    if (menuDisplayed && handle.current) {
+        const elementRect = handle.current.getBoundingClientRect();
+        const TagTileContextMenu = sdk.getComponent('context_menus.TagTileContextMenu');
+        contextMenu = (
+            <ContextMenu {...toRightOf(elementRect)} onFinished={closeMenu}>
+                <TagTileContextMenu tag={props.tag} onFinished={closeMenu} />
+            </ContextMenu>
+        );
+    }
     return <div>
         <Draggable
             key={props.tag}
@@ -28,18 +42,21 @@ export default function DNDTagTile(props) {
             index={props.index}
             type="draggable-TagTile"
         >
-            { (provided, snapshot) => (
-                <div>
-                    <div
-                        ref={provided.innerRef}
-                        {...provided.draggableProps}
-                        {...provided.dragHandleProps}
-                    >
-                        <TagTile {...props} />
-                    </div>
-                    { provided.placeholder }
+            {(provided, snapshot) => (
+                <div
+                    ref={provided.innerRef}
+                    {...provided.draggableProps}
+                    {...provided.dragHandleProps}
+                >
+                    <TagTile
+                        {...props}
+                        contextMenuButtonRef={handle}
+                        menuDisplayed={menuDisplayed}
+                        openMenu={openMenu}
+                    />
                 </div>
-            ) }
+            )}
         </Draggable>
+        {contextMenu}
     </div>;
 }
diff --git a/src/components/views/elements/DeviceVerifyButtons.js b/src/components/views/elements/DeviceVerifyButtons.js
deleted file mode 100644
index 7328d50328..0000000000
--- a/src/components/views/elements/DeviceVerifyButtons.js
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
-Copyright 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 createReactClass from 'create-react-class';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import * as sdk from '../../../index';
-import Modal from '../../../Modal';
-import { _t } from '../../../languageHandler';
-
-// XXX: This component is *not* cross-signing aware. Once everything is
-// cross-signing, this component should just go away.
-export default createReactClass({
-    displayName: 'DeviceVerifyButtons',
-
-    propTypes: {
-        userId: PropTypes.string.isRequired,
-        device: PropTypes.object.isRequired,
-    },
-
-    getInitialState: function() {
-        return {
-            device: this.props.device,
-        };
-    },
-
-    componentDidMount: function() {
-        const cli = MatrixClientPeg.get();
-        cli.on("deviceVerificationChanged", this.onDeviceVerificationChanged);
-    },
-
-    componentWillUnmount: function() {
-        const cli = MatrixClientPeg.get();
-        if (cli) {
-            cli.removeListener("deviceVerificationChanged", this.onDeviceVerificationChanged);
-        }
-    },
-
-    onDeviceVerificationChanged: function(userId, deviceId, deviceInfo) {
-        if (userId === this.props.userId && deviceId === this.props.device.deviceId) {
-            this.setState({ device: deviceInfo });
-        }
-    },
-
-    onVerifyClick: function() {
-        const DeviceVerifyDialog = sdk.getComponent('views.dialogs.DeviceVerifyDialog');
-        Modal.createTrackedDialog('Device Verify Dialog', '', DeviceVerifyDialog, {
-            userId: this.props.userId,
-            device: this.state.device,
-        }, null, /* priority = */ false, /* static = */ true);
-    },
-
-    onUnverifyClick: function() {
-        MatrixClientPeg.get().setDeviceVerified(
-            this.props.userId, this.state.device.deviceId, false,
-        );
-    },
-
-    onBlacklistClick: function() {
-        MatrixClientPeg.get().setDeviceBlocked(
-            this.props.userId, this.state.device.deviceId, true,
-        );
-    },
-
-    onUnblacklistClick: function() {
-        MatrixClientPeg.get().setDeviceBlocked(
-            this.props.userId, this.state.device.deviceId, false,
-        );
-    },
-
-    render: function() {
-        let blacklistButton = null; let verifyButton = null;
-
-        if (this.state.device.isBlocked()) {
-            blacklistButton = (
-                <button className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_unblacklist"
-                  onClick={this.onUnblacklistClick}>
-                    { _t("Unblacklist") }
-                </button>
-            );
-        } else {
-            blacklistButton = (
-                <button className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_blacklist"
-                  onClick={this.onBlacklistClick}>
-                    { _t("Blacklist") }
-                </button>
-            );
-        }
-
-        if (this.state.device.isVerified()) {
-            verifyButton = (
-                <button className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_unverify"
-                  onClick={this.onUnverifyClick}>
-                    { _t("Unverify") }
-                </button>
-            );
-        } else {
-            verifyButton = (
-                <button className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_verify"
-                  onClick={this.onVerifyClick}>
-                    { _t("Verify...") }
-                </button>
-            );
-        }
-
-        return (
-            <div className="mx_DeviceVerifyButtons" >
-                { verifyButton }
-                { blacklistButton }
-            </div>
-        );
-    },
-});
diff --git a/src/components/views/elements/Draggable.tsx b/src/components/views/elements/Draggable.tsx
new file mode 100644
index 0000000000..3397fd901c
--- /dev/null
+++ b/src/components/views/elements/Draggable.tsx
@@ -0,0 +1,81 @@
+/*
+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';
+
+interface IProps {
+    className: string;
+    dragFunc: (currentLocation: ILocationState, event: MouseEvent) => ILocationState;
+    onMouseUp: (event: MouseEvent) => void;
+}
+
+interface IState {
+    onMouseMove: (event: MouseEvent) => void;
+    onMouseUp: (event: MouseEvent) => void;
+    location: ILocationState;
+}
+
+export interface ILocationState {
+    currentX: number;
+    currentY: number;
+}
+
+export default class Draggable extends React.Component<IProps, IState> {
+
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            onMouseMove: this.onMouseMove.bind(this),
+            onMouseUp: this.onMouseUp.bind(this),
+            location: {
+                currentX: 0,
+                currentY: 0,
+            },
+        };
+    }
+
+    private onMouseDown = (event: MouseEvent): void => {
+        this.setState({
+            location: {
+                currentX: event.clientX,
+                currentY: event.clientY,
+            },
+        });
+
+        document.addEventListener("mousemove", this.state.onMouseMove);
+        document.addEventListener("mouseup", this.state.onMouseUp);
+    };
+
+    private onMouseUp = (event: MouseEvent): void => {
+        document.removeEventListener("mousemove", this.state.onMouseMove);
+        document.removeEventListener("mouseup", this.state.onMouseUp);
+        this.props.onMouseUp(event);
+    };
+
+    private onMouseMove(event: MouseEvent): void {
+        const newLocation = this.props.dragFunc(this.state.location, event);
+
+        this.setState({
+            location: newLocation,
+        });
+    }
+
+    render() {
+        return <div className={this.props.className} onMouseDown={this.onMouseDown.bind(this)} />;
+    }
+
+}
\ No newline at end of file
diff --git a/src/components/views/elements/EditableItemList.js b/src/components/views/elements/EditableItemList.js
index 50d5a3d10f..34e53906a2 100644
--- a/src/components/views/elements/EditableItemList.js
+++ b/src/components/views/elements/EditableItemList.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import {_t} from '../../../languageHandler.js';
+import {_t} from '../../../languageHandler';
 import Field from "./Field";
 import AccessibleButton from "./AccessibleButton";
 
diff --git a/src/components/views/elements/ErrorBoundary.js b/src/components/views/elements/ErrorBoundary.js
index a043b350ab..68bec667d8 100644
--- a/src/components/views/elements/ErrorBoundary.js
+++ b/src/components/views/elements/ErrorBoundary.js
@@ -72,7 +72,7 @@ export default class ErrorBoundary extends React.PureComponent {
     render() {
         if (this.state.error) {
             const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-            const newIssueUrl = "https://github.com/vector-im/riot-web/issues/new";
+            const newIssueUrl = "https://github.com/vector-im/element-web/issues/new";
             return <div className="mx_ErrorBoundary">
                 <div className="mx_ErrorBoundary_body">
                     <h1>{_t("Something went wrong!")}</h1>
diff --git a/src/components/views/elements/EventListSummary.js b/src/components/views/elements/EventListSummary.js
index 79c84293c2..5a4a6e4f5a 100644
--- a/src/components/views/elements/EventListSummary.js
+++ b/src/components/views/elements/EventListSummary.js
@@ -66,12 +66,12 @@ const EventListSummary = ({events, children, threshold=3, onToggle, startExpande
     }
 
     return (
-        <div className="mx_EventListSummary" data-scroll-tokens={eventIds}>
+        <li className="mx_EventListSummary" data-scroll-tokens={eventIds}>
             <AccessibleButton className="mx_EventListSummary_toggle" onClick={toggleExpanded} aria-expanded={expanded}>
                 { expanded ? _t('collapse') : _t('expand') }
             </AccessibleButton>
             { body }
-        </div>
+        </li>
     );
 };
 
@@ -90,7 +90,7 @@ EventListSummary.propTypes = {
     // The list of room members for which to show avatars next to the summary
     summaryMembers: PropTypes.arrayOf(PropTypes.instanceOf(RoomMember)),
     // The text to show as the summary of this event list
-    summaryText: PropTypes.string.isRequired,
+    summaryText: PropTypes.string,
 };
 
 export default EventListSummary;
diff --git a/src/components/views/elements/EventTilePreview.tsx b/src/components/views/elements/EventTilePreview.tsx
new file mode 100644
index 0000000000..7d8b774955
--- /dev/null
+++ b/src/components/views/elements/EventTilePreview.tsx
@@ -0,0 +1,129 @@
+/*
+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 classnames from 'classnames';
+import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
+
+import * as Avatar from '../../../Avatar';
+import { MatrixClientPeg } from '../../../MatrixClientPeg';
+import EventTile from '../rooms/EventTile';
+
+interface IProps {
+    /**
+     * The text to be displayed in the message preview
+     */
+    message: string;
+
+    /**
+     * Whether to use the irc layout or not
+     */
+    useIRCLayout: boolean;
+
+    /**
+     * classnames to apply to the wrapper of the preview
+     */
+    className: string;
+}
+
+interface IState {
+    userId: string;
+    displayname: string;
+    avatar_url: string;
+}
+
+const AVATAR_SIZE = 32;
+
+export default class EventTilePreview extends React.Component<IProps, IState> {
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            userId: "@erim:fink.fink",
+            displayname: "Erimayas Fink",
+            avatar_url: null,
+        };
+    }
+
+    async componentDidMount() {
+        // Fetch current user data
+        const client = MatrixClientPeg.get();
+        const userId = client.getUserId();
+        const profileInfo = await client.getProfileInfo(userId);
+        const avatar_url = Avatar.avatarUrlForUser(
+            {avatarUrl: profileInfo.avatar_url},
+            AVATAR_SIZE, AVATAR_SIZE, "crop");
+
+        this.setState({
+            userId,
+            displayname: profileInfo.displayname,
+            avatar_url,
+        });
+
+    }
+
+    private fakeEvent({userId, displayname, avatar_url}: IState) {
+        // Fake it till we make it
+        const event = new MatrixEvent(JSON.parse(`{
+                "type": "m.room.message",
+                "sender": "${userId}",
+                "content": {
+                  "m.new_content": {
+                    "msgtype": "m.text",
+                    "body": "${this.props.message}",
+                    "displayname": "${displayname}",
+                    "avatar_url": "${avatar_url}"
+                  },
+                  "msgtype": "m.text",
+                  "body": "${this.props.message}",
+                  "displayname": "${displayname}",
+                  "avatar_url": "${avatar_url}"
+                },
+                "unsigned": {
+                  "age": 97
+                },
+                "event_id": "$9999999999999999999999999999999999999999999",
+                "room_id": "!999999999999999999:matrix.org"
+              }`));
+
+        // Fake it more
+        event.sender = {
+            name: displayname,
+            userId: userId,
+            getAvatarUrl: (..._) => {
+                return avatar_url;
+            },
+        };
+
+        return event;
+    }
+
+    public render() {
+        const event = this.fakeEvent(this.state);
+
+        let className = classnames(
+            this.props.className,
+            {
+                "mx_IRCLayout": this.props.useIRCLayout,
+                "mx_GroupLayout": !this.props.useIRCLayout,
+            }
+        );
+
+        return <div className={className}>
+            <EventTile mxEvent={event} useIRCLayout={this.props.useIRCLayout} />
+        </div>;
+    }
+}
diff --git a/src/components/views/elements/Field.js b/src/components/views/elements/Field.tsx
similarity index 54%
rename from src/components/views/elements/Field.js
rename to src/components/views/elements/Field.tsx
index 2ebb90da26..d9fd59dc11 100644
--- a/src/components/views/elements/Field.js
+++ b/src/components/views/elements/Field.tsx
@@ -14,11 +14,11 @@ 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, {InputHTMLAttributes, SelectHTMLAttributes, TextareaHTMLAttributes} from 'react';
 import classNames from 'classnames';
 import * as sdk from '../../../index';
 import { debounce } from 'lodash';
+import {IFieldState, IValidationResult} from "./Validation";
 
 // Invoke validation from user input (when typing, etc.) at most once every N ms.
 const VALIDATION_THROTTLE_MS = 200;
@@ -29,58 +29,111 @@ function getId() {
     return `${BASE_ID}_${count++}`;
 }
 
-export default class Field extends React.PureComponent {
-    static propTypes = {
-        // The field's ID, which binds the input and label together. Immutable.
-        id: PropTypes.string,
-        // The element to create. Defaults to "input".
-        // To define options for a select, use <Field><option ... /></Field>
-        element: PropTypes.oneOf(["input", "select", "textarea"]),
-        // The field's type (when used as an <input>). Defaults to "text".
-        type: PropTypes.string,
-        // id of a <datalist> element for suggestions
-        list: PropTypes.string,
-        // The field's label string.
-        label: PropTypes.string,
-        // The field's placeholder string. Defaults to the label.
-        placeholder: PropTypes.string,
-        // The field's value.
-        // This is a controlled component, so the value is required.
-        value: PropTypes.string.isRequired,
-        // Optional component to include inside the field before the input.
-        prefix: PropTypes.node,
-        // Optional component to include inside the field after the input.
-        postfix: PropTypes.node,
-        // The callback called whenever the contents of the field
-        // changes.  Returns an object with `valid` boolean field
-        // and a `feedback` react component field to provide feedback
-        // to the user.
-        onValidate: PropTypes.func,
-        // If specified, overrides the value returned by onValidate.
-        flagInvalid: PropTypes.bool,
-        // If specified, contents will appear as a tooltip on the element and
-        // validation feedback tooltips will be suppressed.
-        tooltipContent: PropTypes.node,
-        // If specified alongside tooltipContent, the class name to apply to the
-        // tooltip itself.
-        tooltipClassName: PropTypes.string,
-        // If specified, an additional class name to apply to the field container
-        className: PropTypes.string,
-        // All other props pass through to the <input>.
+interface IProps {
+    // The field's ID, which binds the input and label together. Immutable.
+    id?: string;
+    // The field's type (when used as an <input>). Defaults to "text".
+    type?: string;
+    // id of a <datalist> element for suggestions
+    list?: string;
+    // The field's label string.
+    label?: string;
+    // The field's placeholder string. Defaults to the label.
+    placeholder?: string;
+    // Optional component to include inside the field before the input.
+    prefixComponent?: React.ReactNode;
+    // Optional component to include inside the field after the input.
+    postfixComponent?: React.ReactNode;
+    // The callback called whenever the contents of the field
+    // changes.  Returns an object with `valid` boolean field
+    // and a `feedback` react component field to provide feedback
+    // to the user.
+    onValidate?: (input: IFieldState) => Promise<IValidationResult>;
+    // If specified, overrides the value returned by onValidate.
+    forceValidity?: boolean;
+    // If specified, contents will appear as a tooltip on the element and
+    // validation feedback tooltips will be suppressed.
+    tooltipContent?: React.ReactNode;
+    // If specified the tooltip will be shown regardless of feedback
+    forceTooltipVisible?: boolean;
+    // If specified alongside tooltipContent, the class name to apply to the
+    // tooltip itself.
+    tooltipClassName?: string;
+    // If specified, an additional class name to apply to the field container
+    className?: string;
+    // All other props pass through to the <input>.
+}
+
+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.
+    value: string;
+}
+
+interface ISelectProps extends IProps, SelectHTMLAttributes<HTMLSelectElement> {
+    // To define options for a select, use <Field><option ... /></Field>
+    element: "select";
+    // The select's value. This is a controlled component, so the value is required.
+    value: string;
+}
+
+interface ITextareaProps extends IProps, TextareaHTMLAttributes<HTMLTextAreaElement> {
+    element: "textarea";
+    // The textarea's value. This is a controlled component, so the value is required.
+    value: string;
+}
+
+type PropShapes = IInputProps | ISelectProps | ITextareaProps;
+
+interface IState {
+    valid: boolean;
+    feedback: React.ReactNode;
+    feedbackVisible: boolean;
+    focused: boolean;
+}
+
+export default class Field extends React.PureComponent<PropShapes, IState> {
+    private id: string;
+    private input: HTMLInputElement;
+
+    public static readonly defaultProps = {
+        element: "input",
+        type: "text",
     };
 
+    /*
+     * This was changed from throttle to debounce: this is more traditional for
+     * form validation since it means that the validation doesn't happen at all
+     * until the user stops typing for a bit (debounce defaults to not running on
+     * the leading edge). If we're doing an HTTP hit on each validation, we have more
+     * incentive to prevent validating input that's very unlikely to be valid.
+     * We may find that we actually want different behaviour for registration
+     * fields, in which case we can add some options to control it.
+     */
+    private validateOnChange = debounce(() => {
+        this.validate({
+            focused: true,
+        });
+    }, VALIDATION_THROTTLE_MS);
+
     constructor(props) {
         super(props);
         this.state = {
             valid: undefined,
             feedback: undefined,
+            feedbackVisible: false,
             focused: false,
         };
 
         this.id = this.props.id || getId();
     }
 
-    onFocus = (ev) => {
+    public focus() {
+        this.input.focus();
+    }
+
+    private onFocus = (ev) => {
         this.setState({
             focused: true,
         });
@@ -93,7 +146,7 @@ export default class Field extends React.PureComponent {
         }
     };
 
-    onChange = (ev) => {
+    private onChange = (ev) => {
         this.validateOnChange();
         // Parent component may have supplied its own `onChange` as well
         if (this.props.onChange) {
@@ -101,7 +154,7 @@ export default class Field extends React.PureComponent {
         }
     };
 
-    onBlur = (ev) => {
+    private onBlur = (ev) => {
         this.setState({
             focused: false,
         });
@@ -114,11 +167,7 @@ export default class Field extends React.PureComponent {
         }
     };
 
-    focus() {
-        this.input.focus();
-    }
-
-    async validate({ focused, allowEmpty = true }) {
+    private async validate({ focused, allowEmpty = true }: {focused: boolean, allowEmpty?: boolean}) {
         if (!this.props.onValidate) {
             return;
         }
@@ -149,59 +198,45 @@ export default class Field extends React.PureComponent {
         }
     }
 
-    /*
-     * This was changed from throttle to debounce: this is more traditional for
-     * form validation since it means that the validation doesn't happen at all
-     * until the user stops typing for a bit (debounce defaults to not running on
-     * the leading edge). If we're doing an HTTP hit on each validation, we have more
-     * incentive to prevent validating input that's very unlikely to be valid.
-     * We may find that we actually want different behaviour for registration
-     * fields, in which case we can add some options to control it.
-     */
-    validateOnChange = debounce(() => {
-        this.validate({
-            focused: true,
-        });
-    }, VALIDATION_THROTTLE_MS);
 
-    render() {
+
+    public render() {
         const {
-            element, prefix, postfix, className, onValidate, children,
-            tooltipContent, flagInvalid, tooltipClassName, list, ...inputProps} = this.props;
-
-        const inputElement = element || "input";
+            element, prefixComponent, postfixComponent, className, onValidate, children,
+            tooltipContent, forceValidity, tooltipClassName, list, ...inputProps} = this.props;
 
         // Set some defaults for the <input> element
-        inputProps.type = inputProps.type || "text";
-        inputProps.ref = input => this.input = input;
+        const ref = input => this.input = input;
         inputProps.placeholder = inputProps.placeholder || inputProps.label;
         inputProps.id = this.id; // this overwrites the id from props
 
         inputProps.onFocus = this.onFocus;
         inputProps.onChange = this.onChange;
         inputProps.onBlur = this.onBlur;
-        inputProps.list = list;
 
-        const fieldInput = React.createElement(inputElement, inputProps, children);
+        // Appease typescript's inference
+        const inputProps_ = {...inputProps, ref, list};
+
+        const fieldInput = React.createElement(this.props.element, inputProps_, children);
 
         let prefixContainer = null;
-        if (prefix) {
-            prefixContainer = <span className="mx_Field_prefix">{prefix}</span>;
+        if (prefixComponent) {
+            prefixContainer = <span className="mx_Field_prefix">{prefixComponent}</span>;
         }
         let postfixContainer = null;
-        if (postfix) {
-            postfixContainer = <span className="mx_Field_postfix">{postfix}</span>;
+        if (postfixComponent) {
+            postfixContainer = <span className="mx_Field_postfix">{postfixComponent}</span>;
         }
 
-        const hasValidationFlag = flagInvalid !== null && flagInvalid !== undefined;
-        const fieldClasses = classNames("mx_Field", `mx_Field_${inputElement}`, className, {
+        const hasValidationFlag = forceValidity !== null && forceValidity !== undefined;
+        const fieldClasses = classNames("mx_Field", `mx_Field_${this.props.element}`, className, {
             // If we have a prefix element, leave the label always at the top left and
             // don't animate it, as it looks a bit clunky and would add complexity to do
             // properly.
-            mx_Field_labelAlwaysTopLeft: prefix,
-            mx_Field_valid: onValidate && this.state.valid === true,
+            mx_Field_labelAlwaysTopLeft: prefixComponent,
+            mx_Field_valid: hasValidationFlag ? forceValidity : onValidate && this.state.valid === true,
             mx_Field_invalid: hasValidationFlag
-                ? flagInvalid
+                ? !forceValidity
                 : onValidate && this.state.valid === false,
         });
 
@@ -209,11 +244,11 @@ export default class Field extends React.PureComponent {
         const Tooltip = sdk.getComponent("elements.Tooltip");
         let fieldTooltip;
         if (tooltipContent || this.state.feedback) {
-            const addlClassName = tooltipClassName ? tooltipClassName : '';
             fieldTooltip = <Tooltip
-                tooltipClassName={`mx_Field_tooltip ${addlClassName}`}
-                visible={this.state.feedbackVisible}
+                tooltipClassName={classNames("mx_Field_tooltip", tooltipClassName)}
+                visible={(this.state.focused && this.props.forceTooltipVisible) || this.state.feedbackVisible}
                 label={tooltipContent || this.state.feedback}
+                forceOnRight
             />;
         }
 
diff --git a/src/components/views/elements/Flair.js b/src/components/views/elements/Flair.js
index bc657e9e91..0f06904b68 100644
--- a/src/components/views/elements/Flair.js
+++ b/src/components/views/elements/Flair.js
@@ -19,7 +19,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import FlairStore from '../../../stores/FlairStore';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
 
diff --git a/src/components/views/elements/IRCTimelineProfileResizer.tsx b/src/components/views/elements/IRCTimelineProfileResizer.tsx
new file mode 100644
index 0000000000..1098d0293e
--- /dev/null
+++ b/src/components/views/elements/IRCTimelineProfileResizer.tsx
@@ -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 React from 'react';
+import SettingsStore from "../../../settings/SettingsStore";
+import Draggable, {ILocationState} from './Draggable';
+import { SettingLevel } from "../../../settings/SettingLevel";
+
+interface IProps {
+    // Current room
+    roomId: string;
+    minWidth: number;
+    maxWidth: number;
+}
+
+interface IState {
+    width: number;
+    IRCLayoutRoot: HTMLElement;
+}
+
+export default class IRCTimelineProfileResizer extends React.Component<IProps, IState> {
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            width: SettingsStore.getValue("ircDisplayNameWidth", this.props.roomId),
+            IRCLayoutRoot: null,
+        };
+    }
+
+    componentDidMount() {
+        this.setState({
+            IRCLayoutRoot: document.querySelector(".mx_IRCLayout") as HTMLElement,
+        }, () => this.updateCSSWidth(this.state.width));
+    }
+
+    private dragFunc = (location: ILocationState, event: React.MouseEvent<Element, MouseEvent>): ILocationState => {
+        const offset = event.clientX - location.currentX;
+        const newWidth = this.state.width + offset;
+
+        // If we're trying to go smaller than min width, don't.
+        if (newWidth < this.props.minWidth) {
+            return location;
+        }
+
+        if (newWidth > this.props.maxWidth) {
+            return location;
+        }
+
+        this.setState({
+            width: newWidth,
+        });
+
+        this.updateCSSWidth.bind(this)(newWidth);
+
+        return {
+            currentX: event.clientX,
+            currentY: location.currentY,
+        };
+    };
+
+    private updateCSSWidth(newWidth: number) {
+        this.state.IRCLayoutRoot.style.setProperty("--name-width", newWidth + "px");
+    }
+
+    private onMoueUp(event: MouseEvent) {
+        if (this.props.roomId) {
+            SettingsStore.setValue("ircDisplayNameWidth", this.props.roomId, SettingLevel.ROOM_DEVICE, this.state.width);
+        }
+    }
+
+    render() {
+        return <Draggable
+            className="mx_ProfileResizer"
+            dragFunc={this.dragFunc.bind(this)}
+            onMouseUp={this.onMoueUp.bind(this)}
+        />;
+    }
+}
diff --git a/src/components/views/elements/ImageView.js b/src/components/views/elements/ImageView.js
index e675e6b73f..e39075cedc 100644
--- a/src/components/views/elements/ImageView.js
+++ b/src/components/views/elements/ImageView.js
@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
-
 import React from 'react';
 import PropTypes from 'prop-types';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
@@ -27,6 +25,7 @@ import AccessibleButton from "./AccessibleButton";
 import Modal from "../../../Modal";
 import * as sdk from "../../../index";
 import {Key} from "../../../Keyboard";
+import FocusLock from "react-focus-lock";
 
 export default class ImageView extends React.Component {
     static propTypes = {
@@ -50,16 +49,6 @@ export default class ImageView extends React.Component {
         this.state = { rotationDegrees: 0 };
     }
 
-    // XXX: keyboard shortcuts for managing dialogs should be done by the modal
-    // dialog base class somehow, surely...
-    componentDidMount() {
-        document.addEventListener("keydown", this.onKeyDown);
-    }
-
-    componentWillUnmount() {
-        document.removeEventListener("keydown", this.onKeyDown);
-    }
-
     onKeyDown = (ev) => {
         if (ev.key === Key.ESCAPE) {
             ev.stopPropagation();
@@ -73,6 +62,7 @@ export default class ImageView extends React.Component {
         Modal.createTrackedDialog('Confirm Redact Dialog', 'Image View', ConfirmRedactDialog, {
             onFinished: (proceed) => {
                 if (!proceed) return;
+                this.props.onFinished();
                 MatrixClientPeg.get().redactEvent(
                     this.props.mxEvent.getRoomId(), this.props.mxEvent.getId(),
                 ).catch(function(e) {
@@ -194,7 +184,14 @@ export default class ImageView extends React.Component {
         const effectiveStyle = {transform: `rotate(${rotationDegrees}deg)`, ...style};
 
         return (
-            <div className="mx_ImageView">
+            <FocusLock
+                returnFocus={true}
+                lockProps={{
+                    onKeyDown: this.onKeyDown,
+                    role: "dialog",
+                }}
+                className="mx_ImageView"
+            >
                 <div className="mx_ImageView_lhs">
                 </div>
                 <div className="mx_ImageView_content">
@@ -230,7 +227,7 @@ export default class ImageView extends React.Component {
                 </div>
                 <div className="mx_ImageView_rhs">
                 </div>
-            </div>
+            </FocusLock>
         );
     }
 }
diff --git a/src/components/views/elements/InlineSpinner.js b/src/components/views/elements/InlineSpinner.js
index ad70471d89..ce3c738f3b 100644
--- a/src/components/views/elements/InlineSpinner.js
+++ b/src/components/views/elements/InlineSpinner.js
@@ -16,6 +16,8 @@ limitations under the License.
 
 import React from "react";
 import createReactClass from 'create-react-class';
+import {_t} from "../../../languageHandler";
+import SettingsStore from "../../../settings/SettingsStore";
 
 export default createReactClass({
     displayName: 'InlineSpinner',
@@ -25,9 +27,22 @@ export default createReactClass({
         const h = this.props.h || 16;
         const imgClass = this.props.imgClassName || "";
 
+        let imageSource;
+        if (SettingsStore.getValue('feature_new_spinner')) {
+            imageSource = require("../../../../res/img/spinner.svg");
+        } else {
+            imageSource = require("../../../../res/img/spinner.gif");
+        }
+
         return (
             <div className="mx_InlineSpinner">
-                <img src={require("../../../../res/img/spinner.gif")} width={w} height={h} className={imgClass} />
+                <img
+                    src={imageSource}
+                    width={w}
+                    height={h}
+                    className={imgClass}
+                    aria-label={_t("Loading...")}
+                />
             </div>
         );
     },
diff --git a/src/components/views/elements/InteractiveTooltip.js b/src/components/views/elements/InteractiveTooltip.js
deleted file mode 100644
index 7f5f24a094..0000000000
--- a/src/components/views/elements/InteractiveTooltip.js
+++ /dev/null
@@ -1,336 +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 ReactDOM from 'react-dom';
-import PropTypes from 'prop-types';
-import classNames from 'classnames';
-
-const InteractiveTooltipContainerId = "mx_InteractiveTooltip_Container";
-
-// If the distance from tooltip to window edge is below this value, the tooltip
-// will flip around to the other side of the target.
-const MIN_SAFE_DISTANCE_TO_WINDOW_EDGE = 20;
-
-function getOrCreateContainer() {
-    let container = document.getElementById(InteractiveTooltipContainerId);
-
-    if (!container) {
-        container = document.createElement("div");
-        container.id = InteractiveTooltipContainerId;
-        document.body.appendChild(container);
-    }
-
-    return container;
-}
-
-function isInRect(x, y, rect) {
-    const { top, right, bottom, left } = rect;
-    return x >= left && x <= right && y >= top && y <= bottom;
-}
-
-/**
- * Returns the positive slope of the diagonal of the rect.
- *
- * @param {DOMRect} rect
- * @return {integer}
- */
-function getDiagonalSlope(rect) {
-    const { top, right, bottom, left } = rect;
-    return (bottom - top) / (right - left);
-}
-
-function isInUpperLeftHalf(x, y, rect) {
-    const { bottom, left } = rect;
-    // Negative slope because Y values grow downwards and for this case, the
-    // diagonal goes from larger to smaller Y values.
-    const diagonalSlope = getDiagonalSlope(rect) * -1;
-    return isInRect(x, y, rect) && (y <= bottom + diagonalSlope * (x - left));
-}
-
-function isInLowerRightHalf(x, y, rect) {
-    const { bottom, left } = rect;
-    // Negative slope because Y values grow downwards and for this case, the
-    // diagonal goes from larger to smaller Y values.
-    const diagonalSlope = getDiagonalSlope(rect) * -1;
-    return isInRect(x, y, rect) && (y >= bottom + diagonalSlope * (x - left));
-}
-
-function isInUpperRightHalf(x, y, rect) {
-    const { top, left } = rect;
-    // Positive slope because Y values grow downwards and for this case, the
-    // diagonal goes from smaller to larger Y values.
-    const diagonalSlope = getDiagonalSlope(rect) * 1;
-    return isInRect(x, y, rect) && (y <= top + diagonalSlope * (x - left));
-}
-
-function isInLowerLeftHalf(x, y, rect) {
-    const { top, left } = rect;
-    // Positive slope because Y values grow downwards and for this case, the
-    // diagonal goes from smaller to larger Y values.
-    const diagonalSlope = getDiagonalSlope(rect) * 1;
-    return isInRect(x, y, rect) && (y >= top + diagonalSlope * (x - left));
-}
-
-/*
- * This style of tooltip takes a "target" element as its child and centers the
- * tooltip along one edge of the target.
- */
-export default class InteractiveTooltip extends React.Component {
-    static propTypes = {
-        // Content to show in the tooltip
-        content: PropTypes.node.isRequired,
-        // Function to call when visibility of the tooltip changes
-        onVisibilityChange: PropTypes.func,
-        // flag to forcefully hide this tooltip
-        forceHidden: PropTypes.bool,
-    };
-
-    constructor() {
-        super();
-
-        this.state = {
-            contentRect: null,
-            visible: false,
-        };
-    }
-
-    componentDidUpdate() {
-        // Whenever this passthrough component updates, also render the tooltip
-        // in a separate DOM tree. This allows the tooltip content to participate
-        // the normal React rendering cycle: when this component re-renders, the
-        // tooltip content re-renders.
-        // Once we upgrade to React 16, this could be done a bit more naturally
-        // using the portals feature instead.
-        this.renderTooltip();
-    }
-
-    componentWillUnmount() {
-        document.removeEventListener("mousemove", this.onMouseMove);
-    }
-
-    collectContentRect = (element) => {
-        // We don't need to clean up when unmounting, so ignore
-        if (!element) return;
-
-        this.setState({
-            contentRect: element.getBoundingClientRect(),
-        });
-    }
-
-    collectTarget = (element) => {
-        this.target = element;
-    }
-
-    canTooltipFitAboveTarget() {
-        const { contentRect } = this.state;
-        const targetRect = this.target.getBoundingClientRect();
-        const targetTop = targetRect.top + window.pageYOffset;
-        return (
-            !contentRect ||
-            (targetTop - contentRect.height > MIN_SAFE_DISTANCE_TO_WINDOW_EDGE)
-        );
-    }
-
-    onMouseMove = (ev) => {
-        const { clientX: x, clientY: y } = ev;
-        const { contentRect } = this.state;
-        const targetRect = this.target.getBoundingClientRect();
-
-        // When moving the mouse from the target to the tooltip, we create a
-        // safe area that includes the tooltip, the target, and the trapezoid
-        // ABCD between them:
-        //                            ┌───────────┐
-        //                            │           │
-        //                            │           │
-        //                          A └───E───F───┘ B
-        //                                  V
-        //                                 ┌─┐
-        //                                 │ │
-        //                                C└─┘D
-        //
-        // As long as the mouse remains inside the safe area, the tooltip will
-        // stay open.
-        const buffer = 50;
-        if (isInRect(x, y, targetRect)) {
-            return;
-        }
-        if (this.canTooltipFitAboveTarget()) {
-            const contentRectWithBuffer = {
-                top: contentRect.top - buffer,
-                right: contentRect.right + buffer,
-                bottom: contentRect.bottom,
-                left: contentRect.left - buffer,
-            };
-            const trapezoidLeft = {
-                top: contentRect.bottom,
-                right: targetRect.left,
-                bottom: targetRect.bottom,
-                left: contentRect.left - buffer,
-            };
-            const trapezoidCenter = {
-                top: contentRect.bottom,
-                right: targetRect.right,
-                bottom: targetRect.bottom,
-                left: targetRect.left,
-            };
-            const trapezoidRight = {
-                top: contentRect.bottom,
-                right: contentRect.right + buffer,
-                bottom: targetRect.bottom,
-                left: targetRect.right,
-            };
-
-            if (
-                isInRect(x, y, contentRectWithBuffer) ||
-                isInUpperRightHalf(x, y, trapezoidLeft) ||
-                isInRect(x, y, trapezoidCenter) ||
-                isInUpperLeftHalf(x, y, trapezoidRight)
-            ) {
-                return;
-            }
-        } else {
-            const contentRectWithBuffer = {
-                top: contentRect.top,
-                right: contentRect.right + buffer,
-                bottom: contentRect.bottom + buffer,
-                left: contentRect.left - buffer,
-            };
-            const trapezoidLeft = {
-                top: targetRect.top,
-                right: targetRect.left,
-                bottom: contentRect.top,
-                left: contentRect.left - buffer,
-            };
-            const trapezoidCenter = {
-                top: targetRect.top,
-                right: targetRect.right,
-                bottom: contentRect.top,
-                left: targetRect.left,
-            };
-            const trapezoidRight = {
-                top: targetRect.top,
-                right: contentRect.right + buffer,
-                bottom: contentRect.top,
-                left: targetRect.right,
-            };
-
-            if (
-                isInRect(x, y, contentRectWithBuffer) ||
-                isInLowerRightHalf(x, y, trapezoidLeft) ||
-                isInRect(x, y, trapezoidCenter) ||
-                isInLowerLeftHalf(x, y, trapezoidRight)
-            ) {
-                return;
-            }
-        }
-
-        this.hideTooltip();
-    }
-
-    onTargetMouseOver = (ev) => {
-        this.showTooltip();
-    }
-
-    showTooltip() {
-        // Don't enter visible state if we haven't collected the target yet
-        if (!this.target) {
-            return;
-        }
-        this.setState({
-            visible: true,
-        });
-        if (this.props.onVisibilityChange) {
-            this.props.onVisibilityChange(true);
-        }
-        document.addEventListener("mousemove", this.onMouseMove);
-    }
-
-    hideTooltip() {
-        this.setState({
-            visible: false,
-        });
-        if (this.props.onVisibilityChange) {
-            this.props.onVisibilityChange(false);
-        }
-        document.removeEventListener("mousemove", this.onMouseMove);
-    }
-
-    renderTooltip() {
-        const { contentRect, visible } = this.state;
-        if (this.props.forceHidden === true || !visible) {
-            ReactDOM.render(null, getOrCreateContainer());
-            return null;
-        }
-
-        const targetRect = this.target.getBoundingClientRect();
-
-        // The window X and Y offsets are to adjust position when zoomed in to page
-        const targetLeft = targetRect.left + window.pageXOffset;
-        const targetBottom = targetRect.bottom + window.pageYOffset;
-        const targetTop = targetRect.top + window.pageYOffset;
-
-        // Place the tooltip above the target by default. If we find that the
-        // tooltip content would extend past the safe area towards the window
-        // edge, flip around to below the target.
-        const position = {};
-        let chevronFace = null;
-        if (this.canTooltipFitAboveTarget()) {
-            position.bottom = window.innerHeight - targetTop;
-            chevronFace = "bottom";
-        } else {
-            position.top = targetBottom;
-            chevronFace = "top";
-        }
-
-        // Center the tooltip horizontally with the target's center.
-        position.left = targetLeft + targetRect.width / 2;
-
-        const chevron = <div className={"mx_InteractiveTooltip_chevron_" + chevronFace} />;
-
-        const menuClasses = classNames({
-            'mx_InteractiveTooltip': true,
-            'mx_InteractiveTooltip_withChevron_top': chevronFace === 'top',
-            'mx_InteractiveTooltip_withChevron_bottom': chevronFace === 'bottom',
-        });
-
-        const menuStyle = {};
-        if (contentRect) {
-            menuStyle.left = `-${contentRect.width / 2}px`;
-        }
-
-        const tooltip = <div className="mx_InteractiveTooltip_wrapper" style={{...position}}>
-            <div className={menuClasses}
-                style={menuStyle}
-                ref={this.collectContentRect}
-            >
-                {chevron}
-                {this.props.content}
-            </div>
-        </div>;
-
-        ReactDOM.render(tooltip, getOrCreateContainer());
-    }
-
-    render() {
-        // We use `cloneElement` here to append some props to the child content
-        // without using a wrapper element which could disrupt layout.
-        return React.cloneElement(this.props.children, {
-            ref: this.collectTarget,
-            onMouseOver: this.onTargetMouseOver,
-        });
-    }
-}
diff --git a/src/components/views/elements/ManageIntegsButton.js b/src/components/views/elements/ManageIntegsButton.js
index b631ddee73..0990218c65 100644
--- a/src/components/views/elements/ManageIntegsButton.js
+++ b/src/components/views/elements/ManageIntegsButton.js
@@ -17,10 +17,10 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
 import SettingsStore from "../../../settings/SettingsStore";
+import AccessibleTooltipButton from "./AccessibleTooltipButton";
 
 export default class ManageIntegsButton extends React.Component {
     constructor(props) {
@@ -34,7 +34,7 @@ export default class ManageIntegsButton extends React.Component {
         if (!managers.hasManager()) {
             managers.openNoManagerDialog();
         } else {
-            if (SettingsStore.isFeatureEnabled("feature_many_integration_managers")) {
+            if (SettingsStore.getValue("feature_many_integration_managers")) {
                 managers.openAll(this.props.room);
             } else {
                 managers.getPrimaryManager().open(this.props.room);
@@ -45,9 +45,8 @@ export default class ManageIntegsButton extends React.Component {
     render() {
         let integrationsButton = <div />;
         if (IntegrationManagers.sharedInstance().hasManager()) {
-            const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
             integrationsButton = (
-                <AccessibleButton
+                <AccessibleTooltipButton
                     className='mx_RoomHeader_button mx_RoomHeader_manageIntegsButton'
                     title={_t("Manage Integrations")}
                     onClick={this.onManageIntegrations}
diff --git a/src/components/views/elements/MemberEventListSummary.js b/src/components/views/elements/MemberEventListSummary.js
index fc79fc87d0..956b69ca7b 100644
--- a/src/components/views/elements/MemberEventListSummary.js
+++ b/src/components/views/elements/MemberEventListSummary.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,6 +23,7 @@ import { _t } from '../../../languageHandler';
 import { formatCommaSeparatedList } from '../../../utils/FormattingUtils';
 import * as sdk from "../../../index";
 import {MatrixEvent} from "matrix-js-sdk";
+import {isValid3pidInvite} from "../../../RoomInvite";
 
 export default createReactClass({
     displayName: 'MemberEventListSummary',
@@ -284,6 +285,9 @@ export default createReactClass({
     _getTransition: function(e) {
         if (e.mxEvent.getType() === 'm.room.third_party_invite') {
             // Handle 3pid invites the same as invites so they get bundled together
+            if (!isValid3pidInvite(e.mxEvent)) {
+                return 'invite_withdrawal';
+            }
             return 'invited';
         }
 
diff --git a/src/components/views/elements/MessageSpinner.js b/src/components/views/elements/MessageSpinner.js
deleted file mode 100644
index 1775fdd4d7..0000000000
--- a/src/components/views/elements/MessageSpinner.js
+++ /dev/null
@@ -1,35 +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 createReactClass from 'create-react-class';
-
-export default createReactClass({
-    displayName: 'MessageSpinner',
-
-    render: function() {
-        const w = this.props.w || 32;
-        const h = this.props.h || 32;
-        const imgClass = this.props.imgClassName || "";
-        const msg = this.props.msg || "Loading...";
-        return (
-            <div className="mx_Spinner">
-                <div className="mx_Spinner_Msg">{ msg }</div>&nbsp;
-                <img src={require("../../../../res/img/spinner.gif")} width={w} height={h} className={imgClass} />
-            </div>
-        );
-    },
-});
diff --git a/src/components/views/elements/PersistedElement.js b/src/components/views/elements/PersistedElement.js
index 53f2501f19..7f9bfdebf4 100644
--- a/src/components/views/elements/PersistedElement.js
+++ b/src/components/views/elements/PersistedElement.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 
 import ResizeObserver from 'resize-observer-polyfill';
 
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 
 // Shamelessly ripped off Modal.js.  There's probably a better way
 // of doing reusable widgets like dialog boxes & menus where we go and
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 1df12738c5..03a1aeed85 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import createReactClass from 'create-react-class';
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import classNames from 'classnames';
 import { Room, RoomMember } from 'matrix-js-sdk';
 import PropTypes from 'prop-types';
@@ -26,6 +26,7 @@ import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import FlairStore from "../../../stores/FlairStore";
 import {getPrimaryPermalinkEntity} 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 `[^\/]*`)
@@ -191,7 +192,7 @@ const Pill = createReactClass({
 
     onUserPillClicked: function() {
         dis.dispatch({
-            action: 'view_user',
+            action: Action.ViewUser,
             member: this.state.member,
         });
     },
diff --git a/src/components/views/elements/ProgressBar.js b/src/components/views/elements/ProgressBar.js
deleted file mode 100644
index 045731ba38..0000000000
--- a/src/components/views/elements/ProgressBar.js
+++ /dev/null
@@ -1,39 +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 from "react";
-import PropTypes from 'prop-types';
-import createReactClass from 'create-react-class';
-
-export default createReactClass({
-    displayName: 'ProgressBar',
-    propTypes: {
-        value: PropTypes.number,
-        max: PropTypes.number,
-    },
-
-    render: function() {
-        // Would use an HTML5 progress tag but if that doesn't animate if you
-        // use the HTML attributes rather than styles
-        const progressStyle = {
-            width: ((this.props.value / this.props.max) * 100)+"%",
-        };
-        return (
-            <div className="mx_ProgressBar"><div className="mx_ProgressBar_fill" style={progressStyle}></div></div>
-        );
-    },
-});
diff --git a/src/components/views/elements/ProgressBar.tsx b/src/components/views/elements/ProgressBar.tsx
new file mode 100644
index 0000000000..90832e5006
--- /dev/null
+++ b/src/components/views/elements/ProgressBar.tsx
@@ -0,0 +1,28 @@
+/*
+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";
+
+interface IProps {
+    value: number;
+    max: number;
+}
+
+const ProgressBar: React.FC<IProps> = ({value, max}) => {
+    return <progress className="mx_ProgressBar" max={max} value={value} />;
+};
+
+export default ProgressBar;
diff --git a/src/components/views/elements/QRCode.tsx b/src/components/views/elements/QRCode.tsx
new file mode 100644
index 0000000000..f70ab48fa3
--- /dev/null
+++ b/src/components/views/elements/QRCode.tsx
@@ -0,0 +1,51 @@
+/*
+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 {toDataURL, QRCodeSegment, QRCodeToDataURLOptions} from "qrcode";
+import classNames from "classnames";
+
+import {_t} from "../../../languageHandler";
+import Spinner from "./Spinner";
+
+interface IProps extends QRCodeToDataURLOptions {
+    data: string | QRCodeSegment[];
+    className?: string;
+}
+
+const defaultOptions: QRCodeToDataURLOptions = {
+    errorCorrectionLevel: 'L', // we want it as trivial-looking as possible
+};
+
+const QRCode: React.FC<IProps> = ({data, className, ...options}) => {
+    const [dataUri, setUri] = React.useState<string>(null);
+    React.useEffect(() => {
+        let cancelled = false;
+        toDataURL(data, {...defaultOptions, ...options}).then(uri => {
+            if (cancelled) return;
+            setUri(uri);
+        });
+        return () => {
+            cancelled = true;
+        };
+    }, [JSON.stringify(data), options]);
+
+    return <div className={classNames("mx_QRCode", className)}>
+        { dataUri ? <img src={dataUri} className="mx_VerificationQRCode" alt={_t("QR Code")} /> : <Spinner /> }
+    </div>;
+};
+
+export default QRCode;
diff --git a/src/components/views/elements/ReplyThread.js b/src/components/views/elements/ReplyThread.js
index eae2d13f8a..409bf9e01f 100644
--- a/src/components/views/elements/ReplyThread.js
+++ b/src/components/views/elements/ReplyThread.js
@@ -19,13 +19,15 @@ import React from 'react';
 import * as sdk from '../../../index';
 import {_t} from '../../../languageHandler';
 import PropTypes from 'prop-types';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import {wantsDateSeparator} from '../../../DateUtils';
 import {MatrixEvent} from 'matrix-js-sdk';
 import {makeUserPermalink, RoomPermalinkCreator} from "../../../utils/permalinks/Permalinks";
 import SettingsStore from "../../../settings/SettingsStore";
 import escapeHtml from "escape-html";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {Action} from "../../../dispatcher/actions";
+import sanitizeHtml from "sanitize-html";
 
 // This component does no cycle detection, simply because the only way to make such a cycle would be to
 // craft event_id's, using a homeserver that generates predictable event IDs; even then the impact would
@@ -37,6 +39,8 @@ export default class ReplyThread extends React.Component {
         // called when the ReplyThread contents has changed, including EventTiles thereof
         onHeightChanged: PropTypes.func.isRequired,
         permalinkCreator: PropTypes.instanceOf(RoomPermalinkCreator).isRequired,
+        // Specifies which layout to use.
+        useIRCLayout: PropTypes.bool,
     };
 
     static contextType = MatrixClientContext;
@@ -89,7 +93,21 @@ export default class ReplyThread extends React.Component {
 
     // Part of Replies fallback support
     static stripHTMLReply(html) {
-        return html.replace(/^<mx-reply>[\s\S]+?<\/mx-reply>/, '');
+        // Sanitize the original HTML for inclusion in <mx-reply>.  We allow
+        // any HTML, since the original sender could use special tags that we
+        // don't recognize, but want to pass along to any recipients who do
+        // recognize them -- recipients should be sanitizing before displaying
+        // anyways.  However, we sanitize to 1) remove any mx-reply, so that we
+        // don't generate a nested mx-reply, and 2) make sure that the HTML is
+        // properly formatted (e.g. tags are closed where necessary)
+        return sanitizeHtml(
+            html,
+            {
+                allowedTags: false, // false means allow everything
+                allowedAttributes: false,
+                exclusiveFilter: (frame) => frame.tag === "mx-reply",
+            },
+        );
     }
 
     // Part of Replies fallback support
@@ -99,15 +117,19 @@ export default class ReplyThread extends React.Component {
         let {body, formatted_body: html} = ev.getContent();
         if (this.getParentEventId(ev)) {
             if (body) body = this.stripPlainReply(body);
-            if (html) html = this.stripHTMLReply(html);
         }
 
         if (!body) body = ""; // Always ensure we have a body, for reasons.
 
-        // Escape the body to use as HTML below.
-        // We also run a nl2br over the result to fix the fallback representation. We do this
-        // after converting the text to safe HTML to avoid user-provided BR's from being converted.
-        if (!html) html = escapeHtml(body).replace(/\n/g, '<br/>');
+        if (html) {
+            // sanitize the HTML before we put it in an <mx-reply>
+            html = this.stripHTMLReply(html);
+        } else {
+            // Escape the body to use as HTML below.
+            // We also run a nl2br over the result to fix the fallback representation. We do this
+            // after converting the text to safe HTML to avoid user-provided BR's from being converted.
+            html = escapeHtml(body).replace(/\n/g, '<br/>');
+        }
 
         // dev note: do not rely on `body` being safe for HTML usage below.
 
@@ -176,12 +198,17 @@ export default class ReplyThread extends React.Component {
         };
     }
 
-    static makeThread(parentEv, onHeightChanged, permalinkCreator, ref) {
+    static makeThread(parentEv, onHeightChanged, permalinkCreator, ref, useIRCLayout) {
         if (!ReplyThread.getParentEventId(parentEv)) {
-            return <div />;
+            return <div className="mx_ReplyThread_wrapper_empty" />;
         }
-        return <ReplyThread parentEv={parentEv} onHeightChanged={onHeightChanged}
-            ref={ref} permalinkCreator={permalinkCreator} />;
+        return <ReplyThread
+            parentEv={parentEv}
+            onHeightChanged={onHeightChanged}
+            ref={ref}
+            permalinkCreator={permalinkCreator}
+            useIRCLayout={useIRCLayout}
+        />;
     }
 
     componentDidMount() {
@@ -283,7 +310,7 @@ export default class ReplyThread extends React.Component {
             events,
         }, this.loadNextEvent);
 
-        dis.dispatch({action: 'focus_composer'});
+        dis.fire(Action.FocusComposer);
     }
 
     render() {
@@ -331,11 +358,13 @@ export default class ReplyThread extends React.Component {
                     onHeightChanged={this.props.onHeightChanged}
                     permalinkCreator={this.props.permalinkCreator}
                     isRedacted={ev.isRedacted()}
-                    isTwelveHour={SettingsStore.getValue("showTwelveHourTimestamps")} />
+                    isTwelveHour={SettingsStore.getValue("showTwelveHourTimestamps")}
+                    useIRCLayout={this.props.useIRCLayout}
+                />
             </blockquote>;
         });
 
-        return <div>
+        return <div className="mx_ReplyThread_wrapper">
             <div>{ header }</div>
             <div>{ evTiles }</div>
         </div>;
diff --git a/src/components/views/elements/RoomAliasField.js b/src/components/views/elements/RoomAliasField.js
index d3de6a5d34..04bbe1c3de 100644
--- a/src/components/views/elements/RoomAliasField.js
+++ b/src/components/views/elements/RoomAliasField.js
@@ -45,10 +45,10 @@ export default class RoomAliasField extends React.PureComponent {
         const maxlength = 255 - this.props.domain.length - 2;   // 2 for # and :
         return (
                 <Field
-                    label={_t("Room alias")}
+                    label={_t("Room address")}
                     className="mx_RoomAliasField"
-                    prefix={poundSign}
-                    postfix={domain}
+                    prefixComponent={poundSign}
+                    postfixComponent={domain}
                     ref={ref => this._fieldRef = ref}
                     onValidate={this._onValidate}
                     placeholder={_t("e.g. my-room")}
@@ -87,7 +87,7 @@ export default class RoomAliasField extends React.PureComponent {
             }, {
                 key: "required",
                 test: async ({ value, allowEmpty }) => allowEmpty || !!value,
-                invalid: () => _t("Please provide a room alias"),
+                invalid: () => _t("Please provide a room address"),
             }, {
                 key: "taken",
                 final: true,
@@ -107,8 +107,8 @@ export default class RoomAliasField extends React.PureComponent {
                         return !!err.errcode;
                     }
                 },
-                valid: () => _t("This alias is available to use"),
-                invalid: () => _t("This alias is already in use"),
+                valid: () => _t("This address is available to use"),
+                invalid: () => _t("This address is already in use"),
             },
         ],
     });
diff --git a/src/components/views/elements/RoomDirectoryButton.js b/src/components/views/elements/RoomDirectoryButton.js
index d0bff4beeb..e9de6f8d15 100644
--- a/src/components/views/elements/RoomDirectoryButton.js
+++ b/src/components/views/elements/RoomDirectoryButton.js
@@ -18,11 +18,12 @@ 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="view_room_directory"
+        <ActionButton action={Action.ViewRoomDirectory}
             mouseOverAction={props.callout ? "callout_room_directory" : null}
             label={_t("Room directory")}
             iconPath={require("../../../../res/img/icons-directory.svg")}
diff --git a/src/components/views/elements/SSOButton.js b/src/components/views/elements/SSOButton.js
index 3e0757924b..1126ae3cd7 100644
--- a/src/components/views/elements/SSOButton.js
+++ b/src/components/views/elements/SSOButton.js
@@ -21,9 +21,9 @@ import PlatformPeg from "../../../PlatformPeg";
 import AccessibleButton from "./AccessibleButton";
 import {_t} from "../../../languageHandler";
 
-const SSOButton = ({matrixClient, loginType, ...props}) => {
+const SSOButton = ({matrixClient, loginType, fragmentAfterLogin, ...props}) => {
     const onClick = () => {
-        PlatformPeg.get().startSingleSignOn(matrixClient, loginType);
+        PlatformPeg.get().startSingleSignOn(matrixClient, loginType, fragmentAfterLogin);
     };
 
     return (
@@ -36,6 +36,7 @@ const SSOButton = ({matrixClient, loginType, ...props}) => {
 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/SettingsFlag.js b/src/components/views/elements/SettingsFlag.js
deleted file mode 100644
index 15f17805a8..0000000000
--- a/src/components/views/elements/SettingsFlag.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-Copyright 2017 Travis Ralston
-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 createReactClass from 'create-react-class';
-import SettingsStore from "../../../settings/SettingsStore";
-import { _t } from '../../../languageHandler';
-import ToggleSwitch from "./ToggleSwitch";
-
-export default createReactClass({
-    displayName: 'SettingsFlag',
-    propTypes: {
-        name: PropTypes.string.isRequired,
-        level: PropTypes.string.isRequired,
-        roomId: PropTypes.string, // for per-room settings
-        label: PropTypes.string, // untranslated
-        onChange: PropTypes.func,
-        isExplicit: PropTypes.bool,
-    },
-
-    getInitialState: function() {
-        return {
-            value: SettingsStore.getValueAt(
-                this.props.level,
-                this.props.name,
-                this.props.roomId,
-                this.props.isExplicit,
-            ),
-        };
-    },
-
-    onChange: function(checked) {
-        if (this.props.group && !checked) return;
-
-        this.save(checked);
-        this.setState({ value: checked });
-        if (this.props.onChange) this.props.onChange(checked);
-    },
-
-    save: function(val = undefined) {
-        return SettingsStore.setValue(
-            this.props.name,
-            this.props.roomId,
-            this.props.level,
-            val !== undefined ? val : this.state.value,
-        );
-    },
-
-    render: function() {
-        const canChange = SettingsStore.canSetValue(this.props.name, this.props.roomId, this.props.level);
-
-        let label = this.props.label;
-        if (!label) label = SettingsStore.getDisplayName(this.props.name, this.props.level);
-        else label = _t(label);
-
-        return (
-            <div className="mx_SettingsFlag">
-                <span className="mx_SettingsFlag_label">{label}</span>
-                <ToggleSwitch checked={this.state.value} onChange={this.onChange} disabled={!canChange} aria-label={label} />
-            </div>
-        );
-    },
-});
diff --git a/src/components/views/elements/SettingsFlag.tsx b/src/components/views/elements/SettingsFlag.tsx
new file mode 100644
index 0000000000..03e91fac62
--- /dev/null
+++ b/src/components/views/elements/SettingsFlag.tsx
@@ -0,0 +1,104 @@
+/*
+Copyright 2017 Travis Ralston
+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 SettingsStore from "../../../settings/SettingsStore";
+import { _t } from '../../../languageHandler';
+import ToggleSwitch from "./ToggleSwitch";
+import StyledCheckbox from "./StyledCheckbox";
+import { SettingLevel } from "../../../settings/SettingLevel";
+
+interface IProps {
+    // The setting must be a boolean
+    name: string;
+    level: SettingLevel;
+    roomId?: string; // for per-room settings
+    label?: string; // untranslated
+    isExplicit?: boolean;
+    // XXX: once design replaces all toggles make this the default
+    useCheckbox?: boolean;
+    disabled?: boolean;
+    onChange?(checked: boolean): void;
+}
+
+interface IState {
+    value: boolean;
+}
+
+export default class SettingsFlag extends React.Component<IProps, IState> {
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            value: SettingsStore.getValueAt(
+                this.props.level,
+                this.props.name,
+                this.props.roomId,
+                this.props.isExplicit,
+            ),
+        };
+    }
+
+    private onChange = async (checked: boolean) => {
+        await this.save(checked);
+        this.setState({ value: checked });
+        if (this.props.onChange) this.props.onChange(checked);
+    };
+
+    private checkBoxOnChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+        this.onChange(e.target.checked);
+    };
+
+    private save = async (val?: boolean) => {
+        await SettingsStore.setValue(
+            this.props.name,
+            this.props.roomId,
+            this.props.level,
+            val !== undefined ? val : this.state.value,
+        );
+    };
+
+    public render() {
+        const canChange = SettingsStore.canSetValue(this.props.name, this.props.roomId, this.props.level);
+
+        let label = this.props.label;
+        if (!label) label = SettingsStore.getDisplayName(this.props.name, this.props.level);
+        else label = _t(label);
+
+        if (this.props.useCheckbox) {
+            return <StyledCheckbox
+                checked={this.state.value}
+                onChange={this.checkBoxOnChange}
+                disabled={this.props.disabled || !canChange}
+            >
+                {label}
+            </StyledCheckbox>;
+        } else {
+            return (
+                <div className="mx_SettingsFlag">
+                    <span className="mx_SettingsFlag_label">{label}</span>
+                    <ToggleSwitch
+                        checked={this.state.value}
+                        onChange={this.onChange}
+                        disabled={this.props.disabled || !canChange}
+                        aria-label={label}
+                    />
+                </div>
+            );
+        }
+    }
+}
diff --git a/src/components/views/elements/Slider.tsx b/src/components/views/elements/Slider.tsx
new file mode 100644
index 0000000000..a88c581d07
--- /dev/null
+++ b/src/components/views/elements/Slider.tsx
@@ -0,0 +1,146 @@
+/*
+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';
+
+interface IProps {
+    // A callback for the selected value
+    onSelectionChange: (value: number) => void;
+
+    // The current value of the slider
+    value: number;
+
+    // The range and values of the slider
+    // Currently only supports an ascending, constant interval range
+    values: number[];
+
+    // A function for formatting the the values
+    displayFunc: (value: number) => string;
+
+    // Whether the slider is disabled
+    disabled: boolean;
+}
+
+export default class Slider extends React.Component<IProps> {
+    // offset is a terrible inverse approximation.
+    // if the values represents some function f(x) = y where x is the
+    // index of the array and y = values[x] then offset(f, y) = x
+    // s.t f(x) = y.
+    // it assumes a monotonic function and interpolates linearly between
+    // y values.
+    // Offset is used for finding the location of a value on a
+    // non linear slider.
+    private offset(values: number[], value: number): number {
+        // the index of the first number greater than value.
+        let closest = values.reduce((prev, curr) => {
+            return (value > curr ? prev + 1 : prev);
+        }, 0);
+
+        // Off the left
+        if (closest === 0) {
+            return 0;
+        }
+
+        // Off the right
+        if (closest === values.length) {
+            return 100;
+        }
+
+        // Now
+        const closestLessValue = values[closest - 1];
+        const closestGreaterValue = values[closest];
+
+        const intervalWidth = 1 / (values.length - 1);
+
+        const linearInterpolation = (value - closestLessValue) / (closestGreaterValue - closestLessValue);
+
+        return 100 * (closest - 1 + linearInterpolation) * intervalWidth;
+
+    }
+
+    render(): React.ReactNode {
+        const dots = this.props.values.map(v =>
+            <Dot active={v <= this.props.value}
+                 label={this.props.displayFunc(v)}
+                 onClick={this.props.disabled ? () => {} : () => this.props.onSelectionChange(v)}
+                 key={v}
+                 disabled={this.props.disabled}
+            />);
+
+        let selection = null;
+
+        if (!this.props.disabled) {
+            const offset = this.offset(this.props.values, this.props.value);
+            selection = <div className="mx_Slider_selection">
+                <div className="mx_Slider_selectionDot" style={{left: "calc(-0.55em + " + offset + "%)"}} />
+                <hr style={{width: offset + "%"}} />
+            </div>;
+        }
+
+        return <div className="mx_Slider">
+            <div>
+                <div className="mx_Slider_bar">
+                    <hr onClick={this.props.disabled ? () => {} : this.onClick.bind(this)}/>
+                    { selection }
+                </div>
+                <div className="mx_Slider_dotContainer">
+                    {dots}
+                </div>
+            </div>
+        </div>;
+    }
+
+    onClick(event: React.MouseEvent) {
+        const width = (event.target as HTMLElement).clientWidth;
+        // nativeEvent is safe to use because https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/offsetX
+        // is supported by all modern browsers
+        const relativeClick = (event.nativeEvent.offsetX / width);
+        const nearestValue = this.props.values[Math.round(relativeClick * (this.props.values.length - 1))];
+        this.props.onSelectionChange(nearestValue);
+    }
+}
+
+interface IDotProps {
+    // Callback for behavior onclick
+    onClick: () => void;
+
+    // Whether the dot should appear active
+    active: boolean;
+
+    // The label on the dot
+    label: string;
+
+    // Whether the slider is disabled
+    disabled: boolean;
+}
+
+class Dot extends React.PureComponent<IDotProps> {
+    render(): React.ReactNode {
+        let className = "mx_Slider_dot";
+        if (!this.props.disabled && this.props.active) {
+            className += " mx_Slider_dotActive";
+        }
+
+        return <span onClick={this.props.onClick} className="mx_Slider_dotValue">
+            <div className={className} />
+            <div className="mx_Slider_labelContainer">
+                <div className="mx_Slider_label">
+                    {this.props.label}
+                </div>
+            </div>
+        </span>;
+    }
+}
diff --git a/src/components/views/elements/Spinner.js b/src/components/views/elements/Spinner.js
index b1fe97d5d2..4d2dcea90a 100644
--- a/src/components/views/elements/Spinner.js
+++ b/src/components/views/elements/Spinner.js
@@ -16,19 +16,36 @@ limitations under the License.
 */
 
 import React from "react";
-import createReactClass from 'create-react-class';
+import PropTypes from "prop-types";
+import {_t} from "../../../languageHandler";
+import SettingsStore from "../../../settings/SettingsStore";
 
-export default createReactClass({
-    displayName: 'Spinner',
+const Spinner = ({w = 32, h = 32, imgClassName, message}) => {
+    let imageSource;
+    if (SettingsStore.getValue('feature_new_spinner')) {
+        imageSource = require("../../../../res/img/spinner.svg");
+    } else {
+        imageSource = require("../../../../res/img/spinner.gif");
+    }
 
-    render: function() {
-        const w = this.props.w || 32;
-        const h = this.props.h || 32;
-        const imgClass = this.props.imgClassName || "";
-        return (
-            <div className="mx_Spinner">
-                <img src={require("../../../../res/img/spinner.gif")} width={w} height={h} className={imgClass} />
-            </div>
-        );
-    },
-});
+    return (
+        <div className="mx_Spinner">
+            { message && <React.Fragment><div className="mx_Spinner_Msg">{ message}</div>&nbsp;</React.Fragment> }
+            <img
+                src={imageSource}
+                width={w}
+                height={h}
+                className={imgClassName}
+                aria-label={_t("Loading...")}
+            />
+        </div>
+    );
+};
+Spinner.propTypes = {
+    w: PropTypes.number,
+    h: PropTypes.number,
+    imgClassName: PropTypes.string,
+    message: PropTypes.node,
+};
+
+export default Spinner;
diff --git a/src/components/views/elements/StyledCheckbox.tsx b/src/components/views/elements/StyledCheckbox.tsx
new file mode 100644
index 0000000000..be983828ff
--- /dev/null
+++ b/src/components/views/elements/StyledCheckbox.tsx
@@ -0,0 +1,56 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from "react";
+import { randomString } from "matrix-js-sdk/src/randomstring";
+
+const CHECK_BOX_SVG = require("../../../../res/img/feather-customised/check.svg");
+
+interface IProps extends React.InputHTMLAttributes<HTMLInputElement> {
+}
+
+interface IState {
+}
+
+export default class StyledCheckbox extends React.PureComponent<IProps, IState> {
+    private id: string;
+
+    public static readonly defaultProps = {
+        className: "",
+    };
+
+    constructor(props: IProps) {
+        super(props);
+        // 56^10 so unlikely chance of collision.
+        this.id = "checkbox_" + randomString(10);
+    }
+
+    public render() {
+        const { children, className, ...otherProps } = this.props;
+        return <span className={"mx_Checkbox " + className}>
+            <input id={this.id} {...otherProps} type="checkbox" />
+            <label htmlFor={this.id}>
+                {/* Using the div to center the image */}
+                <div className="mx_Checkbox_background">
+                    <img src={CHECK_BOX_SVG}/>
+                </div>
+                <div>
+                    { this.props.children }
+                </div>
+            </label>
+        </span>;
+    }
+}
\ No newline at end of file
diff --git a/src/components/views/elements/StyledRadioButton.tsx b/src/components/views/elements/StyledRadioButton.tsx
new file mode 100644
index 0000000000..2efd084861
--- /dev/null
+++ b/src/components/views/elements/StyledRadioButton.tsx
@@ -0,0 +1,51 @@
+/*
+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 classnames from 'classnames';
+
+interface IProps extends React.InputHTMLAttributes<HTMLInputElement> {
+    outlined?: boolean;
+}
+
+interface IState {
+}
+
+export default class StyledRadioButton extends React.PureComponent<IProps, IState> {
+    public static readonly defaultProps = {
+        className: '',
+    };
+
+    public render() {
+        const { children, className, disabled, outlined, ...otherProps } = this.props;
+        const _className = classnames(
+            'mx_RadioButton',
+            className,
+            {
+                "mx_RadioButton_disabled": disabled,
+                "mx_RadioButton_enabled": !disabled,
+                "mx_RadioButton_checked": this.props.checked,
+                "mx_RadioButton_outlined": outlined,
+            });
+        return <label className={_className}>
+            <input type='radio' disabled={disabled} {...otherProps} />
+            {/* Used to render the radio button circle */}
+            <div><div /></div>
+            <div className="mx_RadioButton_content">{children}</div>
+            <div className="mx_RadioButton_spacer" />
+        </label>;
+    }
+}
diff --git a/src/components/views/elements/StyledRadioGroup.tsx b/src/components/views/elements/StyledRadioGroup.tsx
new file mode 100644
index 0000000000..6b9e992f92
--- /dev/null
+++ b/src/components/views/elements/StyledRadioGroup.tsx
@@ -0,0 +1,63 @@
+/*
+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 classNames from "classnames";
+
+import StyledRadioButton from "./StyledRadioButton";
+
+interface IDefinition<T extends string> {
+    value: T;
+    className?: string;
+    disabled?: boolean;
+    label: React.ReactChild;
+    description?: React.ReactChild;
+    checked?: boolean; // If provided it will override the value comparison done in the group
+}
+
+interface IProps<T extends string> {
+    name: string;
+    className?: string;
+    definitions: IDefinition<T>[];
+    value?: T; // if not provided no options will be selected
+    outlined?: boolean;
+    onChange(newValue: T): void;
+}
+
+function StyledRadioGroup<T extends string>({name, definitions, value, className, outlined, onChange}: IProps<T>) {
+    const _onChange = e => {
+        onChange(e.target.value);
+    };
+
+    return <React.Fragment>
+        {definitions.map(d => <React.Fragment key={d.value}>
+            <StyledRadioButton
+                className={classNames(className, d.className)}
+                onChange={_onChange}
+                checked={d.checked !== undefined ? d.checked : d.value === value}
+                name={name}
+                value={d.value}
+                disabled={d.disabled}
+                outlined={outlined}
+            >
+                {d.label}
+            </StyledRadioButton>
+            {d.description}
+        </React.Fragment>)}
+    </React.Fragment>;
+}
+
+export default StyledRadioGroup;
diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index 2f182c261e..c59aaeefa4 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -16,20 +16,20 @@ 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 createReactClass from 'create-react-class';
 import classNames from 'classnames';
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import { isOnlyCtrlOrCmdIgnoreShiftKeyEvent } from '../../../Keyboard';
 import * as FormattingUtils from '../../../utils/FormattingUtils';
 
 import FlairStore from '../../../stores/FlairStore';
 import GroupStore from '../../../stores/GroupStore';
 import TagOrderStore from '../../../stores/TagOrderStore';
-import {ContextMenu, toRightOf} from "../../structures/ContextMenu";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import AccessibleButton from "./AccessibleButton";
 
 // A class for a child of TagPanel (possibly wrapped in a DNDTagTile) that represents
 // a thing to click on for the user to filter the visible rooms in the RoomList to:
@@ -43,6 +43,9 @@ export default createReactClass({
         // A string tag such as "m.favourite" or a group ID such as "+groupid:domain.bla"
         // For now, only group IDs are handled.
         tag: PropTypes.string,
+        contextMenuButtonRef: PropTypes.object,
+        openMenu: PropTypes.func,
+        menuDisplayed: PropTypes.bool,
     },
 
     statics: {
@@ -55,14 +58,10 @@ export default createReactClass({
             hover: false,
             // The profile data of the group if this.props.tag is a group ID
             profile: null,
-            // Whether or not the context menu is open
-            menuDisplayed: false,
         };
     },
 
     componentDidMount() {
-        this._contextMenuButton = createRef();
-
         this.unmounted = false;
         if (this.props.tag[0] === '+') {
             FlairStore.addListener('updateGroupProfile', this._onFlairStoreUpdated);
@@ -86,7 +85,7 @@ export default createReactClass({
             this.props.tag,
         ).then((profile) => {
             if (this.unmounted) return;
-            this.setState({profile});
+            this.setState({ profile });
         }).catch((err) => {
             console.warn('Could not fetch group profile for ' + this.props.tag, err);
         });
@@ -113,35 +112,26 @@ export default createReactClass({
     },
 
     onMouseOver: function() {
-        this.setState({hover: true});
+        this.setState({ hover: true });
     },
 
-    onMouseOut: function() {
-        this.setState({hover: false});
+    onMouseLeave: function() {
+        this.setState({ hover: false });
     },
 
     openMenu: function(e) {
         // Prevent the TagTile onClick event firing as well
         e.stopPropagation();
         e.preventDefault();
-
-        this.setState({
-            menuDisplayed: true,
-            hover: false,
-        });
-    },
-
-    closeMenu: function() {
-        this.setState({
-            menuDisplayed: false,
-        });
+        this.setState({ hover: false });
+        this.props.openMenu();
     },
 
     render: function() {
         const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
         const profile = this.state.profile || {};
         const name = profile.name || this.props.tag;
-        const avatarHeight = 40;
+        const avatarHeight = 32;
 
         const httpUrl = profile.avatarUrl ? this.context.mxcUrlToHttp(
             profile.avatarUrl, avatarHeight, avatarHeight, "crop",
@@ -154,7 +144,7 @@ export default createReactClass({
 
         const badge = TagOrderStore.getGroupBadge(this.props.tag);
         let badgeElement;
-        if (badge && !this.state.hover) {
+        if (badge && !this.state.hover && !this.props.menuDisplayed) {
             const badgeClasses = classNames({
                 "mx_TagTile_badge": true,
                 "mx_TagTile_badgeHighlight": badge.highlight,
@@ -162,40 +152,38 @@ export default createReactClass({
             badgeElement = (<div className={badgeClasses}>{FormattingUtils.formatCount(badge.count)}</div>);
         }
 
-        // FIXME: this ought to use AccessibleButton for a11y but that causes onMouseOut/onMouseOver to fire too much
-        const contextButton = this.state.hover || this.state.menuDisplayed ?
-            <div className="mx_TagTile_context_button" onClick={this.openMenu} ref={this._contextMenuButton}>
-                { "\u00B7\u00B7\u00B7" }
-            </div> : <div ref={this._contextMenuButton} />;
-
-        let contextMenu;
-        if (this.state.menuDisplayed) {
-            const elementRect = this._contextMenuButton.current.getBoundingClientRect();
-            const TagTileContextMenu = sdk.getComponent('context_menus.TagTileContextMenu');
-            contextMenu = (
-                <ContextMenu {...toRightOf(elementRect)} onFinished={this.closeMenu}>
-                    <TagTileContextMenu tag={this.props.tag} onFinished={this.closeMenu} />
-                </ContextMenu>
-            );
-        }
+        const contextButton = this.state.hover || this.props.menuDisplayed ?
+            <AccessibleButton
+                className="mx_TagTile_context_button"
+                onClick={this.openMenu}
+                inputRef={this.props.contextMenuButtonRef}
+            >
+                {"\u00B7\u00B7\u00B7"}
+            </AccessibleButton> : <div ref={this.props.contextMenuButtonRef} />;
 
         const AccessibleTooltipButton = sdk.getComponent("elements.AccessibleTooltipButton");
-        return <React.Fragment>
-            <AccessibleTooltipButton className={className} onClick={this.onClick} onContextMenu={this.openMenu} title={name}>
-                <div className="mx_TagTile_avatar" onMouseOver={this.onMouseOver} onMouseOut={this.onMouseOut}>
-                    <BaseAvatar
-                        name={name}
-                        idName={this.props.tag}
-                        url={httpUrl}
-                        width={avatarHeight}
-                        height={avatarHeight}
-                    />
-                    { contextButton }
-                    { badgeElement }
-                </div>
-            </AccessibleTooltipButton>
 
-            { contextMenu }
-        </React.Fragment>;
+        return <AccessibleTooltipButton
+            className={className}
+            onClick={this.onClick}
+            onContextMenu={this.openMenu}
+            title={name}
+        >
+            <div
+                className="mx_TagTile_avatar"
+                onMouseOver={this.onMouseOver}
+                onMouseLeave={this.onMouseLeave}
+            >
+                <BaseAvatar
+                    name={name}
+                    idName={this.props.tag}
+                    url={httpUrl}
+                    width={avatarHeight}
+                    height={avatarHeight}
+                />
+                {contextButton}
+                {badgeElement}
+            </div>
+        </AccessibleTooltipButton>;
     },
 });
diff --git a/src/components/views/elements/TextWithTooltip.js b/src/components/views/elements/TextWithTooltip.js
index c46bc3bfbb..b0405dc4c9 100644
--- a/src/components/views/elements/TextWithTooltip.js
+++ b/src/components/views/elements/TextWithTooltip.js
@@ -37,7 +37,7 @@ export default class TextWithTooltip extends React.Component {
         this.setState({hover: true});
     };
 
-    onMouseOut = () => {
+    onMouseLeave = () => {
         this.setState({hover: false});
     };
 
@@ -45,13 +45,12 @@ export default class TextWithTooltip extends React.Component {
         const Tooltip = sdk.getComponent("elements.Tooltip");
 
         return (
-            <span onMouseOver={this.onMouseOver} onMouseOut={this.onMouseOut} className={this.props.class}>
+            <span onMouseOver={this.onMouseOver} onMouseLeave={this.onMouseLeave} className={this.props.class}>
                 {this.props.children}
-                <Tooltip
+                {this.state.hover && <Tooltip
                     label={this.props.tooltip}
-                    visible={this.state.hover}
                     tooltipClassName={this.props.tooltipClass}
-                    className={"mx_TextWithTooltip_tooltip"} />
+                    className={"mx_TextWithTooltip_tooltip"} /> }
             </span>
         );
     }
diff --git a/src/components/views/elements/ToggleSwitch.js b/src/components/views/elements/ToggleSwitch.tsx
similarity index 83%
rename from src/components/views/elements/ToggleSwitch.js
rename to src/components/views/elements/ToggleSwitch.tsx
index bea1a85555..f05c45b3db 100644
--- a/src/components/views/elements/ToggleSwitch.js
+++ b/src/components/views/elements/ToggleSwitch.tsx
@@ -16,13 +16,23 @@ limitations under the License.
 */
 
 import React from "react";
-import PropTypes from "prop-types";
 import classNames from "classnames";
 import * as sdk from "../../../index";
 
+interface IProps {
+    // Whether or not this toggle is in the 'on' position.
+    checked: boolean;
+
+    // Whether or not the user can interact with the switch
+    disabled: boolean;
+
+    // Called when the checked state changes. First argument will be the new state.
+    onChange(checked: boolean): void;
+}
+
 // Controlled Toggle Switch element, written with Accessibility in mind
-const ToggleSwitch = ({checked, disabled=false, onChange, ...props}) => {
-    const _onClick = (e) => {
+export default ({checked, disabled = false, onChange, ...props}: IProps) => {
+    const _onClick = () => {
         if (disabled) return;
         onChange(!checked);
     };
@@ -46,16 +56,3 @@ const ToggleSwitch = ({checked, disabled=false, onChange, ...props}) => {
         </AccessibleButton>
     );
 };
-
-ToggleSwitch.propTypes = {
-    // Whether or not this toggle is in the 'on' position.
-    checked: PropTypes.bool.isRequired,
-
-    // Whether or not the user can interact with the switch
-    disabled: PropTypes.bool,
-
-    // Called when the checked state changes. First argument will be the new state.
-    onChange: PropTypes.func.isRequired,
-};
-
-export default ToggleSwitch;
diff --git a/src/components/views/elements/Tooltip.js b/src/components/views/elements/Tooltip.tsx
similarity index 65%
rename from src/components/views/elements/Tooltip.js
rename to src/components/views/elements/Tooltip.tsx
index fd845d9db3..6b71a1dbf5 100644
--- a/src/components/views/elements/Tooltip.js
+++ b/src/components/views/elements/Tooltip.tsx
@@ -2,7 +2,7 @@
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2019 New Vector Ltd
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -18,67 +18,60 @@ limitations under the License.
 */
 
 
-import React from 'react';
+import React, {Component, CSSProperties} from 'react';
 import ReactDOM from 'react-dom';
-import PropTypes from 'prop-types';
-import createReactClass from 'create-react-class';
-import dis from '../../../dispatcher';
 import classNames from 'classnames';
 
 const MIN_TOOLTIP_HEIGHT = 25;
 
-export default createReactClass({
-    displayName: 'Tooltip',
-
-    propTypes: {
+interface IProps {
         // Class applied to the element used to position the tooltip
-        className: PropTypes.string,
+        className?: string;
         // Class applied to the tooltip itself
-        tooltipClassName: PropTypes.string,
+        tooltipClassName?: string;
         // Whether the tooltip is visible or hidden.
         // The hidden state allows animating the tooltip away via CSS.
         // Defaults to visible if unset.
-        visible: PropTypes.bool,
+        visible?: boolean;
         // the react element to put into the tooltip
-        label: PropTypes.node,
-    },
+        label: React.ReactNode;
+        forceOnRight?: boolean;
+}
 
-    getDefaultProps() {
-        return {
-            visible: true,
-        };
-    },
+export default class Tooltip extends React.Component<IProps> {
+    private tooltipContainer: HTMLElement;
+    private tooltip: void | Element | Component<Element, any, any>;
+    private parent: Element;
+
+
+    public static readonly defaultProps = {
+        visible: true,
+    };
 
     // Create a wrapper for the tooltip outside the parent and attach it to the body element
-    componentDidMount: function() {
+    public componentDidMount() {
         this.tooltipContainer = document.createElement("div");
         this.tooltipContainer.className = "mx_Tooltip_wrapper";
         document.body.appendChild(this.tooltipContainer);
-        window.addEventListener('scroll', this._renderTooltip, true);
+        window.addEventListener('scroll', this.renderTooltip, true);
 
-        this.parent = ReactDOM.findDOMNode(this).parentNode;
+        this.parent = ReactDOM.findDOMNode(this).parentNode as Element;
 
-        this._renderTooltip();
-    },
+        this.renderTooltip();
+    }
 
-    componentDidUpdate: function() {
-        this._renderTooltip();
-    },
+    public componentDidUpdate() {
+        this.renderTooltip();
+    }
 
     // Remove the wrapper element, as the tooltip has finished using it
-    componentWillUnmount: function() {
-        dis.dispatch({
-            action: 'view_tooltip',
-            tooltip: null,
-            parent: null,
-        });
-
+    public componentWillUnmount() {
         ReactDOM.unmountComponentAtNode(this.tooltipContainer);
         document.body.removeChild(this.tooltipContainer);
-        window.removeEventListener('scroll', this._renderTooltip, true);
-    },
+        window.removeEventListener('scroll', this.renderTooltip, true);
+    }
 
-    _updatePosition(style) {
+    private updatePosition(style: CSSProperties) {
         const parentBox = this.parent.getBoundingClientRect();
         let offset = 0;
         if (parentBox.height > MIN_TOOLTIP_HEIGHT) {
@@ -88,19 +81,23 @@ export default createReactClass({
             // we need so that we're still centered.
             offset = Math.floor(parentBox.height - MIN_TOOLTIP_HEIGHT);
         }
-        style.top = (parentBox.top - 2) + window.pageYOffset + offset;
-        style.left = 6 + parentBox.right + window.pageXOffset;
-        return style;
-    },
 
-    _renderTooltip: function() {
+        style.top = (parentBox.top - 2) + window.pageYOffset + offset;
+        if (!this.props.forceOnRight && parentBox.right > window.innerWidth / 2) {
+            style.right = window.innerWidth - parentBox.right - window.pageXOffset - 8;
+        } else {
+            style.left = parentBox.right + window.pageXOffset + 6;
+        }
+
+        return style;
+    }
+
+    private renderTooltip = () => {
         // Add the parent's position to the tooltips, so it's correctly
         // positioned, also taking into account any window zoom
         // NOTE: The additional 6 pixels for the left position, is to take account of the
         // tooltips chevron
-        const parent = ReactDOM.findDOMNode(this).parentNode;
-        let style = {};
-        style = this._updatePosition(style);
+        const style = this.updatePosition({});
         // Hide the entire container when not visible. This prevents flashing of the tooltip
         // if it is not meant to be visible on first mount.
         style.display = this.props.visible ? "block" : "none";
@@ -118,21 +115,14 @@ export default createReactClass({
         );
 
         // Render the tooltip manually, as we wish it not to be rendered within the parent
-        this.tooltip = ReactDOM.render(tooltip, this.tooltipContainer);
+        this.tooltip = ReactDOM.render<Element>(tooltip, this.tooltipContainer);
+    };
 
-        // Tell the roomlist about us so it can manipulate us if it wishes
-        dis.dispatch({
-            action: 'view_tooltip',
-            tooltip: this.tooltip,
-            parent: parent,
-        });
-    },
-
-    render: function() {
+    public render() {
         // Render a placeholder
         return (
-            <div className={this.props.className} >
+            <div className={this.props.className}>
             </div>
         );
-    },
-});
+    }
+}
diff --git a/src/components/views/elements/TooltipButton.js b/src/components/views/elements/TooltipButton.js
index a32044873b..5c8d53fbcc 100644
--- a/src/components/views/elements/TooltipButton.js
+++ b/src/components/views/elements/TooltipButton.js
@@ -34,7 +34,7 @@ export default createReactClass({
         });
     },
 
-    onMouseOut: function() {
+    onMouseLeave: function() {
         this.setState({
             hover: false,
         });
@@ -48,7 +48,7 @@ export default createReactClass({
             label={this.props.helpText}
         /> : <div />;
         return (
-            <div className="mx_TooltipButton" onMouseOver={this.onMouseOver} onMouseOut={this.onMouseOut} >
+            <div className="mx_TooltipButton" onMouseOver={this.onMouseOver} onMouseLeave={this.onMouseLeave}>
                 ?
                 { tip }
             </div>
diff --git a/src/components/views/elements/Validation.js b/src/components/views/elements/Validation.tsx
similarity index 85%
rename from src/components/views/elements/Validation.js
rename to src/components/views/elements/Validation.tsx
index 2be526a3c3..50544c9f51 100644
--- a/src/components/views/elements/Validation.js
+++ b/src/components/views/elements/Validation.tsx
@@ -1,5 +1,6 @@
 /*
 Copyright 2019 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,11 +16,39 @@ limitations under the License.
 */
 
 /* eslint-disable babel/no-invalid-this */
+import React from "react";
+import classNames from "classnames";
 
-import classNames from 'classnames';
+type Data = Pick<IFieldState, "value" | "allowEmpty">;
+
+interface IRule<T> {
+    key: string;
+    final?: boolean;
+    skip?(this: T, data: Data): boolean;
+    test(this: T, data: Data): boolean | Promise<boolean>;
+    valid?(this: T): string;
+    invalid?(this: T): string;
+}
+
+interface IArgs<T> {
+    rules: IRule<T>[];
+    description(this: T): React.ReactChild;
+}
+
+export interface IFieldState {
+    value: string;
+    focused: boolean;
+    allowEmpty: boolean;
+}
+
+export interface IValidationResult {
+    valid?: boolean;
+    feedback?: React.ReactChild;
+}
 
 /**
  * Creates a validation function from a set of rules describing what to validate.
+ * Generic T is the "this" type passed to the rule methods
  *
  * @param {Function} description
  *     Function that returns a string summary of the kind of value that will
@@ -37,8 +66,8 @@ import classNames from 'classnames';
  *     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({ description, rules }) {
-    return async function onValidate({ value, focused, allowEmpty = true }) {
+export default function withValidation<T = undefined>({ description, rules }: IArgs<T>) {
+    return async function onValidate({ value, focused, allowEmpty = true }: IFieldState): Promise<IValidationResult> {
         if (!value && allowEmpty) {
             return {
                 valid: null,
diff --git a/src/components/views/elements/crypto/VerificationQRCode.js b/src/components/views/elements/crypto/VerificationQRCode.js
index 08cd0c772e..3bbfb004c6 100644
--- a/src/components/views/elements/crypto/VerificationQRCode.js
+++ b/src/components/views/elements/crypto/VerificationQRCode.js
@@ -17,8 +17,7 @@ limitations under the License.
 import React from "react";
 import PropTypes from "prop-types";
 import {replaceableComponent} from "../../../../utils/replaceableComponent";
-import Spinner from "../Spinner";
-import * as QRCode from "qrcode";
+import QRCode from "../QRCode";
 
 @replaceableComponent("views.elements.crypto.VerificationQRCode")
 export default class VerificationQRCode extends React.PureComponent {
@@ -26,33 +25,12 @@ export default class VerificationQRCode extends React.PureComponent {
         qrCodeData: PropTypes.object.isRequired,
     };
 
-    constructor(props) {
-        super(props);
-        this.state = {
-            dataUri: null,
-        };
-        this.generateQrCode();
-    }
-
-    componentDidUpdate(prevProps): void {
-        if (JSON.stringify(this.props) === JSON.stringify(prevProps)) return; // No prop change
-
-        this.generateQRCode();
-    }
-
-    async generateQrCode() {
-        // Now actually assemble the QR code's data URI
-        const uri = await QRCode.toDataURL([{data: this.props.qrCodeData.buffer, mode: 'byte'}], {
-            errorCorrectionLevel: 'L', // we want it as trivial-looking as possible
-        });
-        this.setState({dataUri: uri});
-    }
-
     render() {
-        if (!this.state.dataUri) {
-            return <div className='mx_VerificationQRCode'><Spinner /></div>;
-        }
-
-        return <img src={this.state.dataUri} className='mx_VerificationQRCode' />;
+        return (
+            <QRCode
+                data={[{data: this.props.qrCodeData.buffer, mode: 'byte'}]}
+                className="mx_VerificationQRCode"
+                width={196} />
+        );
     }
 }
diff --git a/src/components/views/emojipicker/Category.js b/src/components/views/emojipicker/Category.js
index 3c4352105e..eb3f83dcdf 100644
--- a/src/components/views/emojipicker/Category.js
+++ b/src/components/views/emojipicker/Category.js
@@ -67,7 +67,13 @@ class Category extends React.PureComponent {
         const localScrollTop = Math.max(0, scrollTop - listTop);
 
         return (
-            <section className="mx_EmojiPicker_category" data-category-id={this.props.id}>
+            <section
+                id={`mx_EmojiPicker_category_${this.props.id}`}
+                className="mx_EmojiPicker_category"
+                data-category-id={this.props.id}
+                role="tabpanel"
+                aria-label={name}
+            >
                 <h2 className="mx_EmojiPicker_category_label">
                     {name}
                 </h2>
diff --git a/src/components/views/emojipicker/Emoji.js b/src/components/views/emojipicker/Emoji.js
index 75f23c5761..36aa4ff782 100644
--- a/src/components/views/emojipicker/Emoji.js
+++ b/src/components/views/emojipicker/Emoji.js
@@ -16,6 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
+import {MenuItem} from "../../structures/ContextMenu";
 
 class Emoji extends React.PureComponent {
     static propTypes = {
@@ -30,14 +31,18 @@ class Emoji extends React.PureComponent {
         const { onClick, onMouseEnter, onMouseLeave, emoji, selectedEmojis } = this.props;
         const isSelected = selectedEmojis && selectedEmojis.has(emoji.unicode);
         return (
-            <li onClick={() => onClick(emoji)}
+            <MenuItem
+                element="li"
+                onClick={() => onClick(emoji)}
                 onMouseEnter={() => onMouseEnter(emoji)}
                 onMouseLeave={() => onMouseLeave(emoji)}
-                className="mx_EmojiPicker_item_wrapper">
+                className="mx_EmojiPicker_item_wrapper"
+                label={emoji.unicode}
+            >
                 <div className={`mx_EmojiPicker_item ${isSelected ? 'mx_EmojiPicker_item_selected' : ''}`}>
                     {emoji.unicode}
                 </div>
-            </li>
+            </MenuItem>
         );
     }
 }
diff --git a/src/components/views/emojipicker/EmojiPicker.js b/src/components/views/emojipicker/EmojiPicker.js
index cacc15a5f9..16a0fc67e7 100644
--- a/src/components/views/emojipicker/EmojiPicker.js
+++ b/src/components/views/emojipicker/EmojiPicker.js
@@ -147,8 +147,12 @@ class EmojiPicker extends React.Component {
             // We update this here instead of through React to avoid re-render on scroll.
             if (cat.visible) {
                 cat.ref.current.classList.add("mx_EmojiPicker_anchor_visible");
+                cat.ref.current.setAttribute("aria-selected", true);
+                cat.ref.current.setAttribute("tabindex", 0);
             } else {
                 cat.ref.current.classList.remove("mx_EmojiPicker_anchor_visible");
+                cat.ref.current.setAttribute("aria-selected", false);
+                cat.ref.current.setAttribute("tabindex", -1);
             }
         }
     }
diff --git a/src/components/views/emojipicker/Header.js b/src/components/views/emojipicker/Header.js
index b98e90e9b1..c53437e02d 100644
--- a/src/components/views/emojipicker/Header.js
+++ b/src/components/views/emojipicker/Header.js
@@ -16,23 +16,89 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
+import classNames from "classnames";
+
+import {_t} from "../../../languageHandler";
+import {Key} from "../../../Keyboard";
 
 class Header extends React.PureComponent {
     static propTypes = {
         categories: PropTypes.arrayOf(PropTypes.object).isRequired,
         onAnchorClick: PropTypes.func.isRequired,
-        refs: PropTypes.object,
+    };
+
+    findNearestEnabled(index, delta) {
+        index += this.props.categories.length;
+        const cats = [...this.props.categories, ...this.props.categories, ...this.props.categories];
+
+        while (index < cats.length && index >= 0) {
+            if (cats[index].enabled) return index % this.props.categories.length;
+            index += delta > 0 ? 1 : -1;
+        }
+    }
+
+    changeCategoryRelative(delta) {
+        const current = this.props.categories.findIndex(c => c.visible);
+        this.changeCategoryAbsolute(current + delta, delta);
+    }
+
+    changeCategoryAbsolute(index, delta=1) {
+        const category = this.props.categories[this.findNearestEnabled(index, delta)];
+        if (category) {
+            this.props.onAnchorClick(category.id);
+            category.ref.current.focus();
+        }
+    }
+
+    // Implements ARIA Tabs with Automatic Activation pattern
+    // https://www.w3.org/TR/wai-aria-practices/examples/tabs/tabs-1/tabs.html
+    onKeyDown = (ev) => {
+        let handled = true;
+        switch (ev.key) {
+            case Key.ARROW_LEFT:
+                this.changeCategoryRelative(-1);
+                break;
+            case Key.ARROW_RIGHT:
+                this.changeCategoryRelative(1);
+                break;
+
+            case Key.HOME:
+                this.changeCategoryAbsolute(0);
+                break;
+            case Key.END:
+                this.changeCategoryAbsolute(this.props.categories.length - 1, -1);
+                break;
+            default:
+                handled = false;
+        }
+
+        if (handled) {
+            ev.preventDefault();
+            ev.stopPropagation();
+        }
     };
 
     render() {
         return (
-            <nav className="mx_EmojiPicker_header">
-                {this.props.categories.map(category => (
-                    <button disabled={!category.enabled} key={category.id} ref={category.ref}
-                        className={`mx_EmojiPicker_anchor ${category.visible ? 'mx_EmojiPicker_anchor_visible' : ''}
-                            mx_EmojiPicker_anchor_${category.id}`}
-                        onClick={() => this.props.onAnchorClick(category.id)} title={category.name} />
-                ))}
+            <nav className="mx_EmojiPicker_header" role="tablist" aria-label={_t("Categories")} onKeyDown={this.onKeyDown}>
+                {this.props.categories.map(category => {
+                    const classes = classNames(`mx_EmojiPicker_anchor mx_EmojiPicker_anchor_${category.id}`, {
+                        mx_EmojiPicker_anchor_visible: category.visible,
+                    });
+                    // Properties of this button are also modified by EmojiPicker's updateVisibility in DOM.
+                    return <button
+                        disabled={!category.enabled}
+                        key={category.id}
+                        ref={category.ref}
+                        className={classes}
+                        onClick={() => this.props.onAnchorClick(category.id)}
+                        title={category.name}
+                        role="tab"
+                        tabIndex={category.visible ? 0 : -1} // roving
+                        aria-selected={category.visible}
+                        aria-controls={`mx_EmojiPicker_category_${category.id}`}
+                    />;
+                })}
             </nav>
         );
     }
diff --git a/src/components/views/emojipicker/QuickReactions.js b/src/components/views/emojipicker/QuickReactions.js
index 0bc799d356..2f30ae767e 100644
--- a/src/components/views/emojipicker/QuickReactions.js
+++ b/src/components/views/emojipicker/QuickReactions.js
@@ -27,8 +27,7 @@ const QUICK_REACTIONS = ["👍", "👎", "😄", "🎉", "😕", "❤️", "🚀
     if (!data) {
         throw new Error(`Emoji ${emoji} doesn't exist in emojibase`);
     }
-    // Prefer our unicode value for quick reactions as we sometimes use variation selectors.
-    return Object.assign({}, data, { unicode: emoji });
+    return data;
 });
 
 class QuickReactions extends React.Component {
@@ -72,7 +71,7 @@ class QuickReactions extends React.Component {
                         </React.Fragment>
                     }
                 </h2>
-                <ul className="mx_EmojiPicker_list">
+                <ul className="mx_EmojiPicker_list" aria-label={_t("Quick Reactions")}>
                     {QUICK_REACTIONS.map(emoji => <Emoji
                         key={emoji.hexcode} emoji={emoji} onClick={this.props.onClick}
                         onMouseEnter={this.onMouseEnter} onMouseLeave={this.onMouseLeave}
diff --git a/src/components/views/emojipicker/ReactionPicker.js b/src/components/views/emojipicker/ReactionPicker.js
index 96894e18d2..6f8cc46c40 100644
--- a/src/components/views/emojipicker/ReactionPicker.js
+++ b/src/components/views/emojipicker/ReactionPicker.js
@@ -18,6 +18,7 @@ import React from 'react';
 import PropTypes from "prop-types";
 import EmojiPicker from "./EmojiPicker";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import dis from "../../../dispatcher/dispatcher";
 
 class ReactionPicker extends React.Component {
     static propTypes = {
@@ -105,6 +106,7 @@ class ReactionPicker extends React.Component {
                     "key": reaction,
                 },
             });
+            dis.dispatch({action: "message_sent"});
             return true;
         }
     }
diff --git a/src/components/views/globals/CookieBar.js b/src/components/views/globals/CookieBar.js
deleted file mode 100644
index 8774e4f1fa..0000000000
--- a/src/components/views/globals/CookieBar.js
+++ /dev/null
@@ -1,103 +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 PropTypes from 'prop-types';
-import dis from '../../../dispatcher';
-import { _t } from '../../../languageHandler';
-import * as sdk from '../../../index';
-import Analytics from '../../../Analytics';
-
-export default class CookieBar extends React.Component {
-    static propTypes = {
-        policyUrl: PropTypes.string,
-    }
-
-    constructor() {
-        super();
-    }
-
-    onUsageDataClicked(e) {
-        e.stopPropagation();
-        e.preventDefault();
-        Analytics.showDetailsModal();
-    }
-
-    onAccept() {
-        dis.dispatch({
-            action: 'accept_cookies',
-        });
-    }
-
-    onReject() {
-        dis.dispatch({
-            action: 'reject_cookies',
-        });
-    }
-
-    render() {
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        const toolbarClasses = "mx_MatrixToolbar";
-        return (
-            <div className={toolbarClasses}>
-                <img className="mx_MatrixToolbar_warning" src={require("../../../../res/img/warning.svg")} width="24" height="23" alt="" />
-                <div className="mx_MatrixToolbar_content">
-                    { this.props.policyUrl ? _t(
-                        "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. " +
-                        "This will use a cookie " +
-                        "(please see our <PolicyLink>Cookie Policy</PolicyLink>).",
-                        {},
-                        {
-                            'UsageDataLink': (sub) => <a
-                                className="mx_MatrixToolbar_link"
-                                onClick={this.onUsageDataClicked}
-                            >
-                                { sub }
-                            </a>,
-                            // XXX: We need to link to the page that explains our cookies
-                            'PolicyLink': (sub) => <a
-                                    className="mx_MatrixToolbar_link"
-                                    target="_blank"
-                                    href={this.props.policyUrl}
-                                >
-                                    { sub }
-                                </a>
-                            ,
-                        },
-                    ) : _t(
-                        "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. " +
-                        "This will use a cookie.",
-                        {},
-                        {
-                            'UsageDataLink': (sub) => <a
-                                className="mx_MatrixToolbar_link"
-                                onClick={this.onUsageDataClicked}
-                            >
-                                { sub }
-                            </a>,
-                        },
-                    ) }
-                </div>
-                <AccessibleButton element='button' className="mx_MatrixToolbar_action" onClick={this.onAccept}>
-                    { _t("Yes, I want to help!") }
-                </AccessibleButton>
-                <AccessibleButton className="mx_MatrixToolbar_close" onClick={this.onReject}>
-                    <img src={require("../../../../res/img/cancel.svg")} width="18" height="18" alt={_t('Close')} />
-                </AccessibleButton>
-            </div>
-        );
-    }
-}
diff --git a/src/components/views/globals/MatrixToolbar.js b/src/components/views/globals/MatrixToolbar.js
deleted file mode 100644
index 758e4d62aa..0000000000
--- a/src/components/views/globals/MatrixToolbar.js
+++ /dev/null
@@ -1,45 +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 createReactClass from 'create-react-class';
-import { _t } from '../../../languageHandler';
-import Notifier from '../../../Notifier';
-import AccessibleButton from '../../../components/views/elements/AccessibleButton';
-
-export default createReactClass({
-    displayName: 'MatrixToolbar',
-
-    hideToolbar: function() {
-        Notifier.setToolbarHidden(true);
-    },
-
-    onClick: function() {
-        Notifier.setEnabled(true);
-    },
-
-    render: function() {
-        return (
-            <div className="mx_MatrixToolbar">
-                <img className="mx_MatrixToolbar_warning" src={require("../../../../res/img/warning.svg")} width="24" height="23" alt="" />
-                <div className="mx_MatrixToolbar_content">
-                   { _t('You are not receiving desktop notifications') } <a className="mx_MatrixToolbar_link" onClick={ this.onClick }> { _t('Enable them now') }</a>
-                </div>
-                <AccessibleButton className="mx_MatrixToolbar_close" onClick={ this.hideToolbar } ><img src={require("../../../../res/img/cancel.svg")} width="18" height="18" alt={_t('Close')} /></AccessibleButton>
-            </div>
-        );
-    },
-});
diff --git a/src/components/views/globals/NewVersionBar.js b/src/components/views/globals/NewVersionBar.js
deleted file mode 100644
index dedccdc6b6..0000000000
--- a/src/components/views/globals/NewVersionBar.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import createReactClass from 'create-react-class';
-import * as sdk from '../../../index';
-import Modal from '../../../Modal';
-import PlatformPeg from '../../../PlatformPeg';
-import { _t } from '../../../languageHandler';
-
-/**
- * Check a version string is compatible with the Changelog
- * dialog ([vectorversion]-react-[react-sdk-version]-js-[js-sdk-version])
- */
-function checkVersion(ver) {
-    const parts = ver.split('-');
-    return parts.length == 5 && parts[1] == 'react' && parts[3] == 'js';
-}
-
-export default createReactClass({
-    propTypes: {
-        version: PropTypes.string.isRequired,
-        newVersion: PropTypes.string.isRequired,
-        releaseNotes: PropTypes.string,
-    },
-
-    displayReleaseNotes: function(releaseNotes) {
-        const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog');
-        Modal.createTrackedDialog('Display release notes', '', QuestionDialog, {
-            title: _t("What's New"),
-            description: <div className="mx_MatrixToolbar_changelog">{releaseNotes}</div>,
-            button: _t("Update"),
-            onFinished: (update) => {
-                if (update && PlatformPeg.get()) {
-                    PlatformPeg.get().installUpdate();
-                }
-            },
-        });
-    },
-
-    displayChangelog: function() {
-        const ChangelogDialog = sdk.getComponent('dialogs.ChangelogDialog');
-        Modal.createTrackedDialog('Display Changelog', '', ChangelogDialog, {
-            version: this.props.version,
-            newVersion: this.props.newVersion,
-            onFinished: (update) => {
-                if (update && PlatformPeg.get()) {
-                    PlatformPeg.get().installUpdate();
-                }
-            },
-        });
-    },
-
-    onUpdateClicked: function() {
-        PlatformPeg.get().installUpdate();
-    },
-
-    render: function() {
-        let action_button;
-        // If we have release notes to display, we display them. Otherwise,
-        // we display the Changelog Dialog which takes two versions and
-        // automatically tells you what's changed (provided the versions
-        // are in the right format)
-        if (this.props.releaseNotes) {
-            action_button = (
-                <button className="mx_MatrixToolbar_action" onClick={this.displayReleaseNotes}>
-                    { _t("What's new?") }
-                </button>
-            );
-        } else if (checkVersion(this.props.version) && checkVersion(this.props.newVersion)) {
-            action_button = (
-                <button className="mx_MatrixToolbar_action" onClick={this.displayChangelog}>
-                    { _t("What's new?") }
-                </button>
-            );
-        } else if (PlatformPeg.get()) {
-            action_button = (
-                <button className="mx_MatrixToolbar_action" onClick={this.onUpdateClicked}>
-                    { _t("Update") }
-                </button>
-            );
-        }
-        return (
-            <div className="mx_MatrixToolbar">
-                <img className="mx_MatrixToolbar_warning" src={require("../../../../res/img/warning.svg")} width="24" height="23" alt="" />
-                <div className="mx_MatrixToolbar_content">
-                    {_t("A new version of Riot is available.")}
-                </div>
-                {action_button}
-            </div>
-        );
-    },
-});
diff --git a/src/components/views/globals/PasswordNagBar.js b/src/components/views/globals/PasswordNagBar.js
deleted file mode 100644
index 74735ca5ea..0000000000
--- a/src/components/views/globals/PasswordNagBar.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-Copyright 2017 Vector Creations Ltd
-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 createReactClass from 'create-react-class';
-import * as sdk from '../../../index';
-import Modal from '../../../Modal';
-import { _t } from '../../../languageHandler';
-
-export default createReactClass({
-    onUpdateClicked: function() {
-        const SetPasswordDialog = sdk.getComponent('dialogs.SetPasswordDialog');
-        Modal.createTrackedDialog('Set Password Dialog', 'Password Nag Bar', SetPasswordDialog);
-    },
-
-    render: function() {
-        const toolbarClasses = "mx_MatrixToolbar mx_MatrixToolbar_clickable";
-        return (
-            <div className={toolbarClasses} onClick={this.onUpdateClicked}>
-                <img className="mx_MatrixToolbar_warning"
-                    src={require("../../../../res/img/warning.svg")}
-                    width="24"
-                    height="23"
-                    alt=""
-                />
-                <div className="mx_MatrixToolbar_content">
-                    { _t(
-                        "To return to your account in future you need to <u>set a password</u>",
-                        {},
-                        { 'u': (sub) => <u>{ sub }</u> },
-                    ) }
-                </div>
-                <button className="mx_MatrixToolbar_action">
-                    { _t("Set Password") }
-                </button>
-            </div>
-        );
-    },
-});
diff --git a/src/components/views/globals/ServerLimitBar.js b/src/components/views/globals/ServerLimitBar.js
deleted file mode 100644
index 7d414a2826..0000000000
--- a/src/components/views/globals/ServerLimitBar.js
+++ /dev/null
@@ -1,99 +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 PropTypes from 'prop-types';
-import createReactClass from 'create-react-class';
-import classNames from 'classnames';
-import { _td } from '../../../languageHandler';
-import { messageForResourceLimitError } from '../../../utils/ErrorUtils';
-
-export default createReactClass({
-    propTypes: {
-        // 'hard' if the logged in user has been locked out, 'soft' if they haven't
-        kind: PropTypes.string,
-        adminContact: PropTypes.string,
-        // The type of limit that has been hit.
-        limitType: PropTypes.string.isRequired,
-    },
-
-    getDefaultProps: function() {
-        return {
-            kind: 'hard',
-        };
-    },
-
-    render: function() {
-        const toolbarClasses = {
-            'mx_MatrixToolbar': true,
-        };
-
-        let adminContact;
-        let limitError;
-        if (this.props.kind === 'hard') {
-            toolbarClasses['mx_MatrixToolbar_error'] = true;
-
-            adminContact = messageForResourceLimitError(
-                this.props.limitType,
-                this.props.adminContact,
-                {
-                    '': _td("Please <a>contact your service administrator</a> to continue using the service."),
-                },
-            );
-            limitError = messageForResourceLimitError(
-                this.props.limitType,
-                this.props.adminContact,
-                {
-                    'monthly_active_user': _td("This homeserver has hit its Monthly Active User limit."),
-                    '': _td("This homeserver has exceeded one of its resource limits."),
-                },
-            );
-        } else {
-            toolbarClasses['mx_MatrixToolbar_info'] = true;
-            adminContact = messageForResourceLimitError(
-                this.props.limitType,
-                this.props.adminContact,
-                {
-                    '': _td("Please <a>contact your service administrator</a> to get this limit increased."),
-                },
-            );
-            limitError = messageForResourceLimitError(
-                this.props.limitType,
-                this.props.adminContact,
-                {
-                    'monthly_active_user': _td(
-                        "This homeserver has hit its Monthly Active User limit so " +
-                        "<b>some users will not be able to log in</b>.",
-                    ),
-                    '': _td(
-                        "This homeserver has exceeded one of its resource limits so " +
-                        "<b>some users will not be able to log in</b>.",
-                    ),
-                },
-                {'b': sub => <b>{sub}</b>},
-            );
-        }
-        return (
-            <div className={classNames(toolbarClasses)}>
-                <div className="mx_MatrixToolbar_content">
-                    {limitError}
-                    {' '}
-                    {adminContact}
-                </div>
-            </div>
-        );
-    },
-});
diff --git a/src/components/views/globals/UpdateCheckBar.js b/src/components/views/globals/UpdateCheckBar.js
deleted file mode 100644
index 32b38ff5b0..0000000000
--- a/src/components/views/globals/UpdateCheckBar.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-Copyright 2017, 2019 Michael Telatynski <7t3chguy@gmail.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import createReactClass from 'create-react-class';
-import { _t } from '../../../languageHandler';
-import PlatformPeg from '../../../PlatformPeg';
-import AccessibleButton from '../../../components/views/elements/AccessibleButton';
-
-export default createReactClass({
-    propTypes: {
-        status: PropTypes.string.isRequired,
-        // Currently for error detail but will be usable for download progress
-        // once that is a thing that squirrel passes through electron.
-        detail: PropTypes.string,
-    },
-
-    getDefaultProps: function() {
-        return {
-            detail: '',
-        };
-    },
-
-    getStatusText: function() {
-        // we can't import the enum from riot-web as we don't want matrix-react-sdk
-        // to depend on riot-web. so we grab it as a normal object via API instead.
-        const updateCheckStatusEnum = PlatformPeg.get().getUpdateCheckStatusEnum();
-        switch (this.props.status) {
-            case updateCheckStatusEnum.ERROR:
-                return _t('Error encountered (%(errorDetail)s).', { errorDetail: this.props.detail });
-            case updateCheckStatusEnum.CHECKING:
-                return _t('Checking for an update...');
-            case updateCheckStatusEnum.NOTAVAILABLE:
-                return _t('No update available.');
-            case updateCheckStatusEnum.DOWNLOADING:
-                return _t('Downloading update...');
-        }
-    },
-
-    hideToolbar: function() {
-        PlatformPeg.get().stopUpdateCheck();
-    },
-
-    render: function() {
-        const message = this.getStatusText();
-        const warning = _t('Warning');
-
-        if (!('getUpdateCheckStatusEnum' in PlatformPeg.get())) {
-            return <div></div>;
-        }
-
-        const updateCheckStatusEnum = PlatformPeg.get().getUpdateCheckStatusEnum();
-        const doneStatuses = [
-            updateCheckStatusEnum.ERROR,
-            updateCheckStatusEnum.NOTAVAILABLE,
-        ];
-
-        let image;
-        if (doneStatuses.includes(this.props.status)) {
-            image = <img className="mx_MatrixToolbar_warning" src={require("../../../../res/img/warning.svg")} width="24" height="23" alt="" />;
-        } else {
-            image = <img className="mx_MatrixToolbar_warning" src={require("../../../../res/img/spinner.gif")} width="24" height="23" alt="" />;
-        }
-
-        return (
-            <div className="mx_MatrixToolbar">
-                {image}
-                <div className="mx_MatrixToolbar_content">
-                    {message}
-                </div>
-                <AccessibleButton className="mx_MatrixToolbar_close" onClick={this.hideToolbar}>
-                    <img src={require("../../../../res/img/cancel.svg")} width="18" height="18" alt={_t('Close')} />
-                </AccessibleButton>
-            </div>
-        );
-    },
-});
diff --git a/src/components/views/groups/GroupInviteTile.js b/src/components/views/groups/GroupInviteTile.js
index 91c930525d..bc5334f2de 100644
--- a/src/components/views/groups/GroupInviteTile.js
+++ b/src/components/views/groups/GroupInviteTile.js
@@ -20,7 +20,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import {_t} from '../../../languageHandler';
 import classNames from 'classnames';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
diff --git a/src/components/views/groups/GroupMemberInfo.js b/src/components/views/groups/GroupMemberInfo.js
deleted file mode 100644
index 9f5660386b..0000000000
--- a/src/components/views/groups/GroupMemberInfo.js
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
-Copyright 2017 Vector Creations Ltd
-Copyright 2017 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 createReactClass from 'create-react-class';
-import dis from '../../../dispatcher';
-import Modal from '../../../Modal';
-import * as sdk from '../../../index';
-import { _t } from '../../../languageHandler';
-import { GroupMemberType } from '../../../groups';
-import GroupStore from '../../../stores/GroupStore';
-import AccessibleButton from '../elements/AccessibleButton';
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
-
-export default createReactClass({
-    displayName: 'GroupMemberInfo',
-
-    statics: {
-        contextType: MatrixClientContext,
-    },
-
-    propTypes: {
-        groupId: PropTypes.string,
-        groupMember: GroupMemberType,
-        isInvited: PropTypes.bool,
-    },
-
-    getInitialState: function() {
-        return {
-            removingUser: false,
-            isUserPrivilegedInGroup: null,
-        };
-    },
-
-    componentDidMount: function() {
-        this._unmounted = false;
-        this._initGroupStore(this.props.groupId);
-    },
-
-    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    UNSAFE_componentWillReceiveProps(newProps) {
-        if (newProps.groupId !== this.props.groupId) {
-            this._unregisterGroupStore(this.props.groupId);
-            this._initGroupStore(newProps.groupId);
-        }
-    },
-
-    componentWillUnmount() {
-        this._unmounted = true;
-        this._unregisterGroupStore(this.props.groupId);
-    },
-
-    _initGroupStore(groupId) {
-        GroupStore.registerListener(groupId, this.onGroupStoreUpdated);
-    },
-
-    _unregisterGroupStore(groupId) {
-        GroupStore.unregisterListener(this.onGroupStoreUpdated);
-    },
-
-    onGroupStoreUpdated: function() {
-        if (this._unmounted) return;
-        this.setState({
-            isUserInvited: GroupStore.getGroupInvitedMembers(this.props.groupId).some(
-                (m) => m.userId === this.props.groupMember.userId,
-            ),
-            isUserPrivilegedInGroup: GroupStore.isUserPrivileged(this.props.groupId),
-        });
-    },
-
-    _onKick: function() {
-        const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog");
-        Modal.createDialog(ConfirmUserActionDialog, {
-            matrixClient: this.context,
-            groupMember: this.props.groupMember,
-            action: this.state.isUserInvited ? _t('Disinvite') : _t('Remove from community'),
-            title: this.state.isUserInvited ? _t('Disinvite this user from community?')
-                                            : _t('Remove this user from community?'),
-            danger: true,
-            onFinished: (proceed) => {
-                if (!proceed) return;
-
-                this.setState({removingUser: true});
-                this.context.removeUserFromGroup(
-                    this.props.groupId, this.props.groupMember.userId,
-                ).then(() => {
-                    // return to the user list
-                    dis.dispatch({
-                        action: "view_user",
-                        member: null,
-                    });
-                }).catch((e) => {
-                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                    Modal.createTrackedDialog('Failed to remove user from group', '', ErrorDialog, {
-                        title: _t('Error'),
-                        description: this.state.isUserInvited ?
-                            _t('Failed to withdraw invitation') :
-                            _t('Failed to remove user from community'),
-                    });
-                }).finally(() => {
-                    this.setState({removingUser: false});
-                });
-            },
-        });
-    },
-
-    _onCancel: function(e) {
-        // Go back to the user list
-        dis.dispatch({
-            action: "view_user",
-            member: null,
-        });
-    },
-
-    onRoomTileClick(roomId) {
-        dis.dispatch({
-            action: 'view_room',
-            room_id: roomId,
-        });
-    },
-
-    render: function() {
-        if (this.state.removingUser) {
-            const Spinner = sdk.getComponent("elements.Spinner");
-            return <div className="mx_MemberInfo">
-                <Spinner />
-            </div>;
-        }
-
-        let adminTools;
-        if (this.state.isUserPrivilegedInGroup) {
-            const kickButton = (
-                <AccessibleButton className="mx_MemberInfo_field"
-                        onClick={this._onKick}>
-                    { this.state.isUserInvited ? _t('Disinvite') : _t('Remove from community') }
-                </AccessibleButton>
-            );
-
-            // No make/revoke admin API yet
-            /*const opLabel = this.state.isTargetMod ? _t("Revoke Moderator") : _t("Make Moderator");
-            giveModButton = <AccessibleButton className="mx_MemberInfo_field" onClick={this.onModToggle}>
-                {giveOpLabel}
-            </AccessibleButton>;*/
-
-            if (kickButton) {
-                adminTools =
-                    <div className="mx_MemberInfo_adminTools">
-                        <h3>{ _t("Admin Tools") }</h3>
-                        <div className="mx_MemberInfo_buttons">
-                            { kickButton }
-                        </div>
-                    </div>;
-            }
-        }
-
-
-        const avatarUrl = this.props.groupMember.avatarUrl;
-        let avatarElement;
-        if (avatarUrl) {
-            const httpUrl = this.context.mxcUrlToHttp(avatarUrl, 800, 800);
-            avatarElement = (<div className="mx_MemberInfo_avatar">
-                            <img src={httpUrl} />
-                        </div>);
-        }
-
-        const groupMemberName = (
-            this.props.groupMember.displayname || this.props.groupMember.userId
-        );
-
-        return (
-            <div className="mx_MemberInfo" role="tabpanel">
-                <AutoHideScrollbar>
-                    <AccessibleButton className="mx_MemberInfo_cancel" onClick={this._onCancel}>
-                        <img src={require("../../../../res/img/cancel.svg")} width="18" height="18" className="mx_filterFlipColor" />
-                    </AccessibleButton>
-                    { avatarElement }
-                    <h2>{ groupMemberName }</h2>
-
-                    <div className="mx_MemberInfo_profile">
-                        <div className="mx_MemberInfo_profileField">
-                            { this.props.groupMember.userId }
-                        </div>
-                    </div>
-
-                    { adminTools }
-                </AutoHideScrollbar>
-            </div>
-        );
-    },
-});
diff --git a/src/components/views/groups/GroupMemberList.js b/src/components/views/groups/GroupMemberList.js
index ca374d1309..031b875409 100644
--- a/src/components/views/groups/GroupMemberList.js
+++ b/src/components/views/groups/GroupMemberList.js
@@ -19,14 +19,14 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import GroupStore from '../../../stores/GroupStore';
 import PropTypes from 'prop-types';
 import { showGroupInviteDialog } from '../../../GroupAddressPicker';
 import AccessibleButton from '../elements/AccessibleButton';
-import TintableSvg from '../elements/TintableSvg';
-import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
+import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
+import {Action} from "../../../dispatcher/actions";
 
 const INITIAL_LOAD_NUM_MEMBERS = 30;
 
@@ -165,9 +165,9 @@ export default createReactClass({
     onInviteToGroupButtonClick() {
         showGroupInviteDialog(this.props.groupId).then(() => {
             dis.dispatch({
-                action: 'set_right_panel_phase',
-                phase: RIGHT_PANEL_PHASES.GroupMemberList,
-                groupId: this.props.groupId,
+                action: Action.SetRightPanelPhase,
+                phase: RightPanelPhases.GroupMemberList,
+                refireParams: { groupId: this.props.groupId },
             });
         });
     },
@@ -211,15 +211,13 @@ export default createReactClass({
         let inviteButton;
         if (GroupStore.isUserPrivileged(this.props.groupId)) {
             inviteButton = (
-            <AccessibleButton
-                className="mx_RightPanel_invite"
-                onClick={this.onInviteToGroupButtonClick}
-            >
-                <div className="mx_RightPanel_icon" >
-                    <TintableSvg src={require("../../../../res/img/icon-invite-people.svg")} width="18" height="14" />
-                </div>
-                <div className="mx_RightPanel_message">{ _t('Invite to this community') }</div>
-            </AccessibleButton>);
+                <AccessibleButton
+                    className="mx_MemberList_invite mx_MemberList_inviteCommunity"
+                    onClick={this.onInviteToGroupButtonClick}
+                >
+                    <span>{ _t('Invite to this community') }</span>
+                </AccessibleButton>
+            );
         }
 
         return (
diff --git a/src/components/views/groups/GroupMemberTile.js b/src/components/views/groups/GroupMemberTile.js
index f99d5c768c..05e3f6ac2a 100644
--- a/src/components/views/groups/GroupMemberTile.js
+++ b/src/components/views/groups/GroupMemberTile.js
@@ -20,7 +20,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import { GroupMemberType } from '../../../groups';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
diff --git a/src/components/views/groups/GroupRoomInfo.js b/src/components/views/groups/GroupRoomInfo.js
index 3a20de7eca..8c9b39675e 100644
--- a/src/components/views/groups/GroupRoomInfo.js
+++ b/src/components/views/groups/GroupRoomInfo.js
@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import Modal from '../../../Modal';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
diff --git a/src/components/views/groups/GroupRoomList.js b/src/components/views/groups/GroupRoomList.js
index 5c3e1587db..18ab0f288a 100644
--- a/src/components/views/groups/GroupRoomList.js
+++ b/src/components/views/groups/GroupRoomList.js
@@ -21,7 +21,6 @@ import GroupStore from '../../../stores/GroupStore';
 import PropTypes from 'prop-types';
 import { showGroupAddRoomDialog } from '../../../GroupAddressPicker';
 import AccessibleButton from '../elements/AccessibleButton';
-import TintableSvg from '../elements/TintableSvg';
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
 
 const INITIAL_LOAD_NUM_ROOMS = 30;
@@ -135,13 +134,10 @@ export default createReactClass({
         if (GroupStore.isUserPrivileged(this.props.groupId)) {
             inviteButton = (
                 <AccessibleButton
-                    className="mx_RightPanel_invite"
+                    className="mx_MemberList_invite mx_MemberList_addRoomToCommunity"
                     onClick={this.onAddRoomToGroupButtonClick}
                 >
-                    <div className="mx_RightPanel_icon" >
-                        <TintableSvg src={require("../../../../res/img/icons-room-add.svg")} width="18" height="14" />
-                    </div>
-                    <div className="mx_RightPanel_message">{ _t('Add rooms to this community') }</div>
+                    <span>{ _t('Add rooms to this community') }</span>
                 </AccessibleButton>
             );
         }
diff --git a/src/components/views/groups/GroupRoomTile.js b/src/components/views/groups/GroupRoomTile.js
index 94d143b263..fd6969a49a 100644
--- a/src/components/views/groups/GroupRoomTile.js
+++ b/src/components/views/groups/GroupRoomTile.js
@@ -18,7 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import { GroupRoomType } from '../../../groups';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
diff --git a/src/components/views/groups/GroupTile.js b/src/components/views/groups/GroupTile.js
index b845a83c2a..906bcbaf99 100644
--- a/src/components/views/groups/GroupTile.js
+++ b/src/components/views/groups/GroupTile.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import { Draggable, Droppable } from 'react-beautiful-dnd';
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import FlairStore from '../../../stores/FlairStore';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
@@ -126,7 +126,7 @@ const GroupTile = createReactClass({
         }
 
         // XXX: Use onMouseDown as a workaround for https://github.com/atlassian/react-beautiful-dnd/issues/273
-        // instead of onClick. Otherwise we experience https://github.com/vector-im/riot-web/issues/6156
+        // instead of onClick. Otherwise we experience https://github.com/vector-im/element-web/issues/6156
         return <AccessibleButton className="mx_GroupTile" onMouseDown={this.onMouseDown} onClick={nop}>
             { avatarElement }
             <div className="mx_GroupTile_profile">
diff --git a/src/components/views/messages/DateSeparator.js b/src/components/views/messages/DateSeparator.js
index 56faa670b2..ef4b5d16d1 100644
--- a/src/components/views/messages/DateSeparator.js
+++ b/src/components/views/messages/DateSeparator.js
@@ -21,7 +21,7 @@ import { _t } from '../../../languageHandler';
 import {formatFullDateNoTime} from '../../../DateUtils';
 
 function getdaysArray() {
-	return [
+    return [
         _t('Sunday'),
         _t('Monday'),
         _t('Tuesday'),
diff --git a/src/components/views/messages/EditHistoryMessage.js b/src/components/views/messages/EditHistoryMessage.js
index 679a8f7471..df27773a40 100644
--- a/src/components/views/messages/EditHistoryMessage.js
+++ b/src/components/views/messages/EditHistoryMessage.js
@@ -26,6 +26,7 @@ import * as sdk from '../../../index';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';
 import classNames from 'classnames';
+import RedactedBody from "./RedactedBody";
 
 function getReplacedContent(event) {
     const originalContent = event.getOriginalContent();
@@ -132,8 +133,7 @@ export default class EditHistoryMessage extends React.PureComponent {
         const content = getReplacedContent(mxEvent);
         let contentContainer;
         if (mxEvent.isRedacted()) {
-            const UnknownBody = sdk.getComponent('messages.UnknownBody');
-            contentContainer = <UnknownBody mxEvent={this.props.mxEvent} />;
+            contentContainer = <RedactedBody mxEvent={this.props.mxEvent} />;
         } else {
             let contentElements;
             if (this.props.previousEdit) {
@@ -158,7 +158,6 @@ export default class EditHistoryMessage extends React.PureComponent {
         const isSending = (['sending', 'queued', 'encrypting'].indexOf(this.state.sendStatus) !== -1);
         const classes = classNames({
             "mx_EventTile": true,
-            "mx_EventTile_redacted": mxEvent.isRedacted(),
             "mx_EventTile_sending": isSending,
             "mx_EventTile_notSent": this.state.sendStatus === 'not_sent',
         });
diff --git a/src/components/views/messages/MAudioBody.js b/src/components/views/messages/MAudioBody.js
index a642936fec..37f85a108f 100644
--- a/src/components/views/messages/MAudioBody.js
+++ b/src/components/views/messages/MAudioBody.js
@@ -22,6 +22,7 @@ import MFileBody from './MFileBody';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { decryptFile } from '../../../utils/DecryptFile';
 import { _t } from '../../../languageHandler';
+import InlineSpinner from '../elements/InlineSpinner';
 
 export default class MAudioBody extends React.Component {
     constructor(props) {
@@ -94,7 +95,7 @@ export default class MAudioBody extends React.Component {
             // Not sure how tall the audio player is so not sure how tall it should actually be.
             return (
                 <span className="mx_MAudioBody">
-                    <img src={require("../../../../res/img/spinner.gif")} alt={content.body} width="16" height="16" />
+                    <InlineSpinner />
                 </span>
             );
         }
diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index ad238a728e..c92ae475bf 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -26,6 +26,7 @@ import { decryptFile } from '../../../utils/DecryptFile';
 import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import InlineSpinner from '../elements/InlineSpinner';
 
 export default class MImageBody extends React.Component {
     static propTypes = {
@@ -365,12 +366,7 @@ export default class MImageBody extends React.Component {
 
         // e2e image hasn't been decrypted yet
         if (content.file !== undefined && this.state.decryptedUrl === null) {
-            placeholder = <img
-                src={require("../../../../res/img/spinner.gif")}
-                alt={content.body}
-                width="32"
-                height="32"
-            />;
+            placeholder = <InlineSpinner w={32} h={32} />;
         } else if (!this.state.imgLoaded) {
             // Deliberately, getSpinner is left unimplemented here, MStickerBody overides
             placeholder = this.getPlaceholder();
diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js
index f49ae1b6b1..01a5c2663e 100644
--- a/src/components/views/messages/MKeyVerificationRequest.js
+++ b/src/components/views/messages/MKeyVerificationRequest.js
@@ -21,8 +21,9 @@ import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import {getNameForEventRoom, userLabelForEventRoom}
     from '../../../utils/KeyVerificationStateObserver';
-import dis from "../../../dispatcher";
-import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
+import dis from "../../../dispatcher/dispatcher";
+import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
+import {Action} from "../../../dispatcher/actions";
 
 export default class MKeyVerificationRequest extends React.Component {
     constructor(props) {
@@ -48,8 +49,8 @@ export default class MKeyVerificationRequest extends React.Component {
         const {verificationRequest} = this.props.mxEvent;
         const member = MatrixClientPeg.get().getUser(verificationRequest.otherUserId);
         dis.dispatch({
-            action: "set_right_panel_phase",
-            phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+            action: Action.SetRightPanelPhase,
+            phase: RightPanelPhases.EncryptionPanel,
             refireParams: {verificationRequest, member},
         });
     };
diff --git a/src/components/views/messages/MVideoBody.js b/src/components/views/messages/MVideoBody.js
index 03f345e042..fdc04deffc 100644
--- a/src/components/views/messages/MVideoBody.js
+++ b/src/components/views/messages/MVideoBody.js
@@ -23,6 +23,7 @@ import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { decryptFile } from '../../../utils/DecryptFile';
 import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
+import InlineSpinner from '../elements/InlineSpinner';
 
 export default createReactClass({
     displayName: 'MVideoBody',
@@ -147,7 +148,7 @@ export default createReactClass({
             return (
                 <span className="mx_MVideoBody">
                     <div className="mx_MImageBody_thumbnail mx_MImageBody_thumbnail_spinner">
-                        <img src={require("../../../../res/img/spinner.gif")} alt={content.body} width="16" height="16" />
+                        <InlineSpinner />
                     </div>
                 </span>
             );
diff --git a/src/components/views/messages/MessageActionBar.js b/src/components/views/messages/MessageActionBar.js
index 0cde90e417..c94f296eac 100644
--- a/src/components/views/messages/MessageActionBar.js
+++ b/src/components/views/messages/MessageActionBar.js
@@ -1,7 +1,7 @@
 /*
 Copyright 2019 New Vector Ltd
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -18,18 +18,20 @@ limitations under the License.
 
 import React, {useEffect} from 'react';
 import PropTypes from 'prop-types';
+import { EventStatus } from 'matrix-js-sdk';
 
 import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
-import Modal from '../../../Modal';
-import {aboveLeftOf, ContextMenu, ContextMenuButton, useContextMenu} from '../../structures/ContextMenu';
+import dis from '../../../dispatcher/dispatcher';
+import {aboveLeftOf, ContextMenu, ContextMenuTooltipButton, useContextMenu} from '../../structures/ContextMenu';
 import { isContentActionable, canEditContent } from '../../../utils/EventUtils';
 import RoomContext from "../../../contexts/RoomContext";
-import SettingsStore from '../../../settings/SettingsStore';
+import Toolbar from "../../../accessibility/Toolbar";
+import {RovingAccessibleTooltipButton, useRovingTabIndex} from "../../../accessibility/RovingTabIndex";
 
 const OptionsButton = ({mxEvent, getTile, getReplyThread, permalinkCreator, onFocusChange}) => {
     const [menuDisplayed, button, openMenu, closeMenu] = useContextMenu();
+    const [onFocus, isActive, ref] = useRovingTabIndex(button);
     useEffect(() => {
         onFocusChange(menuDisplayed);
     }, [onFocusChange, menuDisplayed]);
@@ -41,18 +43,6 @@ const OptionsButton = ({mxEvent, getTile, getReplyThread, permalinkCreator, onFo
         const tile = getTile && getTile();
         const replyThread = getReplyThread && getReplyThread();
 
-        const onCryptoClick = () => {
-            Modal.createTrackedDialogAsync('Encrypted Event Dialog', '',
-                import('../../../async-components/views/dialogs/EncryptedEventDialog'),
-                {event: mxEvent},
-            );
-        };
-
-        let e2eInfoCallback = null;
-        if (mxEvent.isEncrypted() && !SettingsStore.getValue("feature_cross_signing")) {
-            e2eInfoCallback = onCryptoClick;
-        }
-
         const buttonRect = button.current.getBoundingClientRect();
         contextMenu = <ContextMenu {...aboveLeftOf(buttonRect)} onFinished={closeMenu}>
             <MessageContextMenu
@@ -60,19 +50,20 @@ const OptionsButton = ({mxEvent, getTile, getReplyThread, permalinkCreator, onFo
                 permalinkCreator={permalinkCreator}
                 eventTileOps={tile && tile.getEventTileOps ? tile.getEventTileOps() : undefined}
                 collapseReplyThread={replyThread && replyThread.canCollapse() ? replyThread.collapse : undefined}
-                e2eInfoCallback={e2eInfoCallback}
                 onFinished={closeMenu}
             />
         </ContextMenu>;
     }
 
     return <React.Fragment>
-        <ContextMenuButton
+        <ContextMenuTooltipButton
             className="mx_MessageActionBar_maskButton mx_MessageActionBar_optionsButton"
-            label={_t("Options")}
+            title={_t("Options")}
             onClick={openMenu}
             isExpanded={menuDisplayed}
-            inputRef={button}
+            inputRef={ref}
+            onFocus={onFocus}
+            tabIndex={isActive ? 0 : -1}
         />
 
         { contextMenu }
@@ -81,6 +72,7 @@ const OptionsButton = ({mxEvent, getTile, getReplyThread, permalinkCreator, onFo
 
 const ReactButton = ({mxEvent, reactions, onFocusChange}) => {
     const [menuDisplayed, button, openMenu, closeMenu] = useContextMenu();
+    const [onFocus, isActive, ref] = useRovingTabIndex(button);
     useEffect(() => {
         onFocusChange(menuDisplayed);
     }, [onFocusChange, menuDisplayed]);
@@ -95,12 +87,14 @@ const ReactButton = ({mxEvent, reactions, onFocusChange}) => {
     }
 
     return <React.Fragment>
-        <ContextMenuButton
+        <ContextMenuTooltipButton
             className="mx_MessageActionBar_maskButton mx_MessageActionBar_reactButton"
-            label={_t("React")}
+            title={_t("React")}
             onClick={openMenu}
             isExpanded={menuDisplayed}
-            inputRef={button}
+            inputRef={ref}
+            onFocus={onFocus}
+            tabIndex={isActive ? 0 : -1}
         />
 
         { contextMenu }
@@ -121,13 +115,19 @@ export default class MessageActionBar extends React.PureComponent {
     static contextType = RoomContext;
 
     componentDidMount() {
-        this.props.mxEvent.on("Event.decrypted", this.onDecrypted);
+        if (this.props.mxEvent.status && this.props.mxEvent.status !== EventStatus.SENT) {
+            this.props.mxEvent.on("Event.status", this.onSent);
+        }
+        if (this.props.mxEvent.isBeingDecrypted()) {
+            this.props.mxEvent.once("Event.decrypted", this.onDecrypted);
+        }
         this.props.mxEvent.on("Event.beforeRedaction", this.onBeforeRedaction);
     }
 
     componentWillUnmount() {
-        this.props.mxEvent.removeListener("Event.decrypted", this.onDecrypted);
-        this.props.mxEvent.removeListener("Event.beforeRedaction", this.onBeforeRedaction);
+        this.props.mxEvent.off("Event.status", this.onSent);
+        this.props.mxEvent.off("Event.decrypted", this.onDecrypted);
+        this.props.mxEvent.off("Event.beforeRedaction", this.onBeforeRedaction);
     }
 
     onDecrypted = () => {
@@ -141,6 +141,11 @@ export default class MessageActionBar extends React.PureComponent {
         this.forceUpdate();
     };
 
+    onSent = () => {
+        // When an event is sent and echoed the possible actions change.
+        this.forceUpdate();
+    };
+
     onFocusChange = (focused) => {
         if (!this.props.onFocusChange) {
             return;
@@ -163,8 +168,6 @@ export default class MessageActionBar extends React.PureComponent {
     };
 
     render() {
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-
         let reactButton;
         let replyButton;
         let editButton;
@@ -176,7 +179,7 @@ export default class MessageActionBar extends React.PureComponent {
                 );
             }
             if (this.context.canReply) {
-                replyButton = <AccessibleButton
+                replyButton = <RovingAccessibleTooltipButton
                     className="mx_MessageActionBar_maskButton mx_MessageActionBar_replyButton"
                     title={_t("Reply")}
                     onClick={this.onReplyClick}
@@ -184,7 +187,7 @@ export default class MessageActionBar extends React.PureComponent {
             }
         }
         if (canEditContent(this.props.mxEvent)) {
-            editButton = <AccessibleButton
+            editButton = <RovingAccessibleTooltipButton
                 className="mx_MessageActionBar_maskButton mx_MessageActionBar_editButton"
                 title={_t("Edit")}
                 onClick={this.onEditClick}
@@ -192,7 +195,7 @@ export default class MessageActionBar extends React.PureComponent {
         }
 
         // aria-live=off to not have this read out automatically as navigating around timeline, gets repetitive.
-        return <div className="mx_MessageActionBar" role="toolbar" aria-label={_t("Message Actions")} aria-live="off">
+        return <Toolbar className="mx_MessageActionBar" aria-label={_t("Message Actions")} aria-live="off">
             {reactButton}
             {replyButton}
             {editButton}
@@ -203,6 +206,6 @@ export default class MessageActionBar extends React.PureComponent {
                 permalinkCreator={this.props.permalinkCreator}
                 onFocusChange={this.onFocusChange}
             />
-        </div>;
+        </Toolbar>;
     }
 }
diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js
index beba986104..c3e5af2eb6 100644
--- a/src/components/views/messages/MessageEvent.js
+++ b/src/components/views/messages/MessageEvent.js
@@ -20,6 +20,8 @@ import createReactClass from 'create-react-class';
 import * as sdk from '../../../index';
 import SettingsStore from "../../../settings/SettingsStore";
 import {Mjolnir} from "../../../mjolnir/Mjolnir";
+import RedactedBody from "./RedactedBody";
+import UnknownBody from "./UnknownBody";
 
 export default createReactClass({
     displayName: 'MessageEvent',
@@ -61,8 +63,6 @@ export default createReactClass({
     },
 
     render: function() {
-        const UnknownBody = sdk.getComponent('messages.UnknownBody');
-
         const bodyTypes = {
             'm.text': sdk.getComponent('messages.TextualBody'),
             'm.notice': sdk.getComponent('messages.TextualBody'),
@@ -79,7 +79,7 @@ export default createReactClass({
         const content = this.props.mxEvent.getContent();
         const type = this.props.mxEvent.getType();
         const msgtype = content.msgtype;
-        let BodyType = UnknownBody;
+        let BodyType = RedactedBody;
         if (!this.props.mxEvent.isRedacted()) {
             // only resolve BodyType if event is not redacted
             if (type && evTypes[type]) {
@@ -89,10 +89,13 @@ export default createReactClass({
             } else if (content.url) {
                 // Fallback to MFileBody if there's a content URL
                 BodyType = bodyTypes['m.file'];
+            } else {
+                // Fallback to UnknownBody otherwise if not redacted
+                BodyType = UnknownBody;
             }
         }
 
-        if (SettingsStore.isFeatureEnabled("feature_mjolnir")) {
+        if (SettingsStore.getValue("feature_mjolnir")) {
             const key = `mx_mjolnir_render_${this.props.mxEvent.getRoomId()}__${this.props.mxEvent.getId()}`;
             const allowRender = localStorage.getItem(key) === "true";
 
diff --git a/src/components/views/messages/ReactionsRowButton.js b/src/components/views/messages/ReactionsRowButton.js
index a7ff7dce96..bb8d9a3b6e 100644
--- a/src/components/views/messages/ReactionsRowButton.js
+++ b/src/components/views/messages/ReactionsRowButton.js
@@ -22,6 +22,7 @@ import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import { formatCommaSeparatedList } from '../../../utils/FormattingUtils';
+import dis from "../../../dispatcher/dispatcher";
 
 export default class ReactionsRowButton extends React.PureComponent {
     static propTypes = {
@@ -60,6 +61,7 @@ export default class ReactionsRowButton extends React.PureComponent {
                     "key": content,
                 },
             });
+            dis.dispatch({action: "message_sent"});
         }
     };
 
@@ -72,7 +74,7 @@ export default class ReactionsRowButton extends React.PureComponent {
         });
     }
 
-    onMouseOut = () => {
+    onMouseLeave = () => {
         this.setState({
             tooltipVisible: false,
         });
@@ -127,11 +129,12 @@ export default class ReactionsRowButton extends React.PureComponent {
         }
 
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        return <AccessibleButton className={classes}
+        return <AccessibleButton
+            className={classes}
             aria-label={label}
             onClick={this.onClick}
             onMouseOver={this.onMouseOver}
-            onMouseOut={this.onMouseOut}
+            onMouseLeave={this.onMouseLeave}
         >
             <span className="mx_ReactionsRowButton_content" aria-hidden="true">
                 {content}
diff --git a/src/components/views/messages/ReactionsRowButtonTooltip.js b/src/components/views/messages/ReactionsRowButtonTooltip.js
index 59e9d2ad7f..2b90175722 100644
--- a/src/components/views/messages/ReactionsRowButtonTooltip.js
+++ b/src/components/views/messages/ReactionsRowButtonTooltip.js
@@ -55,7 +55,7 @@ export default class ReactionsRowButtonTooltip extends React.PureComponent {
                 },
                 {
                     reactors: () => {
-                        return <div className="mx_ReactionsRowButtonTooltip_senders">
+                        return <div className="mx_Tooltip_title">
                             {formatCommaSeparatedList(senders, 6)}
                         </div>;
                     },
@@ -63,7 +63,7 @@ export default class ReactionsRowButtonTooltip extends React.PureComponent {
                         if (!shortName) {
                             return null;
                         }
-                        return <div className="mx_ReactionsRowButtonTooltip_reactedWith">
+                        return <div className="mx_Tooltip_sub">
                             {sub}
                         </div>;
                     },
@@ -73,11 +73,7 @@ export default class ReactionsRowButtonTooltip extends React.PureComponent {
 
         let tooltip;
         if (tooltipLabel) {
-            tooltip = <Tooltip
-                tooltipClassName="mx_Tooltip_timeline"
-                visible={visible}
-                label={tooltipLabel}
-            />;
+            tooltip = <Tooltip visible={visible} label={tooltipLabel} />;
         }
 
         return tooltip;
diff --git a/src/components/views/messages/RedactedBody.tsx b/src/components/views/messages/RedactedBody.tsx
new file mode 100644
index 0000000000..5f80460d03
--- /dev/null
+++ b/src/components/views/messages/RedactedBody.tsx
@@ -0,0 +1,52 @@
+/*
+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 {MatrixClient} from "matrix-js-sdk/src/client";
+import {MatrixEvent} from "matrix-js-sdk/src/models/event";
+import { _t } from "../../../languageHandler";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {formatFullDate} from "../../../DateUtils";
+import SettingsStore from "../../../settings/SettingsStore";
+
+interface IProps {
+    mxEvent: MatrixEvent;
+}
+
+const RedactedBody = React.forwardRef<any, IProps>(({mxEvent}, ref) => {
+    const cli: MatrixClient = useContext(MatrixClientContext);
+
+    let text = _t("Message deleted");
+    const unsigned = mxEvent.getUnsigned();
+    const redactedBecauseUserId = unsigned && unsigned.redacted_because && unsigned.redacted_because.sender;
+    if (redactedBecauseUserId && redactedBecauseUserId !== mxEvent.getSender()) {
+        const room = cli.getRoom(mxEvent.getRoomId());
+        const sender = room && room.getMember(redactedBecauseUserId);
+        text = _t("Message deleted by %(name)s", { name: sender ? sender.name : redactedBecauseUserId });
+    }
+
+    const showTwelveHour = SettingsStore.getValue("showTwelveHourTimestamps");
+    const fullDate = formatFullDate(new Date(unsigned.redacted_because.origin_server_ts), showTwelveHour);
+    const titleText = _t("Message deleted on %(date)s", { date: fullDate });
+
+    return (
+        <span className="mx_RedactedBody" ref={ref} title={titleText}>
+            { text }
+        </span>
+    );
+});
+
+export default RedactedBody;
diff --git a/src/components/views/messages/RoomCreate.js b/src/components/views/messages/RoomCreate.js
index b5749ced97..95bc460636 100644
--- a/src/components/views/messages/RoomCreate.js
+++ b/src/components/views/messages/RoomCreate.js
@@ -19,7 +19,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import { RoomPermalinkCreator } from '../../../utils/permalinks/Permalinks';
 import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
diff --git a/src/components/views/messages/SenderProfile.js b/src/components/views/messages/SenderProfile.js
index bed93b68c3..5064c4d2b2 100644
--- a/src/components/views/messages/SenderProfile.js
+++ b/src/components/views/messages/SenderProfile.js
@@ -125,13 +125,17 @@ export default createReactClass({
         </span>;
 
         const content = this.props.text ?
-            <span className="mx_SenderProfile_aux">
-                { _t(this.props.text, { senderName: () => nameElem }) }
+            <span>
+                <span className="mx_SenderProfile_aux">
+                    { _t(this.props.text, { senderName: () => nameElem }) }
+                </span>
             </span> : nameFlair;
 
         return (
             <div className="mx_SenderProfile" dir="auto" onClick={this.props.onClick}>
-                { content }
+                <div className="mx_SenderProfile_hover">
+                    { content }
+                </div>
             </div>
         );
     },
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 882e331675..df72398b1c 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -25,7 +25,7 @@ import * as HtmlUtils from '../../../HtmlUtils';
 import {formatDate} from '../../../DateUtils';
 import * as sdk from '../../../index';
 import Modal from '../../../Modal';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import { _t } from '../../../languageHandler';
 import * as ContextMenu from '../../structures/ContextMenu';
 import SettingsStore from "../../../settings/SettingsStore";
@@ -35,6 +35,7 @@ import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
 import {isPermalinkHost} from "../../../utils/permalinks/Permalinks";
 import {toRightOf} from "../../structures/ContextMenu";
 import {copyPlaintext} from "../../../utils/strings";
+import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
 
 export default createReactClass({
     displayName: 'TextualBody',
@@ -106,7 +107,7 @@ export default createReactClass({
                         } 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-');
+                                return cl.startsWith('language-') && !cl.startsWith('language-_');
                             });
 
                             if (classes.length != 0) {
@@ -146,7 +147,6 @@ export default createReactClass({
                 nextProps.showUrlPreview !== this.props.showUrlPreview ||
                 nextProps.editState !== this.props.editState ||
                 nextState.links !== this.state.links ||
-                nextState.editedMarkerHovered !== this.state.editedMarkerHovered ||
                 nextState.widgetHidden !== this.state.widgetHidden);
     },
 
@@ -172,6 +172,8 @@ export default createReactClass({
                     const hidden = global.localStorage.getItem("hide_preview_" + this.props.mxEvent.getId());
                     this.setState({ widgetHidden: hidden });
                 }
+            } else if (this.state.links.length) {
+                this.setState({ links: [] });
             }
         }
     },
@@ -367,42 +369,33 @@ export default createReactClass({
         });
     },
 
-    _onMouseEnterEditedMarker: function() {
-        this.setState({editedMarkerHovered: true});
-    },
-
-    _onMouseLeaveEditedMarker: function() {
-        this.setState({editedMarkerHovered: false});
-    },
-
     _openHistoryDialog: async function() {
         const MessageEditHistoryDialog = sdk.getComponent("views.dialogs.MessageEditHistoryDialog");
         Modal.createDialog(MessageEditHistoryDialog, {mxEvent: this.props.mxEvent});
     },
 
     _renderEditedMarker: function() {
-        let editedTooltip;
-        if (this.state.editedMarkerHovered) {
-            const Tooltip = sdk.getComponent('elements.Tooltip');
-            const date = this.props.mxEvent.replacingEventDate();
-            const dateString = date && formatDate(date);
-            editedTooltip = <Tooltip
-                tooltipClassName="mx_Tooltip_timeline"
-                label={_t("Edited at %(date)s. Click to view edits.", {date: dateString})}
-            />;
-        }
+        const date = this.props.mxEvent.replacingEventDate();
+        const dateString = date && formatDate(date);
+
+        const tooltip = <div>
+            <div className="mx_Tooltip_title">
+                {_t("Edited at %(date)s", {date: dateString})}
+            </div>
+            <div className="mx_Tooltip_sub">
+                {_t("Click to view edits")}
+            </div>
+        </div>;
 
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         return (
-            <AccessibleButton
-                key="editedMarker"
+            <AccessibleTooltipButton
                 className="mx_EventTile_edited"
                 onClick={this._openHistoryDialog}
-                onMouseEnter={this._onMouseEnterEditedMarker}
-                onMouseLeave={this._onMouseLeaveEditedMarker}
+                title={_t("Edited at %(date)s. Click to view edits.", {date: dateString})}
+                tooltip={tooltip}
             >
-                { editedTooltip }<span>{`(${_t("edited")})`}</span>
-            </AccessibleButton>
+                <span>{`(${_t("edited")})`}</span>
+            </AccessibleTooltipButton>
         );
     },
 
diff --git a/src/components/views/messages/UnknownBody.js b/src/components/views/messages/UnknownBody.js
index 2a19f324e8..6c00921b45 100644
--- a/src/components/views/messages/UnknownBody.js
+++ b/src/components/views/messages/UnknownBody.js
@@ -1,5 +1,6 @@
 /*
 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,27 +15,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
-import createReactClass from 'create-react-class';
-import { _t } from '../../../languageHandler';
+import React from "react";
 
-export default createReactClass({
-    displayName: 'UnknownBody',
-
-    render: function() {
-        let tooltip = _t("Removed or unknown message type");
-        if (this.props.mxEvent.isRedacted()) {
-            const redactedBecauseUserId = this.props.mxEvent.getUnsigned().redacted_because.sender;
-            tooltip = redactedBecauseUserId ?
-                _t("Message removed by %(userId)s", { userId: redactedBecauseUserId }) :
-                _t("Message removed");
-        }
-
-        const text = this.props.mxEvent.getContent().body;
-        return (
-            <span className="mx_UnknownBody" title={tooltip}>
-                { text }
-            </span>
-        );
-    },
-});
+export default ({mxEvent}) => {
+    const text = mxEvent.getContent().body;
+    return (
+        <span className="mx_UnknownBody">
+            { text }
+        </span>
+    );
+};
diff --git a/src/components/views/right_panel/EncryptionInfo.js b/src/components/views/right_panel/EncryptionInfo.tsx
similarity index 87%
rename from src/components/views/right_panel/EncryptionInfo.js
rename to src/components/views/right_panel/EncryptionInfo.tsx
index 007e2831ce..f62af65543 100644
--- a/src/components/views/right_panel/EncryptionInfo.js
+++ b/src/components/views/right_panel/EncryptionInfo.tsx
@@ -15,10 +15,10 @@ limitations under the License.
 */
 
 import React from "react";
-import PropTypes from "prop-types";
 
 import * as sdk from "../../../index";
 import {_t} from "../../../languageHandler";
+import {RoomMember} from "matrix-js-sdk/src/models/room-member";
 
 export const PendingActionSpinner = ({text}) => {
     const Spinner = sdk.getComponent('elements.Spinner');
@@ -28,7 +28,17 @@ export const PendingActionSpinner = ({text}) => {
     </div>;
 };
 
-const EncryptionInfo = ({
+interface IProps {
+    waitingForOtherParty: boolean;
+    waitingForNetwork: boolean;
+    member: RoomMember;
+    onStartVerification: () => Promise<void>;
+    isRoomEncrypted: boolean;
+    inDialog: boolean;
+    isSelfVerification: boolean;
+}
+
+const EncryptionInfo: React.FC<IProps> = ({
     waitingForOtherParty,
     waitingForNetwork,
     member,
@@ -36,10 +46,10 @@ const EncryptionInfo = ({
     isRoomEncrypted,
     inDialog,
     isSelfVerification,
-}) => {
-    let content;
+}: IProps) => {
+    let content: JSX.Element;
     if (waitingForOtherParty || waitingForNetwork) {
-        let text;
+        let text: string;
         if (waitingForOtherParty) {
             if (isSelfVerification) {
                 text = _t("Waiting for you to accept on your other session…");
@@ -61,7 +71,7 @@ const EncryptionInfo = ({
         );
     }
 
-    let description;
+    let description: JSX.Element;
     if (isRoomEncrypted) {
         description = (
             <div>
@@ -97,10 +107,5 @@ const EncryptionInfo = ({
         </div>
     </React.Fragment>;
 };
-EncryptionInfo.propTypes = {
-    member: PropTypes.object.isRequired,
-    onStartVerification: PropTypes.func.isRequired,
-    request: PropTypes.object,
-};
 
 export default EncryptionInfo;
diff --git a/src/components/views/right_panel/EncryptionPanel.js b/src/components/views/right_panel/EncryptionPanel.tsx
similarity index 86%
rename from src/components/views/right_panel/EncryptionPanel.js
rename to src/components/views/right_panel/EncryptionPanel.tsx
index bc580c767b..df52e5cabd 100644
--- a/src/components/views/right_panel/EncryptionPanel.js
+++ b/src/components/views/right_panel/EncryptionPanel.tsx
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 import React, {useCallback, useEffect, useState} from "react";
-import PropTypes from "prop-types";
 
 import EncryptionInfo from "./EncryptionInfo";
 import VerificationPanel from "./VerificationPanel";
@@ -26,11 +25,23 @@ import Modal from "../../../Modal";
 import {PHASE_REQUESTED, PHASE_UNSENT} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 import * as sdk from "../../../index";
 import {_t} from "../../../languageHandler";
+import {VerificationRequest} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
+import {RoomMember} from "matrix-js-sdk/src/models/room-member";
 
 // cancellation codes which constitute a key mismatch
 const MISMATCHES = ["m.key_mismatch", "m.user_error", "m.mismatched_sas"];
 
-const EncryptionPanel = (props) => {
+interface IProps {
+    member: RoomMember;
+    onClose: () => void;
+    verificationRequest: VerificationRequest;
+    verificationRequestPromise: Promise<VerificationRequest>;
+    layout: string;
+    inDialog: boolean;
+    isRoomEncrypted: boolean;
+}
+
+const EncryptionPanel: React.FC<IProps> = (props: IProps) => {
     const {verificationRequest, verificationRequestPromise, member, onClose, layout, isRoomEncrypted} = props;
     const [request, setRequest] = useState(verificationRequest);
     // state to show a spinner immediately after clicking "start verification",
@@ -45,16 +56,13 @@ const EncryptionPanel = (props) => {
         }
     }, [verificationRequest]);
 
-    const deviceId = request && request.channel.deviceId;
-    const device = MatrixClientPeg.get().getStoredDevice(MatrixClientPeg.get().getUserId(), deviceId);
-
     useEffect(() => {
         async function awaitPromise() {
             setRequesting(true);
-            const request = await verificationRequestPromise;
+            const requestFromPromise = await verificationRequestPromise;
             setRequesting(false);
-            setRequest(request);
-            setPhase(request.phase);
+            setRequest(requestFromPromise);
+            setPhase(requestFromPromise.phase);
         }
         if (verificationRequestPromise) {
             awaitPromise();
@@ -93,7 +101,7 @@ const EncryptionPanel = (props) => {
         }
     }, [request]);
 
-    let cancelButton;
+    let cancelButton: JSX.Element;
     if (layout !== "dialog" && request && request.pending) {
         const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
         cancelButton = (<AccessibleButton
@@ -107,9 +115,9 @@ const EncryptionPanel = (props) => {
         setRequesting(true);
         const cli = MatrixClientPeg.get();
         const roomId = await ensureDMExists(cli, member.userId);
-        const verificationRequest = await cli.requestVerificationDM(member.userId, roomId);
-        setRequest(verificationRequest);
-        setPhase(verificationRequest.phase);
+        const verificationRequest_ = await cli.requestVerificationDM(member.userId, roomId);
+        setRequest(verificationRequest_);
+        setPhase(verificationRequest_.phase);
     }, [member.userId]);
 
     const requested =
@@ -143,16 +151,9 @@ const EncryptionPanel = (props) => {
                 key={request.channel.transactionId}
                 inDialog={layout === "dialog"}
                 phase={phase}
-                device={device} />
+            />
         </React.Fragment>);
     }
 };
-EncryptionPanel.propTypes = {
-    member: PropTypes.object.isRequired,
-    onClose: PropTypes.func.isRequired,
-    verificationRequest: PropTypes.object,
-    layout: PropTypes.string,
-    inDialog: PropTypes.bool,
-};
 
 export default EncryptionPanel;
diff --git a/src/components/views/right_panel/GroupHeaderButtons.js b/src/components/views/right_panel/GroupHeaderButtons.tsx
similarity index 56%
rename from src/components/views/right_panel/GroupHeaderButtons.js
rename to src/components/views/right_panel/GroupHeaderButtons.tsx
index f164b6c578..44237e401f 100644
--- a/src/components/views/right_panel/GroupHeaderButtons.js
+++ b/src/components/views/right_panel/GroupHeaderButtons.tsx
@@ -21,63 +21,68 @@ limitations under the License.
 import React from 'react';
 import { _t } from '../../../languageHandler';
 import HeaderButton from './HeaderButton';
-import HeaderButtons, {HEADER_KIND_GROUP} from './HeaderButtons';
-import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
+import HeaderButtons, {HeaderKind} from './HeaderButtons';
+import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
+import {Action} from "../../../dispatcher/actions";
+import {ActionPayload} from "../../../dispatcher/payloads";
+import {ViewUserPayload} from "../../../dispatcher/payloads/ViewUserPayload";
 
 const GROUP_PHASES = [
-    RIGHT_PANEL_PHASES.GroupMemberInfo,
-    RIGHT_PANEL_PHASES.GroupMemberList,
+    RightPanelPhases.GroupMemberInfo,
+    RightPanelPhases.GroupMemberList,
 ];
 const ROOM_PHASES = [
-    RIGHT_PANEL_PHASES.GroupRoomList,
-    RIGHT_PANEL_PHASES.GroupRoomInfo,
+    RightPanelPhases.GroupRoomList,
+    RightPanelPhases.GroupRoomInfo,
 ];
 
+interface IProps {}
+
 export default class GroupHeaderButtons extends HeaderButtons {
-    constructor(props) {
-        super(props, HEADER_KIND_GROUP);
-        this._onMembersClicked = this._onMembersClicked.bind(this);
-        this._onRoomsClicked = this._onRoomsClicked.bind(this);
+    constructor(props: IProps) {
+        super(props, HeaderKind.Group);
+        this.onMembersClicked = this.onMembersClicked.bind(this);
+        this.onRoomsClicked = this.onRoomsClicked.bind(this);
     }
 
-    onAction(payload) {
+    protected onAction(payload: ActionPayload) {
         super.onAction(payload);
 
-        if (payload.action === "view_user") {
-            if (payload.member) {
-                this.setPhase(RIGHT_PANEL_PHASES.RoomMemberInfo, {member: payload.member});
+        if (payload.action === Action.ViewUser) {
+            if ((payload as ViewUserPayload).member) {
+                this.setPhase(RightPanelPhases.RoomMemberInfo, {member: payload.member});
             } else {
-                this.setPhase(RIGHT_PANEL_PHASES.GroupMemberList);
+                this.setPhase(RightPanelPhases.GroupMemberList);
             }
         } else if (payload.action === "view_group") {
-            this.setPhase(RIGHT_PANEL_PHASES.GroupMemberList);
+            this.setPhase(RightPanelPhases.GroupMemberList);
         } else if (payload.action === "view_group_room") {
             this.setPhase(
-                RIGHT_PANEL_PHASES.GroupRoomInfo,
+                RightPanelPhases.GroupRoomInfo,
                 {groupRoomId: payload.groupRoomId, groupId: payload.groupId},
             );
         } else if (payload.action === "view_group_room_list") {
-            this.setPhase(RIGHT_PANEL_PHASES.GroupRoomList);
+            this.setPhase(RightPanelPhases.GroupRoomList);
         } else if (payload.action === "view_group_member_list") {
-            this.setPhase(RIGHT_PANEL_PHASES.GroupMemberList);
+            this.setPhase(RightPanelPhases.GroupMemberList);
         } else if (payload.action === "view_group_user") {
-            this.setPhase(RIGHT_PANEL_PHASES.GroupMemberInfo, {member: payload.member});
+            this.setPhase(RightPanelPhases.GroupMemberInfo, {member: payload.member});
         }
     }
 
-    _onMembersClicked() {
-        if (this.state.phase === RIGHT_PANEL_PHASES.GroupMemberInfo) {
+    private onMembersClicked() {
+        if (this.state.phase === RightPanelPhases.GroupMemberInfo) {
             // send the active phase to trigger a toggle
-            this.setPhase(RIGHT_PANEL_PHASES.GroupMemberInfo);
+            this.setPhase(RightPanelPhases.GroupMemberInfo);
         } else {
             // This toggles for us, if needed
-            this.setPhase(RIGHT_PANEL_PHASES.GroupMemberList);
+            this.setPhase(RightPanelPhases.GroupMemberList);
         }
     }
 
-    _onRoomsClicked() {
+    private onRoomsClicked() {
         // This toggles for us, if needed
-        this.setPhase(RIGHT_PANEL_PHASES.GroupRoomList);
+        this.setPhase(RightPanelPhases.GroupRoomList);
     }
 
     renderButtons() {
@@ -85,13 +90,13 @@ export default class GroupHeaderButtons extends HeaderButtons {
             <HeaderButton key="groupMembersButton" name="groupMembersButton"
                 title={_t('Members')}
                 isHighlighted={this.isPhase(GROUP_PHASES)}
-                onClick={this._onMembersClicked}
+                onClick={this.onMembersClicked}
                 analytics={['Right Panel', 'Group Member List Button', 'click']}
             />,
             <HeaderButton key="roomsButton" name="roomsButton"
                 title={_t('Rooms')}
                 isHighlighted={this.isPhase(ROOM_PHASES)}
-                onClick={this._onRoomsClicked}
+                onClick={this.onRoomsClicked}
                 analytics={['Right Panel', 'Group Room List Button', 'click']}
             />,
         ];
diff --git a/src/components/views/right_panel/HeaderButton.js b/src/components/views/right_panel/HeaderButton.tsx
similarity index 71%
rename from src/components/views/right_panel/HeaderButton.js
rename to src/components/views/right_panel/HeaderButton.tsx
index 06b434c1ce..ff092ca060 100644
--- a/src/components/views/right_panel/HeaderButton.js
+++ b/src/components/views/right_panel/HeaderButton.tsx
@@ -19,51 +19,52 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import Analytics from '../../../Analytics';
-import AccessibleButton from '../elements/AccessibleButton';
+import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
 
-export default class HeaderButton extends React.Component {
-    constructor() {
-        super();
+interface IProps {
+    // Whether this button is highlighted
+    isHighlighted: boolean;
+    // click handler
+    onClick: () => void;
+    // The badge to display above the icon
+    badge?: React.ReactNode;
+    // The parameters to track the click event
+    analytics: string[];
+
+    // Button name
+    name: string;
+    // Button title
+    title: string;
+}
+
+// TODO: replace this, the composer buttons and the right panel buttons with a unified
+// representation
+export default class HeaderButton extends React.Component<IProps> {
+    constructor(props: IProps) {
+        super(props);
         this.onClick = this.onClick.bind(this);
     }
 
-    onClick(ev) {
+    private onClick() {
         Analytics.trackEvent(...this.props.analytics);
         this.props.onClick();
     }
 
-    render() {
+    public render() {
         const classes = classNames({
             mx_RightPanel_headerButton: true,
             mx_RightPanel_headerButton_highlight: this.props.isHighlighted,
             [`mx_RightPanel_${this.props.name}`]: true,
         });
 
-        return <AccessibleButton
+        return <AccessibleTooltipButton
             aria-selected={this.props.isHighlighted}
             role="tab"
             title={this.props.title}
             className={classes}
-            onClick={this.onClick}>
-        </AccessibleButton>;
+            onClick={this.onClick}
+        />;
     }
 }
-
-HeaderButton.propTypes = {
-    // Whether this button is highlighted
-    isHighlighted: PropTypes.bool.isRequired,
-    // click handler
-    onClick: PropTypes.func.isRequired,
-    // The badge to display above the icon
-    badge: PropTypes.node,
-    // The parameters to track the click event
-    analytics: PropTypes.arrayOf(PropTypes.string).isRequired,
-
-    // Button name
-    name: PropTypes.string.isRequired,
-    // Button title
-    title: PropTypes.string.isRequired,
-};
diff --git a/src/components/views/right_panel/HeaderButtons.js b/src/components/views/right_panel/HeaderButtons.js
deleted file mode 100644
index 03b03218ee..0000000000
--- a/src/components/views/right_panel/HeaderButtons.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations Ltd
-Copyright 2017 New Vector Ltd
-Copyright 2018 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 dis from '../../../dispatcher';
-import RightPanelStore from "../../../stores/RightPanelStore";
-
-export const HEADER_KIND_ROOM = "room";
-export const HEADER_KIND_GROUP = "group";
-
-const HEADER_KINDS = [HEADER_KIND_GROUP, HEADER_KIND_ROOM];
-
-export default class HeaderButtons extends React.Component {
-    constructor(props, kind) {
-        super(props);
-
-        if (!HEADER_KINDS.includes(kind)) throw new Error(`Invalid header kind: ${kind}`);
-
-        const rps = RightPanelStore.getSharedInstance();
-        this.state = {
-            headerKind: kind,
-            phase: kind === HEADER_KIND_ROOM ? rps.visibleRoomPanelPhase : rps.visibleGroupPanelPhase,
-        };
-    }
-
-    componentDidMount() {
-        this._storeToken = RightPanelStore.getSharedInstance().addListener(this.onRightPanelUpdate.bind(this));
-        this._dispatcherRef = dis.register(this.onAction.bind(this)); // used by subclasses
-    }
-
-    componentWillUnmount() {
-        if (this._storeToken) this._storeToken.remove();
-        if (this._dispatcherRef) dis.unregister(this._dispatcherRef);
-    }
-
-    onAction(payload) {
-        // Ignore - intended to be overridden by subclasses
-    }
-
-    setPhase(phase, extras) {
-        dis.dispatch({
-            action: 'set_right_panel_phase',
-            phase: phase,
-            refireParams: extras,
-        });
-    }
-
-    isPhase(phases: string | string[]) {
-        if (Array.isArray(phases)) {
-            return phases.includes(this.state.phase);
-        } else {
-            return phases === this.state.phase;
-        }
-    }
-
-    onRightPanelUpdate() {
-        const rps = RightPanelStore.getSharedInstance();
-        if (this.state.headerKind === HEADER_KIND_ROOM) {
-            this.setState({phase: rps.visibleRoomPanelPhase});
-        } else if (this.state.headerKind === HEADER_KIND_GROUP) {
-            this.setState({phase: rps.visibleGroupPanelPhase});
-        }
-    }
-
-    render() {
-        // inline style as this will be swapped around in future commits
-        return <div className="mx_HeaderButtons" role="tablist">
-            {this.renderButtons()}
-        </div>;
-    }
-}
diff --git a/src/components/views/right_panel/HeaderButtons.tsx b/src/components/views/right_panel/HeaderButtons.tsx
new file mode 100644
index 0000000000..57d3075739
--- /dev/null
+++ b/src/components/views/right_panel/HeaderButtons.tsx
@@ -0,0 +1,110 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 Vector Creations Ltd
+Copyright 2017 New Vector Ltd
+Copyright 2018 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 dis from '../../../dispatcher/dispatcher';
+import RightPanelStore from "../../../stores/RightPanelStore";
+import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
+import {Action} from '../../../dispatcher/actions';
+import {SetRightPanelPhasePayload, SetRightPanelPhaseRefireParams} from '../../../dispatcher/payloads/SetRightPanelPhasePayload';
+import {EventSubscription} from "fbemitter";
+
+export enum HeaderKind {
+  Room = "room",
+  Group = "group",
+}
+
+interface IState {
+    headerKind: HeaderKind;
+    phase: RightPanelPhases;
+}
+
+interface IProps {}
+
+export default class HeaderButtons extends React.Component<IProps, IState> {
+    private storeToken: EventSubscription;
+    private dispatcherRef: string;
+
+    constructor(props: IProps, kind: HeaderKind) {
+        super(props);
+
+        const rps = RightPanelStore.getSharedInstance();
+        this.state = {
+            headerKind: kind,
+            phase: kind === HeaderKind.Room ? rps.visibleRoomPanelPhase : rps.visibleGroupPanelPhase,
+        };
+    }
+
+    public componentDidMount() {
+        this.storeToken = RightPanelStore.getSharedInstance().addListener(this.onRightPanelUpdate.bind(this));
+        this.dispatcherRef = dis.register(this.onAction.bind(this)); // used by subclasses
+    }
+
+    public componentWillUnmount() {
+        if (this.storeToken) this.storeToken.remove();
+        if (this.dispatcherRef) dis.unregister(this.dispatcherRef);
+    }
+
+    protected onAction(payload) {
+        // Ignore - intended to be overridden by subclasses
+    }
+
+    public setPhase(phase: RightPanelPhases, extras?: Partial<SetRightPanelPhaseRefireParams>) {
+        dis.dispatch<SetRightPanelPhasePayload>({
+            action: Action.SetRightPanelPhase,
+            phase: phase,
+            refireParams: extras,
+        });
+    }
+
+    public isPhase(phases: string | string[]) {
+        if (Array.isArray(phases)) {
+            return phases.includes(this.state.phase);
+        } else {
+            return phases === this.state.phase;
+        }
+    }
+
+    private onRightPanelUpdate() {
+        const rps = RightPanelStore.getSharedInstance();
+        if (this.state.headerKind === HeaderKind.Room) {
+            this.setState({phase: rps.visibleRoomPanelPhase});
+        } else if (this.state.headerKind === HeaderKind.Group) {
+            this.setState({phase: rps.visibleGroupPanelPhase});
+        }
+    }
+
+    // XXX: Make renderButtons a prop
+    public renderButtons(): JSX.Element[] {
+        // Ignore - intended to be overridden by subclasses
+        // Return empty fragment to satisfy the type
+        return [
+          <React.Fragment>
+          </React.Fragment>
+        ];
+    }
+
+    public render() {
+        // inline style as this will be swapped around in future commits
+        return <div className="mx_HeaderButtons" role="tablist">
+            {this.renderButtons()}
+        </div>;
+    }
+}
diff --git a/src/components/views/right_panel/RoomHeaderButtons.js b/src/components/views/right_panel/RoomHeaderButtons.tsx
similarity index 55%
rename from src/components/views/right_panel/RoomHeaderButtons.js
rename to src/components/views/right_panel/RoomHeaderButtons.tsx
index bad89e2dbe..7ac547f499 100644
--- a/src/components/views/right_panel/RoomHeaderButtons.js
+++ b/src/components/views/right_panel/RoomHeaderButtons.tsx
@@ -21,80 +21,82 @@ limitations under the License.
 import React from 'react';
 import { _t } from '../../../languageHandler';
 import HeaderButton from './HeaderButton';
-import HeaderButtons, {HEADER_KIND_ROOM} from './HeaderButtons';
-import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
+import HeaderButtons, {HeaderKind} from './HeaderButtons';
+import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
+import {Action} from "../../../dispatcher/actions";
+import {ActionPayload} from "../../../dispatcher/payloads";
 
 const MEMBER_PHASES = [
-    RIGHT_PANEL_PHASES.RoomMemberList,
-    RIGHT_PANEL_PHASES.RoomMemberInfo,
-    RIGHT_PANEL_PHASES.EncryptionPanel,
-    RIGHT_PANEL_PHASES.Room3pidMemberInfo,
+    RightPanelPhases.RoomMemberList,
+    RightPanelPhases.RoomMemberInfo,
+    RightPanelPhases.EncryptionPanel,
+    RightPanelPhases.Room3pidMemberInfo,
 ];
 
 export default class RoomHeaderButtons extends HeaderButtons {
     constructor(props) {
-        super(props, HEADER_KIND_ROOM);
-        this._onMembersClicked = this._onMembersClicked.bind(this);
-        this._onFilesClicked = this._onFilesClicked.bind(this);
-        this._onNotificationsClicked = this._onNotificationsClicked.bind(this);
+        super(props, HeaderKind.Room);
+        this.onMembersClicked = this.onMembersClicked.bind(this);
+        this.onFilesClicked = this.onFilesClicked.bind(this);
+        this.onNotificationsClicked = this.onNotificationsClicked.bind(this);
     }
 
-    onAction(payload) {
+    protected onAction(payload: ActionPayload) {
         super.onAction(payload);
-        if (payload.action === "view_user") {
+        if (payload.action === Action.ViewUser) {
             if (payload.member) {
-                this.setPhase(RIGHT_PANEL_PHASES.RoomMemberInfo, {member: payload.member});
+                this.setPhase(RightPanelPhases.RoomMemberInfo, {member: payload.member});
             } else {
-                this.setPhase(RIGHT_PANEL_PHASES.RoomMemberList);
+                this.setPhase(RightPanelPhases.RoomMemberList);
             }
         } else if (payload.action === "view_3pid_invite") {
             if (payload.event) {
-                this.setPhase(RIGHT_PANEL_PHASES.Room3pidMemberInfo, {event: payload.event});
+                this.setPhase(RightPanelPhases.Room3pidMemberInfo, {event: payload.event});
             } else {
-                this.setPhase(RIGHT_PANEL_PHASES.RoomMemberList);
+                this.setPhase(RightPanelPhases.RoomMemberList);
             }
         }
     }
 
-    _onMembersClicked() {
-        if (this.state.phase === RIGHT_PANEL_PHASES.RoomMemberInfo) {
+    private onMembersClicked() {
+        if (this.state.phase === RightPanelPhases.RoomMemberInfo) {
             // send the active phase to trigger a toggle
             // XXX: we should pass refireParams here but then it won't collapse as we desire it to
-            this.setPhase(RIGHT_PANEL_PHASES.RoomMemberInfo);
+            this.setPhase(RightPanelPhases.RoomMemberInfo);
         } else {
             // This toggles for us, if needed
-            this.setPhase(RIGHT_PANEL_PHASES.RoomMemberList);
+            this.setPhase(RightPanelPhases.RoomMemberList);
         }
     }
 
-    _onFilesClicked() {
+    private onFilesClicked() {
         // This toggles for us, if needed
-        this.setPhase(RIGHT_PANEL_PHASES.FilePanel);
+        this.setPhase(RightPanelPhases.FilePanel);
     }
 
-    _onNotificationsClicked() {
+    private onNotificationsClicked() {
         // This toggles for us, if needed
-        this.setPhase(RIGHT_PANEL_PHASES.NotificationPanel);
+        this.setPhase(RightPanelPhases.NotificationPanel);
     }
 
-    renderButtons() {
+    public renderButtons() {
         return [
             <HeaderButton key="membersButton" name="membersButton"
                 title={_t('Members')}
                 isHighlighted={this.isPhase(MEMBER_PHASES)}
-                onClick={this._onMembersClicked}
+                onClick={this.onMembersClicked}
                 analytics={['Right Panel', 'Member List Button', 'click']}
             />,
             <HeaderButton key="filesButton" name="filesButton"
                 title={_t('Files')}
-                isHighlighted={this.isPhase(RIGHT_PANEL_PHASES.FilePanel)}
-                onClick={this._onFilesClicked}
+                isHighlighted={this.isPhase(RightPanelPhases.FilePanel)}
+                onClick={this.onFilesClicked}
                 analytics={['Right Panel', 'File List Button', 'click']}
             />,
             <HeaderButton key="notifsButton" name="notifsButton"
                 title={_t('Notifications')}
-                isHighlighted={this.isPhase(RIGHT_PANEL_PHASES.NotificationPanel)}
-                onClick={this._onNotificationsClicked}
+                isHighlighted={this.isPhase(RightPanelPhases.NotificationPanel)}
+                onClick={this.onNotificationsClicked}
                 analytics={['Right Panel', 'Notification List Button', 'click']}
             />,
         ];
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 61f5a8161a..71ee86a1ea 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -21,11 +21,11 @@ import React, {useCallback, useMemo, useState, useEffect, useContext} from 'reac
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import {Group, RoomMember, User} from 'matrix-js-sdk';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import Modal from '../../../Modal';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
-import createRoom from '../../../createRoom';
+import createRoom, {privateShouldBeEncrypted} from '../../../createRoom';
 import DMRoomMap from '../../../utils/DMRoomMap';
 import AccessibleButton from '../elements/AccessibleButton';
 import SdkConfig from '../../../SdkConfig';
@@ -40,10 +40,11 @@ import E2EIcon from "../rooms/E2EIcon";
 import {useEventEmitter} from "../../../hooks/useEventEmitter";
 import {textualPowerLevel} from '../../../Roles';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
+import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
 import EncryptionPanel from "./EncryptionPanel";
 import { useAsyncMemo } from '../../../hooks/useAsyncMemo';
 import { verifyUser, legacyVerifyUser, verifyDevice } from '../../../verification';
+import {Action} from "../../../dispatcher/actions";
 
 const _disambiguateDevices = (devices) => {
     const names = Object.create(null);
@@ -63,10 +64,6 @@ const _disambiguateDevices = (devices) => {
 };
 
 export const getE2EStatus = (cli, userId, devices) => {
-    if (!SettingsStore.getValue("feature_cross_signing")) {
-        const hasUnverifiedDevice = devices.some((device) => device.isUnverified());
-        return hasUnverifiedDevice ? "warning" : "verified";
-    }
     const isMe = userId === cli.getUserId();
     const userTrust = cli.checkUserTrust(userId);
     if (!userTrust.isCrossSigningVerified()) {
@@ -111,7 +108,7 @@ async function openDMForUser(matrixClient, userId) {
         dmUserId: userId,
     };
 
-    if (SettingsStore.getValue("feature_cross_signing")) {
+    if (privateShouldBeEncrypted()) {
         // Check whether all users have uploaded device keys before.
         // If so, enable encryption in the new room.
         const usersToDevicesMap = await matrixClient.downloadKeys([userId]);
@@ -166,9 +163,7 @@ function DeviceItem({userId, device}) {
     // cross-signing so that other users can then safely trust you.
     // For other people's devices, the more general verified check that
     // includes locally verified devices can be used.
-    const isVerified = (isMe && SettingsStore.getValue("feature_cross_signing")) ?
-        deviceTrust.isCrossSigningVerified() :
-        deviceTrust.isVerified();
+    const isVerified = isMe ? deviceTrust.isCrossSigningVerified() : deviceTrust.isVerified();
 
     const classes = classNames("mx_UserInfo_device", {
         mx_UserInfo_device_verified: isVerified,
@@ -247,9 +242,7 @@ function DevicesSection({devices, userId, loading}) {
             // cross-signing so that other users can then safely trust you.
             // For other people's devices, the more general verified check that
             // includes locally verified devices can be used.
-            const isVerified = (isMe && SettingsStore.getValue("feature_cross_signing")) ?
-                deviceTrust.isCrossSigningVerified() :
-                deviceTrust.isVerified();
+            const isVerified = isMe ? deviceTrust.isCrossSigningVerified() : deviceTrust.isVerified();
 
             if (isVerified) {
                 expandSectionDevices.push(device);
@@ -557,7 +550,9 @@ const RedactMessagesButton = ({member}) => {
         let eventsToRedact = [];
         while (timeline) {
             eventsToRedact = timeline.getEvents().reduce((events, event) => {
-                if (event.getSender() === userId && !event.isRedacted()) {
+                if (event.getSender() === userId && !event.isRedacted() && !event.isRedaction() &&
+                    event.getType() !== "m.room.create"
+                ) {
                     return events.concat(event);
                 } else {
                     return events;
@@ -755,19 +750,26 @@ const RoomAdminToolsContainer = ({room, children, member, startUpdating, stopUpd
         powerLevels.state_default
     );
 
+    // if these do not exist in the event then they should default to 50 as per the spec
+    const {
+        ban: banPowerLevel = 50,
+        kick: kickPowerLevel = 50,
+        redact: redactPowerLevel = 50,
+    } = powerLevels;
+
     const me = room.getMember(cli.getUserId());
     const isMe = me.userId === member.userId;
     const canAffectUser = member.powerLevel < me.powerLevel || isMe;
 
-    if (canAffectUser && me.powerLevel >= powerLevels.kick) {
+    if (canAffectUser && me.powerLevel >= kickPowerLevel) {
         kickButton = <RoomKickButton member={member} startUpdating={startUpdating} stopUpdating={stopUpdating} />;
     }
-    if (me.powerLevel >= powerLevels.redact) {
+    if (me.powerLevel >= redactPowerLevel) {
         redactButton = (
             <RedactMessagesButton member={member} startUpdating={startUpdating} stopUpdating={stopUpdating} />
         );
     }
-    if (canAffectUser && me.powerLevel >= powerLevels.ban) {
+    if (canAffectUser && me.powerLevel >= banPowerLevel) {
         banButton = <BanToggleButton member={member} startUpdating={startUpdating} stopUpdating={stopUpdating} />;
     }
     if (canAffectUser && me.powerLevel >= editPowerLevel) {
@@ -841,7 +843,7 @@ const GroupAdminToolsSection = ({children, groupId, groupMember, startUpdating,
             cli.removeUserFromGroup(groupId, groupMember.userId).then(() => {
                 // return to the user list
                 dis.dispatch({
-                    action: "view_user",
+                    action: Action.ViewUser,
                     member: null,
                 });
             }).catch((e) => {
@@ -1287,11 +1289,11 @@ const BasicUserInfo = ({room, member, groupId, devices, isRoomEncrypted}) => {
     );
 
     // only display the devices list if our client supports E2E
-    const _enableDevices = cli.isCryptoEnabled();
+    const cryptoEnabled = cli.isCryptoEnabled();
 
     let text;
     if (!isRoomEncrypted) {
-        if (!_enableDevices) {
+        if (!cryptoEnabled) {
             text = _t("This client does not support end-to-end encryption.");
         } else if (room) {
             text = _t("Messages in this room are not end-to-end encrypted.");
@@ -1305,11 +1307,10 @@ const BasicUserInfo = ({room, member, groupId, devices, isRoomEncrypted}) => {
     let verifyButton;
     const homeserverSupportsCrossSigning = useHomeserverSupportsCrossSigning(cli);
 
-    const userTrust = cli.checkUserTrust(member.userId);
-    const userVerified = userTrust.isCrossSigningVerified();
+    const userTrust = cryptoEnabled && cli.checkUserTrust(member.userId);
+    const userVerified = cryptoEnabled && userTrust.isCrossSigningVerified();
     const isMe = member.userId === cli.getUserId();
-    const canVerify = SettingsStore.getValue("feature_cross_signing") &&
-                        homeserverSupportsCrossSigning && !userVerified && !isMe;
+    const canVerify = cryptoEnabled && homeserverSupportsCrossSigning && !userVerified && !isMe;
 
     const setUpdating = (updating) => {
         setPendingUpdateCount(count => count + (updating ? 1 : -1));
@@ -1346,10 +1347,10 @@ const BasicUserInfo = ({room, member, groupId, devices, isRoomEncrypted}) => {
             <h3>{ _t("Security") }</h3>
             <p>{ text }</p>
             { verifyButton }
-            <DevicesSection
+            { cryptoEnabled && <DevicesSection
                 loading={showDeviceListSpinner}
                 devices={devices}
-                userId={member.userId} />
+                userId={member.userId} /> }
         </div>
     );
 
@@ -1427,7 +1428,7 @@ const UserInfoHeader = ({onClose, member, e2eStatus}) => {
         presenceLastActiveAgo = member.user.lastActiveAgo;
         presenceCurrentlyActive = member.user.currentlyActive;
 
-        if (SettingsStore.isFeatureEnabled("feature_custom_status")) {
+        if (SettingsStore.getValue("feature_custom_status")) {
             statusMessage = member.user._unstable_statusMessage;
         }
     }
@@ -1481,7 +1482,7 @@ const UserInfoHeader = ({onClose, member, e2eStatus}) => {
     </React.Fragment>;
 };
 
-const UserInfo = ({user, groupId, roomId, onClose, phase=RIGHT_PANEL_PHASES.RoomMemberInfo, ...props}) => {
+const UserInfo = ({user, groupId, roomId, onClose, phase=RightPanelPhases.RoomMemberInfo, ...props}) => {
     const cli = useContext(MatrixClientContext);
 
     // Load room if we are given a room id and memoize it
@@ -1501,8 +1502,8 @@ const UserInfo = ({user, groupId, roomId, onClose, phase=RIGHT_PANEL_PHASES.Room
 
     let content;
     switch (phase) {
-        case RIGHT_PANEL_PHASES.RoomMemberInfo:
-        case RIGHT_PANEL_PHASES.GroupMemberInfo:
+        case RightPanelPhases.RoomMemberInfo:
+        case RightPanelPhases.GroupMemberInfo:
             content = (
                 <BasicUserInfo
                     room={room}
@@ -1512,7 +1513,7 @@ const UserInfo = ({user, groupId, roomId, onClose, phase=RIGHT_PANEL_PHASES.Room
                     isRoomEncrypted={isRoomEncrypted} />
             );
             break;
-        case RIGHT_PANEL_PHASES.EncryptionPanel:
+        case RightPanelPhases.EncryptionPanel:
             classes.push("mx_UserInfo_smallAvatar");
             content = (
                 <EncryptionPanel {...props} member={member} onClose={onClose} isRoomEncrypted={isRoomEncrypted} />
diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.tsx
similarity index 70%
rename from src/components/views/right_panel/VerificationPanel.js
rename to src/components/views/right_panel/VerificationPanel.tsx
index 67efd29d27..1f0703839f 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.tsx
@@ -15,14 +15,19 @@ limitations under the License.
 */
 
 import React from "react";
-import PropTypes from "prop-types";
 
+import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import * as sdk from '../../../index';
 import {verificationMethods} from 'matrix-js-sdk/src/crypto';
 import {SCAN_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode";
+import {VerificationRequest} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
+import {RoomMember} from "matrix-js-sdk/src/models/room-member";
+import {ReciprocateQRCode} from "matrix-js-sdk/src/crypto/verification/QRCode";
+import {SAS} from "matrix-js-sdk/src/crypto/verification/SAS";
 
 import VerificationQRCode from "../elements/crypto/VerificationQRCode";
 import {_t} from "../../../languageHandler";
+import SdkConfig from "../../../SdkConfig";
 import E2EIcon from "../rooms/E2EIcon";
 import {
     PHASE_UNSENT,
@@ -34,76 +39,96 @@ import {
 } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 import Spinner from "../elements/Spinner";
 
-export default class VerificationPanel extends React.PureComponent {
-    static propTypes = {
-        layout: PropTypes.string,
-        request: PropTypes.object.isRequired,
-        member: PropTypes.object.isRequired,
-        phase: PropTypes.oneOf([
-            PHASE_UNSENT,
-            PHASE_REQUESTED,
-            PHASE_READY,
-            PHASE_STARTED,
-            PHASE_CANCELLED,
-            PHASE_DONE,
-        ]).isRequired,
-        onClose: PropTypes.func.isRequired,
-        isRoomEncrypted: PropTypes.bool,
-    };
+// XXX: Should be defined in matrix-js-sdk
+enum VerificationPhase {
+    PHASE_UNSENT,
+    PHASE_REQUESTED,
+    PHASE_READY,
+    PHASE_DONE,
+    PHASE_STARTED,
+    PHASE_CANCELLED,
+}
 
-    constructor(props) {
+interface IProps {
+    layout: string;
+    request: VerificationRequest;
+    member: RoomMember;
+    phase: VerificationPhase;
+    onClose: () => void;
+    isRoomEncrypted: boolean;
+    inDialog: boolean;
+    key: number;
+}
+
+interface IState {
+    sasEvent?: SAS;
+    emojiButtonClicked?: boolean;
+    reciprocateButtonClicked?: boolean;
+    reciprocateQREvent?: ReciprocateQRCode;
+}
+
+export default class VerificationPanel extends React.PureComponent<IProps, IState> {
+    private hasVerifier: boolean;
+
+    constructor(props: IProps) {
         super(props);
         this.state = {};
-        this._hasVerifier = false;
+        this.hasVerifier = false;
     }
 
-    renderQRPhase() {
+    private renderQRPhase() {
         const {member, request} = this.props;
-        const showSAS = request.otherPartySupportsMethod(verificationMethods.SAS);
-        const showQR = request.otherPartySupportsMethod(SCAN_QR_CODE_METHOD);
+        const showSAS: boolean = request.otherPartySupportsMethod(verificationMethods.SAS);
+        const showQR: boolean = request.otherPartySupportsMethod(SCAN_QR_CODE_METHOD);
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
+        const brand = SdkConfig.get().brand;
 
-        const noCommonMethodError = !showSAS && !showQR ?
-            <p>{_t("The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.")}</p> :
+        const noCommonMethodError: JSX.Element = !showSAS && !showQR ?
+            <p>{_t(
+                "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 },
+            )}</p> :
             null;
 
         if (this.props.layout === 'dialog') {
             // HACK: This is a terrible idea.
-            let qrBlock;
-            let sasBlock;
+            let qrBlockDialog: JSX.Element;
+            let sasBlockDialog: JSX.Element;
             if (showQR) {
-                qrBlock =
+                qrBlockDialog =
                     <div className='mx_VerificationPanel_QRPhase_startOption'>
                         <p>{_t("Scan this unique code")}</p>
                         <VerificationQRCode qrCodeData={request.qrCodeData} />
                     </div>;
             }
             if (showSAS) {
-                sasBlock =
+                sasBlockDialog =
                     <div className='mx_VerificationPanel_QRPhase_startOption'>
                         <p>{_t("Compare unique emoji")}</p>
                         <span className='mx_VerificationPanel_QRPhase_helpText'>{_t("Compare a unique set of emoji if you don't have a camera on either device")}</span>
-                        <AccessibleButton disabled={this.state.emojiButtonClicked} onClick={this._startSAS} kind='primary'>
+                        <AccessibleButton disabled={this.state.emojiButtonClicked} onClick={this.startSAS} kind='primary'>
                             {_t("Start")}
                         </AccessibleButton>
                     </div>;
             }
-            const or = qrBlock && sasBlock ?
+            const or = qrBlockDialog && sasBlockDialog ?
                 <div className='mx_VerificationPanel_QRPhase_betweenText'>{_t("or")}</div> : null;
             return (
                 <div>
                     {_t("Verify this session by completing one of the following:")}
                     <div className='mx_VerificationPanel_QRPhase_startOptions'>
-                        {qrBlock}
+                        {qrBlockDialog}
                         {or}
-                        {sasBlock}
+                        {sasBlockDialog}
                         {noCommonMethodError}
                     </div>
                 </div>
             );
         }
 
-        let qrBlock;
+        let qrBlock: JSX.Element;
         if (showQR) {
             qrBlock = <div className="mx_UserInfo_container">
                 <h3>{_t("Verify by scanning")}</h3>
@@ -117,7 +142,7 @@ export default class VerificationPanel extends React.PureComponent {
             </div>;
         }
 
-        let sasBlock;
+        let sasBlock: JSX.Element;
         if (showSAS) {
             const disabled = this.state.emojiButtonClicked;
             const sasLabel = showQR ?
@@ -132,7 +157,7 @@ export default class VerificationPanel extends React.PureComponent {
                     disabled={disabled}
                     kind="primary"
                     className="mx_UserInfo_wideButton mx_VerificationPanel_verifyByEmojiButton"
-                    onClick={this._startSAS}
+                    onClick={this.startSAS}
                 >
                     {_t("Verify by emoji")}
                 </AccessibleButton>
@@ -151,17 +176,22 @@ export default class VerificationPanel extends React.PureComponent {
         </React.Fragment>;
     }
 
-    _onReciprocateYesClick = () => {
+    private onReciprocateYesClick = () => {
         this.setState({reciprocateButtonClicked: true});
         this.state.reciprocateQREvent.confirm();
     };
 
-    _onReciprocateNoClick = () => {
+    private onReciprocateNoClick = () => {
         this.setState({reciprocateButtonClicked: true});
         this.state.reciprocateQREvent.cancel();
     };
 
-    renderQRReciprocatePhase() {
+    private getDevice() {
+        const deviceId = this.props.request && this.props.request.channel.deviceId;
+        return MatrixClientPeg.get().getStoredDevice(MatrixClientPeg.get().getUserId(), deviceId);
+    }
+
+    private renderQRReciprocatePhase() {
         const {member, request} = this.props;
         let Button;
         // a bit of a hack, but the FormButton should only be used in the right panel
@@ -176,9 +206,9 @@ export default class VerificationPanel extends React.PureComponent {
             _t("Almost there! Is %(displayName)s showing the same shield?", {
                 displayName: member.displayName || member.name || member.userId,
             });
-        let body;
+        let body: JSX.Element;
         if (this.state.reciprocateQREvent) {
-            // riot web doesn't support scanning yet, so assume here we're the client being scanned.
+            // Element Web doesn't support scanning yet, so assume here we're the client being scanned.
             //
             // we're passing both a label and a child string to Button as
             // FormButton and AccessibleButton expect this differently
@@ -189,11 +219,11 @@ export default class VerificationPanel extends React.PureComponent {
                     <Button
                         label={_t("No")} kind="danger"
                         disabled={this.state.reciprocateButtonClicked}
-                        onClick={this._onReciprocateNoClick}>{_t("No")}</Button>
+                        onClick={this.onReciprocateNoClick}>{_t("No")}</Button>
                     <Button
                         label={_t("Yes")} kind="primary"
                         disabled={this.state.reciprocateButtonClicked}
-                        onClick={this._onReciprocateYesClick}>{_t("Yes")}</Button>
+                        onClick={this.onReciprocateYesClick}>{_t("Yes")}</Button>
                 </div>
             </React.Fragment>;
         } else {
@@ -205,10 +235,10 @@ export default class VerificationPanel extends React.PureComponent {
         </div>;
     }
 
-    renderVerifiedPhase() {
+    private renderVerifiedPhase() {
         const {member, request} = this.props;
 
-        let text;
+        let text: string;
         if (!request.isSelfVerification) {
             if (this.props.isRoomEncrypted) {
                 text = _t("Verify all users in a room to ensure it's secure.");
@@ -217,16 +247,27 @@ export default class VerificationPanel extends React.PureComponent {
             }
         }
 
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        const description = request.isSelfVerification ?
-            _t("You've successfully verified %(deviceName)s (%(deviceId)s)!", {
-                deviceName: this.props.device.getDisplayName(),
-                deviceId: this.props.device.deviceId,
-            }):
-            _t("You've successfully verified %(displayName)s!", {
+        let description: string;
+        if (request.isSelfVerification) {
+            const device = this.getDevice();
+            if (!device) {
+                // This can happen if the device is logged out while we're still showing verification
+                // UI for it.
+                console.warn("Verified device we don't know about: " + this.props.request.channel.deviceId);
+                description = _t("You've successfully verified your device!");
+            } else {
+                description = _t("You've successfully verified %(deviceName)s (%(deviceId)s)!", {
+                    deviceName: device ? device.getDisplayName() : '',
+                    deviceId: this.props.request.channel.deviceId,
+                });
+            }
+        } else {
+            description = _t("You've successfully verified %(displayName)s!", {
                 displayName: member.displayName || member.name || member.userId,
             });
+        }
 
+        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         return (
             <div className="mx_UserInfo_container mx_VerificationPanel_verified_section">
                 <h3>{_t("Verified")}</h3>
@@ -240,19 +281,19 @@ export default class VerificationPanel extends React.PureComponent {
         );
     }
 
-    renderCancelledPhase() {
+    private renderCancelledPhase() {
         const {member, request} = this.props;
 
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
-        let startAgainInstruction;
+        let startAgainInstruction: string;
         if (request.isSelfVerification) {
             startAgainInstruction = _t("Start verification again from the notification.");
         } else {
             startAgainInstruction = _t("Start verification again from their profile.");
         }
 
-        let text;
+        let text: string;
         if (request.cancellationCode === "m.timeout") {
             text = _t("Verification timed out.") + ` ${startAgainInstruction}`;
         } else if (request.cancellingUserId === request.otherUserId) {
@@ -280,7 +321,7 @@ export default class VerificationPanel extends React.PureComponent {
         );
     }
 
-    render() {
+    public render() {
         const {member, phase, request} = this.props;
 
         const displayName = member.displayName || member.name || member.userId;
@@ -297,12 +338,12 @@ export default class VerificationPanel extends React.PureComponent {
                         const emojis = this.state.sasEvent ?
                             <VerificationShowSas
                                 displayName={displayName}
+                                device={this.getDevice()}
                                 sas={this.state.sasEvent.sas}
-                                onCancel={this._onSasMismatchesClick}
-                                onDone={this._onSasMatchesClick}
+                                onCancel={this.onSasMismatchesClick}
+                                onDone={this.onSasMatchesClick}
                                 inDialog={this.props.inDialog}
                                 isSelf={request.isSelfVerification}
-                                device={this.props.device}
                             /> : <Spinner />;
                         return <div className="mx_UserInfo_container">
                             <h3>{_t("Compare emoji")}</h3>
@@ -321,7 +362,7 @@ export default class VerificationPanel extends React.PureComponent {
         return null;
     }
 
-    _startSAS = async () => {
+    private startSAS = async () => {
         this.setState({emojiButtonClicked: true});
         const verifier = this.props.request.beginKeyVerification(verificationMethods.SAS);
         try {
@@ -331,31 +372,31 @@ export default class VerificationPanel extends React.PureComponent {
         }
     };
 
-    _onSasMatchesClick = () => {
+    private onSasMatchesClick = () => {
         this.state.sasEvent.confirm();
     };
 
-    _onSasMismatchesClick = () => {
+    private onSasMismatchesClick = () => {
         this.state.sasEvent.mismatch();
     };
 
-    _updateVerifierState = () => {
+    private updateVerifierState = () => {
         const {request} = this.props;
         const {sasEvent, reciprocateQREvent} = request.verifier;
-        request.verifier.off('show_sas', this._updateVerifierState);
-        request.verifier.off('show_reciprocate_qr', this._updateVerifierState);
+        request.verifier.off('show_sas', this.updateVerifierState);
+        request.verifier.off('show_reciprocate_qr', this.updateVerifierState);
         this.setState({sasEvent, reciprocateQREvent});
     };
 
-    _onRequestChange = async () => {
+    private onRequestChange = async () => {
         const {request} = this.props;
-        const hadVerifier = this._hasVerifier;
-        this._hasVerifier = !!request.verifier;
-        if (!hadVerifier && this._hasVerifier) {
-            request.verifier.on('show_sas', this._updateVerifierState);
-            request.verifier.on('show_reciprocate_qr', this._updateVerifierState);
+        const hadVerifier = this.hasVerifier;
+        this.hasVerifier = !!request.verifier;
+        if (!hadVerifier && this.hasVerifier) {
+            request.verifier.on('show_sas', this.updateVerifierState);
+            request.verifier.on('show_reciprocate_qr', this.updateVerifierState);
             try {
-                // on the requester side, this is also awaited in _startSAS,
+                // on the requester side, this is also awaited in startSAS,
                 // but that's ok as verify should return the same promise.
                 await request.verifier.verify();
             } catch (err) {
@@ -364,23 +405,22 @@ export default class VerificationPanel extends React.PureComponent {
         }
     };
 
-    componentDidMount() {
+    public componentDidMount() {
         const {request} = this.props;
-        request.on("change", this._onRequestChange);
+        request.on("change", this.onRequestChange);
         if (request.verifier) {
-            const {request} = this.props;
             const {sasEvent, reciprocateQREvent} = request.verifier;
             this.setState({sasEvent, reciprocateQREvent});
         }
-        this._onRequestChange();
+        this.onRequestChange();
     }
 
-    componentWillUnmount() {
+    public componentWillUnmount() {
         const {request} = this.props;
         if (request.verifier) {
-            request.verifier.off('show_sas', this._updateVerifierState);
-            request.verifier.off('show_reciprocate_qr', this._updateVerifierState);
+            request.verifier.off('show_sas', this.updateVerifierState);
+            request.verifier.off('show_reciprocate_qr', this.updateVerifierState);
         }
-        request.off("change", this._onRequestChange);
+        request.off("change", this.onRequestChange);
     }
 }
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index 3994d78390..eb9276b729 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -220,10 +220,10 @@ export default class AliasSettings extends React.Component {
             }
         }).catch((err) => {
             console.error(err);
-            Modal.createTrackedDialog('Error creating alias', '', ErrorDialog, {
-                title: _t("Error creating alias"),
+            Modal.createTrackedDialog('Error creating address', '', ErrorDialog, {
+                title: _t("Error creating address"),
                 description: _t(
-                    "There was an error creating that alias. It may not be allowed by the server " +
+                    "There was an error creating that address. It may not be allowed by the server " +
                     "or a temporary failure occurred.",
                 ),
             });
@@ -233,7 +233,7 @@ export default class AliasSettings extends React.Component {
     onLocalAliasDeleted = (index) => {
         const alias = this.state.localAliases[index];
         // TODO: In future, we should probably be making sure that the alias actually belongs
-        // to this room. See https://github.com/vector-im/riot-web/issues/7353
+        // to this room. See https://github.com/vector-im/element-web/issues/7353
         MatrixClientPeg.get().deleteAlias(alias).then(() => {
             const localAliases = this.state.localAliases.filter(a => a !== alias);
             this.setState({localAliases});
@@ -245,15 +245,15 @@ export default class AliasSettings extends React.Component {
             console.error(err);
             let description;
             if (err.errcode === "M_FORBIDDEN") {
-                description = _t("You don't have permission to delete the alias.");
+                description = _t("You don't have permission to delete the address.");
             } else {
                 description = _t(
-                    "There was an error removing that alias. It may no longer exist or a temporary " +
+                    "There was an error removing that address. It may no longer exist or a temporary " +
                     "error occurred.",
                 );
             }
-            Modal.createTrackedDialog('Error removing alias', '', ErrorDialog, {
-                title: _t("Error removing alias"),
+            Modal.createTrackedDialog('Error removing address', '', ErrorDialog, {
+                title: _t("Error removing address"),
                 description,
             });
         });
diff --git a/src/components/views/room_settings/ColorSettings.js b/src/components/views/room_settings/ColorSettings.js
index 1e06da0cd8..2179bd905e 100644
--- a/src/components/views/room_settings/ColorSettings.js
+++ b/src/components/views/room_settings/ColorSettings.js
@@ -19,8 +19,9 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 
 import Tinter from '../../../Tinter';
-import dis from '../../../dispatcher';
-import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
+import dis from '../../../dispatcher/dispatcher';
+import SettingsStore from "../../../settings/SettingsStore";
+import {SettingLevel} from "../../../settings/SettingLevel";
 
 const ROOM_COLORS = [
     // magic room default values courtesy of Ribot
@@ -38,7 +39,7 @@ const ROOM_COLORS = [
 
 // Dev note: this component is not attached anywhere, but is left here as it
 // has a high possibility of being used in the nearish future.
-// Ref: https://github.com/vector-im/riot-web/issues/8421
+// Ref: https://github.com/vector-im/element-web/issues/8421
 
 export default createReactClass({
     displayName: 'ColorSettings',
diff --git a/src/components/views/room_settings/UrlPreviewSettings.js b/src/components/views/room_settings/UrlPreviewSettings.js
index 5de355ebd7..fa5c1baf8f 100644
--- a/src/components/views/room_settings/UrlPreviewSettings.js
+++ b/src/components/views/room_settings/UrlPreviewSettings.js
@@ -22,9 +22,11 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import * as sdk from "../../../index";
 import { _t, _td } from '../../../languageHandler';
-import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
-import dis from "../../../dispatcher";
+import SettingsStore from "../../../settings/SettingsStore";
+import dis from "../../../dispatcher/dispatcher";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import {Action} from "../../../dispatcher/actions";
+import {SettingLevel} from "../../../settings/SettingLevel";
 
 
 export default createReactClass({
@@ -37,7 +39,7 @@ export default createReactClass({
     _onClickUserSettings: (e) => {
         e.preventDefault();
         e.stopPropagation();
-        dis.dispatch({action: 'view_user_settings'});
+        dis.fire(Action.ViewUserSettings);
     },
 
     render: function() {
@@ -57,7 +59,7 @@ export default createReactClass({
                         'a': (sub)=><a onClick={this._onClickUserSettings} href=''>{ sub }</a>,
                     })
                 );
-            } else if (accountEnabled) {
+            } else {
                 previewsForAccount = (
                     _t("You have <a>disabled</a> URL previews by default.", {}, {
                         'a': (sub)=><a onClick={this._onClickUserSettings} href=''>{ sub }</a>,
diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index 842b93170f..f173d76f24 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -21,7 +21,7 @@ import createReactClass from 'create-react-class';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import AppTile from '../elements/AppTile';
 import Modal from '../../../Modal';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import * as sdk from '../../../index';
 import * as ScalarMessaging from '../../../ScalarMessaging';
 import { _t } from '../../../languageHandler';
@@ -138,7 +138,7 @@ export default createReactClass({
     },
 
     _launchManageIntegrations: function() {
-        if (SettingsStore.isFeatureEnabled("feature_many_integration_managers")) {
+        if (SettingsStore.getValue("feature_many_integration_managers")) {
             IntegrationManagers.sharedInstance().openAll();
         } else {
             IntegrationManagers.sharedInstance().getPrimaryManager().open(this.props.room, 'add_integ');
diff --git a/src/components/views/rooms/Autocomplete.tsx b/src/components/views/rooms/Autocomplete.tsx
index 975c8e84a5..70f7556550 100644
--- a/src/components/views/rooms/Autocomplete.tsx
+++ b/src/components/views/rooms/Autocomplete.tsx
@@ -15,8 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
-import ReactDOM from 'react-dom';
+import React, {createRef, KeyboardEvent} from 'react';
 import classNames from 'classnames';
 import flatMap from 'lodash/flatMap';
 import {ICompletion, ISelectionRange, IProviderCompletions} from '../../../autocomplete/Autocompleter';
@@ -54,7 +53,7 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
     autocompleter: Autocompleter;
     queryRequested: string;
     debounceCompletionsRequest: NodeJS.Timeout;
-    containerRef: React.RefObject<HTMLDivElement>;
+    private containerRef = createRef<HTMLDivElement>();
 
     constructor(props) {
         super(props);
@@ -78,8 +77,6 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
 
             forceComplete: false,
         };
-
-        this.containerRef = React.createRef();
     }
 
     componentDidMount() {
@@ -256,14 +253,15 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
     componentDidUpdate(prevProps: IProps) {
         this.applyNewProps(prevProps.query, prevProps.room);
         // this is the selected completion, so scroll it into view if needed
-        const selectedCompletion = this.refs[`completion${this.state.selectionOffset}`];
-        if (selectedCompletion && this.containerRef.current) {
-            const domNode = ReactDOM.findDOMNode(selectedCompletion);
-            const offsetTop = domNode && (domNode as HTMLElement).offsetTop;
-            if (offsetTop > this.containerRef.current.scrollTop + this.containerRef.current.offsetHeight ||
-                offsetTop < this.containerRef.current.scrollTop) {
-                this.containerRef.current.scrollTop = offsetTop - this.containerRef.current.offsetTop;
-            }
+        const selectedCompletion = this.refs[`completion${this.state.selectionOffset}`] as HTMLElement;
+
+        if (selectedCompletion) {
+            selectedCompletion.scrollIntoView({
+                behavior: "auto",
+                block: "nearest",
+            });
+        } else if (this.containerRef.current) {
+            this.containerRef.current.scrollTo({ top: 0 });
         }
     }
 
diff --git a/src/components/views/rooms/AuxPanel.js b/src/components/views/rooms/AuxPanel.js
index e102b0dba4..521aeec406 100644
--- a/src/components/views/rooms/AuxPanel.js
+++ b/src/components/views/rooms/AuxPanel.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import * as sdk from '../../../index';
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 import * as ObjectUtils from '../../../ObjectUtils';
 import AppsDrawer from './AppsDrawer';
 import { _t } from '../../../languageHandler';
@@ -28,6 +28,7 @@ import classNames from 'classnames';
 import RateLimitedFunc from '../../../ratelimitedfunc';
 import SettingsStore from "../../../settings/SettingsStore";
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
+import CallView from "../voip/CallView";
 
 
 export default createReactClass({
@@ -103,7 +104,7 @@ export default createReactClass({
     },
 
     _rateLimitedUpdate: new RateLimitedFunc(function() {
-        if (SettingsStore.isFeatureEnabled("feature_state_counters")) {
+        if (SettingsStore.getValue("feature_state_counters")) {
             this.setState({counters: this._computeCounters()});
         }
     }, 500),
@@ -111,7 +112,7 @@ export default createReactClass({
     _computeCounters: function() {
         let counters = [];
 
-        if (this.props.room && SettingsStore.isFeatureEnabled("feature_state_counters")) {
+        if (this.props.room && SettingsStore.getValue("feature_state_counters")) {
             const stateEvs = this.props.room.currentState.getStateEvents('re.jki.counter');
             stateEvs.sort((a, b) => {
                 return a.getStateKey() < b.getStateKey();
@@ -142,7 +143,6 @@ export default createReactClass({
     },
 
     render: function() {
-        const CallView = sdk.getComponent("voip.CallView");
         const TintableSvg = sdk.getComponent("elements.TintableSvg");
 
         let fileDropTarget = null;
@@ -206,7 +206,7 @@ export default createReactClass({
         />;
 
         let stateViews = null;
-        if (this.state.counters && SettingsStore.isFeatureEnabled("feature_state_counters")) {
+        if (this.state.counters && SettingsStore.getValue("feature_state_counters")) {
             let counters = [];
 
             this.state.counters.forEach((counter, idx) => {
diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.tsx
similarity index 64%
rename from src/components/views/rooms/BasicMessageComposer.js
rename to src/components/views/rooms/BasicMessageComposer.tsx
index 2e4a966404..6024f272ec 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.tsx
@@ -16,11 +16,13 @@ limitations under the License.
 */
 
 import classNames from 'classnames';
-import React from 'react';
-import PropTypes from 'prop-types';
+import React, {createRef, ClipboardEvent} from 'react';
+import {Room} from 'matrix-js-sdk/src/models/room';
+import EMOTICON_REGEX from 'emojibase-regex/emoticon';
+
 import EditorModel from '../../../editor/model';
 import HistoryManager from '../../../editor/history';
-import {setSelection} from '../../../editor/caret';
+import {Caret, setSelection} from '../../../editor/caret';
 import {
     formatRangeAsQuote,
     formatRangeAsCode,
@@ -29,17 +31,21 @@ import {
 } from '../../../editor/operations';
 import {getCaretOffsetAndText, getRangeForSelection} from '../../../editor/dom';
 import Autocomplete, {generateCompletionDomId} from '../rooms/Autocomplete';
-import {autoCompleteCreator} from '../../../editor/parts';
+import {getAutoCompleteCreator} from '../../../editor/parts';
 import {parsePlainTextMessage} from '../../../editor/deserialize';
 import {renderModel} from '../../../editor/render';
-import {Room} from 'matrix-js-sdk';
 import TypingStore from "../../../stores/TypingStore";
 import SettingsStore from "../../../settings/SettingsStore";
-import EMOTICON_REGEX from 'emojibase-regex/emoticon';
-import * as sdk from '../../../index';
 import {Key} from "../../../Keyboard";
 import {EMOTICON_TO_EMOJI} from "../../../emoji";
 import {CommandCategories, CommandMap, parseCommandString} from "../../../SlashCommands";
+import Range from "../../../editor/range";
+import MessageComposerFormatBar from "./MessageComposerFormatBar";
+import DocumentOffset from "../../../editor/offset";
+import {IDiff} from "../../../editor/diff";
+import AutocompleteWrapperModel from "../../../editor/autocomplete";
+import DocumentPosition from "../../../editor/position";
+import {ICompletion} from "../../../autocomplete/Autocompleter";
 
 const REGEX_EMOTICON_WHITESPACE = new RegExp('(?:^|\\s)(' + EMOTICON_REGEX.source + ')\\s$');
 
@@ -49,7 +55,7 @@ function ctrlShortcutLabel(key) {
     return (IS_MAC ? "⌘" : "Ctrl") + "+" + key;
 }
 
-function cloneSelection(selection) {
+function cloneSelection(selection: Selection): Partial<Selection> {
     return {
         anchorNode: selection.anchorNode,
         anchorOffset: selection.anchorOffset,
@@ -61,7 +67,7 @@ function cloneSelection(selection) {
     };
 }
 
-function selectionEquals(a: Selection, b: Selection): boolean {
+function selectionEquals(a: Partial<Selection>, b: Selection): boolean {
     return a.anchorNode === b.anchorNode &&
         a.anchorOffset === b.anchorOffset &&
         a.focusNode === b.focusNode &&
@@ -71,44 +77,75 @@ function selectionEquals(a: Selection, b: Selection): boolean {
         a.type === b.type;
 }
 
-export default class BasicMessageEditor extends React.Component {
-    static propTypes = {
-        onChange: PropTypes.func,
-        model: PropTypes.instanceOf(EditorModel).isRequired,
-        room: PropTypes.instanceOf(Room).isRequired,
-        placeholder: PropTypes.string,
-        label: PropTypes.string,    // the aria label
-        initialCaret: PropTypes.object, // See DocumentPosition in editor/model.js
-    };
+enum Formatting {
+    Bold = "bold",
+    Italics = "italics",
+    Strikethrough = "strikethrough",
+    Code = "code",
+    Quote = "quote",
+}
+
+interface IProps {
+    model: EditorModel;
+    room: Room;
+    placeholder?: string;
+    label?: string;
+    initialCaret?: DocumentOffset;
+
+    onChange();
+    onPaste?(event: ClipboardEvent<HTMLDivElement>, model: EditorModel): boolean;
+}
+
+interface IState {
+    showPillAvatar: boolean;
+    query?: string;
+    showVisualBell?: boolean;
+    autoComplete?: AutocompleteWrapperModel;
+    completionIndex?: number;
+}
+
+export default class BasicMessageEditor extends React.Component<IProps, IState> {
+    private editorRef = createRef<HTMLDivElement>();
+    private autocompleteRef = createRef<Autocomplete>();
+    private formatBarRef = createRef<typeof MessageComposerFormatBar>();
+
+    private modifiedFlag = false;
+    private isIMEComposing = false;
+    private hasTextSelected = false;
+
+    private _isCaretAtEnd: boolean;
+    private lastCaret: DocumentOffset;
+    private lastSelection: ReturnType<typeof cloneSelection>;
+
+    private readonly emoticonSettingHandle: string;
+    private readonly shouldShowPillAvatarSettingHandle: string;
+    private readonly historyManager = new HistoryManager();
 
     constructor(props) {
         super(props);
         this.state = {
-            autoComplete: null,
             showPillAvatar: SettingsStore.getValue("Pill.shouldShowPillAvatar"),
         };
-        this._editorRef = null;
-        this._autocompleteRef = null;
-        this._formatBarRef = null;
-        this._modifiedFlag = false;
-        this._isIMEComposing = false;
-        this._hasTextSelected = false;
-        this._emoticonSettingHandle = null;
-        this._shouldShowPillAvatarSettingHandle = null;
+
+        this.emoticonSettingHandle = SettingsStore.watchSetting('MessageComposerInput.autoReplaceEmoji', null,
+            this.configureEmoticonAutoReplace);
+        this.configureEmoticonAutoReplace();
+        this.shouldShowPillAvatarSettingHandle = SettingsStore.watchSetting("Pill.shouldShowPillAvatar", null,
+            this.configureShouldShowPillAvatar);
     }
 
-    componentDidUpdate(prevProps) {
+    public componentDidUpdate(prevProps: IProps) {
         if (this.props.placeholder !== prevProps.placeholder && this.props.placeholder) {
             const {isEmpty} = this.props.model;
             if (isEmpty) {
-                this._showPlaceholder();
+                this.showPlaceholder();
             } else {
-                this._hidePlaceholder();
+                this.hidePlaceholder();
             }
         }
     }
 
-    _replaceEmoticon = (caretPosition, inputType, diff) => {
+    private replaceEmoticon = (caretPosition: DocumentPosition) => {
         const {model} = this.props;
         const range = model.startRange(caretPosition);
         // expand range max 8 characters backwards from caretPosition,
@@ -138,30 +175,30 @@ export default class BasicMessageEditor extends React.Component {
                 return range.replace([partCreator.plain(data.unicode + " ")]);
             }
         }
-    }
+    };
 
-    _updateEditorState = (selection, inputType, diff) => {
-        renderModel(this._editorRef, this.props.model);
+    private updateEditorState = (selection: Caret, inputType?: string, diff?: IDiff) => {
+        renderModel(this.editorRef.current, this.props.model);
         if (selection) { // set the caret/selection
             try {
-                setSelection(this._editorRef, this.props.model, selection);
+                setSelection(this.editorRef.current, this.props.model, selection);
             } catch (err) {
                 console.error(err);
             }
             // if caret selection is a range, take the end position
-            const position = selection.end || selection;
-            this._setLastCaretFromPosition(position);
+            const position = selection instanceof Range ? selection.end : selection;
+            this.setLastCaretFromPosition(position);
         }
         const {isEmpty} = this.props.model;
         if (this.props.placeholder) {
             if (isEmpty) {
-                this._showPlaceholder();
+                this.showPlaceholder();
             } else {
-                this._hidePlaceholder();
+                this.hidePlaceholder();
             }
         }
         if (isEmpty) {
-            this._formatBarRef.hide();
+            this.formatBarRef.current.hide();
         }
         this.setState({autoComplete: this.props.model.autoComplete});
         this.historyManager.tryPush(this.props.model, selection, inputType, diff);
@@ -179,31 +216,33 @@ export default class BasicMessageEditor extends React.Component {
         if (this.props.onChange) {
             this.props.onChange();
         }
+    };
+
+    private showPlaceholder() {
+        // escape single quotes
+        const placeholder = this.props.placeholder.replace(/'/g, '\\\'');
+        this.editorRef.current.style.setProperty("--placeholder", `'${placeholder}'`);
+        this.editorRef.current.classList.add("mx_BasicMessageComposer_inputEmpty");
     }
 
-    _showPlaceholder() {
-        this._editorRef.style.setProperty("--placeholder", `'${this.props.placeholder}'`);
-        this._editorRef.classList.add("mx_BasicMessageComposer_inputEmpty");
+    private hidePlaceholder() {
+        this.editorRef.current.classList.remove("mx_BasicMessageComposer_inputEmpty");
+        this.editorRef.current.style.removeProperty("--placeholder");
     }
 
-    _hidePlaceholder() {
-        this._editorRef.classList.remove("mx_BasicMessageComposer_inputEmpty");
-        this._editorRef.style.removeProperty("--placeholder");
-    }
-
-    _onCompositionStart = (event) => {
-        this._isIMEComposing = true;
+    private onCompositionStart = () => {
+        this.isIMEComposing = true;
         // even if the model is empty, the composition text shouldn't be mixed with the placeholder
-        this._hidePlaceholder();
-    }
+        this.hidePlaceholder();
+    };
 
-    _onCompositionEnd = (event) => {
-        this._isIMEComposing = false;
+    private onCompositionEnd = () => {
+        this.isIMEComposing = false;
         // some browsers (Chrome) don't fire an input event after ending a composition,
         // so trigger a model update after the composition is done by calling the input handler.
 
         // however, modifying the DOM (caused by the editor model update) from the compositionend handler seems
-        // to confuse the IME in Chrome, likely causing https://github.com/vector-im/riot-web/issues/10913 ,
+        // to confuse the IME in Chrome, likely causing https://github.com/vector-im/element-web/issues/10913 ,
         // so we do it async
 
         // however, doing this async seems to break things in Safari for some reason, so browser sniff.
@@ -212,51 +251,57 @@ export default class BasicMessageEditor extends React.Component {
         const isSafari = ua.includes('safari/') && !ua.includes('chrome/');
 
         if (isSafari) {
-            this._onInput({inputType: "insertCompositionText"});
+            this.onInput({inputType: "insertCompositionText"});
         } else {
             Promise.resolve().then(() => {
-                this._onInput({inputType: "insertCompositionText"});
+                this.onInput({inputType: "insertCompositionText"});
             });
         }
-    }
+    };
 
-    isComposing(event) {
+    isComposing(event: React.KeyboardEvent) {
         // checking the event.isComposing flag just in case any browser out there
         // emits events related to the composition after compositionend
         // has been fired
-        return !!(this._isIMEComposing || (event.nativeEvent && event.nativeEvent.isComposing));
+        return !!(this.isIMEComposing || (event.nativeEvent && event.nativeEvent.isComposing));
     }
 
-    _onCutCopy = (event, type) => {
+    private onCutCopy = (event: ClipboardEvent, type: string) => {
         const selection = document.getSelection();
         const text = selection.toString();
         if (text) {
             const {model} = this.props;
-            const range = getRangeForSelection(this._editorRef, model, selection);
+            const range = getRangeForSelection(this.editorRef.current, model, selection);
             const selectedParts = range.parts.map(p => p.serialize());
-            event.clipboardData.setData("application/x-riot-composer", JSON.stringify(selectedParts));
+            event.clipboardData.setData("application/x-element-composer", JSON.stringify(selectedParts));
             event.clipboardData.setData("text/plain", text); // so plain copy/paste works
             if (type === "cut") {
                 // Remove the text, updating the model as appropriate
-                this._modifiedFlag = true;
+                this.modifiedFlag = true;
                 replaceRangeAndMoveCaret(range, []);
             }
             event.preventDefault();
         }
-    }
+    };
 
-    _onCopy = (event) => {
-        this._onCutCopy(event, "copy");
-    }
+    private onCopy = (event: ClipboardEvent) => {
+        this.onCutCopy(event, "copy");
+    };
 
-    _onCut = (event) => {
-        this._onCutCopy(event, "cut");
-    }
+    private onCut = (event: ClipboardEvent) => {
+        this.onCutCopy(event, "cut");
+    };
+
+    private onPaste = (event: ClipboardEvent<HTMLDivElement>) => {
+        event.preventDefault(); // we always handle the paste ourselves
+        if (this.props.onPaste && this.props.onPaste(event, this.props.model)) {
+            // to prevent double handling, allow props.onPaste to skip internal onPaste
+            return true;
+        }
 
-    _onPaste = (event) => {
         const {model} = this.props;
         const {partCreator} = model;
-        const partsText = event.clipboardData.getData("application/x-riot-composer");
+        const partsText = event.clipboardData.getData("application/x-element-composer");
         let parts;
         if (partsText) {
             const serializedTextParts = JSON.parse(partsText);
@@ -266,29 +311,28 @@ export default class BasicMessageEditor extends React.Component {
             const text = event.clipboardData.getData("text/plain");
             parts = parsePlainTextMessage(text, partCreator);
         }
-        this._modifiedFlag = true;
-        const range = getRangeForSelection(this._editorRef, model, document.getSelection());
+        this.modifiedFlag = true;
+        const range = getRangeForSelection(this.editorRef.current, model, document.getSelection());
         replaceRangeAndMoveCaret(range, parts);
-        event.preventDefault();
-    }
+    };
 
-    _onInput = (event) => {
+    private onInput = (event: Partial<InputEvent>) => {
         // ignore any input while doing IME compositions
-        if (this._isIMEComposing) {
+        if (this.isIMEComposing) {
             return;
         }
-        this._modifiedFlag = true;
+        this.modifiedFlag = true;
         const sel = document.getSelection();
-        const {caret, text} = getCaretOffsetAndText(this._editorRef, sel);
+        const {caret, text} = getCaretOffsetAndText(this.editorRef.current, sel);
         this.props.model.update(text, event.inputType, caret);
-    }
+    };
 
-    _insertText(textToInsert, inputType = "insertText") {
+    private insertText(textToInsert: string, inputType = "insertText") {
         const sel = document.getSelection();
-        const {caret, text} = getCaretOffsetAndText(this._editorRef, sel);
+        const {caret, text} = getCaretOffsetAndText(this.editorRef.current, sel);
         const newText = text.substr(0, caret.offset) + textToInsert + text.substr(caret.offset);
         caret.offset += textToInsert.length;
-        this._modifiedFlag = true;
+        this.modifiedFlag = true;
         this.props.model.update(newText, inputType, caret);
     }
 
@@ -297,28 +341,28 @@ export default class BasicMessageEditor extends React.Component {
     // we don't need to. But if the user is navigating the caret without input
     // we need to recalculate it, to be able to know where to insert content after
     // losing focus
-    _setLastCaretFromPosition(position) {
+    private setLastCaretFromPosition(position: DocumentPosition) {
         const {model} = this.props;
         this._isCaretAtEnd = position.isAtEnd(model);
-        this._lastCaret = position.asOffset(model);
-        this._lastSelection = cloneSelection(document.getSelection());
+        this.lastCaret = position.asOffset(model);
+        this.lastSelection = cloneSelection(document.getSelection());
     }
 
-    _refreshLastCaretIfNeeded() {
+    private refreshLastCaretIfNeeded() {
         // XXX: needed when going up and down in editing messages ... not sure why yet
         // because the editors should stop doing this when when blurred ...
         // maybe it's on focus and the _editorRef isn't available yet or something.
-        if (!this._editorRef) {
+        if (!this.editorRef.current) {
             return;
         }
         const selection = document.getSelection();
-        if (!this._lastSelection || !selectionEquals(this._lastSelection, selection)) {
-            this._lastSelection = cloneSelection(selection);
-            const {caret, text} = getCaretOffsetAndText(this._editorRef, selection);
-            this._lastCaret = caret;
+        if (!this.lastSelection || !selectionEquals(this.lastSelection, selection)) {
+            this.lastSelection = cloneSelection(selection);
+            const {caret, text} = getCaretOffsetAndText(this.editorRef.current, selection);
+            this.lastCaret = caret;
             this._isCaretAtEnd = caret.offset === text.length;
         }
-        return this._lastCaret;
+        return this.lastCaret;
     }
 
     clearUndoHistory() {
@@ -326,11 +370,11 @@ export default class BasicMessageEditor extends React.Component {
     }
 
     getCaret() {
-        return this._lastCaret;
+        return this.lastCaret;
     }
 
     isSelectionCollapsed() {
-        return !this._lastSelection || this._lastSelection.isCollapsed;
+        return !this.lastSelection || this.lastSelection.isCollapsed;
     }
 
     isCaretAtStart() {
@@ -341,49 +385,51 @@ export default class BasicMessageEditor extends React.Component {
         return this._isCaretAtEnd;
     }
 
-    _onBlur = () => {
-        document.removeEventListener("selectionchange", this._onSelectionChange);
-    }
+    private onBlur = () => {
+        document.removeEventListener("selectionchange", this.onSelectionChange);
+    };
 
-    _onFocus = () => {
-        document.addEventListener("selectionchange", this._onSelectionChange);
+    private onFocus = () => {
+        document.addEventListener("selectionchange", this.onSelectionChange);
         // force to recalculate
-        this._lastSelection = null;
-        this._refreshLastCaretIfNeeded();
-    }
+        this.lastSelection = null;
+        this.refreshLastCaretIfNeeded();
+    };
 
-    _onSelectionChange = () => {
-        this._refreshLastCaretIfNeeded();
+    private onSelectionChange = () => {
+        const {isEmpty} = this.props.model;
+
+        this.refreshLastCaretIfNeeded();
         const selection = document.getSelection();
-        if (this._hasTextSelected && selection.isCollapsed) {
-            this._hasTextSelected = false;
-            if (this._formatBarRef) {
-                this._formatBarRef.hide();
+        if (this.hasTextSelected && selection.isCollapsed) {
+            this.hasTextSelected = false;
+            if (this.formatBarRef.current) {
+                this.formatBarRef.current.hide();
             }
-        } else if (!selection.isCollapsed) {
-            this._hasTextSelected = true;
-            if (this._formatBarRef) {
+        } else if (!selection.isCollapsed && !isEmpty) {
+            this.hasTextSelected = true;
+            if (this.formatBarRef.current) {
                 const selectionRect = selection.getRangeAt(0).getBoundingClientRect();
-                this._formatBarRef.showAt(selectionRect);
+                this.formatBarRef.current.showAt(selectionRect);
             }
         }
-    }
+    };
 
-    _onKeyDown = (event) => {
+    private onKeyDown = (event: React.KeyboardEvent) => {
         const model = this.props.model;
         const modKey = IS_MAC ? event.metaKey : event.ctrlKey;
         let handled = false;
         // format bold
         if (modKey && event.key === Key.B) {
-            this._onFormatAction("bold");
+            this.onFormatAction(Formatting.Bold);
             handled = true;
         // format italics
         } else if (modKey && event.key === Key.I) {
-            this._onFormatAction("italics");
+            this.onFormatAction(Formatting.Italics);
             handled = true;
         // format quote
         } else if (modKey && event.key === Key.GREATER_THAN) {
-            this._onFormatAction("quote");
+            this.onFormatAction(Formatting.Quote);
             handled = true;
         // redo
         } else if ((!IS_MAC && modKey && event.key === Key.Y) ||
@@ -406,18 +452,18 @@ export default class BasicMessageEditor extends React.Component {
             handled = true;
         // insert newline on Shift+Enter
         } else if (event.key === Key.ENTER && (event.shiftKey || (IS_MAC && event.altKey))) {
-            this._insertText("\n");
+            this.insertText("\n");
             handled = true;
         // move selection to start of composer
         } else if (modKey && event.key === Key.HOME && !event.shiftKey) {
-            setSelection(this._editorRef, model, {
+            setSelection(this.editorRef.current, model, {
                 index: 0,
                 offset: 0,
             });
             handled = true;
         // move selection to end of composer
         } else if (modKey && event.key === Key.END && !event.shiftKey) {
-            setSelection(this._editorRef, model, {
+            setSelection(this.editorRef.current, model, {
                 index: model.parts.length - 1,
                 offset: model.parts[model.parts.length - 1].text.length,
             });
@@ -457,19 +503,19 @@ export default class BasicMessageEditor extends React.Component {
                         return; // don't preventDefault on anything else
                 }
             } else if (event.key === Key.TAB) {
-                this._tabCompleteName();
+                this.tabCompleteName(event);
                 handled = true;
             } else if (event.key === Key.BACKSPACE || event.key === Key.DELETE) {
-                this._formatBarRef.hide();
+                this.formatBarRef.current.hide();
             }
         }
         if (handled) {
             event.preventDefault();
             event.stopPropagation();
         }
-    }
+    };
 
-    async _tabCompleteName() {
+    private async tabCompleteName(event: React.KeyboardEvent) {
         try {
             await new Promise(resolve => this.setState({showVisualBell: false}, resolve));
             const {model} = this.props;
@@ -492,7 +538,7 @@ export default class BasicMessageEditor extends React.Component {
 
             // Don't try to do things with the autocomplete if there is none shown
             if (model.autoComplete) {
-                await model.autoComplete.onTab();
+                await model.autoComplete.onTab(event);
                 if (!model.autoComplete.hasSelection()) {
                     this.setState({showVisualBell: true});
                     model.autoComplete.close();
@@ -503,69 +549,61 @@ export default class BasicMessageEditor extends React.Component {
         }
     }
 
-    getEditableRootNode() {
-        return this._editorRef;
-    }
-
     isModified() {
-        return this._modifiedFlag;
+        return this.modifiedFlag;
     }
 
-    _onAutoCompleteConfirm = (completion) => {
+    private onAutoCompleteConfirm = (completion: ICompletion) => {
+        this.modifiedFlag = true;
         this.props.model.autoComplete.onComponentConfirm(completion);
-    }
-
-    _onAutoCompleteSelectionChange = (completion, completionIndex) => {
-        this.props.model.autoComplete.onComponentSelectionChange(completion);
-        this.setState({completionIndex});
-    }
-
-    _configureEmoticonAutoReplace = () => {
-        const shouldReplace = SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji');
-        this.props.model.setTransformCallback(shouldReplace ? this._replaceEmoticon : null);
     };
 
-    _configureShouldShowPillAvatar = () => {
+    private onAutoCompleteSelectionChange = (completion: ICompletion, completionIndex: number) => {
+        this.modifiedFlag = true;
+        this.props.model.autoComplete.onComponentSelectionChange(completion);
+        this.setState({completionIndex});
+    };
+
+    private configureEmoticonAutoReplace = () => {
+        const shouldReplace = SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji');
+        this.props.model.setTransformCallback(shouldReplace ? this.replaceEmoticon : null);
+    };
+
+    private configureShouldShowPillAvatar = () => {
         const showPillAvatar = SettingsStore.getValue("Pill.shouldShowPillAvatar");
         this.setState({ showPillAvatar });
     };
 
     componentWillUnmount() {
-        document.removeEventListener("selectionchange", this._onSelectionChange);
-        this._editorRef.removeEventListener("input", this._onInput, true);
-        this._editorRef.removeEventListener("compositionstart", this._onCompositionStart, true);
-        this._editorRef.removeEventListener("compositionend", this._onCompositionEnd, true);
-        SettingsStore.unwatchSetting(this._emoticonSettingHandle);
-        SettingsStore.unwatchSetting(this._shouldShowPillAvatarSettingHandle);
+        document.removeEventListener("selectionchange", this.onSelectionChange);
+        this.editorRef.current.removeEventListener("input", this.onInput, true);
+        this.editorRef.current.removeEventListener("compositionstart", this.onCompositionStart, true);
+        this.editorRef.current.removeEventListener("compositionend", this.onCompositionEnd, true);
+        SettingsStore.unwatchSetting(this.emoticonSettingHandle);
+        SettingsStore.unwatchSetting(this.shouldShowPillAvatarSettingHandle);
     }
 
     componentDidMount() {
         const model = this.props.model;
-        model.setUpdateCallback(this._updateEditorState);
-        this._emoticonSettingHandle = SettingsStore.watchSetting('MessageComposerInput.autoReplaceEmoji', null,
-            this._configureEmoticonAutoReplace);
-        this._configureEmoticonAutoReplace();
-        this._shouldShowPillAvatarSettingHandle = SettingsStore.watchSetting("Pill.shouldShowPillAvatar", null,
-            this._configureShouldShowPillAvatar);
+        model.setUpdateCallback(this.updateEditorState);
         const partCreator = model.partCreator;
         // TODO: does this allow us to get rid of EditorStateTransfer?
         // not really, but we could not serialize the parts, and just change the autoCompleter
-        partCreator.setAutoCompleteCreator(autoCompleteCreator(
-            () => this._autocompleteRef,
+        partCreator.setAutoCompleteCreator(getAutoCompleteCreator(
+            () => this.autocompleteRef.current,
             query => new Promise(resolve => this.setState({query}, resolve)),
         ));
-        this.historyManager = new HistoryManager(partCreator);
         // initial render of model
-        this._updateEditorState(this._getInitialCaretPosition());
+        this.updateEditorState(this.getInitialCaretPosition());
         // attach input listener by hand so React doesn't proxy the events,
         // as the proxied event doesn't support inputType, which we need.
-        this._editorRef.addEventListener("input", this._onInput, true);
-        this._editorRef.addEventListener("compositionstart", this._onCompositionStart, true);
-        this._editorRef.addEventListener("compositionend", this._onCompositionEnd, true);
-        this._editorRef.focus();
+        this.editorRef.current.addEventListener("input", this.onInput, true);
+        this.editorRef.current.addEventListener("compositionstart", this.onCompositionStart, true);
+        this.editorRef.current.addEventListener("compositionend", this.onCompositionEnd, true);
+        this.editorRef.current.focus();
     }
 
-    _getInitialCaretPosition() {
+    private getInitialCaretPosition() {
         let caretPosition;
         if (this.props.initialCaret) {
             // if restoring state from a previous editor,
@@ -579,34 +617,34 @@ export default class BasicMessageEditor extends React.Component {
         return caretPosition;
     }
 
-    _onFormatAction = (action) => {
+    private onFormatAction = (action: Formatting) => {
         const range = getRangeForSelection(
-            this._editorRef,
+            this.editorRef.current,
             this.props.model,
             document.getSelection());
         if (range.length === 0) {
             return;
         }
         this.historyManager.ensureLastChangesPushed(this.props.model);
-        this._modifiedFlag = true;
+        this.modifiedFlag = true;
         switch (action) {
-            case "bold":
+            case Formatting.Bold:
                 toggleInlineFormat(range, "**");
                 break;
-            case "italics":
+            case Formatting.Italics:
                 toggleInlineFormat(range, "_");
                 break;
-            case "strikethrough":
+            case Formatting.Strikethrough:
                 toggleInlineFormat(range, "<del>", "</del>");
                 break;
-            case "code":
+            case Formatting.Code:
                 formatRangeAsCode(range);
                 break;
-            case "quote":
+            case Formatting.Quote:
                 formatRangeAsQuote(range);
                 break;
         }
-    }
+    };
 
     render() {
         let autoComplete;
@@ -615,10 +653,10 @@ export default class BasicMessageEditor extends React.Component {
             const queryLen = query.length;
             autoComplete = (<div className="mx_BasicMessageComposer_AutoCompleteWrapper">
                 <Autocomplete
-                    ref={ref => this._autocompleteRef = ref}
+                    ref={this.autocompleteRef}
                     query={query}
-                    onConfirm={this._onAutoCompleteConfirm}
-                    onSelectionChange={this._onAutoCompleteSelectionChange}
+                    onConfirm={this.onAutoCompleteConfirm}
+                    onSelectionChange={this.onAutoCompleteSelectionChange}
                     selection={{beginning: true, end: queryLen, start: queryLen}}
                     room={this.props.room}
                 />
@@ -631,7 +669,6 @@ export default class BasicMessageEditor extends React.Component {
             "mx_BasicMessageComposer_input_shouldShowPillAvatar": this.state.showPillAvatar,
         });
 
-        const MessageComposerFormatBar = sdk.getComponent('rooms.MessageComposerFormatBar');
         const shortcuts = {
             bold: ctrlShortcutLabel("B"),
             italics: ctrlShortcutLabel("I"),
@@ -642,18 +679,18 @@ export default class BasicMessageEditor extends React.Component {
 
         return (<div className={wrapperClasses}>
             { autoComplete }
-            <MessageComposerFormatBar ref={ref => this._formatBarRef = ref} onAction={this._onFormatAction} shortcuts={shortcuts} />
+            <MessageComposerFormatBar ref={this.formatBarRef} onAction={this.onFormatAction} shortcuts={shortcuts} />
             <div
                 className={classes}
                 contentEditable="true"
-                tabIndex="0"
-                onBlur={this._onBlur}
-                onFocus={this._onFocus}
-                onCopy={this._onCopy}
-                onCut={this._onCut}
-                onPaste={this._onPaste}
-                onKeyDown={this._onKeyDown}
-                ref={ref => this._editorRef = ref}
+                tabIndex={0}
+                onBlur={this.onBlur}
+                onFocus={this.onFocus}
+                onCopy={this.onCopy}
+                onCut={this.onCut}
+                onPaste={this.onPaste}
+                onKeyDown={this.onKeyDown}
+                ref={this.editorRef}
                 aria-label={this.props.label}
                 role="textbox"
                 aria-multiline="true"
@@ -667,6 +704,6 @@ export default class BasicMessageEditor extends React.Component {
     }
 
     focus() {
-        this._editorRef.focus();
+        this.editorRef.current.focus();
     }
 }
diff --git a/src/components/views/rooms/E2EIcon.js b/src/components/views/rooms/E2EIcon.js
index 5e74656920..d7316f198d 100644
--- a/src/components/views/rooms/E2EIcon.js
+++ b/src/components/views/rooms/E2EIcon.js
@@ -20,7 +20,6 @@ import PropTypes from "prop-types";
 import classNames from 'classnames';
 
 import {_t, _td} from '../../../languageHandler';
-import {useSettingValue} from "../../../hooks/useSettings";
 import AccessibleButton from "../elements/AccessibleButton";
 import Tooltip from "../elements/Tooltip";
 
@@ -29,6 +28,7 @@ export const E2E_STATE = {
     WARNING: "warning",
     UNKNOWN: "unknown",
     NORMAL: "normal",
+    UNAUTHENTICATED: "unauthenticated",
 };
 
 const crossSigningUserTitles = {
@@ -42,35 +42,22 @@ const crossSigningRoomTitles = {
     [E2E_STATE.VERIFIED]: _td("Everyone in this room is verified"),
 };
 
-const legacyUserTitles = {
-    [E2E_STATE.WARNING]: _td("Some sessions for this user are not trusted"),
-    [E2E_STATE.VERIFIED]: _td("All sessions for this user are trusted"),
-};
-const legacyRoomTitles = {
-    [E2E_STATE.WARNING]: _td("Some sessions in this encrypted room are not trusted"),
-    [E2E_STATE.VERIFIED]: _td("All sessions in this encrypted room are trusted"),
-};
-
-const E2EIcon = ({isUser, status, className, size, onClick, hideTooltip}) => {
+const E2EIcon = ({isUser, status, className, size, onClick, hideTooltip, bordered}) => {
     const [hover, setHover] = useState(false);
 
     const classes = classNames({
         mx_E2EIcon: true,
+        mx_E2EIcon_bordered: bordered,
         mx_E2EIcon_warning: status === E2E_STATE.WARNING,
         mx_E2EIcon_normal: status === E2E_STATE.NORMAL,
         mx_E2EIcon_verified: status === E2E_STATE.VERIFIED,
     }, className);
 
     let e2eTitle;
-    const crossSigning = useSettingValue("feature_cross_signing");
-    if (crossSigning && isUser) {
+    if (isUser) {
         e2eTitle = crossSigningUserTitles[status];
-    } else if (crossSigning && !isUser) {
+    } else {
         e2eTitle = crossSigningRoomTitles[status];
-    } else if (!crossSigning && isUser) {
-        e2eTitle = legacyUserTitles[status];
-    } else if (!crossSigning && !isUser) {
-        e2eTitle = legacyRoomTitles[status];
     }
 
     let style;
@@ -79,7 +66,7 @@ const E2EIcon = ({isUser, status, className, size, onClick, hideTooltip}) => {
     }
 
     const onMouseOver = () => setHover(true);
-    const onMouseOut = () => setHover(false);
+    const onMouseLeave = () => setHover(false);
 
     let tip;
     if (hover && !hideTooltip) {
@@ -91,7 +78,7 @@ const E2EIcon = ({isUser, status, className, size, onClick, hideTooltip}) => {
             <AccessibleButton
                 onClick={onClick}
                 onMouseOver={onMouseOver}
-                onMouseOut={onMouseOut}
+                onMouseLeave={onMouseLeave}
                 className={classes}
                 style={style}
             >
@@ -100,7 +87,7 @@ const E2EIcon = ({isUser, status, className, size, onClick, hideTooltip}) => {
         );
     }
 
-    return <div onMouseOver={onMouseOver} onMouseOut={onMouseOut} className={classes} style={style}>
+    return <div onMouseOver={onMouseOver} onMouseLeave={onMouseLeave} className={classes} style={style}>
         { tip }
     </div>;
 };
diff --git a/src/components/views/rooms/EditMessageComposer.js b/src/components/views/rooms/EditMessageComposer.js
index 8353940c90..78c7de887d 100644
--- a/src/components/views/rooms/EditMessageComposer.js
+++ b/src/components/views/rooms/EditMessageComposer.js
@@ -18,7 +18,7 @@ import React from 'react';
 import * as sdk from '../../../index';
 import {_t} from '../../../languageHandler';
 import PropTypes from 'prop-types';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import EditorModel from '../../../editor/model';
 import {getCaretOffsetAndText} from '../../../editor/dom';
 import {htmlSerializeIfNeeded, textSerialize, containsEmote, stripEmoteCommand} from '../../../editor/serialize';
@@ -31,6 +31,7 @@ import {EventStatus} from 'matrix-js-sdk';
 import BasicMessageComposer from "./BasicMessageComposer";
 import {Key} from "../../../Keyboard";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import {Action} from "../../../dispatcher/actions";
 
 function _isReply(mxEvent) {
     const relatesTo = mxEvent.getContent()["m.relates_to"];
@@ -157,7 +158,7 @@ export default class EditMessageComposer extends React.Component {
                 dis.dispatch({action: 'edit_event', event: nextEvent});
             } else {
                 dis.dispatch({action: 'edit_event', event: null});
-                dis.dispatch({action: 'focus_composer'});
+                dis.fire(Action.FocusComposer);
             }
             event.preventDefault();
         }
@@ -165,7 +166,7 @@ export default class EditMessageComposer extends React.Component {
 
     _cancelEdit = () => {
         dis.dispatch({action: "edit_event", event: null});
-        dis.dispatch({action: 'focus_composer'});
+        dis.fire(Action.FocusComposer);
     }
 
     _isContentModified(newContent) {
@@ -190,11 +191,12 @@ export default class EditMessageComposer extends React.Component {
             const roomId = editedEvent.getRoomId();
             this._cancelPreviousPendingEdit();
             this.context.sendMessage(roomId, editContent);
+            dis.dispatch({action: "message_sent"});
         }
 
         // close the event editing and focus composer
         dis.dispatch({action: "edit_event", event: null});
-        dis.dispatch({action: 'focus_composer'});
+        dis.fire(Action.FocusComposer);
     };
 
     _cancelPreviousPendingEdit() {
diff --git a/src/components/views/rooms/EntityTile.js b/src/components/views/rooms/EntityTile.js
index b6d2bce785..d880e824da 100644
--- a/src/components/views/rooms/EntityTile.js
+++ b/src/components/views/rooms/EntityTile.js
@@ -170,7 +170,7 @@ const EntityTile = createReactClass({
         let e2eIcon;
         const { e2eStatus } = this.props;
         if (e2eStatus) {
-            e2eIcon = <E2EIcon status={e2eStatus} isUser={true} />;
+            e2eIcon = <E2EIcon status={e2eStatus} isUser={true} bordered={true} />;
         }
 
         const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index a64fd82eb5..2f00447287 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -25,7 +25,7 @@ import classNames from "classnames";
 import { _t, _td } from '../../../languageHandler';
 import * as TextForEvent from "../../../TextForEvent";
 import * as sdk from "../../../index";
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import SettingsStore from "../../../settings/SettingsStore";
 import {EventStatus} from 'matrix-js-sdk';
 import {formatTime} from "../../../DateUtils";
@@ -34,7 +34,7 @@ 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/rem";
+import {toRem} from "../../../utils/units";
 
 const eventTileTypes = {
     'm.room.message': 'messages.MessageEvent',
@@ -60,7 +60,7 @@ const stateEventTileTypes = {
     'm.room.power_levels': 'messages.TextualEvent',
     'm.room.pinned_events': 'messages.TextualEvent',
     'm.room.server_acl': 'messages.TextualEvent',
-    // TODO: Enable support for m.widget event type (https://github.com/vector-im/riot-web/issues/13111)
+    // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
     'im.vector.modular.widgets': 'messages.TextualEvent',
     'm.room.tombstone': 'messages.TextualEvent',
     'm.room.join_rules': 'messages.TextualEvent',
@@ -104,7 +104,7 @@ export function getHandlerTile(ev) {
     // fall back to showing hidden events, if we're viewing hidden events
     // XXX: This is extremely a hack. Possibly these components should have an interface for
     // declining to render?
-    if (type === "m.key.verification.cancel" && SettingsStore.getValue("showHiddenEventsInTimeline")) {
+    if (type === "m.key.verification.cancel" || type === "m.key.verification.done") {
         const MKeyVerificationConclusion = sdk.getComponent("messages.MKeyVerificationConclusion");
         if (!MKeyVerificationConclusion.prototype._shouldRender.call(null, ev, ev.request)) {
             return;
@@ -206,6 +206,9 @@ export default createReactClass({
 
         // whether to show reactions for this event
         showReactions: PropTypes.bool,
+
+        // whether to use the irc layout
+        useIRCLayout: PropTypes.bool,
     },
 
     getDefaultProps: function() {
@@ -310,44 +313,52 @@ export default createReactClass({
             return;
         }
 
-        // If we directly trust the device, short-circuit here
-        const verified = await this.context.isEventSenderVerified(mxEvent);
-        if (verified) {
-            this.setState({
-                verified: E2E_STATE.VERIFIED,
-            }, () => {
-                // Decryption may have caused a change in size
-                this.props.onHeightChanged();
-            });
-            return;
-        }
+        const encryptionInfo = this.context.getEventEncryptionInfo(mxEvent);
+        const senderId = mxEvent.getSender();
+        const userTrust = this.context.checkUserTrust(senderId);
 
-        // If cross-signing is off, the old behaviour is to scream at the user
-        // as if they've done something wrong, which they haven't
-        if (!SettingsStore.getValue("feature_cross_signing")) {
+        if (encryptionInfo.mismatchedSender) {
+            // something definitely wrong is going on here
             this.setState({
                 verified: E2E_STATE.WARNING,
-            }, this.props.onHeightChanged);
+            }, this.props.onHeightChanged); // Decryption may have caused a change in size
             return;
         }
 
-        if (!this.context.checkUserTrust(mxEvent.getSender()).isCrossSigningVerified()) {
+        if (!userTrust.isCrossSigningVerified()) {
+            // user is not verified, so default to everything is normal
             this.setState({
                 verified: E2E_STATE.NORMAL,
-            }, this.props.onHeightChanged);
+            }, this.props.onHeightChanged); // Decryption may have caused a change in size
             return;
         }
 
-        const eventSenderTrust = await this.context.checkEventSenderTrust(mxEvent);
+        const eventSenderTrust = encryptionInfo.sender && this.context.checkDeviceTrust(
+            senderId, encryptionInfo.sender.deviceId,
+        );
         if (!eventSenderTrust) {
             this.setState({
                 verified: E2E_STATE.UNKNOWN,
-            }, this.props.onHeightChanged); // Decryption may have cause a change in size
+            }, this.props.onHeightChanged); // Decryption may have caused a change in size
+            return;
+        }
+
+        if (!eventSenderTrust.isVerified()) {
+            this.setState({
+                verified: E2E_STATE.WARNING,
+            }, this.props.onHeightChanged); // Decryption may have caused a change in size
+            return;
+        }
+
+        if (!encryptionInfo.authenticated) {
+            this.setState({
+                verified: E2E_STATE.UNAUTHENTICATED,
+            }, this.props.onHeightChanged); // Decryption may have caused a change in size
             return;
         }
 
         this.setState({
-            verified: eventSenderTrust.isVerified() ? E2E_STATE.VERIFIED : E2E_STATE.WARNING,
+            verified: E2E_STATE.VERIFIED,
         }, this.props.onHeightChanged); // Decryption may have caused a change in size
     },
 
@@ -400,7 +411,7 @@ export default createReactClass({
     },
 
     shouldHighlight: function() {
-        const actions = this.context.getPushActionsForEvent(this.props.mxEvent);
+        const actions = this.context.getPushActionsForEvent(this.props.mxEvent.replacingEvent() || this.props.mxEvent);
         if (!actions || !actions.tweaks) { return false; }
 
         // don't show self-highlights from another of our clients
@@ -508,7 +519,7 @@ export default createReactClass({
 
     onPermalinkClicked: function(e) {
         // This allows the permalink to be opened in a new tab/window or copied as
-        // matrix.to, but also for it to enable routing within Riot when clicked.
+        // matrix.to, but also for it to enable routing within Element when clicked.
         e.preventDefault();
         dis.dispatch({
             action: 'view_room',
@@ -532,6 +543,8 @@ export default createReactClass({
                 return; // no icon if we've not even cross-signed the user
             } else if (this.state.verified === E2E_STATE.VERIFIED) {
                 return; // no icon for verified
+            } else if (this.state.verified === E2E_STATE.UNAUTHENTICATED) {
+                return (<E2ePadlockUnauthenticated />);
             } else if (this.state.verified === E2E_STATE.UNKNOWN) {
                 return (<E2ePadlockUnknown />);
             } else {
@@ -582,11 +595,11 @@ export default createReactClass({
         }
         const eventId = this.props.mxEvent.getId();
         if (!eventId) {
-            // XXX: Temporary diagnostic logging for https://github.com/vector-im/riot-web/issues/11120
+            // XXX: Temporary diagnostic logging for https://github.com/vector-im/element-web/issues/11120
             console.error("EventTile attempted to get relations for an event without an ID");
             // Use event's special `toJSON` method to log key data.
             console.log(JSON.stringify(this.props.mxEvent, null, 4));
-            console.trace("Stacktrace for https://github.com/vector-im/riot-web/issues/11120");
+            console.trace("Stacktrace for https://github.com/vector-im/element-web/issues/11120");
         }
         return this.props.getRelationsForEvent(eventId, "m.annotation", "m.reaction");
     },
@@ -670,9 +683,11 @@ export default createReactClass({
             mx_EventTile_unknown: !isBubbleMessage && this.state.verified === E2E_STATE.UNKNOWN,
             mx_EventTile_bad: isEncryptionFailure,
             mx_EventTile_emote: msgtype === 'm.emote',
-            mx_EventTile_redacted: isRedacted,
         });
 
+        // If the tile is in the Sending state, don't speak the message.
+        const ariaLive = (this.props.eventSendStatus !== null) ? 'off' : undefined;
+
         let permalink = "#";
         if (this.props.permalinkCreator) {
             permalink = this.props.permalinkCreator.forEvent(this.props.mxEvent.getId());
@@ -696,6 +711,9 @@ export default createReactClass({
             // joins/parts/etc
             avatarSize = 14;
             needsSenderProfile = false;
+        } else if (this.props.useIRCLayout) {
+            avatarSize = 14;
+            needsSenderProfile = true;
         } else if (this.props.continuation && this.props.tileShape !== "file_grid") {
             // no avatar or sender profile for continuation messages
             avatarSize = 0;
@@ -787,11 +805,24 @@ export default createReactClass({
             />;
         }
 
+        const linkedTimestamp = <a
+                href={permalink}
+                onClick={this.onPermalinkClicked}
+                aria-label={formatTime(new Date(this.props.mxEvent.getTs()), this.props.isTwelveHour)}
+            >
+                { 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();
+
         switch (this.props.tileShape) {
             case 'notif': {
                 const room = this.context.getRoom(this.props.mxEvent.getRoomId());
                 return (
-                    <div className={classes}>
+                    <div className={classes} aria-live={ariaLive} aria-atomic="true">
                         <div className="mx_EventTile_roomName">
                             <a href={permalink} onClick={this.onPermalinkClicked}>
                                 { room ? room.name : '' }
@@ -817,7 +848,7 @@ export default createReactClass({
             }
             case 'file_grid': {
                 return (
-                    <div className={classes}>
+                    <div className={classes} aria-live={ariaLive} aria-atomic="true">
                         <div className="mx_EventTile_line">
                             <EventTileType ref={this._tile}
                                            mxEvent={this.props.mxEvent}
@@ -853,14 +884,14 @@ export default createReactClass({
                     );
                 }
                 return (
-                    <div className={classes}>
+                    <div className={classes} aria-live={ariaLive} aria-atomic="true">
+                        { ircTimestamp }
                         { avatar }
                         { sender }
+                        { ircPadlock }
                         <div className="mx_EventTile_reply">
-                            <a href={permalink} onClick={this.onPermalinkClicked}>
-                                { timestamp }
-                            </a>
-                            { !isBubbleMessage && this._renderE2EPadlock() }
+                            { groupTimestamp }
+                            { groupPadlock }
                             { thread }
                             <EventTileType ref={this._tile}
                                            mxEvent={this.props.mxEvent}
@@ -878,23 +909,21 @@ export default createReactClass({
                     this.props.onHeightChanged,
                     this.props.permalinkCreator,
                     this._replyThread,
+                    this.props.useIRCLayout,
                 );
+
                 // 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}>
+                    <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">
-                            <a
-                                href={permalink}
-                                onClick={this.onPermalinkClicked}
-                                aria-label={formatTime(new Date(this.props.mxEvent.getTs()), this.props.isTwelveHour)}
-                            >
-                                { timestamp }
-                            </a>
-                            { !isBubbleMessage && this._renderE2EPadlock() }
+                            { groupTimestamp }
+                            { groupPadlock }
                             { thread }
                             <EventTileType ref={this._tile}
                                            mxEvent={this.props.mxEvent}
@@ -969,6 +998,12 @@ function E2ePadlockUnknown(props) {
     );
 }
 
+function E2ePadlockUnauthenticated(props) {
+    return (
+        <E2ePadlock title={_t("The authenticity of this encrypted message can't be guaranteed on this device.")} icon="unauthenticated" {...props} />
+    );
+}
+
 class E2ePadlock extends React.Component {
     static propTypes = {
         icon: PropTypes.string.isRequired,
diff --git a/src/components/views/rooms/ForwardMessage.js b/src/components/views/rooms/ForwardMessage.js
index a3c00598a7..03ca32c5e6 100644
--- a/src/components/views/rooms/ForwardMessage.js
+++ b/src/components/views/rooms/ForwardMessage.js
@@ -19,7 +19,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import { _t } from '../../../languageHandler';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import {Key} from '../../../Keyboard';
 
 
diff --git a/src/components/views/rooms/InviteOnlyIcon.js b/src/components/views/rooms/InviteOnlyIcon.js
deleted file mode 100644
index b02f9843d9..0000000000
--- a/src/components/views/rooms/InviteOnlyIcon.js
+++ /dev/null
@@ -1,53 +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 { _t } from '../../../languageHandler';
-import * as sdk from '../../../index';
-
-export default class InviteOnlyIcon extends React.Component {
-    constructor() {
-        super();
-
-        this.state = {
-            hover: false,
-        };
-    }
-
-    onHoverStart = () => {
-        this.setState({hover: true});
-    };
-
-    onHoverEnd = () => {
-        this.setState({hover: false});
-    };
-
-    render() {
-        const classes = this.props.collapsedPanel ? "mx_InviteOnlyIcon_small": "mx_InviteOnlyIcon_large";
-
-        const Tooltip = sdk.getComponent("elements.Tooltip");
-        let tooltip;
-        if (this.state.hover) {
-            tooltip = <Tooltip className="mx_InviteOnlyIcon_tooltip" label={_t("Invite only")} dir="auto" />;
-        }
-        return (<div className={classes}
-          onMouseEnter={this.onHoverStart}
-          onMouseLeave={this.onHoverEnd}
-        >
-          { tooltip }
-        </div>);
-    }
-}
diff --git a/src/components/views/rooms/JumpToBottomButton.js b/src/components/views/rooms/JumpToBottomButton.js
index d3305f498a..b6cefc1231 100644
--- a/src/components/views/rooms/JumpToBottomButton.js
+++ b/src/components/views/rooms/JumpToBottomButton.js
@@ -16,13 +16,18 @@ limitations under the License.
 
 import { _t } from '../../../languageHandler';
 import AccessibleButton from '../elements/AccessibleButton';
+import classNames from 'classnames';
 
 export default (props) => {
+    const className = classNames({
+        'mx_JumpToBottomButton': true,
+        'mx_JumpToBottomButton_highlight': props.highlight,
+    });
     let badge;
     if (props.numUnreadMessages) {
         badge = (<div className="mx_JumpToBottomButton_badge">{props.numUnreadMessages}</div>);
     }
-    return (<div className="mx_JumpToBottomButton">
+    return (<div className={className}>
         <AccessibleButton className="mx_JumpToBottomButton_scrollDown"
             title={_t("Scroll to most recent messages")}
             onClick={props.onScrollToBottomClick}>
diff --git a/src/components/views/rooms/LinkPreviewWidget.js b/src/components/views/rooms/LinkPreviewWidget.js
index 1fe70dc61c..d1c1ce04f9 100644
--- a/src/components/views/rooms/LinkPreviewWidget.js
+++ b/src/components/views/rooms/LinkPreviewWidget.js
@@ -134,7 +134,7 @@ export default createReactClass({
 
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         return (
-            <div className="mx_LinkPreviewWidget" >
+            <div className="mx_LinkPreviewWidget">
                 { img }
                 <div className="mx_LinkPreviewWidget_caption">
                     <div className="mx_LinkPreviewWidget_title"><a href={this.props.link} target="_blank" rel="noreferrer noopener">{ p["og:title"] }</a></div>
diff --git a/src/components/views/rooms/MemberDeviceInfo.js b/src/components/views/rooms/MemberDeviceInfo.js
deleted file mode 100644
index dbf0ae0c62..0000000000
--- a/src/components/views/rooms/MemberDeviceInfo.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-Copyright 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 { _t } from '../../../languageHandler';
-import classNames from 'classnames';
-
-export default class MemberDeviceInfo extends React.Component {
-    render() {
-        const DeviceVerifyButtons = sdk.getComponent('elements.DeviceVerifyButtons');
-        // XXX: These checks are not cross-signing aware but this component is only used
-        // from the old, pre-cross-signing memberinfopanel
-        const iconClasses = classNames({
-            mx_MemberDeviceInfo_icon: true,
-            mx_MemberDeviceInfo_icon_blacklisted: this.props.device.isBlocked(),
-            mx_MemberDeviceInfo_icon_verified: this.props.device.isVerified(),
-            mx_MemberDeviceInfo_icon_unverified: this.props.device.isUnverified(),
-        });
-        const indicator = (<div className={iconClasses} />);
-        const deviceName = (this.props.device.ambiguous || this.props.showDeviceId) ?
-            (this.props.device.getDisplayName() ? this.props.device.getDisplayName() : "") + " (" + this.props.device.deviceId + ")" :
-            this.props.device.getDisplayName();
-
-        // add the deviceId as a titletext to help with debugging
-        return (
-            <div className="mx_MemberDeviceInfo"
-                    title={_t("device id: ") + this.props.device.deviceId} >
-                { indicator }
-                <div className="mx_MemberDeviceInfo_deviceInfo">
-                    <div className="mx_MemberDeviceInfo_deviceId">
-                        { deviceName }
-                    </div>
-                </div>
-                <DeviceVerifyButtons userId={this.props.userId} device={this.props.device} />
-            </div>
-        );
-    }
-}
-
-MemberDeviceInfo.displayName = 'MemberDeviceInfo';
-MemberDeviceInfo.propTypes = {
-    userId: PropTypes.string.isRequired,
-    device: PropTypes.object.isRequired,
-};
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
deleted file mode 100644
index be3e8cf971..0000000000
--- a/src/components/views/rooms/MemberInfo.js
+++ /dev/null
@@ -1,1164 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017, 2018 Vector Creations Ltd
-Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
- * State vars:
- * 'can': {
- *   kick: boolean,
- *   ban: boolean,
- *   mute: boolean,
- *   modifyLevel: boolean
- * },
- * 'muted': boolean,
- * 'isTargetMod': boolean
- */
-import React from 'react';
-import PropTypes from 'prop-types';
-import createReactClass from 'create-react-class';
-import classNames from 'classnames';
-import dis from '../../../dispatcher';
-import Modal from '../../../Modal';
-import * as sdk from '../../../index';
-import { _t } from '../../../languageHandler';
-import createRoom from '../../../createRoom';
-import DMRoomMap from '../../../utils/DMRoomMap';
-import * as Unread from '../../../Unread';
-import { findReadReceiptFromUserId } from '../../../utils/Receipt';
-import AccessibleButton from '../elements/AccessibleButton';
-import RoomViewStore from '../../../stores/RoomViewStore';
-import SdkConfig from '../../../SdkConfig';
-import MultiInviter from "../../../utils/MultiInviter";
-import SettingsStore from "../../../settings/SettingsStore";
-import E2EIcon from "./E2EIcon";
-import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
-
-export default createReactClass({
-    displayName: 'MemberInfo',
-
-    propTypes: {
-        member: PropTypes.object.isRequired,
-    },
-
-    getInitialState: function() {
-        return {
-            can: {
-                kick: false,
-                ban: false,
-                mute: false,
-                modifyLevel: false,
-                synapseDeactivate: false,
-                redactMessages: false,
-            },
-            muted: false,
-            isTargetMod: false,
-            updating: 0,
-            devicesLoading: true,
-            devices: null,
-            isIgnoring: false,
-        };
-    },
-
-    statics: {
-        contextType: MatrixClientContext,
-    },
-
-    // TODO: [REACT-WARNING] Move this to constructor
-    UNSAFE_componentWillMount: function() {
-        this._cancelDeviceList = null;
-        const cli = this.context;
-
-        // only display the devices list if our client supports E2E
-        this._enableDevices = cli.isCryptoEnabled();
-
-        cli.on("deviceVerificationChanged", this.onDeviceVerificationChanged);
-        cli.on("Room", this.onRoom);
-        cli.on("deleteRoom", this.onDeleteRoom);
-        cli.on("Room.timeline", this.onRoomTimeline);
-        cli.on("Room.name", this.onRoomName);
-        cli.on("Room.receipt", this.onRoomReceipt);
-        cli.on("RoomState.events", this.onRoomStateEvents);
-        cli.on("RoomMember.name", this.onRoomMemberName);
-        cli.on("RoomMember.membership", this.onRoomMemberMembership);
-        cli.on("accountData", this.onAccountData);
-
-        this._checkIgnoreState();
-
-        this._updateStateForNewMember(this.props.member);
-    },
-
-    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    UNSAFE_componentWillReceiveProps: function(newProps) {
-        if (this.props.member.userId !== newProps.member.userId) {
-            this._updateStateForNewMember(newProps.member);
-        }
-    },
-
-    componentWillUnmount: function() {
-        const client = this.context;
-        if (client) {
-            client.removeListener("deviceVerificationChanged", this.onDeviceVerificationChanged);
-            client.removeListener("Room", this.onRoom);
-            client.removeListener("deleteRoom", this.onDeleteRoom);
-            client.removeListener("Room.timeline", this.onRoomTimeline);
-            client.removeListener("Room.name", this.onRoomName);
-            client.removeListener("Room.receipt", this.onRoomReceipt);
-            client.removeListener("RoomState.events", this.onRoomStateEvents);
-            client.removeListener("RoomMember.name", this.onRoomMemberName);
-            client.removeListener("RoomMember.membership", this.onRoomMemberMembership);
-            client.removeListener("accountData", this.onAccountData);
-        }
-        if (this._cancelDeviceList) {
-            this._cancelDeviceList();
-        }
-    },
-
-    _checkIgnoreState: function() {
-        const isIgnoring = this.context.isUserIgnored(this.props.member.userId);
-        this.setState({isIgnoring: isIgnoring});
-    },
-
-    _disambiguateDevices: function(devices) {
-        const names = Object.create(null);
-        for (let i = 0; i < devices.length; i++) {
-            const name = devices[i].getDisplayName();
-            const indexList = names[name] || [];
-            indexList.push(i);
-            names[name] = indexList;
-        }
-        for (const name in names) {
-            if (names[name].length > 1) {
-                names[name].forEach((j)=>{
-                    devices[j].ambiguous = true;
-                });
-            }
-        }
-    },
-
-    onDeviceVerificationChanged: function(userId, device) {
-        if (!this._enableDevices) {
-            return;
-        }
-
-        if (userId === this.props.member.userId) {
-            // no need to re-download the whole thing; just update our copy of
-            // the list.
-
-            const devices = this.context.getStoredDevicesForUser(userId);
-            this.setState({
-                devices: devices,
-                e2eStatus: this._getE2EStatus(devices),
-            });
-        }
-    },
-
-    _getE2EStatus: function(devices) {
-        const hasUnverifiedDevice = devices.some((device) => device.isUnverified());
-        return hasUnverifiedDevice ? "warning" : "verified";
-    },
-
-    onRoom: function(room) {
-        this.forceUpdate();
-    },
-
-    onDeleteRoom: function(roomId) {
-        this.forceUpdate();
-    },
-
-    onRoomTimeline: function(ev, room, toStartOfTimeline) {
-        if (toStartOfTimeline) return;
-        this.forceUpdate();
-    },
-
-    onRoomName: function(room) {
-        this.forceUpdate();
-    },
-
-    onRoomReceipt: function(receiptEvent, room) {
-        // because if we read a notification, it will affect notification count
-        // only bother updating if there's a receipt from us
-        if (findReadReceiptFromUserId(receiptEvent, this.context.credentials.userId)) {
-            this.forceUpdate();
-        }
-    },
-
-    onRoomStateEvents: function(ev, state) {
-        this.forceUpdate();
-    },
-
-    onRoomMemberName: function(ev, member) {
-        this.forceUpdate();
-    },
-
-    onRoomMemberMembership: function(ev, member) {
-        if (this.props.member.userId === member.userId) this.forceUpdate();
-    },
-
-    onAccountData: function(ev) {
-        if (ev.getType() === 'm.direct') {
-            this.forceUpdate();
-        }
-    },
-
-    _updateStateForNewMember: async function(member) {
-        const newState = await this._calculateOpsPermissions(member);
-        newState.devicesLoading = true;
-        newState.devices = null;
-        this.setState(newState);
-
-        if (this._cancelDeviceList) {
-            this._cancelDeviceList();
-            this._cancelDeviceList = null;
-        }
-
-        this._downloadDeviceList(member);
-    },
-
-    _downloadDeviceList: function(member) {
-        if (!this._enableDevices) {
-            return;
-        }
-
-        let cancelled = false;
-        this._cancelDeviceList = function() { cancelled = true; };
-
-        const client = this.context;
-        const self = this;
-        client.downloadKeys([member.userId], true).then(() => {
-            return client.getStoredDevicesForUser(member.userId);
-        }).finally(function() {
-            self._cancelDeviceList = null;
-        }).then(function(devices) {
-            if (cancelled) {
-                // we got cancelled - presumably a different user now
-                return;
-            }
-
-            self._disambiguateDevices(devices);
-            self.setState({
-                devicesLoading: false,
-                devices: devices,
-                e2eStatus: self._getE2EStatus(devices),
-            });
-        }, function(err) {
-            console.log("Error downloading sessions", err);
-            self.setState({devicesLoading: false});
-        });
-    },
-
-    onIgnoreToggle: function() {
-        const ignoredUsers = this.context.getIgnoredUsers();
-        if (this.state.isIgnoring) {
-            const index = ignoredUsers.indexOf(this.props.member.userId);
-            if (index !== -1) ignoredUsers.splice(index, 1);
-        } else {
-            ignoredUsers.push(this.props.member.userId);
-        }
-
-        this.context.setIgnoredUsers(ignoredUsers).then(() => {
-            return this.setState({isIgnoring: !this.state.isIgnoring});
-        });
-    },
-
-    onKick: function() {
-        const membership = this.props.member.membership;
-        const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog");
-        Modal.createTrackedDialog('Confirm User Action Dialog', 'onKick', ConfirmUserActionDialog, {
-            member: this.props.member,
-            action: membership === "invite" ? _t("Disinvite") : _t("Kick"),
-            title: membership === "invite" ? _t("Disinvite this user?") : _t("Kick this user?"),
-            askReason: membership === "join",
-            danger: true,
-            onFinished: (proceed, reason) => {
-                if (!proceed) return;
-
-                this.setState({ updating: this.state.updating + 1 });
-                this.context.kick(
-                    this.props.member.roomId, this.props.member.userId,
-                    reason || undefined,
-                ).then(function() {
-                        // NO-OP; rely on the m.room.member event coming down else we could
-                        // get out of sync if we force setState here!
-                        console.log("Kick success");
-                    }, function(err) {
-                        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                        console.error("Kick error: " + err);
-                        Modal.createTrackedDialog('Failed to kick', '', ErrorDialog, {
-                            title: _t("Failed to kick"),
-                            description: ((err && err.message) ? err.message : "Operation failed"),
-                        });
-                    },
-                ).finally(()=>{
-                    this.setState({ updating: this.state.updating - 1 });
-                });
-            },
-        });
-    },
-
-    onBanOrUnban: function() {
-        const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog");
-        Modal.createTrackedDialog('Confirm User Action Dialog', 'onBanOrUnban', ConfirmUserActionDialog, {
-            member: this.props.member,
-            action: this.props.member.membership === 'ban' ? _t("Unban") : _t("Ban"),
-            title: this.props.member.membership === 'ban' ? _t("Unban this user?") : _t("Ban this user?"),
-            askReason: this.props.member.membership !== 'ban',
-            danger: this.props.member.membership !== 'ban',
-            onFinished: (proceed, reason) => {
-                if (!proceed) return;
-
-                this.setState({ updating: this.state.updating + 1 });
-                let promise;
-                if (this.props.member.membership === 'ban') {
-                    promise = this.context.unban(
-                        this.props.member.roomId, this.props.member.userId,
-                    );
-                } else {
-                    promise = this.context.ban(
-                        this.props.member.roomId, this.props.member.userId,
-                        reason || undefined,
-                    );
-                }
-                promise.then(
-                    function() {
-                        // NO-OP; rely on the m.room.member event coming down else we could
-                        // get out of sync if we force setState here!
-                        console.log("Ban success");
-                    }, function(err) {
-                        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                        console.error("Ban error: " + err);
-                        Modal.createTrackedDialog('Failed to ban user', '', ErrorDialog, {
-                            title: _t("Error"),
-                            description: _t("Failed to ban user"),
-                        });
-                    },
-                ).finally(()=>{
-                    this.setState({ updating: this.state.updating - 1 });
-                });
-            },
-        });
-    },
-
-    onRedactAllMessages: async function() {
-        const {roomId, userId} = this.props.member;
-        const room = this.context.getRoom(roomId);
-        if (!room) {
-            return;
-        }
-        const timelineSet = room.getUnfilteredTimelineSet();
-        let eventsToRedact = [];
-        for (const timeline of timelineSet.getTimelines()) {
-            eventsToRedact = timeline.getEvents().reduce((events, event) => {
-                if (event.getSender() === userId && !event.isRedacted()) {
-                    return events.concat(event);
-                } else {
-                    return events;
-                }
-            }, eventsToRedact);
-        }
-
-        const count = eventsToRedact.length;
-        const user = this.props.member.name;
-
-        if (count === 0) {
-            const InfoDialog = sdk.getComponent("dialogs.InfoDialog");
-            Modal.createTrackedDialog('No user messages found to remove', '', InfoDialog, {
-                title: _t("No recent messages by %(user)s found", {user}),
-                description:
-                    <div>
-                        <p>{ _t("Try scrolling up in the timeline to see if there are any earlier ones.") }</p>
-                    </div>,
-            });
-        } else {
-            const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-            const confirmed = await new Promise((resolve) => {
-                Modal.createTrackedDialog('Remove recent messages by user', '', QuestionDialog, {
-                    title: _t("Remove recent messages by %(user)s", {user}),
-                    description:
-                        <div>
-                            <p>{ _t("You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?", {count, user}) }</p>
-                            <p>{ _t("For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.") }</p>
-                        </div>,
-                    button: _t("Remove %(count)s messages", {count}),
-                    onFinished: resolve,
-                });
-            });
-
-            if (!confirmed) {
-                return;
-            }
-
-            // Submitting a large number of redactions freezes the UI,
-            // so first yield to allow to rerender after closing the dialog.
-            await Promise.resolve();
-
-            console.info(`Started redacting recent ${count} messages for ${user} in ${roomId}`);
-            await Promise.all(eventsToRedact.map(async event => {
-                try {
-                    await this.context.redactEvent(roomId, event.getId());
-                } catch (err) {
-                    // log and swallow errors
-                    console.error("Could not redact", event.getId());
-                    console.error(err);
-                }
-            }));
-            console.info(`Finished redacting recent ${count} messages for ${user} in ${roomId}`);
-        }
-    },
-
-    _warnSelfDemote: function() {
-        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-        return new Promise((resolve) => {
-            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.") }
-                    </div>,
-                button: _t("Demote"),
-                onFinished: resolve,
-            });
-        });
-    },
-
-    onMuteToggle: async function() {
-        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-        const roomId = this.props.member.roomId;
-        const target = this.props.member.userId;
-        const room = this.context.getRoom(roomId);
-        if (!room) return;
-
-        // if muting self, warn as it may be irreversible
-        if (target === this.context.getUserId()) {
-            try {
-                if (!(await this._warnSelfDemote())) return;
-            } catch (e) {
-                console.error("Failed to warn about self demotion: ", e);
-                return;
-            }
-        }
-
-        const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
-        if (!powerLevelEvent) return;
-
-        const isMuted = this.state.muted;
-        const powerLevels = powerLevelEvent.getContent();
-        const levelToSend = (
-            (powerLevels.events ? powerLevels.events["m.room.message"] : null) ||
-            powerLevels.events_default
-        );
-        let level;
-        if (isMuted) { // unmute
-            level = levelToSend;
-        } else { // mute
-            level = levelToSend - 1;
-        }
-        level = parseInt(level);
-
-        if (!isNaN(level)) {
-            this.setState({ updating: this.state.updating + 1 });
-            this.context.setPowerLevel(roomId, target, level, powerLevelEvent).then(
-                function() {
-                    // NO-OP; rely on the m.room.member event coming down else we could
-                    // get out of sync if we force setState here!
-                    console.log("Mute toggle success");
-                }, function(err) {
-                    console.error("Mute error: " + err);
-                    Modal.createTrackedDialog('Failed to mute user', '', ErrorDialog, {
-                        title: _t("Error"),
-                        description: _t("Failed to mute user"),
-                    });
-                },
-            ).finally(()=>{
-                this.setState({ updating: this.state.updating - 1 });
-            });
-        }
-    },
-
-    onModToggle: function() {
-        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-        const roomId = this.props.member.roomId;
-        const target = this.props.member.userId;
-        const room = this.context.getRoom(roomId);
-        if (!room) return;
-
-        const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
-        if (!powerLevelEvent) return;
-
-        const me = room.getMember(this.context.credentials.userId);
-        if (!me) return;
-
-        const defaultLevel = powerLevelEvent.getContent().users_default;
-        let modLevel = me.powerLevel - 1;
-        if (modLevel > 50 && defaultLevel < 50) modLevel = 50; // try to stick with the vector level defaults
-        // toggle the level
-        const newLevel = this.state.isTargetMod ? defaultLevel : modLevel;
-        this.setState({ updating: this.state.updating + 1 });
-        this.context.setPowerLevel(roomId, target, parseInt(newLevel), powerLevelEvent).then(
-            function() {
-                // NO-OP; rely on the m.room.member event coming down else we could
-                // get out of sync if we force setState here!
-                console.log("Mod toggle success");
-            }, function(err) {
-                if (err.errcode === 'M_GUEST_ACCESS_FORBIDDEN') {
-                    dis.dispatch({action: 'require_registration'});
-                } else {
-                    console.error("Toggle moderator error:" + err);
-                    Modal.createTrackedDialog('Failed to toggle moderator status', '', ErrorDialog, {
-                        title: _t("Error"),
-                        description: _t("Failed to toggle moderator status"),
-                    });
-                }
-            },
-        ).finally(()=>{
-            this.setState({ updating: this.state.updating - 1 });
-        });
-    },
-
-    onSynapseDeactivate: function() {
-        const QuestionDialog = sdk.getComponent('views.dialogs.QuestionDialog');
-        Modal.createTrackedDialog('Synapse User Deactivation', '', QuestionDialog, {
-            title: _t("Deactivate user?"),
-            description:
-                <div>{ _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?"
-                ) }</div>,
-            button: _t("Deactivate user"),
-            danger: true,
-            onFinished: (accepted) => {
-                if (!accepted) return;
-                this.context.deactivateSynapseUser(this.props.member.userId).catch(e => {
-                    console.error("Failed to deactivate user");
-                    console.error(e);
-
-                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                    Modal.createTrackedDialog('Failed to deactivate Synapse user', '', ErrorDialog, {
-                        title: _t('Failed to deactivate user'),
-                        description: ((e && e.message) ? e.message : _t("Operation failed")),
-                    });
-                });
-            },
-        });
-    },
-
-    _applyPowerChange: function(roomId, target, powerLevel, powerLevelEvent) {
-        this.setState({ updating: this.state.updating + 1 });
-        this.context.setPowerLevel(roomId, target, parseInt(powerLevel), powerLevelEvent).then(
-            function() {
-                // NO-OP; rely on the m.room.member event coming down else we could
-                // get out of sync if we force setState here!
-                console.log("Power change success");
-            }, function(err) {
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                console.error("Failed to change power level " + err);
-                Modal.createTrackedDialog('Failed to change power level', '', ErrorDialog, {
-                    title: _t("Error"),
-                    description: _t("Failed to change power level"),
-                });
-            },
-        ).finally(()=>{
-            this.setState({ updating: this.state.updating - 1 });
-        });
-    },
-
-    onPowerChange: async function(powerLevel) {
-        const roomId = this.props.member.roomId;
-        const target = this.props.member.userId;
-        const room = this.context.getRoom(roomId);
-        if (!room) return;
-
-        const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
-        if (!powerLevelEvent) return;
-
-        if (!powerLevelEvent.getContent().users) {
-            this._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
-            return;
-        }
-
-        const myUserId = this.context.getUserId();
-        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-
-        // If we are changing our own PL it can only ever be decreasing, which we cannot reverse.
-        if (myUserId === target) {
-            try {
-                if (!(await this._warnSelfDemote())) return;
-                this._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
-            } catch (e) {
-                console.error("Failed to warn about self demotion: ", e);
-            }
-            return;
-        }
-
-        const myPower = powerLevelEvent.getContent().users[myUserId];
-        if (parseInt(myPower) === parseInt(powerLevel)) {
-            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"),
-                onFinished: (confirmed) => {
-                    if (confirmed) {
-                        this._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
-                    }
-                },
-            });
-            return;
-        }
-        this._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
-    },
-
-    onNewDMClick: function() {
-        this.setState({ updating: this.state.updating + 1 });
-        createRoom({dmUserId: this.props.member.userId}).finally(() => {
-            this.setState({ updating: this.state.updating - 1 });
-        });
-    },
-
-    onLeaveClick: function() {
-        dis.dispatch({
-            action: 'leave_room',
-            room_id: this.props.member.roomId,
-        });
-    },
-
-    _calculateOpsPermissions: async function(member) {
-        let canDeactivate = false;
-        if (this.context) {
-            try {
-                canDeactivate = await this.context.isSynapseAdministrator();
-            } catch (e) {
-                console.error(e);
-            }
-        }
-
-        const defaultPerms = {
-            can: {
-                // Calculate permissions for Synapse before doing the PL checks
-                synapseDeactivate: canDeactivate,
-            },
-            muted: false,
-        };
-        const room = this.context.getRoom(member.roomId);
-        if (!room) return defaultPerms;
-
-        const powerLevels = room.currentState.getStateEvents("m.room.power_levels", "");
-        if (!powerLevels) return defaultPerms;
-
-        const me = room.getMember(this.context.credentials.userId);
-        if (!me) return defaultPerms;
-
-        const them = member;
-        return {
-            can: {
-                ...defaultPerms.can,
-                ...await this._calculateCanPermissions(me, them, powerLevels.getContent()),
-            },
-            muted: this._isMuted(them, powerLevels.getContent()),
-            isTargetMod: them.powerLevel > powerLevels.getContent().users_default,
-        };
-    },
-
-    _calculateCanPermissions: function(me, them, powerLevels) {
-        const isMe = me.userId === them.userId;
-        const can = {
-            kick: false,
-            ban: false,
-            mute: false,
-            modifyLevel: false,
-            modifyLevelMax: 0,
-            redactMessages: me.powerLevel >= powerLevels.redact,
-        };
-
-        const canAffectUser = them.powerLevel < me.powerLevel || isMe;
-        if (!canAffectUser) {
-            //console.info("Cannot affect user: %s >= %s", them.powerLevel, me.powerLevel);
-            return can;
-        }
-        const editPowerLevel = (
-            (powerLevels.events ? powerLevels.events["m.room.power_levels"] : null) ||
-            powerLevels.state_default
-        );
-
-        can.kick = me.powerLevel >= powerLevels.kick;
-        can.ban = me.powerLevel >= powerLevels.ban;
-        can.invite = me.powerLevel >= powerLevels.invite;
-        can.mute = me.powerLevel >= editPowerLevel;
-        can.modifyLevel = me.powerLevel >= editPowerLevel && (isMe || me.powerLevel > them.powerLevel);
-        can.modifyLevelMax = me.powerLevel;
-
-        return can;
-    },
-
-    _isMuted: function(member, powerLevelContent) {
-        if (!powerLevelContent || !member) return false;
-
-        const levelToSend = (
-            (powerLevelContent.events ? powerLevelContent.events["m.room.message"] : null) ||
-            powerLevelContent.events_default
-        );
-        return member.powerLevel < levelToSend;
-    },
-
-    onCancel: function(e) {
-        dis.dispatch({
-            action: "view_user",
-            member: null,
-        });
-    },
-
-    onMemberAvatarClick: function() {
-        const member = this.props.member;
-        const avatarUrl = member.getMxcAvatarUrl();
-        if (!avatarUrl) return;
-
-        const httpUrl = this.context.mxcUrlToHttp(avatarUrl);
-        const ImageView = sdk.getComponent("elements.ImageView");
-        const params = {
-            src: httpUrl,
-            name: member.name,
-        };
-
-        Modal.createDialog(ImageView, params, "mx_Dialog_lightbox");
-    },
-
-    onRoomTileClick(roomId) {
-        dis.dispatch({
-            action: 'view_room',
-            room_id: roomId,
-        });
-    },
-
-    _renderDevices: function() {
-        if (!this._enableDevices) return null;
-
-        const devices = this.state.devices;
-        const MemberDeviceInfo = sdk.getComponent('rooms.MemberDeviceInfo');
-        const Spinner = sdk.getComponent("elements.Spinner");
-
-        let devComponents;
-        if (this.state.devicesLoading) {
-            // still loading
-            devComponents = <Spinner />;
-        } else if (devices === null) {
-            devComponents = _t("Unable to load session list");
-        } else if (devices.length === 0) {
-            devComponents = _t("No sessions with registered encryption keys");
-        } else {
-            devComponents = [];
-            for (let i = 0; i < devices.length; i++) {
-                devComponents.push(<MemberDeviceInfo key={i}
-                                       userId={this.props.member.userId}
-                                       device={devices[i]} />);
-            }
-        }
-
-        return (
-            <div>
-                <h3>{ _t("Sessions") }</h3>
-                <div className="mx_MemberInfo_devices">
-                    { devComponents }
-                </div>
-            </div>
-        );
-    },
-
-    onShareUserClick: function() {
-        const ShareDialog = sdk.getComponent("dialogs.ShareDialog");
-        Modal.createTrackedDialog('share room member dialog', '', ShareDialog, {
-            target: this.props.member,
-        });
-    },
-
-    _renderUserOptions: function() {
-        const cli = this.context;
-        const member = this.props.member;
-
-        let ignoreButton = null;
-        let insertPillButton = null;
-        let inviteUserButton = null;
-        let readReceiptButton = null;
-
-        // Only allow the user to ignore the user if its not ourselves
-        // same goes for jumping to read receipt
-        if (member.userId !== cli.getUserId()) {
-            ignoreButton = (
-                <AccessibleButton onClick={this.onIgnoreToggle} className="mx_MemberInfo_field">
-                    { this.state.isIgnoring ? _t("Unignore") : _t("Ignore") }
-                </AccessibleButton>
-            );
-
-            if (member.roomId) {
-                const room = cli.getRoom(member.roomId);
-                const eventId = room.getEventReadUpTo(member.userId);
-
-                const onReadReceiptButton = function() {
-                    dis.dispatch({
-                        action: 'view_room',
-                        highlighted: true,
-                        event_id: eventId,
-                        room_id: member.roomId,
-                    });
-                };
-
-                const onInsertPillButton = function() {
-                    dis.dispatch({
-                        action: 'insert_mention',
-                        user_id: member.userId,
-                    });
-                };
-
-                readReceiptButton = (
-                    <AccessibleButton onClick={onReadReceiptButton} className="mx_MemberInfo_field">
-                        { _t('Jump to read receipt') }
-                    </AccessibleButton>
-                );
-
-                insertPillButton = (
-                    <AccessibleButton onClick={onInsertPillButton} className={"mx_MemberInfo_field"}>
-                        { _t('Mention') }
-                    </AccessibleButton>
-                );
-            }
-
-            if (this.state.can.invite && (!member || !member.membership || member.membership === 'leave')) {
-                const roomId = member && member.roomId ? member.roomId : RoomViewStore.getRoomId();
-                const onInviteUserButton = async () => {
-                    try {
-                        // We use a MultiInviter to re-use the invite logic, even though
-                        // we're only inviting one user.
-                        const inviter = new MultiInviter(roomId);
-                        await inviter.invite([member.userId]).then(() => {
-                            if (inviter.getCompletionState(member.userId) !== "invited")
-                                throw new Error(inviter.getErrorText(member.userId));
-                        });
-                    } catch (err) {
-                        const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
-                        Modal.createTrackedDialog('Failed to invite', '', ErrorDialog, {
-                            title: _t('Failed to invite'),
-                            description: ((err && err.message) ? err.message : _t("Operation failed")),
-                        });
-                    }
-                };
-
-                inviteUserButton = (
-                    <AccessibleButton onClick={onInviteUserButton} className="mx_MemberInfo_field">
-                        { _t('Invite') }
-                    </AccessibleButton>
-                );
-            }
-        }
-
-        const shareUserButton = (
-            <AccessibleButton onClick={this.onShareUserClick} className="mx_MemberInfo_field">
-                { _t('Share Link to User') }
-            </AccessibleButton>
-        );
-
-        return (
-            <div>
-                <h3>{ _t("User Options") }</h3>
-                <div className="mx_MemberInfo_buttons">
-                    { readReceiptButton }
-                    { shareUserButton }
-                    { insertPillButton }
-                    { ignoreButton }
-                    { inviteUserButton }
-                </div>
-            </div>
-        );
-    },
-
-    render: function() {
-        let startChat;
-        let kickButton;
-        let banButton;
-        let muteButton;
-        let giveModButton;
-        let redactButton;
-        let synapseDeactivateButton;
-        let spinner;
-
-        if (this.props.member.userId !== this.context.credentials.userId) {
-            // TODO: Immutable DMs replaces a lot of this
-            const dmRoomMap = new DMRoomMap(this.context);
-            // dmRooms will not include dmRooms that we have been invited into but did not join.
-            // Because DMRoomMap runs off account_data[m.direct] which is only set on join of dm room.
-            // XXX: we potentially want DMs we have been invited to, to also show up here :L
-            // especially as logic below concerns specially if we haven't joined but have been invited
-            const dmRooms = dmRoomMap.getDMRoomsForUserId(this.props.member.userId);
-
-            const RoomTile = sdk.getComponent("rooms.RoomTile");
-
-            const tiles = [];
-            for (const roomId of dmRooms) {
-                const room = this.context.getRoom(roomId);
-                if (room) {
-                    const myMembership = room.getMyMembership();
-                    // not a DM room if we have are not joined
-                    if (myMembership !== 'join') continue;
-
-                    const them = this.props.member;
-                    // not a DM room if they are not joined
-                    if (!them.membership || them.membership !== 'join') continue;
-
-                    const highlight = room.getUnreadNotificationCount('highlight') > 0;
-
-                    tiles.push(
-                        <RoomTile key={room.roomId} room={room}
-                            transparent={true}
-                            collapsed={false}
-                            selected={false}
-                            unread={Unread.doesRoomHaveUnreadMessages(room)}
-                            highlight={highlight}
-                            isInvite={false}
-                            onClick={this.onRoomTileClick}
-                        />,
-                    );
-                }
-            }
-
-            const labelClasses = classNames({
-                mx_MemberInfo_createRoom_label: true,
-                mx_RoomTile_name: true,
-            });
-            let startNewChat = <AccessibleButton
-                className="mx_MemberInfo_createRoom"
-                onClick={this.onNewDMClick}
-            >
-                <div className="mx_RoomTile_avatar">
-                    <img src={require("../../../../res/img/create-big.svg")} width="26" height="26" />
-                </div>
-                <div className={labelClasses}><i>{ _t("Start a chat") }</i></div>
-            </AccessibleButton>;
-
-            if (tiles.length > 0) startNewChat = null; // Don't offer a button for a new chat if we have one.
-
-            startChat = <div>
-                <h3>{ _t("Direct chats") }</h3>
-                { tiles }
-                { startNewChat }
-            </div>;
-        }
-
-        if (this.state.updating) {
-            const Loader = sdk.getComponent("elements.Spinner");
-            spinner = <Loader imgClassName="mx_ContextualMenu_spinner" />;
-        }
-
-        if (this.state.can.kick) {
-            const membership = this.props.member.membership;
-            const kickLabel = membership === "invite" ? _t("Disinvite") : _t("Kick");
-            kickButton = (
-                <AccessibleButton className="mx_MemberInfo_field"
-                        onClick={this.onKick}>
-                    { kickLabel }
-                </AccessibleButton>
-            );
-        }
-
-        if (this.state.can.redactMessages) {
-            redactButton = (
-                <AccessibleButton className="mx_MemberInfo_field" onClick={this.onRedactAllMessages}>
-                    { _t("Remove recent messages") }
-                </AccessibleButton>
-            );
-        }
-
-        if (this.state.can.ban) {
-            let label = _t("Ban");
-            if (this.props.member.membership === 'ban') {
-                label = _t("Unban");
-            }
-            banButton = (
-                <AccessibleButton className="mx_MemberInfo_field"
-                        onClick={this.onBanOrUnban}>
-                    { label }
-                </AccessibleButton>
-            );
-        }
-        if (this.state.can.mute) {
-            const muteLabel = this.state.muted ? _t("Unmute") : _t("Mute");
-            muteButton = (
-                <AccessibleButton className="mx_MemberInfo_field"
-                        onClick={this.onMuteToggle}>
-                    { muteLabel }
-                </AccessibleButton>
-            );
-        }
-        if (this.state.can.toggleMod) {
-            const giveOpLabel = this.state.isTargetMod ? _t("Revoke Moderator") : _t("Make Moderator");
-            giveModButton = <AccessibleButton className="mx_MemberInfo_field" onClick={this.onModToggle}>
-                { giveOpLabel }
-            </AccessibleButton>;
-        }
-
-        // We don't need a perfect check here, just something to pass as "probably not our homeserver". If
-        // someone does figure out how to bypass this check the worst that happens is an error.
-        const sameHomeserver = this.props.member.userId.endsWith(`:${MatrixClientPeg.getHomeserverName()}`);
-        if (this.state.can.synapseDeactivate && sameHomeserver) {
-            synapseDeactivateButton = (
-                <AccessibleButton onClick={this.onSynapseDeactivate} className="mx_MemberInfo_field">
-                    {_t("Deactivate user")}
-                </AccessibleButton>
-            );
-        }
-
-        let adminTools;
-        if (kickButton || banButton || muteButton || giveModButton || synapseDeactivateButton || redactButton) {
-            adminTools =
-                <div>
-                    <h3>{ _t("Admin Tools") }</h3>
-
-                    <div className="mx_MemberInfo_buttons">
-                        { muteButton }
-                        { kickButton }
-                        { banButton }
-                        { redactButton }
-                        { giveModButton }
-                        { synapseDeactivateButton }
-                    </div>
-                </div>;
-        }
-
-        const memberName = this.props.member.name;
-
-        let presenceState;
-        let presenceLastActiveAgo;
-        let presenceCurrentlyActive;
-        let statusMessage;
-
-        if (this.props.member.user) {
-            presenceState = this.props.member.user.presence;
-            presenceLastActiveAgo = this.props.member.user.lastActiveAgo;
-            presenceCurrentlyActive = this.props.member.user.currentlyActive;
-
-            if (SettingsStore.isFeatureEnabled("feature_custom_status")) {
-                statusMessage = this.props.member.user._unstable_statusMessage;
-            }
-        }
-
-        const room = this.context.getRoom(this.props.member.roomId);
-        const powerLevelEvent = room ? room.currentState.getStateEvents("m.room.power_levels", "") : null;
-        const powerLevelUsersDefault = powerLevelEvent ? powerLevelEvent.getContent().users_default : 0;
-
-        const enablePresenceByHsUrl = SdkConfig.get()["enable_presence_by_hs_url"];
-        const hsUrl = this.context.baseUrl;
-        let showPresence = true;
-        if (enablePresenceByHsUrl && enablePresenceByHsUrl[hsUrl] !== undefined) {
-            showPresence = enablePresenceByHsUrl[hsUrl];
-        }
-
-        let presenceLabel = null;
-        if (showPresence) {
-            const PresenceLabel = sdk.getComponent('rooms.PresenceLabel');
-            presenceLabel = <PresenceLabel activeAgo={presenceLastActiveAgo}
-                currentlyActive={presenceCurrentlyActive}
-                presenceState={presenceState} />;
-        }
-
-        let statusLabel = null;
-        if (statusMessage) {
-            statusLabel = <span className="mx_MemberInfo_statusMessage">{ statusMessage }</span>;
-        }
-
-        let roomMemberDetails = null;
-        let e2eIconElement;
-
-        if (this.props.member.roomId) { // is in room
-            const PowerSelector = sdk.getComponent('elements.PowerSelector');
-            roomMemberDetails = <div>
-                <div className="mx_MemberInfo_profileField">
-                    <PowerSelector
-                        value={parseInt(this.props.member.powerLevel)}
-                        maxValue={this.state.can.modifyLevelMax}
-                        disabled={!this.state.can.modifyLevel}
-                        usersDefault={powerLevelUsersDefault}
-                        onChange={this.onPowerChange} />
-                </div>
-                <div className="mx_MemberInfo_profileField">
-                    {presenceLabel}
-                    {statusLabel}
-                </div>
-            </div>;
-
-            const isEncrypted = this.context.isRoomEncrypted(this.props.member.roomId);
-            if (this.state.e2eStatus && isEncrypted) {
-                e2eIconElement = (<E2EIcon status={this.state.e2eStatus} isUser={true} />);
-            }
-        }
-
-        const {member} = this.props;
-        const avatarUrl = member.avatarUrl || (member.getMxcAvatarUrl && member.getMxcAvatarUrl());
-        let avatarElement;
-        if (avatarUrl) {
-            const httpUrl = this.context.mxcUrlToHttp(avatarUrl, 800, 800);
-            avatarElement = <div className="mx_MemberInfo_avatar">
-                <img src={httpUrl} />
-            </div>;
-        }
-
-        let backButton;
-        if (this.props.member.roomId) {
-            backButton = (<AccessibleButton className="mx_MemberInfo_cancel"
-                onClick={this.onCancel}
-                title={_t('Close')}
-            />);
-        }
-
-        return (
-            <div className="mx_MemberInfo" role="tabpanel">
-                <div className="mx_MemberInfo_name">
-                    { backButton }
-                    { e2eIconElement }
-                    <h2>{ memberName }</h2>
-                </div>
-                { avatarElement }
-                <div className="mx_MemberInfo_container">
-
-                    <div className="mx_MemberInfo_profile">
-                        <div className="mx_MemberInfo_profileField">
-                            { this.props.member.userId }
-                        </div>
-                        { roomMemberDetails }
-                    </div>
-                </div>
-                <AutoHideScrollbar className="mx_MemberInfo_scrollContainer">
-                    <div className="mx_MemberInfo_container">
-                        { this._renderUserOptions() }
-
-                        { adminTools }
-
-                        { startChat }
-
-                        { this._renderDevices() }
-
-                        { spinner }
-                    </div>
-                </AutoHideScrollbar>
-            </div>
-        );
-    },
-});
diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index 3779d461bb..e2d7e3f8e0 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -20,7 +20,7 @@ import React from 'react';
 import createReactClass from 'create-react-class';
 import { _t } from '../../../languageHandler';
 import SdkConfig from '../../../SdkConfig';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
 import {isValid3pidInvite} from "../../../RoomInvite";
 import rate_limited_func from "../../../ratelimitedfunc";
diff --git a/src/components/views/rooms/MemberTile.js b/src/components/views/rooms/MemberTile.js
index 1c609afcaa..ebb8b7999d 100644
--- a/src/components/views/rooms/MemberTile.js
+++ b/src/components/views/rooms/MemberTile.js
@@ -20,9 +20,10 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import * as sdk from "../../../index";
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 import { _t } from '../../../languageHandler';
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import {Action} from "../../../dispatcher/actions";
 
 export default createReactClass({
     displayName: 'MemberTile',
@@ -49,28 +50,26 @@ export default createReactClass({
     componentDidMount() {
         const cli = MatrixClientPeg.get();
 
-        if (SettingsStore.isFeatureEnabled("feature_custom_status")) {
+        if (SettingsStore.getValue("feature_custom_status")) {
             const { user } = this.props.member;
             if (user) {
                 user.on("User._unstable_statusMessage", this._onStatusMessageCommitted);
             }
         }
 
-        if (SettingsStore.getValue("feature_cross_signing")) {
-            const { roomId } = this.props.member;
-            if (roomId) {
-                const isRoomEncrypted = cli.isRoomEncrypted(roomId);
-                this.setState({
-                    isRoomEncrypted,
-                });
-                if (isRoomEncrypted) {
-                    cli.on("userTrustStatusChanged", this.onUserTrustStatusChanged);
-                    cli.on("deviceVerificationChanged", this.onDeviceVerificationChanged);
-                    this.updateE2EStatus();
-                } else {
-                    // Listen for room to become encrypted
-                    cli.on("RoomState.events", this.onRoomStateEvents);
-                }
+        const { roomId } = this.props.member;
+        if (roomId) {
+            const isRoomEncrypted = cli.isRoomEncrypted(roomId);
+            this.setState({
+                isRoomEncrypted,
+            });
+            if (isRoomEncrypted) {
+                cli.on("userTrustStatusChanged", this.onUserTrustStatusChanged);
+                cli.on("deviceVerificationChanged", this.onDeviceVerificationChanged);
+                this.updateE2EStatus();
+            } else {
+                // Listen for room to become encrypted
+                cli.on("RoomState.events", this.onRoomStateEvents);
             }
         }
     },
@@ -185,7 +184,7 @@ export default createReactClass({
 
     onClick: function(e) {
         dis.dispatch({
-            action: 'view_user',
+            action: Action.ViewUser,
             member: this.props.member,
         });
     },
@@ -210,7 +209,7 @@ export default createReactClass({
         const presenceState = member.user ? member.user.presence : null;
 
         let statusMessage = null;
-        if (member.user && SettingsStore.isFeatureEnabled("feature_custom_status")) {
+        if (member.user && SettingsStore.getValue("feature_custom_status")) {
             statusMessage = this.state.statusMessage;
         }
 
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 4749742a7d..922cc2b11e 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -15,18 +15,22 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 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';
+import dis from '../../../dispatcher/dispatcher';
 import RoomViewStore from '../../../stores/RoomViewStore';
 import Stickerpicker from './Stickerpicker';
 import { makeRoomPermalink } from '../../../utils/permalinks/Permalinks';
 import ContentMessages from '../../../ContentMessages';
 import E2EIcon from './E2EIcon';
 import SettingsStore from "../../../settings/SettingsStore";
+import {aboveLeftOf, ContextMenu, ContextMenuTooltipButton, useContextMenu} from "../../structures/ContextMenu";
+import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
+import ReplyPreview from "./ReplyPreview";
 
 function ComposerAvatar(props) {
     const MemberStatusMessageAvatar = sdk.getComponent('avatars.MemberStatusMessageAvatar');
@@ -40,7 +44,6 @@ ComposerAvatar.propTypes = {
 };
 
 function CallButton(props) {
-    const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
     const onVoiceCallClick = (ev) => {
         dis.dispatch({
             action: 'place_call',
@@ -49,10 +52,11 @@ function CallButton(props) {
         });
     };
 
-    return (<AccessibleButton className="mx_MessageComposer_button mx_MessageComposer_voicecall"
-            onClick={onVoiceCallClick}
-            title={_t('Voice call')}
-        />);
+    return (<AccessibleTooltipButton
+        className="mx_MessageComposer_button mx_MessageComposer_voicecall"
+        onClick={onVoiceCallClick}
+        title={_t('Voice call')}
+    />);
 }
 
 CallButton.propTypes = {
@@ -60,7 +64,6 @@ CallButton.propTypes = {
 };
 
 function VideoCallButton(props) {
-    const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
     const onCallClick = (ev) => {
         dis.dispatch({
             action: 'place_call',
@@ -69,7 +72,8 @@ function VideoCallButton(props) {
         });
     };
 
-    return <AccessibleButton className="mx_MessageComposer_button mx_MessageComposer_videocall"
+    return <AccessibleTooltipButton
+        className="mx_MessageComposer_button mx_MessageComposer_videocall"
         onClick={onCallClick}
         title={_t('Video call')}
     />;
@@ -103,6 +107,43 @@ HangupButton.propTypes = {
     roomId: PropTypes.string.isRequired,
 };
 
+const EmojiButton = ({addEmoji}) => {
+    const [menuDisplayed, button, openMenu, closeMenu] = useContextMenu();
+
+    let contextMenu;
+    if (menuDisplayed) {
+        const buttonRect = button.current.getBoundingClientRect();
+        const EmojiPicker = sdk.getComponent('emojipicker.EmojiPicker');
+        contextMenu = <ContextMenu {...aboveLeftOf(buttonRect)} onFinished={closeMenu} catchTab={false}>
+            <EmojiPicker onChoose={addEmoji} showQuickReactions={true} />
+        </ContextMenu>;
+    }
+
+    const className = classNames(
+        "mx_MessageComposer_button",
+        "mx_MessageComposer_emoji",
+        {
+            "mx_MessageComposer_button_highlight": menuDisplayed,
+        },
+    );
+
+    // TODO: replace ContextMenuTooltipButton with a unified representation of
+    // the header buttons and the right panel buttons
+    return <React.Fragment>
+        <ContextMenuTooltipButton
+            className={className}
+            onClick={openMenu}
+            isExpanded={menuDisplayed}
+            title={_t('Emoji picker')}
+            inputRef={button}
+        >
+
+        </ContextMenuTooltipButton>
+
+        { contextMenu }
+    </React.Fragment>;
+};
+
 class UploadButton extends React.Component {
     static propTypes = {
         roomId: PropTypes.string.isRequired,
@@ -114,8 +155,19 @@ class UploadButton extends React.Component {
         this.onUploadFileInputChange = this.onUploadFileInputChange.bind(this);
 
         this._uploadInput = createRef();
+        this._dispatcherRef = dis.register(this.onAction);
     }
 
+    componentWillUnmount() {
+        dis.unregister(this._dispatcherRef);
+    }
+
+    onAction = payload => {
+        if (payload.action === "upload_file") {
+            this.onUploadClick();
+        }
+    };
+
     onUploadClick(ev) {
         if (MatrixClientPeg.get().isGuest()) {
             dis.dispatch({action: 'require_registration'});
@@ -128,7 +180,7 @@ class UploadButton extends React.Component {
         if (ev.target.files.length === 0) return;
 
         // take a copy so we can safely reset the value of the form control
-        // (Note it is a FileList: we can't use slice or sesnible iteration).
+        // (Note it is a FileList: we can't use slice or sensible iteration).
         const tfiles = [];
         for (let i = 0; i < ev.target.files.length; ++i) {
             tfiles.push(ev.target.files[i]);
@@ -147,9 +199,9 @@ class UploadButton extends React.Component {
 
     render() {
         const uploadInputStyle = {display: 'none'};
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         return (
-            <AccessibleButton className="mx_MessageComposer_button mx_MessageComposer_upload"
+            <AccessibleTooltipButton
+                className="mx_MessageComposer_button mx_MessageComposer_upload"
                 onClick={this.onUploadClick}
                 title={_t('Upload file')}
             >
@@ -160,7 +212,7 @@ class UploadButton extends React.Component {
                     multiple
                     onChange={this.onUploadFileInputChange}
                 />
-            </AccessibleButton>
+            </AccessibleTooltipButton>
         );
     }
 }
@@ -173,7 +225,7 @@ export default class MessageComposer extends React.Component {
         this._onRoomViewStoreUpdate = this._onRoomViewStoreUpdate.bind(this);
         this._onTombstoneClick = this._onTombstoneClick.bind(this);
         this.renderPlaceholderText = this.renderPlaceholderText.bind(this);
-
+        this._dispatcherRef = null;
         this.state = {
             isQuoting: Boolean(RoomViewStore.getQuotingEvent()),
             tombstone: this._getRoomTombstone(),
@@ -182,7 +234,20 @@ export default class MessageComposer extends React.Component {
         };
     }
 
+    onAction = (payload) => {
+        if (payload.action === 'reply_to_event') {
+            // add a timeout for the reply preview to be rendered, so
+            // that the ScrollPanel listening to the resizeNotifier can
+            // correctly measure it's new height and scroll down to keep
+            // at the bottom if it already is
+            setTimeout(() => {
+                this.props.resizeNotifier.notifyTimelineHeightChanged();
+            }, 100);
+        }
+    };
+
     componentDidMount() {
+        this.dispatcherRef = dis.register(this.onAction);
         MatrixClientPeg.get().on("RoomState.events", this._onRoomStateEvents);
         this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
         this._waitForOwnMember();
@@ -211,6 +276,7 @@ export default class MessageComposer extends React.Component {
         if (this._roomStoreToken) {
             this._roomStoreToken.remove();
         }
+        dis.unregister(this.dispatcherRef);
     }
 
     _onRoomStateEvents(ev, state) {
@@ -270,37 +336,28 @@ export default class MessageComposer extends React.Component {
     }
 
     renderPlaceholderText() {
-        if (SettingsStore.getValue("feature_cross_signing")) {
-            if (this.state.isQuoting) {
-                if (this.props.e2eStatus) {
-                    return _t('Send an encrypted reply…');
-                } else {
-                    return _t('Send a reply…');
-                }
+        if (this.state.isQuoting) {
+            if (this.props.e2eStatus) {
+                return _t('Send an encrypted reply…');
             } else {
-                if (this.props.e2eStatus) {
-                    return _t('Send an encrypted message…');
-                } else {
-                    return _t('Send a message…');
-                }
+                return _t('Send a reply…');
             }
         } else {
-            if (this.state.isQuoting) {
-                if (this.props.e2eStatus) {
-                    return _t('Send an encrypted reply…');
-                } else {
-                    return _t('Send a reply (unencrypted)…');
-                }
+            if (this.props.e2eStatus) {
+                return _t('Send an encrypted message…');
             } else {
-                if (this.props.e2eStatus) {
-                    return _t('Send an encrypted message…');
-                } else {
-                    return _t('Send a message (unencrypted)…');
-                }
+                return _t('Send a message…');
             }
         }
     }
 
+    addEmoji(emoji) {
+        dis.dispatch({
+            action: "insert_emoji",
+            emoji,
+        });
+    }
+
     render() {
         const controls = [
             this.state.me ? <ComposerAvatar key="controls_avatar" me={this.state.me} /> : null,
@@ -323,9 +380,11 @@ export default class MessageComposer extends React.Component {
                     key="controls_input"
                     room={this.props.room}
                     placeholder={this.renderPlaceholderText()}
+                    resizeNotifier={this.props.resizeNotifier}
                     permalinkCreator={this.props.permalinkCreator} />,
-                <Stickerpicker key='stickerpicker_controls_button' room={this.props.room} />,
                 <UploadButton key="controls_upload" roomId={this.props.room.roomId} />,
+                <EmojiButton key="emoji_button" addEmoji={this.addEmoji} />,
+                <Stickerpicker key="stickerpicker_controls_button" room={this.props.room} />,
             );
 
             if (this.state.showCallButtons) {
@@ -370,8 +429,9 @@ export default class MessageComposer extends React.Component {
         }
 
         return (
-            <div className="mx_MessageComposer">
+            <div className="mx_MessageComposer mx_GroupLayout">
                 <div className="mx_MessageComposer_wrapper">
+                    <ReplyPreview permalinkCreator={this.props.permalinkCreator} />
                     <div className="mx_MessageComposer_row">
                         { controls }
                     </div>
diff --git a/src/components/views/rooms/MessageComposerFormatBar.js b/src/components/views/rooms/MessageComposerFormatBar.js
index 42d54f5987..71aef1e833 100644
--- a/src/components/views/rooms/MessageComposerFormatBar.js
+++ b/src/components/views/rooms/MessageComposerFormatBar.js
@@ -17,9 +17,8 @@ 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 AccessibleButton from "../elements/AccessibleButton";
+import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
 
 export default class MessageComposerFormatBar extends React.PureComponent {
     static propTypes = {
@@ -68,28 +67,28 @@ class FormatButton extends React.PureComponent {
     };
 
     render() {
-        const InteractiveTooltip = sdk.getComponent('elements.InteractiveTooltip');
         const className = `mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIcon${this.props.icon}`;
         let shortcut;
         if (this.props.shortcut) {
             shortcut = <div className="mx_MessageComposerFormatBar_tooltipShortcut">{this.props.shortcut}</div>;
         }
-        const tooltipContent = (
-            <div className="mx_MessageComposerFormatBar_buttonTooltip">
-                <div>{this.props.label}</div>
+        const tooltip = <div>
+            <div className="mx_Tooltip_title">
+                {this.props.label}
+            </div>
+            <div className="mx_Tooltip_sub">
                 {shortcut}
             </div>
-        );
+        </div>;
 
         return (
-            <InteractiveTooltip content={tooltipContent} forceHidden={!this.props.visible}>
-                <AccessibleButton
-                    as="span"
-                    role="button"
-                    onClick={this.props.onClick}
-                    aria-label={this.props.label}
-                    className={className} />
-            </InteractiveTooltip>
+            <AccessibleTooltipButton
+                as="span"
+                role="button"
+                onClick={this.props.onClick}
+                title={this.props.label}
+                tooltip={tooltip}
+                className={className} />
         );
     }
 }
diff --git a/src/components/views/rooms/NotificationBadge.tsx b/src/components/views/rooms/NotificationBadge.tsx
new file mode 100644
index 0000000000..8253940d4e
--- /dev/null
+++ b/src/components/views/rooms/NotificationBadge.tsx
@@ -0,0 +1,137 @@
+/*
+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 classNames from "classnames";
+import { formatMinimalBadgeCount } from "../../../utils/FormattingUtils";
+import SettingsStore from "../../../settings/SettingsStore";
+import AccessibleButton from "../elements/AccessibleButton";
+import { XOR } from "../../../@types/common";
+import { NOTIFICATION_STATE_UPDATE, NotificationState } from "../../../stores/notifications/NotificationState";
+
+interface IProps {
+    notification: NotificationState;
+
+    /**
+     * If true, the badge will show a count if at all possible. This is typically
+     * used to override the user's preference for things like room sublists.
+     */
+    forceCount: boolean;
+
+    /**
+     * The room ID, if any, the badge represents.
+     */
+    roomId?: string;
+}
+
+interface IClickableProps extends IProps, React.InputHTMLAttributes<Element> {
+    /**
+     * If specified will return an AccessibleButton instead of a div.
+     */
+    onClick?(ev: React.MouseEvent);
+}
+
+interface IState {
+    showCounts: boolean; // whether or not to show counts. Independent of props.forceCount
+}
+
+export default class NotificationBadge extends React.PureComponent<XOR<IProps, IClickableProps>, IState> {
+    private countWatcherRef: string;
+
+    constructor(props: IProps) {
+        super(props);
+        this.props.notification.on(NOTIFICATION_STATE_UPDATE, this.onNotificationUpdate);
+
+        this.state = {
+            showCounts: SettingsStore.getValue("Notifications.alwaysShowBadgeCounts", this.roomId),
+        };
+
+        this.countWatcherRef = SettingsStore.watchSetting(
+            "Notifications.alwaysShowBadgeCounts", this.roomId,
+            this.countPreferenceChanged,
+        );
+    }
+
+    private get roomId(): string {
+        // We should convert this to null for safety with the SettingsStore
+        return this.props.roomId || null;
+    }
+
+    public componentWillUnmount() {
+        SettingsStore.unwatchSetting(this.countWatcherRef);
+        this.props.notification.off(NOTIFICATION_STATE_UPDATE, this.onNotificationUpdate);
+    }
+
+    public componentDidUpdate(prevProps: Readonly<IProps>) {
+        if (prevProps.notification) {
+            prevProps.notification.off(NOTIFICATION_STATE_UPDATE, this.onNotificationUpdate);
+        }
+
+        this.props.notification.on(NOTIFICATION_STATE_UPDATE, this.onNotificationUpdate);
+    }
+
+    private countPreferenceChanged = () => {
+        this.setState({showCounts: SettingsStore.getValue("Notifications.alwaysShowBadgeCounts", this.roomId)});
+    };
+
+    private onNotificationUpdate = () => {
+        this.forceUpdate(); // notification state changed - update
+    };
+
+    public render(): React.ReactElement {
+        const {notification, forceCount, roomId, onClick, ...props} = this.props;
+
+        // Don't show a badge if we don't need to
+        if (notification.isIdle) return null;
+
+        // TODO: Update these booleans for FTUE Notifications: https://github.com/vector-im/element-web/issues/14261
+        // As of writing, that is "if red, show count always" and "optionally show counts instead of dots".
+        // See git diff for what that boolean state looks like.
+        // XXX: We ignore this.state.showCounts (the setting which controls counts vs dots).
+        const hasAnySymbol = notification.symbol || notification.count > 0;
+        let isEmptyBadge = !hasAnySymbol || !notification.hasUnreadCount;
+        if (forceCount) {
+            isEmptyBadge = false;
+            if (!notification.hasUnreadCount) return null; // Can't render a badge
+        }
+
+        let symbol = notification.symbol || formatMinimalBadgeCount(notification.count);
+        if (isEmptyBadge) symbol = "";
+
+        const classes = classNames({
+            'mx_NotificationBadge': true,
+            'mx_NotificationBadge_visible': isEmptyBadge ? true : notification.hasUnreadCount,
+            'mx_NotificationBadge_highlighted': notification.hasMentions,
+            'mx_NotificationBadge_dot': isEmptyBadge,
+            'mx_NotificationBadge_2char': symbol.length > 0 && symbol.length < 3,
+            'mx_NotificationBadge_3char': symbol.length > 2,
+        });
+
+        if (onClick) {
+            return (
+                <AccessibleButton {...props} className={classes} onClick={onClick}>
+                    <span className="mx_NotificationBadge_count">{symbol}</span>
+                </AccessibleButton>
+            );
+        }
+
+        return (
+            <div className={classes}>
+                <span className="mx_NotificationBadge_count">{symbol}</span>
+            </div>
+        );
+    }
+}
diff --git a/src/components/views/rooms/PinnedEventTile.js b/src/components/views/rooms/PinnedEventTile.js
index 28fc8fc338..924385d226 100644
--- a/src/components/views/rooms/PinnedEventTile.js
+++ b/src/components/views/rooms/PinnedEventTile.js
@@ -18,7 +18,7 @@ import React from "react";
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 import AccessibleButton from "../elements/AccessibleButton";
 import MessageEvent from "../messages/MessageEvent";
 import MemberAvatar from "../avatars/MemberAvatar";
diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index 85d443d55a..1c490f019e 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -23,7 +23,7 @@ import { _t } from '../../../languageHandler';
 import {formatDate} from '../../../DateUtils';
 import Velociraptor from "../../../Velociraptor";
 import * as sdk from "../../../index";
-import toRem from "../../../utils/rem";
+import {toPx} from "../../../utils/units";
 
 let bounce = false;
 try {
@@ -149,7 +149,7 @@ export default createReactClass({
             // start at the old height and in the old h pos
 
             startStyles.push({ top: startTopOffset+"px",
-                               left: toRem(oldInfo.left) });
+                               left: toPx(oldInfo.left) });
 
             const reorderTransitionOpts = {
                 duration: 100,
@@ -182,7 +182,7 @@ export default createReactClass({
         }
 
         const style = {
-            left: toRem(this.props.leftOffset),
+            left: toPx(this.props.leftOffset),
             top: '0px',
             visibility: this.props.hidden ? 'hidden' : 'visible',
         };
diff --git a/src/components/views/rooms/ReplyPreview.js b/src/components/views/rooms/ReplyPreview.js
index b28494c65a..de70338245 100644
--- a/src/components/views/rooms/ReplyPreview.js
+++ b/src/components/views/rooms/ReplyPreview.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import RoomViewStore from '../../../stores/RoomViewStore';
@@ -73,7 +73,7 @@ export default class ReplyPreview extends React.Component {
         return <div className="mx_ReplyPreview">
             <div className="mx_ReplyPreview_section">
                 <div className="mx_ReplyPreview_header mx_ReplyPreview_title">
-                    { '💬 ' + _t('Replying') }
+                    { _t('Replying') }
                 </div>
                 <div className="mx_ReplyPreview_header mx_ReplyPreview_cancel">
                     <img className="mx_filterFlipColor" src={require("../../../../res/img/cancel.svg")} width="18" height="18"
diff --git a/src/components/views/rooms/RoomBreadcrumbs.js b/src/components/views/rooms/RoomBreadcrumbs.js
deleted file mode 100644
index 86c0d7ca96..0000000000
--- a/src/components/views/rooms/RoomBreadcrumbs.js
+++ /dev/null
@@ -1,394 +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, {createRef} from "react";
-import dis from "../../../dispatcher";
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
-import AccessibleButton from '../elements/AccessibleButton';
-import RoomAvatar from '../avatars/RoomAvatar';
-import classNames from 'classnames';
-import * as sdk from "../../../index";
-import Analytics from "../../../Analytics";
-import * as RoomNotifs from '../../../RoomNotifs';
-import * as FormattingUtils from "../../../utils/FormattingUtils";
-import DMRoomMap from "../../../utils/DMRoomMap";
-import {_t} from "../../../languageHandler";
-
-const MAX_ROOMS = 20;
-const MIN_ROOMS_BEFORE_ENABLED = 10;
-
-// The threshold time in milliseconds to wait for an autojoined room to show up.
-const AUTOJOIN_WAIT_THRESHOLD_MS = 90000; // 90 seconds
-
-export default class RoomBreadcrumbs extends React.Component {
-    constructor(props) {
-        super(props);
-        this.state = {rooms: [], enabled: false};
-
-        this.onAction = this.onAction.bind(this);
-        this._dispatcherRef = null;
-
-        // The room IDs we're waiting to come down the Room handler and when we
-        // started waiting for them. Used to track a room over an upgrade/autojoin.
-        this._waitingRoomQueue = [/* { roomId, addedTs } */];
-
-        this._scroller = createRef();
-    }
-
-    // TODO: [REACT-WARNING] Move this to constructor
-    UNSAFE_componentWillMount() { // eslint-disable-line camelcase
-        this._dispatcherRef = dis.register(this.onAction);
-
-        const storedRooms = SettingsStore.getValue("breadcrumb_rooms");
-        this._loadRoomIds(storedRooms || []);
-
-        this._settingWatchRef = SettingsStore.watchSetting("breadcrumb_rooms", null, this.onBreadcrumbsChanged);
-
-        this.setState({enabled: this._shouldEnable()});
-
-        MatrixClientPeg.get().on("Room.myMembership", this.onMyMembership);
-        MatrixClientPeg.get().on("Room.receipt", this.onRoomReceipt);
-        MatrixClientPeg.get().on("Room.timeline", this.onRoomTimeline);
-        MatrixClientPeg.get().on("Event.decrypted", this.onEventDecrypted);
-        MatrixClientPeg.get().on("Room", this.onRoom);
-    }
-
-    componentWillUnmount() {
-        dis.unregister(this._dispatcherRef);
-
-        SettingsStore.unwatchSetting(this._settingWatchRef);
-
-        const client = MatrixClientPeg.get();
-        if (client) {
-            client.removeListener("Room.myMembership", this.onMyMembership);
-            client.removeListener("Room.receipt", this.onRoomReceipt);
-            client.removeListener("Room.timeline", this.onRoomTimeline);
-            client.removeListener("Event.decrypted", this.onEventDecrypted);
-            client.removeListener("Room", this.onRoom);
-        }
-    }
-
-    componentDidUpdate() {
-        const rooms = this.state.rooms.slice();
-
-        if (rooms.length) {
-            const roomModel = rooms[0];
-            if (!roomModel.animated) {
-                roomModel.animated = true;
-                setTimeout(() => this.setState({rooms}), 0);
-            }
-        }
-    }
-
-    onAction(payload) {
-        switch (payload.action) {
-            case 'view_room':
-                if (payload.auto_join && !MatrixClientPeg.get().getRoom(payload.room_id)) {
-                    // Queue the room instead of pushing it immediately - we're probably just waiting
-                    // for a join to complete (ie: joining the upgraded room).
-                    this._waitingRoomQueue.push({roomId: payload.room_id, addedTs: (new Date).getTime()});
-                    break;
-                }
-                this._appendRoomId(payload.room_id);
-                break;
-
-            // XXX: slight hack in order to zero the notification count when a room
-            // is read. Copied from RoomTile
-            case 'on_room_read': {
-                const room = MatrixClientPeg.get().getRoom(payload.roomId);
-                this._calculateRoomBadges(room, /*zero=*/true);
-                break;
-            }
-        }
-    }
-
-    onMyMembership = (room, membership) => {
-        if (membership === "leave" || membership === "ban") {
-            const rooms = this.state.rooms.slice();
-            const roomState = rooms.find((r) => r.room.roomId === room.roomId);
-            if (roomState) {
-                roomState.left = true;
-                this.setState({rooms});
-            }
-        }
-        this.onRoomMembershipChanged();
-    };
-
-    onRoomReceipt = (event, room) => {
-        if (this.state.rooms.map(r => r.room.roomId).includes(room.roomId)) {
-            this._calculateRoomBadges(room);
-        }
-    };
-
-    onRoomTimeline = (event, room) => {
-        if (!room) return; // Can be null for the notification timeline, etc.
-        if (this.state.rooms.map(r => r.room.roomId).includes(room.roomId)) {
-            this._calculateRoomBadges(room);
-        }
-    };
-
-    onEventDecrypted = (event) => {
-        if (this.state.rooms.map(r => r.room.roomId).includes(event.getRoomId())) {
-            this._calculateRoomBadges(MatrixClientPeg.get().getRoom(event.getRoomId()));
-        }
-    };
-
-    onBreadcrumbsChanged = (settingName, roomId, level, valueAtLevel, value) => {
-        if (!value) return;
-
-        const currentState = this.state.rooms.map((r) => r.room.roomId);
-        if (currentState.length === value.length) {
-            let changed = false;
-            for (let i = 0; i < currentState.length; i++) {
-                if (currentState[i] !== value[i]) {
-                    changed = true;
-                    break;
-                }
-            }
-            if (!changed) return;
-        }
-
-        this._loadRoomIds(value);
-    };
-
-    onRoomMembershipChanged = () => {
-        if (!this.state.enabled && this._shouldEnable()) {
-            this.setState({enabled: true});
-        }
-    };
-
-    onRoom = (room) => {
-        // Always check for membership changes when we see new rooms
-        this.onRoomMembershipChanged();
-
-        const waitingRoom = this._waitingRoomQueue.find(r => r.roomId === room.roomId);
-        if (!waitingRoom) return;
-        this._waitingRoomQueue.splice(this._waitingRoomQueue.indexOf(waitingRoom), 1);
-
-        const now = (new Date()).getTime();
-        if ((now - waitingRoom.addedTs) > AUTOJOIN_WAIT_THRESHOLD_MS) return; // Too long ago.
-        this._appendRoomId(room.roomId); // add the room we've been waiting for
-    };
-
-    _shouldEnable() {
-        const client = MatrixClientPeg.get();
-        const joinedRoomCount = client.getRooms().reduce((count, r) => {
-            return count + (r.getMyMembership() === "join" ? 1 : 0);
-        }, 0);
-        return joinedRoomCount >= MIN_ROOMS_BEFORE_ENABLED;
-    }
-
-    _loadRoomIds(roomIds) {
-        if (!roomIds || roomIds.length <= 0) return; // Skip updates with no rooms
-
-        // If we're here, the list changed.
-        const rooms = roomIds.map((r) => MatrixClientPeg.get().getRoom(r)).filter((r) => r).map((r) => {
-            const badges = this._calculateBadgesForRoom(r) || {};
-            return {
-                room: r,
-                animated: false,
-                ...badges,
-            };
-        });
-        this.setState({
-            rooms: rooms,
-        });
-    }
-
-    _calculateBadgesForRoom(room, zero=false) {
-        if (!room) return null;
-
-        // Reset the notification variables for simplicity
-        const roomModel = {
-            redBadge: false,
-            formattedCount: "0",
-            showCount: false,
-        };
-
-        if (zero) return roomModel;
-
-        const notifState = RoomNotifs.getRoomNotifsState(room.roomId);
-        if (RoomNotifs.MENTION_BADGE_STATES.includes(notifState)) {
-            const highlightNotifs = RoomNotifs.getUnreadNotificationCount(room, 'highlight');
-            const unreadNotifs = RoomNotifs.getUnreadNotificationCount(room);
-
-            const redBadge = highlightNotifs > 0;
-            const greyBadge = redBadge || (unreadNotifs > 0 && RoomNotifs.BADGE_STATES.includes(notifState));
-
-            if (redBadge || greyBadge) {
-                const notifCount = redBadge ? highlightNotifs : unreadNotifs;
-                const limitedCount = FormattingUtils.formatCount(notifCount);
-
-                roomModel.redBadge = redBadge;
-                roomModel.formattedCount = limitedCount;
-                roomModel.showCount = true;
-            }
-        }
-
-        return roomModel;
-    }
-
-    _calculateRoomBadges(room, zero=false) {
-        if (!room) return;
-
-        const rooms = this.state.rooms.slice();
-        const roomModel = rooms.find((r) => r.room.roomId === room.roomId);
-        if (!roomModel) return; // No applicable room, so don't do math on it
-
-        const badges = this._calculateBadgesForRoom(room, zero);
-        if (!badges) return; // No badges for some reason
-
-        Object.assign(roomModel, badges);
-        this.setState({rooms});
-    }
-
-    _appendRoomId(roomId) {
-        let room = MatrixClientPeg.get().getRoom(roomId);
-        if (!room) return;
-
-        const rooms = this.state.rooms.slice();
-
-        // If the room is upgraded, use that room instead. We'll also splice out
-        // any children of the room.
-        const history = MatrixClientPeg.get().getRoomUpgradeHistory(roomId);
-        if (history.length > 1) {
-            room = history[history.length - 1]; // Last room is most recent
-
-            // Take out any room that isn't the most recent room
-            for (let i = 0; i < history.length - 1; i++) {
-                const idx = rooms.findIndex((r) => r.room.roomId === history[i].roomId);
-                if (idx !== -1) rooms.splice(idx, 1);
-            }
-        }
-
-        const existingIdx = rooms.findIndex((r) => r.room.roomId === room.roomId);
-        if (existingIdx !== -1) {
-            rooms.splice(existingIdx, 1);
-        }
-
-        rooms.splice(0, 0, {room, animated: false});
-
-        if (rooms.length > MAX_ROOMS) {
-            rooms.splice(MAX_ROOMS, rooms.length - MAX_ROOMS);
-        }
-        this.setState({rooms});
-
-        if (this._scroller.current) {
-            this._scroller.current.moveToOrigin();
-        }
-
-        // We don't track room aesthetics (badges, membership, etc) over the wire so we
-        // don't need to do this elsewhere in the file. Just where we alter the room IDs
-        // and their order.
-        const roomIds = rooms.map((r) => r.room.roomId);
-        if (roomIds.length > 0) {
-            SettingsStore.setValue("breadcrumb_rooms", null, SettingLevel.ACCOUNT, roomIds);
-        }
-    }
-
-    _viewRoom(room, index) {
-        Analytics.trackEvent("Breadcrumbs", "click_node", index);
-        dis.dispatch({action: "view_room", room_id: room.roomId});
-    }
-
-    _onMouseEnter(room) {
-        this._onHover(room);
-    }
-
-    _onMouseLeave(room) {
-        this._onHover(null); // clear hover states
-    }
-
-    _onHover(room) {
-        const rooms = this.state.rooms.slice();
-        for (const r of rooms) {
-            r.hover = room && r.room.roomId === room.roomId;
-        }
-        this.setState({rooms});
-    }
-
-    _isDmRoom(room) {
-        const dmRooms = DMRoomMap.shared().getUserIdForRoomId(room.roomId);
-        return Boolean(dmRooms);
-    }
-
-    render() {
-        const Tooltip = sdk.getComponent('elements.Tooltip');
-        const IndicatorScrollbar = sdk.getComponent('structures.IndicatorScrollbar');
-
-        // check for collapsed here and not at parent so we keep rooms in our state
-        // when collapsing and expanding
-        if (this.props.collapsed || !this.state.enabled) {
-            return null;
-        }
-
-        const rooms = this.state.rooms;
-        const avatars = rooms.map((r, i) => {
-            const isFirst = i === 0;
-            const classes = classNames({
-                "mx_RoomBreadcrumbs_crumb": true,
-                "mx_RoomBreadcrumbs_preAnimate": isFirst && !r.animated,
-                "mx_RoomBreadcrumbs_animate": isFirst,
-                "mx_RoomBreadcrumbs_left": r.left,
-            });
-
-            let tooltip = null;
-            if (r.hover) {
-                tooltip = <Tooltip label={r.room.name} />;
-            }
-
-            let badge;
-            if (r.showCount) {
-                const badgeClasses = classNames({
-                    'mx_RoomTile_badge': true,
-                    'mx_RoomTile_badgeButton': true,
-                    'mx_RoomTile_badgeRed': r.redBadge,
-                    'mx_RoomTile_badgeUnread': !r.redBadge,
-                });
-
-                badge = <div className={badgeClasses}>{r.formattedCount}</div>;
-            }
-
-            return (
-                <AccessibleButton
-                    className={classes}
-                    key={r.room.roomId}
-                    onClick={() => this._viewRoom(r.room, i)}
-                    onMouseEnter={() => this._onMouseEnter(r.room)}
-                    onMouseLeave={() => this._onMouseLeave(r.room)}
-                    aria-label={_t("Room %(name)s", {name: r.room.name})}
-                >
-                    <RoomAvatar room={r.room} width={32} height={32} />
-                    {badge}
-                    {tooltip}
-                </AccessibleButton>
-            );
-        });
-        return (
-            <div role="toolbar" aria-label={_t("Recent rooms")}>
-                <IndicatorScrollbar
-                    ref={this._scroller}
-                    className="mx_RoomBreadcrumbs"
-                    trackHorizontalOverflow={true}
-                    verticalScrollsHorizontally={true}
-                >
-                    { avatars }
-                </IndicatorScrollbar>
-            </div>
-        );
-    }
-}
diff --git a/src/components/views/rooms/RoomBreadcrumbs.tsx b/src/components/views/rooms/RoomBreadcrumbs.tsx
new file mode 100644
index 0000000000..92e911067c
--- /dev/null
+++ b/src/components/views/rooms/RoomBreadcrumbs.tsx
@@ -0,0 +1,129 @@
+/*
+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 { BreadcrumbsStore } from "../../../stores/BreadcrumbsStore";
+import DecoratedRoomAvatar from "../avatars/DecoratedRoomAvatar";
+import { _t } from "../../../languageHandler";
+import { Room } from "matrix-js-sdk/src/models/room";
+import defaultDispatcher from "../../../dispatcher/dispatcher";
+import Analytics from "../../../Analytics";
+import { UPDATE_EVENT } from "../../../stores/AsyncStore";
+import { CSSTransition } from "react-transition-group";
+import RoomListStore from "../../../stores/room-list/RoomListStore";
+import { DefaultTagID } from "../../../stores/room-list/models";
+import { RovingAccessibleTooltipButton } from "../../../accessibility/RovingTabIndex";
+import Toolbar from "../../../accessibility/Toolbar";
+
+interface IProps {
+}
+
+interface IState {
+    // Both of these control the animation for the breadcrumbs. For details on the
+    // actual animation, see the CSS.
+    //
+    // doAnimation is to lie to the CSSTransition component (see onBreadcrumbsUpdate
+    // for info). skipFirst is used to try and reduce jerky animation - also see the
+    // breadcrumb update function for info on that.
+    doAnimation: boolean;
+    skipFirst: boolean;
+}
+
+export default class RoomBreadcrumbs extends React.PureComponent<IProps, IState> {
+    private isMounted = true;
+
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            doAnimation: true, // technically we want animation on mount, but it won't be perfect
+            skipFirst: false, // render the thing, as boring as it is
+        };
+
+        BreadcrumbsStore.instance.on(UPDATE_EVENT, this.onBreadcrumbsUpdate);
+    }
+
+    public componentWillUnmount() {
+        this.isMounted = false;
+        BreadcrumbsStore.instance.off(UPDATE_EVENT, this.onBreadcrumbsUpdate);
+    }
+
+    private onBreadcrumbsUpdate = () => {
+        if (!this.isMounted) return;
+
+        // We need to trick the CSSTransition component into updating, which means we need to
+        // tell it to not animate, then to animate a moment later. This causes two updates
+        // which means two renders. The skipFirst change is so that our don't-animate state
+        // doesn't show the breadcrumb we're about to reveal as it causes a visual jump/jerk.
+        // The second update, on the next available tick, causes the "enter" animation to start
+        // again and this time we want to show the newest breadcrumb because it'll be hidden
+        // off screen for the animation.
+        this.setState({doAnimation: false, skipFirst: true});
+        setTimeout(() => this.setState({doAnimation: true, skipFirst: false}), 0);
+    };
+
+    private viewRoom = (room: Room, index: number) => {
+        Analytics.trackEvent("Breadcrumbs", "click_node", index);
+        defaultDispatcher.dispatch({action: "view_room", room_id: room.roomId});
+    };
+
+    public render(): React.ReactElement {
+        const tiles = BreadcrumbsStore.instance.rooms.map((r, i) => {
+            const roomTags = RoomListStore.instance.getTagsForRoom(r);
+            const roomTag = roomTags.includes(DefaultTagID.DM) ? DefaultTagID.DM : roomTags[0];
+            return (
+                <RovingAccessibleTooltipButton
+                    className="mx_RoomBreadcrumbs_crumb"
+                    key={r.roomId}
+                    onClick={() => this.viewRoom(r, i)}
+                    aria-label={_t("Room %(name)s", {name: r.name})}
+                    title={r.name}
+                    tooltipClassName="mx_RoomBreadcrumbs_Tooltip"
+                >
+                    <DecoratedRoomAvatar
+                        room={r}
+                        avatarSize={32}
+                        tag={roomTag}
+                        displayBadge={true}
+                        forceCount={true}
+                    />
+                </RovingAccessibleTooltipButton>
+            );
+        });
+
+        if (tiles.length > 0) {
+            // NOTE: The CSSTransition timeout MUST match the timeout in our CSS!
+            return (
+                <CSSTransition
+                    appear={true} in={this.state.doAnimation} timeout={640}
+                    classNames='mx_RoomBreadcrumbs'
+                >
+                    <Toolbar className='mx_RoomBreadcrumbs'>
+                        {tiles.slice(this.state.skipFirst ? 1 : 0)}
+                    </Toolbar>
+                </CSSTransition>
+            );
+        } else {
+            return (
+                <div className='mx_RoomBreadcrumbs'>
+                    <div className="mx_RoomBreadcrumbs_placeholder">
+                        {_t("No recently visited rooms")}
+                    </div>
+                </div>
+            );
+        }
+    }
+}
diff --git a/src/components/views/rooms/RoomDetailList.js b/src/components/views/rooms/RoomDetailList.js
index db7b86da4f..5b45cfc29a 100644
--- a/src/components/views/rooms/RoomDetailList.js
+++ b/src/components/views/rooms/RoomDetailList.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import React from 'react';
 import { _t } from '../../../languageHandler';
 import PropTypes from 'prop-types';
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 17495e6299..fe5b12c1c0 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -26,14 +26,14 @@ import Modal from "../../../Modal";
 import RateLimitedFunc from '../../../ratelimitedfunc';
 
 import { linkifyElement } from '../../../HtmlUtils';
-import AccessibleButton from '../elements/AccessibleButton';
 import ManageIntegsButton from '../elements/ManageIntegsButton';
 import {CancelButton} from './SimpleRoomHeader';
 import SettingsStore from "../../../settings/SettingsStore";
 import RoomHeaderButtons from '../right_panel/RoomHeaderButtons';
-import DMRoomMap from '../../../utils/DMRoomMap';
 import E2EIcon from './E2EIcon';
-import InviteOnlyIcon from './InviteOnlyIcon';
+import DecoratedRoomAvatar from "../avatars/DecoratedRoomAvatar";
+import {DefaultTagID} from "../../../stores/room-list/models";
+import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
 
 export default createReactClass({
     displayName: 'RoomHeader',
@@ -152,28 +152,11 @@ export default createReactClass({
     },
 
     render: function() {
-        const RoomAvatar = sdk.getComponent("avatars.RoomAvatar");
-
         let searchStatus = null;
         let cancelButton = null;
         let settingsButton = null;
         let pinnedEventsButton = null;
 
-        const e2eIcon = this.props.e2eStatus ?
-            <E2EIcon status={this.props.e2eStatus} /> :
-            undefined;
-
-        const dmUserId = DMRoomMap.shared().getUserIdForRoomId(this.props.room.roomId);
-        const joinRules = this.props.room && this.props.room.currentState.getStateEvents("m.room.join_rules", "");
-        const joinRule = joinRules && joinRules.getContent().join_rule;
-        let privateIcon;
-        // Don't show an invite-only icon for DMs. Users know they're invite-only.
-        if (!dmUserId && SettingsStore.getValue("feature_cross_signing")) {
-            if (joinRule == "invite") {
-                privateIcon = <InviteOnlyIcon />;
-            }
-        }
-
         if (this.props.onCancelClick) {
             cancelButton = <CancelButton onClick={this.props.onCancelClick} />;
         }
@@ -223,27 +206,27 @@ export default createReactClass({
         }
         const topicElement =
             <div className="mx_RoomHeader_topic" ref={this._topic} title={topic} dir="auto">{ topic }</div>;
-        const avatarSize = 28;
+
         let roomAvatar;
         if (this.props.room) {
-            roomAvatar = (<RoomAvatar
+            roomAvatar = <DecoratedRoomAvatar
                 room={this.props.room}
-                width={avatarSize}
-                height={avatarSize}
+                avatarSize={32}
+                tag={DefaultTagID.Untagged} // to apply room publicity badging
                 oobData={this.props.oobData}
-                viewAvatarOnClick={true} />);
+                viewAvatarOnClick={true}
+            />;
         }
 
         if (this.props.onSettingsClick) {
             settingsButton =
-                <AccessibleButton className="mx_RoomHeader_button mx_RoomHeader_settingsButton"
+                <AccessibleTooltipButton
+                    className="mx_RoomHeader_button mx_RoomHeader_settingsButton"
                     onClick={this.props.onSettingsClick}
-                    title={_t("Settings")}
-                >
-                </AccessibleButton>;
+                    title={_t("Settings")} />;
         }
 
-        if (this.props.onPinnedClick && SettingsStore.isFeatureEnabled('feature_pinning')) {
+        if (this.props.onPinnedClick && SettingsStore.getValue('feature_pinning')) {
             let pinsIndicator = null;
             if (this._hasUnreadPins()) {
                 pinsIndicator = (<div className="mx_RoomHeader_pinsIndicator mx_RoomHeader_pinsIndicatorUnread" />);
@@ -252,55 +235,45 @@ export default createReactClass({
             }
 
             pinnedEventsButton =
-                <AccessibleButton className="mx_RoomHeader_button mx_RoomHeader_pinnedButton"
-                                  onClick={this.props.onPinnedClick} title={_t("Pinned Messages")}>
+                <AccessibleTooltipButton
+                    className="mx_RoomHeader_button mx_RoomHeader_pinnedButton"
+                    onClick={this.props.onPinnedClick}
+                    title={_t("Pinned Messages")}
+                >
                     { pinsIndicator }
-                </AccessibleButton>;
+                </AccessibleTooltipButton>;
         }
 
-//        var leave_button;
-//        if (this.props.onLeaveClick) {
-//            leave_button =
-//                <div className="mx_RoomHeader_button" onClick={this.props.onLeaveClick} title="Leave room">
-//                    <TintableSvg src={require("../../../../res/img/leave.svg")} width="26" height="20"/>
-//                </div>;
-//        }
-
         let forgetButton;
         if (this.props.onForgetClick) {
             forgetButton =
-                <AccessibleButton className="mx_RoomHeader_button mx_RoomHeader_forgetButton"
+                <AccessibleTooltipButton
+                    className="mx_RoomHeader_button mx_RoomHeader_forgetButton"
                     onClick={this.props.onForgetClick}
-                    title={_t("Forget room")}
-                >
-                </AccessibleButton>;
+                    title={_t("Forget room")} />;
         }
 
         let searchButton;
         if (this.props.onSearchClick && this.props.inRoom) {
             searchButton =
-                <AccessibleButton className="mx_RoomHeader_button mx_RoomHeader_searchButton"
+                <AccessibleTooltipButton
+                    className="mx_RoomHeader_button mx_RoomHeader_searchButton"
                     onClick={this.props.onSearchClick}
-                    title={_t("Search")}
-                >
-                </AccessibleButton>;
+                    title={_t("Search")} />;
         }
 
         let shareRoomButton;
         if (this.props.inRoom) {
             shareRoomButton =
-                <AccessibleButton className="mx_RoomHeader_button mx_RoomHeader_shareButton"
+                <AccessibleTooltipButton
+                    className="mx_RoomHeader_button mx_RoomHeader_shareButton"
                     onClick={this.onShareRoomClick}
-                    title={_t('Share room')}
-                >
-                </AccessibleButton>;
+                    title={_t('Share room')} />;
         }
 
         let manageIntegsButton;
         if (this.props.room && this.props.room.roomId && this.props.inRoom) {
-            manageIntegsButton = <ManageIntegsButton
-                room={this.props.room}
-            />;
+            manageIntegsButton = <ManageIntegsButton room={this.props.room} />;
         }
 
         const rightRow =
@@ -313,11 +286,13 @@ export default createReactClass({
                 { searchButton }
             </div>;
 
+        const e2eIcon = this.props.e2eStatus ? <E2EIcon status={this.props.e2eStatus} /> : undefined;
+
         return (
             <div className="mx_RoomHeader light-panel">
                 <div className="mx_RoomHeader_wrapper" aria-owns="mx_RightPanel">
-                    <div className="mx_RoomHeader_avatar">{ roomAvatar }{ e2eIcon }</div>
-                    { privateIcon }
+                    <div className="mx_RoomHeader_avatar">{ roomAvatar }</div>
+                    <div className="mx_RoomHeader_e2eIcon">{ e2eIcon }</div>
                     { name }
                     { topicElement }
                     { cancelButton }
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
deleted file mode 100644
index 289a89a206..0000000000
--- a/src/components/views/rooms/RoomList.js
+++ /dev/null
@@ -1,850 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017, 2018 Vector Creations 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.
-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 Timer from "../../../utils/Timer";
-import React from "react";
-import ReactDOM from "react-dom";
-import createReactClass from 'create-react-class';
-import PropTypes from 'prop-types';
-import * as utils from "matrix-js-sdk/src/utils";
-import { _t } from '../../../languageHandler';
-import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import rate_limited_func from "../../../ratelimitedfunc";
-import * as Rooms from '../../../Rooms';
-import DMRoomMap from '../../../utils/DMRoomMap';
-import TagOrderStore from '../../../stores/TagOrderStore';
-import RoomListStore, {TAG_DM} from '../../../stores/RoomListStore';
-import CustomRoomTagStore from '../../../stores/CustomRoomTagStore';
-import GroupStore from '../../../stores/GroupStore';
-import RoomSubList from '../../structures/RoomSubList';
-import ResizeHandle from '../elements/ResizeHandle';
-import CallHandler from "../../../CallHandler";
-import dis from "../../../dispatcher";
-import * as sdk from "../../../index";
-import * as Receipt from "../../../utils/Receipt";
-import {Resizer} from '../../../resizer';
-import {Layout, Distributor} from '../../../resizer/distributors/roomsublist2';
-import {RovingTabIndexProvider} from "../../../accessibility/RovingTabIndex";
-import * as Unread from "../../../Unread";
-import RoomViewStore from "../../../stores/RoomViewStore";
-
-const HIDE_CONFERENCE_CHANS = true;
-const STANDARD_TAGS_REGEX = /^(m\.(favourite|lowpriority|server_notice)|im\.vector\.fake\.(invite|recent|direct|archived))$/;
-const HOVER_MOVE_TIMEOUT = 1000;
-
-function labelForTagName(tagName) {
-    if (tagName.startsWith('u.')) return tagName.slice(2);
-    return tagName;
-}
-
-export default createReactClass({
-    displayName: 'RoomList',
-
-    propTypes: {
-        ConferenceHandler: PropTypes.any,
-        collapsed: PropTypes.bool.isRequired,
-        searchFilter: PropTypes.string,
-    },
-
-    getInitialState: function() {
-
-        this._hoverClearTimer = null;
-        this._subListRefs = {
-            // key => RoomSubList ref
-        };
-
-        const sizesJson = window.localStorage.getItem("mx_roomlist_sizes");
-        const collapsedJson = window.localStorage.getItem("mx_roomlist_collapsed");
-        this.subListSizes = sizesJson ? JSON.parse(sizesJson) : {};
-        this.collapsedState = collapsedJson ? JSON.parse(collapsedJson) : {};
-        this._layoutSections = [];
-
-        const unfilteredOptions = {
-            allowWhitespace: false,
-            handleHeight: 1,
-        };
-        this._unfilteredlayout = new Layout((key, size) => {
-            const subList = this._subListRefs[key];
-            if (subList) {
-                subList.setHeight(size);
-            }
-            // update overflow indicators
-            this._checkSubListsOverflow();
-            // don't store height for collapsed sublists
-            if (!this.collapsedState[key]) {
-                this.subListSizes[key] = size;
-                window.localStorage.setItem("mx_roomlist_sizes",
-                    JSON.stringify(this.subListSizes));
-            }
-        }, this.subListSizes, this.collapsedState, unfilteredOptions);
-
-        this._filteredLayout = new Layout((key, size) => {
-            const subList = this._subListRefs[key];
-            if (subList) {
-                subList.setHeight(size);
-            }
-        }, null, null, {
-            allowWhitespace: false,
-            handleHeight: 0,
-        });
-
-        this._layout = this._unfilteredlayout;
-
-        return {
-            isLoadingLeftRooms: false,
-            totalRoomCount: null,
-            lists: {},
-            incomingCallTag: null,
-            incomingCall: null,
-            selectedTags: [],
-            hover: false,
-            customTags: CustomRoomTagStore.getTags(),
-        };
-    },
-
-    // TODO: [REACT-WARNING] Replace component with real class, put this in the constructor.
-    UNSAFE_componentWillMount: function() {
-        this.mounted = false;
-
-        const cli = MatrixClientPeg.get();
-
-        cli.on("Room", this.onRoom);
-        cli.on("deleteRoom", this.onDeleteRoom);
-        cli.on("Room.receipt", this.onRoomReceipt);
-        cli.on("RoomMember.name", this.onRoomMemberName);
-        cli.on("Event.decrypted", this.onEventDecrypted);
-        cli.on("accountData", this.onAccountData);
-        cli.on("Group.myMembership", this._onGroupMyMembership);
-        cli.on("RoomState.events", this.onRoomStateEvents);
-
-        const dmRoomMap = DMRoomMap.shared();
-        // A map between tags which are group IDs and the room IDs of rooms that should be kept
-        // in the room list when filtering by that tag.
-        this._visibleRoomsForGroup = {
-            // $groupId: [$roomId1, $roomId2, ...],
-        };
-        // All rooms that should be kept in the room list when filtering.
-        // By default, show all rooms.
-        this._visibleRooms = MatrixClientPeg.get().getVisibleRooms();
-
-        // Listen to updates to group data. RoomList cares about members and rooms in order
-        // to filter the room list when group tags are selected.
-        this._groupStoreToken = GroupStore.registerListener(null, () => {
-            (TagOrderStore.getOrderedTags() || []).forEach((tag) => {
-                if (tag[0] !== '+') {
-                    return;
-                }
-                // This group's rooms or members may have updated, update rooms for its tag
-                this.updateVisibleRoomsForTag(dmRoomMap, tag);
-                this.updateVisibleRooms();
-            });
-        });
-
-        this._tagStoreToken = TagOrderStore.addListener(() => {
-            // Filters themselves have changed
-            this.updateVisibleRooms();
-        });
-
-        this._roomListStoreToken = RoomListStore.addListener(() => {
-            this._delayedRefreshRoomList();
-        });
-
-
-        if (SettingsStore.isFeatureEnabled("feature_custom_tags")) {
-            this._customTagStoreToken = CustomRoomTagStore.addListener(() => {
-                this.setState({
-                    customTags: CustomRoomTagStore.getTags(),
-                });
-            });
-        }
-
-        this.refreshRoomList();
-
-        // order of the sublists
-        //this.listOrder = [];
-
-        // loop count to stop a stack overflow if the user keeps waggling the
-        // mouse for >30s in a row, or if running under mocha
-        this._delayedRefreshRoomListLoopCount = 0;
-    },
-
-    componentDidMount: function() {
-        this.dispatcherRef = dis.register(this.onAction);
-        const cfg = {
-            getLayout: () => this._layout,
-        };
-        this.resizer = new Resizer(this.resizeContainer, Distributor, cfg);
-        this.resizer.setClassNames({
-            handle: "mx_ResizeHandle",
-            vertical: "mx_ResizeHandle_vertical",
-            reverse: "mx_ResizeHandle_reverse",
-        });
-        this._layout.update(
-            this._layoutSections,
-            this.resizeContainer && this.resizeContainer.offsetHeight,
-        );
-        this._checkSubListsOverflow();
-
-        this.resizer.attach();
-        if (this.props.resizeNotifier) {
-            this.props.resizeNotifier.on("leftPanelResized", this.onResize);
-        }
-        this.mounted = true;
-    },
-
-    componentDidUpdate: function(prevProps) {
-        let forceLayoutUpdate = false;
-        this._repositionIncomingCallBox(undefined, false);
-        if (!this.props.searchFilter && prevProps.searchFilter) {
-            this._layout = this._unfilteredlayout;
-            forceLayoutUpdate = true;
-        } else if (this.props.searchFilter && !prevProps.searchFilter) {
-            this._layout = this._filteredLayout;
-            forceLayoutUpdate = true;
-        }
-        this._layout.update(
-            this._layoutSections,
-            this.resizeContainer && this.resizeContainer.clientHeight,
-            forceLayoutUpdate,
-        );
-        this._checkSubListsOverflow();
-    },
-
-    onAction: function(payload) {
-        switch (payload.action) {
-            case 'view_tooltip':
-                this.tooltip = payload.tooltip;
-                break;
-            case 'call_state':
-                var call = CallHandler.getCall(payload.room_id);
-                if (call && call.call_state === 'ringing') {
-                    this.setState({
-                        incomingCall: call,
-                        incomingCallTag: this.getTagNameForRoomId(payload.room_id),
-                    });
-                    this._repositionIncomingCallBox(undefined, true);
-                } else {
-                    this.setState({
-                        incomingCall: null,
-                        incomingCallTag: null,
-                    });
-                }
-                break;
-            case 'view_room_delta': {
-                const currentRoomId = RoomViewStore.getRoomId();
-                const {
-                    "im.vector.fake.invite": inviteRooms,
-                    "m.favourite": favouriteRooms,
-                    [TAG_DM]: dmRooms,
-                    "im.vector.fake.recent": recentRooms,
-                    "m.lowpriority": lowPriorityRooms,
-                    "im.vector.fake.archived": historicalRooms,
-                    "m.server_notice": serverNoticeRooms,
-                    ...tags
-                } = this.state.lists;
-
-                const shownCustomTagRooms = Object.keys(tags).filter(tagName => {
-                    return (!this.state.customTags || this.state.customTags[tagName]) &&
-                        !tagName.match(STANDARD_TAGS_REGEX);
-                }).map(tagName => tags[tagName]);
-
-                // this order matches the one when generating the room sublists below.
-                let rooms = this._applySearchFilter([
-                    ...inviteRooms,
-                    ...favouriteRooms,
-                    ...dmRooms,
-                    ...recentRooms,
-                    ...[].concat.apply([], shownCustomTagRooms), // eslint-disable-line prefer-spread
-                    ...lowPriorityRooms,
-                    ...historicalRooms,
-                    ...serverNoticeRooms,
-                ], this.props.searchFilter);
-
-                if (payload.unread) {
-                    // filter to only notification rooms (and our current active room so we can index properly)
-                    rooms = rooms.filter(room => {
-                        return room.roomId === currentRoomId || Unread.doesRoomHaveUnreadMessages(room);
-                    });
-                }
-
-                const currentIndex = rooms.findIndex(room => room.roomId === currentRoomId);
-                // use slice to account for looping around the start
-                const [room] = rooms.slice((currentIndex + payload.delta) % rooms.length);
-                if (room) {
-                    dis.dispatch({
-                        action: 'view_room',
-                        room_id: room.roomId,
-                        show_room_tile: true, // to make sure the room gets scrolled into view
-                    });
-                }
-                break;
-            }
-        }
-    },
-
-    componentWillUnmount: function() {
-        this.mounted = false;
-
-        dis.unregister(this.dispatcherRef);
-        if (MatrixClientPeg.get()) {
-            MatrixClientPeg.get().removeListener("Room", this.onRoom);
-            MatrixClientPeg.get().removeListener("deleteRoom", this.onDeleteRoom);
-            MatrixClientPeg.get().removeListener("Room.receipt", this.onRoomReceipt);
-            MatrixClientPeg.get().removeListener("RoomMember.name", this.onRoomMemberName);
-            MatrixClientPeg.get().removeListener("Event.decrypted", this.onEventDecrypted);
-            MatrixClientPeg.get().removeListener("accountData", this.onAccountData);
-            MatrixClientPeg.get().removeListener("Group.myMembership", this._onGroupMyMembership);
-            MatrixClientPeg.get().removeListener("RoomState.events", this.onRoomStateEvents);
-        }
-
-        if (this.props.resizeNotifier) {
-            this.props.resizeNotifier.removeListener("leftPanelResized", this.onResize);
-        }
-
-
-        if (this._tagStoreToken) {
-            this._tagStoreToken.remove();
-        }
-
-        if (this._roomListStoreToken) {
-            this._roomListStoreToken.remove();
-        }
-        if (this._customTagStoreToken) {
-            this._customTagStoreToken.remove();
-        }
-
-        // NB: GroupStore is not a Flux.Store
-        if (this._groupStoreToken) {
-            this._groupStoreToken.unregister();
-        }
-
-        // cancel any pending calls to the rate_limited_funcs
-        this._delayedRefreshRoomList.cancelPendingCall();
-    },
-
-
-    onResize: function() {
-        if (this.mounted && this._layout && this.resizeContainer &&
-            Array.isArray(this._layoutSections)
-        ) {
-            this._layout.update(
-                this._layoutSections,
-                this.resizeContainer.offsetHeight,
-            );
-        }
-    },
-
-    onRoom: function(room) {
-        this.updateVisibleRooms();
-    },
-
-    onRoomStateEvents: function(ev, state) {
-        if (ev.getType() === "m.room.create" || ev.getType() === "m.room.tombstone") {
-            this.updateVisibleRooms();
-        }
-    },
-
-    onDeleteRoom: function(roomId) {
-        this.updateVisibleRooms();
-    },
-
-    onArchivedHeaderClick: function(isHidden, scrollToPosition) {
-        if (!isHidden) {
-            const self = this;
-            this.setState({ isLoadingLeftRooms: true });
-            // we don't care about the response since it comes down via "Room"
-            // events.
-            MatrixClientPeg.get().syncLeftRooms().catch(function(err) {
-                console.error("Failed to sync left rooms: %s", err);
-                console.error(err);
-            }).finally(function() {
-                self.setState({ isLoadingLeftRooms: false });
-            });
-        }
-    },
-
-    onRoomReceipt: function(receiptEvent, room) {
-        // because if we read a notification, it will affect notification count
-        // only bother updating if there's a receipt from us
-        if (Receipt.findReadReceiptFromUserId(receiptEvent, MatrixClientPeg.get().credentials.userId)) {
-            this._delayedRefreshRoomList();
-        }
-    },
-
-    onRoomMemberName: function(ev, member) {
-        this._delayedRefreshRoomList();
-    },
-
-    onEventDecrypted: function(ev) {
-        // An event being decrypted may mean we need to re-order the room list
-        this._delayedRefreshRoomList();
-    },
-
-    onAccountData: function(ev) {
-        if (ev.getType() == 'm.direct') {
-            this._delayedRefreshRoomList();
-        }
-    },
-
-    _onGroupMyMembership: function(group) {
-        this.forceUpdate();
-    },
-
-    onMouseMove: async function(ev) {
-        if (!this._hoverClearTimer) {
-            this.setState({hover: true});
-            this._hoverClearTimer = new Timer(HOVER_MOVE_TIMEOUT);
-            this._hoverClearTimer.start();
-            let finished = true;
-            try {
-                await this._hoverClearTimer.finished();
-            } catch (err) {
-                finished = false;
-            }
-            this._hoverClearTimer = null;
-            if (finished) {
-                this.setState({hover: false});
-                this._delayedRefreshRoomList();
-            }
-        } else {
-            this._hoverClearTimer.restart();
-        }
-    },
-
-    onMouseLeave: function(ev) {
-        if (this._hoverClearTimer) {
-            this._hoverClearTimer.abort();
-            this._hoverClearTimer = null;
-        }
-        this.setState({hover: false});
-
-        // Refresh the room list just in case the user missed something.
-        this._delayedRefreshRoomList();
-    },
-
-    _delayedRefreshRoomList: rate_limited_func(function() {
-        this.refreshRoomList();
-    }, 500),
-
-    // Update which rooms and users should appear in RoomList for a given group tag
-    updateVisibleRoomsForTag: function(dmRoomMap, tag) {
-        if (!this.mounted) return;
-        // For now, only handle group tags
-        if (tag[0] !== '+') return;
-
-        this._visibleRoomsForGroup[tag] = [];
-        GroupStore.getGroupRooms(tag).forEach((room) => this._visibleRoomsForGroup[tag].push(room.roomId));
-        GroupStore.getGroupMembers(tag).forEach((member) => {
-            if (member.userId === MatrixClientPeg.get().credentials.userId) return;
-            dmRoomMap.getDMRoomsForUserId(member.userId).forEach(
-                (roomId) => this._visibleRoomsForGroup[tag].push(roomId),
-            );
-        });
-        // TODO: Check if room has been tagged to the group by the user
-    },
-
-    // Update which rooms and users should appear according to which tags are selected
-    updateVisibleRooms: function() {
-        const selectedTags = TagOrderStore.getSelectedTags();
-        const visibleGroupRooms = [];
-        selectedTags.forEach((tag) => {
-            (this._visibleRoomsForGroup[tag] || []).forEach(
-                (roomId) => visibleGroupRooms.push(roomId),
-            );
-        });
-
-        // If there are any tags selected, constrain the rooms listed to the
-        // visible rooms as determined by visibleGroupRooms. Here, we
-        // de-duplicate and filter out rooms that the client doesn't know
-        // about (hence the Set and the null-guard on `room`).
-        if (selectedTags.length > 0) {
-            const roomSet = new Set();
-            visibleGroupRooms.forEach((roomId) => {
-                const room = MatrixClientPeg.get().getRoom(roomId);
-                if (room) {
-                    roomSet.add(room);
-                }
-            });
-            this._visibleRooms = Array.from(roomSet);
-        } else {
-            // Show all rooms
-            this._visibleRooms = MatrixClientPeg.get().getVisibleRooms();
-        }
-        this._delayedRefreshRoomList();
-    },
-
-    refreshRoomList: function() {
-        if (this.state.hover) {
-            // Don't re-sort the list if we're hovering over the list
-            return;
-        }
-
-        // TODO: ideally we'd calculate this once at start, and then maintain
-        // any changes to it incrementally, updating the appropriate sublists
-        // as needed.
-        // Alternatively we'd do something magical with Immutable.js or similar.
-        const lists = this.getRoomLists();
-        let totalRooms = 0;
-        for (const l of Object.values(lists)) {
-            totalRooms += l.length;
-        }
-        this.setState({
-            lists,
-            totalRoomCount: totalRooms,
-            // Do this here so as to not render every time the selected tags
-            // themselves change.
-            selectedTags: TagOrderStore.getSelectedTags(),
-        }, () => {
-            // we don't need to restore any size here, do we?
-            // i guess we could have triggered a new group to appear
-            // that already an explicit size the last time it appeared ...
-            this._checkSubListsOverflow();
-        });
-
-        // this._lastRefreshRoomListTs = Date.now();
-    },
-
-    getTagNameForRoomId: function(roomId) {
-        const lists = RoomListStore.getRoomLists();
-        for (const tagName of Object.keys(lists)) {
-            for (const room of lists[tagName]) {
-                // Should be impossible, but guard anyways.
-                if (!room) {
-                    continue;
-                }
-                const myUserId = MatrixClientPeg.get().getUserId();
-                if (HIDE_CONFERENCE_CHANS && Rooms.isConfCallRoom(room, myUserId, this.props.ConferenceHandler)) {
-                    continue;
-                }
-
-                if (room.roomId === roomId) return tagName;
-            }
-        }
-
-        return null;
-    },
-
-    getRoomLists: function() {
-        const lists = RoomListStore.getRoomLists();
-
-        const filteredLists = {};
-
-        const isRoomVisible = {
-            // $roomId: true,
-        };
-
-        this._visibleRooms.forEach((r) => {
-            isRoomVisible[r.roomId] = true;
-        });
-
-        Object.keys(lists).forEach((tagName) => {
-            const filteredRooms = lists[tagName].filter((taggedRoom) => {
-                // Somewhat impossible, but guard against it anyway
-                if (!taggedRoom) {
-                    return;
-                }
-                const myUserId = MatrixClientPeg.get().getUserId();
-                if (HIDE_CONFERENCE_CHANS && Rooms.isConfCallRoom(taggedRoom, myUserId, this.props.ConferenceHandler)) {
-                    return;
-                }
-
-                return Boolean(isRoomVisible[taggedRoom.roomId]);
-            });
-
-            if (filteredRooms.length > 0 || tagName.match(STANDARD_TAGS_REGEX)) {
-                filteredLists[tagName] = filteredRooms;
-            }
-        });
-
-        return filteredLists;
-    },
-
-    _getScrollNode: function() {
-        if (!this.mounted) return null;
-        const panel = ReactDOM.findDOMNode(this);
-        if (!panel) return null;
-
-        if (panel.classList.contains('gm-prevented')) {
-            return panel;
-        } else {
-            return panel.children[2]; // XXX: Fragile!
-        }
-    },
-
-    _whenScrolling: function(e) {
-        this._hideTooltip(e);
-        this._repositionIncomingCallBox(e, false);
-    },
-
-    _hideTooltip: function(e) {
-        // Hide tooltip when scrolling, as we'll no longer be over the one we were on
-        if (this.tooltip && this.tooltip.style.display !== "none") {
-            this.tooltip.style.display = "none";
-        }
-    },
-
-    _repositionIncomingCallBox: function(e, firstTime) {
-        const incomingCallBox = document.getElementById("incomingCallBox");
-        if (incomingCallBox && incomingCallBox.parentElement) {
-            const scrollArea = this._getScrollNode();
-            if (!scrollArea) return;
-            // Use the offset of the top of the scroll area from the window
-            // as this is used to calculate the CSS fixed top position for the stickies
-            const scrollAreaOffset = scrollArea.getBoundingClientRect().top + window.pageYOffset;
-            // Use the offset of the top of the component from the window
-            // as this is used to calculate the CSS fixed top position for the stickies
-            const scrollAreaHeight = ReactDOM.findDOMNode(this).getBoundingClientRect().height;
-
-            let top = (incomingCallBox.parentElement.getBoundingClientRect().top + window.pageYOffset);
-            // Make sure we don't go too far up, if the headers aren't sticky
-            top = (top < scrollAreaOffset) ? scrollAreaOffset : top;
-            // make sure we don't go too far down, if the headers aren't sticky
-            const bottomMargin = scrollAreaOffset + (scrollAreaHeight - 45);
-            top = (top > bottomMargin) ? bottomMargin : top;
-
-            incomingCallBox.style.top = top + "px";
-            incomingCallBox.style.left = scrollArea.offsetLeft + scrollArea.offsetWidth + 12 + "px";
-        }
-    },
-
-    _makeGroupInviteTiles(filter) {
-        const ret = [];
-        const lcFilter = filter && filter.toLowerCase();
-
-        const GroupInviteTile = sdk.getComponent('groups.GroupInviteTile');
-        for (const group of MatrixClientPeg.get().getGroups()) {
-            const {groupId, name, myMembership} = group;
-            // filter to only groups in invite state and group_id starts with filter or group name includes it
-            if (myMembership !== 'invite') continue;
-            if (lcFilter && !groupId.toLowerCase().startsWith(lcFilter) &&
-                !(name && name.toLowerCase().includes(lcFilter))) continue;
-            ret.push(<GroupInviteTile key={groupId} group={group} collapsed={this.props.collapsed} />);
-        }
-
-        return ret;
-    },
-
-    _applySearchFilter: function(list, filter) {
-        if (filter === "") return list;
-        const lcFilter = filter.toLowerCase();
-        // apply toLowerCase before and after removeHiddenChars because different rules get applied
-        // e.g M -> M but m -> n, yet some unicode homoglyphs come out as uppercase, e.g 𝚮 -> H
-        const fuzzyFilter = utils.removeHiddenChars(lcFilter).toLowerCase();
-        // case insensitive if room name includes filter,
-        // or if starts with `#` and one of room's aliases starts with filter
-        return list.filter((room) => {
-            if (filter[0] === "#") {
-                if (room.getCanonicalAlias() && room.getCanonicalAlias().toLowerCase().startsWith(lcFilter)) {
-                    return true;
-                }
-                if (room.getAltAliases().some((alias) => alias.toLowerCase().startsWith(lcFilter))) {
-                    return true;
-                }
-            }
-            return room.name && utils.removeHiddenChars(room.name.toLowerCase()).toLowerCase().includes(fuzzyFilter);
-        });
-    },
-
-    _handleCollapsedState: function(key, collapsed) {
-        // persist collapsed state
-        this.collapsedState[key] = collapsed;
-        window.localStorage.setItem("mx_roomlist_collapsed", JSON.stringify(this.collapsedState));
-        // load the persisted size configuration of the expanded sub list
-        if (collapsed) {
-            this._layout.collapseSection(key);
-        } else {
-            this._layout.expandSection(key, this.subListSizes[key]);
-        }
-        // check overflow, as sub lists sizes have changed
-        // important this happens after calling resize above
-        this._checkSubListsOverflow();
-    },
-
-    // check overflow for scroll indicator gradient
-    _checkSubListsOverflow() {
-        Object.values(this._subListRefs).forEach(l => l.checkOverflow());
-    },
-
-    _subListRef: function(key, ref) {
-        if (!ref) {
-            delete this._subListRefs[key];
-        } else {
-            this._subListRefs[key] = ref;
-        }
-    },
-
-    _mapSubListProps: function(subListsProps) {
-        this._layoutSections = [];
-        const defaultProps = {
-            collapsed: this.props.collapsed,
-            isFiltered: !!this.props.searchFilter,
-        };
-
-        subListsProps.forEach((p) => {
-            p.list = this._applySearchFilter(p.list, this.props.searchFilter);
-        });
-
-        subListsProps = subListsProps.filter((props => {
-            const len = props.list.length + (props.extraTiles ? props.extraTiles.length : 0);
-            return len !== 0 || props.onAddRoom;
-        }));
-
-        return subListsProps.reduce((components, props, i) => {
-            props = {...defaultProps, ...props};
-            const isLast = i === subListsProps.length - 1;
-            const len = props.list.length + (props.extraTiles ? props.extraTiles.length : 0);
-            const {key, label, onHeaderClick, ...otherProps} = props;
-            const chosenKey = key || label;
-            const onSubListHeaderClick = (collapsed) => {
-                this._handleCollapsedState(chosenKey, collapsed);
-                if (onHeaderClick) {
-                    onHeaderClick(collapsed);
-                }
-            };
-            const startAsHidden = props.startAsHidden || this.collapsedState[chosenKey];
-            this._layoutSections.push({
-                id: chosenKey,
-                count: len,
-            });
-            const subList = (<RoomSubList
-                ref={this._subListRef.bind(this, chosenKey)}
-                startAsHidden={startAsHidden}
-                forceExpand={!!this.props.searchFilter}
-                onHeaderClick={onSubListHeaderClick}
-                key={chosenKey}
-                label={label}
-                {...otherProps} />);
-
-            if (!isLast) {
-                return components.concat(
-                    subList,
-                    <ResizeHandle key={chosenKey+"-resizer"} vertical={true} id={chosenKey} />
-                );
-            } else {
-                return components.concat(subList);
-            }
-        }, []);
-    },
-
-    _collectResizeContainer: function(el) {
-        this.resizeContainer = el;
-    },
-
-    render: function() {
-        const incomingCallIfTaggedAs = (tagName) => {
-            if (!this.state.incomingCall) return null;
-            if (this.state.incomingCallTag !== tagName) return null;
-            return this.state.incomingCall;
-        };
-
-        let subLists = [
-            {
-                list: [],
-                extraTiles: this._makeGroupInviteTiles(this.props.searchFilter),
-                label: _t('Community Invites'),
-                isInvite: true,
-            },
-            {
-                list: this.state.lists['im.vector.fake.invite'],
-                label: _t('Invites'),
-                incomingCall: incomingCallIfTaggedAs('im.vector.fake.invite'),
-                isInvite: true,
-            },
-            {
-                list: this.state.lists['m.favourite'],
-                label: _t('Favourites'),
-                tagName: "m.favourite",
-                incomingCall: incomingCallIfTaggedAs('m.favourite'),
-            },
-            {
-                list: this.state.lists[TAG_DM],
-                label: _t('Direct Messages'),
-                tagName: TAG_DM,
-                incomingCall: incomingCallIfTaggedAs(TAG_DM),
-                onAddRoom: () => {dis.dispatch({action: 'view_create_chat'});},
-                addRoomLabel: _t("Start chat"),
-            },
-            {
-                list: this.state.lists['im.vector.fake.recent'],
-                label: _t('Rooms'),
-                incomingCall: incomingCallIfTaggedAs('im.vector.fake.recent'),
-                onAddRoom: () => {dis.dispatch({action: 'view_create_room'});},
-            },
-        ];
-        const tagSubLists = Object.keys(this.state.lists)
-            .filter((tagName) => {
-                return (!this.state.customTags || this.state.customTags[tagName]) &&
-                    !tagName.match(STANDARD_TAGS_REGEX);
-            }).map((tagName) => {
-                return {
-                    list: this.state.lists[tagName],
-                    key: tagName,
-                    label: labelForTagName(tagName),
-                    tagName: tagName,
-                    incomingCall: incomingCallIfTaggedAs(tagName),
-                };
-            });
-        subLists = subLists.concat(tagSubLists);
-        subLists = subLists.concat([
-            {
-                list: this.state.lists['m.lowpriority'],
-                label: _t('Low priority'),
-                tagName: "m.lowpriority",
-                incomingCall: incomingCallIfTaggedAs('m.lowpriority'),
-            },
-            {
-                list: this.state.lists['im.vector.fake.archived'],
-                label: _t('Historical'),
-                incomingCall: incomingCallIfTaggedAs('im.vector.fake.archived'),
-                startAsHidden: true,
-                showSpinner: this.state.isLoadingLeftRooms,
-                onHeaderClick: this.onArchivedHeaderClick,
-            },
-            {
-                list: this.state.lists['m.server_notice'],
-                label: _t('System Alerts'),
-                tagName: "m.lowpriority",
-                incomingCall: incomingCallIfTaggedAs('m.server_notice'),
-            },
-        ]);
-
-        const subListComponents = this._mapSubListProps(subLists);
-
-        const {resizeNotifier, collapsed, searchFilter, ConferenceHandler, onKeyDown, ...props} = this.props; // eslint-disable-line
-        return (
-            <RovingTabIndexProvider handleHomeEnd={true} onKeyDown={onKeyDown}>
-                {({onKeyDownHandler}) => <div
-                    {...props}
-                    onKeyDown={onKeyDownHandler}
-                    ref={this._collectResizeContainer}
-                    className="mx_RoomList"
-                    role="tree"
-                    aria-label={_t("Rooms")}
-                    // Firefox sometimes makes this element focusable due to
-                    // overflow:scroll;, so force it out of tab order.
-                    tabIndex="-1"
-                    onMouseMove={this.onMouseMove}
-                    onMouseLeave={this.onMouseLeave}
-                >
-                    { subListComponents }
-                </div> }
-            </RovingTabIndexProvider>
-        );
-    },
-});
diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
new file mode 100644
index 0000000000..3274e0e49f
--- /dev/null
+++ b/src/components/views/rooms/RoomList.tsx
@@ -0,0 +1,396 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017, 2018 Vector Creations 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.
+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 { Dispatcher } from "flux";
+import { Room } from "matrix-js-sdk/src/models/room";
+
+import { _t, _td } from "../../../languageHandler";
+import { RovingTabIndexProvider } from "../../../accessibility/RovingTabIndex";
+import { ResizeNotifier } from "../../../utils/ResizeNotifier";
+import RoomListStore, { LISTS_UPDATE_EVENT } from "../../../stores/room-list/RoomListStore";
+import RoomViewStore from "../../../stores/RoomViewStore";
+import { ITagMap } from "../../../stores/room-list/algorithms/models";
+import { DefaultTagID, isCustomTag, TagID } from "../../../stores/room-list/models";
+import dis from "../../../dispatcher/dispatcher";
+import defaultDispatcher from "../../../dispatcher/dispatcher";
+import RoomSublist from "./RoomSublist";
+import { ActionPayload } from "../../../dispatcher/payloads";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import GroupAvatar from "../avatars/GroupAvatar";
+import TemporaryTile from "./TemporaryTile";
+import { StaticNotificationState } from "../../../stores/notifications/StaticNotificationState";
+import { NotificationColor } from "../../../stores/notifications/NotificationColor";
+import { Action } from "../../../dispatcher/actions";
+import { ViewRoomDeltaPayload } from "../../../dispatcher/payloads/ViewRoomDeltaPayload";
+import { RoomNotificationStateStore } from "../../../stores/notifications/RoomNotificationStateStore";
+import SettingsStore from "../../../settings/SettingsStore";
+import CustomRoomTagStore from "../../../stores/CustomRoomTagStore";
+import { arrayFastClone, arrayHasDiff } from "../../../utils/arrays";
+import { objectShallowClone, objectWithOnly } from "../../../utils/objects";
+import { IconizedContextMenuOption, IconizedContextMenuOptionList } from "../context_menus/IconizedContextMenu";
+import AccessibleButton from "../elements/AccessibleButton";
+
+interface IProps {
+    onKeyDown: (ev: React.KeyboardEvent) => void;
+    onFocus: (ev: React.FocusEvent) => void;
+    onBlur: (ev: React.FocusEvent) => void;
+    onResize: () => void;
+    resizeNotifier: ResizeNotifier;
+    collapsed: boolean;
+    isMinimized: boolean;
+}
+
+interface IState {
+    sublists: ITagMap;
+}
+
+const TAG_ORDER: TagID[] = [
+    DefaultTagID.Invite,
+    DefaultTagID.Favourite,
+    DefaultTagID.DM,
+    DefaultTagID.Untagged,
+
+    // -- Custom Tags Placeholder --
+
+    DefaultTagID.LowPriority,
+    DefaultTagID.ServerNotice,
+    DefaultTagID.Archived,
+];
+const CUSTOM_TAGS_BEFORE_TAG = DefaultTagID.LowPriority;
+const ALWAYS_VISIBLE_TAGS: TagID[] = [
+    DefaultTagID.DM,
+    DefaultTagID.Untagged,
+];
+
+interface ITagAesthetics {
+    sectionLabel: string;
+    sectionLabelRaw?: string;
+    addRoomLabel?: string;
+    onAddRoom?: (dispatcher?: Dispatcher<ActionPayload>) => void;
+    addRoomContextMenu?: (onFinished: () => void) => React.ReactNode;
+    isInvite: boolean;
+    defaultHidden: boolean;
+}
+
+const TAG_AESTHETICS: {
+    // @ts-ignore - TS wants this to be a string but we know better
+    [tagId: TagID]: ITagAesthetics;
+} = {
+    [DefaultTagID.Invite]: {
+        sectionLabel: _td("Invites"),
+        isInvite: true,
+        defaultHidden: false,
+    },
+    [DefaultTagID.Favourite]: {
+        sectionLabel: _td("Favourites"),
+        isInvite: false,
+        defaultHidden: false,
+    },
+    [DefaultTagID.DM]: {
+        sectionLabel: _td("People"),
+        isInvite: false,
+        defaultHidden: false,
+        addRoomLabel: _td("Start chat"),
+        onAddRoom: (dispatcher?: Dispatcher<ActionPayload>) => {
+            (dispatcher || defaultDispatcher).dispatch({action: 'view_create_chat'});
+        },
+    },
+    [DefaultTagID.Untagged]: {
+        sectionLabel: _td("Rooms"),
+        isInvite: false,
+        defaultHidden: false,
+        addRoomLabel: _td("Add room"),
+        addRoomContextMenu: (onFinished: () => void) => {
+            return <IconizedContextMenuOptionList first>
+                <IconizedContextMenuOption
+                    label={_t("Create new room")}
+                    iconClassName="mx_RoomList_iconPlus"
+                    onClick={(e) => {
+                        e.preventDefault();
+                        e.stopPropagation();
+                        onFinished();
+                        defaultDispatcher.dispatch({action: "view_create_room"});
+                    }}
+                />
+                <IconizedContextMenuOption
+                    label={_t("Explore public rooms")}
+                    iconClassName="mx_RoomList_iconExplore"
+                    onClick={(e) => {
+                        e.preventDefault();
+                        e.stopPropagation();
+                        onFinished();
+                        defaultDispatcher.fire(Action.ViewRoomDirectory);
+                    }}
+                />
+            </IconizedContextMenuOptionList>;
+        },
+    },
+    [DefaultTagID.LowPriority]: {
+        sectionLabel: _td("Low priority"),
+        isInvite: false,
+        defaultHidden: false,
+    },
+    [DefaultTagID.ServerNotice]: {
+        sectionLabel: _td("System Alerts"),
+        isInvite: false,
+        defaultHidden: false,
+    },
+
+    // TODO: Replace with archived view: https://github.com/vector-im/element-web/issues/14038
+    [DefaultTagID.Archived]: {
+        sectionLabel: _td("Historical"),
+        isInvite: false,
+        defaultHidden: true,
+    },
+};
+
+function customTagAesthetics(tagId: TagID): ITagAesthetics {
+    if (tagId.startsWith("u.")) {
+        tagId = tagId.substring(2);
+    }
+    return {
+        sectionLabel: _td("Custom Tag"),
+        sectionLabelRaw: tagId,
+        isInvite: false,
+        defaultHidden: false,
+    };
+}
+
+export default class RoomList extends React.PureComponent<IProps, IState> {
+    private dispatcherRef;
+    private customTagStoreRef;
+
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            sublists: {},
+        };
+
+        this.dispatcherRef = defaultDispatcher.register(this.onAction);
+    }
+
+    public componentDidMount(): void {
+        RoomListStore.instance.on(LISTS_UPDATE_EVENT, this.updateLists);
+        this.customTagStoreRef = CustomRoomTagStore.addListener(this.updateLists);
+        this.updateLists(); // trigger the first update
+    }
+
+    public componentWillUnmount() {
+        RoomListStore.instance.off(LISTS_UPDATE_EVENT, this.updateLists);
+        defaultDispatcher.unregister(this.dispatcherRef);
+        if (this.customTagStoreRef) this.customTagStoreRef.remove();
+    }
+
+    private onAction = (payload: ActionPayload) => {
+        if (payload.action === Action.ViewRoomDelta) {
+            const viewRoomDeltaPayload = payload as ViewRoomDeltaPayload;
+            const currentRoomId = RoomViewStore.getRoomId();
+            const room = this.getRoomDelta(currentRoomId, viewRoomDeltaPayload.delta, viewRoomDeltaPayload.unread);
+            if (room) {
+                dis.dispatch({
+                    action: 'view_room',
+                    room_id: room.roomId,
+                    show_room_tile: true, // to make sure the room gets scrolled into view
+                });
+            }
+        }
+    };
+
+    private getRoomDelta = (roomId: string, delta: number, unread = false) => {
+        const lists = RoomListStore.instance.orderedLists;
+        let rooms: Room = [];
+        TAG_ORDER.forEach(t => {
+            let listRooms = lists[t];
+
+            if (unread) {
+                // filter to only notification rooms (and our current active room so we can index properly)
+                listRooms = listRooms.filter(r => {
+                    const state = RoomNotificationStateStore.instance.getRoomState(r);
+                    return state.room.roomId === roomId || state.isUnread;
+                });
+            }
+
+            rooms.push(...listRooms);
+        });
+
+        const currentIndex = rooms.findIndex(r => r.roomId === roomId);
+        // use slice to account for looping around the start
+        const [room] = rooms.slice((currentIndex + delta) % rooms.length);
+        return room;
+    };
+
+    private updateLists = () => {
+        const newLists = RoomListStore.instance.orderedLists;
+        if (SettingsStore.getValue("advancedRoomListLogging")) {
+            // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+            console.log("new lists", newLists);
+        }
+
+        const previousListIds = Object.keys(this.state.sublists);
+        const newListIds = Object.keys(newLists).filter(t => {
+            if (!isCustomTag(t)) return true; // always include non-custom tags
+
+            // if the tag is custom though, only include it if it is enabled
+            return CustomRoomTagStore.getTags()[t];
+        });
+
+        let doUpdate = 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
+            // let's check the length of each.
+            for (const tagId of newListIds) {
+                const oldRooms = this.state.sublists[tagId];
+                const newRooms = newLists[tagId];
+                if (oldRooms.length !== newRooms.length) {
+                    doUpdate = true;
+                    break;
+                }
+            }
+        }
+
+        if (doUpdate) {
+            // We have to break our reference to the room list store if we want to be able to
+            // diff the object for changes, so do that.
+            // @ts-ignore - ITagMap is ts-ignored so this will have to be too
+            const newSublists = objectWithOnly(newLists, newListIds);
+            const sublists = objectShallowClone(newSublists, (k, v) => arrayFastClone(v));
+
+            this.setState({sublists}, () => {
+                this.props.onResize();
+            });
+        }
+    };
+
+    private onExplore = () => {
+        dis.fire(Action.ViewRoomDirectory);
+    };
+
+    private renderCommunityInvites(): TemporaryTile[] {
+        // TODO: Put community invites in a more sensible place (not in the room list)
+        // See https://github.com/vector-im/element-web/issues/14456
+        return MatrixClientPeg.get().getGroups().filter(g => {
+           return g.myMembership === 'invite';
+        }).map(g => {
+            const avatar = (
+                <GroupAvatar
+                    groupId={g.groupId}
+                    groupName={g.name}
+                    groupAvatarUrl={g.avatarUrl}
+                    width={32} height={32} resizeMethod='crop'
+                />
+            );
+            const openGroup = () => {
+                defaultDispatcher.dispatch({
+                    action: 'view_group',
+                    group_id: g.groupId,
+                });
+            };
+            return (
+                <TemporaryTile
+                    isMinimized={this.props.isMinimized}
+                    isSelected={false}
+                    displayName={g.name}
+                    avatar={avatar}
+                    notificationState={StaticNotificationState.forSymbol("!", NotificationColor.Red)}
+                    onClick={openGroup}
+                    key={`temporaryGroupTile_${g.groupId}`}
+                />
+            );
+        });
+    }
+
+    private renderSublists(): React.ReactElement[] {
+        const components: React.ReactElement[] = [];
+
+        const tagOrder = TAG_ORDER.reduce((p, c) => {
+            if (c === CUSTOM_TAGS_BEFORE_TAG) {
+                const customTags = Object.keys(this.state.sublists)
+                    .filter(t => isCustomTag(t));
+                p.push(...customTags);
+            }
+            p.push(c);
+            return p;
+        }, [] as TagID[]);
+
+        for (const orderedTagId of tagOrder) {
+            const orderedRooms = this.state.sublists[orderedTagId] || [];
+            const extraTiles = orderedTagId === DefaultTagID.Invite ? this.renderCommunityInvites() : null;
+            const totalTiles = orderedRooms.length + (extraTiles ? extraTiles.length : 0);
+            if (totalTiles === 0 && !ALWAYS_VISIBLE_TAGS.includes(orderedTagId)) {
+                continue; // skip tag - not needed
+            }
+
+            const aesthetics: ITagAesthetics = isCustomTag(orderedTagId)
+                ? customTagAesthetics(orderedTagId)
+                : TAG_AESTHETICS[orderedTagId];
+            if (!aesthetics) throw new Error(`Tag ${orderedTagId} does not have aesthetics`);
+
+            components.push(
+                <RoomSublist
+                    key={`sublist-${orderedTagId}`}
+                    tagId={orderedTagId}
+                    forRooms={true}
+                    startAsHidden={aesthetics.defaultHidden}
+                    label={aesthetics.sectionLabelRaw ? aesthetics.sectionLabelRaw : _t(aesthetics.sectionLabel)}
+                    onAddRoom={aesthetics.onAddRoom}
+                    addRoomLabel={aesthetics.addRoomLabel ? _t(aesthetics.addRoomLabel) : aesthetics.addRoomLabel}
+                    addRoomContextMenu={aesthetics.addRoomContextMenu}
+                    isMinimized={this.props.isMinimized}
+                    onResize={this.props.onResize}
+                    extraBadTilesThatShouldntExist={extraTiles}
+                />
+            );
+        }
+
+        return components;
+    }
+
+    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>;
+        }
+
+        const sublists = this.renderSublists();
+        return (
+            <RovingTabIndexProvider handleHomeEnd={true} onKeyDown={this.props.onKeyDown}>
+                {({onKeyDownHandler}) => (
+                    <div
+                        onFocus={this.props.onFocus}
+                        onBlur={this.props.onBlur}
+                        onKeyDown={onKeyDownHandler}
+                        className="mx_RoomList"
+                        role="tree"
+                        aria-label={_t("Rooms")}
+                    >
+                        {sublists}
+                        {explorePrompt}
+                    </div>
+                )}
+            </RovingTabIndexProvider>
+        );
+    }
+}
diff --git a/src/components/views/rooms/RoomListNumResults.tsx b/src/components/views/rooms/RoomListNumResults.tsx
new file mode 100644
index 0000000000..fcac91a56a
--- /dev/null
+++ b/src/components/views/rooms/RoomListNumResults.tsx
@@ -0,0 +1,41 @@
+/*
+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, {useState} from "react";
+
+import { _t } from "../../../languageHandler";
+import RoomListStore, { LISTS_UPDATE_EVENT } from "../../../stores/room-list/RoomListStore";
+import {useEventEmitter} from "../../../hooks/useEventEmitter";
+
+const RoomListNumResults: React.FC = () => {
+    const [count, setCount] = useState<number>(null);
+    useEventEmitter(RoomListStore.instance, LISTS_UPDATE_EVENT, () => {
+        if (RoomListStore.instance.getFirstNameFilterCondition()) {
+            const numRooms = Object.values(RoomListStore.instance.orderedLists).flat(1).length;
+            setCount(numRooms);
+        } else {
+            setCount(null);
+        }
+    });
+
+    if (typeof count !== "number") return null;
+
+    return <div className="mx_LeftPanel_roomListFilterCount">
+        {_t("%(count)s results", { count })}
+    </div>;
+};
+
+export default RoomListNumResults;
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index 85c41f30ec..d52bbbb0d0 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -1,7 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -21,9 +21,10 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import * as sdk from '../../../index';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import classNames from 'classnames';
 import { _t } from '../../../languageHandler';
+import SdkConfig from "../../../SdkConfig";
 import IdentityAuthClient from '../../../IdentityAuthClient';
 
 const MessageCase = Object.freeze({
@@ -266,9 +267,9 @@ export default createReactClass({
             params: {
                 email: this.props.invitedEmail,
                 signurl: this.props.signUrl,
-                room_name: this.props.oobData.room_name,
-                room_avatar_url: this.props.oobData.avatarUrl,
-                inviter_name: this.props.oobData.inviterName,
+                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,
             }
         };
     },
@@ -282,11 +283,11 @@ export default createReactClass({
     },
 
     render: function() {
+        const brand = SdkConfig.get().brand;
         const Spinner = sdk.getComponent('elements.Spinner');
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
         let showSpinner = false;
-        let darkStyle = false;
         let title;
         let subTitle;
         let primaryActionHandler;
@@ -314,7 +315,6 @@ export default createReactClass({
                 break;
             }
             case MessageCase.NotLoggedIn: {
-                darkStyle = true;
                 title = _t("Join the conversation with an account");
                 primaryActionLabel = _t("Sign Up");
                 primaryActionHandler = this.onRegisterClick;
@@ -398,7 +398,8 @@ export default createReactClass({
                 );
                 subTitle = _t(
                     "Link this email with your account in Settings to receive invites " +
-                    "directly in Riot.",
+                    "directly in %(brand)s.",
+                    { brand },
                 );
                 primaryActionLabel = _t("Join the discussion");
                 primaryActionHandler = this.props.onJoinClick;
@@ -413,7 +414,8 @@ export default createReactClass({
                     },
                 );
                 subTitle = _t(
-                    "Use an identity server in Settings to receive invites directly in Riot.",
+                    "Use an identity server in Settings to receive invites directly in %(brand)s.",
+                    { brand },
                 );
                 primaryActionLabel = _t("Join the discussion");
                 primaryActionHandler = this.props.onJoinClick;
@@ -428,7 +430,8 @@ export default createReactClass({
                     },
                 );
                 subTitle = _t(
-                    "Share this email in Settings to receive invites directly in Riot.",
+                    "Share this email in Settings to receive invites directly in %(brand)s.",
+                    { brand },
                 );
                 primaryActionLabel = _t("Join the discussion");
                 primaryActionHandler = this.props.onJoinClick;
@@ -508,7 +511,7 @@ export default createReactClass({
                         "If you think you're seeing this message in error, please " +
                         "<issueLink>submit a bug report</issueLink>.",
                         { errcode: this.props.error.errcode },
-                        { issueLink: label => <a href="https://github.com/vector-im/riot-web/issues/new/choose"
+                        { issueLink: label => <a href="https://github.com/vector-im/element-web/issues/new/choose"
                             target="_blank" rel="noreferrer noopener">{ label }</a> },
                     ),
                 ];
@@ -552,7 +555,6 @@ export default createReactClass({
         const classes = classNames("mx_RoomPreviewBar", "dark-panel", `mx_RoomPreviewBar_${messageCase}`, {
             "mx_RoomPreviewBar_panel": this.props.canPreview,
             "mx_RoomPreviewBar_dialog": !this.props.canPreview,
-            "mx_RoomPreviewBar_dark": darkStyle,
         });
 
         return (
diff --git a/src/components/views/rooms/RoomRecoveryReminder.js b/src/components/views/rooms/RoomRecoveryReminder.js
index a29467b07f..859df6dd1b 100644
--- a/src/components/views/rooms/RoomRecoveryReminder.js
+++ b/src/components/views/rooms/RoomRecoveryReminder.js
@@ -21,7 +21,8 @@ import * as sdk from "../../../index";
 import { _t } from "../../../languageHandler";
 import Modal from "../../../Modal";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
+import SettingsStore from "../../../settings/SettingsStore";
+import {SettingLevel} from "../../../settings/SettingLevel";
 
 export default class RoomRecoveryReminder extends React.PureComponent {
     static propTypes = {
diff --git a/src/components/views/rooms/RoomSublist.tsx b/src/components/views/rooms/RoomSublist.tsx
new file mode 100644
index 0000000000..1e7ba3f77a
--- /dev/null
+++ b/src/components/views/rooms/RoomSublist.tsx
@@ -0,0 +1,891 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017, 2018 Vector Creations 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.
+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 {createRef} from "react";
+import { Room } from "matrix-js-sdk/src/models/room";
+import classNames from 'classnames';
+import { RovingAccessibleButton, RovingTabIndexWrapper } from "../../../accessibility/RovingTabIndex";
+import { _t } from "../../../languageHandler";
+import AccessibleButton from "../../views/elements/AccessibleButton";
+import RoomTile from "./RoomTile";
+import { ListLayout } from "../../../stores/room-list/ListLayout";
+import {
+    ChevronFace,
+    ContextMenu,
+    ContextMenuTooltipButton,
+    StyledMenuItemCheckbox,
+    StyledMenuItemRadio,
+} from "../../structures/ContextMenu";
+import RoomListStore, { LISTS_UPDATE_EVENT } from "../../../stores/room-list/RoomListStore";
+import { ListAlgorithm, SortAlgorithm } from "../../../stores/room-list/algorithms/models";
+import { DefaultTagID, TagID } from "../../../stores/room-list/models";
+import dis from "../../../dispatcher/dispatcher";
+import defaultDispatcher from "../../../dispatcher/dispatcher";
+import NotificationBadge from "./NotificationBadge";
+import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
+import { Key } from "../../../Keyboard";
+import { ActionPayload } from "../../../dispatcher/payloads";
+import { Enable, Resizable } from "re-resizable";
+import { Direction } from "re-resizable/lib/resizer";
+import { polyfillTouchEvent } from "../../../@types/polyfill";
+import { RoomNotificationStateStore } from "../../../stores/notifications/RoomNotificationStateStore";
+import RoomListLayoutStore from "../../../stores/room-list/RoomListLayoutStore";
+import { arrayFastClone, arrayHasOrderChange } from "../../../utils/arrays";
+import { objectExcluding, objectHasDiff } from "../../../utils/objects";
+import TemporaryTile from "./TemporaryTile";
+import { ListNotificationState } from "../../../stores/notifications/ListNotificationState";
+import IconizedContextMenu from "../context_menus/IconizedContextMenu";
+
+const SHOW_N_BUTTON_HEIGHT = 28; // As defined by CSS
+const RESIZE_HANDLE_HEIGHT = 4; // As defined by CSS
+export const HEADER_HEIGHT = 32; // As defined by CSS
+
+const MAX_PADDING_HEIGHT = SHOW_N_BUTTON_HEIGHT + RESIZE_HANDLE_HEIGHT;
+
+// HACK: We really shouldn't have to do this.
+polyfillTouchEvent();
+
+interface IProps {
+    forRooms: boolean;
+    startAsHidden: boolean;
+    label: string;
+    onAddRoom?: () => void;
+    addRoomContextMenu?: (onFinished: () => void) => React.ReactNode;
+    addRoomLabel: string;
+    isMinimized: boolean;
+    tagId: TagID;
+    onResize: () => void;
+
+    // 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.
+    extraBadTilesThatShouldntExist?: TemporaryTile[];
+
+    // TODO: Account for https://github.com/vector-im/element-web/issues/14179
+}
+
+// TODO: Use re-resizer's NumberSize when it is exposed as the type
+interface ResizeDelta {
+    width: number;
+    height: number;
+}
+
+type PartialDOMRect = Pick<DOMRect, "left" | "top" | "height">;
+
+interface IState {
+    contextMenuPosition: PartialDOMRect;
+    addRoomContextMenuPosition: PartialDOMRect;
+    isResizing: boolean;
+    isExpanded: boolean; // used for the for expand of the sublist when the room list is being filtered
+    height: number;
+    rooms: Room[];
+    filteredExtraTiles?: TemporaryTile[];
+}
+
+export default class RoomSublist extends React.Component<IProps, IState> {
+    private headerButton = createRef<HTMLDivElement>();
+    private sublistRef = createRef<HTMLDivElement>();
+    private dispatcherRef: string;
+    private layout: ListLayout;
+    private heightAtStart: number;
+    private isBeingFiltered: boolean;
+    private notificationState: ListNotificationState;
+
+    constructor(props: IProps) {
+        super(props);
+
+        this.layout = RoomListLayoutStore.instance.getLayoutFor(this.props.tagId);
+        this.heightAtStart = 0;
+        this.isBeingFiltered = !!RoomListStore.instance.getFirstNameFilterCondition();
+        this.notificationState = RoomNotificationStateStore.instance.getListState(this.props.tagId);
+        this.state = {
+            contextMenuPosition: null,
+            addRoomContextMenuPosition: null,
+            isResizing: false,
+            isExpanded: this.isBeingFiltered ? this.isBeingFiltered : !this.layout.isCollapsed,
+            height: 0, // to be fixed in a moment, we need `rooms` to calculate this.
+            rooms: arrayFastClone(RoomListStore.instance.orderedLists[this.props.tagId] || []),
+        };
+        // Why Object.assign() and not this.state.height? Because TypeScript says no.
+        this.state = Object.assign(this.state, {height: this.calculateInitialHeight()});
+        this.dispatcherRef = defaultDispatcher.register(this.onAction);
+        RoomListStore.instance.on(LISTS_UPDATE_EVENT, this.onListsUpdated);
+    }
+
+    private calculateInitialHeight() {
+        const requestedVisibleTiles = Math.max(Math.floor(this.layout.visibleTiles), this.layout.minVisibleTiles);
+        const tileCount = Math.min(this.numTiles, requestedVisibleTiles);
+        return this.layout.tilesToPixelsWithPadding(tileCount, this.padding);
+    }
+
+    private get padding() {
+        let padding = RESIZE_HANDLE_HEIGHT;
+        // this is used for calculating the max height of the whole container,
+        // and takes into account whether there should be room reserved for the show more/less button
+        // when fully expanded. We can't rely purely on the layout's defaultVisible tile count
+        // because there are conditions in which we need to know that the 'show more' button
+        // is present while well under the default tile limit.
+        const needsShowMore = this.numTiles > this.numVisibleTiles;
+
+        // ...but also check this or we'll miss if the section is expanded and we need a
+        // 'show less'
+        const needsShowLess = this.numTiles > this.layout.defaultVisibleTiles;
+
+        if (needsShowMore || needsShowLess) {
+            padding += SHOW_N_BUTTON_HEIGHT;
+        }
+        return padding;
+    }
+
+    private get extraTiles(): TemporaryTile[] | null {
+        if (this.state.filteredExtraTiles) {
+            return this.state.filteredExtraTiles;
+        }
+        if (this.props.extraBadTilesThatShouldntExist) {
+            return this.props.extraBadTilesThatShouldntExist;
+        }
+        return null;
+    }
+
+    private get numTiles(): number {
+        return RoomSublist.calcNumTiles(this.state.rooms, this.extraTiles);
+    }
+
+    private static calcNumTiles(rooms: Room[], extraTiles: any[]) {
+        return (rooms || []).length + (extraTiles || []).length;
+    }
+
+    private get numVisibleTiles(): number {
+        const nVisible = Math.ceil(this.layout.visibleTiles);
+        return Math.min(nVisible, this.numTiles);
+    }
+
+    public componentDidUpdate(prevProps: Readonly<IProps>, prevState: Readonly<IState>) {
+        const prevExtraTiles = prevState.filteredExtraTiles || prevProps.extraBadTilesThatShouldntExist;
+        // as the rooms can come in one by one we need to reevaluate
+        // the amount of available rooms to cap the amount of requested visible rooms by the layout
+        if (RoomSublist.calcNumTiles(prevState.rooms, prevExtraTiles) !== this.numTiles) {
+            this.setState({height: this.calculateInitialHeight()});
+        }
+    }
+
+    public shouldComponentUpdate(nextProps: Readonly<IProps>, nextState: Readonly<IState>): boolean {
+        if (objectHasDiff(this.props, nextProps)) {
+            // Something we don't care to optimize has updated, so update.
+            return true;
+        }
+
+        // Do the same check used on props for state, without the rooms we're going to no-op
+        const prevStateNoRooms = objectExcluding(this.state, ['rooms']);
+        const nextStateNoRooms = objectExcluding(nextState, ['rooms']);
+        if (objectHasDiff(prevStateNoRooms, nextStateNoRooms)) {
+            return true;
+        }
+
+        // If we're supposed to handle extra tiles, take the performance hit and re-render all the
+        // time so we don't have to consider them as part of the visible room optimization.
+        const prevExtraTiles = this.props.extraBadTilesThatShouldntExist || [];
+        const nextExtraTiles = (nextState.filteredExtraTiles || nextProps.extraBadTilesThatShouldntExist) || [];
+        if (prevExtraTiles.length > 0 || nextExtraTiles.length > 0) {
+            return true;
+        }
+
+        // If we're about to update the height of the list, we don't really care about which rooms
+        // are visible or not for no-op purposes, so ensure that the height calculation runs through.
+        if (RoomSublist.calcNumTiles(nextState.rooms, nextExtraTiles) !== this.numTiles) {
+            return true;
+        }
+
+        // Before we go analyzing the rooms, we can see if we're collapsed. If we're collapsed, we don't need
+        // to render anything. We do this after the height check though to ensure that the height gets appropriately
+        // calculated for when/if we become uncollapsed.
+        if (!nextState.isExpanded) {
+            return false;
+        }
+
+        // Quickly double check we're not about to break something due to the number of rooms changing.
+        if (this.state.rooms.length !== nextState.rooms.length) {
+            return true;
+        }
+
+        // Finally, determine if the room update (as presumably that's all that's left) is within
+        // our visible range. If it is, then do a render. If the update is outside our visible range
+        // then we can skip the update.
+        //
+        // We also optimize for order changing here: if the update did happen in our visible range
+        // but doesn't result in the list re-sorting itself then there's no reason for us to update
+        // on our own.
+        const prevSlicedRooms = this.state.rooms.slice(0, this.numVisibleTiles);
+        const nextSlicedRooms = nextState.rooms.slice(0, this.numVisibleTiles);
+        if (arrayHasOrderChange(prevSlicedRooms, nextSlicedRooms)) {
+            return true;
+        }
+
+        // Finally, nothing happened so no-op the update
+        return false;
+    }
+
+    public componentWillUnmount() {
+        defaultDispatcher.unregister(this.dispatcherRef);
+        RoomListStore.instance.off(LISTS_UPDATE_EVENT, this.onListsUpdated);
+    }
+
+    private onListsUpdated = () => {
+        const stateUpdates: IState & any = {}; // &any is to avoid a cast on the initializer
+
+        if (this.props.extraBadTilesThatShouldntExist) {
+            const nameCondition = RoomListStore.instance.getFirstNameFilterCondition();
+            if (nameCondition) {
+                stateUpdates.filteredExtraTiles = this.props.extraBadTilesThatShouldntExist
+                    .filter(t => nameCondition.matches(t.props.displayName || ""));
+            } else if (this.state.filteredExtraTiles) {
+                stateUpdates.filteredExtraTiles = null;
+            }
+        }
+
+        const currentRooms = this.state.rooms;
+        const newRooms = arrayFastClone(RoomListStore.instance.orderedLists[this.props.tagId] || []);
+        if (arrayHasOrderChange(currentRooms, newRooms)) {
+            stateUpdates.rooms = newRooms;
+        }
+
+        const isStillBeingFiltered = !!RoomListStore.instance.getFirstNameFilterCondition();
+        if (isStillBeingFiltered !== this.isBeingFiltered) {
+            this.isBeingFiltered = isStillBeingFiltered;
+            if (isStillBeingFiltered) {
+                stateUpdates.isExpanded = true;
+            } else {
+                stateUpdates.isExpanded = !this.layout.isCollapsed;
+            }
+        }
+
+        if (Object.keys(stateUpdates).length > 0) {
+            this.setState(stateUpdates);
+        }
+    };
+
+    private onAction = (payload: ActionPayload) => {
+        if (payload.action === "view_room" && payload.show_room_tile && this.state.rooms) {
+            // XXX: we have to do this a tick later because we have incorrect intermediate props during a room change
+            // where we lose the room we are changing from temporarily and then it comes back in an update right after.
+            setImmediate(() => {
+                const roomIndex = this.state.rooms.findIndex((r) => r.roomId === payload.room_id);
+
+                if (!this.state.isExpanded && roomIndex > -1) {
+                    this.toggleCollapsed();
+                }
+                // extend the visible section to include the room if it is entirely invisible
+                if (roomIndex >= this.numVisibleTiles) {
+                    this.layout.visibleTiles = this.layout.tilesWithPadding(roomIndex + 1, MAX_PADDING_HEIGHT);
+                    this.forceUpdate(); // because the layout doesn't trigger a re-render
+                }
+            });
+        }
+    };
+
+    private onAddRoom = (e) => {
+        e.stopPropagation();
+        if (this.props.onAddRoom) this.props.onAddRoom();
+    };
+
+    private applyHeightChange(newHeight: number) {
+        const heightInTiles = Math.ceil(this.layout.pixelsToTiles(newHeight - this.padding));
+        this.layout.visibleTiles = Math.min(this.numTiles, heightInTiles);
+    }
+
+    private onResize = (
+        e: MouseEvent | TouchEvent,
+        travelDirection: Direction,
+        refToElement: HTMLDivElement,
+        delta: ResizeDelta,
+    ) => {
+        const newHeight = this.heightAtStart + delta.height;
+        this.applyHeightChange(newHeight);
+        this.setState({height: newHeight});
+    };
+
+    private onResizeStart = () => {
+        this.heightAtStart = this.state.height;
+        this.setState({isResizing: true});
+    };
+
+    private onResizeStop = (
+        e: MouseEvent | TouchEvent,
+        travelDirection: Direction,
+        refToElement: HTMLDivElement,
+        delta: ResizeDelta,
+    ) => {
+        const newHeight = this.heightAtStart + delta.height;
+        this.applyHeightChange(newHeight);
+        this.setState({isResizing: false, height: newHeight});
+    };
+
+    private onShowAllClick = () => {
+        // read number of visible tiles before we mutate it
+        const numVisibleTiles = this.numVisibleTiles;
+        const newHeight = this.layout.tilesToPixelsWithPadding(this.numTiles, this.padding);
+        this.applyHeightChange(newHeight);
+        this.setState({height: newHeight}, () => {
+            // focus the top-most new room
+            this.focusRoomTile(numVisibleTiles);
+        });
+    };
+
+    private onShowLessClick = () => {
+        const newHeight = this.layout.tilesToPixelsWithPadding(this.layout.defaultVisibleTiles, this.padding);
+        this.applyHeightChange(newHeight);
+        this.setState({height: newHeight});
+    };
+
+    private focusRoomTile = (index: number) => {
+        if (!this.sublistRef.current) return;
+        const elements = this.sublistRef.current.querySelectorAll<HTMLDivElement>(".mx_RoomTile");
+        const element = elements && elements[index];
+        if (element) {
+            element.focus();
+        }
+    };
+
+    private onOpenMenuClick = (ev: React.MouseEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+        const target = ev.target as HTMLButtonElement;
+        this.setState({contextMenuPosition: target.getBoundingClientRect()});
+    };
+
+    private onContextMenu = (ev: React.MouseEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+        this.setState({
+            contextMenuPosition: {
+                left: ev.clientX,
+                top: ev.clientY,
+                height: 0,
+            },
+        });
+    };
+
+    private onAddRoomContextMenu = (ev: React.MouseEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+        const target = ev.target as HTMLButtonElement;
+        this.setState({addRoomContextMenuPosition: target.getBoundingClientRect()});
+    };
+
+    private onCloseMenu = () => {
+        this.setState({contextMenuPosition: null});
+    };
+
+    private onCloseAddRoomMenu = () => {
+        this.setState({addRoomContextMenuPosition: null});
+    };
+
+    private onUnreadFirstChanged = async () => {
+        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);
+    };
+
+    private onTagSortChanged = async (sort: SortAlgorithm) => {
+        await RoomListStore.instance.setTagSorting(this.props.tagId, sort);
+    };
+
+    private onMessagePreviewChanged = () => {
+        this.layout.showPreviews = !this.layout.showPreviews;
+        this.forceUpdate(); // because the layout doesn't trigger a re-render
+    };
+
+    private onBadgeClick = (ev: React.MouseEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        let room;
+        if (this.props.tagId === DefaultTagID.Invite) {
+            // switch to first room as that'll be the top of the list for the user
+            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) => {
+                const notifState = this.notificationState.getForRoom(r);
+                return notifState.count > 0 && notifState.color === this.notificationState.color;
+            });
+        }
+
+        if (room) {
+            dis.dispatch({
+                action: 'view_room',
+                room_id: room.roomId,
+                show_room_tile: true, // to make sure the room gets scrolled into view
+            });
+        }
+    };
+
+    private onHeaderClick = () => {
+        const possibleSticky = this.headerButton.current.parentElement;
+        const sublist = possibleSticky.parentElement.parentElement;
+        const list = sublist.parentElement.parentElement;
+        // the scrollTop is capped at the height of the header in LeftPanel, the top header is always sticky
+        const isAtTop = list.scrollTop <= HEADER_HEIGHT;
+        const isAtBottom = list.scrollTop >= list.scrollHeight - list.offsetHeight;
+        const isStickyTop = possibleSticky.classList.contains('mx_RoomSublist_headerContainer_stickyTop');
+        const isStickyBottom = possibleSticky.classList.contains('mx_RoomSublist_headerContainer_stickyBottom');
+
+        if ((isStickyBottom && !isAtBottom) || (isStickyTop && !isAtTop)) {
+            // is sticky - jump to list
+            sublist.scrollIntoView({behavior: 'smooth'});
+        } else {
+            // on screen - toggle collapse
+            const isExpanded = this.state.isExpanded;
+            this.toggleCollapsed();
+            // if the bottom list is collapsed then scroll it in so it doesn't expand off screen
+            if (!isExpanded && isStickyBottom) {
+                setImmediate(() => {
+                    sublist.scrollIntoView({behavior: 'smooth'});
+                });
+            }
+        }
+    };
+
+    private toggleCollapsed = () => {
+        this.layout.isCollapsed = this.state.isExpanded;
+        this.setState({isExpanded: !this.layout.isCollapsed});
+        setImmediate(() => this.props.onResize()); // needs to happen when the DOM is updated
+    };
+
+    private onHeaderKeyDown = (ev: React.KeyboardEvent) => {
+        switch (ev.key) {
+            case Key.ARROW_LEFT:
+                ev.stopPropagation();
+                if (this.state.isExpanded) {
+                    // On ARROW_LEFT collapse the room sublist if it isn't already
+                    this.toggleCollapsed();
+                }
+                break;
+            case Key.ARROW_RIGHT: {
+                ev.stopPropagation();
+                if (!this.state.isExpanded) {
+                    // On ARROW_RIGHT expand the room sublist if it isn't already
+                    this.toggleCollapsed();
+                } else if (this.sublistRef.current) {
+                    // otherwise focus the first room
+                    const element = this.sublistRef.current.querySelector(".mx_RoomTile") as HTMLDivElement;
+                    if (element) {
+                        element.focus();
+                    }
+                }
+                break;
+            }
+        }
+    };
+
+    private onKeyDown = (ev: React.KeyboardEvent) => {
+        switch (ev.key) {
+            // On ARROW_LEFT go to the sublist header
+            case Key.ARROW_LEFT:
+                ev.stopPropagation();
+                this.headerButton.current.focus();
+                break;
+            // Consume ARROW_RIGHT so it doesn't cause focus to get sent to composer
+            case Key.ARROW_RIGHT:
+                ev.stopPropagation();
+        }
+    };
+
+    private renderVisibleTiles(): React.ReactElement[] {
+        if (!this.state.isExpanded) {
+            // don't waste time on rendering
+            return [];
+        }
+
+        const tiles: React.ReactElement[] = [];
+
+        if (this.state.rooms) {
+            const visibleRooms = this.state.rooms.slice(0, this.numVisibleTiles);
+            for (const room of visibleRooms) {
+                tiles.push(
+                    <RoomTile
+                        room={room}
+                        key={`room-${room.roomId}`}
+                        showMessagePreview={this.layout.showPreviews}
+                        isMinimized={this.props.isMinimized}
+                        tag={this.props.tagId}
+                    />
+                );
+            }
+        }
+
+        if (this.extraTiles) {
+            // HACK: We break typing here, but this 'extra tiles' property shouldn't exist.
+            (tiles as any[]).push(...this.extraTiles);
+        }
+
+        // We only have to do this because of the extra tiles. We do it conditionally
+        // to avoid spending cycles on slicing. It's generally fine to do this though
+        // as users are unlikely to have more than a handful of tiles when the extra
+        // tiles are used.
+        if (tiles.length > this.numVisibleTiles) {
+            return tiles.slice(0, this.numVisibleTiles);
+        }
+
+        return tiles;
+    }
+
+    private renderMenu(): React.ReactElement {
+        let contextMenu = null;
+        if (this.state.contextMenuPosition) {
+            const isAlphabetical = RoomListStore.instance.getTagSorting(this.props.tagId) === SortAlgorithm.Alphabetic;
+            const isUnreadFirst = RoomListStore.instance.getListOrder(this.props.tagId) === ListAlgorithm.Importance;
+
+            // Invites don't get some nonsense options, so only add them if we have to.
+            let otherSections = null;
+            if (this.props.tagId !== DefaultTagID.Invite) {
+                otherSections = (
+                    <React.Fragment>
+                        <hr />
+                        <div>
+                            <div className='mx_RoomSublist_contextMenu_title'>{_t("Appearance")}</div>
+                            <StyledMenuItemCheckbox
+                                onClose={this.onCloseMenu}
+                                onChange={this.onUnreadFirstChanged}
+                                checked={isUnreadFirst}
+                            >
+                                {_t("Show rooms with unread messages first")}
+                            </StyledMenuItemCheckbox>
+                            <StyledMenuItemCheckbox
+                                onClose={this.onCloseMenu}
+                                onChange={this.onMessagePreviewChanged}
+                                checked={this.layout.showPreviews}
+                            >
+                                {_t("Show previews of messages")}
+                            </StyledMenuItemCheckbox>
+                        </div>
+                    </React.Fragment>
+                );
+            }
+
+            contextMenu = (
+                <ContextMenu
+                    chevronFace={ChevronFace.None}
+                    left={this.state.contextMenuPosition.left}
+                    top={this.state.contextMenuPosition.top + this.state.contextMenuPosition.height}
+                    onFinished={this.onCloseMenu}
+                >
+                    <div className="mx_RoomSublist_contextMenu">
+                        <div>
+                            <div className='mx_RoomSublist_contextMenu_title'>{_t("Sort by")}</div>
+                            <StyledMenuItemRadio
+                                onClose={this.onCloseMenu}
+                                onChange={() => this.onTagSortChanged(SortAlgorithm.Recent)}
+                                checked={!isAlphabetical}
+                                name={`mx_${this.props.tagId}_sortBy`}
+                            >
+                                {_t("Activity")}
+                            </StyledMenuItemRadio>
+                            <StyledMenuItemRadio
+                                onClose={this.onCloseMenu}
+                                onChange={() => this.onTagSortChanged(SortAlgorithm.Alphabetic)}
+                                checked={isAlphabetical}
+                                name={`mx_${this.props.tagId}_sortBy`}
+                            >
+                                {_t("A-Z")}
+                            </StyledMenuItemRadio>
+                        </div>
+                        {otherSections}
+                    </div>
+                </ContextMenu>
+            );
+        } else if (this.state.addRoomContextMenuPosition) {
+            contextMenu = (
+                <IconizedContextMenu
+                    chevronFace={ChevronFace.None}
+                    left={this.state.addRoomContextMenuPosition.left - 7} // center align with the handle
+                    top={this.state.addRoomContextMenuPosition.top + this.state.addRoomContextMenuPosition.height}
+                    onFinished={this.onCloseAddRoomMenu}
+                    compact
+                >
+                    {this.props.addRoomContextMenu(this.onCloseAddRoomMenu)}
+                </IconizedContextMenu>
+            );
+        }
+
+        return (
+            <React.Fragment>
+                <ContextMenuTooltipButton
+                    className="mx_RoomSublist_menuButton"
+                    onClick={this.onOpenMenuClick}
+                    title={_t("List options")}
+                    isExpanded={!!this.state.contextMenuPosition}
+                />
+                {contextMenu}
+            </React.Fragment>
+        );
+    }
+
+    private renderHeader(): React.ReactElement {
+        return (
+            <RovingTabIndexWrapper inputRef={this.headerButton}>
+                {({onFocus, isActive, ref}) => {
+                    const tabIndex = isActive ? 0 : -1;
+
+                    let ariaLabel = _t("Jump to first unread room.");
+                    if (this.props.tagId === DefaultTagID.Invite) {
+                        ariaLabel = _t("Jump to first invite.");
+                    }
+
+                    const badge = (
+                        <NotificationBadge
+                            forceCount={true}
+                            notification={this.notificationState}
+                            onClick={this.onBadgeClick}
+                            tabIndex={tabIndex}
+                            aria-label={ariaLabel}
+                        />
+                    );
+
+                    let addRoomButton = null;
+                    if (!!this.props.onAddRoom) {
+                        addRoomButton = (
+                            <AccessibleTooltipButton
+                                tabIndex={tabIndex}
+                                onClick={this.onAddRoom}
+                                className="mx_RoomSublist_auxButton"
+                                tooltipClassName="mx_RoomSublist_addRoomTooltip"
+                                aria-label={this.props.addRoomLabel || _t("Add room")}
+                                title={this.props.addRoomLabel}
+                            />
+                        );
+                    } else if (this.props.addRoomContextMenu) {
+                        addRoomButton = (
+                            <ContextMenuTooltipButton
+                                tabIndex={tabIndex}
+                                onClick={this.onAddRoomContextMenu}
+                                className="mx_RoomSublist_auxButton"
+                                tooltipClassName="mx_RoomSublist_addRoomTooltip"
+                                aria-label={this.props.addRoomLabel || _t("Add room")}
+                                title={this.props.addRoomLabel}
+                                isExpanded={!!this.state.addRoomContextMenuPosition}
+                            />
+                        );
+                    }
+
+                    const collapseClasses = classNames({
+                        'mx_RoomSublist_collapseBtn': true,
+                        'mx_RoomSublist_collapseBtn_collapsed': !this.state.isExpanded,
+                    });
+
+                    const classes = classNames({
+                        'mx_RoomSublist_headerContainer': true,
+                        'mx_RoomSublist_headerContainer_withAux': !!addRoomButton,
+                    });
+
+                    const badgeContainer = (
+                        <div className="mx_RoomSublist_badgeContainer">
+                            {badge}
+                        </div>
+                    );
+
+                    let Button: React.ComponentType<React.ComponentProps<typeof AccessibleButton>> = AccessibleButton;
+                    if (this.props.isMinimized) {
+                        Button = AccessibleTooltipButton;
+                    }
+
+                    // Note: the addRoomButton conditionally gets moved around
+                    // the DOM depending on whether or not the list is minimized.
+                    // If we're minimized, we want it below the header so it
+                    // doesn't become sticky.
+                    // The same applies to the notification badge.
+                    return (
+                        <div className={classes} onKeyDown={this.onHeaderKeyDown} onFocus={onFocus} aria-label={this.props.label}>
+                            <div className="mx_RoomSublist_stickable">
+                                <Button
+                                    onFocus={onFocus}
+                                    inputRef={ref}
+                                    tabIndex={tabIndex}
+                                    className="mx_RoomSublist_headerText"
+                                    role="treeitem"
+                                    aria-expanded={this.state.isExpanded}
+                                    aria-level={1}
+                                    onClick={this.onHeaderClick}
+                                    onContextMenu={this.onContextMenu}
+                                    title={this.props.isMinimized ? this.props.label : undefined}
+                                >
+                                    <span className={collapseClasses} />
+                                    <span>{this.props.label}</span>
+                                </Button>
+                                {this.renderMenu()}
+                                {this.props.isMinimized ? null : badgeContainer}
+                                {this.props.isMinimized ? null : addRoomButton}
+                            </div>
+                            {this.props.isMinimized ? badgeContainer : null}
+                            {this.props.isMinimized ? addRoomButton : null}
+                        </div>
+                    );
+                }}
+            </RovingTabIndexWrapper>
+        );
+    }
+
+    private onScrollPrevent(e: React.UIEvent<HTMLDivElement>) {
+        // the RoomTile calls scrollIntoView and the browser may scroll a div we do not wish to be scrollable
+        // this fixes https://github.com/vector-im/element-web/issues/14413
+        (e.target as HTMLDivElement).scrollTop = 0;
+    }
+
+    public render(): React.ReactElement {
+        const visibleTiles = this.renderVisibleTiles();
+        const classes = classNames({
+            'mx_RoomSublist': true,
+            'mx_RoomSublist_hasMenuOpen': !!this.state.contextMenuPosition,
+            'mx_RoomSublist_minimized': this.props.isMinimized,
+        });
+
+        let content = null;
+        if (visibleTiles.length > 0) {
+            const layout = this.layout; // to shorten calls
+
+            const minTiles = Math.min(layout.minVisibleTiles, this.numTiles);
+            const showMoreAtMinHeight = minTiles < this.numTiles;
+            const minHeightPadding = RESIZE_HANDLE_HEIGHT + (showMoreAtMinHeight ? SHOW_N_BUTTON_HEIGHT : 0);
+            const minTilesPx = layout.tilesToPixelsWithPadding(minTiles, minHeightPadding);
+            let maxTilesPx = layout.tilesToPixelsWithPadding(this.numTiles, this.padding);
+            const showMoreBtnClasses = classNames({
+                'mx_RoomSublist_showNButton': true,
+            });
+
+            // If we're hiding rooms, show a 'show more' button to the user. This button
+            // floats above the resize handle, if we have one present. If the user has all
+            // tiles visible, it becomes 'show less'.
+            let showNButton = null;
+
+            if (maxTilesPx > this.state.height) {
+                // the height of all the tiles is greater than the section height: we need a 'show more' button
+                const nonPaddedHeight = this.state.height - RESIZE_HANDLE_HEIGHT - SHOW_N_BUTTON_HEIGHT;
+                const amountFullyShown = Math.floor(nonPaddedHeight / this.layout.tileHeight);
+                const numMissing = this.numTiles - amountFullyShown;
+                const label = _t("Show %(count)s more", {count: numMissing});
+                let showMoreText = (
+                    <span className='mx_RoomSublist_showNButtonText'>
+                        {label}
+                    </span>
+                );
+                if (this.props.isMinimized) showMoreText = null;
+                showNButton = (
+                    <RovingAccessibleButton
+                        role="treeitem"
+                        onClick={this.onShowAllClick}
+                        className={showMoreBtnClasses}
+                        aria-label={label}
+                    >
+                        <span className='mx_RoomSublist_showMoreButtonChevron mx_RoomSublist_showNButtonChevron'>
+                            {/* set by CSS masking */}
+                        </span>
+                        {showMoreText}
+                    </RovingAccessibleButton>
+                );
+            } else if (this.numTiles > this.layout.defaultVisibleTiles) {
+                // we have all tiles visible - add a button to show less
+                const label = _t("Show less");
+                let showLessText = (
+                    <span className='mx_RoomSublist_showNButtonText'>
+                        {label}
+                    </span>
+                );
+                if (this.props.isMinimized) showLessText = null;
+                showNButton = (
+                    <RovingAccessibleButton
+                        role="treeitem"
+                        onClick={this.onShowLessClick}
+                        className={showMoreBtnClasses}
+                        aria-label={label}
+                    >
+                        <span className='mx_RoomSublist_showLessButtonChevron mx_RoomSublist_showNButtonChevron'>
+                            {/* set by CSS masking */}
+                        </span>
+                        {showLessText}
+                    </RovingAccessibleButton>
+                );
+            }
+
+            // Figure out if we need a handle
+            const handles: Enable = {
+                bottom: true, // the only one we need, but the others must be explicitly false
+                bottomLeft: false,
+                bottomRight: false,
+                left: false,
+                right: false,
+                top: false,
+                topLeft: false,
+                topRight: false,
+            };
+            if (layout.visibleTiles >= this.numTiles && this.numTiles <= layout.minVisibleTiles) {
+                // we're at a minimum, don't have a bottom handle
+                handles.bottom = false;
+            }
+
+            // We have to account for padding so we can accommodate a 'show more' button and
+            // the resize handle, which are pinned to the bottom of the container. This is the
+            // easiest way to have a resize handle below the button as otherwise we're writing
+            // our own resize handling and that doesn't sound fun.
+            //
+            // The layout class has some helpers for dealing with padding, as we don't want to
+            // apply it in all cases. If we apply it in all cases, the resizing feels like it
+            // goes backwards and can become wildly incorrect (visibleTiles says 18 when there's
+            // only mathematically 7 possible).
+
+            const handleWrapperClasses = classNames({
+                'mx_RoomSublist_resizerHandles': true,
+                'mx_RoomSublist_resizerHandles_showNButton': !!showNButton,
+            });
+
+            content = (
+                <React.Fragment>
+                    <Resizable
+                        size={{height: this.state.height} as any}
+                        minHeight={minTilesPx}
+                        maxHeight={maxTilesPx}
+                        onResizeStart={this.onResizeStart}
+                        onResizeStop={this.onResizeStop}
+                        onResize={this.onResize}
+                        handleWrapperClass={handleWrapperClasses}
+                        handleClasses={{bottom: "mx_RoomSublist_resizerHandle"}}
+                        className="mx_RoomSublist_resizeBox"
+                        enable={handles}
+                    >
+                        <div className="mx_RoomSublist_tiles" onScroll={this.onScrollPrevent}>
+                            {visibleTiles}
+                        </div>
+                        {showNButton}
+                    </Resizable>
+                </React.Fragment>
+            );
+        }
+
+        return (
+            <div
+                ref={this.sublistRef}
+                className={classes}
+                role="group"
+                aria-label={this.props.label}
+                onKeyDown={this.onKeyDown}
+            >
+                {this.renderHeader()}
+                {content}
+            </div>
+        );
+    }
+}
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
deleted file mode 100644
index f157ee0df7..0000000000
--- a/src/components/views/rooms/RoomTile.js
+++ /dev/null
@@ -1,571 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 New Vector Ltd
-Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
-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';
-import createReactClass from 'create-react-class';
-import classNames from 'classnames';
-import dis from '../../../dispatcher';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import DMRoomMap from '../../../utils/DMRoomMap';
-import * as sdk from '../../../index';
-import {ContextMenu, ContextMenuButton, toRightOf} from '../../structures/ContextMenu';
-import * as RoomNotifs from '../../../RoomNotifs';
-import * as FormattingUtils from '../../../utils/FormattingUtils';
-import ActiveRoomObserver from '../../../ActiveRoomObserver';
-import RoomViewStore from '../../../stores/RoomViewStore';
-import SettingsStore from "../../../settings/SettingsStore";
-import {_t} from "../../../languageHandler";
-import {RovingTabIndexWrapper} from "../../../accessibility/RovingTabIndex";
-import E2EIcon from './E2EIcon';
-import InviteOnlyIcon from './InviteOnlyIcon';
-// eslint-disable-next-line camelcase
-import rate_limited_func from '../../../ratelimitedfunc';
-import { shieldStatusForRoom } from '../../../utils/ShieldUtils';
-
-export default createReactClass({
-    displayName: 'RoomTile',
-
-    propTypes: {
-        onClick: PropTypes.func,
-
-        room: PropTypes.object.isRequired,
-        collapsed: PropTypes.bool.isRequired,
-        unread: PropTypes.bool.isRequired,
-        highlight: PropTypes.bool.isRequired,
-        // If true, apply mx_RoomTile_transparent class
-        transparent: PropTypes.bool,
-        isInvite: PropTypes.bool.isRequired,
-        incomingCall: PropTypes.object,
-    },
-
-    getDefaultProps: function() {
-        return {
-            isDragging: false,
-        };
-    },
-
-    getInitialState: function() {
-        const joinRules = this.props.room.currentState.getStateEvents("m.room.join_rules", "");
-        const joinRule = joinRules && joinRules.getContent().join_rule;
-
-        return ({
-            joinRule,
-            hover: false,
-            badgeHover: false,
-            contextMenuPosition: null, // DOM bounding box, null if non-shown
-            roomName: this.props.room.name,
-            notifState: RoomNotifs.getRoomNotifsState(this.props.room.roomId),
-            notificationCount: this.props.room.getUnreadNotificationCount(),
-            selected: this.props.room.roomId === RoomViewStore.getRoomId(),
-            statusMessage: this._getStatusMessage(),
-            e2eStatus: null,
-        });
-    },
-
-    _shouldShowStatusMessage() {
-        if (!SettingsStore.isFeatureEnabled("feature_custom_status")) {
-            return false;
-        }
-        const isInvite = this.props.room.getMyMembership() === "invite";
-        const isJoined = this.props.room.getMyMembership() === "join";
-        const looksLikeDm = this.props.room.getInvitedAndJoinedMemberCount() === 2;
-        return !isInvite && isJoined && looksLikeDm;
-    },
-
-    _getStatusMessageUser() {
-        if (!MatrixClientPeg.get()) return null; // We've probably been logged out
-
-        const selfId = MatrixClientPeg.get().getUserId();
-        const otherMember = this.props.room.currentState.getMembersExcept([selfId])[0];
-        if (!otherMember) {
-            return null;
-        }
-        return otherMember.user;
-    },
-
-    _getStatusMessage() {
-        const statusUser = this._getStatusMessageUser();
-        if (!statusUser) {
-            return "";
-        }
-        return statusUser._unstable_statusMessage;
-    },
-
-    onRoomStateMember: function(ev, state, member) {
-        // we only care about leaving users
-        // because trust state will change if someone joins a megolm session anyway
-        if (member.membership !== "leave") {
-            return;
-        }
-        // ignore members in other rooms
-        if (member.roomId !== this.props.room.roomId) {
-            return;
-        }
-
-        this._updateE2eStatus();
-    },
-
-    onUserVerificationChanged: function(userId, _trustStatus) {
-        if (!this.props.room.getMember(userId)) {
-            // Not in this room
-            return;
-        }
-        this._updateE2eStatus();
-    },
-
-    onCrossSigningKeysChanged: function() {
-        this._updateE2eStatus();
-    },
-
-    onRoomTimeline: function(ev, room) {
-        if (!room) return;
-        if (room.roomId != this.props.room.roomId) return;
-        if (ev.getType() !== "m.room.encryption") return;
-        MatrixClientPeg.get().removeListener("Room.timeline", this.onRoomTimeline);
-        this.onFindingRoomToBeEncrypted();
-    },
-
-    onFindingRoomToBeEncrypted: function() {
-        const cli = MatrixClientPeg.get();
-        cli.on("RoomState.members", this.onRoomStateMember);
-        cli.on("userTrustStatusChanged", this.onUserVerificationChanged);
-        cli.on("crossSigning.keysChanged", this.onCrossSigningKeysChanged);
-        this._updateE2eStatus();
-    },
-
-    _updateE2eStatus: async function() {
-        const cli = MatrixClientPeg.get();
-        if (!cli.isRoomEncrypted(this.props.room.roomId)) {
-            return;
-        }
-        if (!SettingsStore.getValue("feature_cross_signing")) {
-            return;
-        }
-
-        /* At this point, the user has encryption on and cross-signing on */
-        this.setState({
-            e2eStatus: await shieldStatusForRoom(cli, this.props.room),
-        });
-    },
-
-    onRoomName: function(room) {
-        if (room !== this.props.room) return;
-        this.setState({
-            roomName: this.props.room.name,
-        });
-    },
-
-    onJoinRule: function(ev) {
-        if (ev.getType() !== "m.room.join_rules") return;
-        if (ev.getRoomId() !== this.props.room.roomId) return;
-        this.setState({ joinRule: ev.getContent().join_rule });
-    },
-
-    onAccountData: function(accountDataEvent) {
-        if (accountDataEvent.getType() === 'm.push_rules') {
-            this.setState({
-                notifState: RoomNotifs.getRoomNotifsState(this.props.room.roomId),
-            });
-        }
-    },
-
-    onAction: function(payload) {
-        switch (payload.action) {
-            // XXX: slight hack in order to zero the notification count when a room
-            // is read. Ideally this state would be given to this via props (as we
-            // do with `unread`). This is still better than forceUpdating the entire
-            // RoomList when a room is read.
-            case 'on_room_read':
-                if (payload.roomId !== this.props.room.roomId) break;
-                this.setState({
-                    notificationCount: this.props.room.getUnreadNotificationCount(),
-                });
-                break;
-            // RoomTiles are one of the few components that may show custom status and
-            // also remain on screen while in Settings toggling the feature.  This ensures
-            // you can clearly see the status hide and show when toggling the feature.
-            case 'feature_custom_status_changed':
-                this.forceUpdate();
-                break;
-
-            case 'view_room':
-                // when the room is selected make sure its tile is visible, for breadcrumbs/keyboard shortcut access
-                if (payload.room_id === this.props.room.roomId && payload.show_room_tile) {
-                    this._scrollIntoView();
-                }
-                break;
-        }
-    },
-
-    _scrollIntoView: function() {
-        if (!this._roomTile.current) return;
-        this._roomTile.current.scrollIntoView({
-            block: "nearest",
-            behavior: "auto",
-        });
-    },
-
-    _onActiveRoomChange: function() {
-        this.setState({
-            selected: this.props.room.roomId === RoomViewStore.getRoomId(),
-        });
-    },
-
-    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
-    UNSAFE_componentWillMount: function() {
-        this._roomTile = createRef();
-    },
-
-    componentDidMount: function() {
-        /* We bind here rather than in the definition because otherwise we wind up with the
-           method only being callable once every 500ms across all instances, which would be wrong */
-        this._updateE2eStatus = rate_limited_func(this._updateE2eStatus, 500);
-
-        const cli = MatrixClientPeg.get();
-        cli.on("accountData", this.onAccountData);
-        cli.on("Room.name", this.onRoomName);
-        cli.on("RoomState.events", this.onJoinRule);
-        if (cli.isRoomEncrypted(this.props.room.roomId)) {
-            this.onFindingRoomToBeEncrypted();
-        } else {
-            cli.on("Room.timeline", this.onRoomTimeline);
-        }
-        ActiveRoomObserver.addListener(this.props.room.roomId, this._onActiveRoomChange);
-        this.dispatcherRef = dis.register(this.onAction);
-
-        if (this._shouldShowStatusMessage()) {
-            const statusUser = this._getStatusMessageUser();
-            if (statusUser) {
-                statusUser.on("User._unstable_statusMessage", this._onStatusMessageCommitted);
-            }
-        }
-
-        // when we're first rendered (or our sublist is expanded) make sure we are visible if we're active
-        if (this.state.selected) {
-            this._scrollIntoView();
-        }
-    },
-
-    componentWillUnmount: function() {
-        const cli = MatrixClientPeg.get();
-        if (cli) {
-            MatrixClientPeg.get().removeListener("accountData", this.onAccountData);
-            MatrixClientPeg.get().removeListener("Room.name", this.onRoomName);
-            cli.removeListener("RoomState.events", this.onJoinRule);
-            cli.removeListener("RoomState.members", this.onRoomStateMember);
-            cli.removeListener("userTrustStatusChanged", this.onUserVerificationChanged);
-            cli.removeListener("crossSigning.keysChanged", this.onCrossSigningKeysChanged);
-            cli.removeListener("Room.timeline", this.onRoomTimeline);
-        }
-        ActiveRoomObserver.removeListener(this.props.room.roomId, this._onActiveRoomChange);
-        dis.unregister(this.dispatcherRef);
-
-        if (this._shouldShowStatusMessage()) {
-            const statusUser = this._getStatusMessageUser();
-            if (statusUser) {
-                statusUser.removeListener(
-                    "User._unstable_statusMessage",
-                    this._onStatusMessageCommitted,
-                );
-            }
-        }
-    },
-
-    // TODO: [REACT-WARNING] Replace with appropriate lifecycle event
-    UNSAFE_componentWillReceiveProps: function(props) {
-        // XXX: This could be a lot better - this makes the assumption that
-        // the notification count may have changed when the properties of
-        // the room tile change.
-        this.setState({
-            notificationCount: this.props.room.getUnreadNotificationCount(),
-        });
-    },
-
-    // Do a simple shallow comparison of props and state to avoid unnecessary
-    // renders. The assumption made here is that only state and props are used
-    // in rendering this component and children.
-    //
-    // RoomList is frequently made to forceUpdate, so this decreases number of
-    // RoomTile renderings.
-    shouldComponentUpdate: function(newProps, newState) {
-        if (Object.keys(newProps).some((k) => newProps[k] !== this.props[k])) {
-            return true;
-        }
-        if (Object.keys(newState).some((k) => newState[k] !== this.state[k])) {
-            return true;
-        }
-        return false;
-    },
-
-    _onStatusMessageCommitted() {
-        // The status message `User` object has observed a message change.
-        this.setState({
-            statusMessage: this._getStatusMessage(),
-        });
-    },
-
-    onClick: function(ev) {
-        if (this.props.onClick) {
-            this.props.onClick(this.props.room.roomId, ev);
-        }
-    },
-
-    onMouseEnter: function() {
-        this.setState( { hover: true });
-        this.badgeOnMouseEnter();
-    },
-
-    onMouseLeave: function() {
-        this.setState( { hover: false });
-        this.badgeOnMouseLeave();
-    },
-
-    badgeOnMouseEnter: function() {
-        // Only allow non-guests to access the context menu
-        // and only change it if it needs to change
-        if (!MatrixClientPeg.get().isGuest() && !this.state.badgeHover) {
-            this.setState( { badgeHover: true } );
-        }
-    },
-
-    badgeOnMouseLeave: function() {
-        this.setState( { badgeHover: false } );
-    },
-
-    _showContextMenu: function(boundingClientRect) {
-        // Only allow non-guests to access the context menu
-        if (MatrixClientPeg.get().isGuest()) return;
-
-        const state = {
-            contextMenuPosition: boundingClientRect,
-        };
-
-        // If the badge is clicked, then no longer show tooltip
-        if (this.props.collapsed) {
-            state.hover = false;
-        }
-
-        this.setState(state);
-    },
-
-    onContextMenuButtonClick: function(e) {
-        // Prevent the RoomTile onClick event firing as well
-        e.stopPropagation();
-        e.preventDefault();
-
-        this._showContextMenu(e.target.getBoundingClientRect());
-    },
-
-    onContextMenu: function(e) {
-        // Prevent the native context menu
-        e.preventDefault();
-
-        this._showContextMenu({
-            right: e.clientX,
-            top: e.clientY,
-            height: 0,
-        });
-    },
-
-    closeMenu: function() {
-        this.setState({
-            contextMenuPosition: null,
-        });
-        this.props.refreshSubList();
-    },
-
-    render: function() {
-        const isInvite = this.props.room.getMyMembership() === "invite";
-        const notificationCount = this.props.notificationCount;
-        // var highlightCount = this.props.room.getUnreadNotificationCount("highlight");
-
-        const notifBadges = notificationCount > 0 && RoomNotifs.shouldShowNotifBadge(this.state.notifState);
-        const mentionBadges = this.props.highlight && RoomNotifs.shouldShowMentionBadge(this.state.notifState);
-        const badges = notifBadges || mentionBadges;
-
-        let subtext = null;
-        if (this._shouldShowStatusMessage()) {
-            subtext = this.state.statusMessage;
-        }
-
-        const isMenuDisplayed = Boolean(this.state.contextMenuPosition);
-
-        const dmUserId = DMRoomMap.shared().getUserIdForRoomId(this.props.room.roomId);
-
-        const classes = classNames({
-            'mx_RoomTile': true,
-            'mx_RoomTile_selected': this.state.selected,
-            'mx_RoomTile_unread': this.props.unread,
-            'mx_RoomTile_unreadNotify': notifBadges,
-            'mx_RoomTile_highlight': mentionBadges,
-            'mx_RoomTile_invited': isInvite,
-            'mx_RoomTile_menuDisplayed': isMenuDisplayed,
-            'mx_RoomTile_noBadges': !badges,
-            'mx_RoomTile_transparent': this.props.transparent,
-            'mx_RoomTile_hasSubtext': subtext && !this.props.collapsed,
-        });
-
-        const avatarClasses = classNames({
-            'mx_RoomTile_avatar': true,
-        });
-
-        const badgeClasses = classNames({
-            'mx_RoomTile_badge': true,
-            'mx_RoomTile_badgeButton': this.state.badgeHover || isMenuDisplayed,
-        });
-
-        let name = this.state.roomName;
-        if (name == undefined || name == null) name = '';
-        name = name.replace(":", ":\u200b"); // add a zero-width space to allow linewrapping after the colon
-
-
-        let badge;
-        if (badges) {
-            const limitedCount = FormattingUtils.formatCount(notificationCount);
-            const badgeContent = notificationCount ? limitedCount : '!';
-            badge = <div className={badgeClasses}>{ badgeContent }</div>;
-        }
-
-        let label;
-        let subtextLabel;
-        let tooltip;
-        if (!this.props.collapsed) {
-            const nameClasses = classNames({
-                'mx_RoomTile_name': true,
-                'mx_RoomTile_invite': this.props.isInvite,
-                'mx_RoomTile_badgeShown': badges || this.state.badgeHover || isMenuDisplayed,
-            });
-
-            subtextLabel = subtext ? <span className="mx_RoomTile_subtext">{ subtext }</span> : null;
-            // XXX: this is a workaround for Firefox giving this div a tabstop :( [tabIndex]
-            label = <div title={name} className={nameClasses} tabIndex={-1} dir="auto">{ name }</div>;
-        } else if (this.state.hover) {
-            const Tooltip = sdk.getComponent("elements.Tooltip");
-            tooltip = <Tooltip className="mx_RoomTile_tooltip" label={this.props.room.name} dir="auto" />;
-        }
-
-        //var incomingCallBox;
-        //if (this.props.incomingCall) {
-        //    var IncomingCallBox = sdk.getComponent("voip.IncomingCallBox");
-        //    incomingCallBox = <IncomingCallBox incomingCall={ this.props.incomingCall }/>;
-        //}
-
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-
-        let contextMenuButton;
-        if (!MatrixClientPeg.get().isGuest()) {
-            contextMenuButton = (
-                <ContextMenuButton
-                    className="mx_RoomTile_menuButton"
-                    label={_t("Options")}
-                    isExpanded={isMenuDisplayed}
-                    onClick={this.onContextMenuButtonClick} />
-            );
-        }
-
-        const RoomAvatar = sdk.getComponent('avatars.RoomAvatar');
-
-        let ariaLabel = name;
-
-        let dmOnline;
-        const { room } = this.props;
-        const member = room.getMember(dmUserId);
-        if (member && member.membership === "join" && room.getJoinedMemberCount() === 2) {
-            const UserOnlineDot = sdk.getComponent('rooms.UserOnlineDot');
-            dmOnline = <UserOnlineDot userId={dmUserId} />;
-        }
-
-        // The following labels are written in such a fashion to increase screen reader efficiency (speed).
-        if (notifBadges && mentionBadges && !isInvite) {
-            ariaLabel += " " + _t("%(count)s unread messages including mentions.", {
-                count: notificationCount,
-            });
-        } else if (notifBadges) {
-            ariaLabel += " " + _t("%(count)s unread messages.", { count: notificationCount });
-        } else if (mentionBadges && !isInvite) {
-            ariaLabel += " " + _t("Unread mentions.");
-        } else if (this.props.unread) {
-            ariaLabel += " " + _t("Unread messages.");
-        }
-
-        let contextMenu;
-        if (isMenuDisplayed) {
-            const RoomTileContextMenu = sdk.getComponent('context_menus.RoomTileContextMenu');
-            contextMenu = (
-                <ContextMenu {...toRightOf(this.state.contextMenuPosition)} onFinished={this.closeMenu}>
-                    <RoomTileContextMenu room={this.props.room} onFinished={this.closeMenu} />
-                </ContextMenu>
-            );
-        }
-
-        let privateIcon = null;
-        if (SettingsStore.getValue("feature_cross_signing")) {
-            if (this.state.joinRule == "invite" && !dmUserId) {
-                privateIcon = <InviteOnlyIcon collapsedPanel={this.props.collapsed} />;
-            }
-        }
-
-        let e2eIcon = null;
-        if (this.state.e2eStatus) {
-            e2eIcon = <E2EIcon status={this.state.e2eStatus} className="mx_RoomTile_e2eIcon" />;
-        }
-
-        return <React.Fragment>
-            <RovingTabIndexWrapper inputRef={this._roomTile}>
-                {({onFocus, isActive, ref}) =>
-                    <AccessibleButton
-                        onFocus={onFocus}
-                        tabIndex={isActive ? 0 : -1}
-                        inputRef={ref}
-                        className={classes}
-                        onClick={this.onClick}
-                        onMouseEnter={this.onMouseEnter}
-                        onMouseLeave={this.onMouseLeave}
-                        onContextMenu={this.onContextMenu}
-                        aria-label={ariaLabel}
-                        aria-selected={this.state.selected}
-                        role="treeitem"
-                    >
-                        <div className={avatarClasses}>
-                            <div className="mx_RoomTile_avatar_container">
-                                <RoomAvatar room={this.props.room} width={24} height={24} />
-                                { e2eIcon }
-                            </div>
-                        </div>
-                        { privateIcon }
-                        <div className="mx_RoomTile_nameContainer">
-                            <div className="mx_RoomTile_labelContainer">
-                                { label }
-                                { subtextLabel }
-                            </div>
-                            { dmOnline }
-                            { contextMenuButton }
-                            { badge }
-                        </div>
-                        { /* { incomingCallBox } */ }
-                        { tooltip }
-                    </AccessibleButton>
-                }
-            </RovingTabIndexWrapper>
-
-            { contextMenu }
-        </React.Fragment>;
-    },
-});
diff --git a/src/components/views/rooms/RoomTile.tsx b/src/components/views/rooms/RoomTile.tsx
new file mode 100644
index 0000000000..0c99b98e1a
--- /dev/null
+++ b/src/components/views/rooms/RoomTile.tsx
@@ -0,0 +1,572 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 New Vector Ltd
+Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
+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, { createRef } from "react";
+import { Room } from "matrix-js-sdk/src/models/room";
+import classNames from "classnames";
+import { RovingTabIndexWrapper } from "../../../accessibility/RovingTabIndex";
+import AccessibleButton, { ButtonEvent } from "../../views/elements/AccessibleButton";
+import dis from '../../../dispatcher/dispatcher';
+import defaultDispatcher from '../../../dispatcher/dispatcher';
+import { Key } from "../../../Keyboard";
+import ActiveRoomObserver from "../../../ActiveRoomObserver";
+import { _t } from "../../../languageHandler";
+import { ChevronFace, ContextMenuTooltipButton, MenuItemRadio } from "../../structures/ContextMenu";
+import { DefaultTagID, TagID } from "../../../stores/room-list/models";
+import { MessagePreviewStore, ROOM_PREVIEW_CHANGED } 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";
+import NotificationBadge from "./NotificationBadge";
+import { Volume } from "../../../RoomNotifsTypes";
+import RoomListStore from "../../../stores/room-list/RoomListStore";
+import RoomListActions from "../../../actions/RoomListActions";
+import { ActionPayload } from "../../../dispatcher/payloads";
+import { RoomNotificationStateStore } from "../../../stores/notifications/RoomNotificationStateStore";
+import { NOTIFICATION_STATE_UPDATE, NotificationState } from "../../../stores/notifications/NotificationState";
+import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
+import { EchoChamber } from "../../../stores/local-echo/EchoChamber";
+import { CachedRoomKey, RoomEchoChamber } from "../../../stores/local-echo/RoomEchoChamber";
+import { PROPERTY_UPDATED } from "../../../stores/local-echo/GenericEchoChamber";
+import IconizedContextMenu, {
+    IconizedContextMenuCheckbox,
+    IconizedContextMenuOption,
+    IconizedContextMenuOptionList, IconizedContextMenuRadio
+} from "../context_menus/IconizedContextMenu";
+
+interface IProps {
+    room: Room;
+    showMessagePreview: boolean;
+    isMinimized: boolean;
+    tag: TagID;
+}
+
+type PartialDOMRect = Pick<DOMRect, "left" | "bottom">;
+
+interface IState {
+    selected: boolean;
+    notificationsMenuPosition: PartialDOMRect;
+    generalMenuPosition: PartialDOMRect;
+    messagePreview?: string;
+}
+
+const messagePreviewId = (roomId: string) => `mx_RoomTile_messagePreview_${roomId}`;
+
+const contextMenuBelow = (elementRect: PartialDOMRect) => {
+    // align the context menu's icons with the icon which opened the context menu
+    const left = elementRect.left + window.pageXOffset - 9;
+    const top = elementRect.bottom + window.pageYOffset + 17;
+    const chevronFace = ChevronFace.None;
+    return {left, top, chevronFace};
+};
+
+export default class RoomTile extends React.PureComponent<IProps, IState> {
+    private dispatcherRef: string;
+    private roomTileRef = createRef<HTMLDivElement>();
+    private notificationState: NotificationState;
+    private roomProps: RoomEchoChamber;
+
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            selected: ActiveRoomObserver.activeRoomId === this.props.room.roomId,
+            notificationsMenuPosition: null,
+            generalMenuPosition: null,
+
+            // generatePreview() will return nothing if the user has previews disabled
+            messagePreview: this.generatePreview(),
+        };
+
+        ActiveRoomObserver.addListener(this.props.room.roomId, this.onActiveRoomUpdate);
+        this.dispatcherRef = defaultDispatcher.register(this.onAction);
+        MessagePreviewStore.instance.on(ROOM_PREVIEW_CHANGED, 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);
+    }
+
+    private onNotificationUpdate = () => {
+        this.forceUpdate(); // notification state changed - update
+    };
+
+    private onRoomPropertyUpdate = (property: CachedRoomKey) => {
+        if (property === CachedRoomKey.NotificationVolume) this.onNotificationUpdate();
+        // else ignore - not important for this tile
+    };
+
+    private get showContextMenu(): boolean {
+        return this.props.tag !== DefaultTagID.Invite;
+    }
+
+    private get showMessagePreview(): boolean {
+        return !this.props.isMinimized && this.props.showMessagePreview;
+    }
+
+    public componentDidUpdate(prevProps: Readonly<IProps>, prevState: Readonly<IState>) {
+        if (prevProps.showMessagePreview !== this.props.showMessagePreview && this.showMessagePreview) {
+            this.setState({messagePreview: this.generatePreview()});
+        }
+    }
+
+    public componentDidMount() {
+        // when we're first rendered (or our sublist is expanded) make sure we are visible if we're active
+        if (this.state.selected) {
+            this.scrollIntoView();
+        }
+    }
+
+    public componentWillUnmount() {
+        if (this.props.room) {
+            ActiveRoomObserver.removeListener(this.props.room.roomId, this.onActiveRoomUpdate);
+        }
+        defaultDispatcher.unregister(this.dispatcherRef);
+        MessagePreviewStore.instance.off(ROOM_PREVIEW_CHANGED, this.onRoomPreviewChanged);
+        this.notificationState.off(NOTIFICATION_STATE_UPDATE, this.onNotificationUpdate);
+    }
+
+    private onAction = (payload: ActionPayload) => {
+        if (payload.action === "view_room" && payload.room_id === this.props.room.roomId && payload.show_room_tile) {
+            setImmediate(() => {
+                this.scrollIntoView();
+            });
+        }
+    };
+
+    private onRoomPreviewChanged = (room: Room) => {
+        if (this.props.room && room.roomId === this.props.room.roomId) {
+            // generatePreview() will return nothing if the user has previews disabled
+            this.setState({messagePreview: this.generatePreview()});
+        }
+    };
+
+    private generatePreview(): string | null {
+        if (!this.showMessagePreview) {
+            return null;
+        }
+
+        return MessagePreviewStore.instance.getPreviewForRoom(this.props.room, this.props.tag);
+    }
+
+    private scrollIntoView = () => {
+        if (!this.roomTileRef.current) return;
+        this.roomTileRef.current.scrollIntoView({
+            block: "nearest",
+            behavior: "auto",
+        });
+    };
+
+    private onTileClick = (ev: React.KeyboardEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+        dis.dispatch({
+            action: 'view_room',
+            show_room_tile: true, // make sure the room is visible in the list
+            room_id: this.props.room.roomId,
+            clear_search: (ev && (ev.key === Key.ENTER || ev.key === Key.SPACE)),
+        });
+    };
+
+    private onActiveRoomUpdate = (isActive: boolean) => {
+        this.setState({selected: isActive});
+    };
+
+    private onNotificationsMenuOpenClick = (ev: React.MouseEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+        const target = ev.target as HTMLButtonElement;
+        this.setState({notificationsMenuPosition: target.getBoundingClientRect()});
+    };
+
+    private onCloseNotificationsMenu = () => {
+        this.setState({notificationsMenuPosition: null});
+    };
+
+    private onGeneralMenuOpenClick = (ev: React.MouseEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+        const target = ev.target as HTMLButtonElement;
+        this.setState({generalMenuPosition: target.getBoundingClientRect()});
+    };
+
+    private onContextMenu = (ev: React.MouseEvent) => {
+        // If we don't have a context menu to show, ignore the action.
+        if (!this.showContextMenu) return;
+
+        ev.preventDefault();
+        ev.stopPropagation();
+        this.setState({
+            generalMenuPosition: {
+                left: ev.clientX,
+                bottom: ev.clientY,
+            },
+        });
+    };
+
+    private onCloseGeneralMenu = () => {
+        this.setState({generalMenuPosition: null});
+    };
+
+    private onTagRoom = (ev: ButtonEvent, tagId: TagID) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        if (tagId === DefaultTagID.Favourite || tagId === DefaultTagID.LowPriority) {
+            const inverseTag = tagId === DefaultTagID.Favourite ? DefaultTagID.LowPriority : DefaultTagID.Favourite;
+            const isApplied = RoomListStore.instance.getTagsForRoom(this.props.room).includes(tagId);
+            const removeTag = isApplied ? tagId : inverseTag;
+            const addTag = isApplied ? null : tagId;
+            dis.dispatch(RoomListActions.tagRoom(
+                MatrixClientPeg.get(),
+                this.props.room,
+                removeTag,
+                addTag,
+                undefined,
+                0
+            ));
+        } else {
+            console.warn(`Unexpected tag ${tagId} applied to ${this.props.room.room_id}`);
+        }
+
+        if ((ev as React.KeyboardEvent).key === Key.ENTER) {
+            // Implements https://www.w3.org/TR/wai-aria-practices/#keyboard-interaction-12
+            this.setState({generalMenuPosition: null}); // hide the menu
+        }
+    };
+
+    private onLeaveRoomClick = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        dis.dispatch({
+            action: 'leave_room',
+            room_id: this.props.room.roomId,
+        });
+        this.setState({generalMenuPosition: null}); // hide the menu
+    };
+
+    private onForgetRoomClick = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        dis.dispatch({
+            action: 'forget_room',
+            room_id: this.props.room.roomId,
+        });
+        this.setState({generalMenuPosition: null}); // hide the menu
+    };
+
+    private onOpenRoomSettings = (ev: ButtonEvent) => {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        dis.dispatch({
+            action: 'open_room_settings',
+            room_id: this.props.room.roomId,
+        });
+        this.setState({generalMenuPosition: null}); // hide the menu
+    };
+
+    private async saveNotifState(ev: ButtonEvent, newState: Volume) {
+        ev.preventDefault();
+        ev.stopPropagation();
+        if (MatrixClientPeg.get().isGuest()) return;
+
+        this.roomProps.notificationVolume = newState;
+
+        const key = (ev as React.KeyboardEvent).key;
+        if (key === Key.ENTER) {
+            // Implements https://www.w3.org/TR/wai-aria-practices/#keyboard-interaction-12
+            this.setState({notificationsMenuPosition: null}); // hide the menu
+        }
+    }
+
+    private onClickAllNotifs = ev => this.saveNotifState(ev, ALL_MESSAGES);
+    private onClickAlertMe = ev => this.saveNotifState(ev, ALL_MESSAGES_LOUD);
+    private onClickMentions = ev => this.saveNotifState(ev, MENTIONS_ONLY);
+    private onClickMute = ev => this.saveNotifState(ev, MUTE);
+
+    private renderNotificationsMenu(isActive: boolean): React.ReactElement {
+        if (MatrixClientPeg.get().isGuest() || this.props.tag === DefaultTagID.Archived ||
+            !this.showContextMenu || this.props.isMinimized
+        ) {
+            // the menu makes no sense in these cases so do not show one
+            return null;
+        }
+
+        const state = this.roomProps.notificationVolume;
+
+        let contextMenu = null;
+        if (this.state.notificationsMenuPosition) {
+            contextMenu = <IconizedContextMenu
+                {...contextMenuBelow(this.state.notificationsMenuPosition)}
+                onFinished={this.onCloseNotificationsMenu}
+                className="mx_RoomTile_contextMenu"
+                compact
+            >
+                <IconizedContextMenuOptionList first>
+                    <IconizedContextMenuRadio
+                        label={_t("Use default")}
+                        active={state === ALL_MESSAGES}
+                        iconClassName="mx_RoomTile_iconBell"
+                        onClick={this.onClickAllNotifs}
+                    />
+                    <IconizedContextMenuRadio
+                        label={_t("All messages")}
+                        active={state === ALL_MESSAGES_LOUD}
+                        iconClassName="mx_RoomTile_iconBellDot"
+                        onClick={this.onClickAlertMe}
+                    />
+                    <IconizedContextMenuRadio
+                        label={_t("Mentions & Keywords")}
+                        active={state === MENTIONS_ONLY}
+                        iconClassName="mx_RoomTile_iconBellMentions"
+                        onClick={this.onClickMentions}
+                    />
+                    <IconizedContextMenuRadio
+                        label={_t("None")}
+                        active={state === MUTE}
+                        iconClassName="mx_RoomTile_iconBellCrossed"
+                        onClick={this.onClickMute}
+                    />
+                </IconizedContextMenuOptionList>
+            </IconizedContextMenu>;
+        }
+
+        const classes = classNames("mx_RoomTile_notificationsButton", {
+            // Show bell icon for the default case too.
+            mx_RoomTile_iconBell: state === ALL_MESSAGES,
+            mx_RoomTile_iconBellDot: state === ALL_MESSAGES_LOUD,
+            mx_RoomTile_iconBellMentions: state === MENTIONS_ONLY,
+            mx_RoomTile_iconBellCrossed: state === MUTE,
+
+            // Only show the icon by default if the room is overridden to muted.
+            // TODO: [FTUE Notifications] Probably need to detect global mute state
+            mx_RoomTile_notificationsButton_show: state === MUTE,
+        });
+
+        return (
+            <React.Fragment>
+                <ContextMenuTooltipButton
+                    className={classes}
+                    onClick={this.onNotificationsMenuOpenClick}
+                    title={_t("Notification options")}
+                    isExpanded={!!this.state.notificationsMenuPosition}
+                    tabIndex={isActive ? 0 : -1}
+                />
+                {contextMenu}
+            </React.Fragment>
+        );
+    }
+
+    private renderGeneralMenu(): React.ReactElement {
+        if (!this.showContextMenu) return null; // no menu to show
+
+        let contextMenu = null;
+        if (this.state.generalMenuPosition && this.props.tag === DefaultTagID.Archived) {
+            contextMenu = <IconizedContextMenu
+                {...contextMenuBelow(this.state.generalMenuPosition)}
+                onFinished={this.onCloseGeneralMenu}
+                className="mx_RoomTile_contextMenu"
+                compact
+            >
+                <IconizedContextMenuOptionList red>
+                    <IconizedContextMenuOption
+                        iconClassName="mx_RoomTile_iconSignOut"
+                        label={_t("Forget Room")}
+                        onClick={this.onForgetRoomClick}
+                    />
+                </IconizedContextMenuOptionList>
+            </IconizedContextMenu>;
+        } else if (this.state.generalMenuPosition) {
+            const roomTags = RoomListStore.instance.getTagsForRoom(this.props.room);
+
+            const isFavorite = roomTags.includes(DefaultTagID.Favourite);
+            const favouriteLabel = isFavorite ? _t("Favourited") : _t("Favourite");
+
+            const isLowPriority = roomTags.includes(DefaultTagID.LowPriority);
+            const lowPriorityLabel = _t("Low Priority");
+
+            contextMenu = <IconizedContextMenu
+                {...contextMenuBelow(this.state.generalMenuPosition)}
+                onFinished={this.onCloseGeneralMenu}
+                className="mx_RoomTile_contextMenu"
+                compact
+            >
+                <IconizedContextMenuOptionList>
+                    <IconizedContextMenuCheckbox
+                        onClick={(e) => this.onTagRoom(e, DefaultTagID.Favourite)}
+                        active={isFavorite}
+                        label={favouriteLabel}
+                        iconClassName="mx_RoomTile_iconStar"
+                    />
+                    <IconizedContextMenuCheckbox
+                        onClick={(e) => this.onTagRoom(e, DefaultTagID.LowPriority)}
+                        active={isLowPriority}
+                        label={lowPriorityLabel}
+                        iconClassName="mx_RoomTile_iconArrowDown"
+                    />
+
+                    <IconizedContextMenuOption
+                        onClick={this.onOpenRoomSettings}
+                        label={_t("Settings")}
+                        iconClassName="mx_RoomTile_iconSettings"
+                    />
+                </IconizedContextMenuOptionList>
+                <IconizedContextMenuOptionList red>
+                    <IconizedContextMenuOption
+                        onClick={this.onLeaveRoomClick}
+                        label={_t("Leave Room")}
+                        iconClassName="mx_RoomTile_iconSignOut"
+                    />
+                </IconizedContextMenuOptionList>
+            </IconizedContextMenu>;
+        }
+
+        return (
+            <React.Fragment>
+                <ContextMenuTooltipButton
+                    className="mx_RoomTile_menuButton"
+                    onClick={this.onGeneralMenuOpenClick}
+                    title={_t("Room options")}
+                    isExpanded={!!this.state.generalMenuPosition}
+                />
+                {contextMenu}
+            </React.Fragment>
+        );
+    }
+
+    public render(): React.ReactElement {
+        const classes = classNames({
+            'mx_RoomTile': true,
+            'mx_RoomTile_selected': this.state.selected,
+            'mx_RoomTile_hasMenuOpen': !!(this.state.generalMenuPosition || this.state.notificationsMenuPosition),
+            'mx_RoomTile_minimized': this.props.isMinimized,
+        });
+
+        const roomAvatar = <DecoratedRoomAvatar
+            room={this.props.room}
+            avatarSize={32}
+            tag={this.props.tag}
+            displayBadge={this.props.isMinimized}
+        />;
+
+        let badge: React.ReactNode;
+        if (!this.props.isMinimized) {
+            // aria-hidden because we summarise the unread count/highlight status in a manual aria-label below
+            badge = (
+                <div className="mx_RoomTile_badgeContainer" aria-hidden="true">
+                    <NotificationBadge
+                        notification={this.notificationState}
+                        forceCount={false}
+                        roomId={this.props.room.roomId}
+                    />
+                </div>
+            );
+        }
+
+        let name = this.props.room.name;
+        if (typeof name !== 'string') name = '';
+        name = name.replace(":", ":\u200b"); // add a zero-width space to allow linewrapping after the colon
+
+        let messagePreview = null;
+        if (this.showMessagePreview && this.state.messagePreview) {
+            messagePreview = (
+                <div className="mx_RoomTile_messagePreview" id={messagePreviewId(this.props.room.roomId)}>
+                    {this.state.messagePreview}
+                </div>
+            );
+        }
+
+        const nameClasses = classNames({
+            "mx_RoomTile_name": true,
+            "mx_RoomTile_nameWithPreview": !!messagePreview,
+            "mx_RoomTile_nameHasUnreadEvents": this.notificationState.isUnread,
+        });
+
+        let nameContainer = (
+            <div className="mx_RoomTile_nameContainer">
+                <div title={name} className={nameClasses} tabIndex={-1} dir="auto">
+                    {name}
+                </div>
+                {messagePreview}
+            </div>
+        );
+        if (this.props.isMinimized) nameContainer = null;
+
+        let ariaLabel = name;
+        // The following labels are written in such a fashion to increase screen reader efficiency (speed).
+        if (this.props.tag === DefaultTagID.Invite) {
+            // append nothing
+        } else if (this.notificationState.hasMentions) {
+            ariaLabel += " " + _t("%(count)s unread messages including mentions.", {
+                count: this.notificationState.count,
+            });
+        } else if (this.notificationState.hasUnreadCount) {
+            ariaLabel += " " + _t("%(count)s unread messages.", {
+                count: this.notificationState.count,
+            });
+        } else if (this.notificationState.isUnread) {
+            ariaLabel += " " + _t("Unread messages.");
+        }
+
+        let ariaDescribedBy: string;
+        if (this.showMessagePreview) {
+            ariaDescribedBy = messagePreviewId(this.props.room.roomId);
+        }
+
+        const props: Partial<React.ComponentProps<typeof AccessibleTooltipButton>> = {};
+        let Button: React.ComponentType<React.ComponentProps<typeof AccessibleButton>> = AccessibleButton;
+        if (this.props.isMinimized) {
+            Button = AccessibleTooltipButton;
+            props.title = name;
+            // force the tooltip to hide whilst we are showing the context menu
+            props.forceHide = !!this.state.generalMenuPosition;
+        }
+
+        return (
+            <React.Fragment>
+                <RovingTabIndexWrapper inputRef={this.roomTileRef}>
+                    {({onFocus, isActive, ref}) =>
+                        <Button
+                            {...props}
+                            onFocus={onFocus}
+                            tabIndex={isActive ? 0 : -1}
+                            inputRef={ref}
+                            className={classes}
+                            onClick={this.onTileClick}
+                            onContextMenu={this.onContextMenu}
+                            role="treeitem"
+                            aria-label={ariaLabel}
+                            aria-selected={this.state.selected}
+                            aria-describedby={ariaDescribedBy}
+                        >
+                            {roomAvatar}
+                            {nameContainer}
+                            {badge}
+                            {this.renderGeneralMenu()}
+                            {this.renderNotificationsMenu(isActive)}
+                        </Button>
+                    }
+                </RovingTabIndexWrapper>
+            </React.Fragment>
+        );
+    }
+}
diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index 233bb110be..6a7b2fc753 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -16,7 +16,7 @@ limitations under the License.
 */
 import React from 'react';
 import PropTypes from 'prop-types';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import EditorModel from '../../../editor/model';
 import {
     htmlSerializeIfNeeded,
@@ -29,7 +29,6 @@ import {
 } from '../../../editor/serialize';
 import {CommandPartCreator} from '../../../editor/parts';
 import BasicMessageComposer from "./BasicMessageComposer";
-import ReplyPreview from "./ReplyPreview";
 import RoomViewStore from '../../../stores/RoomViewStore';
 import ReplyThread from "../elements/ReplyThread";
 import {parseEvent} from '../../../editor/deserialize';
@@ -44,6 +43,7 @@ import {Key} from "../../../Keyboard";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import RateLimitedFunc from '../../../ratelimitedfunc';
+import {Action} from "../../../dispatcher/actions";
 
 function addReplyToMessageContent(content, repliedToEvent, permalinkCreator) {
     const replyContent = ReplyThread.makeReplyMixIn(repliedToEvent);
@@ -312,6 +312,7 @@ export default class SendMessageComposer extends React.Component {
                     event: null,
                 });
             }
+            dis.dispatch({action: "message_sent"});
         }
 
         this.sendHistoryManager.save(this.model);
@@ -322,13 +323,8 @@ export default class SendMessageComposer extends React.Component {
         this._clearStoredEditorState();
     }
 
-    componentDidMount() {
-        this._editorRef.getEditableRootNode().addEventListener("paste", this._onPaste, true);
-    }
-
     componentWillUnmount() {
         dis.unregister(this.dispatcherRef);
-        this._editorRef.getEditableRootNode().removeEventListener("paste", this._onPaste, true);
     }
 
     // TODO: [REACT-WARNING] Move this to constructor
@@ -368,7 +364,7 @@ export default class SendMessageComposer extends React.Component {
     onAction = (payload) => {
         switch (payload.action) {
             case 'reply_to_event':
-            case 'focus_composer':
+            case Action.FocusComposer:
                 this._editorRef && this._editorRef.focus();
                 break;
             case 'insert_mention':
@@ -377,6 +373,9 @@ export default class SendMessageComposer extends React.Component {
             case 'quote':
                 this._insertQuotedMessage(payload.event);
                 break;
+            case 'insert_emoji':
+                this._insertEmoji(payload.emoji);
+                break;
         }
     };
 
@@ -414,9 +413,22 @@ export default class SendMessageComposer extends React.Component {
         this._editorRef && this._editorRef.focus();
     }
 
+    _insertEmoji = (emoji) => {
+        const {model} = this;
+        const {partCreator} = model;
+        const caret = this._editorRef.getCaret();
+        const position = model.positionForOffset(caret.offset, caret.atNodeEnd);
+        model.transform(() => {
+            const addedLen = model.insert([partCreator.plain(emoji)], position);
+            return model.positionForOffset(caret.offset + addedLen, true);
+        });
+    };
+
     _onPaste = (event) => {
         const {clipboardData} = event;
-        if (clipboardData.files.length) {
+        // Prioritize text on the clipboard over files as Office on macOS puts a bitmap
+        // in the clipboard as well as the content being copied.
+        if (clipboardData.files.length && !clipboardData.types.some(t => t === "text/plain")) {
             // This actually not so much for 'files' as such (at time of writing
             // neither chrome nor firefox let you paste a plain file copied
             // from Finder) but more images copied from a different website
@@ -424,15 +436,13 @@ export default class SendMessageComposer extends React.Component {
             ContentMessages.sharedInstance().sendContentListToRoom(
                 Array.from(clipboardData.files), this.props.room.roomId, this.context,
             );
+            return true; // to skip internal onPaste handler
         }
     }
 
     render() {
         return (
             <div className="mx_SendMessageComposer" onClick={this.focusComposer} onKeyDown={this._onKeyDown}>
-                <div className="mx_SendMessageComposer_overlayWrapper">
-                    <ReplyPreview permalinkCreator={this.props.permalinkCreator} />
-                </div>
                 <BasicMessageComposer
                     ref={this._setEditorRef}
                     model={this.model}
@@ -440,6 +450,7 @@ export default class SendMessageComposer extends React.Component {
                     label={this.props.placeholder}
                     placeholder={this.props.placeholder}
                     onChange={this._saveStoredEditorState}
+                    onPaste={this._onPaste}
                 />
             </div>
         );
diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 9d91ab04b3..dba25a94cf 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -14,11 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import React from 'react';
+import classNames from 'classnames';
 import {_t, _td} from '../../../languageHandler';
 import AppTile from '../elements/AppTile';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import AccessibleButton from '../elements/AccessibleButton';
 import WidgetUtils from '../../../utils/WidgetUtils';
 import ActiveWidgetStore from '../../../stores/ActiveWidgetStore';
@@ -27,6 +28,8 @@ import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
 import SettingsStore from "../../../settings/SettingsStore";
 import {ContextMenu} from "../../structures/ContextMenu";
 import {WidgetType} from "../../../widgets/WidgetType";
+import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
+import {Action} from "../../../dispatcher/actions";
 
 // This should be below the dialog level (4000), but above the rest of the UI (1000-2000).
 // We sit in a context menu, so this should be given to the context menu.
@@ -180,7 +183,7 @@ export default class Stickerpicker extends React.Component {
             case "stickerpicker_close":
                 this.setState({showStickers: false});
                 break;
-            case "after_right_panel_phase_change":
+            case Action.AfterRightPanelPhaseChange:
             case "show_left_panel":
             case "hide_left_panel":
                 this.setState({showStickers: false});
@@ -360,7 +363,7 @@ export default class Stickerpicker extends React.Component {
      */
     _launchManageIntegrations() {
         // TODO: Open the right integration manager for the widget
-        if (SettingsStore.isFeatureEnabled("feature_many_integration_managers")) {
+        if (SettingsStore.getValue("feature_many_integration_managers")) {
             IntegrationManagers.sharedInstance().openAll(
                 this.props.room,
                 `type_${WidgetType.STICKERPICKER.preferred}`,
@@ -378,14 +381,21 @@ export default class Stickerpicker extends React.Component {
     render() {
         let stickerPicker;
         let stickersButton;
+        const className = classNames(
+            "mx_MessageComposer_button",
+            "mx_MessageComposer_stickers",
+            "mx_Stickers_hideStickers",
+            "mx_MessageComposer_button_highlight",
+        );
         if (this.state.showStickers) {
             // Show hide-stickers button
             stickersButton =
                 <AccessibleButton
                     id='stickersButton'
                     key="controls_hide_stickers"
-                    className="mx_MessageComposer_button mx_MessageComposer_stickers mx_Stickers_hideStickers"
+                    className={className}
                     onClick={this._onHideStickersClick}
+                    active={this.state.showStickers}
                     title={_t("Hide Stickers")}
                 >
                 </AccessibleButton>;
@@ -409,14 +419,14 @@ export default class Stickerpicker extends React.Component {
         } else {
             // Show show-stickers button
             stickersButton =
-                <AccessibleButton
+                <AccessibleTooltipButton
                     id='stickersButton'
                     key="controls_show_stickers"
                     className="mx_MessageComposer_button mx_MessageComposer_stickers"
                     onClick={this._onShowStickersClick}
                     title={_t("Show Stickers")}
                 >
-                </AccessibleButton>;
+                </AccessibleTooltipButton>;
         }
         return <React.Fragment>
             { stickersButton }
diff --git a/src/components/views/rooms/TemporaryTile.tsx b/src/components/views/rooms/TemporaryTile.tsx
new file mode 100644
index 0000000000..a61ff6e1da
--- /dev/null
+++ b/src/components/views/rooms/TemporaryTile.tsx
@@ -0,0 +1,119 @@
+/*
+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 classNames from "classnames";
+import {
+    RovingAccessibleButton,
+    RovingAccessibleTooltipButton,
+    RovingTabIndexWrapper
+} from "../../../accessibility/RovingTabIndex";
+import AccessibleButton from "../../views/elements/AccessibleButton";
+import NotificationBadge from "./NotificationBadge";
+import { NotificationState } from "../../../stores/notifications/NotificationState";
+
+interface IProps {
+    isMinimized: boolean;
+    isSelected: boolean;
+    displayName: string;
+    avatar: React.ReactElement;
+    notificationState: NotificationState;
+    onClick: () => void;
+}
+
+interface IState {
+    hover: boolean;
+}
+
+// TODO: Remove with community invites in the room list: https://github.com/vector-im/element-web/issues/14456
+export default class TemporaryTile extends React.Component<IProps, IState> {
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            hover: false,
+        };
+    }
+
+    private onTileMouseEnter = () => {
+        this.setState({hover: true});
+    };
+
+    private onTileMouseLeave = () => {
+        this.setState({hover: false});
+    };
+
+    public render(): React.ReactElement {
+        // XXX: We copy classes because it's easier
+        const classes = classNames({
+            'mx_RoomTile': true,
+            'mx_TemporaryTile': true,
+            'mx_RoomTile_selected': this.props.isSelected,
+            'mx_RoomTile_minimized': this.props.isMinimized,
+        });
+
+        const badge = (
+            <NotificationBadge
+                notification={this.props.notificationState}
+                forceCount={false}
+            />
+        );
+
+        let name = this.props.displayName;
+        if (typeof name !== 'string') name = '';
+        name = name.replace(":", ":\u200b"); // add a zero-width space to allow linewrapping after the colon
+
+        const nameClasses = classNames({
+            "mx_RoomTile_name": true,
+            "mx_RoomTile_nameHasUnreadEvents": this.props.notificationState.isUnread,
+        });
+
+        let nameContainer = (
+            <div className="mx_RoomTile_nameContainer">
+                <div title={name} className={nameClasses} tabIndex={-1} dir="auto">
+                    {name}
+                </div>
+            </div>
+        );
+        if (this.props.isMinimized) nameContainer = null;
+
+        let Button = RovingAccessibleButton;
+        if (this.props.isMinimized) {
+            Button = RovingAccessibleTooltipButton;
+        }
+
+        return (
+            <React.Fragment>
+                <Button
+                    className={classes}
+                    onMouseEnter={this.onTileMouseEnter}
+                    onMouseLeave={this.onTileMouseLeave}
+                    onClick={this.props.onClick}
+                    role="treeitem"
+                    title={this.props.isMinimized ? name : undefined}
+                >
+                    <div className="mx_RoomTile_avatarContainer">
+                        {this.props.avatar}
+                    </div>
+                    {nameContainer}
+                    <div className="mx_RoomTile_badgeContainer">
+                        {badge}
+                    </div>
+                </Button>
+            </React.Fragment>
+        );
+    }
+}
diff --git a/src/components/views/rooms/ThirdPartyMemberInfo.js b/src/components/views/rooms/ThirdPartyMemberInfo.js
index 3e6ed16aa4..3a7042ebd2 100644
--- a/src/components/views/rooms/ThirdPartyMemberInfo.js
+++ b/src/components/views/rooms/ThirdPartyMemberInfo.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {MatrixEvent} from "matrix-js-sdk";
 import {_t} from "../../../languageHandler";
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 import * as sdk from "../../../index";
 import Modal from "../../../Modal";
 import {isValid3pidInvite} from "../../../RoomInvite";
diff --git a/src/components/views/rooms/UserOnlineDot.js b/src/components/views/rooms/UserOnlineDot.js
deleted file mode 100644
index 426dd1bf64..0000000000
--- a/src/components/views/rooms/UserOnlineDot.js
+++ /dev/null
@@ -1,48 +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, {useContext, useEffect, useMemo, useState, useCallback} from "react";
-import PropTypes from "prop-types";
-
-import {useEventEmitter} from "../../../hooks/useEventEmitter";
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
-
-const UserOnlineDot = ({userId}) => {
-    const cli = useContext(MatrixClientContext);
-    const user = useMemo(() => cli.getUser(userId), [cli, userId]);
-
-    const [isOnline, setIsOnline] = useState(false);
-
-    // Recheck if the user or client changes
-    useEffect(() => {
-        setIsOnline(user && (user.currentlyActive || user.presence === "online"));
-    }, [cli, user]);
-    // Recheck also if we receive a User.currentlyActive event
-    const currentlyActiveHandler = useCallback((ev) => {
-        const content = ev.getContent();
-        setIsOnline(content.currently_active || content.presence === "online");
-    }, []);
-    useEventEmitter(user, "User.currentlyActive", currentlyActiveHandler);
-    useEventEmitter(user, "User.presence", currentlyActiveHandler);
-
-    return isOnline ? <span className="mx_UserOnlineDot" /> : null;
-};
-
-UserOnlineDot.propTypes = {
-    userId: PropTypes.string.isRequired,
-};
-
-export default UserOnlineDot;
diff --git a/src/components/views/settings/AvatarSetting.js b/src/components/views/settings/AvatarSetting.js
index 261a832158..888d99ca49 100644
--- a/src/components/views/settings/AvatarSetting.js
+++ b/src/components/views/settings/AvatarSetting.js
@@ -48,7 +48,6 @@ const AvatarSetting = ({avatarUrl, avatarAltText, avatarName, uploadAvatar, remo
     if (uploadAvatar) {
         // insert an empty div to be the host for a css mask containing the upload.svg
         uploadAvatarBtn = <AccessibleButton onClick={uploadAvatar} kind="primary">
-            <div>&nbsp;</div>
             {_t("Upload")}
         </AccessibleButton>;
     }
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index 7c88573e9c..47fcae5c6f 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@@ -20,7 +20,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 import AccessibleButton from '../elements/AccessibleButton';
 import { _t } from '../../../languageHandler';
 import * as sdk from "../../../index";
@@ -119,8 +119,8 @@ export default createReactClass({
                         'In future this will be improved.',
                     ) }
                     {' '}
-                    <a href="https://github.com/vector-im/riot-web/issues/2671" target="_blank" rel="noreferrer noopener">
-                        https://github.com/vector-im/riot-web/issues/2671
+                    <a href="https://github.com/vector-im/element-web/issues/2671" target="_blank" rel="noreferrer noopener">
+                        https://github.com/vector-im/element-web/issues/2671
                     </a>
                 </div>,
             button: _t("Continue"),
@@ -141,6 +141,12 @@ export default createReactClass({
     _changePassword: function(cli, oldPassword, newPassword) {
         const authDict = {
             type: 'm.login.password',
+            identifier: {
+                type: 'm.id.user',
+                user: cli.credentials.userId,
+            },
+            // TODO: Remove `user` once servers support proper UIA
+            // See https://github.com/matrix-org/synapse/issues/5665
             user: cli.credentials.userId,
             password: oldPassword,
         };
diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index cb04d2a018..1c6baee9af 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -32,11 +32,11 @@ export default class CrossSigningPanel extends React.PureComponent {
             error: null,
             crossSigningPublicKeysOnDevice: false,
             crossSigningPrivateKeysInStorage: false,
+            masterPrivateKeyCached: false,
             selfSigningPrivateKeyCached: false,
             userSigningPrivateKeyCached: false,
             sessionBackupKeyCached: false,
             secretStorageKeyInAccount: false,
-            secretStorageKeyNeedsUpgrade: null,
         };
     }
 
@@ -79,6 +79,7 @@ export default class CrossSigningPanel extends React.PureComponent {
         const secretStorage = cli._crypto._secretStorage;
         const crossSigningPublicKeysOnDevice = crossSigning.getId();
         const crossSigningPrivateKeysInStorage = await crossSigning.isStoredInSecretStorage(secretStorage);
+        const masterPrivateKeyCached = !!(pkCache && await pkCache.getCrossSigningKeyCache("master"));
         const selfSigningPrivateKeyCached = !!(pkCache && await pkCache.getCrossSigningKeyCache("self_signing"));
         const userSigningPrivateKeyCached = !!(pkCache && await pkCache.getCrossSigningKeyCache("user_signing"));
         const sessionBackupKeyFromCache = await cli._crypto.getSessionBackupPrivateKey();
@@ -88,11 +89,11 @@ export default class CrossSigningPanel extends React.PureComponent {
         const homeserverSupportsCrossSigning =
             await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing");
         const crossSigningReady = await cli.isCrossSigningReady();
-        const secretStorageKeyNeedsUpgrade = await cli.secretStorageKeyNeedsUpgrade();
 
         this.setState({
             crossSigningPublicKeysOnDevice,
             crossSigningPrivateKeysInStorage,
+            masterPrivateKeyCached,
             selfSigningPrivateKeyCached,
             userSigningPrivateKeyCached,
             sessionBackupKeyCached,
@@ -100,7 +101,6 @@ export default class CrossSigningPanel extends React.PureComponent {
             secretStorageKeyInAccount,
             homeserverSupportsCrossSigning,
             crossSigningReady,
-            secretStorageKeyNeedsUpgrade,
         });
     }
 
@@ -131,8 +131,8 @@ export default class CrossSigningPanel extends React.PureComponent {
     }
 
     _destroySecureSecretStorage = () => {
-        const ConfirmDestoryCrossSigningDialog = sdk.getComponent("dialogs.ConfirmDestroyCrossSigningDialog");
-        Modal.createDialog(ConfirmDestoryCrossSigningDialog, {
+        const ConfirmDestroyCrossSigningDialog = sdk.getComponent("dialogs.ConfirmDestroyCrossSigningDialog");
+        Modal.createDialog(ConfirmDestroyCrossSigningDialog, {
             onFinished: this.onDestroyStorage,
         });
     }
@@ -143,6 +143,7 @@ export default class CrossSigningPanel extends React.PureComponent {
             error,
             crossSigningPublicKeysOnDevice,
             crossSigningPrivateKeysInStorage,
+            masterPrivateKeyCached,
             selfSigningPrivateKeyCached,
             userSigningPrivateKeyCached,
             sessionBackupKeyCached,
@@ -150,7 +151,6 @@ export default class CrossSigningPanel extends React.PureComponent {
             secretStorageKeyInAccount,
             homeserverSupportsCrossSigning,
             crossSigningReady,
-            secretStorageKeyNeedsUpgrade,
         } = this.state;
 
         let errorSection;
@@ -158,13 +158,6 @@ export default class CrossSigningPanel extends React.PureComponent {
             errorSection = <div className="error">{error.toString()}</div>;
         }
 
-        // Whether the various keys exist on your account (but not necessarily
-        // on this device).
-        const enabledForAccount = (
-            crossSigningPrivateKeysInStorage &&
-            secretStorageKeyInAccount
-        );
-
         let summarisedStatus;
         if (homeserverSupportsCrossSigning === undefined) {
             const InlineSpinner = sdk.getComponent('views.elements.InlineSpinner');
@@ -188,8 +181,19 @@ export default class CrossSigningPanel extends React.PureComponent {
             )}</p>;
         }
 
+        const keysExistAnywhere = (
+            secretStorageKeyInAccount ||
+            crossSigningPrivateKeysInStorage ||
+            crossSigningPublicKeysOnDevice
+        );
+        const keysExistEverywhere = (
+            secretStorageKeyInAccount &&
+            crossSigningPrivateKeysInStorage &&
+            crossSigningPublicKeysOnDevice
+        );
+
         let resetButton;
-        if (enabledForAccount) {
+        if (keysExistAnywhere) {
             resetButton = (
                 <div className="mx_CrossSigningPanel_buttonRow">
                     <AccessibleButton kind="danger" onClick={this._destroySecureSecretStorage}>
@@ -198,11 +202,10 @@ export default class CrossSigningPanel extends React.PureComponent {
                 </div>
             );
         }
+
+        // TODO: determine how better to expose this to users in addition to prompts at login/toast
         let bootstrapButton;
-        if (
-            (!enabledForAccount || !crossSigningPublicKeysOnDevice) &&
-            homeserverSupportsCrossSigning
-        ) {
+        if (!keysExistEverywhere && homeserverSupportsCrossSigning) {
             bootstrapButton = (
                 <div className="mx_CrossSigningPanel_buttonRow">
                     <AccessibleButton kind="primary" onClick={this._onBootstrapClick}>
@@ -236,6 +239,10 @@ export default class CrossSigningPanel extends React.PureComponent {
                             <td>{_t("Cross-signing private keys:")}</td>
                             <td>{crossSigningPrivateKeysInStorage ? _t("in secret storage") : _t("not found")}</td>
                         </tr>
+                        <tr>
+                            <td>{_t("Master private key:")}</td>
+                            <td>{masterPrivateKeyCached ? _t("cached locally") : _t("not found locally")}</td>
+                        </tr>
                         <tr>
                             <td>{_t("Self signing private key:")}</td>
                             <td>{selfSigningPrivateKeyCached ? _t("cached locally") : _t("not found locally")}</td>
@@ -259,10 +266,6 @@ export default class CrossSigningPanel extends React.PureComponent {
                             <td>{_t("Homeserver feature support:")}</td>
                             <td>{homeserverSupportsCrossSigning ? _t("exists") : _t("not found")}</td>
                         </tr>
-                        <tr>
-                            <td>{_t("Secret Storage key format:")}</td>
-                            <td>{secretStorageKeyNeedsUpgrade ? _t("outdated") : _t("up to date")}</td>
-                        </tr>
                    </tbody></table>
                 </details>
                 {errorSection}
diff --git a/src/components/views/settings/DevicesPanelEntry.js b/src/components/views/settings/DevicesPanelEntry.js
index ff3c318a92..567b144a92 100644
--- a/src/components/views/settings/DevicesPanelEntry.js
+++ b/src/components/views/settings/DevicesPanelEntry.js
@@ -21,6 +21,7 @@ import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {formatDate} from '../../../DateUtils';
+import StyledCheckbox from '../elements/StyledCheckbox';
 
 export default class DevicesPanelEntry extends React.Component {
     constructor(props) {
@@ -81,7 +82,7 @@ export default class DevicesPanelEntry extends React.Component {
                     { lastSeen }
                 </div>
                 <div className="mx_DevicesPanel_deviceButtons">
-                    <input type="checkbox" onChange={this.onDeviceToggled} checked={this.props.selected} />
+                    <StyledCheckbox onChange={this.onDeviceToggled} checked={this.props.selected} />
                 </div>
             </div>
         );
diff --git a/src/components/views/settings/E2eAdvancedPanel.js b/src/components/views/settings/E2eAdvancedPanel.js
index 709465bcb0..2ba6190a9b 100644
--- a/src/components/views/settings/E2eAdvancedPanel.js
+++ b/src/components/views/settings/E2eAdvancedPanel.js
@@ -18,7 +18,7 @@ import React from 'react';
 
 import * as sdk from '../../../index';
 import {_t} from "../../../languageHandler";
-import {SettingLevel} from "../../../settings/SettingsStore";
+import {SettingLevel} from "../../../settings/SettingLevel";
 
 const SETTING_MANUALLY_VERIFY_ALL_SESSIONS = "e2ee.manuallyVerifyAllSessions";
 
diff --git a/src/components/views/settings/EnableNotificationsButton.js b/src/components/views/settings/EnableNotificationsButton.js
deleted file mode 100644
index 9ca591f30e..0000000000
--- a/src/components/views/settings/EnableNotificationsButton.js
+++ /dev/null
@@ -1,75 +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 createReactClass from 'create-react-class';
-import Notifier from "../../../Notifier";
-import dis from "../../../dispatcher";
-import { _t } from '../../../languageHandler';
-
-export default createReactClass({
-    displayName: 'EnableNotificationsButton',
-
-    componentDidMount: function() {
-        this.dispatcherRef = dis.register(this.onAction);
-    },
-
-    componentWillUnmount: function() {
-        dis.unregister(this.dispatcherRef);
-    },
-
-    onAction: function(payload) {
-        if (payload.action !== "notifier_enabled") {
-            return;
-        }
-        this.forceUpdate();
-    },
-
-    enabled: function() {
-        return Notifier.isEnabled();
-    },
-
-    onClick: function() {
-        const self = this;
-        if (!Notifier.supportsDesktopNotifications()) {
-            return;
-        }
-        if (!Notifier.isEnabled()) {
-            Notifier.setEnabled(true, function() {
-                self.forceUpdate();
-            });
-        } else {
-            Notifier.setEnabled(false);
-        }
-        this.forceUpdate();
-    },
-
-    render: function() {
-        if (this.enabled()) {
-            return (
-                <button className="mx_EnableNotificationsButton" onClick={this.onClick}>
-                    { _t("Disable Notifications") }
-                </button>
-            );
-        } else {
-            return (
-                <button className="mx_EnableNotificationsButton" onClick={this.onClick}>
-                    { _t("Enable Notifications") }
-                </button>
-            );
-        }
-    },
-});
diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index 6b084c2579..8598a2a966 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -17,12 +17,14 @@ limitations under the License.
 import React from 'react';
 
 import { _t } from '../../../languageHandler';
+import SdkConfig from "../../../SdkConfig";
 import * as sdk from '../../../index';
 import Modal from '../../../Modal';
-import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
+import SettingsStore from "../../../settings/SettingsStore";
 import AccessibleButton from "../elements/AccessibleButton";
 import {formatBytes, formatCountLong} from "../../../utils/FormattingUtils";
 import EventIndexPeg from "../../../indexing/EventIndexPeg";
+import {SettingLevel} from "../../../settings/SettingLevel";
 
 export default class EventIndexPanel extends React.Component {
     constructor() {
@@ -121,6 +123,7 @@ export default class EventIndexPanel extends React.Component {
     render() {
         let eventIndexingSettings = null;
         const InlineSpinner = sdk.getComponent('elements.InlineSpinner');
+        const brand = SdkConfig.get().brand;
 
         if (EventIndexPeg.get() !== null) {
             eventIndexingSettings = (
@@ -157,7 +160,7 @@ export default class EventIndexPanel extends React.Component {
             );
         } else if (EventIndexPeg.platformHasSupport() && !EventIndexPeg.supportIsInstalled()) {
             const nativeLink = (
-                "https://github.com/vector-im/riot-web/blob/develop/" +
+                "https://github.com/vector-im/element-web/blob/develop/" +
                 "docs/native-node-modules.md#" +
                 "adding-seshat-for-search-in-e2e-encrypted-rooms"
             );
@@ -165,11 +168,13 @@ export default class EventIndexPanel extends React.Component {
             eventIndexingSettings = (
                 <div className='mx_SettingsTab_subsectionText'>
                     {
-                        _t( "Riot is missing some components required for securely " +
+                        _t( "%(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 Riot Desktop " +
+                            "experiment with this feature, build a custom %(brand)s Desktop " +
                             "with <nativeLink>search components added</nativeLink>.",
-                            {},
+                            {
+                                brand,
+                            },
                             {
                                 'nativeLink': (sub) => <a href={nativeLink} target="_blank"
                                     rel="noreferrer noopener">{sub}</a>,
@@ -182,12 +187,14 @@ export default class EventIndexPanel extends React.Component {
             eventIndexingSettings = (
                 <div className='mx_SettingsTab_subsectionText'>
                     {
-                        _t( "Riot can't securely cache encrypted messages locally " +
-                            "while running in a web browser. Use <riotLink>Riot Desktop</riotLink> " +
+                        _t( "%(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.",
-                            {},
                             {
-                                'riotLink': (sub) => <a href="https://riot.im/download/desktop"
+                                brand,
+                            },
+                            {
+                                'desktopLink': (sub) => <a href="https://element.io/get-started"
                                     target="_blank" rel="noreferrer noopener">{sub}</a>,
                             },
                         )
diff --git a/src/components/views/settings/IntegrationManager.js b/src/components/views/settings/IntegrationManager.js
index a5150e3777..fd6a62d73a 100644
--- a/src/components/views/settings/IntegrationManager.js
+++ b/src/components/views/settings/IntegrationManager.js
@@ -19,7 +19,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 import {Key} from "../../../Keyboard";
 
 export default class IntegrationManager extends React.Component {
diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index fa3fa03c74..a7a2c768db 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -21,7 +21,6 @@ import * as sdk from '../../../index';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
-import SettingsStore from '../../../settings/SettingsStore';
 
 export default class KeyBackupPanel extends React.PureComponent {
     constructor(props) {
@@ -316,7 +315,7 @@ export default class KeyBackupPanel extends React.PureComponent {
                 trustedLocally = _t("This backup is trusted because it has been restored on this session");
             }
 
-            let buttonRow = (
+            const buttonRow = (
                 <div className="mx_KeyBackupPanel_buttonRow">
                     <AccessibleButton kind="primary" onClick={this._restoreBackup}>
                         {restoreButtonCaption}
@@ -326,13 +325,6 @@ export default class KeyBackupPanel extends React.PureComponent {
                     </AccessibleButton>
                 </div>
             );
-            if (this.state.backupKeyStored && !SettingsStore.getValue("feature_cross_signing")) {
-                buttonRow = <p>⚠️ {_t(
-                    "Backup key stored in secret storage, but this feature is not " +
-                    "enabled on this session. Please enable cross-signing in Labs to " +
-                    "modify key backup state.",
-                )}</p>;
-            }
 
             return <div>
                 <div>{clientBackupStatus}</div>
diff --git a/src/components/views/settings/Notifications.js b/src/components/views/settings/Notifications.js
index a3173f18bb..5c16e1ed4f 100644
--- a/src/components/views/settings/Notifications.js
+++ b/src/components/views/settings/Notifications.js
@@ -1,5 +1,6 @@
 /*
 Copyright 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.
@@ -19,7 +20,7 @@ import createReactClass from 'create-react-class';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import SettingsStore, {SettingLevel} from '../../../settings/SettingsStore';
+import SettingsStore from '../../../settings/SettingsStore';
 import Modal from '../../../Modal';
 import {
     NotificationUtils,
@@ -30,6 +31,7 @@ import {
 import SdkConfig from "../../../SdkConfig";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import AccessibleButton from "../elements/AccessibleButton";
+import {SettingLevel} from "../../../settings/SettingLevel";
 
 // TODO: this "view" component still has far too much application logic in it,
 // which should be factored out to other files.
@@ -154,7 +156,7 @@ export default createReactClass({
         let emailPusherPromise;
         if (checked) {
             const data = {};
-            data['brand'] = SdkConfig.get().brand || 'Riot';
+            data['brand'] = SdkConfig.get().brand;
             emailPusherPromise = MatrixClientPeg.get().setPusher({
                 kind: 'email',
                 app_id: 'm.email',
@@ -841,11 +843,16 @@ export default createReactClass({
 
         let advancedSettings;
         if (externalRules.length) {
+            const brand = SdkConfig.get().brand;
             advancedSettings = (
                 <div>
                     <h3>{ _t('Advanced notification settings') }</h3>
-                    { _t('There are advanced notifications which are not shown here') }.<br />
-                    { _t('You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply') }.
+                    { _t('There are advanced notifications which are not shown here.') }<br />
+                    {_t(
+                        'You might have configured them in a client other than %(brand)s. ' +
+                        'You cannot tune them in %(brand)s but they still apply.',
+                        { brand },
+                    )}
                     <ul>
                         { externalRules }
                     </ul>
diff --git a/src/components/views/settings/ProfileSettings.js b/src/components/views/settings/ProfileSettings.js
index 23ab60423a..5dbdcd4901 100644
--- a/src/components/views/settings/ProfileSettings.js
+++ b/src/components/views/settings/ProfileSettings.js
@@ -40,8 +40,8 @@ export default class ProfileSettings extends React.Component {
         if (avatarUrl) avatarUrl = client.mxcUrlToHttp(avatarUrl, 96, 96, 'crop', false);
         this.state = {
             userId: user.userId,
-            originalDisplayName: user.displayName,
-            displayName: user.displayName,
+            originalDisplayName: user.rawDisplayName,
+            displayName: user.rawDisplayName,
             originalAvatarUrl: avatarUrl,
             avatarUrl: avatarUrl,
             avatarFile: null,
diff --git a/src/components/views/settings/SetIdServer.js b/src/components/views/settings/SetIdServer.js
index cb37271452..e05fe4f1c3 100644
--- a/src/components/views/settings/SetIdServer.js
+++ b/src/components/views/settings/SetIdServer.js
@@ -21,7 +21,7 @@ import {_t} from "../../../languageHandler";
 import * as sdk from '../../../index';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import Modal from '../../../Modal';
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 import { getThreepidsWithBindStatus } from '../../../boundThreepids';
 import IdentityAuthClient from "../../../IdentityAuthClient";
 import {abbreviateUrl, unabbreviateUrl} from "../../../utils/UrlUtils";
@@ -413,7 +413,7 @@ export default class SetIdServer extends React.Component {
                     tooltipContent={this._getTooltip()}
                     tooltipClassName="mx_SetIdServer_tooltip"
                     disabled={this.state.busy}
-                    flagInvalid={!!this.state.error}
+                    forceValidity={this.state.error ? false : null}
                 />
                 <AccessibleButton type="submit" kind="primary_sm"
                     onClick={this._checkIdServer}
diff --git a/src/components/views/settings/SetIntegrationManager.js b/src/components/views/settings/SetIntegrationManager.js
index da2953482f..e6fb3f6e1c 100644
--- a/src/components/views/settings/SetIntegrationManager.js
+++ b/src/components/views/settings/SetIntegrationManager.js
@@ -18,7 +18,8 @@ import React from 'react';
 import {_t} from "../../../languageHandler";
 import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
 import * as sdk from '../../../index';
-import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
+import SettingsStore from "../../../settings/SettingsStore";
+import {SettingLevel} from "../../../settings/SettingLevel";
 
 export default class SetIntegrationManager extends React.Component {
     constructor() {
diff --git a/src/components/views/settings/UpdateCheckButton.tsx b/src/components/views/settings/UpdateCheckButton.tsx
new file mode 100644
index 0000000000..10e0e29f31
--- /dev/null
+++ b/src/components/views/settings/UpdateCheckButton.tsx
@@ -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 React, {useState} from "react";
+
+import {UpdateCheckStatus} from "../../../BasePlatform";
+import PlatformPeg from "../../../PlatformPeg";
+import {useDispatcher} from "../../../hooks/useDispatcher";
+import dis from "../../../dispatcher/dispatcher";
+import {Action} from "../../../dispatcher/actions";
+import {_t} from "../../../languageHandler";
+import InlineSpinner from "../../../components/views/elements/InlineSpinner";
+import AccessibleButton from "../../../components/views/elements/AccessibleButton";
+import {CheckUpdatesPayload} from "../../../dispatcher/payloads/CheckUpdatesPayload";
+
+function installUpdate() {
+    PlatformPeg.get().installUpdate();
+}
+
+function getStatusText(status: UpdateCheckStatus, errorDetail?: string) {
+    switch (status) {
+        case UpdateCheckStatus.Error:
+            return _t('Error encountered (%(errorDetail)s).', { errorDetail });
+        case UpdateCheckStatus.Checking:
+            return _t('Checking for an update...');
+        case UpdateCheckStatus.NotAvailable:
+            return _t('No update available.');
+        case UpdateCheckStatus.Downloading:
+            return _t('Downloading update...');
+        case UpdateCheckStatus.Ready:
+            return _t("New version available. <a>Update now.</a>", {}, {
+                a: sub => <AccessibleButton kind="link" onClick={installUpdate}>{sub}</AccessibleButton>
+            });
+    }
+}
+
+const doneStatuses = [
+    UpdateCheckStatus.Ready,
+    UpdateCheckStatus.Error,
+    UpdateCheckStatus.NotAvailable,
+];
+
+const UpdateCheckButton = () => {
+    const [state, setState] = useState<CheckUpdatesPayload>(null);
+
+    const onCheckForUpdateClick = () => {
+        setState(null);
+        PlatformPeg.get().startUpdateCheck();
+    };
+
+    useDispatcher(dis, ({action, ...params}) => {
+        if (action === Action.CheckUpdates) {
+            setState(params as CheckUpdatesPayload);
+        }
+    });
+
+    const busy = state && !doneStatuses.includes(state.status);
+
+    let suffix;
+    if (state) {
+        suffix = <span className="mx_UpdateCheckButton_summary">
+            {getStatusText(state.status, state.detail)}
+            {busy && <InlineSpinner />}
+        </span>;
+    }
+
+    return <React.Fragment>
+        <AccessibleButton onClick={onCheckForUpdateClick} kind="primary" disabled={busy}>
+            {_t("Check for update")}
+        </AccessibleButton>
+        { suffix }
+    </React.Fragment>;
+};
+
+export default UpdateCheckButton;
diff --git a/src/components/views/settings/account/PhoneNumbers.js b/src/components/views/settings/account/PhoneNumbers.js
index ad2dabd8ae..02e995ac45 100644
--- a/src/components/views/settings/account/PhoneNumbers.js
+++ b/src/components/views/settings/account/PhoneNumbers.js
@@ -267,7 +267,7 @@ export default class PhoneNumbers extends React.Component {
                             label={_t("Phone Number")}
                             autoComplete="off"
                             disabled={this.state.verifying}
-                            prefix={phoneCountry}
+                            prefixComponent={phoneCountry}
                             value={this.state.newPhoneNumber}
                             onChange={this._onChangeNewPhoneNumber}
                         />
diff --git a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
index 9ee9c8d130..2fa61a0ee6 100644
--- a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
@@ -21,7 +21,7 @@ import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import * as sdk from "../../../../..";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import Modal from "../../../../../Modal";
-import dis from "../../../../../dispatcher";
+import dis from "../../../../../dispatcher/dispatcher";
 
 export default class AdvancedRoomSettingsTab extends React.Component {
     static propTypes = {
@@ -29,8 +29,8 @@ export default class AdvancedRoomSettingsTab extends React.Component {
         closeSettingsFn: PropTypes.func.isRequired,
     };
 
-    constructor() {
-        super();
+    constructor(props) {
+        super(props);
 
         this.state = {
             // This is eventually set to the value of room.getRecommendedVersion()
diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.js b/src/components/views/settings/tabs/room/BridgeSettingsTab.tsx
similarity index 78%
rename from src/components/views/settings/tabs/room/BridgeSettingsTab.js
rename to src/components/views/settings/tabs/room/BridgeSettingsTab.tsx
index a5d20eae33..8638105cd9 100644
--- a/src/components/views/settings/tabs/room/BridgeSettingsTab.js
+++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -14,8 +14,10 @@ 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 from "react";
+import {Room} from "matrix-js-sdk/src/models/room";
+import {MatrixEvent} from "matrix-js-sdk/src/models/event";
+
 import {_t} from "../../../../../languageHandler";
 import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import BridgeTile from "../../BridgeTile";
@@ -27,28 +29,26 @@ const BRIDGE_EVENT_TYPES = [
 
 const BRIDGES_LINK = "https://matrix.org/bridges/";
 
-export default class BridgeSettingsTab extends React.Component {
-    static propTypes = {
-        roomId: PropTypes.string.isRequired,
-    };
+interface IProps {
+    roomId: string;
+}
 
-    _renderBridgeCard(event, room) {
+export default class BridgeSettingsTab extends React.Component<IProps> {
+    private renderBridgeCard(event: MatrixEvent, room: Room) {
         const content = event.getContent();
         if (!content || !content.channel || !content.protocol) {
             return null;
         }
-        return <BridgeTile room={room} ev={event}></BridgeTile>;
+        return <BridgeTile key={event.getId()} room={room} ev={event} />;
     }
 
-    static getBridgeStateEvents(roomId) {
+    static getBridgeStateEvents(roomId: string) {
         const client = MatrixClientPeg.get();
-        const roomState = (client.getRoom(roomId)).currentState;
+        const roomState = client.getRoom(roomId).currentState;
 
-        const bridgeEvents = [].concat(...BRIDGE_EVENT_TYPES.map((typeName) =>
-            Object.values(roomState.events[typeName] || {}),
+        return [].concat(...BRIDGE_EVENT_TYPES.map((typeName) =>
+            Array.from(roomState.events.get(typeName).values()),
         ));
-
-        return bridgeEvents;
     }
 
     render() {
@@ -58,8 +58,7 @@ export default class BridgeSettingsTab extends React.Component {
         const client = MatrixClientPeg.get();
         const room = client.getRoom(this.props.roomId);
 
-        let content = null;
-
+        let content: JSX.Element;
         if (bridgeEvents.length > 0) {
             content = <div>
                 <p>{_t(
@@ -72,7 +71,7 @@ export default class BridgeSettingsTab extends React.Component {
                     },
                 )}</p>
                 <ul className="mx_RoomSettingsDialog_BridgeList">
-                    { bridgeEvents.map((event) => this._renderBridgeCard(event, room)) }
+                    { bridgeEvents.map((event) => this.renderBridgeCard(event, room)) }
                 </ul>
             </div>;
         } else {
diff --git a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
index 99882ae400..1f12396413 100644
--- a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
@@ -20,7 +20,7 @@ import {_t} from "../../../../../languageHandler";
 import RoomProfileSettings from "../../../room_settings/RoomProfileSettings";
 import * as sdk from "../../../../..";
 import AccessibleButton from "../../../elements/AccessibleButton";
-import dis from "../../../../../dispatcher";
+import dis from "../../../../../dispatcher/dispatcher";
 import MatrixClientContext from "../../../../../contexts/MatrixClientContext";
 
 export default class GeneralRoomSettingsTab extends React.Component {
diff --git a/src/components/views/settings/tabs/room/NotificationSettingsTab.js b/src/components/views/settings/tabs/room/NotificationSettingsTab.js
index 96e6b3d354..dd88b5018f 100644
--- a/src/components/views/settings/tabs/room/NotificationSettingsTab.js
+++ b/src/components/views/settings/tabs/room/NotificationSettingsTab.js
@@ -21,13 +21,15 @@ import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import Notifier from "../../../../../Notifier";
 import SettingsStore from '../../../../../settings/SettingsStore';
-import { SettingLevel } from '../../../../../settings/SettingsStore';
+import {SettingLevel} from "../../../../../settings/SettingLevel";
 
 export default class NotificationsSettingsTab extends React.Component {
     static propTypes = {
         roomId: PropTypes.string.isRequired,
     };
 
+    _soundUpload = createRef();
+
     constructor() {
         super();
 
@@ -39,14 +41,11 @@ export default class NotificationsSettingsTab extends React.Component {
 
     // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
     UNSAFE_componentWillMount() { // eslint-disable-line camelcase
-        Notifier.getSoundForRoom(this.props.roomId).then((soundData) => {
-            if (!soundData) {
-                return;
-            }
-            this.setState({currentSound: soundData.name || soundData.url});
-        });
-
-        this._soundUpload = createRef();
+        const soundData = Notifier.getSoundForRoom(this.props.roomId);
+        if (!soundData) {
+            return;
+        }
+        this.setState({currentSound: soundData.name || soundData.url});
     }
 
     async _triggerUploader(e) {
diff --git a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
index b812bb6b68..99352a452e 100644
--- a/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
@@ -33,7 +33,7 @@ const plEventsToLabels = {
     "m.room.tombstone": _td("Upgrade the room"),
     "m.room.encryption": _td("Enable room encryption"),
 
-    // TODO: Enable support for m.widget event type (https://github.com/vector-im/riot-web/issues/13111)
+    // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
     "im.vector.modular.widgets": _td("Modify widgets"),
 };
 
@@ -48,7 +48,7 @@ const plEventsToShow = {
     "m.room.tombstone": {isState: true},
     "m.room.encryption": {isState: true},
 
-    // TODO: Enable support for m.widget event type (https://github.com/vector-im/riot-web/issues/13111)
+    // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
     "im.vector.modular.widgets": {isState: true},
 };
 
diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
index eb2b885a22..48115146f1 100644
--- a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
@@ -20,9 +20,10 @@ import {_t} from "../../../../../languageHandler";
 import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import * as sdk from "../../../../..";
 import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
-import {SettingLevel} from "../../../../../settings/SettingsStore";
 import Modal from "../../../../../Modal";
 import QuestionDialog from "../../../dialogs/QuestionDialog";
+import StyledRadioGroup from '../../../elements/StyledRadioGroup';
+import {SettingLevel} from "../../../../../settings/SettingLevel";
 
 export default class SecurityRoomSettingsTab extends React.Component {
     static propTypes = {
@@ -99,7 +100,7 @@ export default class SecurityRoomSettingsTab extends React.Component {
                 {
                     'a': (sub) => {
                         return <a rel='noreferrer noopener' target='_blank'
-                                  href='https://about.riot.im/help#end-to-end-encryption'>{sub}</a>;
+                                  href='https://element.io/help#encryption'>{sub}</a>;
                     },
                 },
             ),
@@ -144,7 +145,7 @@ export default class SecurityRoomSettingsTab extends React.Component {
         });
     };
 
-    _onRoomAccessRadioToggle = (ev) => {
+    _onRoomAccessRadioToggle = (roomAccess) => {
         //                         join_rule
         //                      INVITE  |  PUBLIC
         //        ----------------------+----------------
@@ -161,7 +162,7 @@ export default class SecurityRoomSettingsTab extends React.Component {
         let joinRule = "invite";
         let guestAccess = "can_join";
 
-        switch (ev.target.value) {
+        switch (roomAccess) {
             case "invite_only":
                 // no change - use defaults above
                 break;
@@ -190,11 +191,11 @@ export default class SecurityRoomSettingsTab extends React.Component {
         });
     };
 
-    _onHistoryRadioToggle = (ev) => {
+    _onHistoryRadioToggle = (history) => {
         const beforeHistory = this.state.history;
-        this.setState({history: ev.target.value});
+        this.setState({history: history});
         MatrixClientPeg.get().sendStateEvent(this.props.roomId, "m.room.history_visibility", {
-            history_visibility: ev.target.value,
+            history_visibility: history,
         }, "").catch((e) => {
             console.error(e);
             this.setState({history: beforeHistory});
@@ -247,7 +248,7 @@ export default class SecurityRoomSettingsTab extends React.Component {
                 <div className='mx_SecurityRoomSettingsTab_warning'>
                     <img src={require("../../../../../../res/img/warning.svg")} width={15} height={15} />
                     <span>
-                        {_t("To link to this room, please add an alias.")}
+                        {_t("To link to this room, please add an address.")}
                     </span>
                 </div>
             );
@@ -257,27 +258,31 @@ export default class SecurityRoomSettingsTab extends React.Component {
             <div>
                 {guestWarning}
                 {aliasWarning}
-                <label>
-                    <input type="radio" name="roomVis" value="invite_only"
-                           disabled={!canChangeAccess}
-                           onChange={this._onRoomAccessRadioToggle}
-                           checked={joinRule !== "public"} />
-                    {_t('Only people who have been invited')}
-                </label>
-                <label>
-                    <input type="radio" name="roomVis" value="public_no_guests"
-                           disabled={!canChangeAccess}
-                           onChange={this._onRoomAccessRadioToggle}
-                           checked={joinRule === "public" && guestAccess !== "can_join"} />
-                    {_t('Anyone who knows the room\'s link, apart from guests')}
-                </label>
-                <label>
-                    <input type="radio" name="roomVis" value="public_with_guests"
-                           disabled={!canChangeAccess}
-                           onChange={this._onRoomAccessRadioToggle}
-                           checked={joinRule === "public" && guestAccess === "can_join"} />
-                    {_t("Anyone who knows the room's link, including guests")}
-                </label>
+                <StyledRadioGroup
+                    name="roomVis"
+                    value={joinRule}
+                    onChange={this._onRoomAccessRadioToggle}
+                    definitions={[
+                        {
+                            value: "invite_only",
+                            disabled: !canChangeAccess,
+                            label: _t('Only people who have been invited'),
+                            checked: joinRule !== "public",
+                        },
+                        {
+                            value: "public_no_guests",
+                            disabled: !canChangeAccess,
+                            label: _t('Anyone who knows the room\'s link, apart from guests'),
+                            checked: joinRule === "public" && guestAccess !== "can_join",
+                        },
+                        {
+                            value: "public_with_guests",
+                            disabled: !canChangeAccess,
+                            label: _t("Anyone who knows the room's link, including guests"),
+                            checked: joinRule === "public" && guestAccess === "can_join",
+                        },
+                    ]}
+                />
             </div>
         );
     }
@@ -294,34 +299,33 @@ export default class SecurityRoomSettingsTab extends React.Component {
                     {_t('Changes to who can read history will only apply to future messages in this room. ' +
                         'The visibility of existing history will be unchanged.')}
                 </div>
-                <label>
-                    <input type="radio" name="historyVis" value="world_readable"
-                           disabled={!canChangeHistory}
-                           checked={history === "world_readable"}
-                           onChange={this._onHistoryRadioToggle} />
-                    {_t("Anyone")}
-                </label>
-                <label>
-                    <input type="radio" name="historyVis" value="shared"
-                           disabled={!canChangeHistory}
-                           checked={history === "shared"}
-                           onChange={this._onHistoryRadioToggle} />
-                    {_t('Members only (since the point in time of selecting this option)')}
-                </label>
-                <label>
-                    <input type="radio" name="historyVis" value="invited"
-                           disabled={!canChangeHistory}
-                           checked={history === "invited"}
-                           onChange={this._onHistoryRadioToggle} />
-                    {_t('Members only (since they were invited)')}
-                </label>
-                <label >
-                    <input type="radio" name="historyVis" value="joined"
-                           disabled={!canChangeHistory}
-                           checked={history === "joined"}
-                           onChange={this._onHistoryRadioToggle} />
-                    {_t('Members only (since they joined)')}
-                </label>
+                <StyledRadioGroup
+                    name="historyVis"
+                    value={history}
+                    onChange={this._onHistoryRadioToggle}
+                    definitions={[
+                        {
+                            value: "world_readable",
+                            disabled: !canChangeHistory,
+                            label: _t("Anyone"),
+                        },
+                        {
+                            value: "shared",
+                            disabled: !canChangeHistory,
+                            label: _t('Members only (since the point in time of selecting this option)'),
+                        },
+                        {
+                            value: "invited",
+                            disabled: !canChangeHistory,
+                            label: _t('Members only (since they were invited)'),
+                        },
+                        {
+                            value: "joined",
+                            disabled: !canChangeHistory,
+                            label: _t('Members only (since they joined)'),
+                        },
+                    ]}
+                />
             </div>
         );
     }
diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
new file mode 100644
index 0000000000..c9ec4a6bc7
--- /dev/null
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
@@ -0,0 +1,461 @@
+/*
+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.
+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";
+import SettingsStore from "../../../../../settings/SettingsStore";
+import { enumerateThemes } from "../../../../../theme";
+import ThemeWatcher from "../../../../../settings/watchers/ThemeWatcher";
+import Slider from "../../../elements/Slider";
+import AccessibleButton from "../../../elements/AccessibleButton";
+import dis from "../../../../../dispatcher/dispatcher";
+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";
+
+interface IProps {
+}
+
+interface IThemeState {
+    theme: string;
+    useSystemTheme: boolean;
+}
+
+export interface CustomThemeMessage {
+    isError: boolean;
+    text: string;
+}
+
+interface IState extends IThemeState {
+    // String displaying the current selected fontSize.
+    // Needs to be string for things like '17.' without
+    // trailing 0s.
+    fontSize: string;
+    customThemeUrl: string;
+    customThemeMessage: CustomThemeMessage;
+    useCustomFontSize: boolean;
+    useSystemFont: boolean;
+    systemFont: string;
+    showAdvanced: boolean;
+    useIRCLayout: boolean;
+}
+
+
+export default class AppearanceUserSettingsTab extends React.Component<IProps, IState> {
+    private readonly MESSAGE_PREVIEW_TEXT = _t("Hey you. You're the best!");
+
+    private themeTimer: NodeJS.Timeout;
+
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            fontSize: (SettingsStore.getValue("baseFontSize", null) + FontWatcher.SIZE_DIFF).toString(),
+            ...this.calculateThemeState(),
+            customThemeUrl: "",
+            customThemeMessage: {isError: false, text: ""},
+            useCustomFontSize: SettingsStore.getValue("useCustomFontSize"),
+            useSystemFont: SettingsStore.getValue("useSystemFont"),
+            systemFont: SettingsStore.getValue("systemFont"),
+            showAdvanced: false,
+            useIRCLayout: SettingsStore.getValue("useIRCLayout"),
+        };
+    }
+
+    private calculateThemeState(): IThemeState {
+        // We have to mirror the logic from ThemeWatcher.getEffectiveTheme so we
+        // show the right values for things.
+
+        const themeChoice: string = SettingsStore.getValue("theme");
+        const systemThemeExplicit: boolean = SettingsStore.getValueAt(
+            SettingLevel.DEVICE, "use_system_theme", null, false, true);
+        const themeExplicit: string = SettingsStore.getValueAt(
+            SettingLevel.DEVICE, "theme", null, false, true);
+
+        // If the user has enabled system theme matching, use that.
+        if (systemThemeExplicit) {
+            return {
+                theme: themeChoice,
+                useSystemTheme: true,
+            };
+        }
+
+        // If the user has set a theme explicitly, use that (no system theme matching)
+        if (themeExplicit) {
+            return {
+                theme: themeChoice,
+                useSystemTheme: false,
+            };
+        }
+
+        // Otherwise assume the defaults for the settings
+        return {
+            theme: themeChoice,
+            useSystemTheme: SettingsStore.getValueAt(SettingLevel.DEVICE, "use_system_theme"),
+        };
+    }
+
+    private onThemeChange = (newTheme: string): void => {
+        if (this.state.theme === newTheme) return;
+
+        // doing getValue in the .catch will still return the value we failed to set,
+        // so remember what the value was before we tried to set it so we can revert
+        const oldTheme: string = SettingsStore.getValue('theme');
+        SettingsStore.setValue("theme", null, SettingLevel.DEVICE, newTheme).catch(() => {
+            dis.dispatch<RecheckThemePayload>({action: Action.RecheckTheme});
+            this.setState({theme: oldTheme});
+        });
+        this.setState({theme: newTheme});
+        // The settings watcher doesn't fire until the echo comes back from the
+        // server, so to make the theme change immediately we need to manually
+        // do the dispatch now
+        // XXX: The local echoed value appears to be unreliable, in particular
+        // when settings custom themes(!) so adding forceTheme to override
+        // the value from settings.
+        dis.dispatch<RecheckThemePayload>({action: Action.RecheckTheme, forceTheme: newTheme});
+    };
+
+    private onUseSystemThemeChanged = (checked: boolean): void => {
+        this.setState({useSystemTheme: checked});
+        SettingsStore.setValue("use_system_theme", null, SettingLevel.DEVICE, checked);
+        dis.dispatch<RecheckThemePayload>({action: Action.RecheckTheme});
+    };
+
+    private onFontSizeChanged = (size: number): void => {
+        this.setState({fontSize: size.toString()});
+        SettingsStore.setValue("baseFontSize", null, SettingLevel.DEVICE, size - FontWatcher.SIZE_DIFF);
+    };
+
+    private onValidateFontSize = async ({value}: Pick<IFieldState, "value">): Promise<IValidationResult> => {
+        const parsedSize = parseFloat(value);
+        const min = FontWatcher.MIN_SIZE + FontWatcher.SIZE_DIFF;
+        const max = FontWatcher.MAX_SIZE + FontWatcher.SIZE_DIFF;
+
+        if (isNaN(parsedSize)) {
+            return {valid: false, feedback: _t("Size must be a number")};
+        }
+
+        if (!(min <= parsedSize && parsedSize <= max)) {
+            return {
+                valid: false,
+                feedback: _t('Custom font size can only be between %(min)s pt and %(max)s pt', {min, max}),
+            };
+        }
+
+        SettingsStore.setValue(
+            "baseFontSize",
+            null,
+            SettingLevel.DEVICE,
+            parseInt(value, 10) - FontWatcher.SIZE_DIFF
+        );
+
+        return {valid: true, feedback: _t('Use between %(min)s pt and %(max)s pt', {min, max})};
+    };
+
+    private onAddCustomTheme = async (): Promise<void> => {
+        let currentThemes: string[] = SettingsStore.getValue("custom_themes");
+        if (!currentThemes) currentThemes = [];
+        currentThemes = currentThemes.map(c => c); // cheap clone
+
+        if (this.themeTimer) {
+            clearTimeout(this.themeTimer);
+        }
+
+        try {
+            const r = await fetch(this.state.customThemeUrl);
+            // XXX: need some schema for this
+            const themeInfo = await r.json();
+            if (!themeInfo || typeof(themeInfo['name']) !== 'string' || typeof(themeInfo['colors']) !== 'object') {
+                this.setState({customThemeMessage: {text: _t("Invalid theme schema."), isError: true}});
+                return;
+            }
+            currentThemes.push(themeInfo);
+        } catch (e) {
+            console.error(e);
+            this.setState({customThemeMessage: {text: _t("Error downloading theme information."), isError: true}});
+            return; // Don't continue on error
+        }
+
+        await SettingsStore.setValue("custom_themes", null, SettingLevel.ACCOUNT, currentThemes);
+        this.setState({customThemeUrl: "", customThemeMessage: {text: _t("Theme added!"), isError: false}});
+
+        this.themeTimer = setTimeout(() => {
+            this.setState({customThemeMessage: {text: "", isError: false}});
+        }, 3000);
+    };
+
+    private onCustomThemeChange = (e: React.ChangeEvent<HTMLSelectElement | HTMLInputElement>): void => {
+        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 renderThemeSection() {
+        const themeWatcher = new ThemeWatcher();
+        let systemThemeSection: JSX.Element;
+        if (themeWatcher.isSystemThemeSupported()) {
+            systemThemeSection = <div>
+                <StyledCheckbox
+                    checked={this.state.useSystemTheme}
+                    onChange={(e) => this.onUseSystemThemeChanged(e.target.checked)}
+                >
+                    {SettingsStore.getDisplayName("use_system_theme")}
+                </StyledCheckbox>
+            </div>;
+        }
+
+        let customThemeForm: JSX.Element;
+        if (SettingsStore.getValue("feature_custom_themes")) {
+            let messageElement = null;
+            if (this.state.customThemeMessage.text) {
+                if (this.state.customThemeMessage.isError) {
+                    messageElement = <div className='text-error'>{this.state.customThemeMessage.text}</div>;
+                } else {
+                    messageElement = <div className='text-success'>{this.state.customThemeMessage.text}</div>;
+                }
+            }
+            customThemeForm = (
+                <div className='mx_SettingsTab_section'>
+                    <form onSubmit={this.onAddCustomTheme}>
+                        <Field
+                            label={_t("Custom theme URL")}
+                            type='text'
+                            id='mx_GeneralUserSettingsTab_customThemeInput'
+                            autoComplete="off"
+                            onChange={this.onCustomThemeChange}
+                            value={this.state.customThemeUrl}
+                        />
+                        <AccessibleButton
+                            onClick={this.onAddCustomTheme}
+                            type="submit" kind="primary_sm"
+                            disabled={!this.state.customThemeUrl.trim()}
+                        >{_t("Add theme")}</AccessibleButton>
+                        {messageElement}
+                    </form>
+                </div>
+            );
+        }
+
+        // XXX: replace any type here
+        const themes = Object.entries<any>(enumerateThemes())
+            .map(p => ({id: p[0], name: p[1]})); // convert pairs to objects for code readability
+        const builtInThemes = themes.filter(p => !p.id.startsWith("custom-"));
+        const customThemes = themes.filter(p => !builtInThemes.includes(p))
+            .sort((a, b) => a.name.localeCompare(b.name));
+        const orderedThemes = [...builtInThemes, ...customThemes];
+        return (
+            <div className="mx_SettingsTab_section mx_AppearanceUserSettingsTab_themeSection">
+                <span className="mx_SettingsTab_subheading">{_t("Theme")}</span>
+                {systemThemeSection}
+                <div className="mx_ThemeSelectors">
+                    <StyledRadioGroup
+                        name="theme"
+                        definitions={orderedThemes.map(t => ({
+                            value: t.id,
+                            label: t.name,
+                            disabled: this.state.useSystemTheme,
+                            className: "mx_ThemeSelector_" + t.id,
+                        }))}
+                        onChange={this.onThemeChange}
+                        value={this.state.useSystemTheme ? undefined : this.state.theme}
+                        outlined
+                    />
+                </div>
+                {customThemeForm}
+           </div>
+        );
+    }
+
+    private renderFontSection() {
+        return <div className="mx_SettingsTab_section mx_AppearanceUserSettingsTab_fontScaling">
+
+            <span className="mx_SettingsTab_subheading">{_t("Font size")}</span>
+            <EventTilePreview
+                className="mx_AppearanceUserSettingsTab_fontSlider_preview"
+                message={this.MESSAGE_PREVIEW_TEXT}
+                useIRCLayout={this.state.useIRCLayout}
+            />
+            <div className="mx_AppearanceUserSettingsTab_fontSlider">
+                <div className="mx_AppearanceUserSettingsTab_fontSlider_smallText">Aa</div>
+                <Slider
+                    values={[13, 14, 15, 16, 18]}
+                    value={parseInt(this.state.fontSize, 10)}
+                    onSelectionChange={this.onFontSizeChanged}
+                    displayFunc={_ => ""}
+                    disabled={this.state.useCustomFontSize}
+                />
+                <div className="mx_AppearanceUserSettingsTab_fontSlider_largeText">Aa</div>
+            </div>
+
+            <SettingsFlag
+                name="useCustomFontSize"
+                level={SettingLevel.ACCOUNT}
+                onChange={(checked) => this.setState({useCustomFontSize: checked})}
+                useCheckbox={true}
+            />
+
+            <Field
+                type="number"
+                label={_t("Font size")}
+                autoComplete="off"
+                placeholder={this.state.fontSize.toString()}
+                value={this.state.fontSize.toString()}
+                id="font_size_field"
+                onValidate={this.onValidateFontSize}
+                onChange={(value) => this.setState({fontSize: value.target.value})}
+                disabled={!this.state.useCustomFontSize}
+                className="mx_SettingsTab_customFontSizeField"
+            />
+        </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() {
+        const brand = SdkConfig.get().brand;
+        const toggle = <div
+            className="mx_AppearanceUserSettingsTab_AdvancedToggle"
+            onClick={() => this.setState({showAdvanced: !this.state.showAdvanced})}
+        >
+            {this.state.showAdvanced ? "Hide advanced" : "Show advanced"}
+        </div>;
+
+        let advanced: React.ReactNode;
+
+        if (this.state.showAdvanced) {
+            const tooltipContent = _t(
+                "Set the name of a font installed on your system & %(brand)s will attempt to use it.",
+                { brand },
+            );
+            advanced = <>
+                <SettingsFlag
+                    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})}
+                />
+                <SettingsFlag
+                    name="useSystemFont"
+                    level={SettingLevel.DEVICE}
+                    useCheckbox={true}
+                    onChange={(checked) => this.setState({useSystemFont: checked})}
+                />
+                <Field
+                    className="mx_AppearanceUserSettingsTab_systemFont"
+                    label={SettingsStore.getDisplayName("systemFont")}
+                    onChange={(value) => {
+                        this.setState({
+                            systemFont: value.target.value,
+                        });
+
+                        SettingsStore.setValue("systemFont", null, SettingLevel.DEVICE, value.target.value);
+                    }}
+                    tooltipContent={tooltipContent}
+                    forceTooltipVisible={true}
+                    disabled={!this.state.useSystemFont}
+                    value={this.state.systemFont}
+                />
+            </>;
+        }
+        return <div className="mx_SettingsTab_section mx_AppearanceUserSettingsTab_Advanced">
+            {toggle}
+            {advanced}
+        </div>;
+    }
+
+    render() {
+        const brand = SdkConfig.get().brand;
+
+        return (
+            <div className="mx_SettingsTab mx_AppearanceUserSettingsTab">
+                <div className="mx_SettingsTab_heading">{_t("Customise your appearance")}</div>
+                <div className="mx_SettingsTab_SubHeading">
+                    {_t("Appearance Settings only affect this %(brand)s session.", { brand })}
+                </div>
+                {this.renderThemeSection()}
+                {this.renderFontSection()}
+                {this.renderAdvancedSection()}
+            </div>
+        );
+    }
+}
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index 801062bff4..1ebefae590 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -19,25 +19,24 @@ limitations under the License.
 import React from 'react';
 import {_t} from "../../../../../languageHandler";
 import ProfileSettings from "../../ProfileSettings";
-import Field from "../../../elements/Field";
 import * as languageHandler from "../../../../../languageHandler";
-import {SettingLevel} from "../../../../../settings/SettingsStore";
 import SettingsStore from "../../../../../settings/SettingsStore";
 import LanguageDropdown from "../../../elements/LanguageDropdown";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import DeactivateAccountDialog from "../../../dialogs/DeactivateAccountDialog";
 import PropTypes from "prop-types";
-import {enumerateThemes, ThemeWatcher} from "../../../../../theme";
 import PlatformPeg from "../../../../../PlatformPeg";
 import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import * as sdk from "../../../../..";
 import Modal from "../../../../../Modal";
-import dis from "../../../../../dispatcher";
+import dis from "../../../../../dispatcher/dispatcher";
 import {Service, startTermsFlow} from "../../../../../Terms";
 import {SERVICE_TYPES} from "matrix-js-sdk";
 import IdentityAuthClient from "../../../../../IdentityAuthClient";
 import {abbreviateUrl} from "../../../../../utils/UrlUtils";
 import { getThreepidsWithBindStatus } from '../../../../../boundThreepids';
+import Spinner from "../../../elements/Spinner";
+import {SettingLevel} from "../../../../../settings/SettingLevel";
 
 export default class GeneralUserSettingsTab extends React.Component {
     static propTypes = {
@@ -60,9 +59,7 @@ export default class GeneralUserSettingsTab extends React.Component {
             },
             emails: [],
             msisdns: [],
-            ...this._calculateThemeState(),
-            customThemeUrl: "",
-            customThemeMessage: {isError: false, text: ""},
+            loading3pids: true, // whether or not the emails and msisdns have been loaded
         };
 
         this.dispatcherRef = dis.register(this._onAction);
@@ -91,39 +88,6 @@ export default class GeneralUserSettingsTab extends React.Component {
         dis.unregister(this.dispatcherRef);
     }
 
-    _calculateThemeState() {
-        // We have to mirror the logic from ThemeWatcher.getEffectiveTheme so we
-        // show the right values for things.
-
-        const themeChoice = SettingsStore.getValueAt(SettingLevel.ACCOUNT, "theme");
-        const systemThemeExplicit = SettingsStore.getValueAt(
-            SettingLevel.DEVICE, "use_system_theme", null, false, true);
-        const themeExplicit = SettingsStore.getValueAt(
-            SettingLevel.DEVICE, "theme", null, false, true);
-
-        // If the user has enabled system theme matching, use that.
-        if (systemThemeExplicit) {
-            return {
-                theme: themeChoice,
-                useSystemTheme: true,
-            };
-        }
-
-        // If the user has set a theme explicitly, use that (no system theme matching)
-        if (themeExplicit) {
-            return {
-                theme: themeChoice,
-                useSystemTheme: false,
-            };
-        }
-
-        // Otherwise assume the defaults for the settings
-        return {
-            theme: themeChoice,
-            useSystemTheme: SettingsStore.getValueAt(SettingLevel.DEVICE, "use_system_theme"),
-        };
-    }
-
     _onAction = (payload) => {
         if (payload.action === 'id_server_changed') {
             this.setState({haveIdServer: Boolean(MatrixClientPeg.get().getIdentityServerUrl())});
@@ -158,8 +122,11 @@ export default class GeneralUserSettingsTab extends React.Component {
             );
             console.warn(e);
         }
-        this.setState({ emails: threepids.filter((a) => a.medium === 'email') });
-        this.setState({ msisdns: threepids.filter((a) => a.medium === 'msisdn') });
+        this.setState({
+            emails: threepids.filter((a) => a.medium === 'email'),
+            msisdns: threepids.filter((a) => a.medium === 'msisdn'),
+            loading3pids: false,
+        });
     }
 
     async _checkTerms() {
@@ -214,33 +181,6 @@ export default class GeneralUserSettingsTab extends React.Component {
         PlatformPeg.get().reload();
     };
 
-    _onThemeChange = (e) => {
-        const newTheme = e.target.value;
-        if (this.state.theme === newTheme) return;
-
-        // doing getValue in the .catch will still return the value we failed to set,
-        // so remember what the value was before we tried to set it so we can revert
-        const oldTheme = SettingsStore.getValue('theme');
-        SettingsStore.setValue("theme", null, SettingLevel.ACCOUNT, newTheme).catch(() => {
-            dis.dispatch({action: 'recheck_theme'});
-            this.setState({theme: oldTheme});
-        });
-        this.setState({theme: newTheme});
-        // The settings watcher doesn't fire until the echo comes back from the
-        // server, so to make the theme change immediately we need to manually
-        // do the dispatch now
-        // XXX: The local echoed value appears to be unreliable, in particular
-        // when settings custom themes(!) so adding forceTheme to override
-        // the value from settings.
-        dis.dispatch({action: 'recheck_theme', forceTheme: newTheme});
-    };
-
-    _onUseSystemThemeChanged = (checked) => {
-        this.setState({useSystemTheme: checked});
-        SettingsStore.setValue("use_system_theme", null, SettingLevel.DEVICE, checked);
-        dis.dispatch({action: 'recheck_theme'});
-    };
-
     _onPasswordChangeError = (err) => {
         // TODO: Figure out a design that doesn't involve replacing the current dialog
         let errMsg = err.error || "";
@@ -277,41 +217,6 @@ export default class GeneralUserSettingsTab extends React.Component {
         });
     };
 
-    _onAddCustomTheme = async () => {
-        let currentThemes = SettingsStore.getValue("custom_themes");
-        if (!currentThemes) currentThemes = [];
-        currentThemes = currentThemes.map(c => c); // cheap clone
-
-        if (this._themeTimer) {
-            clearTimeout(this._themeTimer);
-        }
-
-        try {
-            const r = await fetch(this.state.customThemeUrl);
-            const themeInfo = await r.json();
-            if (!themeInfo || typeof(themeInfo['name']) !== 'string' || typeof(themeInfo['colors']) !== 'object') {
-                this.setState({customThemeMessage: {text: _t("Invalid theme schema."), isError: true}});
-                return;
-            }
-            currentThemes.push(themeInfo);
-        } catch (e) {
-            console.error(e);
-            this.setState({customThemeMessage: {text: _t("Error downloading theme information."), isError: true}});
-            return; // Don't continue on error
-        }
-
-        await SettingsStore.setValue("custom_themes", null, SettingLevel.ACCOUNT, currentThemes);
-        this.setState({customThemeUrl: "", customThemeMessage: {text: _t("Theme added!"), isError: false}});
-
-        this._themeTimer = setTimeout(() => {
-            this.setState({customThemeMessage: {text: "", isError: false}});
-        }, 3000);
-    };
-
-    _onCustomThemeChange = (e) => {
-        this.setState({customThemeUrl: e.target.value});
-    };
-
     _renderProfileSection() {
         return (
             <div className="mx_SettingsTab_section">
@@ -325,7 +230,6 @@ export default class GeneralUserSettingsTab extends React.Component {
         const ChangePassword = sdk.getComponent("views.settings.ChangePassword");
         const EmailAddresses = sdk.getComponent("views.settings.account.EmailAddresses");
         const PhoneNumbers = sdk.getComponent("views.settings.account.PhoneNumbers");
-        const Spinner = sdk.getComponent("views.elements.Spinner");
 
         let passwordChangeForm = (
             <ChangePassword
@@ -344,18 +248,24 @@ export default class GeneralUserSettingsTab extends React.Component {
         // For newer homeservers with separate 3PID add and bind methods (MSC2290),
         // there is no such concern, so we can always show the HS account 3PIDs.
         if (this.state.haveIdServer || this.state.serverSupportsSeparateAddAndBind === true) {
-            threepidSection = <div>
-                <span className="mx_SettingsTab_subheading">{_t("Email addresses")}</span>
-                <EmailAddresses
+            const emails = this.state.loading3pids
+                ? <Spinner />
+                : <EmailAddresses
                     emails={this.state.emails}
                     onEmailsChange={this._onEmailsChange}
-                />
-
-                <span className="mx_SettingsTab_subheading">{_t("Phone numbers")}</span>
-                <PhoneNumbers
+                />;
+            const msisdns = this.state.loading3pids
+                ? <Spinner />
+                : <PhoneNumbers
                     msisdns={this.state.msisdns}
                     onMsisdnsChange={this._onMsisdnsChange}
-                />
+                />;
+            threepidSection = <div>
+                <span className="mx_SettingsTab_subheading">{_t("Email addresses")}</span>
+                {emails}
+
+                <span className="mx_SettingsTab_subheading">{_t("Phone numbers")}</span>
+                {msisdns}
             </div>;
         } else if (this.state.serverSupportsSeparateAddAndBind === null) {
             threepidSection = <Spinner />;
@@ -391,77 +301,6 @@ export default class GeneralUserSettingsTab extends React.Component {
         );
     }
 
-    _renderThemeSection() {
-        const SettingsFlag = sdk.getComponent("views.elements.SettingsFlag");
-        const LabelledToggleSwitch = sdk.getComponent("views.elements.LabelledToggleSwitch");
-
-        const themeWatcher = new ThemeWatcher();
-        let systemThemeSection;
-        if (themeWatcher.isSystemThemeSupported()) {
-            systemThemeSection = <div>
-                <LabelledToggleSwitch
-                    value={this.state.useSystemTheme}
-                    label={SettingsStore.getDisplayName("use_system_theme")}
-                    onChange={this._onUseSystemThemeChanged}
-                />
-            </div>;
-        }
-
-        let customThemeForm;
-        if (SettingsStore.isFeatureEnabled("feature_custom_themes")) {
-            let messageElement = null;
-            if (this.state.customThemeMessage.text) {
-                if (this.state.customThemeMessage.isError) {
-                    messageElement = <div className='text-error'>{this.state.customThemeMessage.text}</div>;
-                } else {
-                    messageElement = <div className='text-success'>{this.state.customThemeMessage.text}</div>;
-                }
-            }
-            customThemeForm = (
-                <div className='mx_SettingsTab_section'>
-                    <form onSubmit={this._onAddCustomTheme}>
-                        <Field
-                            label={_t("Custom theme URL")}
-                            type='text'
-                            autoComplete="off"
-                            onChange={this._onCustomThemeChange}
-                            value={this.state.customThemeUrl}
-                        />
-                        <AccessibleButton
-                            onClick={this._onAddCustomTheme}
-                            type="submit" kind="primary_sm"
-                            disabled={!this.state.customThemeUrl.trim()}
-                        >{_t("Add theme")}</AccessibleButton>
-                        {messageElement}
-                    </form>
-                </div>
-            );
-        }
-
-        const themes = Object.entries(enumerateThemes())
-            .map(p => ({id: p[0], name: p[1]})); // convert pairs to objects for code readability
-        const builtInThemes = themes.filter(p => !p.id.startsWith("custom-"));
-        const customThemes = themes.filter(p => !builtInThemes.includes(p))
-            .sort((a, b) => a.name.localeCompare(b.name));
-        const orderedThemes = [...builtInThemes, ...customThemes];
-        return (
-            <div className="mx_SettingsTab_section mx_GeneralUserSettingsTab_themeSection">
-                <span className="mx_SettingsTab_subheading">{_t("Theme")}</span>
-                {systemThemeSection}
-                <Field label={_t("Theme")} element="select"
-                       value={this.state.theme} onChange={this._onThemeChange}
-                       disabled={this.state.useSystemTheme}
-                >
-                    {orderedThemes.map(theme => {
-                        return <option key={theme.id} value={theme.id}>{theme.name}</option>;
-                    })}
-                </Field>
-                {customThemeForm}
-                <SettingsFlag name="useCompactLayout" level={SettingLevel.ACCOUNT} />
-            </div>
-        );
-    }
-
     _renderDiscoverySection() {
         const SetIdServer = sdk.getComponent("views.settings.SetIdServer");
 
@@ -491,12 +330,15 @@ export default class GeneralUserSettingsTab extends React.Component {
         const EmailAddresses = sdk.getComponent("views.settings.discovery.EmailAddresses");
         const PhoneNumbers = sdk.getComponent("views.settings.discovery.PhoneNumbers");
 
+        const emails = this.state.loading3pids ? <Spinner /> : <EmailAddresses emails={this.state.emails} />;
+        const msisdns = this.state.loading3pids ? <Spinner /> : <PhoneNumbers msisdns={this.state.msisdns} />;
+
         const threepidSection = this.state.haveIdServer ? <div className='mx_GeneralUserSettingsTab_discovery'>
             <span className="mx_SettingsTab_subheading">{_t("Email addresses")}</span>
-            <EmailAddresses emails={this.state.emails} />
+            {emails}
 
             <span className="mx_SettingsTab_subheading">{_t("Phone numbers")}</span>
-            <PhoneNumbers msisdns={this.state.msisdns} />
+            {msisdns}
         </div> : null;
 
         return (
@@ -547,7 +389,6 @@ export default class GeneralUserSettingsTab extends React.Component {
                 {this._renderProfileSection()}
                 {this._renderAccountSection()}
                 {this._renderLanguageSection()}
-                {this._renderThemeSection()}
                 <div className="mx_SettingsTab_heading">{discoWarning} {_t("Discovery")}</div>
                 {this._renderDiscoverySection()}
                 {this._renderIntegrationManagerSection() /* Has its own title */}
diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
index 146d841d58..64807ddb21 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2019 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -25,6 +26,7 @@ import Modal from "../../../../../Modal";
 import * as sdk from "../../../../../";
 import PlatformPeg from "../../../../../PlatformPeg";
 import * as KeyboardShortcuts from "../../../../../accessibility/KeyboardShortcuts";
+import UpdateCheckButton from "../../UpdateCheckButton";
 
 export default class HelpUserSettingsTab extends React.Component {
     static propTypes = {
@@ -35,13 +37,13 @@ export default class HelpUserSettingsTab extends React.Component {
         super();
 
         this.state = {
-            vectorVersion: null,
+            appVersion: null,
             canUpdate: false,
         };
     }
 
     componentDidMount(): void {
-        PlatformPeg.get().getAppVersion().then((ver) => this.setState({vectorVersion: ver})).catch((e) => {
+        PlatformPeg.get().getAppVersion().then((ver) => this.setState({appVersion: ver})).catch((e) => {
             console.error("Error getting vector version: ", e);
         });
         PlatformPeg.get().canSelfUpdate().then((v) => this.setState({canUpdate: v})).catch((e) => {
@@ -118,7 +120,7 @@ export default class HelpUserSettingsTab extends React.Component {
                 <span className='mx_SettingsTab_subheading'>{_t("Credits")}</span>
                 <ul>
                     <li>
-                        The <a href="themes/riot/img/backgrounds/valley.jpg" rel="noreferrer noopener" target="_blank">
+                        The <a href="themes/element/img/backgrounds/lake.jpg" rel="noreferrer noopener" target="_blank">
                         default cover photo</a> is ©&nbsp;
                         <a href="https://www.flickr.com/golan" rel="noreferrer noopener" target="_blank">Jesús Roncero</a>{' '}
                         used under the terms of&nbsp;
@@ -147,42 +149,59 @@ export default class HelpUserSettingsTab extends React.Component {
     }
 
     render() {
-        let faqText = _t('For help with using Riot, click <a>here</a>.', {}, {
-            'a': (sub) =>
-                <a href="https://about.riot.im/need-help/" rel="noreferrer noopener" target="_blank">{sub}</a>,
-        });
+        const brand = SdkConfig.get().brand;
+
+        let faqText = _t(
+            'For help with using %(brand)s, click <a>here</a>.',
+            {
+                brand,
+            },
+            {
+                'a': (sub) => <a
+                    href="https://element.io/help"
+                    rel="noreferrer noopener"
+                    target="_blank"
+                >
+                    {sub}
+                </a>,
+            },
+        );
         if (SdkConfig.get().welcomeUserId && getCurrentLanguage().startsWith('en')) {
             faqText = (
                 <div>
-                    {
-                        _t('For help with using Riot, click <a>here</a> or start a chat with our ' +
-                            'bot using the button below.', {}, {
-                            'a': (sub) => <a href="https://about.riot.im/need-help/" rel='noreferrer noopener'
-                                             target='_blank'>{sub}</a>,
-                        })
-                    }
+                    {_t(
+                        'For help with using %(brand)s, click <a>here</a> or start a chat with our ' +
+                        'bot using the button below.',
+                        {
+                            brand,
+                        },
+                        {
+                            'a': (sub) => <a
+                                href="https://element.io/help"
+                                rel='noreferrer noopener'
+                                target='_blank'
+                            >
+                                {sub}
+                            </a>,
+                        },
+                    )}
                     <div>
                         <AccessibleButton onClick={this._onStartBotChat} kind='primary'>
-                            {_t("Chat with Riot Bot")}
+                            {_t("Chat with %(brand)s Bot", { brand })}
                         </AccessibleButton>
                     </div>
                 </div>
             );
         }
 
-        const vectorVersion = this.state.vectorVersion || 'unknown';
+        const appVersion = this.state.appVersion || 'unknown';
 
         let olmVersion = MatrixClientPeg.get().olmVersion;
         olmVersion = olmVersion ? `${olmVersion[0]}.${olmVersion[1]}.${olmVersion[2]}` : '<not-enabled>';
 
         let updateButton = null;
         if (this.state.canUpdate) {
-            const platform = PlatformPeg.get();
-            updateButton = (
-                <AccessibleButton onClick={platform.startUpdateCheck} kind='primary'>
-                    {_t('Check for update')}
-                </AccessibleButton>
-            );
+            updateButton = <UpdateCheckButton />;
         }
 
         return (
@@ -232,7 +251,7 @@ export default class HelpUserSettingsTab extends React.Component {
                 <div className='mx_SettingsTab_section mx_HelpUserSettingsTab_versions'>
                     <span className='mx_SettingsTab_subheading'>{_t("Versions")}</span>
                     <div className='mx_SettingsTab_subsectionText'>
-                        {_t("riot-web version:")} {vectorVersion}<br />
+                        {_t("%(brand)s version:", { brand })} {appVersion}<br />
                         {_t("olm version:")} {olmVersion}<br />
                         {updateButton}
                     </div>
diff --git a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
index 3e69107159..eba5c6586d 100644
--- a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
@@ -17,9 +17,10 @@ limitations under the License.
 import React from 'react';
 import {_t} from "../../../../../languageHandler";
 import PropTypes from "prop-types";
-import SettingsStore, {SettingLevel} from "../../../../../settings/SettingsStore";
+import SettingsStore from "../../../../../settings/SettingsStore";
 import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
 import * as sdk from "../../../../../index";
+import {SettingLevel} from "../../../../../settings/SettingLevel";
 
 export class LabsSettingToggle extends React.Component {
     static propTypes = {
@@ -27,14 +28,15 @@ export class LabsSettingToggle extends React.Component {
     };
 
     _onChange = async (checked) => {
-        await SettingsStore.setFeatureEnabled(this.props.featureId, checked);
+        await SettingsStore.setValue(this.props.featureId, null, SettingLevel.DEVICE, checked);
         this.forceUpdate();
     };
 
     render() {
         const label = SettingsStore.getDisplayName(this.props.featureId);
-        const value = SettingsStore.isFeatureEnabled(this.props.featureId);
-        return <LabelledToggleSwitch value={value} label={label} onChange={this._onChange} />;
+        const value = SettingsStore.getValue(this.props.featureId);
+        const canChange = SettingsStore.canSetValue(this.props.featureId, null, SettingLevel.DEVICE);
+        return <LabelledToggleSwitch value={value} label={label} onChange={this._onChange} disabled={!canChange} />;
     }
 }
 
@@ -45,7 +47,7 @@ export default class LabsUserSettingsTab extends React.Component {
 
     render() {
         const SettingsFlag = sdk.getComponent("views.elements.SettingsFlag");
-        const flags = SettingsStore.getLabsFeatures().map(f => <LabsSettingToggle featureId={f} key={f} />);
+        const flags = SettingsStore.getFeatureSettingNames().map(f => <LabsSettingToggle featureId={f} key={f} />);
         return (
             <div className="mx_SettingsTab">
                 <div className="mx_SettingsTab_heading">{_t("Labs")}</div>
@@ -54,7 +56,7 @@ export default class LabsUserSettingsTab extends React.Component {
                         _t('Customise your experience with experimental labs features. ' +
                             '<a>Learn more</a>.', {}, {
                             'a': (sub) => {
-                                return <a href="https://github.com/vector-im/riot-web/blob/develop/docs/labs.md"
+                                return <a href="https://github.com/vector-im/element-web/blob/develop/docs/labs.md"
                                     rel='noreferrer noopener' target='_blank'>{sub}</a>;
                             },
                         })
@@ -66,7 +68,7 @@ export default class LabsUserSettingsTab extends React.Component {
                     <SettingsFlag name={"showHiddenEventsInTimeline"} level={SettingLevel.DEVICE} />
                     <SettingsFlag name={"lowBandwidth"} level={SettingLevel.DEVICE} />
                     <SettingsFlag name={"sendReadReceipts"} level={SettingLevel.ACCOUNT} />
-                    <SettingsFlag name={"keepSecretStoragePassphraseForSession"} level={SettingLevel.DEVICE} />
+                    <SettingsFlag name={"advancedRoomListLogging"} level={SettingLevel.DEVICE} />
                 </div>
             </div>
         );
diff --git a/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js b/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js
index d22b7ec183..510d6076a0 100644
--- a/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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 React from 'react';
 import {_t} from "../../../../../languageHandler";
+import SdkConfig from "../../../../../SdkConfig";
 import {Mjolnir} from "../../../../../mjolnir/Mjolnir";
 import {ListRule} from "../../../../../mjolnir/ListRule";
 import {BanList, RULE_SERVER, RULE_USER} from "../../../../../mjolnir/BanList";
@@ -84,7 +85,7 @@ export default class MjolnirUserSettingsTab extends React.Component {
             const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Failed to subscribe to Mjolnir list', '', ErrorDialog, {
                 title: _t('Error subscribing to list'),
-                description: _t('Please verify the room ID or alias and try again.'),
+                description: _t('Please verify the room ID or address and try again.'),
             });
         } finally {
             this.setState({busy: false});
@@ -234,6 +235,7 @@ export default class MjolnirUserSettingsTab extends React.Component {
     render() {
         const Field = sdk.getComponent('elements.Field');
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
+        const brand = SdkConfig.get().brand;
 
         return (
             <div className="mx_SettingsTab mx_MjolnirUserSettingsTab">
@@ -244,9 +246,9 @@ export default class MjolnirUserSettingsTab extends React.Component {
                         <br />
                         {_t(
                             "Add users and servers you want to ignore here. Use asterisks " +
-                            "to have Riot match any characters. For example, <code>@bot:*</code> " +
+                            "to have %(brand)s match any characters. For example, <code>@bot:*</code> " +
                             "would ignore all users that have the name 'bot' on any server.",
-                            {}, {code: (s) => <code>{s}</code>},
+                            { brand }, {code: (s) => <code>{s}</code>},
                         )}<br />
                         <br />
                         {_t(
@@ -305,7 +307,7 @@ export default class MjolnirUserSettingsTab extends React.Component {
                         <form onSubmit={this._onSubscribeList} autoComplete="off">
                             <Field
                                 type="text"
-                                label={_t("Room ID or alias of ban list")}
+                                label={_t("Room ID or address of ban list")}
                                 value={this.state.newList}
                                 onChange={this._onNewListChanged}
                             />
diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
index bdb2a9ffc4..a77815a68c 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
@@ -17,17 +17,15 @@ limitations under the License.
 
 import React from 'react';
 import {_t} from "../../../../../languageHandler";
-import {SettingLevel} from "../../../../../settings/SettingsStore";
 import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
 import SettingsStore from "../../../../../settings/SettingsStore";
 import Field from "../../../elements/Field";
 import * as sdk from "../../../../..";
 import PlatformPeg from "../../../../../PlatformPeg";
+import {SettingLevel} from "../../../../../settings/SettingLevel";
 
 export default class PreferencesUserSettingsTab extends React.Component {
     static ROOM_LIST_SETTINGS = [
-        'RoomList.orderAlphabetically',
-        'RoomList.orderByImportance',
         'breadcrumbs',
     ];
 
diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
index a4336a81f3..fda7ccb005 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2019 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../../../languageHandler";
-import SettingsStore, {SettingLevel} from "../../../../../settings/SettingsStore";
+import SdkConfig from "../../../../../SdkConfig";
 import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import * as FormattingUtils from "../../../../../utils/FormattingUtils";
 import AccessibleButton from "../../../elements/AccessibleButton";
@@ -25,7 +26,9 @@ import Analytics from "../../../../../Analytics";
 import Modal from "../../../../../Modal";
 import * as sdk from "../../../../..";
 import {sleep} from "../../../../../utils/promise";
-import dis from "../../../../../dispatcher";
+import dis from "../../../../../dispatcher/dispatcher";
+import {privateShouldBeEncrypted} from "../../../../../createRoom";
+import {SettingLevel} from "../../../../../settings/SettingLevel";
 
 export class IgnoredUser extends React.Component {
     static propTypes = {
@@ -112,7 +115,10 @@ export default class SecurityUserSettingsTab extends React.Component {
     };
 
     _onGoToUserProfileClick = () => {
-        window.location.href = "#/user/" + MatrixClientPeg.get().getUserId();
+        dis.dispatch({
+            action: 'view_user_info',
+            userId: MatrixClientPeg.get().getUserId(),
+        });
         this.props.closeSettingsFn();
     }
 
@@ -277,6 +283,7 @@ export default class SecurityUserSettingsTab extends React.Component {
     }
 
     render() {
+        const brand = SdkConfig.get().brand;
         const DevicesPanel = sdk.getComponent('views.settings.DevicesPanel');
         const SettingsFlag = sdk.getComponent('views.elements.SettingsFlag');
         const EventIndexPanel = sdk.getComponent('views.settings.EventIndexPanel');
@@ -303,9 +310,7 @@ export default class SecurityUserSettingsTab extends React.Component {
         // in having advanced details here once all flows are implemented, we
         // can remove this.
         const CrossSigningPanel = sdk.getComponent('views.settings.CrossSigningPanel');
-        let crossSigning;
-        if (SettingsStore.getValue("feature_cross_signing")) {
-            crossSigning = (
+        const crossSigning = (
                 <div className='mx_SettingsTab_section'>
                     <span className="mx_SettingsTab_subheading">{_t("Cross-signing")}</span>
                     <div className='mx_SettingsTab_subsectionText'>
@@ -313,12 +318,20 @@ export default class SecurityUserSettingsTab extends React.Component {
                     </div>
                 </div>
             );
-        }
 
         const E2eAdvancedPanel = sdk.getComponent('views.settings.E2eAdvancedPanel');
 
+        let warning;
+        if (!privateShouldBeEncrypted()) {
+            warning = <div className="mx_SecurityUserSettingsTab_warning">
+                { _t("Your server admin has disabled end-to-end encryption by default " +
+                    "in private rooms & Direct Messages.") }
+            </div>;
+        }
+
         return (
             <div className="mx_SettingsTab mx_SecurityUserSettingsTab">
+                {warning}
                 <div className="mx_SettingsTab_heading">{_t("Security & Privacy")}</div>
                 <div className="mx_SettingsTab_section">
                     <span className="mx_SettingsTab_subheading">{_t("Where you’re logged in")}</span>
@@ -345,7 +358,10 @@ export default class SecurityUserSettingsTab extends React.Component {
                 <div className='mx_SettingsTab_section'>
                     <span className="mx_SettingsTab_subheading">{_t("Analytics")}</span>
                     <div className='mx_SettingsTab_subsectionText'>
-                        {_t("Riot collects anonymous analytics to allow us to improve the application.")}
+                        {_t(
+                            "%(brand)s collects anonymous analytics to allow us to improve the application.",
+                            { brand },
+                        )}
                         &nbsp;
                         {_t("Privacy is important to us, so we don't collect any personal or " +
                             "identifiable data for our analytics.")}
diff --git a/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js b/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js
index 71ed2bab65..a78cc10b92 100644
--- a/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2019 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,13 +17,14 @@ limitations under the License.
 
 import React from 'react';
 import {_t} from "../../../../../languageHandler";
+import SdkConfig from "../../../../../SdkConfig";
 import CallMediaHandler from "../../../../../CallMediaHandler";
 import Field from "../../../elements/Field";
 import AccessibleButton from "../../../elements/AccessibleButton";
-import {SettingLevel} from "../../../../../settings/SettingsStore";
 import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import * as sdk from "../../../../../index";
 import Modal from "../../../../../Modal";
+import {SettingLevel} from "../../../../../settings/SettingLevel";
 
 export default class VoiceUserSettingsTab extends React.Component {
     constructor() {
@@ -80,10 +82,14 @@ export default class VoiceUserSettingsTab extends React.Component {
             }
         }
         if (error) {
+            const brand = SdkConfig.get().brand;
             const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
             Modal.createTrackedDialog('No media permissions', '', ErrorDialog, {
                 title: _t('No media permissions'),
-                description: _t('You may need to manually permit Riot to access your microphone/webcam'),
+                description: _t(
+                    'You may need to manually permit %(brand)s to access your microphone/webcam',
+                    { brand },
+                ),
             });
         } else {
             this._refreshMediaDevices(stream);
@@ -151,6 +157,9 @@ export default class VoiceUserSettingsTab extends React.Component {
                 label: _t('Default Device'),
             };
             const getDefaultDevice = (devices) => {
+                // Note we're looking for a device with deviceId 'default' but adding a device
+                // with deviceId == the empty string: this is because Chrome gives us a device
+                // with deviceId 'default', so we're looking for this, not the one we are adding.
                 if (!devices.some((i) => i.deviceId === 'default')) {
                     devices.unshift(defaultOption);
                     return '';
diff --git a/src/components/views/terms/InlineTermsAgreement.js b/src/components/views/terms/InlineTermsAgreement.js
index bccd686cd3..5f6e276976 100644
--- a/src/components/views/terms/InlineTermsAgreement.js
+++ b/src/components/views/terms/InlineTermsAgreement.js
@@ -18,6 +18,8 @@ import React from "react";
 import PropTypes from "prop-types";
 import {_t, pickBestLanguage} from "../../../languageHandler";
 import * as sdk from "../../..";
+import {objectClone} from "../../../utils/objects";
+import StyledCheckbox from "../elements/StyledCheckbox";
 
 export default class InlineTermsAgreement extends React.Component {
     static propTypes = {
@@ -56,7 +58,7 @@ export default class InlineTermsAgreement extends React.Component {
     }
 
     _togglePolicy = (index) => {
-        const policies = JSON.parse(JSON.stringify(this.state.policies)); // deep & cheap clone
+        const policies = objectClone(this.state.policies);
         policies[index].checked = !policies[index].checked;
         this.setState({policies});
     };
@@ -89,8 +91,9 @@ export default class InlineTermsAgreement extends React.Component {
                 <div key={i} className='mx_InlineTermsAgreement_cbContainer'>
                     <div>{introText}</div>
                     <div className='mx_InlineTermsAgreement_checkbox'>
-                        <input type='checkbox' onChange={() => this._togglePolicy(i)} checked={policy.checked} />
-                        {_t("Accept")}
+                        <StyledCheckbox onChange={() => this._togglePolicy(i)} checked={policy.checked}>
+                            {_t("Accept")}
+                        </StyledCheckbox>
                     </div>
                 </div>,
             );
diff --git a/src/components/views/toasts/BulkUnverifiedSessionsToast.js b/src/components/views/toasts/BulkUnverifiedSessionsToast.js
deleted file mode 100644
index 0c40e56858..0000000000
--- a/src/components/views/toasts/BulkUnverifiedSessionsToast.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import { _t } from '../../../languageHandler';
-import dis from "../../../dispatcher";
-import { MatrixClientPeg } from '../../../MatrixClientPeg';
-import DeviceListener from '../../../DeviceListener';
-import FormButton from '../elements/FormButton';
-import { replaceableComponent } from '../../../utils/replaceableComponent';
-
-@replaceableComponent("views.toasts.BulkUnverifiedSessionsToast")
-export default class BulkUnverifiedSessionsToast extends React.PureComponent {
-    static propTypes = {
-        deviceIds: PropTypes.array,
-    }
-
-    _onLaterClick = () => {
-        DeviceListener.sharedInstance().dismissUnverifiedSessions(this.props.deviceIds);
-    };
-
-    _onReviewClick = async () => {
-        DeviceListener.sharedInstance().dismissUnverifiedSessions(this.props.deviceIds);
-
-        dis.dispatch({
-            action: 'view_user_info',
-            userId: MatrixClientPeg.get().getUserId(),
-        });
-    };
-
-    render() {
-        return (<div>
-            <div className="mx_Toast_description">
-                {_t("Verify all your sessions to ensure your account & messages are safe")}
-            </div>
-            <div className="mx_Toast_buttons" aria-live="off">
-                <FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />
-                <FormButton label={_t("Review")} onClick={this._onReviewClick} />
-            </div>
-        </div>);
-    }
-}
diff --git a/src/components/views/toasts/GenericExpiringToast.tsx b/src/components/views/toasts/GenericExpiringToast.tsx
new file mode 100644
index 0000000000..83f43208c4
--- /dev/null
+++ b/src/components/views/toasts/GenericExpiringToast.tsx
@@ -0,0 +1,53 @@
+/*
+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 ToastStore from "../../../stores/ToastStore";
+import GenericToast, { IProps as IGenericToastProps } from "./GenericToast";
+import {useExpiringCounter} from "../../../hooks/useTimeout";
+
+interface IProps extends IGenericToastProps {
+    toastKey: string;
+    numSeconds: number;
+    dismissLabel: string;
+    onDismiss?();
+}
+
+const SECOND = 1000;
+
+const GenericExpiringToast: React.FC<IProps> = ({description, acceptLabel, dismissLabel, onAccept, onDismiss, toastKey, numSeconds}) => {
+    const onReject = () => {
+        if (onDismiss) onDismiss();
+        ToastStore.sharedInstance().dismissToast(toastKey);
+    };
+    const counter = useExpiringCounter(onReject, SECOND, numSeconds);
+
+    let rejectLabel = dismissLabel;
+    if (counter > 0) {
+        rejectLabel += ` (${counter})`;
+    }
+
+    return <GenericToast
+        description={description}
+        acceptLabel={acceptLabel}
+        onAccept={onAccept}
+        rejectLabel={rejectLabel}
+        onReject={onReject}
+    />;
+};
+
+export default GenericExpiringToast;
diff --git a/src/components/views/toasts/GenericToast.tsx b/src/components/views/toasts/GenericToast.tsx
new file mode 100644
index 0000000000..6cd881b9eb
--- /dev/null
+++ b/src/components/views/toasts/GenericToast.tsx
@@ -0,0 +1,46 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, {ReactNode} from "react";
+
+import FormButton from "../elements/FormButton";
+import {XOR} from "../../../@types/common";
+
+export interface IProps {
+    description: ReactNode;
+    acceptLabel: string;
+
+    onAccept();
+}
+
+interface IPropsExtended extends IProps {
+    rejectLabel: string;
+    onReject();
+}
+
+const GenericToast: React.FC<XOR<IPropsExtended, IProps>> = ({description, acceptLabel, rejectLabel, onAccept, onReject}) => {
+    return <div>
+        <div className="mx_Toast_description">
+            { description }
+        </div>
+        <div className="mx_Toast_buttons" aria-live="off">
+            {onReject && rejectLabel && <FormButton label={rejectLabel} kind="danger" onClick={onReject} /> }
+            <FormButton label={acceptLabel} onClick={onAccept} />
+        </div>
+    </div>;
+};
+
+export default GenericToast;
diff --git a/src/components/views/toasts/NonUrgentEchoFailureToast.tsx b/src/components/views/toasts/NonUrgentEchoFailureToast.tsx
new file mode 100644
index 0000000000..76d0328e8b
--- /dev/null
+++ b/src/components/views/toasts/NonUrgentEchoFailureToast.tsx
@@ -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 React from "react";
+import { _t } from "../../../languageHandler";
+import AccessibleButton from "../elements/AccessibleButton";
+import Modal from "../../../Modal";
+import ServerOfflineDialog from "../dialogs/ServerOfflineDialog";
+
+export default class NonUrgentEchoFailureToast extends React.PureComponent {
+    private openDialog = () => {
+        Modal.createTrackedDialog('Local Echo Server Error', '', ServerOfflineDialog, {});
+    };
+
+    public render() {
+        return (
+            <div className="mx_NonUrgentEchoFailureToast">
+                <span className="mx_NonUrgentEchoFailureToast_icon" />
+                {_t("Your server isn't responding to some <a>requests</a>.", {}, {
+                    'a': (sub) => (
+                        <AccessibleButton kind="link" onClick={this.openDialog}>{sub}</AccessibleButton>
+                    ),
+                })}
+            </div>
+        )
+    }
+}
diff --git a/src/components/views/toasts/SetupEncryptionToast.js b/src/components/views/toasts/SetupEncryptionToast.js
deleted file mode 100644
index 75fd55378c..0000000000
--- a/src/components/views/toasts/SetupEncryptionToast.js
+++ /dev/null
@@ -1,112 +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 Modal from '../../../Modal';
-import { MatrixClientPeg } from '../../../MatrixClientPeg';
-import * as sdk from "../../../index";
-import { _t } from '../../../languageHandler';
-import DeviceListener from '../../../DeviceListener';
-import SetupEncryptionDialog from "../dialogs/SetupEncryptionDialog";
-import { accessSecretStorage } from '../../../CrossSigningManager';
-
-export default class SetupEncryptionToast extends React.PureComponent {
-    static propTypes = {
-        toastKey: PropTypes.string.isRequired,
-        kind: PropTypes.oneOf([
-            'set_up_encryption',
-            'verify_this_session',
-            'upgrade_encryption',
-            'upgrade_ssss',
-        ]).isRequired,
-    };
-
-    _onLaterClick = () => {
-        DeviceListener.sharedInstance().dismissEncryptionSetup();
-    };
-
-    async _waitForCompletion() {
-        if (this.props.kind === 'upgrade_ssss') {
-            return new Promise(resolve => {
-                const recheck = async () => {
-                    const needsUpgrade = await MatrixClientPeg.get().secretStorageKeyNeedsUpgrade();
-                    if (!needsUpgrade) {
-                        MatrixClientPeg.get().removeListener('accountData', recheck);
-                        resolve();
-                    }
-                };
-                MatrixClientPeg.get().on('accountData', recheck);
-                recheck();
-            });
-        } else {
-            return;
-        }
-    }
-
-    _onSetupClick = async () => {
-        if (this.props.kind === "verify_this_session") {
-            Modal.createTrackedDialog('Verify session', 'Verify session', SetupEncryptionDialog,
-                {}, null, /* priority = */ false, /* static = */ true);
-        } else {
-            const Spinner = sdk.getComponent("elements.Spinner");
-            const modal = Modal.createDialog(
-                Spinner, null, 'mx_Dialog_spinner', /* priority */ false, /* static */ true,
-            );
-            try {
-                await accessSecretStorage();
-                await this._waitForCompletion();
-            } finally {
-                modal.close();
-            }
-        }
-    };
-
-    getDescription() {
-        switch (this.props.kind) {
-            case 'set_up_encryption':
-            case 'upgrade_encryption':
-                return _t('Verify yourself & others to keep your chats safe');
-            case 'verify_this_session':
-                return _t('Other users may not trust it');
-            case 'upgrade_ssss':
-                return _t('Update your secure storage');
-        }
-    }
-
-    getSetupCaption() {
-        switch (this.props.kind) {
-            case 'set_up_encryption':
-                return _t('Set up');
-            case 'upgrade_encryption':
-            case 'upgrade_ssss':
-                return _t('Upgrade');
-            case 'verify_this_session':
-                return _t('Verify');
-        }
-    }
-
-    render() {
-        const FormButton = sdk.getComponent("elements.FormButton");
-        return (<div>
-            <div className="mx_Toast_description">{this.getDescription()}</div>
-            <div className="mx_Toast_buttons" aria-live="off">
-                <FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />
-                <FormButton label={this.getSetupCaption()} onClick={this._onSetupClick} />
-            </div>
-        </div>);
-    }
-}
diff --git a/src/components/views/toasts/UnverifiedSessionToast.js b/src/components/views/toasts/UnverifiedSessionToast.js
deleted file mode 100644
index 38cd9f20df..0000000000
--- a/src/components/views/toasts/UnverifiedSessionToast.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import { _t } from '../../../languageHandler';
-import { MatrixClientPeg } from '../../../MatrixClientPeg';
-import Modal from '../../../Modal';
-import DeviceListener from '../../../DeviceListener';
-import NewSessionReviewDialog from '../dialogs/NewSessionReviewDialog';
-import FormButton from '../elements/FormButton';
-import { replaceableComponent } from '../../../utils/replaceableComponent';
-
-@replaceableComponent("views.toasts.UnverifiedSessionToast")
-export default class UnverifiedSessionToast extends React.PureComponent {
-    static propTypes = {
-        deviceId: PropTypes.string,
-    }
-
-    _onLaterClick = () => {
-        DeviceListener.sharedInstance().dismissUnverifiedSessions([this.props.deviceId]);
-    };
-
-    _onReviewClick = async () => {
-        const cli = MatrixClientPeg.get();
-        Modal.createTrackedDialog('New Session Review', 'Starting dialog', NewSessionReviewDialog, {
-            userId: cli.getUserId(),
-            device: cli.getStoredDevice(cli.getUserId(), this.props.deviceId),
-            onFinished: (r) => {
-                if (!r) {
-                    /* This'll come back false if the user clicks "this wasn't me" and saw a warning dialog */
-                    DeviceListener.sharedInstance().dismissUnverifiedSessions([this.props.deviceId]);
-                }
-            },
-        }, null, /* priority = */ false, /* static = */ true);
-    };
-
-    render() {
-        const cli = MatrixClientPeg.get();
-        const device = cli.getStoredDevice(cli.getUserId(), this.props.deviceId);
-
-        return (<div>
-            <div className="mx_Toast_description">
-                {_t(
-                    "Verify the new login accessing your account: %(name)s", { name: device.getDisplayName()})}
-            </div>
-            <div className="mx_Toast_buttons" aria-live="off">
-                <FormButton label={_t("Later")} kind="danger" onClick={this._onLaterClick} />
-                <FormButton label={_t("Verify")} onClick={this._onReviewClick} />
-            </div>
-        </div>);
-    }
-}
diff --git a/src/components/views/toasts/VerificationRequestToast.js b/src/components/views/toasts/VerificationRequestToast.tsx
similarity index 79%
rename from src/components/views/toasts/VerificationRequestToast.js
rename to src/components/views/toasts/VerificationRequestToast.tsx
index 6447e87627..8c8a74b2be 100644
--- a/src/components/views/toasts/VerificationRequestToast.js
+++ b/src/components/views/toasts/VerificationRequestToast.tsx
@@ -14,18 +14,35 @@ 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 from "react";
+
 import * as sdk from "../../../index";
 import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
+import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
+import {SetRightPanelPhasePayload} from "../../../dispatcher/payloads/SetRightPanelPhasePayload"
 import {userLabelForEventRoom} from "../../../utils/KeyVerificationStateObserver";
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
 import ToastStore from "../../../stores/ToastStore";
 import Modal from "../../../Modal";
+import GenericToast from "./GenericToast";
+import {VerificationRequest} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
+import {DeviceInfo} from "matrix-js-sdk/src/crypto/deviceinfo";
+import {Action} from "../../../dispatcher/actions";
+
+interface IProps {
+    toastKey: string;
+    request: VerificationRequest;
+}
+
+interface IState {
+    counter: number;
+    device?: DeviceInfo;
+}
+
+export default class VerificationRequestToast extends React.PureComponent<IProps, IState> {
+    private intervalHandle: NodeJS.Timeout;
 
-export default class VerificationRequestToast extends React.PureComponent {
     constructor(props) {
         super(props);
         this.state = {counter: Math.ceil(props.request.timeout / 1000)};
@@ -34,7 +51,7 @@ export default class VerificationRequestToast extends React.PureComponent {
     async componentDidMount() {
         const {request} = this.props;
         if (request.timeout && request.timeout > 0) {
-            this._intervalHandle = setInterval(() => {
+            this.intervalHandle = setInterval(() => {
                 let {counter} = this.state;
                 counter = Math.max(0, counter - 1);
                 this.setState({counter});
@@ -56,7 +73,7 @@ export default class VerificationRequestToast extends React.PureComponent {
     }
 
     componentWillUnmount() {
-        clearInterval(this._intervalHandle);
+        clearInterval(this.intervalHandle);
         const {request} = this.props;
         request.off("change", this._checkRequestIsPending);
     }
@@ -75,7 +92,7 @@ export default class VerificationRequestToast extends React.PureComponent {
         } catch (err) {
             console.error("Error while cancelling verification request", err);
         }
-    }
+    };
 
     accept = async () => {
         ToastStore.sharedInstance().dismissToast(this.props.toastKey);
@@ -89,9 +106,9 @@ export default class VerificationRequestToast extends React.PureComponent {
                     room_id: request.channel.roomId,
                     should_peek: false,
                 });
-                dis.dispatch({
-                    action: "set_right_panel_phase",
-                    phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+                dis.dispatch<SetRightPanelPhasePayload>({
+                    action: Action.SetRightPanelPhase,
+                    phase: RightPanelPhases.EncryptionPanel,
                     refireParams: {
                         verificationRequest: request,
                         member: cli.getUser(request.otherUserId),
@@ -110,7 +127,6 @@ export default class VerificationRequestToast extends React.PureComponent {
     };
 
     render() {
-        const FormButton = sdk.getComponent("elements.FormButton");
         const {request} = this.props;
         let nameLabel;
         if (request.isSelfVerification) {
@@ -133,20 +149,16 @@ export default class VerificationRequestToast extends React.PureComponent {
                 }
             }
         }
-        const declineLabel = this.state.counter == 0 ?
+        const declineLabel = this.state.counter === 0 ?
             _t("Decline") :
             _t("Decline (%(counter)s)", {counter: this.state.counter});
-        return (<div>
-            <div className="mx_Toast_description">{nameLabel}</div>
-            <div className="mx_Toast_buttons" aria-live="off">
-                <FormButton label={declineLabel} kind="danger" onClick={this.cancel} />
-                <FormButton label={_t("Accept")} onClick={this.accept} />
-            </div>
-        </div>);
+
+        return <GenericToast
+            description={nameLabel}
+            acceptLabel={_t("Accept")}
+            onAccept={this.accept}
+            rejectLabel={declineLabel}
+            onReject={this.cancel}
+        />;
     }
 }
-
-VerificationRequestToast.propTypes = {
-    request: PropTypes.object.isRequired,
-    toastKey: PropTypes.string.isRequired,
-};
diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js
index edf860c4c2..09374b91af 100644
--- a/src/components/views/verification/VerificationShowSas.js
+++ b/src/components/views/verification/VerificationShowSas.js
@@ -30,6 +30,7 @@ export default class VerificationShowSas extends React.Component {
     static propTypes = {
         pending: PropTypes.bool,
         displayName: PropTypes.string, // required if pending is true
+        device: PropTypes.object,
         onDone: PropTypes.func.isRequired,
         onCancel: PropTypes.func.isRequired,
         sas: PropTypes.object.isRequired,
@@ -116,10 +117,16 @@ export default class VerificationShowSas extends React.Component {
             let text;
             if (this.state.pending) {
                 if (this.props.isSelf) {
-                    text = _t("Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…", {
-                        deviceName: this.props.device.getDisplayName(),
-                        deviceId: this.props.device.deviceId,
-                    });
+                    // device shouldn't be null in this situation but it can be, eg. if the device is
+                    // logged out during verification
+                    if (this.props.device) {
+                        text = _t("Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…", {
+                            deviceName: this.props.device ? this.props.device.getDisplayName() : '',
+                            deviceId: this.props.device ? this.props.device.deviceId : '',
+                        });
+                    } else {
+                        text = _t("Waiting for your other session to verify…");
+                    }
                 } else {
                     const {displayName} = this.props;
                     text = _t("Waiting for %(displayName)s to verify…", {displayName});
diff --git a/src/components/views/elements/GroupsButton.js b/src/components/views/voip/CallContainer.tsx
similarity index 50%
rename from src/components/views/elements/GroupsButton.js
rename to src/components/views/voip/CallContainer.tsx
index dd1118aba0..18a9c098d6 100644
--- a/src/components/views/elements/GroupsButton.js
+++ b/src/components/views/voip/CallContainer.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2017 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,23 +15,23 @@ limitations under the License.
 */
 
 import React from 'react';
-import * as sdk from '../../../index';
-import PropTypes from 'prop-types';
-import { _t } from '../../../languageHandler';
+import IncomingCallBox from './IncomingCallBox';
+import CallPreview from './CallPreview';
+import * as VectorConferenceHandler from '../../../VectorConferenceHandler';
 
-const GroupsButton = function(props) {
-    const ActionButton = sdk.getComponent('elements.ActionButton');
-    return (
-        <ActionButton className="mx_GroupsButton" action="toggle_my_groups"
-            label={_t("Communities")}
-            size={props.size}
-            tooltip={true}
-        />
-    );
-};
+interface IProps {
 
-GroupsButton.propTypes = {
-    size: PropTypes.string,
-};
+}
 
-export default GroupsButton;
+interface IState {
+
+}
+
+export default class CallContainer extends React.PureComponent<IProps, IState> {
+    public render() {
+        return <div className="mx_CallContainer">
+            <IncomingCallBox />
+            <CallPreview ConferenceHandler={VectorConferenceHandler} />
+        </div>;
+    }
+}
diff --git a/src/components/views/voip/CallPreview.js b/src/components/views/voip/CallPreview.tsx
similarity index 53%
rename from src/components/views/voip/CallPreview.js
rename to src/components/views/voip/CallPreview.tsx
index 049dd8a3c6..4352fc95e4 100644
--- a/src/components/views/voip/CallPreview.js
+++ b/src/components/views/voip/CallPreview.tsx
@@ -1,6 +1,6 @@
 /*
 Copyright 2017, 2018 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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,50 +16,62 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import createReactClass from 'create-react-class';
+
+import CallView from "./CallView";
 import RoomViewStore from '../../../stores/RoomViewStore';
 import CallHandler from '../../../CallHandler';
-import dis from '../../../dispatcher';
-import * as sdk from '../../../index';
+import dis from '../../../dispatcher/dispatcher';
+import { ActionPayload } from '../../../dispatcher/payloads';
+import PersistentApp from "../elements/PersistentApp";
+import SettingsStore from "../../../settings/SettingsStore";
 
-export default createReactClass({
-    displayName: 'CallPreview',
+interface IProps {
+    // A Conference Handler implementation
+    // Must have a function signature:
+    //  getConferenceCallForRoom(roomId: string): MatrixCall
+    ConferenceHandler: any;
+}
 
-    propTypes: {
-        // A Conference Handler implementation
-        // Must have a function signature:
-        //  getConferenceCallForRoom(roomId: string): MatrixCall
-        ConferenceHandler: PropTypes.object,
-    },
+interface IState {
+    roomId: string;
+    activeCall: any;
+}
 
-    getInitialState: function() {
-        return {
+export default class CallPreview extends React.Component<IProps, IState> {
+    private roomStoreToken: any;
+    private dispatcherRef: string;
+    private settingsWatcherRef: string;
+
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
             roomId: RoomViewStore.getRoomId(),
             activeCall: CallHandler.getAnyActiveCall(),
         };
-    },
+    }
 
-    componentDidMount: function() {
-        this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
-        this.dispatcherRef = dis.register(this._onAction);
-    },
+    public componentDidMount() {
+        this.roomStoreToken = RoomViewStore.addListener(this.onRoomViewStoreUpdate);
+        this.dispatcherRef = dis.register(this.onAction);
+    }
 
-    componentWillUnmount: function() {
-        if (this._roomStoreToken) {
-            this._roomStoreToken.remove();
+    public componentWillUnmount() {
+        if (this.roomStoreToken) {
+            this.roomStoreToken.remove();
         }
         dis.unregister(this.dispatcherRef);
-    },
+        SettingsStore.unwatchSetting(this.settingsWatcherRef);
+    }
 
-    _onRoomViewStoreUpdate: function(payload) {
+    private onRoomViewStoreUpdate = (payload) => {
         if (RoomViewStore.getRoomId() === this.state.roomId) return;
         this.setState({
             roomId: RoomViewStore.getRoomId(),
         });
-    },
+    };
 
-    _onAction: function(payload) {
+    private onAction = (payload: ActionPayload) => {
         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
@@ -69,9 +81,9 @@ export default createReactClass({
                 });
                 break;
         }
-    },
+    };
 
-    _onCallViewClick: function() {
+    private onCallViewClick = () => {
         const call = CallHandler.getAnyActiveCall();
         if (call) {
             dis.dispatch({
@@ -79,23 +91,28 @@ export default createReactClass({
                 room_id: call.groupRoomId || call.roomId,
             });
         }
-    },
+    };
 
-    render: function() {
+    public render() {
         const callForRoom = CallHandler.getCallForRoom(this.state.roomId);
-        const showCall = (this.state.activeCall && this.state.activeCall.call_state === 'connected' && !callForRoom);
+        const showCall = (
+            this.state.activeCall &&
+            this.state.activeCall.call_state === 'connected' &&
+            !callForRoom
+        );
 
         if (showCall) {
-            const CallView = sdk.getComponent('voip.CallView');
             return (
                 <CallView
-                    className="mx_LeftPanel_callView" showVoice={true} onClick={this._onCallViewClick}
+                    className="mx_CallPreview"
+                    onClick={this.onCallViewClick}
                     ConferenceHandler={this.props.ConferenceHandler}
+                    showHangup={true}
                 />
             );
         }
-        const PersistentApp = sdk.getComponent('elements.PersistentApp');
-        return <PersistentApp />;
-    },
-});
+
+        return <PersistentApp />;
+    }
+}
 
diff --git a/src/components/views/voip/CallView.js b/src/components/views/voip/CallView.tsx
similarity index 60%
rename from src/components/views/voip/CallView.js
rename to src/components/views/voip/CallView.tsx
index 4a5f3923e2..8416f56fd9 100644
--- a/src/components/views/voip/CallView.js
+++ b/src/components/views/voip/CallView.tsx
@@ -1,6 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -14,73 +14,84 @@ 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';
-import createReactClass from 'create-react-class';
-import dis from '../../../dispatcher';
+import Room from 'matrix-js-sdk/src/models/room';
+import dis from '../../../dispatcher/dispatcher';
 import CallHandler from '../../../CallHandler';
-import * as sdk from '../../../index';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
+import AccessibleButton from '../elements/AccessibleButton';
+import VideoView from "./VideoView";
+import RoomAvatar from "../avatars/RoomAvatar";
+import PulsedAvatar from '../avatars/PulsedAvatar';
 
-export default createReactClass({
-    displayName: 'CallView',
-
-    propTypes: {
+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: PropTypes.object,
+        room?: Room;
 
         // A Conference Handler implementation
         // Must have a function signature:
         //  getConferenceCallForRoom(roomId: string): MatrixCall
-        ConferenceHandler: PropTypes.object,
+        ConferenceHandler?: any;
 
         // maxHeight style attribute for the video panel
-        maxVideoHeight: PropTypes.number,
+        maxVideoHeight?: number;
 
         // a callback which is called when the user clicks on the video div
-        onClick: PropTypes.func,
+        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: PropTypes.func,
+        onResize?: any;
 
-        // render ongoing audio call details - useful when in LeftPanel
-        showVoice: PropTypes.bool,
-    },
+        // classname applied to view,
+        className?: string;
 
-    getInitialState: function() {
-        return {
+        // Whether to show the hang up icon:W
+        showHangup?: boolean;
+}
+
+interface IState {
+    call: any;
+}
+
+export default class CallView extends React.Component<IProps, IState> {
+    private videoref: React.RefObject<any>;
+    private dispatcherRef: string;
+    public call: any;
+
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
             // the call this view is displaying (if any)
             call: null,
         };
-    },
 
-    // TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
-    UNSAFE_componentWillMount: function() {
-        this._video = createRef();
-    },
+        this.videoref = createRef();
+    }
 
-    componentDidMount: function() {
+    public componentDidMount() {
         this.dispatcherRef = dis.register(this.onAction);
         this.showCall();
-    },
+    }
 
-    componentWillUnmount: function() {
+    public componentWillUnmount() {
         dis.unregister(this.dispatcherRef);
-    },
+    }
 
-    onAction: function(payload) {
+    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;
         }
         this.showCall();
-    },
+    };
 
-    showCall: function() {
+    private showCall() {
         let call;
 
         if (this.props.room) {
@@ -131,37 +142,57 @@ export default createReactClass({
         if (this.props.onResize) {
             this.props.onResize();
         }
-    },
+    }
 
-    getVideoView: function() {
-        return this._video.current;
-    },
+    private getVideoView() {
+        return this.videoref.current;
+    }
 
-    render: function() {
-        const VideoView = sdk.getComponent('voip.VideoView');
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
+    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);
 
-        let voice;
-        if (this.state.call && this.state.call.type === "voice" && this.props.showVoice) {
-            const callRoom = MatrixClientPeg.get().getRoom(this.state.call.roomId);
-            voice = (
-                <AccessibleButton className="mx_CallView_voice" onClick={this.props.onClick}>
-                { _t("Active call (%(roomName)s)", {roomName: callRoom.name}) }
-                </AccessibleButton>
-            );
+            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}
+            />;
         }
 
-        return (
-            <div>
-                <VideoView
-                    ref={this._video}
-                    onClick={this.props.onClick}
-                    onResize={this.props.onResize}
-                    maxHeight={this.props.maxVideoHeight}
-                />
-                { voice }
-            </div>
-        );
-    },
-});
+        let hangup: React.ReactNode;
+        if (this.props.showHangup) {
+            hangup = <div
+                className="mx_CallView_hangup"
+                onClick={() => {
+                    dis.dispatch({
+                        action: 'hangup',
+                        room_id: this.state.call.roomId,
+                    });
+                }}
+            />;
+        }
+
+        return <div className={this.props.className}>
+            {view}
+            {hangup}
+        </div>;
+    }
+}
 
diff --git a/src/components/views/voip/IncomingCallBox.js b/src/components/views/voip/IncomingCallBox.js
deleted file mode 100644
index 53e829b784..0000000000
--- a/src/components/views/voip/IncomingCallBox.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2018 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 createReactClass from 'create-react-class';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import dis from '../../../dispatcher';
-import { _t } from '../../../languageHandler';
-import * as sdk from '../../../index';
-
-export default createReactClass({
-    displayName: 'IncomingCallBox',
-
-    propTypes: {
-        incomingCall: PropTypes.object,
-    },
-
-    onAnswerClick: function(e) {
-        e.stopPropagation();
-        dis.dispatch({
-            action: 'answer',
-            room_id: this.props.incomingCall.roomId,
-        });
-    },
-
-    onRejectClick: function(e) {
-        e.stopPropagation();
-        dis.dispatch({
-            action: 'hangup',
-            room_id: this.props.incomingCall.roomId,
-        });
-    },
-
-    render: function() {
-        let room = null;
-        if (this.props.incomingCall) {
-            room = MatrixClientPeg.get().getRoom(this.props.incomingCall.roomId);
-        }
-
-        const caller = room ? room.name : _t("unknown caller");
-
-        let incomingCallText = null;
-        if (this.props.incomingCall) {
-            if (this.props.incomingCall.type === "voice") {
-                incomingCallText = _t("Incoming voice call from %(name)s", {name: caller});
-            } else if (this.props.incomingCall.type === "video") {
-                incomingCallText = _t("Incoming video call from %(name)s", {name: caller});
-            } else {
-                incomingCallText = _t("Incoming call from %(name)s", {name: caller});
-            }
-        }
-
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        return (
-            <div className="mx_IncomingCallBox" id="incomingCallBox">
-                <img className="mx_IncomingCallBox_chevron" src={require("../../../../res/img/chevron-left.png")} width="9" height="16" />
-                <div className="mx_IncomingCallBox_title">
-                    { incomingCallText }
-                </div>
-                <div className="mx_IncomingCallBox_buttons">
-                    <div className="mx_IncomingCallBox_buttons_cell">
-                        <AccessibleButton className="mx_IncomingCallBox_buttons_decline" onClick={this.onRejectClick}>
-                            { _t("Decline") }
-                        </AccessibleButton>
-                    </div>
-                    <div className="mx_IncomingCallBox_buttons_cell">
-                        <AccessibleButton className="mx_IncomingCallBox_buttons_accept" onClick={this.onAnswerClick}>
-                            { _t("Accept") }
-                        </AccessibleButton>
-                    </div>
-                </div>
-            </div>
-        );
-    },
-});
-
diff --git a/src/components/views/voip/IncomingCallBox.tsx b/src/components/views/voip/IncomingCallBox.tsx
new file mode 100644
index 0000000000..00d49b20f5
--- /dev/null
+++ b/src/components/views/voip/IncomingCallBox.tsx
@@ -0,0 +1,139 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 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.
+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 {MatrixClientPeg} from '../../../MatrixClientPeg';
+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';
+
+interface IProps {
+}
+
+interface IState {
+    incomingCall: any;
+}
+
+export default class IncomingCallBox extends React.Component<IProps, IState> {
+    private dispatcherRef: string;
+
+    constructor(props: IProps) {
+        super(props);
+
+        this.dispatcherRef = dis.register(this.onAction);
+        this.state = {
+            incomingCall: null,
+        };
+    }
+
+    public componentWillUnmount() {
+        dis.unregister(this.dispatcherRef);
+    }
+
+    private onAction = (payload: ActionPayload) => {
+        switch (payload.action) {
+            case 'call_state':
+                const call = CallHandler.getCall(payload.room_id);
+                if (call && call.call_state === 'ringing') {
+                    this.setState({
+                        incomingCall: call,
+                    });
+                } else {
+                    this.setState({
+                        incomingCall: null,
+                    });
+                }
+        }
+    };
+
+    private onAnswerClick: React.MouseEventHandler = (e) => {
+        e.stopPropagation();
+        dis.dispatch({
+            action: 'answer',
+            room_id: this.state.incomingCall.roomId,
+        });
+    };
+
+    private onRejectClick: React.MouseEventHandler = (e) => {
+        e.stopPropagation();
+        dis.dispatch({
+            action: 'hangup',
+            room_id: this.state.incomingCall.roomId,
+        });
+    };
+
+    public render() {
+        if (!this.state.incomingCall) {
+            return null;
+        }
+
+        let room = null;
+        if (this.state.incomingCall) {
+            room = MatrixClientPeg.get().getRoom(this.state.incomingCall.roomId);
+        }
+
+        const caller = room ? room.name : _t("Unknown caller");
+
+        let incomingCallText = null;
+        if (this.state.incomingCall) {
+            if (this.state.incomingCall.type === "voice") {
+                incomingCallText = _t("Incoming voice call");
+            } else if (this.state.incomingCall.type === "video") {
+                incomingCallText = _t("Incoming video call");
+            } else {
+                incomingCallText = _t("Incoming call");
+            }
+        }
+
+        return <div className="mx_IncomingCallBox">
+            <div className="mx_IncomingCallBox_CallerInfo">
+                <PulsedAvatar>
+                    <RoomAvatar
+                        room={room}
+                        height={32}
+                        width={32}
+                    />
+                </PulsedAvatar>
+                <div>
+                    <h1>{caller}</h1>
+                    <p>{incomingCallText}</p>
+                </div>
+            </div>
+            <div className="mx_IncomingCallBox_buttons">
+                <FormButton
+                    className={"mx_IncomingCallBox_decline"}
+                    onClick={this.onRejectClick}
+                    kind="danger"
+                    label={_t("Decline")}
+                />
+                <div className="mx_IncomingCallBox_spacer" />
+                <FormButton
+                    className={"mx_IncomingCallBox_accept"}
+                    onClick={this.onAnswerClick}
+                    kind="primary"
+                    label={_t("Accept")}
+                />
+            </div>
+        </div>;
+    }
+}
+
diff --git a/src/components/views/voip/VideoView.js b/src/components/views/voip/VideoView.js
index 51be6db81d..a51ab70da9 100644
--- a/src/components/views/voip/VideoView.js
+++ b/src/components/views/voip/VideoView.js
@@ -22,7 +22,7 @@ import createReactClass from 'create-react-class';
 import classNames from 'classnames';
 
 import * as sdk from '../../../index';
-import dis from '../../../dispatcher';
+import dis from '../../../dispatcher/dispatcher';
 
 import SettingsStore from "../../../settings/SettingsStore";
 
diff --git a/src/contexts/MatrixClientContext.js b/src/contexts/MatrixClientContext.ts
similarity index 85%
rename from src/contexts/MatrixClientContext.js
rename to src/contexts/MatrixClientContext.ts
index 54a23ca132..7e8a92064d 100644
--- a/src/contexts/MatrixClientContext.js
+++ b/src/contexts/MatrixClientContext.ts
@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 import { createContext } from "react";
+import { MatrixClient } from "matrix-js-sdk/src/client";
 
-const MatrixClientContext = createContext(undefined);
+const MatrixClientContext = createContext<MatrixClient>(undefined);
 MatrixClientContext.displayName = "MatrixClientContext";
 export default MatrixClientContext;
diff --git a/src/createRoom.js b/src/createRoom.ts
similarity index 76%
rename from src/createRoom.js
rename to src/createRoom.ts
index a39d2c2216..23a664a4c4 100644
--- a/src/createRoom.js
+++ b/src/createRoom.ts
@@ -15,15 +15,72 @@ 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 {MatrixClientPeg} from './MatrixClientPeg';
 import Modal from './Modal';
 import * as sdk from './index';
 import { _t } from './languageHandler';
-import dis from "./dispatcher";
+import dis from "./dispatcher/dispatcher";
 import * as Rooms from "./Rooms";
 import DMRoomMap from "./utils/DMRoomMap";
 import {getAddressType} from "./UserAddress";
-import SettingsStore from "./settings/SettingsStore";
+
+const E2EE_WK_KEY = "im.vector.riot.e2ee";
+
+// we define a number of interfaces which take their names from the js-sdk
+/* eslint-disable camelcase */
+
+// TODO move these interfaces over to js-sdk once it has been typescripted enough to accept them
+enum Visibility {
+    Public = "public",
+    Private = "private",
+}
+
+enum Preset {
+    PrivateChat = "private_chat",
+    TrustedPrivateChat = "trusted_private_chat",
+    PublicChat = "public_chat",
+}
+
+interface Invite3PID {
+    id_server: string;
+    id_access_token?: string; // this gets injected by the js-sdk
+    medium: string;
+    address: string;
+}
+
+interface IStateEvent {
+    type: string;
+    state_key?: string; // defaults to an empty string
+    content: object;
+}
+
+interface ICreateOpts {
+    visibility?: Visibility;
+    room_alias_name?: string;
+    name?: string;
+    topic?: string;
+    invite?: string[];
+    invite_3pid?: Invite3PID[];
+    room_version?: string;
+    creation_content?: object;
+    initial_state?: IStateEvent[];
+    preset?: Preset;
+    is_direct?: boolean;
+    power_level_content_override?: object;
+}
+
+interface IOpts {
+    dmUserId?: string;
+    createOpts?: ICreateOpts;
+    spinner?: boolean;
+    guestAccess?: boolean;
+    encryption?: boolean;
+    inlineErrors?: boolean;
+    andView?: boolean;
+}
 
 /**
  * Create a new room, and switch to it.
@@ -39,11 +96,12 @@ import SettingsStore from "./settings/SettingsStore";
  *     Default: False
  * @param {bool=} opts.inlineErrors True to raise errors off the promise instead of resolving to null.
  *     Default: False
+ * @param {bool=} opts.andView True to dispatch an action to view the room once it has been created.
  *
  * @returns {Promise} which resolves to the room id, or null if the
  * action was aborted or failed.
  */
-export default function createRoom(opts) {
+export default function createRoom(opts: IOpts): Promise<string | null> {
     opts = opts || {};
     if (opts.spinner === undefined) opts.spinner = true;
     if (opts.guestAccess === undefined) opts.guestAccess = true;
@@ -58,12 +116,12 @@ export default function createRoom(opts) {
         return Promise.resolve(null);
     }
 
-    const defaultPreset = opts.dmUserId ? 'trusted_private_chat' : 'private_chat';
+    const defaultPreset = opts.dmUserId ? Preset.TrustedPrivateChat : Preset.PrivateChat;
 
     // set some defaults for the creation
     const createOpts = opts.createOpts || {};
     createOpts.preset = createOpts.preset || defaultPreset;
-    createOpts.visibility = createOpts.visibility || 'private';
+    createOpts.visibility = createOpts.visibility || Visibility.Private;
     if (opts.dmUserId && createOpts.invite === undefined) {
         switch (getAddressType(opts.dmUserId)) {
             case 'mx-user-id':
@@ -165,7 +223,7 @@ export default function createRoom(opts) {
     });
 }
 
-export function findDMForUser(client, userId) {
+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 => {
@@ -188,7 +246,7 @@ export function findDMForUser(client, userId) {
  * NOTE: this assumes you've just created the room and there's not been an opportunity
  * for other code to run, so we shouldn't miss RoomState.newMember when it comes by.
  */
-export async function _waitForMember(client, roomId, userId, opts = { timeout: 1500 }) {
+export async function _waitForMember(client: MatrixClient, roomId: string, userId: string, opts = { timeout: 1500 }) {
     const { timeout } = opts;
     let handler;
     return new Promise((resolve) => {
@@ -211,7 +269,7 @@ export async function _waitForMember(client, roomId, userId, opts = { timeout: 1
  * Ensure that for every user in a room, there is at least one device that we
  * can encrypt to.
  */
-export async function canEncryptToAllUsers(client, userIds) {
+export async function canEncryptToAllUsers(client: MatrixClient, userIds: string[]) {
     const usersDeviceMap = await client.downloadKeys(userIds);
     // { "@user:host": { "DEVICE": {...}, ... }, ... }
     return Object.values(usersDeviceMap).every((userDevices) =>
@@ -220,14 +278,14 @@ export async function canEncryptToAllUsers(client, userIds) {
     );
 }
 
-export async function ensureDMExists(client, userId) {
+export async function ensureDMExists(client: MatrixClient, userId: string): Promise<string> {
     const existingDMRoom = findDMForUser(client, userId);
     let roomId;
     if (existingDMRoom) {
         roomId = existingDMRoom.roomId;
     } else {
         let encryption;
-        if (SettingsStore.getValue("feature_cross_signing")) {
+        if (privateShouldBeEncrypted()) {
             encryption = canEncryptToAllUsers(client, [userId]);
         }
         roomId = await createRoom({encryption, dmUserId: userId, spinner: false, andView: false});
@@ -235,3 +293,13 @@ export async function ensureDMExists(client, userId) {
     }
     return roomId;
 }
+
+export function privateShouldBeEncrypted() {
+    const clientWellKnown = MatrixClientPeg.get().getClientWellKnown();
+    if (clientWellKnown && clientWellKnown[E2EE_WK_KEY]) {
+        const defaultDisabled = clientWellKnown[E2EE_WK_KEY]["default"] === false;
+        return !defaultDisabled;
+    }
+
+    return true;
+}
diff --git a/src/cryptodevices.js b/src/cryptodevices.js
deleted file mode 100644
index f56a80e1e4..0000000000
--- a/src/cryptodevices.js
+++ /dev/null
@@ -1,123 +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 Resend from './Resend';
-import * as sdk from './index';
-import dis from './dispatcher';
-import Modal from './Modal';
-import { _t } from './languageHandler';
-
-/**
- * Mark all given devices as 'known'
- *
- * @param {MatrixClient} matrixClient A MatrixClient
- * @param {Object} devices Map from userid -> deviceid -> deviceinfo
- */
-export function markAllDevicesKnown(matrixClient, devices) {
-    Object.keys(devices).forEach((userId) => {
-        Object.keys(devices[userId]).map((deviceId) => {
-            matrixClient.setDeviceKnown(userId, deviceId, true);
-        });
-    });
-}
-
-/**
- * Gets all crypto devices in a room that are marked neither known
- * nor verified.
- *
- * @param {MatrixClient} matrixClient A MatrixClient
- * @param {Room} room js-sdk room object representing the room
- * @return {Promise} A promise which resolves to a map userId->deviceId->{@link
- * module:crypto~DeviceInfo|DeviceInfo}.
- */
-export async function getUnknownDevicesForRoom(matrixClient, room) {
-    const roomMembers = (await room.getEncryptionTargetMembers()).map((m) => {
-        return m.userId;
-    });
-    const devices = await matrixClient.downloadKeys(roomMembers, false);
-    const unknownDevices = {};
-    // This is all devices in this room, so find the unknown ones.
-    Object.keys(devices).forEach((userId) => {
-        Object.keys(devices[userId]).map((deviceId) => {
-            const device = devices[userId][deviceId];
-
-            if (device.isUnverified() && !device.isKnown()) {
-                if (unknownDevices[userId] === undefined) {
-                    unknownDevices[userId] = {};
-                }
-                unknownDevices[userId][deviceId] = device;
-            }
-        });
-    });
-    return unknownDevices;
-}
-
-function focusComposer() {
-    dis.dispatch({action: 'focus_composer'});
-}
-
-/**
- * Show the UnknownDeviceDialog for a given room. The dialog will inform the user
- * that messages they sent to this room have not been sent due to unknown devices
- * being present.
- *
- * @param {MatrixClient} matrixClient A MatrixClient
- * @param {Room} room js-sdk room object representing the room
- */
-export function showUnknownDeviceDialogForMessages(matrixClient, room) {
-    getUnknownDevicesForRoom(matrixClient, room).then((unknownDevices) => {
-        const onSendClicked = () => {
-            Resend.resendUnsentEvents(room);
-        };
-
-        const UnknownDeviceDialog = sdk.getComponent('dialogs.UnknownDeviceDialog');
-        Modal.createTrackedDialog('Unknown Device Dialog', '', UnknownDeviceDialog, {
-            room: room,
-            devices: unknownDevices,
-            sendAnywayLabel: _t("Send anyway"),
-            sendLabel: _t("Send"),
-            onSend: onSendClicked,
-            onFinished: focusComposer,
-        }, 'mx_Dialog_unknownDevice');
-    });
-}
-
-/**
- * Show the UnknownDeviceDialog for a given room. The dialog will inform the user
- * that a call they tried to place or answer in the room couldn't be placed or
- * answered due to unknown devices being present.
- *
- * @param {MatrixClient} matrixClient A MatrixClient
- * @param {Room} room js-sdk room object representing the room
- * @param {func} sendAnyway Function called when the 'call anyway' or 'call'
- *     button is pressed. This should attempt to place or answer the call again.
- * @param {string} sendAnywayLabel Label for the button displayed to retry the call
- *     when unknown devices are still present (eg. "Call Anyway")
- * @param {string} sendLabel Label for the button displayed to retry the call
- *     after all devices have been verified (eg. "Call")
- */
-export function showUnknownDeviceDialogForCalls(matrixClient, room, sendAnyway, sendAnywayLabel, sendLabel) {
-    getUnknownDevicesForRoom(matrixClient, room).then((unknownDevices) => {
-        const UnknownDeviceDialog = sdk.getComponent('dialogs.UnknownDeviceDialog');
-        Modal.createTrackedDialog('Unknown Device Dialog', '', UnknownDeviceDialog, {
-            room: room,
-            devices: unknownDevices,
-            sendAnywayLabel: sendAnywayLabel,
-            sendLabel: sendLabel,
-            onSend: sendAnyway,
-        }, 'mx_Dialog_unknownDevice');
-    });
-}
diff --git a/src/dispatcher/actions.ts b/src/dispatcher/actions.ts
new file mode 100644
index 0000000000..6fb71df30d
--- /dev/null
+++ b/src/dispatcher/actions.ts
@@ -0,0 +1,97 @@
+/*
+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.
+*/
+
+// Dispatcher actions also extend into any arbitrary string, so support that.
+export type DispatcherAction = Action | string;
+
+export enum Action {
+    // TODO: Populate with actual actions
+    // This is lazily generated as it also includes fixing a bunch of references. Work
+    // that we don't really want to take on in a giant chunk. We should always define
+    // new actions here, and ideally when we touch existing ones we take some time to
+    // define them correctly.
+
+    // When defining a new action, please use lower_scored_case with an optional class
+    // name prefix. For example, `RoomListStore.view_room` or `view_user_settings`.
+    // New definitions should also receive an accompanying interface in the payloads
+    // directory.
+
+    /**
+     * View a user's profile. Should be used with a ViewUserPayload.
+     */
+    ViewUser = "view_user",
+
+    /**
+     * Open the user settings. No additional payload information required.
+     * Optionally can include an OpenToTabPayload.
+     */
+    ViewUserSettings = "view_user_settings",
+
+    /**
+     * Opens the room directory. No additional payload information required.
+     */
+    ViewRoomDirectory = "view_room_directory",
+
+    /**
+     * Forces the theme to reload. No additional payload information required.
+     */
+    RecheckTheme = "recheck_theme",
+
+    /**
+     * Provide status information for an ongoing update check. Should be used with a CheckUpdatesPayload.
+     */
+    CheckUpdates = "check_updates",
+
+    /**
+     * Focuses the user's cursor to the composer. No additional payload information required.
+     */
+    FocusComposer = "focus_composer",
+
+    /**
+     * Opens the user menu (previously known as the top left menu). No additional payload information required.
+     */
+    ToggleUserMenu = "toggle_user_menu",
+
+    /**
+     * Sets the apps root font size. Should be used with UpdateFontSizePayload
+     */
+    UpdateFontSize = "update_font_size",
+
+    /**
+     * Sets a system font. Should be used with UpdateSystemFontPayload
+     */
+    UpdateSystemFont = "update_system_font",
+
+    /**
+     * Changes room based on room list order and payload parameters. Should be used with ViewRoomDeltaPayload.
+     */
+    ViewRoomDelta = "view_room_delta",
+
+    /**
+     * Sets the phase for the right panel. Should be used with SetRightPanelPhasePayload.
+     */
+    SetRightPanelPhase = "set_right_panel_phase",
+
+    /**
+     * Toggles the right panel. Should be used with ToggleRightPanelPayload.
+     */
+    ToggleRightPanel = "toggle_right_panel",
+
+    /**
+     * Trigged after the phase of the right panel is set. Should be used with AfterRightPanelPhaseChangePayload.
+     */
+    AfterRightPanelPhaseChange = "after_right_panel_phase_change",
+}
diff --git a/src/dispatcher.js b/src/dispatcher/dispatcher.ts
similarity index 50%
rename from src/dispatcher.js
rename to src/dispatcher/dispatcher.ts
index 5dfaa11345..8330e5cd19 100644
--- a/src/dispatcher.js
+++ b/src/dispatcher/dispatcher.ts
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,25 +16,25 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
+import { Dispatcher } from "flux";
+import { Action } from "./actions";
+import { ActionPayload, AsyncActionPayload } from "./payloads";
 
-import flux from "flux";
-
-class MatrixDispatcher extends flux.Dispatcher {
+/**
+ * A dispatcher for ActionPayloads (the default within the SDK).
+ */
+export class MatrixDispatcher extends Dispatcher<ActionPayload> {
     /**
-     * @param {Object|function} payload Required. The payload to dispatch.
-     *        If an Object, must contain at least an 'action' key.
-     *        If a function, must have the signature (dispatch) => {...}.
-     * @param {boolean=} sync Optional. Pass true to dispatch
+     * Dispatches an event on the dispatcher's event bus.
+     * @param {ActionPayload} payload Required. The payload to dispatch.
+     * @param {boolean=false} sync Optional. Pass true to dispatch
      *        synchronously. This is useful for anything triggering
      *        an operation that the browser requires user interaction
-     *        for.
+     *        for. Default false (async).
      */
-    dispatch(payload, sync) {
-        // Allow for asynchronous dispatching by accepting payloads that have the
-        // type `function (dispatch) {...}`
-        if (typeof payload === 'function') {
-            payload((action) => {
+    dispatch<T extends ActionPayload>(payload: T, sync = false) {
+        if (payload instanceof AsyncActionPayload) {
+            payload.fn((action: ActionPayload) => {
                 this.dispatch(action, sync);
             });
             return;
@@ -50,9 +51,24 @@ class MatrixDispatcher extends flux.Dispatcher {
             setTimeout(super.dispatch.bind(this, payload), 0);
         }
     }
+
+    /**
+     * Shorthand for dispatch({action: Action.WHATEVER}, sync). No additional
+     * properties can be included with this version.
+     * @param {Action} action The action to dispatch.
+     * @param {boolean=false} sync Whether the dispatch should be sync or not.
+     * @see dispatch(action: ActionPayload, sync: boolean)
+     */
+    fire(action: Action, sync = false) {
+        this.dispatch({action}, sync);
+    }
 }
 
-if (global.mxDispatcher === undefined) {
-    global.mxDispatcher = new MatrixDispatcher();
+export const defaultDispatcher = new MatrixDispatcher();
+
+const anyGlobal = <any>global;
+if (!anyGlobal.mxDispatcher) {
+    anyGlobal.mxDispatcher = defaultDispatcher;
 }
-export default global.mxDispatcher;
+
+export default defaultDispatcher;
diff --git a/src/dispatcher/payloads.ts b/src/dispatcher/payloads.ts
new file mode 100644
index 0000000000..fa45b30623
--- /dev/null
+++ b/src/dispatcher/payloads.ts
@@ -0,0 +1,59 @@
+/*
+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 { DispatcherAction } from "./actions";
+
+/**
+ * The base dispatch type exposed by our dispatcher.
+ */
+export interface ActionPayload {
+    [property: string]: any; // effectively makes this 'extends Object'
+    action: DispatcherAction;
+}
+
+/**
+ * The function the dispatcher calls when ready for an AsyncActionPayload. The
+ * single argument is used to start a dispatch. First the dispatcher calls the
+ * outer function, then when the called function is ready it calls the cb
+ * function to issue the dispatch. It may call the callback repeatedly if needed.
+ */
+export type AsyncActionFn = (cb: (action: ActionPayload) => void) => void;
+
+/**
+ * An async version of ActionPayload
+ */
+export class AsyncActionPayload implements ActionPayload {
+    /**
+     * The function the dispatcher should call.
+     */
+    public readonly fn: AsyncActionFn;
+
+    /**
+     * @deprecated Not used on AsyncActionPayload.
+     */
+    public get action(): DispatcherAction {
+        return "NOT_USED";
+    }
+
+    /**
+     * Create a new AsyncActionPayload with the given ready function.
+     * @param {AsyncActionFn} readyFn The function to be called when the
+     * dispatcher is ready.
+     */
+    public constructor(readyFn: AsyncActionFn) {
+        this.fn = readyFn;
+    }
+}
diff --git a/src/dispatcher/payloads/AfterRightPanelPhaseChangePayload.ts b/src/dispatcher/payloads/AfterRightPanelPhaseChangePayload.ts
new file mode 100644
index 0000000000..cfd4a2d3cc
--- /dev/null
+++ b/src/dispatcher/payloads/AfterRightPanelPhaseChangePayload.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.
+*/
+
+import { RightPanelPhases } from "../../stores/RightPanelStorePhases";
+import { SetRightPanelPhaseRefireParams } from "./SetRightPanelPhasePayload";
+import { ActionPayload } from "../payloads";
+import { Action } from "../actions";
+import { VerificationRequest } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
+
+interface AfterRightPanelPhaseChangeAction extends ActionPayload {
+    action: Action.AfterRightPanelPhaseChange;
+    phase: RightPanelPhases;
+    verificationRequestPromise?: Promise<VerificationRequest>;
+}
+
+export type AfterRightPanelPhaseChangePayload
+    = AfterRightPanelPhaseChangeAction & SetRightPanelPhaseRefireParams;
diff --git a/src/dispatcher/payloads/CheckUpdatesPayload.ts b/src/dispatcher/payloads/CheckUpdatesPayload.ts
new file mode 100644
index 0000000000..fa4fb3a538
--- /dev/null
+++ b/src/dispatcher/payloads/CheckUpdatesPayload.ts
@@ -0,0 +1,33 @@
+/*
+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 { ActionPayload } from "../payloads";
+import { Action } from "../actions";
+import {UpdateCheckStatus} from "../../BasePlatform";
+
+export interface CheckUpdatesPayload extends ActionPayload {
+    action: Action.CheckUpdates;
+
+    /**
+     * The current phase of the manual update check.
+     */
+    status: UpdateCheckStatus;
+
+    /**
+     * Detail string relating to the current status, typically for error details.
+     */
+    detail?: string;
+}
diff --git a/src/dispatcher/payloads/OpenToTabPayload.ts b/src/dispatcher/payloads/OpenToTabPayload.ts
new file mode 100644
index 0000000000..7548c342e4
--- /dev/null
+++ b/src/dispatcher/payloads/OpenToTabPayload.ts
@@ -0,0 +1,27 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { ActionPayload } from "../payloads";
+import { Action } from "../actions";
+
+export interface OpenToTabPayload extends ActionPayload {
+    action: Action.ViewUserSettings | string; // TODO: Add room settings action
+
+    /**
+     * The tab ID to open in the settings view to start, if possible.
+     */
+    initialTabId?: string;
+}
diff --git a/src/dispatcher/payloads/RecheckThemePayload.ts b/src/dispatcher/payloads/RecheckThemePayload.ts
new file mode 100644
index 0000000000..e9bea612e0
--- /dev/null
+++ b/src/dispatcher/payloads/RecheckThemePayload.ts
@@ -0,0 +1,27 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { ActionPayload } from "../payloads";
+import { Action } from "../actions";
+
+export interface RecheckThemePayload extends ActionPayload {
+    action: Action.RecheckTheme;
+
+    /**
+     * Optionally specify the exact theme which is to be loaded.
+     */
+    forceTheme?: string;
+}
diff --git a/src/dispatcher/payloads/SetRightPanelPhasePayload.ts b/src/dispatcher/payloads/SetRightPanelPhasePayload.ts
new file mode 100644
index 0000000000..75dea9f3df
--- /dev/null
+++ b/src/dispatcher/payloads/SetRightPanelPhasePayload.ts
@@ -0,0 +1,37 @@
+/*
+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 { VerificationRequest } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { RightPanelPhases } from "../../stores/RightPanelStorePhases";
+import { ActionPayload } from "../payloads";
+import { Action } from "../actions";
+
+export interface SetRightPanelPhasePayload extends ActionPayload {
+    action: Action.SetRightPanelPhase;
+
+    phase: RightPanelPhases;
+    refireParams?: SetRightPanelPhaseRefireParams;
+}
+
+export interface SetRightPanelPhaseRefireParams {
+    member?: RoomMember;
+    verificationRequest?: VerificationRequest;
+    groupId?: string;
+    groupRoomId?: string;
+    // XXX: The type for event should 'view_3pid_invite' action's payload
+    event?: any;
+}
diff --git a/src/dispatcher/payloads/ToggleRightPanelPayload.ts b/src/dispatcher/payloads/ToggleRightPanelPayload.ts
new file mode 100644
index 0000000000..0635194890
--- /dev/null
+++ b/src/dispatcher/payloads/ToggleRightPanelPayload.ts
@@ -0,0 +1,27 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { ActionPayload } from "../payloads";
+import { Action } from "../actions";
+
+export interface ToggleRightPanelPayload extends ActionPayload {
+    action: Action.ToggleRightPanel;
+
+    /**
+     * The type of room that the panel is toggled in.
+     */
+    type: "group" | "room";
+}
diff --git a/src/dispatcher/payloads/UpdateFontSizePayload.ts b/src/dispatcher/payloads/UpdateFontSizePayload.ts
new file mode 100644
index 0000000000..6577acd594
--- /dev/null
+++ b/src/dispatcher/payloads/UpdateFontSizePayload.ts
@@ -0,0 +1,27 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { ActionPayload } from "../payloads";
+import { Action } from "../actions";
+
+export interface UpdateFontSizePayload extends ActionPayload {
+    action: Action.UpdateFontSize;
+
+    /**
+     * The font size to set the root to
+     */
+    size: number;
+}
diff --git a/src/dispatcher/payloads/UpdateSystemFontPayload.ts b/src/dispatcher/payloads/UpdateSystemFontPayload.ts
new file mode 100644
index 0000000000..aa59db5aa9
--- /dev/null
+++ b/src/dispatcher/payloads/UpdateSystemFontPayload.ts
@@ -0,0 +1,32 @@
+/*
+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 { ActionPayload } from "../payloads";
+import { Action } from "../actions";
+
+export interface UpdateSystemFontPayload extends ActionPayload {
+    action: Action.UpdateSystemFont;
+
+    /**
+     * Specify whether to use a system font or the stylesheet font
+     */
+    useSystemFont: boolean;
+
+    /**
+     * The system font to use
+     */
+    font: string;
+}
diff --git a/res/css/views/dialogs/_EncryptedEventDialog.scss b/src/dispatcher/payloads/ViewRoomDeltaPayload.ts
similarity index 54%
rename from res/css/views/dialogs/_EncryptedEventDialog.scss
rename to src/dispatcher/payloads/ViewRoomDeltaPayload.ts
index ff73df509d..de33a88b2e 100644
--- a/res/css/views/dialogs/_EncryptedEventDialog.scss
+++ b/src/dispatcher/payloads/ViewRoomDeltaPayload.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 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,21 +14,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_EncryptedEventDialog .mx_DeviceVerifyButtons {
-    float: right;
-    padding: 0px;
-    margin-right: 42px;
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between;
-}
+import { ActionPayload } from "../payloads";
+import { Action } from "../actions";
 
-.mx_EncryptedEventDialog .mx_MemberDeviceInfo_textButton {
-    @mixin mx_DialogButton;
-    background-color: $primary-bg-color;
-    color: $accent-color;
-}
+export interface ViewRoomDeltaPayload extends ActionPayload {
+    action: Action.ViewRoomDelta;
 
-.mx_EncryptedEventDialog button {
-    margin-top: 0px;
+    /**
+     * The delta index of the room to view.
+     */
+    delta: number;
+
+    /**
+     * Optionally, whether or not to filter to unread (Bold/Grey/Red) rooms only. (Default: false)
+     */
+    unread?: boolean;
 }
diff --git a/src/dispatcher/payloads/ViewUserPayload.ts b/src/dispatcher/payloads/ViewUserPayload.ts
new file mode 100644
index 0000000000..c2838d0dbb
--- /dev/null
+++ b/src/dispatcher/payloads/ViewUserPayload.ts
@@ -0,0 +1,29 @@
+/*
+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 { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { ActionPayload } from "../payloads";
+import { Action } from "../actions";
+
+export interface ViewUserPayload extends ActionPayload {
+    action: Action.ViewUser;
+
+    /**
+     * The member to view. May be null or falsy to indicate that no member
+     * should be shown (hide whichever relevant components).
+     */
+    member?: RoomMember;
+}
diff --git a/src/editor/autocomplete.js b/src/editor/autocomplete.js
deleted file mode 100644
index fcde6e0ce4..0000000000
--- a/src/editor/autocomplete.js
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-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.
-*/
-
-export default class AutocompleteWrapperModel {
-    constructor(updateCallback, getAutocompleterComponent, updateQuery, partCreator) {
-        this._updateCallback = updateCallback;
-        this._getAutocompleterComponent = getAutocompleterComponent;
-        this._updateQuery = updateQuery;
-        this._partCreator = partCreator;
-        this._query = null;
-    }
-
-    onEscape(e) {
-        this._getAutocompleterComponent().onEscape(e);
-        this._updateCallback({
-            replaceParts: [this._partCreator.plain(this._queryPart.text)],
-            close: true,
-        });
-    }
-
-    close() {
-        this._updateCallback({close: true});
-    }
-
-    hasSelection() {
-        return this._getAutocompleterComponent().hasSelection();
-    }
-
-    hasCompletions() {
-        const ac = this._getAutocompleterComponent();
-        return ac && ac.countCompletions() > 0;
-    }
-
-    onEnter() {
-        this._updateCallback({close: true});
-    }
-
-    async onTab(e) {
-        const acComponent = this._getAutocompleterComponent();
-
-        if (acComponent.countCompletions() === 0) {
-            // Force completions to show for the text currently entered
-            await acComponent.forceComplete();
-            // Select the first item by moving "down"
-            await acComponent.moveSelection(+1);
-        } else {
-            await acComponent.moveSelection(e.shiftKey ? -1 : +1);
-        }
-    }
-
-    onUpArrow() {
-        this._getAutocompleterComponent().moveSelection(-1);
-    }
-
-    onDownArrow() {
-        this._getAutocompleterComponent().moveSelection(+1);
-    }
-
-    onPartUpdate(part, pos) {
-        // cache the typed value and caret here
-        // so we can restore it in onComponentSelectionChange when the value is undefined (meaning it should be the typed text)
-        this._queryPart = part;
-        this._partIndex = pos.index;
-        return this._updateQuery(part.text);
-    }
-
-    onComponentSelectionChange(completion) {
-        if (!completion) {
-            this._updateCallback({
-                replaceParts: [this._queryPart],
-            });
-        } else {
-            this._updateCallback({
-                replaceParts: this._partForCompletion(completion),
-            });
-        }
-    }
-
-    onComponentConfirm(completion) {
-        this._updateCallback({
-            replaceParts: this._partForCompletion(completion),
-            close: true,
-        });
-    }
-
-    _partForCompletion(completion) {
-        const {completionId} = completion;
-        const text = completion.completion;
-        switch (completion.type) {
-            case "room":
-                return [this._partCreator.roomPill(text, completionId), this._partCreator.plain(completion.suffix)];
-            case "at-room":
-                return [this._partCreator.atRoomPill(completionId), this._partCreator.plain(completion.suffix)];
-            case "user":
-                // not using suffix here, because we also need to calculate
-                // the suffix when clicking a display name to insert a mention,
-                // which happens in createMentionParts
-                return this._partCreator.createMentionParts(this._partIndex, text, completionId);
-            case "command":
-                // command needs special handling for auto complete, but also renders as plain texts
-                return [this._partCreator.command(text)];
-            default:
-                // used for emoji and other plain text completion replacement
-                return [this._partCreator.plain(text)];
-        }
-    }
-}
diff --git a/src/editor/autocomplete.ts b/src/editor/autocomplete.ts
new file mode 100644
index 0000000000..d8cea961d4
--- /dev/null
+++ b/src/editor/autocomplete.ts
@@ -0,0 +1,140 @@
+/*
+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 {KeyboardEvent} from "react";
+
+import {Part, CommandPartCreator, PartCreator} from "./parts";
+import DocumentPosition from "./position";
+import {ICompletion} from "../autocomplete/Autocompleter";
+import Autocomplete from "../components/views/rooms/Autocomplete";
+
+export interface ICallback {
+    replaceParts?: Part[];
+    close?: boolean;
+}
+
+export type UpdateCallback = (data: ICallback) => void;
+export type GetAutocompleterComponent = () => Autocomplete;
+export type UpdateQuery = (test: string) => Promise<void>;
+
+export default class AutocompleteWrapperModel {
+    private queryPart: Part;
+    private partIndex: number;
+
+    constructor(
+        private updateCallback: UpdateCallback,
+        private getAutocompleterComponent: GetAutocompleterComponent,
+        private updateQuery: UpdateQuery,
+        private partCreator: PartCreator | CommandPartCreator,
+    ) {
+    }
+
+    public onEscape(e: KeyboardEvent) {
+        this.getAutocompleterComponent().onEscape(e);
+        this.updateCallback({
+            replaceParts: [this.partCreator.plain(this.queryPart.text)],
+            close: true,
+        });
+    }
+
+    public close() {
+        this.updateCallback({close: true});
+    }
+
+    public hasSelection() {
+        return this.getAutocompleterComponent().hasSelection();
+    }
+
+    public hasCompletions() {
+        const ac = this.getAutocompleterComponent();
+        return ac && ac.countCompletions() > 0;
+    }
+
+    public onEnter() {
+        this.updateCallback({close: true});
+    }
+
+    public async onTab(e: KeyboardEvent) {
+        const acComponent = this.getAutocompleterComponent();
+
+        if (acComponent.countCompletions() === 0) {
+            // Force completions to show for the text currently entered
+            await acComponent.forceComplete();
+            // Select the first item by moving "down"
+            await acComponent.moveSelection(+1);
+        } else {
+            await acComponent.moveSelection(e.shiftKey ? -1 : +1);
+        }
+    }
+
+    public onUpArrow(e: KeyboardEvent) {
+        this.getAutocompleterComponent().moveSelection(-1);
+    }
+
+    public onDownArrow(e: KeyboardEvent) {
+        this.getAutocompleterComponent().moveSelection(+1);
+    }
+
+    public onPartUpdate(part: Part, pos: DocumentPosition) {
+        // cache the typed value and caret here
+        // so we can restore it in onComponentSelectionChange when the value is undefined (meaning it should be the typed text)
+        this.queryPart = part;
+        this.partIndex = pos.index;
+        return this.updateQuery(part.text);
+    }
+
+    public onComponentSelectionChange(completion: ICompletion) {
+        if (!completion) {
+            this.updateCallback({
+                replaceParts: [this.queryPart],
+            });
+        } else {
+            this.updateCallback({
+                replaceParts: this.partForCompletion(completion),
+            });
+        }
+    }
+
+    public onComponentConfirm(completion: ICompletion) {
+        this.updateCallback({
+            replaceParts: this.partForCompletion(completion),
+            close: true,
+        });
+    }
+
+    private partForCompletion(completion: ICompletion) {
+        const {completionId} = completion;
+        const text = completion.completion;
+        switch (completion.type) {
+            case "room":
+                return [this.partCreator.roomPill(text, completionId), this.partCreator.plain(completion.suffix)];
+            case "at-room":
+                return [this.partCreator.atRoomPill(completionId), this.partCreator.plain(completion.suffix)];
+            case "user":
+                // not using suffix here, because we also need to calculate
+                // the suffix when clicking a display name to insert a mention,
+                // which happens in createMentionParts
+                return this.partCreator.createMentionParts(this.partIndex, text, completionId);
+            case "command":
+                // command needs special handling for auto complete, but also renders as plain texts
+                return [(this.partCreator as CommandPartCreator).command(text)];
+            default:
+                // used for emoji and other plain text completion replacement
+                return [this.partCreator.plain(text)];
+        }
+    }
+}
diff --git a/src/editor/caret.js b/src/editor/caret.ts
similarity index 85%
rename from src/editor/caret.js
rename to src/editor/caret.ts
index 8c0090a6f1..cb4978caf4 100644
--- a/src/editor/caret.js
+++ b/src/editor/caret.ts
@@ -17,8 +17,13 @@ limitations under the License.
 
 import {needsCaretNodeBefore, needsCaretNodeAfter} from "./render";
 import Range from "./range";
+import EditorModel from "./model";
+import DocumentPosition, {IPosition} from "./position";
+import {Part} from "./parts";
 
-export function setSelection(editor, model, selection) {
+export type Caret = Range | DocumentPosition;
+
+export function setSelection(editor: HTMLDivElement, model: EditorModel, selection: Range | IPosition) {
     if (selection instanceof Range) {
         setDocumentRangeSelection(editor, model, selection);
     } else {
@@ -26,7 +31,7 @@ export function setSelection(editor, model, selection) {
     }
 }
 
-function setDocumentRangeSelection(editor, model, range) {
+function setDocumentRangeSelection(editor: HTMLDivElement, model: EditorModel, range: Range) {
     const sel = document.getSelection();
     sel.removeAllRanges();
     const selectionRange = document.createRange();
@@ -37,7 +42,7 @@ function setDocumentRangeSelection(editor, model, range) {
     sel.addRange(selectionRange);
 }
 
-export function setCaretPosition(editor, model, caretPosition) {
+export function setCaretPosition(editor: HTMLDivElement, model: EditorModel, caretPosition: IPosition) {
     const range = document.createRange();
     const {node, offset} = getNodeAndOffsetForPosition(editor, model, caretPosition);
     range.setStart(node, offset);
@@ -54,7 +59,7 @@ export function setCaretPosition(editor, model, caretPosition) {
             // If the selection matches, it's important to leave it alone.
             // Recreating the selection state in at least Chrome can cause
             // strange side effects, like touch bar flickering on every key.
-            // See https://github.com/vector-im/riot-web/issues/9299
+            // See https://github.com/vector-im/element-web/issues/9299
             return;
         }
     }
@@ -62,7 +67,7 @@ export function setCaretPosition(editor, model, caretPosition) {
     sel.addRange(range);
 }
 
-function getNodeAndOffsetForPosition(editor, model, position) {
+function getNodeAndOffsetForPosition(editor: HTMLDivElement, model: EditorModel, position: IPosition) {
     const {offset, lineIndex, nodeIndex} = getLineAndNodePosition(model, position);
     const lineNode = editor.childNodes[lineIndex];
 
@@ -80,7 +85,7 @@ function getNodeAndOffsetForPosition(editor, model, position) {
     return {node: focusNode, offset};
 }
 
-export function getLineAndNodePosition(model, caretPosition) {
+export function getLineAndNodePosition(model: EditorModel, caretPosition: IPosition) {
     const {parts} = model;
     const partIndex = caretPosition.index;
     const lineResult = findNodeInLineForPart(parts, partIndex);
@@ -99,7 +104,7 @@ export function getLineAndNodePosition(model, caretPosition) {
     return {lineIndex, nodeIndex, offset};
 }
 
-function findNodeInLineForPart(parts, partIndex) {
+function findNodeInLineForPart(parts: Part[], partIndex: number) {
     let lineIndex = 0;
     let nodeIndex = -1;
 
@@ -135,7 +140,7 @@ function findNodeInLineForPart(parts, partIndex) {
     return {lineIndex, nodeIndex};
 }
 
-function moveOutOfUneditablePart(parts, partIndex, nodeIndex, offset) {
+function moveOutOfUneditablePart(parts: Part[], partIndex: number, nodeIndex: number, offset: number) {
     // move caret before or after uneditable part
     const part = parts[partIndex];
     if (part && !part.canEdit) {
diff --git a/src/editor/deserialize.ts b/src/editor/deserialize.ts
index 48d1d98ae4..ec697b193c 100644
--- a/src/editor/deserialize.ts
+++ b/src/editor/deserialize.ts
@@ -64,7 +64,7 @@ function parseCodeBlock(n: HTMLElement, partCreator: PartCreator) {
     let language = "";
     if (n.firstChild && n.firstChild.nodeName === "CODE") {
         for (const className of (<HTMLElement>n.firstChild).classList) {
-            if (className.startsWith("language-")) {
+            if (className.startsWith("language-") && !className.startsWith("language-_")) {
                 language = className.substr("language-".length);
                 break;
             }
@@ -158,7 +158,7 @@ function checkDescendInto(node) {
 
 function checkIgnored(n) {
     if (n.nodeType === Node.TEXT_NODE) {
-        // riot adds \n text nodes in a lot of places,
+        // Element adds \n text nodes in a lot of places,
         // which should be ignored
         return n.nodeValue === "\n";
     } else if (n.nodeType === Node.ELEMENT_NODE) {
@@ -257,7 +257,7 @@ function parseHtmlMessage(html: string, partCreator: PartCreator, isQuotedMessag
     return parts;
 }
 
-export function parsePlainTextMessage(body: string, partCreator: PartCreator, isQuotedMessage: boolean) {
+export function parsePlainTextMessage(body: string, partCreator: PartCreator, isQuotedMessage?: boolean) {
     const lines = body.split(/\r\n|\r|\n/g); // split on any new-line combination not just \n, collapses \r\n
     return lines.reduce((parts, line, i) => {
         if (isQuotedMessage) {
diff --git a/src/editor/diff.js b/src/editor/diff.ts
similarity index 87%
rename from src/editor/diff.js
rename to src/editor/diff.ts
index 27d10689b3..cda454306a 100644
--- a/src/editor/diff.js
+++ b/src/editor/diff.ts
@@ -15,7 +15,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-function firstDiff(a, b) {
+export interface IDiff {
+    removed?: string;
+    added?: string;
+    at?: number;
+}
+
+function firstDiff(a: string, b: string) {
     const compareLen = Math.min(a.length, b.length);
     for (let i = 0; i < compareLen; ++i) {
         if (a[i] !== b[i]) {
@@ -25,7 +31,7 @@ function firstDiff(a, b) {
     return compareLen;
 }
 
-function diffStringsAtEnd(oldStr, newStr) {
+function diffStringsAtEnd(oldStr: string, newStr: string): IDiff {
     const len = Math.min(oldStr.length, newStr.length);
     const startInCommon = oldStr.substr(0, len) === newStr.substr(0, len);
     if (startInCommon && oldStr.length > newStr.length) {
@@ -43,7 +49,7 @@ function diffStringsAtEnd(oldStr, newStr) {
 }
 
 // assumes only characters have been deleted at one location in the string, and none added
-export function diffDeletion(oldStr, newStr) {
+export function diffDeletion(oldStr: string, newStr: string): IDiff {
     if (oldStr === newStr) {
         return {};
     }
@@ -61,7 +67,7 @@ export function diffDeletion(oldStr, newStr) {
  *                  `added` with the added string (if any), and
  *                  `removed` with the removed string (if any)
  */
-export function diffAtCaret(oldValue, newValue, caretPosition) {
+export function diffAtCaret(oldValue: string, newValue: string, caretPosition: number): IDiff {
     const diffLen = newValue.length - oldValue.length;
     const caretPositionBeforeInput = caretPosition - diffLen;
     const oldValueBeforeCaret = oldValue.substr(0, caretPositionBeforeInput);
diff --git a/src/editor/dom.js b/src/editor/dom.ts
similarity index 92%
rename from src/editor/dom.js
rename to src/editor/dom.ts
index 3efc64f1c9..1ca41553f4 100644
--- a/src/editor/dom.js
+++ b/src/editor/dom.ts
@@ -18,7 +18,10 @@ limitations under the License.
 import {CARET_NODE_CHAR, isCaretNode} from "./render";
 import DocumentOffset from "./offset";
 
-export function walkDOMDepthFirst(rootNode, enterNodeCallback, leaveNodeCallback) {
+type Predicate = (node: Node) => boolean;
+type Callback = (node: Node) => void;
+
+export function walkDOMDepthFirst(rootNode: Node, enterNodeCallback: Predicate, leaveNodeCallback: Callback) {
     let node = rootNode.firstChild;
     while (node && node !== rootNode) {
         const shouldDescend = enterNodeCallback(node);
@@ -40,12 +43,12 @@ export function walkDOMDepthFirst(rootNode, enterNodeCallback, leaveNodeCallback
     }
 }
 
-export function getCaretOffsetAndText(editor, sel) {
+export function getCaretOffsetAndText(editor: HTMLDivElement, sel: Selection) {
     const {offset, text} = getSelectionOffsetAndText(editor, sel.focusNode, sel.focusOffset);
     return {caret: offset, text};
 }
 
-function tryReduceSelectionToTextNode(selectionNode, selectionOffset) {
+function tryReduceSelectionToTextNode(selectionNode: Node, selectionOffset: number) {
     // if selectionNode is an element, the selected location comes after the selectionOffset-th child node,
     // which can point past any childNode, in which case, the end of selectionNode is selected.
     // we try to simplify this to point at a text node with the offset being
@@ -82,7 +85,7 @@ function tryReduceSelectionToTextNode(selectionNode, selectionOffset) {
     };
 }
 
-function getSelectionOffsetAndText(editor, selectionNode, selectionOffset) {
+function getSelectionOffsetAndText(editor: HTMLDivElement, selectionNode: Node, selectionOffset: number) {
     const {node, characterOffset} = tryReduceSelectionToTextNode(selectionNode, selectionOffset);
     const {text, offsetToNode} = getTextAndOffsetToNode(editor, node);
     const offset = getCaret(node, offsetToNode, characterOffset);
@@ -91,7 +94,7 @@ function getSelectionOffsetAndText(editor, selectionNode, selectionOffset) {
 
 // gets the caret position details, ignoring and adjusting to
 // the ZWS if you're typing in a caret node
-function getCaret(node, offsetToNode, offsetWithinNode) {
+function getCaret(node: Node, offsetToNode: number, offsetWithinNode: number) {
     // if no node is selected, return an offset at the start
     if (!node) {
         return new DocumentOffset(0, false);
@@ -114,7 +117,7 @@ function getCaret(node, offsetToNode, offsetWithinNode) {
 // gets the text of the editor as a string,
 // and the offset in characters where the selectionNode starts in that string
 // all ZWS from caret nodes are filtered out
-function getTextAndOffsetToNode(editor, selectionNode) {
+function getTextAndOffsetToNode(editor: HTMLDivElement, selectionNode: Node) {
     let offsetToNode = 0;
     let foundNode = false;
     let text = "";
diff --git a/src/editor/history.js b/src/editor/history.ts
similarity index 52%
rename from src/editor/history.js
rename to src/editor/history.ts
index d66def4704..d2c96a3755 100644
--- a/src/editor/history.js
+++ b/src/editor/history.ts
@@ -14,25 +14,40 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import EditorModel from "./model";
+import {IDiff} from "./diff";
+import {SerializedPart} from "./parts";
+import {Caret} from "./caret";
+
+interface IHistory {
+    parts: SerializedPart[];
+    caret: Caret;
+}
+
 export const MAX_STEP_LENGTH = 10;
 
 export default class HistoryManager {
-    constructor() {
-        this.clear();
-    }
+    private stack: IHistory[] = [];
+    private newlyTypedCharCount = 0;
+    private currentIndex = -1;
+    private changedSinceLastPush = false;
+    private lastCaret: Caret = null;
+    private nonWordBoundarySinceLastPush = false;
+    private addedSinceLastPush = false;
+    private removedSinceLastPush = false;
 
     clear() {
-        this._stack = [];
-        this._newlyTypedCharCount = 0;
-        this._currentIndex = -1;
-        this._changedSinceLastPush = false;
-        this._lastCaret = null;
-        this._nonWordBoundarySinceLastPush = false;
-        this._addedSinceLastPush = false;
-        this._removedSinceLastPush = false;
+        this.stack = [];
+        this.newlyTypedCharCount = 0;
+        this.currentIndex = -1;
+        this.changedSinceLastPush = false;
+        this.lastCaret = null;
+        this.nonWordBoundarySinceLastPush = false;
+        this.addedSinceLastPush = false;
+        this.removedSinceLastPush = false;
     }
 
-    _shouldPush(inputType, diff) {
+    private shouldPush(inputType, diff) {
         // right now we can only push a step after
         // the input has been applied to the model,
         // so we can't push the state before something happened.
@@ -43,24 +58,24 @@ export default class HistoryManager {
                                inputType === "deleteContentBackward";
         if (diff && isNonBulkInput) {
             if (diff.added) {
-                this._addedSinceLastPush = true;
+                this.addedSinceLastPush = true;
             }
             if (diff.removed) {
-                this._removedSinceLastPush = true;
+                this.removedSinceLastPush = true;
             }
             // as long as you've only been adding or removing since the last push
-            if (this._addedSinceLastPush !== this._removedSinceLastPush) {
+            if (this.addedSinceLastPush !== this.removedSinceLastPush) {
                 // add steps by word boundary, up to MAX_STEP_LENGTH characters
                 const str = diff.added ? diff.added : diff.removed;
                 const isWordBoundary = str === " " || str === "\t" || str === "\n";
-                if (this._nonWordBoundarySinceLastPush && isWordBoundary) {
+                if (this.nonWordBoundarySinceLastPush && isWordBoundary) {
                     return true;
                 }
                 if (!isWordBoundary) {
-                    this._nonWordBoundarySinceLastPush = true;
+                    this.nonWordBoundarySinceLastPush = true;
                 }
-                this._newlyTypedCharCount += str.length;
-                return this._newlyTypedCharCount > MAX_STEP_LENGTH;
+                this.newlyTypedCharCount += str.length;
+                return this.newlyTypedCharCount > MAX_STEP_LENGTH;
             } else {
                 // if starting to remove while adding before, or the opposite, push
                 return true;
@@ -71,24 +86,24 @@ export default class HistoryManager {
         }
     }
 
-    _pushState(model, caret) {
+    private pushState(model: EditorModel, caret: Caret) {
         // remove all steps after current step
-        while (this._currentIndex < (this._stack.length - 1)) {
-            this._stack.pop();
+        while (this.currentIndex < (this.stack.length - 1)) {
+            this.stack.pop();
         }
         const parts = model.serializeParts();
-        this._stack.push({parts, caret});
-        this._currentIndex = this._stack.length - 1;
-        this._lastCaret = null;
-        this._changedSinceLastPush = false;
-        this._newlyTypedCharCount = 0;
-        this._nonWordBoundarySinceLastPush = false;
-        this._addedSinceLastPush = false;
-        this._removedSinceLastPush = false;
+        this.stack.push({parts, caret});
+        this.currentIndex = this.stack.length - 1;
+        this.lastCaret = null;
+        this.changedSinceLastPush = false;
+        this.newlyTypedCharCount = 0;
+        this.nonWordBoundarySinceLastPush = false;
+        this.addedSinceLastPush = false;
+        this.removedSinceLastPush = false;
     }
 
     // needs to persist parts and caret position
-    tryPush(model, caret, inputType, diff) {
+    tryPush(model: EditorModel, caret: Caret, inputType: string, diff: IDiff) {
         // ignore state restoration echos.
         // these respect the inputType values of the input event,
         // but are actually passed in from MessageEditor calling model.reset()
@@ -96,45 +111,45 @@ export default class HistoryManager {
         if (inputType === "historyUndo" || inputType === "historyRedo") {
             return false;
         }
-        const shouldPush = this._shouldPush(inputType, diff);
+        const shouldPush = this.shouldPush(inputType, diff);
         if (shouldPush) {
-            this._pushState(model, caret);
+            this.pushState(model, caret);
         } else {
-            this._lastCaret = caret;
-            this._changedSinceLastPush = true;
+            this.lastCaret = caret;
+            this.changedSinceLastPush = true;
         }
         return shouldPush;
     }
 
-    ensureLastChangesPushed(model) {
-        if (this._changedSinceLastPush) {
-            this._pushState(model, this._lastCaret);
+    ensureLastChangesPushed(model: EditorModel) {
+        if (this.changedSinceLastPush) {
+            this.pushState(model, this.lastCaret);
         }
     }
 
     canUndo() {
-        return this._currentIndex >= 1 || this._changedSinceLastPush;
+        return this.currentIndex >= 1 || this.changedSinceLastPush;
     }
 
     canRedo() {
-        return this._currentIndex < (this._stack.length - 1);
+        return this.currentIndex < (this.stack.length - 1);
     }
 
     // returns state that should be applied to model
-    undo(model) {
+    undo(model: EditorModel) {
         if (this.canUndo()) {
             this.ensureLastChangesPushed(model);
-            this._currentIndex -= 1;
-            return this._stack[this._currentIndex];
+            this.currentIndex -= 1;
+            return this.stack[this.currentIndex];
         }
     }
 
     // returns state that should be applied to model
     redo() {
         if (this.canRedo()) {
-            this._changedSinceLastPush = false;
-            this._currentIndex += 1;
-            return this._stack[this._currentIndex];
+            this.changedSinceLastPush = false;
+            this.currentIndex += 1;
+            return this.stack[this.currentIndex];
         }
     }
 }
diff --git a/src/editor/model.js b/src/editor/model.ts
similarity index 69%
rename from src/editor/model.js
rename to src/editor/model.ts
index 5072c5b2c6..2e70b872e9 100644
--- a/src/editor/model.js
+++ b/src/editor/model.ts
@@ -15,9 +15,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {diffAtCaret, diffDeletion} from "./diff";
-import DocumentPosition from "./position";
+import {diffAtCaret, diffDeletion, IDiff} from "./diff";
+import DocumentPosition, {IPosition} from "./position";
 import Range from "./range";
+import {SerializedPart, Part, PartCreator} from "./parts";
+import AutocompleteWrapperModel, {ICallback} from "./autocomplete";
+import DocumentOffset from "./offset";
+import {Caret} from "./caret";
 
 /**
  * @callback ModelCallback
@@ -26,7 +30,7 @@ import Range from "./range";
  * @param {object?} diff an object with `removed` and `added` strings
  */
 
- /**
+/**
  * @callback TransformCallback
  * @param {DocumentPosition?} caretPosition the position where the caret should be position
  * @param {string?} inputType the inputType of the DOM input event
@@ -40,16 +44,23 @@ import Range from "./range";
  * @return the caret position
  */
 
+type TransformCallback = (caretPosition: DocumentPosition, inputType: string, diff: IDiff) => number | void;
+type UpdateCallback = (caret: Caret, inputType?: string, diff?: IDiff) => void;
+type ManualTransformCallback = () => Caret;
+
 export default class EditorModel {
-    constructor(parts, partCreator, updateCallback = null) {
+    private _parts: Part[];
+    private readonly _partCreator: PartCreator;
+    private activePartIdx: number = null;
+    private _autoComplete: AutocompleteWrapperModel = null;
+    private autoCompletePartIdx: number = null;
+    private autoCompletePartCount = 0;
+    private transformCallback: TransformCallback = null;
+
+    constructor(parts: Part[], partCreator: PartCreator, private updateCallback: UpdateCallback = null) {
         this._parts = parts;
         this._partCreator = partCreator;
-        this._activePartIdx = null;
-        this._autoComplete = null;
-        this._autoCompletePartIdx = null;
-        this._autoCompletePartCount = 0;
-        this._transformCallback = null;
-        this.setUpdateCallback(updateCallback);
+        this.transformCallback = null;
     }
 
     /**
@@ -59,16 +70,16 @@ export default class EditorModel {
      * on the model that can span multiple parts. Also see `startRange()`.
      * @param {TransformCallback} transformCallback
      */
-    setTransformCallback(transformCallback) {
-        this._transformCallback = transformCallback;
+    setTransformCallback(transformCallback: TransformCallback) {
+        this.transformCallback = transformCallback;
     }
 
     /**
      * Set a callback for rerendering the model after it has been updated.
      * @param {ModelCallback} updateCallback
      */
-    setUpdateCallback(updateCallback) {
-        this._updateCallback = updateCallback;
+    setUpdateCallback(updateCallback: UpdateCallback) {
+        this.updateCallback = updateCallback;
     }
 
     get partCreator() {
@@ -80,34 +91,34 @@ export default class EditorModel {
     }
 
     clone() {
-        return new EditorModel(this._parts, this._partCreator, this._updateCallback);
+        return new EditorModel(this._parts, this._partCreator, this.updateCallback);
     }
 
-    _insertPart(index, part) {
+    private insertPart(index: number, part: Part) {
         this._parts.splice(index, 0, part);
-        if (this._activePartIdx >= index) {
-            ++this._activePartIdx;
+        if (this.activePartIdx >= index) {
+            ++this.activePartIdx;
         }
-        if (this._autoCompletePartIdx >= index) {
-            ++this._autoCompletePartIdx;
+        if (this.autoCompletePartIdx >= index) {
+            ++this.autoCompletePartIdx;
         }
     }
 
-    _removePart(index) {
+    private removePart(index: number) {
         this._parts.splice(index, 1);
-        if (index === this._activePartIdx) {
-            this._activePartIdx = null;
-        } else if (this._activePartIdx > index) {
-            --this._activePartIdx;
+        if (index === this.activePartIdx) {
+            this.activePartIdx = null;
+        } else if (this.activePartIdx > index) {
+            --this.activePartIdx;
         }
-        if (index === this._autoCompletePartIdx) {
-            this._autoCompletePartIdx = null;
-        } else if (this._autoCompletePartIdx > index) {
-            --this._autoCompletePartIdx;
+        if (index === this.autoCompletePartIdx) {
+            this.autoCompletePartIdx = null;
+        } else if (this.autoCompletePartIdx > index) {
+            --this.autoCompletePartIdx;
         }
     }
 
-    _replacePart(index, part) {
+    private replacePart(index: number, part: Part) {
         this._parts.splice(index, 1, part);
     }
 
@@ -116,7 +127,7 @@ export default class EditorModel {
     }
 
     get autoComplete() {
-        if (this._activePartIdx === this._autoCompletePartIdx) {
+        if (this.activePartIdx === this.autoCompletePartIdx) {
             return this._autoComplete;
         }
         return null;
@@ -137,7 +148,7 @@ export default class EditorModel {
         return this._parts.map(p => p.serialize());
     }
 
-    _diff(newValue, inputType, caret) {
+    private diff(newValue: string, inputType: string, caret: DocumentOffset) {
         const previousValue = this.parts.reduce((text, p) => text + p.text, "");
         // can't use caret position with drag and drop
         if (inputType === "deleteByDrag") {
@@ -147,7 +158,7 @@ export default class EditorModel {
         }
     }
 
-    reset(serializedParts, caret, inputType) {
+    reset(serializedParts: SerializedPart[], caret: Caret, inputType: string) {
         this._parts = serializedParts.map(p => this._partCreator.deserializePart(p));
         if (!caret) {
             caret = this.getPositionAtEnd();
@@ -157,9 +168,9 @@ export default class EditorModel {
         // a message with the autocomplete still open
         if (this._autoComplete) {
             this._autoComplete = null;
-            this._autoCompletePartIdx = null;
+            this.autoCompletePartIdx = null;
         }
-        this._updateCallback(caret, inputType);
+        this.updateCallback(caret, inputType);
     }
 
     /**
@@ -169,19 +180,19 @@ export default class EditorModel {
      * @param {DocumentPosition} position the position to start inserting at
      * @return {Number} the amount of characters added
      */
-    insert(parts, position) {
-        const insertIndex = this._splitAt(position);
+    insert(parts: Part[], position: IPosition) {
+        const insertIndex = this.splitAt(position);
         let newTextLength = 0;
         for (let i = 0; i < parts.length; ++i) {
             const part = parts[i];
             newTextLength += part.text.length;
-            this._insertPart(insertIndex + i, part);
+            this.insertPart(insertIndex + i, part);
         }
         return newTextLength;
     }
 
-    update(newValue, inputType, caret) {
-        const diff = this._diff(newValue, inputType, caret);
+    update(newValue: string, inputType: string, caret: DocumentOffset) {
+        const diff = this.diff(newValue, inputType, caret);
         const position = this.positionForOffset(diff.at, caret.atNodeEnd);
         let removedOffsetDecrease = 0;
         if (diff.removed) {
@@ -189,40 +200,40 @@ export default class EditorModel {
         }
         let addedLen = 0;
         if (diff.added) {
-            addedLen = this._addText(position, diff.added, inputType);
+            addedLen = this.addText(position, diff.added, inputType);
         }
-        this._mergeAdjacentParts();
+        this.mergeAdjacentParts();
         const caretOffset = diff.at - removedOffsetDecrease + addedLen;
         let newPosition = this.positionForOffset(caretOffset, true);
         const canOpenAutoComplete = inputType !== "insertFromPaste" && inputType !== "insertFromDrop";
-        const acPromise = this._setActivePart(newPosition, canOpenAutoComplete);
-        if (this._transformCallback) {
-            const transformAddedLen = this._transform(newPosition, inputType, diff);
+        const acPromise = this.setActivePart(newPosition, canOpenAutoComplete);
+        if (this.transformCallback) {
+            const transformAddedLen = this.getTransformAddedLen(newPosition, inputType, diff);
             newPosition = this.positionForOffset(caretOffset + transformAddedLen, true);
         }
-        this._updateCallback(newPosition, inputType, diff);
+        this.updateCallback(newPosition, inputType, diff);
         return acPromise;
     }
 
-    _transform(newPosition, inputType, diff) {
-        const result = this._transformCallback(newPosition, inputType, diff);
-        return Number.isFinite(result) ? result : 0;
+    private getTransformAddedLen(newPosition: DocumentPosition, inputType: string, diff: IDiff): number {
+        const result = this.transformCallback(newPosition, inputType, diff);
+        return Number.isFinite(result) ? result as number : 0;
     }
 
-    _setActivePart(pos, canOpenAutoComplete) {
+    private setActivePart(pos: DocumentPosition, canOpenAutoComplete: boolean) {
         const {index} = pos;
         const part = this._parts[index];
         if (part) {
-            if (index !== this._activePartIdx) {
-                this._activePartIdx = index;
-                if (canOpenAutoComplete && this._activePartIdx !== this._autoCompletePartIdx) {
+            if (index !== this.activePartIdx) {
+                this.activePartIdx = index;
+                if (canOpenAutoComplete && this.activePartIdx !== this.autoCompletePartIdx) {
                     // else try to create one
-                    const ac = part.createAutoComplete(this._onAutoComplete);
+                    const ac = part.createAutoComplete(this.onAutoComplete);
                     if (ac) {
                         // make sure that react picks up the difference between both acs
                         this._autoComplete = ac;
-                        this._autoCompletePartIdx = index;
-                        this._autoCompletePartCount = 1;
+                        this.autoCompletePartIdx = index;
+                        this.autoCompletePartCount = 1;
                     }
                 }
             }
@@ -231,35 +242,35 @@ export default class EditorModel {
                 return this.autoComplete.onPartUpdate(part, pos);
             }
         } else {
-            this._activePartIdx = null;
+            this.activePartIdx = null;
             this._autoComplete = null;
-            this._autoCompletePartIdx = null;
-            this._autoCompletePartCount = 0;
+            this.autoCompletePartIdx = null;
+            this.autoCompletePartCount = 0;
         }
         return Promise.resolve();
     }
 
-    _onAutoComplete = ({replaceParts, close}) => {
+    private onAutoComplete = ({replaceParts, close}: ICallback) => {
         let pos;
         if (replaceParts) {
-            this._parts.splice(this._autoCompletePartIdx, this._autoCompletePartCount, ...replaceParts);
-            this._autoCompletePartCount = replaceParts.length;
+            this._parts.splice(this.autoCompletePartIdx, this.autoCompletePartCount, ...replaceParts);
+            this.autoCompletePartCount = replaceParts.length;
             const lastPart = replaceParts[replaceParts.length - 1];
-            const lastPartIndex = this._autoCompletePartIdx + replaceParts.length - 1;
+            const lastPartIndex = this.autoCompletePartIdx + replaceParts.length - 1;
             pos = new DocumentPosition(lastPartIndex, lastPart.text.length);
         }
         if (close) {
             this._autoComplete = null;
-            this._autoCompletePartIdx = null;
-            this._autoCompletePartCount = 0;
+            this.autoCompletePartIdx = null;
+            this.autoCompletePartCount = 0;
         }
         // rerender even if editor contents didn't change
         // to make sure the MessageEditor checks
         // model.autoComplete being empty and closes it
-        this._updateCallback(pos);
-    }
+        this.updateCallback(pos);
+    };
 
-    _mergeAdjacentParts() {
+    private mergeAdjacentParts() {
         let prevPart;
         for (let i = 0; i < this._parts.length; ++i) {
             let part = this._parts[i];
@@ -268,7 +279,7 @@ export default class EditorModel {
             if (isEmpty || isMerged) {
                 // remove empty or merged part
                 part = prevPart;
-                this._removePart(i);
+                this.removePart(i);
                 //repeat this index, as it's removed now
                 --i;
             }
@@ -283,7 +294,7 @@ export default class EditorModel {
      * @return {Number} how many characters before pos were also removed,
      * usually because of non-editable parts that can only be removed in their entirety.
      */
-    removeText(pos, len) {
+    removeText(pos: IPosition, len: number) {
         let {index, offset} = pos;
         let removedOffsetDecrease = 0;
         while (len > 0) {
@@ -295,18 +306,18 @@ export default class EditorModel {
                 if (part.canEdit) {
                     const replaceWith = part.remove(offset, amount);
                     if (typeof replaceWith === "string") {
-                        this._replacePart(index, this._partCreator.createDefaultPart(replaceWith));
+                        this.replacePart(index, this._partCreator.createDefaultPart(replaceWith));
                     }
                     part = this._parts[index];
                     // remove empty part
                     if (!part.text.length) {
-                        this._removePart(index);
+                        this.removePart(index);
                     } else {
                         index += 1;
                     }
                 } else {
                     removedOffsetDecrease += offset;
-                    this._removePart(index);
+                    this.removePart(index);
                 }
             } else {
                 index += 1;
@@ -316,8 +327,9 @@ export default class EditorModel {
         }
         return removedOffsetDecrease;
     }
+
     // return part index where insertion will insert between at offset
-    _splitAt(pos) {
+    private splitAt(pos: IPosition) {
         if (pos.index === -1) {
             return 0;
         }
@@ -330,7 +342,7 @@ export default class EditorModel {
         }
 
         const secondPart = part.split(pos.offset);
-        this._insertPart(pos.index + 1, secondPart);
+        this.insertPart(pos.index + 1, secondPart);
         return pos.index + 1;
     }
 
@@ -344,7 +356,7 @@ export default class EditorModel {
      * @return {Number} how far from position (in characters) the insertion ended.
      * This can be more than the length of `str` when crossing non-editable parts, which are skipped.
      */
-    _addText(pos, str, inputType) {
+    private addText(pos: IPosition, str: string, inputType: string) {
         let {index} = pos;
         const {offset} = pos;
         let addLen = str.length;
@@ -356,7 +368,7 @@ export default class EditorModel {
                 } else {
                     const splitPart = part.split(offset);
                     index += 1;
-                    this._insertPart(index, splitPart);
+                    this.insertPart(index, splitPart);
                 }
             } else if (offset !== 0) {
                 // not-editable part, caret is not at start,
@@ -372,13 +384,13 @@ export default class EditorModel {
         while (str) {
             const newPart = this._partCreator.createPartForInput(str, index, inputType);
             str = newPart.appendUntilRejected(str, inputType);
-            this._insertPart(index, newPart);
+            this.insertPart(index, newPart);
             index += 1;
         }
         return addLen;
     }
 
-    positionForOffset(totalOffset, atPartEnd) {
+    positionForOffset(totalOffset: number, atPartEnd: boolean) {
         let currentOffset = 0;
         const index = this._parts.findIndex(part => {
             const partLen = part.text.length;
@@ -404,28 +416,27 @@ export default class EditorModel {
      * @param {DocumentPosition?} positionB the other boundary of the range, optional
      * @return {Range}
      */
-    startRange(positionA, positionB = positionA) {
+    startRange(positionA: DocumentPosition, positionB = positionA) {
         return new Range(this, positionA, positionB);
     }
 
-    // called from Range.replace
-    _replaceRange(startPosition, endPosition, parts) {
+    replaceRange(startPosition: DocumentPosition, endPosition: DocumentPosition, parts: Part[]) {
         // convert end position to offset, so it is independent of how the document is split into parts
         // which we'll change when splitting up at the start position
         const endOffset = endPosition.asOffset(this);
-        const newStartPartIndex = this._splitAt(startPosition);
+        const newStartPartIndex = this.splitAt(startPosition);
         // convert it back to position once split at start
         endPosition = endOffset.asPosition(this);
-        const newEndPartIndex = this._splitAt(endPosition);
+        const newEndPartIndex = this.splitAt(endPosition);
         for (let i = newEndPartIndex - 1; i >= newStartPartIndex; --i) {
-            this._removePart(i);
+            this.removePart(i);
         }
         let insertIdx = newStartPartIndex;
         for (const part of parts) {
-            this._insertPart(insertIdx, part);
+            this.insertPart(insertIdx, part);
             insertIdx += 1;
         }
-        this._mergeAdjacentParts();
+        this.mergeAdjacentParts();
     }
 
     /**
@@ -434,15 +445,15 @@ export default class EditorModel {
      * @param {ManualTransformCallback} callback to run the transformations in
      * @return {Promise} a promise when auto-complete (if applicable) is done updating
      */
-    transform(callback) {
+    transform(callback: ManualTransformCallback) {
         const pos = callback();
         let acPromise = null;
         if (!(pos instanceof Range)) {
-            acPromise = this._setActivePart(pos, true);
+            acPromise = this.setActivePart(pos, true);
         } else {
             acPromise = Promise.resolve();
         }
-        this._updateCallback(pos);
+        this.updateCallback(pos);
         return acPromise;
     }
 }
diff --git a/src/editor/offset.js b/src/editor/offset.ts
similarity index 80%
rename from src/editor/offset.js
rename to src/editor/offset.ts
index 785f16bc6d..413a22c71b 100644
--- a/src/editor/offset.js
+++ b/src/editor/offset.ts
@@ -14,17 +14,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import EditorModel from "./model";
+
 export default class DocumentOffset {
-    constructor(offset, atNodeEnd) {
-        this.offset = offset;
-        this.atNodeEnd = atNodeEnd;
+    constructor(public offset: number, public readonly atNodeEnd: boolean) {
     }
 
-    asPosition(model) {
+    asPosition(model: EditorModel) {
         return model.positionForOffset(this.offset, this.atNodeEnd);
     }
 
-    add(delta, atNodeEnd = false) {
+    add(delta: number, atNodeEnd = false) {
         return new DocumentOffset(this.offset + delta, atNodeEnd);
     }
 }
diff --git a/src/editor/operations.js b/src/editor/operations.ts
similarity index 89%
rename from src/editor/operations.js
rename to src/editor/operations.ts
index d677d7016c..3f07139de3 100644
--- a/src/editor/operations.js
+++ b/src/editor/operations.ts
@@ -14,11 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import Range from "./range";
+import {Part} from "./parts";
+
 /**
  * Some common queries and transformations on the editor model
  */
 
-export function replaceRangeAndExpandSelection(range, newParts) {
+export function replaceRangeAndExpandSelection(range: Range, newParts: Part[]) {
     const {model} = range;
     model.transform(() => {
         const oldLen = range.length;
@@ -29,7 +32,7 @@ export function replaceRangeAndExpandSelection(range, newParts) {
     });
 }
 
-export function replaceRangeAndMoveCaret(range, newParts) {
+export function replaceRangeAndMoveCaret(range: Range, newParts: Part[]) {
     const {model} = range;
     model.transform(() => {
         const oldLen = range.length;
@@ -40,7 +43,7 @@ export function replaceRangeAndMoveCaret(range, newParts) {
     });
 }
 
-export function rangeStartsAtBeginningOfLine(range) {
+export function rangeStartsAtBeginningOfLine(range: Range) {
     const {model} = range;
     const startsWithPartial = range.start.offset !== 0;
     const isFirstPart = range.start.index === 0;
@@ -48,16 +51,16 @@ export function rangeStartsAtBeginningOfLine(range) {
     return !startsWithPartial && (isFirstPart || previousIsNewline);
 }
 
-export function rangeEndsAtEndOfLine(range) {
+export function rangeEndsAtEndOfLine(range: Range) {
     const {model} = range;
     const lastPart = model.parts[range.end.index];
-    const endsWithPartial = range.end.offset !== lastPart.length;
+    const endsWithPartial = range.end.offset !== lastPart.text.length;
     const isLastPart = range.end.index === model.parts.length - 1;
     const nextIsNewline = !isLastPart && model.parts[range.end.index + 1].type === "newline";
     return !endsWithPartial && (isLastPart || nextIsNewline);
 }
 
-export function formatRangeAsQuote(range) {
+export function formatRangeAsQuote(range: Range) {
     const {model, parts} = range;
     const {partCreator} = model;
     for (let i = 0; i < parts.length; ++i) {
@@ -78,7 +81,7 @@ export function formatRangeAsQuote(range) {
     replaceRangeAndExpandSelection(range, parts);
 }
 
-export function formatRangeAsCode(range) {
+export function formatRangeAsCode(range: Range) {
     const {model, parts} = range;
     const {partCreator} = model;
     const needsBlock = parts.some(p => p.type === "newline");
@@ -104,7 +107,7 @@ export function formatRangeAsCode(range) {
 const isBlank = part => !part.text || !/\S/.test(part.text);
 const isNL = part => part.type === "newline";
 
-export function toggleInlineFormat(range, prefix, suffix = prefix) {
+export function toggleInlineFormat(range: Range, prefix: string, suffix = prefix) {
     const {model, parts} = range;
     const {partCreator} = model;
 
@@ -140,10 +143,10 @@ export function toggleInlineFormat(range, prefix, suffix = prefix) {
 
     // keep track of how many things we have inserted as an offset:=0
     let offset = 0;
-    paragraphIndexes.forEach(([startIndex, endIndex]) => {
+    paragraphIndexes.forEach(([startIdx, endIdx]) => {
         // for each paragraph apply the same rule
-        const base = startIndex + offset;
-        const index = endIndex + offset;
+        const base = startIdx + offset;
+        const index = endIdx + offset;
 
         const isFormatted = (index - base > 0) &&
             parts[base].text.startsWith(prefix) &&
diff --git a/src/editor/parts.js b/src/editor/parts.ts
similarity index 56%
rename from src/editor/parts.js
rename to src/editor/parts.ts
index acd27ac219..5ed0c0529f 100644
--- a/src/editor/parts.js
+++ b/src/editor/parts.ts
@@ -15,27 +15,89 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import AutocompleteWrapperModel from "./autocomplete";
+import {MatrixClient} from "matrix-js-sdk/src/client";
+import {RoomMember} from "matrix-js-sdk/src/models/room-member";
+import {Room} from "matrix-js-sdk/src/models/room";
+
+import AutocompleteWrapperModel, {
+    GetAutocompleterComponent,
+    UpdateCallback,
+    UpdateQuery,
+} from "./autocomplete";
 import * as Avatar from "../Avatar";
 
-class BasePart {
+interface ISerializedPart {
+    type: Type.Plain | Type.Newline | Type.Command | Type.PillCandidate;
+    text: string;
+}
+
+interface ISerializedPillPart {
+    type: Type.AtRoomPill | Type.RoomPill | Type.UserPill;
+    text: string;
+    resourceId: string;
+}
+
+export type SerializedPart = ISerializedPart | ISerializedPillPart;
+
+enum Type {
+    Plain = "plain",
+    Newline = "newline",
+    Command = "command",
+    UserPill = "user-pill",
+    RoomPill = "room-pill",
+    AtRoomPill = "at-room-pill",
+    PillCandidate = "pill-candidate",
+}
+
+interface IBasePart {
+    text: string;
+    type: Type.Plain | Type.Newline;
+    canEdit: boolean;
+
+    createAutoComplete(updateCallback: UpdateCallback): void;
+
+    serialize(): SerializedPart;
+    remove(offset: number, len: number): string;
+    split(offset: number): IBasePart;
+    validateAndInsert(offset: number, str: string, inputType: string): boolean;
+    appendUntilRejected(str: string, inputType: string): string;
+    updateDOMNode(node: Node);
+    canUpdateDOMNode(node: Node);
+    toDOMNode(): Node;
+}
+
+interface IPillCandidatePart extends Omit<IBasePart, "type" | "createAutoComplete"> {
+    type: Type.PillCandidate | Type.Command;
+    createAutoComplete(updateCallback: UpdateCallback): AutocompleteWrapperModel;
+}
+
+interface IPillPart extends Omit<IBasePart, "type" | "resourceId"> {
+    type: Type.AtRoomPill | Type.RoomPill | Type.UserPill;
+    resourceId: string;
+}
+
+export type Part = IBasePart | IPillCandidatePart | IPillPart;
+
+abstract class BasePart {
+    protected _text: string;
+
     constructor(text = "") {
         this._text = text;
     }
 
-    acceptsInsertion(chr, offset, inputType) {
+    acceptsInsertion(chr: string, offset: number, inputType: string) {
         return true;
     }
 
-    acceptsRemoval(position, chr) {
+    acceptsRemoval(position: number, chr: string) {
         return true;
     }
 
-    merge(part) {
+    merge(part: Part) {
         return false;
     }
 
-    split(offset) {
+    split(offset: number) {
         const splitText = this.text.substr(offset);
         this._text = this.text.substr(0, offset);
         return new PlainPart(splitText);
@@ -43,7 +105,7 @@ class BasePart {
 
     // removes len chars, or returns the plain text this part should be replaced with
     // if the part would become invalid if it removed everything.
-    remove(offset, len) {
+    remove(offset: number, len: number) {
         // validate
         const strWithRemoval = this.text.substr(0, offset) + this.text.substr(offset + len);
         for (let i = offset; i < (len + offset); ++i) {
@@ -56,7 +118,7 @@ class BasePart {
     }
 
     // append str, returns the remaining string if a character was rejected.
-    appendUntilRejected(str, inputType) {
+    appendUntilRejected(str: string, inputType: string) {
         const offset = this.text.length;
         for (let i = 0; i < str.length; ++i) {
             const chr = str.charAt(i);
@@ -70,7 +132,7 @@ class BasePart {
 
     // inserts str at offset if all the characters in str were accepted, otherwise don't do anything
     // return whether the str was accepted or not.
-    validateAndInsert(offset, str, inputType) {
+    validateAndInsert(offset: number, str: string, inputType: string) {
         for (let i = 0; i < str.length; ++i) {
             const chr = str.charAt(i);
             if (!this.acceptsInsertion(chr, offset + i, inputType)) {
@@ -83,9 +145,9 @@ class BasePart {
         return true;
     }
 
-    createAutoComplete() {}
+    createAutoComplete(updateCallback: UpdateCallback): void {}
 
-    trim(len) {
+    trim(len: number) {
         const remaining = this._text.substr(len);
         this._text = this._text.substr(0, len);
         return remaining;
@@ -95,6 +157,8 @@ class BasePart {
         return this._text;
     }
 
+    abstract get type(): Type;
+
     get canEdit() {
         return true;
     }
@@ -103,20 +167,30 @@ class BasePart {
         return `${this.type}(${this.text})`;
     }
 
-    serialize() {
-        return {type: this.type, text: this.text};
+    serialize(): SerializedPart {
+        return {
+            type: this.type as ISerializedPart["type"],
+            text: this.text,
+        };
     }
+
+    abstract updateDOMNode(node: Node);
+    abstract canUpdateDOMNode(node: Node);
+    abstract toDOMNode(): Node;
 }
 
-// exported for unit tests, should otherwise only be used through PartCreator
-export class PlainPart extends BasePart {
-    acceptsInsertion(chr, offset, inputType) {
+abstract class PlainBasePart extends BasePart {
+    acceptsInsertion(chr: string, offset: number, inputType: string) {
         if (chr === "\n") {
             return false;
         }
         // when not pasting or dropping text, reject characters that should start a pill candidate
         if (inputType !== "insertFromPaste" && inputType !== "insertFromDrop") {
-            return chr !== "@" && chr !== "#" && chr !== ":";
+            if (chr !== "@" && chr !== "#" && chr !== ":" && chr !== "+") {
+                return true;
+            }
+            // only split if the previous character is a space
+            return this._text[offset - 1] !== " ";
         }
         return true;
     }
@@ -133,32 +207,34 @@ export class PlainPart extends BasePart {
         return false;
     }
 
-    get type() {
-        return "plain";
-    }
-
-    updateDOMNode(node) {
+    updateDOMNode(node: Node) {
         if (node.textContent !== this.text) {
             node.textContent = this.text;
         }
     }
 
-    canUpdateDOMNode(node) {
+    canUpdateDOMNode(node: Node) {
         return node.nodeType === Node.TEXT_NODE;
     }
 }
 
-class PillPart extends BasePart {
-    constructor(resourceId, label) {
+// exported for unit tests, should otherwise only be used through PartCreator
+export class PlainPart extends PlainBasePart implements IBasePart {
+    get type(): IBasePart["type"] {
+        return Type.Plain;
+    }
+}
+
+abstract class PillPart extends BasePart implements IPillPart {
+    constructor(public resourceId: string, label) {
         super(label);
-        this.resourceId = resourceId;
     }
 
-    acceptsInsertion(chr) {
+    acceptsInsertion(chr: string) {
         return chr !== " ";
     }
 
-    acceptsRemoval(position, chr) {
+    acceptsRemoval(position: number, chr: string) {
         return position !== 0;  //if you remove initial # or @, pill should become plain
     }
 
@@ -171,7 +247,7 @@ class PillPart extends BasePart {
         return container;
     }
 
-    updateDOMNode(node) {
+    updateDOMNode(node: HTMLElement) {
         const textNode = node.childNodes[0];
         if (textNode.textContent !== this.text) {
             textNode.textContent = this.text;
@@ -182,7 +258,7 @@ class PillPart extends BasePart {
         this.setAvatar(node);
     }
 
-    canUpdateDOMNode(node) {
+    canUpdateDOMNode(node: HTMLElement) {
         return node.nodeType === Node.ELEMENT_NODE &&
                node.nodeName === "SPAN" &&
                node.childNodes.length === 1 &&
@@ -190,7 +266,7 @@ class PillPart extends BasePart {
     }
 
     // helper method for subclasses
-    _setAvatarVars(node, avatarUrl, initialLetter) {
+    _setAvatarVars(node: HTMLElement, avatarUrl: string, initialLetter: string) {
         const avatarBackground = `url('${avatarUrl}')`;
         const avatarLetter = `'${initialLetter}'`;
         // check if the value is changing,
@@ -206,14 +282,20 @@ class PillPart extends BasePart {
     get canEdit() {
         return false;
     }
+
+    abstract get type(): IPillPart["type"];
+
+    abstract get className(): string;
+
+    abstract setAvatar(node: HTMLElement): void;
 }
 
-class NewlinePart extends BasePart {
-    acceptsInsertion(chr, offset) {
+class NewlinePart extends BasePart implements IBasePart {
+    acceptsInsertion(chr: string, offset: number) {
         return offset === 0 && chr === "\n";
     }
 
-    acceptsRemoval(position, chr) {
+    acceptsRemoval(position: number, chr: string) {
         return true;
     }
 
@@ -227,12 +309,12 @@ class NewlinePart extends BasePart {
 
     updateDOMNode() {}
 
-    canUpdateDOMNode(node) {
+    canUpdateDOMNode(node: HTMLElement) {
         return node.tagName === "BR";
     }
 
-    get type() {
-        return "newline";
+    get type(): IBasePart["type"] {
+        return Type.Newline;
     }
 
     // this makes the cursor skip this part when it is inserted
@@ -245,27 +327,26 @@ class NewlinePart extends BasePart {
 }
 
 class RoomPillPart extends PillPart {
-    constructor(displayAlias, room) {
+    constructor(displayAlias, private room: Room) {
         super(displayAlias, displayAlias);
-        this._room = room;
     }
 
-    setAvatar(node) {
+    setAvatar(node: HTMLElement) {
         let initialLetter = "";
         let avatarUrl = Avatar.avatarUrlForRoom(
-            this._room,
+            this.room,
             16 * window.devicePixelRatio,
             16 * window.devicePixelRatio,
             "crop");
         if (!avatarUrl) {
-            initialLetter = Avatar.getInitialLetter(this._room ? this._room.name : this.resourceId);
-            avatarUrl = `../../${Avatar.defaultAvatarUrlForString(this._room ? this._room.roomId : this.resourceId)}`;
+            initialLetter = Avatar.getInitialLetter(this.room ? this.room.name : this.resourceId);
+            avatarUrl = Avatar.defaultAvatarUrlForString(this.room ? this.room.roomId : this.resourceId);
         }
         this._setAvatarVars(node, avatarUrl, initialLetter);
     }
 
-    get type() {
-        return "room-pill";
+    get type(): IPillPart["type"] {
+        return Type.RoomPill;
     }
 
     get className() {
@@ -274,67 +355,61 @@ class RoomPillPart extends PillPart {
 }
 
 class AtRoomPillPart extends RoomPillPart {
-    get type() {
-        return "at-room-pill";
+    get type(): IPillPart["type"] {
+        return Type.AtRoomPill;
     }
 }
 
 class UserPillPart extends PillPart {
-    constructor(userId, displayName, member) {
+    constructor(userId, displayName, private member: RoomMember) {
         super(userId, displayName);
-        this._member = member;
     }
 
-    setAvatar(node) {
-        if (!this._member) {
+    setAvatar(node: HTMLElement) {
+        if (!this.member) {
             return;
         }
-        const name = this._member.name || this._member.userId;
-        const defaultAvatarUrl = Avatar.defaultAvatarUrlForString(this._member.userId);
-        let avatarUrl = Avatar.avatarUrlForMember(
-            this._member,
+        const name = this.member.name || this.member.userId;
+        const defaultAvatarUrl = Avatar.defaultAvatarUrlForString(this.member.userId);
+        const avatarUrl = Avatar.avatarUrlForMember(
+            this.member,
             16 * window.devicePixelRatio,
             16 * window.devicePixelRatio,
             "crop");
         let initialLetter = "";
         if (avatarUrl === defaultAvatarUrl) {
-            // the url from defaultAvatarUrlForString is meant to go in an img element,
-            // which has the base of the document. we're using it in css,
-            // which has the base of the theme css file, two levels deeper than the document,
-            // so go up to the level of the document.
-            avatarUrl = `../../${avatarUrl}`;
             initialLetter = Avatar.getInitialLetter(name);
         }
         this._setAvatarVars(node, avatarUrl, initialLetter);
     }
 
-    get type() {
-        return "user-pill";
+    get type(): IPillPart["type"] {
+        return Type.UserPill;
     }
 
     get className() {
         return "mx_UserPill mx_Pill";
     }
 
-    serialize() {
-        const obj = super.serialize();
-        obj.resourceId = this.resourceId;
-        return obj;
+    serialize(): ISerializedPillPart {
+        return {
+            type: this.type,
+            text: this.text,
+            resourceId: this.resourceId,
+        };
     }
 }
 
-
-class PillCandidatePart extends PlainPart {
-    constructor(text, autoCompleteCreator) {
+class PillCandidatePart extends PlainBasePart implements IPillCandidatePart {
+    constructor(text: string, private autoCompleteCreator: IAutocompleteCreator) {
         super(text);
-        this._autoCompleteCreator = autoCompleteCreator;
     }
 
-    createAutoComplete(updateCallback) {
-        return this._autoCompleteCreator.create(updateCallback);
+    createAutoComplete(updateCallback: UpdateCallback): AutocompleteWrapperModel {
+        return this.autoCompleteCreator.create(updateCallback);
     }
 
-    acceptsInsertion(chr, offset, inputType) {
+    acceptsInsertion(chr: string, offset: number, inputType: string) {
         if (offset === 0) {
             return true;
         } else {
@@ -346,18 +421,18 @@ class PillCandidatePart extends PlainPart {
         return false;
     }
 
-    acceptsRemoval(position, chr) {
+    acceptsRemoval(position: number, chr: string) {
         return true;
     }
 
-    get type() {
-        return "pill-candidate";
+    get type(): IPillCandidatePart["type"] {
+        return Type.PillCandidate;
     }
 }
 
-export function autoCompleteCreator(getAutocompleterComponent, updateQuery) {
-    return (partCreator) => {
-        return (updateCallback) => {
+export function getAutoCompleteCreator(getAutocompleterComponent: GetAutocompleterComponent, updateQuery: UpdateQuery) {
+    return (partCreator: PartCreator) => {
+        return (updateCallback: UpdateCallback) => {
             return new AutocompleteWrapperModel(
                 updateCallback,
                 getAutocompleterComponent,
@@ -368,24 +443,31 @@ export function autoCompleteCreator(getAutocompleterComponent, updateQuery) {
     };
 }
 
+type AutoCompleteCreator = ReturnType<typeof getAutoCompleteCreator>;
+
+interface IAutocompleteCreator {
+    create(updateCallback: UpdateCallback): AutocompleteWrapperModel;
+}
+
 export class PartCreator {
-    constructor(room, client, autoCompleteCreator = null) {
-        this._room = room;
-        this._client = client;
+    protected readonly autoCompleteCreator: IAutocompleteCreator;
+
+    constructor(private room: Room, private client: MatrixClient, autoCompleteCreator: AutoCompleteCreator = null) {
         // pre-create the creator as an object even without callback so it can already be passed
         // to PillCandidatePart (e.g. while deserializing) and set later on
-        this._autoCompleteCreator = {create: autoCompleteCreator && autoCompleteCreator(this)};
+        this.autoCompleteCreator = {create: autoCompleteCreator && autoCompleteCreator(this)};
     }
 
-    setAutoCompleteCreator(autoCompleteCreator) {
-        this._autoCompleteCreator.create = autoCompleteCreator(this);
+    setAutoCompleteCreator(autoCompleteCreator: AutoCompleteCreator) {
+        this.autoCompleteCreator.create = autoCompleteCreator(this);
     }
 
-    createPartForInput(input) {
+    createPartForInput(input: string, partIndex: number, inputType?: string): Part {
         switch (input[0]) {
             case "#":
             case "@":
             case ":":
+            case "+":
                 return this.pillCandidate("");
             case "\n":
                 return new NewlinePart();
@@ -394,28 +476,28 @@ export class PartCreator {
         }
     }
 
-    createDefaultPart(text) {
+    createDefaultPart(text: string) {
         return this.plain(text);
     }
 
-    deserializePart(part) {
+    deserializePart(part: SerializedPart): Part {
         switch (part.type) {
-            case "plain":
+            case Type.Plain:
                 return this.plain(part.text);
-            case "newline":
+            case Type.Newline:
                 return this.newline();
-            case "at-room-pill":
+            case Type.AtRoomPill:
                 return this.atRoomPill(part.text);
-            case "pill-candidate":
+            case Type.PillCandidate:
                 return this.pillCandidate(part.text);
-            case "room-pill":
+            case Type.RoomPill:
                 return this.roomPill(part.text);
-            case "user-pill":
+            case Type.UserPill:
                 return this.userPill(part.text, part.resourceId);
         }
     }
 
-    plain(text) {
+    plain(text: string) {
         return new PlainPart(text);
     }
 
@@ -423,16 +505,16 @@ export class PartCreator {
         return new NewlinePart("\n");
     }
 
-    pillCandidate(text) {
-        return new PillCandidatePart(text, this._autoCompleteCreator);
+    pillCandidate(text: string) {
+        return new PillCandidatePart(text, this.autoCompleteCreator);
     }
 
-    roomPill(alias, roomId) {
+    roomPill(alias: string, roomId?: string) {
         let room;
         if (roomId || alias[0] !== "#") {
-            room = this._client.getRoom(roomId || alias);
+            room = this.client.getRoom(roomId || alias);
         } else {
-            room = this._client.getRooms().find((r) => {
+            room = this.client.getRooms().find((r) => {
                 return r.getCanonicalAlias() === alias ||
                        r.getAltAliases().includes(alias);
             });
@@ -440,16 +522,16 @@ export class PartCreator {
         return new RoomPillPart(alias, room);
     }
 
-    atRoomPill(text) {
-        return new AtRoomPillPart(text, this._room);
+    atRoomPill(text: string) {
+        return new AtRoomPillPart(text, this.room);
     }
 
-    userPill(displayName, userId) {
-        const member = this._room.getMember(userId);
+    userPill(displayName: string, userId: string) {
+        const member = this.room.getMember(userId);
         return new UserPillPart(userId, displayName, member);
     }
 
-    createMentionParts(partIndex, displayName, userId) {
+    createMentionParts(partIndex: number, displayName: string, userId: string) {
         const pill = this.userPill(displayName, userId);
         const postfix = this.plain(partIndex === 0 ? ": " : " ");
         return [pill, postfix];
@@ -459,7 +541,7 @@ export class PartCreator {
 // part creator that support auto complete for /commands,
 // used in SendMessageComposer
 export class CommandPartCreator extends PartCreator {
-    createPartForInput(text, partIndex) {
+    createPartForInput(text: string, partIndex: number) {
         // at beginning and starts with /? create
         if (partIndex === 0 && text[0] === "/") {
             // text will be inserted by model, so pass empty string
@@ -469,11 +551,11 @@ export class CommandPartCreator extends PartCreator {
         }
     }
 
-    command(text) {
-        return new CommandPart(text, this._autoCompleteCreator);
+    command(text: string) {
+        return new CommandPart(text, this.autoCompleteCreator);
     }
 
-    deserializePart(part) {
+    deserializePart(part: Part): Part {
         if (part.type === "command") {
             return this.command(part.text);
         } else {
@@ -483,7 +565,7 @@ export class CommandPartCreator extends PartCreator {
 }
 
 class CommandPart extends PillCandidatePart {
-    get type() {
-        return "command";
+    get type(): IPillCandidatePart["type"] {
+        return Type.Command;
     }
 }
diff --git a/src/editor/position.js b/src/editor/position.ts
similarity index 79%
rename from src/editor/position.js
rename to src/editor/position.ts
index 726377ef48..3f24581695 100644
--- a/src/editor/position.js
+++ b/src/editor/position.ts
@@ -15,30 +15,30 @@ limitations under the License.
 */
 
 import DocumentOffset from "./offset";
+import EditorModel from "./model";
+import {Part} from "./parts";
 
-export default class DocumentPosition {
-    constructor(index, offset) {
-        this._index = index;
-        this._offset = offset;
+export interface IPosition {
+    index: number;
+    offset: number;
+}
+
+type Callback = (part: Part, startIdx: number, endIdx: number) => void;
+export type Predicate = (index: number, offset: number, part: Part) => boolean;
+
+export default class DocumentPosition implements IPosition {
+    constructor(public readonly index: number, public readonly offset: number) {
     }
 
-    get index() {
-        return this._index;
-    }
-
-    get offset() {
-        return this._offset;
-    }
-
-    compare(otherPos) {
-        if (this._index === otherPos._index) {
-            return this._offset - otherPos._offset;
+    compare(otherPos: DocumentPosition) {
+        if (this.index === otherPos.index) {
+            return this.offset - otherPos.offset;
         } else {
-            return this._index - otherPos._index;
+            return this.index - otherPos.index;
         }
     }
 
-    iteratePartsBetween(other, model, callback) {
+    iteratePartsBetween(other: DocumentPosition, model: EditorModel, callback: Callback) {
         if (this.index === -1 || other.index === -1) {
             return;
         }
@@ -57,7 +57,7 @@ export default class DocumentPosition {
         }
     }
 
-    forwardsWhile(model, predicate) {
+    forwardsWhile(model: EditorModel, predicate: Predicate) {
         if (this.index === -1) {
             return this;
         }
@@ -82,7 +82,7 @@ export default class DocumentPosition {
         }
     }
 
-    backwardsWhile(model, predicate) {
+    backwardsWhile(model: EditorModel, predicate: Predicate) {
         if (this.index === -1) {
             return this;
         }
@@ -107,7 +107,7 @@ export default class DocumentPosition {
         }
     }
 
-    asOffset(model) {
+    asOffset(model: EditorModel) {
         if (this.index === -1) {
             return new DocumentOffset(0, true);
         }
@@ -121,7 +121,7 @@ export default class DocumentPosition {
         return new DocumentOffset(offset, atEnd);
     }
 
-    isAtEnd(model) {
+    isAtEnd(model: EditorModel) {
         if (model.parts.length === 0) {
             return true;
         }
diff --git a/src/editor/range.js b/src/editor/range.ts
similarity index 67%
rename from src/editor/range.js
rename to src/editor/range.ts
index 822c3b13a7..27f59f34a9 100644
--- a/src/editor/range.js
+++ b/src/editor/range.ts
@@ -14,32 +14,34 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import EditorModel from "./model";
+import DocumentPosition, {Predicate} from "./position";
+import {Part} from "./parts";
+
 export default class Range {
-    constructor(model, positionA, positionB = positionA) {
-        this._model = model;
+    private _start: DocumentPosition;
+    private _end: DocumentPosition;
+
+    constructor(public readonly model: EditorModel, positionA: DocumentPosition, positionB = positionA) {
         const bIsLarger = positionA.compare(positionB) < 0;
         this._start = bIsLarger ? positionA : positionB;
         this._end = bIsLarger ? positionB : positionA;
     }
 
-    moveStart(delta) {
-        this._start = this._start.forwardsWhile(this._model, () => {
+    moveStart(delta: number) {
+        this._start = this._start.forwardsWhile(this.model, () => {
             delta -= 1;
             return delta >= 0;
         });
     }
 
-    expandBackwardsWhile(predicate) {
-        this._start = this._start.backwardsWhile(this._model, predicate);
-    }
-
-    get model() {
-        return this._model;
+    expandBackwardsWhile(predicate: Predicate) {
+        this._start = this._start.backwardsWhile(this.model, predicate);
     }
 
     get text() {
         let text = "";
-        this._start.iteratePartsBetween(this._end, this._model, (part, startIdx, endIdx) => {
+        this._start.iteratePartsBetween(this._end, this.model, (part, startIdx, endIdx) => {
             const t = part.text.substring(startIdx, endIdx);
             text = text + t;
         });
@@ -52,13 +54,13 @@ export default class Range {
      * @param {Part[]} parts the parts to replace the range with
      * @return {Number} the net amount of characters added, can be negative.
      */
-    replace(parts) {
+    replace(parts: Part[]) {
         const newLength = parts.reduce((sum, part) => sum + part.text.length, 0);
         let oldLength = 0;
-        this._start.iteratePartsBetween(this._end, this._model, (part, startIdx, endIdx) => {
+        this._start.iteratePartsBetween(this._end, this.model, (part, startIdx, endIdx) => {
             oldLength += endIdx - startIdx;
         });
-        this._model._replaceRange(this._start, this._end, parts);
+        this.model.replaceRange(this._start, this._end, parts);
         return newLength - oldLength;
     }
 
@@ -68,10 +70,10 @@ export default class Range {
      */
     get parts() {
         const parts = [];
-        this._start.iteratePartsBetween(this._end, this._model, (part, startIdx, endIdx) => {
+        this._start.iteratePartsBetween(this._end, this.model, (part, startIdx, endIdx) => {
             const serializedPart = part.serialize();
             serializedPart.text = part.text.substring(startIdx, endIdx);
-            const newPart = this._model.partCreator.deserializePart(serializedPart);
+            const newPart = this.model.partCreator.deserializePart(serializedPart);
             parts.push(newPart);
         });
         return parts;
@@ -79,7 +81,7 @@ export default class Range {
 
     get length() {
         let len = 0;
-        this._start.iteratePartsBetween(this._end, this._model, (part, startIdx, endIdx) => {
+        this._start.iteratePartsBetween(this._end, this.model, (part, startIdx, endIdx) => {
             len += endIdx - startIdx;
         });
         return len;
diff --git a/src/editor/render.js b/src/editor/render.ts
similarity index 85%
rename from src/editor/render.js
rename to src/editor/render.ts
index 84e57c2a3f..8aa5c5dea9 100644
--- a/src/editor/render.js
+++ b/src/editor/render.ts
@@ -15,16 +15,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-export function needsCaretNodeBefore(part, prevPart) {
+import {Part} from "./parts";
+import EditorModel from "./model";
+
+export function needsCaretNodeBefore(part: Part, prevPart: Part) {
     const isFirst = !prevPart || prevPart.type === "newline";
     return !part.canEdit && (isFirst || !prevPart.canEdit);
 }
 
-export function needsCaretNodeAfter(part, isLastOfLine) {
+export function needsCaretNodeAfter(part: Part, isLastOfLine: boolean) {
     return !part.canEdit && isLastOfLine;
 }
 
-function insertAfter(node, nodeToInsert) {
+function insertAfter(node: HTMLElement, nodeToInsert: HTMLElement) {
     const next = node.nextSibling;
     if (next) {
         node.parentElement.insertBefore(nodeToInsert, next);
@@ -48,18 +51,18 @@ function createCaretNode() {
     return span;
 }
 
-function updateCaretNode(node) {
+function updateCaretNode(node: HTMLElement) {
     // ensure the caret node contains only a zero-width space
     if (node.textContent !== CARET_NODE_CHAR) {
         node.textContent = CARET_NODE_CHAR;
     }
 }
 
-export function isCaretNode(node) {
+export function isCaretNode(node: HTMLElement) {
     return node && node.tagName === "SPAN" && node.className === "caretNode";
 }
 
-function removeNextSiblings(node) {
+function removeNextSiblings(node: ChildNode) {
     if (!node) {
         return;
     }
@@ -71,7 +74,7 @@ function removeNextSiblings(node) {
     }
 }
 
-function removeChildren(parent) {
+function removeChildren(parent: HTMLElement) {
     const firstChild = parent.firstChild;
     if (firstChild) {
         removeNextSiblings(firstChild);
@@ -79,7 +82,7 @@ function removeChildren(parent) {
     }
 }
 
-function reconcileLine(lineContainer, parts) {
+function reconcileLine(lineContainer: ChildNode, parts: Part[]) {
     let currentNode;
     let prevPart;
     const lastPart = parts[parts.length - 1];
@@ -146,21 +149,21 @@ function reconcileEmptyLine(lineContainer) {
     }
 }
 
-export function renderModel(editor, model) {
-    const lines = model.parts.reduce((lines, part) => {
+export function renderModel(editor: HTMLDivElement, model: EditorModel) {
+    const lines = model.parts.reduce((linesArr, part) => {
         if (part.type === "newline") {
-            lines.push([]);
+            linesArr.push([]);
         } else {
-            const lastLine = lines[lines.length - 1];
+            const lastLine = linesArr[linesArr.length - 1];
             lastLine.push(part);
         }
-        return lines;
+        return linesArr;
     }, [[]]);
     lines.forEach((parts, i) => {
         // find first (and remove anything else) div without className
         // (as browsers insert these in contenteditable) line container
         let lineContainer = editor.childNodes[i];
-        while (lineContainer && (lineContainer.tagName !== "DIV" || !!lineContainer.className)) {
+        while (lineContainer && ((<Element>lineContainer).tagName !== "DIV" || !!(<Element>lineContainer).className)) {
             editor.removeChild(lineContainer);
             lineContainer = editor.childNodes[i];
         }
diff --git a/src/editor/serialize.ts b/src/editor/serialize.ts
index 4d0b8cd03a..c550f54291 100644
--- a/src/editor/serialize.ts
+++ b/src/editor/serialize.ts
@@ -31,7 +31,8 @@ export function mdSerialize(model: EditorModel) {
                 return html + part.text;
             case "room-pill":
             case "user-pill":
-                return html + `[${part.text.replace(/[[\\\]]/g, c => "\\" + c)}](${makeGenericPermalink(part.resourceId)})`;
+                return html +
+                    `[${part.text.replace(/[[\\\]]/g, c => "\\" + c)}](${makeGenericPermalink(part.resourceId)})`;
         }
     }, "");
 }
@@ -42,6 +43,10 @@ export function htmlSerializeIfNeeded(model: EditorModel, {forceHTML = false} =
     if (!parser.isPlainText() || forceHTML) {
         return parser.toHTML();
     }
+    // ensure removal of escape backslashes in non-Markdown messages
+    if (md.indexOf("\\") > -1) {
+        return parser.toPlaintext();
+    }
 }
 
 export function textSerialize(model: EditorModel) {
@@ -62,16 +67,20 @@ export function textSerialize(model: EditorModel) {
 }
 
 export function containsEmote(model: EditorModel) {
-    return startsWith(model, "/me ");
+    return startsWith(model, "/me ", false);
 }
 
-export function startsWith(model: EditorModel, prefix: string) {
+export function startsWith(model: EditorModel, prefix: string, caseSensitive = true) {
     const firstPart = model.parts[0];
     // part type will be "plain" while editing,
     // and "command" while composing a message.
-    return firstPart &&
-        (firstPart.type === "plain" || firstPart.type === "command") &&
-        firstPart.text.startsWith(prefix);
+    let text = firstPart && firstPart.text;
+    if (!caseSensitive) {
+        prefix = prefix.toLowerCase();
+        text = text.toLowerCase();
+    }
+
+    return firstPart && (firstPart.type === "plain" || firstPart.type === "command") && text.startsWith(prefix);
 }
 
 export function stripEmoteCommand(model: EditorModel) {
diff --git a/src/emoji.ts b/src/emoji.ts
index c0a755145a..7caeb06d21 100644
--- a/src/emoji.ts
+++ b/src/emoji.ts
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// @ts-ignore - import * as EMOJIBASE actually breaks this
 import EMOJIBASE from 'emojibase-data/en/compact.json';
 
 export interface IEmoji {
@@ -63,6 +62,8 @@ export const DATA_BY_CATEGORY = {
     "flags": [],
 };
 
+const ZERO_WIDTH_JOINER = "\u200D";
+
 // Store various mappings from unicode/emoticon/shortcode to the Emoji objects
 EMOJIBASE.forEach((emoji: IEmojiWithFilterString) => {
     const categoryId = EMOJIBASE_GROUP_ID_TO_CATEGORY[emoji.group];
@@ -70,7 +71,8 @@ EMOJIBASE.forEach((emoji: IEmojiWithFilterString) => {
         DATA_BY_CATEGORY[categoryId].push(emoji);
     }
     // This is used as the string to match the query against when filtering emojis
-    emoji.filterString = `${emoji.annotation}\n${emoji.shortcodes.join('\n')}}\n${emoji.emoticon || ''}`.toLowerCase();
+    emoji.filterString = (`${emoji.annotation}\n${emoji.shortcodes.join('\n')}}\n${emoji.emoticon || ''}\n` +
+        `${emoji.unicode.split(ZERO_WIDTH_JOINER).join("\n")}`).toLowerCase();
 
     // Add mapping from unicode to Emoji object
     // The 'unicode' field that we use in emojibase has either
diff --git a/src/emojipicker/recent.js b/src/emojipicker/recent.js
deleted file mode 100644
index 1d2106fbfb..0000000000
--- a/src/emojipicker/recent.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2019 Tulir Asokan <tulir@maunium.net>
-
-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.
-*/
-
-const REACTION_COUNT = JSON.parse(window.localStorage.mx_reaction_count || '{}');
-let sorted = null;
-
-export function add(emoji) {
-    const [count] = REACTION_COUNT[emoji] || [0];
-    REACTION_COUNT[emoji] = [count + 1, Date.now()];
-    window.localStorage.mx_reaction_count = JSON.stringify(REACTION_COUNT);
-    sorted = null;
-}
-
-export function get(limit = 24) {
-    if (sorted === null) {
-        sorted = Object.entries(REACTION_COUNT)
-            .sort(([, [count1, date1]], [, [count2, date2]]) =>
-                count2 === count1 ? date2 - date1 : count2 - count1)
-            .map(([emoji, count]) => emoji);
-    }
-    return sorted.slice(0, limit);
-}
diff --git a/src/emojipicker/recent.ts b/src/emojipicker/recent.ts
new file mode 100644
index 0000000000..d86aad660d
--- /dev/null
+++ b/src/emojipicker/recent.ts
@@ -0,0 +1,74 @@
+/*
+Copyright 2019 Tulir Asokan <tulir@maunium.net>
+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 {orderBy} from "lodash";
+import { SettingLevel } from "../settings/SettingLevel";
+
+interface ILegacyFormat {
+    [emoji: string]: [number, number]; // [count, date]
+}
+
+// New format tries to be more space efficient for synchronization. Ordered by Date descending.
+type Format = [string, number][]; // [emoji, count]
+
+const SETTING_NAME = "recent_emoji";
+
+// we store more recents than we typically query but this lets us sort by weighted usage
+// even if you haven't used your typically favourite emoji for a little while.
+const STORAGE_LIMIT = 100;
+
+// TODO remove this after some time
+function migrate() {
+    const data: ILegacyFormat = JSON.parse(window.localStorage.mx_reaction_count || '{}');
+    const sorted = Object.entries(data).sort(([, [count1, date1]], [, [count2, date2]]) => date2 - date1);
+    const newFormat = sorted.map(([emoji, [count, date]]) => [emoji, count]);
+    SettingsStore.setValue(SETTING_NAME, null, SettingLevel.ACCOUNT, newFormat.slice(0, STORAGE_LIMIT));
+}
+
+function getRecentEmoji(): Format {
+    return SettingsStore.getValue(SETTING_NAME) || [];
+}
+
+export function add(emoji: string) {
+    const recents = getRecentEmoji();
+    const i = recents.findIndex(([e]) => e === emoji);
+
+    let newEntry;
+    if (i >= 0) {
+        // first remove the existing tuple so that we can increment it and push it to the front
+        [newEntry] = recents.splice(i, 1);
+        newEntry[1]++; // increment the usage count
+    } else {
+        newEntry = [emoji, 1];
+    }
+
+    SettingsStore.setValue(SETTING_NAME, null, SettingLevel.ACCOUNT, [newEntry, ...recents].slice(0, STORAGE_LIMIT));
+}
+
+export function get(limit = 24) {
+    let recents = getRecentEmoji();
+
+    if (recents.length < 1) {
+        migrate();
+        recents = getRecentEmoji();
+    }
+
+    // perform a stable sort on `count` to keep the recent (date) order as a secondary sort factor
+    const sorted = orderBy(recents, "1", "desc");
+    return sorted.slice(0, limit).map(([emoji]) => emoji);
+}
diff --git a/src/groups.js b/src/groups.js
index 860cf71fff..e73af15c79 100644
--- a/src/groups.js
+++ b/src/groups.js
@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 import PropTypes from 'prop-types';
-import { _t } from './languageHandler.js';
+
+import { _t } from './languageHandler';
 
 export const GroupMemberType = PropTypes.shape({
     userId: PropTypes.string.isRequired,
diff --git a/src/hooks/useAccountData.ts b/src/hooks/useAccountData.ts
new file mode 100644
index 0000000000..fe71ed9ecd
--- /dev/null
+++ b/src/hooks/useAccountData.ts
@@ -0,0 +1,50 @@
+/*
+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 {useCallback, useState} from "react";
+import {MatrixClient} from "matrix-js-sdk/src/client";
+import {MatrixEvent} from "matrix-js-sdk/src/models/event";
+import {Room} from "matrix-js-sdk/src/models/room";
+
+import {useEventEmitter} from "./useEventEmitter";
+
+const tryGetContent = (ev?: MatrixEvent) => ev ? ev.getContent() : undefined;
+
+// Hook to simplify listening to Matrix account data
+export const useAccountData = <T extends {}>(cli: MatrixClient, eventType: string) => {
+    const [value, setValue] = useState<T>(() => tryGetContent(cli.getAccountData(eventType)));
+
+    const handler = useCallback((event) => {
+        if (event.getType() !== eventType) return;
+        setValue(event.getContent());
+    }, [eventType]);
+    useEventEmitter(cli, "accountData", handler);
+
+    return value || {} as T;
+};
+
+// Hook to simplify listening to Matrix room account data
+export const useRoomAccountData = <T extends {}>(room: Room, eventType: string) => {
+    const [value, setValue] = useState<T>(() => tryGetContent(room.getAccountData(eventType)));
+
+    const handler = useCallback((event) => {
+        if (event.getType() !== eventType) return;
+        setValue(event.getContent());
+    }, [eventType]);
+    useEventEmitter(room, "Room.accountData", handler);
+
+    return value || {} as T;
+};
diff --git a/src/hooks/useAsyncMemo.js b/src/hooks/useAsyncMemo.ts
similarity index 81%
rename from src/hooks/useAsyncMemo.js
rename to src/hooks/useAsyncMemo.ts
index ef7d256b04..11c7aca7f1 100644
--- a/src/hooks/useAsyncMemo.js
+++ b/src/hooks/useAsyncMemo.ts
@@ -14,9 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { useState, useEffect } from 'react';
+import {useState, useEffect, DependencyList} from 'react';
 
-export const useAsyncMemo = (fn, deps, initialValue) => {
+type Fn<T> = () => Promise<T>;
+
+export const useAsyncMemo = <T>(fn: Fn<T>, deps: DependencyList, initialValue?: T) => {
     const [value, setValue] = useState(initialValue);
     useEffect(() => {
         fn().then(setValue);
diff --git a/src/hooks/useDispatcher.ts b/src/hooks/useDispatcher.ts
new file mode 100644
index 0000000000..004b15fcef
--- /dev/null
+++ b/src/hooks/useDispatcher.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 {useEffect, useRef} from "react";
+
+import {ActionPayload} from "../dispatcher/payloads";
+import {Dispatcher} from "flux";
+
+// Hook to simplify listening to flux dispatches
+export const useDispatcher = (dispatcher: Dispatcher<ActionPayload>, handler: (payload: ActionPayload) => void) => {
+    // Create a ref that stores handler
+    const savedHandler = useRef((payload: ActionPayload) => {});
+
+    // Update ref.current value if handler changes.
+    useEffect(() => {
+        savedHandler.current = handler;
+    }, [handler]);
+
+    useEffect(() => {
+        // Create event listener that calls handler function stored in ref
+        const ref = dispatcher.register((payload) => savedHandler.current(payload));
+        // Remove event listener on cleanup
+        return () => {
+            dispatcher.unregister(ref);
+        };
+    }, [dispatcher]);
+};
diff --git a/src/hooks/useEventEmitter.js b/src/hooks/useEventEmitter.ts
similarity index 82%
rename from src/hooks/useEventEmitter.js
rename to src/hooks/useEventEmitter.ts
index 7adc6ef2e3..6b5693ef95 100644
--- a/src/hooks/useEventEmitter.js
+++ b/src/hooks/useEventEmitter.ts
@@ -15,11 +15,14 @@ limitations under the License.
 */
 
 import {useRef, useEffect} from "react";
+import type {EventEmitter} from "events";
+
+type Handler = (...args: any[]) => void;
 
 // Hook to wrap event emitter on and removeListener in hook lifecycle
-export const useEventEmitter = (emitter, eventName, handler) => {
+export const useEventEmitter = (emitter: EventEmitter, eventName: string | symbol, handler: Handler) => {
     // Create a ref that stores handler
-    const savedHandler = useRef();
+    const savedHandler = useRef(handler);
 
     // Update ref.current value if handler changes.
     useEffect(() => {
@@ -32,7 +35,7 @@ export const useEventEmitter = (emitter, eventName, handler) => {
             if (!emitter) return;
 
             // Create event listener that calls handler function stored in ref
-            const eventListener = event => savedHandler.current(event);
+            const eventListener = (...args) => savedHandler.current(...args);
 
             // Add event listener
             emitter.on(eventName, eventListener);
diff --git a/src/hooks/useSettings.js b/src/hooks/useSettings.ts
similarity index 82%
rename from src/hooks/useSettings.js
rename to src/hooks/useSettings.ts
index 151a6369de..9534fccc4c 100644
--- a/src/hooks/useSettings.js
+++ b/src/hooks/useSettings.ts
@@ -18,7 +18,7 @@ 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, roomId = null, excludeDefault = false) => {
+export const useSettingValue = (settingName: string, roomId: string = null, excludeDefault = false) => {
     const [value, setValue] = useState(SettingsStore.getValue(settingName, roomId, excludeDefault));
 
     useEffect(() => {
@@ -35,12 +35,12 @@ export const useSettingValue = (settingName, roomId = null, excludeDefault = fal
 };
 
 // Hook to fetch whether a feature is enabled and dynamically update when that changes
-export const useFeatureEnabled = (featureName, roomId = null) => {
-    const [enabled, setEnabled] = useState(SettingsStore.isFeatureEnabled(featureName, roomId));
+export const useFeatureEnabled = (featureName: string, roomId: string = null) => {
+    const [enabled, setEnabled] = useState(SettingsStore.getValue(featureName, roomId));
 
     useEffect(() => {
         const ref = SettingsStore.watchSetting(featureName, roomId, () => {
-            setEnabled(SettingsStore.isFeatureEnabled(featureName, roomId));
+            setEnabled(SettingsStore.getValue(featureName, roomId));
         });
         // clean-up
         return () => {
diff --git a/src/hooks/useStateToggle.js b/src/hooks/useStateToggle.ts
similarity index 85%
rename from src/hooks/useStateToggle.js
rename to src/hooks/useStateToggle.ts
index 58cf123bfb..85441df328 100644
--- a/src/hooks/useStateToggle.js
+++ b/src/hooks/useStateToggle.ts
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {useState} from 'react';
+import {useState} from "react";
 
 // Hook to simplify toggling of a boolean state value
 // Returns value, method to toggle boolean value and method to set the boolean value
-export const useStateToggle = (initialValue) => {
-    const [value, setValue] = useState(Boolean(initialValue));
+export const useStateToggle = (initialValue: boolean) => {
+    const [value, setValue] = useState(initialValue);
     const toggleValue = () => {
         setValue(!value);
     };
diff --git a/src/hooks/useTimeout.ts b/src/hooks/useTimeout.ts
new file mode 100644
index 0000000000..911b7bc75d
--- /dev/null
+++ b/src/hooks/useTimeout.ts
@@ -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.
+*/
+
+import {useEffect, useRef, useState} from "react";
+
+type Handler = () => void;
+
+// Hook to simplify timeouts in functional components
+export const useTimeout = (handler: Handler, timeoutMs: number) => {
+    // Create a ref that stores handler
+    const savedHandler = useRef<Handler>();
+
+    // Update ref.current value if handler changes.
+    useEffect(() => {
+        savedHandler.current = handler;
+    }, [handler]);
+
+    // Set up timer
+    useEffect(() => {
+        const timeoutID = setTimeout(() => {
+            savedHandler.current();
+        }, timeoutMs);
+        return () => clearTimeout(timeoutID);
+    }, [timeoutMs]);
+};
+
+// Hook to simplify intervals in functional components
+export const useInterval = (handler: Handler, intervalMs: number) => {
+    // Create a ref that stores handler
+    const savedHandler = useRef<Handler>();
+
+    // Update ref.current value if handler changes.
+    useEffect(() => {
+        savedHandler.current = handler;
+    }, [handler]);
+
+    // Set up timer
+    useEffect(() => {
+        const intervalID = setInterval(() => {
+            savedHandler.current();
+        }, intervalMs);
+        return () => clearInterval(intervalID);
+    }, [intervalMs]);
+};
+
+// Hook to simplify a variable counting down to 0, handler called when it reached 0
+export const useExpiringCounter = (handler: Handler, intervalMs: number, initialCount: number) => {
+    const [count, setCount] = useState(initialCount);
+    useInterval(() => setCount(c => c - 1), intervalMs);
+    if (count === 0) {
+        handler();
+    }
+    return count;
+};
diff --git a/src/i18n/strings/ar.json b/src/i18n/strings/ar.json
index 708778d15d..a6a52b147d 100644
--- a/src/i18n/strings/ar.json
+++ b/src/i18n/strings/ar.json
@@ -17,15 +17,13 @@
     "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 version of Riot.im": "إصدارة Riot.im",
+    "The version of %(brand)s": "إصدارة %(brand)s",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "فيما إذا كنت تستخدم وضع النص الغني لمحرر النصوص الغني أم لا",
     "Your homeserver's URL": "عنوان خادوم المنزل",
-    "Your identity server's URL": "عنوان خادوم التعريف",
     "Analytics": "التحاليل",
-    "The information being sent to us to help make Riot.im better includes:": "تحتوي المعلومات التي تُرسل إلينا للمساعدة بتحسين جودة Riot.im الآتي:",
+    "The information being sent to us to help make %(brand)s better includes:": "تحتوي المعلومات التي تُرسل إلينا للمساعدة بتحسين جودة %(brand)s الآتي:",
     "Couldn't find a matching Matrix room": "لا يمكن إيجاد غرفة مايتركس متطابقة",
     "Unavailable": "غير متوفر",
-    "A new version of Riot is available.": "هناك نسخة جديدة مِن رايوت متوفرة.",
     "All Rooms": "كل الغُرف",
     "All messages": "كل الرسائل",
     "All notifications are currently disabled for all targets.": "كل التنبيهات غير مفعلة حالياً للجميع.",
@@ -42,7 +40,6 @@
     "No update available.": "لا يوجد هناك أي تحديث.",
     "An error occurred whilst saving your email notification preferences.": "حدث خطأ ما أثناء عملية حفظ إعدادات الإشعارات عبر البريد الإلكتروني.",
     "Collecting app version information": "تجميع المعلومات حول نسخة التطبيق",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "إلغاء مُعرف الغرفة %(alias)s وحذف %(name)s من الدليل؟",
     "Changelog": "سِجل التغييرات",
     "Send Account Data": "إرسال بيانات الحساب",
     "Waiting for response from server": "في انتظار الرد مِن الخادوم",
@@ -51,7 +48,6 @@
     "Thank you!": "شكرًا !",
     "Advanced notification settings": "الإعدادات المتقدمة للإشعارات",
     "Call invitation": "دعوة لمحادثة",
-    "delete the alias.": "إلغاء المُعرف.",
     "Developer Tools": "أدوات التطوير",
     "Downloading update...": "عملية تنزيل التحديث جارية …",
     "State Key": "مفتاح الحالة",
@@ -64,5 +60,310 @@
     "powered by Matrix": "مشغل بواسطة Matrix",
     "The platform you're on": "المنصة الحالية",
     "Your language of choice": "اللغة المختارة",
-    "e.g. %(exampleValue)s": "مثال %(exampleValue)s"
+    "e.g. %(exampleValue)s": "مثال %(exampleValue)s",
+    "Use Single Sign On to continue": "استخدم تسجيل الدخول الموحد للاستمرار",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "اكد اضافة بريدك الالكتروني عن طريق الدخول الموحد (SSO) لتثبت هويتك.",
+    "Single Sign On": "تسجيل الدخول الموحد",
+    "Confirm adding email": "تأكيد اضافة بريدك الالكتروني",
+    "Click the button below to confirm adding this email address.": "انقر على الزر ادناه لتأكد اضافة هذا البريد الالكتروني.",
+    "Confirm": "تأكيد",
+    "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.": "انقر الزر ادناه لتأكيد اضافة رقم الهاتف.",
+    "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)": "اذا كنت تستخدم او لا تستخدم ميزة '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": "مهلة الاتصال",
+    "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",
+    "OK": "حسنا",
+    "Unable to capture screen": "غير قادر على التقاط الشاشة",
+    "Call Failed": "فل الاتصال",
+    "You are already in a call.": "أنت بالفعل في مكالمة.",
+    "VoIP is unsupported": "تقنية VoIP غير مدعومة",
+    "You cannot place VoIP calls in this browser.": "لايمكنك اجراء مكالمات VoIP عبر هذا المتصفح.",
+    "A call is currently being placed!": "يتم حاليًا إجراء مكالمة!",
+    "A call is already in progress!": "المكالمة جارية بالفعل!",
+    "Permission Required": "مطلوب صلاحية",
+    "You do not have permission to start a conference call in this room": "ليس لديك صلاحية لبدء مكالمة جماعية في هذه الغرفة",
+    "Replying With Files": "الرد مع الملفات",
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "في الوقت الحالي ، لا يمكن الرد مع ملف. هل تريد تحميل هذا الملف بدون رد؟",
+    "The file '%(fileName)s' failed to upload.": "فشل في رفع الملف '%(fileName)s'.",
+    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "إن حجم الملف '%(fileName)s' يتجاوز الحد المسموح به للرفع في السيرفر",
+    "Upload Failed": "فشل الرفع",
+    "Server may be unavailable, overloaded, or you hit a bug.": "قد يكون السيرفر غير متوفر، او محملا بشكل زائد او انك طلبت ميزة بها مشكلة.",
+    "The server does not support the room version specified.": "السيرفر لا يدعم إصدار الغرفة المحدد.",
+    "Failure to create room": "فشل في انشاء الغرفة",
+    "Cancel entering passphrase?": "هل تريد إلغاء إدخال عبارة المرور؟",
+    "Are you sure you want to cancel entering passphrase?": "هل أنت متأكد من أنك تريد إلغاء إدخال عبارة المرور؟",
+    "Go Back": "الرجوع للخلف",
+    "Setting up keys": "إعداد المفاتيح",
+    "Sun": "احد",
+    "Mon": "اثنين",
+    "Tue": "ثلاثاء",
+    "Wed": "اربعاء",
+    "Thu": "خميس",
+    "Fri": "جمعة",
+    "Sat": "سبت",
+    "Jan": "يناير",
+    "Feb": "فبراير",
+    "Mar": "مارس",
+    "Apr": "ابريل",
+    "May": "مايو",
+    "Jun": "يونيو",
+    "Jul": "يوليو",
+    "Aug": "اغسطس",
+    "Sep": "سبتمبر",
+    "Oct": "اكتوبر",
+    "Nov": "نوفمبر",
+    "Dec": "ديسمبر",
+    "PM": "مساء",
+    "AM": "صباحا",
+    "%(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",
+    "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": "تحذير: أي شخص تضيفه إلى مجتمع سيكون مرئيًا للعامة لأي شخص يعرف معرف المجتمع",
+    "Invite new community members": "دعوى اعضاء جدد للمجتمع",
+    "Name or Matrix ID": "الاسم او معرف Matrix",
+    "Invite to Community": "دعوة الى المجتمع",
+    "Which rooms would you like to add to this community?": "ما هي الغرف التي ترغب في إضافتها إلى هذا المجتمع؟",
+    "Show these rooms to non-members on the community page and room list?": "هل تريد إظهار هذه الغرف لغير الأعضاء في صفحة المجتمع وقائمة الغرف؟",
+    "Add rooms to the community": "اضافة غرف الى المجتمع",
+    "Room name or address": "اسم او عنوان الغرفة",
+    "Add to community": "اضافة لمجتمع",
+    "Failed to invite the following users to %(groupId)s:": "فشل في اضافة المستخدمين التاليين الى %(groupId)s:",
+    "Failed to invite users to community": "فشل دعوة المستخدمين إلى المجتمع",
+    "Failed to invite users to %(groupId)s": "فشل في دعوة المستخدمين الى %(groupId)s",
+    "Failed to add the following rooms to %(groupId)s:": "فشل في اضافة الغرف التالية الى %(groupId)s:",
+    "Unnamed Room": "غرفة بدون اسم",
+    "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.": "لا تستمر إلا إذا كنت تثق في مالك السيرفر.",
+    "Trust": "ثِق",
+    "%(name)s is requesting verification": "%(name)s يطلب التحقق",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s ليس لديه الصلاحية لارسال التنبيهات - يرجى فحص اعدادات متصفحك",
+    "%(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.": "يبدو ان بريدك الالكتروني غير مرتبط بمعرف Matrix على هذا السيرفر.",
+    "Use your account to sign in to the latest version": "استخدم حسابك للدخول الى الاصدار الاخير",
+    "We’re excited to announce Riot is now Element": "نحن سعيدون باعلان ان Riot اصبح الان Element",
+    "Riot is now Element!": "Riot اصبح الان Element!",
+    "Learn More": "تعلم المزيد",
+    "Sign In or Create Account": "قم بتسجيل الدخول او انشاء حساب جديد",
+    "Use your account or create a new one to continue.": "استخدم حسابك او قم بانشاء حساب اخر للاستمرار.",
+    "Create Account": "انشاء حساب",
+    "Sign In": "الدخول",
+    "Default": "افتراضي",
+    "Restricted": "مقيد",
+    "Moderator": "مشرف",
+    "Admin": "مدير",
+    "Custom (%(level)s)": "(%(level)s) مخصص",
+    "Failed to invite": "فشل في الدعوة",
+    "Operation failed": "فشلت العملية",
+    "Failed to invite users to the room:": "فشل في دعوة المستخدمين للغرفة:",
+    "Failed to invite the following users to the %(roomName)s room:": "فشل في دعوة المستخدمين التالية اسمائهم الى الغرفة %(roomName)s:",
+    "You need to be logged in.": "تحتاج إلى تسجيل الدخول.",
+    "You need to be able to invite users to do that.": "يجب أن تكون قادرًا على دعوة المستخدمين للقيام بذلك.",
+    "Unable to create widget.": "غير قادر على إنشاء Widget.",
+    "Missing roomId.": "معرف الغرفة مفقود.",
+    "Failed to send request.": "فشل في ارسال الطلب.",
+    "This room is not recognised.": "لم يتم التعرف على هذه الغرفة.",
+    "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 %(roomId)s not visible": "الغرفة %(roomId)s غير مرئية",
+    "Missing user_id in request": "رقم المستخدم مفقود في الطلب",
+    "Messages": "الرسائل",
+    "Actions": "الإجراءات",
+    "Advanced": "متقدم",
+    "Other": "أخرى",
+    "Command error": "خطأ في الأمر",
+    "Usage": "الاستخدام",
+    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "ادخل احد الرموز ¯\\_(ツ)_/¯ قبل نص الرسالة",
+    "Sends a message as plain text, without interpreting it as markdown": "ارسال رسالة كنص، دون تفسيرها على انها معلمات",
+    "Sends a message as html, without interpreting it as markdown": "ارسال رسالة بشكل HTML، دون تفسيرها على انها معلمات",
+    "Searches DuckDuckGo for results": "البحث في DuckDuckGo للحصول على نتائج",
+    "/ddg is not a command": "/ddg ليس امر",
+    "To use it, just wait for autocomplete results to load and tab through them.": "لاستخدامها، فقط انتظر حتى يكتمل تحميل النتائج والمرور عليها.",
+    "Upgrades a room to a new version": "ترقية الغرفة الى الاصدار الجديد",
+    "You do not have the required permissions to use this command.": "ليس لديك الأذونات المطلوبة لاستخدام هذا الأمر.",
+    "Error upgrading room": "خطأ في ترقية الغرفة",
+    "Double check that your server supports the room version chosen and try again.": "تحقق مرة أخرى من أن سيرفرك يدعم إصدار الغرفة المختار وحاول مرة أخرى.",
+    "Changes your display nickname": "يغير لقب العرض الخاص بك",
+    "Changes your display nickname in the current room only": "يغير لقب العرض الخاص بك في الغرفة الحالية فقط",
+    "Changes the avatar of the current room": "يغير الصورة الرمزية للغرفة الحالية",
+    "Changes your avatar in this current room only": "تغيير الصورة الرمزية الخاصة بك في هذه الغرفة الحالية فقط",
+    "Changes your avatar in all rooms": "يغير صورتك الرمزية في جميع الغرف",
+    "Gets or sets the room topic": "الحصول على أو تحديد موضوع الغرفة",
+    "Failed to set topic": "فشل في تحديد الموضوع",
+    "This room has no topic.": "هذه الغرفة ليس لها موضوع.",
+    "Sets the room name": "يضبط اسم الغرفة",
+    "Invites user with given id to current room": "يدعو المستخدم حسب المعرّف المعطى إلى الغرفة الحالية",
+    "Use an identity server": "خادوم التعريف",
+    "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 to invite by email. Manage in Settings.": "استخدم سيرفر الهوية للدعوة عبر البريد الالكتروني. ضبط الاعدادات.",
+    "Joins room with given address": "الانضمام الى الغرفة بحسب العنوان المعطى",
+    "Leave room": "اترك الغرفة",
+    "Unrecognised room address:": "عنوان الغرفة غير معروف:",
+    "Kicks user with given id": "يطرد المستخدم حسب المعرّف المعطى",
+    "Bans user with given id": "يحظر المستخدم حسب المعرّف المعطى",
+    "Unbans user with given ID": "يُلغي الحظر عن المستخدم حسب المعرّف المعطى",
+    "Ignores a user, hiding their messages from you": "يتجاهل المستخدم، ويخفي رسائله عنك",
+    "Ignored user": "مستخدم متجاهل",
+    "You are now ignoring %(userId)s": "انت تقوم الان بتجاهل %(userId)s",
+    "Stops ignoring a user, showing their messages going forward": "يوقف تجاهل المستخدم ويظهر رسائله من الان فصاعدا",
+    "Unignored user": "المستخدم غير متجاهل",
+    "You are no longer ignoring %(userId)s": "انت لم تعد متجاهلا للمستخدم %(userId)s",
+    "Define the power level of a user": "قم بتعريف مستوى الطاقة للمستخدم",
+    "Command failed": "فشل الامر",
+    "Could not find user in room": "لم يستطع ايجاد مستخدم في غرفة",
+    "Deops user with given id": "يُلغي إدارية المستخدم حسب المعرّف المعطى",
+    "Opens the Developer Tools dialog": "يفتح نافذة ادوات المطور",
+    "Adds a custom widget by URL to the room": "يضيف Widget خاص عبر URL الى الغرفة",
+    "Please supply a widget URL or embed code": "رجاء قم بتحديد Widget URL او قم بتضمين كود",
+    "Please supply a https:// or http:// widget URL": "يرجى ادخال a https:// او http:// widget URL",
+    "You cannot modify widgets in this room.": "لا يمكنك تعديل الحاجيات في هذه الغرفة.",
+    "Verifies a user, session, and pubkey tuple": "يتحقق من العناصر: المستخدم والجلسة والمفتاح العام",
+    "Unknown (user, session) pair:": "زوج (المستخدم، الجلسة)غير معروف:",
+    "Session already verified!": "تم التحقق من الجلسة بالفعل!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "تحذير: تم التحقق من الجلسة بالفعل ، ولكن لا تتطابق المفاتيح!",
+    "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\" المعطى. هذا يعني ان اتصالك اصبح مكشوف!",
+    "Verified key": "مفتاح مؤكد",
+    "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. تم تحديد الجلسة على انها مؤكدة.",
+    "Forces the current outbound group session in an encrypted room to be discarded": "يفرض تجاهل جلسة المجموعة الصادرة الحالية في غرفة مشفرة",
+    "Sends the given message coloured as a rainbow": "يرسل رسالة معينة ملونة مثل قوس قزح",
+    "Sends the given emote coloured as a rainbow": "يرسل الرمز المعطى باللون كقوس قزح",
+    "Displays list of commands with usages and descriptions": "يعرض قائمة الأوامر مع الوصف وطرق الاستخدام",
+    "Displays information about a user": "يعرض معلومات عن المستخدم",
+    "Send a bug report with logs": "إرسال تقرير خطأ يحتوي على سجلات الاحداث",
+    "Logs sent": "تم ارسال سجل الاحداث",
+    "Opens chat with the given user": "يفتح دردشة من المستخدم المعطى",
+    "Sends a message to the given user": "يرسل رسالة الى المستخدم المعطى",
+    "Displays action": "يعرض إجراءً",
+    "Reason": "السبب",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s قبل دعوة %(displayName)s.",
+    "%(targetName)s accepted an invitation.": "%(targetName)s قبل الدعوة.",
+    "%(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.",
+    "%(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 changed their profile picture.": "%(senderName)s غير صورة البروفايل الخاصة به.",
+    "%(senderName)s set a profile picture.": "%(senderName)s غير صورة البروفايل الخاصة به.",
+    "%(senderName)s made no change.": "%(senderName)s لم يقم باية تعديلات.",
+    "VoIP conference started.": "بدأ اجتماع VoIP.",
+    "%(targetName)s joined the room.": "%(targetName)s انضم الى الغرفة.",
+    "VoIP conference finished.": "انتهى اجتماع VoIP.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s رفض الدعوة.",
+    "%(targetName)s left the room.": "%(targetName)s غادر الغرفة.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s الغى الحظر على %(targetName)s.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s سحب دعوة %(targetName)s.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s طرد %(targetName)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s غير الموضوع الى \"%(topic)s\".",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)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 to %(roomName)s.": "%(senderDisplayName)s غير اسم الغرفة الى %(roomName)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 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 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 في هذه الغرفة.",
+    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s قام بتفعيل الذوق لمجموعة %(newGroups)s و إيقاف الذوق للمجموعة %(oldGroups)s في هذه الغرفة.",
+    "%(senderDisplayName)s sent an image.": "قام %(senderDisplayName)s بإرسال صورة.",
+    "%(senderName)s set the main address for this room to %(address)s.": "قام %(senderName)s بتعديل العنوان الرئيسي لهذه الغرفة الى %(address)s.",
+    "%(senderName)s removed the main address for this room.": "قام %(senderName)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 بتعديل عناوين هذه الغرفة.",
+    "Someone": "شخص ما",
+    "(not supported by this browser)": "(غير مدعوم في هذا المتصفح)",
+    "%(senderName)s answered the call.": "%(senderName)s رد على المكالمة.",
+    "(could not connect media)": "(غير قادر على الاتصال بالوسيط)",
+    "(no answer)": "(لايوجد رد)",
+    "(unknown failure: %(reason)s)": "(فشل غير معروف:%(reason)s)",
+    "%(senderName)s ended the call.": "%(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 مكالمة فيديو.",
+    "%(senderName)s placed a video call. (not supported by this browser)": "أجرى %(senderName)s مكالمة فيديو. (غير متوافقة مع هذا المتصفح)",
+    "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "قام %(senderName)s بسحب الدعوة الى %(targetDisplayName)s بالانضمام الى الغرفة.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "أرسل %(senderName)s دعوة الى %(targetDisplayName)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 بتعديل رؤية المحادثات السابقة ممكنة لكل الاعضاء من لحظة انضمامهم.",
+    "%(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 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": "الودجت %(widgetName)s تعدلت بواسطة %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "الودجت %(widgetName)s اضيفت بواسطة %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "الودجت %(widgetName)s حذفت بواسطة %(senderName)s",
+    "Whether or not you're logged in (we don't record your username)": "سواءً كنت مسجلا دخولك أم لا (لا نحتفظ باسم المستخدم)",
+    "Every page you use in the app": "كل صفحة تستخدمها في التطبيق",
+    "e.g. <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.": "على الرغم من كون هذه الصفحة تحوي معلومات تمكن تحديد الهوية، مثل معرف الغرفة والمستخدم والمجموعة، فهذه البيانات يتم حذفها قبل أن ترسل للسيرفر.",
+    "The remote side failed to pick up": "الطرف الآخر لم يتمكن من الرد",
+    "Existing Call": "مكالمة موجودة",
+    "You cannot place a call with yourself.": "لا يمكنك الاتصال بنفسك.",
+    "Call in Progress": "المكالمة قيد التحضير",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "يرجى تثبيت <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(اسم المرسل)S إزالة القاعدة التي تحظر المستخدمين المتطابقين %(عام)s",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(اسم المرسل)s إزالة القاعدة التي تحظر الغرف المتطابقة %(عام)s",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(اسم المرسل)s إزالة القاعدة التي تحظر الغرف المتطابقة %(عام)s",
+    "%(senderName)s removed a ban rule matching %(glob)s": "%(اسم المرسل)s إزالة قاعدة الحظر  المتطابقة %(عام)s",
+    "%(senderName)s updated an invalid ban rule": "%(اسم المرسل)s قاعدة حظر محدثة غير صالحة",
+    "%(senderName)s updated the 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 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",
+    "%(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",
+    "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 تم تسجيل الدخول لجلسة جديدة من غير التحقق منها",
+    "Ask this user to verify their session, or manually verify it below.": "اطلب من هذا المستخدم التحقق من جلسته أو تحقق منها بشكل يدوي في الأسفل",
+    "Not Trusted": "غير موثوقة",
+    "Manually Verify by Text": "التحقق بشكل يدوي عبر نص",
+    "Interactively verify by Emoji": "التحقق بشكل تفاعلي عبر صور إيموجي",
+    "Done": "تم",
+    "%(displayName)s is typing …": "%(displayName)s يكتب",
+    "%(names)s and %(count)s others are typing …|other": "%(names)s و %(count)s آخرين يكتبون",
+    "%(names)s and %(count)s others are typing …|one": "%(names)s و آخر يكتب",
+    "%(names)s and %(lastPerson)s are typing …": "%(names)s و %(lastPerson)s يكتبون",
+    "Cannot reach homeserver": "لا يمكن الوصول إلى السيرفر",
+    "Ensure you have a stable internet connection, or get in touch with the server admin": "تأكد من أنك تملك اتصال بالانترنت مستقر أو تواصل مع مدير السيرفر",
+    "Your %(brand)s is misconfigured": "%(brand)s لديك غير مهيأ",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "اطلب من %(brand)s مديرك لفحص <a> إعدادك </a> من أجل مدخلات مكررة أو خاطئة",
+    "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": "ادرك المخاطر وارغب في الاستمرار"
 }
diff --git a/src/i18n/strings/az.json b/src/i18n/strings/az.json
index 6cddb58ad1..5a8dec76f0 100644
--- a/src/i18n/strings/az.json
+++ b/src/i18n/strings/az.json
@@ -25,17 +25,15 @@
     "All notifications are currently disabled for all targets.": "Bütün qurğular üçün bütün bildirişlər kəsilmişdir.",
     "Failed to verify email address: make sure you clicked the link in the email": "Email-i yoxlamağı bacarmadı: əmin olun ki, siz məktubda istinaddakı ünvana keçdiniz",
     "The platform you're on": "İstifadə edilən platforma",
-    "The version of Riot.im": "Riot.im versiyası",
+    "The version of %(brand)s": "%(brand)s versiyası",
     "Your language of choice": "Seçilmiş dil",
     "Which officially provided instance you are using, if any": "Hansı rəsmən dəstəklənən müştəri tərəfindən siz istifadə edirsiniz ( əgər istifadə edirsinizsə)",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Siz Rich Text Editor redaktorunda Richtext rejimindən istifadə edirsinizmi",
     "Your homeserver's URL": "Serverin URL-ünvanı",
-    "Your identity server's URL": "Eyniləşdirmənin serverinin URL-ünvanı",
     "Every page you use in the app": "Hər səhifə, hansını ki, siz proqramda istifadə edirsiniz",
     "e.g. <CurrentPageURL>": "məs. <CurrentPageURL>",
-    "Your User Agent": "Sizin istifadəçi agentiniz",
     "Your device resolution": "Sizin cihazınızın qətnaməsi",
-    "The information being sent to us to help make Riot.im better includes:": "Riot.im'i daha yaxşı etmək üçün bizə göndərilən məlumatlar daxildir:",
+    "The information being sent to us to help make %(brand)s better includes:": "%(brand)s'i daha yaxşı etmək üçün bizə göndərilən məlumatlar daxildir:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Əgər bu səhifədə şəxsi xarakterin məlumatları rast gəlinirsə, məsələn otağın, istifadəçinin adının və ya qrupun adı, onlar serverə göndərilmədən əvvəl silinirlər.",
     "Call Timeout": "Cavab yoxdur",
     "Unable to capture screen": "Ekranın şəkilini etməyə müvəffəq olmur",
@@ -73,7 +71,6 @@
     "Default": "Varsayılan olaraq",
     "Moderator": "Moderator",
     "Admin": "Administrator",
-    "Start a chat": "Danışığa başlamaq",
     "You need to be logged in.": "Siz sistemə girməlisiniz.",
     "You need to be able to invite users to do that.": "Bunun üçün siz istifadəçiləri dəvət etmək imkanına malik olmalısınız.",
     "Failed to send request.": "Sorğunu göndərməyi bacarmadı.",
@@ -85,7 +82,6 @@
     "To use it, just wait for autocomplete results to load and tab through them.": "Bu funksiyadan istifadə etmək üçün, avto-əlavənin pəncərəsində nəticələrin yükləməsini gözləyin, sonra burulma üçün Tab-dan istifadə edin.",
     "Changes your display nickname": "Sizin təxəllüsünüz dəyişdirir",
     "Invites user with given id to current room": "Verilmiş ID-lə istifadəçini cari otağa dəvət edir",
-    "Joins room with given alias": "Verilmiş təxəllüslə otağa daxil olur",
     "Leave room": "Otağı tərk etmək",
     "Kicks user with given id": "Verilmiş ID-lə istifadəçini çıxarır",
     "Bans user with given id": "Verilmiş ID-lə istifadəçini bloklayır",
@@ -142,14 +138,10 @@
     "Confirm password": "Yeni şifrə təsdiq edin",
     "Change Password": "Şifrəni dəyişdirin",
     "Authentication": "Müəyyənləşdirilmə",
-    "Device ID": "Qurğunun ID-i",
     "Failed to set display name": "Görünüş adını təyin etmək bacarmadı",
     "Notification targets": "Xəbərdarlıqlar üçün qurğular",
     "On": "Qoşmaq",
     "not specified": "qeyd edilmədi",
-    "Local addresses for this room:": "Sizin serverinizdə bu otağın ünvanları:",
-    "New address (e.g. #foo:%(localDomain)s)": "Yeni ünvan (məsələn, #nəsə:%(localDomain)s)",
-    "Blacklisted": "Qara siyahıda",
     "Disinvite": "Dəvəti geri çağırmaq",
     "Kick": "Qovmaq",
     "Failed to kick": "Qovmağı bacarmadı",
@@ -157,13 +149,10 @@
     "Ban": "Bloklamaq",
     "Failed to ban user": "İstifadəçini bloklamağı bacarmadı",
     "Failed to mute user": "İstifadəçini kəsməyi bacarmadı",
-    "Failed to toggle moderator status": "Moderatorun statusunu dəyişdirməyi bacarmadı",
     "Failed to change power level": "Hüquqların səviyyəsini dəyişdirməyi bacarmadı",
     "Are you sure?": "Siz əminsiniz?",
     "Unignore": "Blokdan çıxarmaq",
     "Ignore": "Bloklamaq",
-    "User Options": "Hərəkətlər",
-    "Direct chats": "Şəxsi çatlar",
     "Invited": "Dəvət edilmişdir",
     "Filter room members": "İştirakçılara görə axtarış",
     "Attachment": "Əlavə",
@@ -202,7 +191,6 @@
     "Today": "Bu gün",
     "Decrypt %(text)s": "Şifrini açmaq %(text)s",
     "Download %(text)s": "Yükləmək %(text)s",
-    "Message removed by %(userId)s": "%(userId)s mesajı silinmişdir",
     "Sign in with": "Seçmək",
     "Register": "Qeydiyyatdan keçmək",
     "Remove": "Silmək",
@@ -212,7 +200,6 @@
     "Create new room": "Otağı yaratmaq",
     "No results": "Nəticə yoxdur",
     "Home": "Başlanğıc",
-    "Could not connect to the integration server": "İnteqrasiyanın serverinə qoşulmağ mümkün deyil",
     "Manage Integrations": "İnteqrasiyaları idarə etmə",
     "%(items)s and %(lastItem)s": "%(items)s və %(lastItem)s",
     "Room directory": "Otaqların kataloqu",
@@ -280,20 +267,6 @@
     "Commands": "Komandalar",
     "Emoji": "Smaylar",
     "Users": "İstifadəçilər",
-    "unknown device": "naməlum cihaz",
-    "NOT verified": "Yoxlanmamışdır",
-    "verified": "yoxlanmış",
-    "Verification": "Yoxlama",
-    "Ed25519 fingerprint": "Ed25519 iz",
-    "User ID": "İstifadəçinin ID-i",
-    "Curve25519 identity key": "Kimlik açarı Curve25519",
-    "none": "heç kim",
-    "Claimed Ed25519 fingerprint key": "Ed25519-un rəqəmli izinin tələb edilən açarı",
-    "Algorithm": "Alqoritm",
-    "unencrypted": "şifrləməsiz",
-    "Decryption error": "Şifrələmə xətası",
-    "End-to-end encryption information": "İki tərəfi açıq şifrləmə haqqında məlumatlar",
-    "Event information": "Hadisə haqqında informasiya",
     "Confirm passphrase": "Şifrəni təsdiqləyin",
     "This email address is already in use": "Bu e-mail ünvanı istifadə olunur",
     "This phone number is already in use": "Bu telefon nömrəsi artıq istifadə olunur",
@@ -301,13 +274,7 @@
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "'Çörək parçaları' funksiyadan istifadə edmiirsiniz (otaqlar siyahısından yuxarıdakı avatarlar)",
     "Analytics": "Analitik",
     "Call Failed": "Uğursuz zəng",
-    "Review Devices": "Cihazları nəzərdən keçirin",
-    "Call Anyway": "Hər halda zəng edin",
-    "Answer Anyway": "Hər halda cavab verin",
-    "Call": "Zəng",
-    "Answer": "Cavab ver",
     "The remote side failed to pick up": "Qarşı tərəf ala bilmədi",
-    "A conference call could not be started because the integrations server is not available": "Birləşmə serverinin mövcud olmadığı üçün bir konfrans zəngini aça bilmədi",
     "Call in Progress": "Zəng edir",
     "A call is currently being placed!": "Hazırda zəng edilir!",
     "A call is already in progress!": "Zəng artıq edilir!",
@@ -317,7 +284,6 @@
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Bu anda bir faylla cavab vermək mümkün deyil. Bu faylı cavab vermədən yükləməyinizi istəyirsinizmi?",
     "Server may be unavailable, overloaded, or you hit a bug.": "Server, istifadə edilə bilməz, yüklənmiş ola bilər və ya bir səhv vurursunuz.",
     "The server does not support the room version specified.": "Server göstərilən otaq versiyasını dəstəkləmir.",
-    "Send anyway": "Hər halda göndər",
     "Send": "Göndər",
     "PM": "24:00",
     "AM": "12:00",
@@ -328,18 +294,15 @@
     "Invite to Community": "Cəmiyyətə dəvət edirik",
     "Which rooms would you like to add to this community?": "Bu cəmiyyətə hansı otaqları əlavə etmək istərdiniz?",
     "Show these rooms to non-members on the community page and room list?": "Bu otaqları icma səhifəsində və otaq siyahısında olmayanlara göstərin?",
-    "Room name or alias": "Otaq adı və ya ləqəb",
     "Add to community": "Cəmiyyətə əlavə edin",
     "Failed to invite users to community": "İstifadəçiləri cəmiyyətə dəvət etmək alınmadı",
     "Unnamed Room": "Adı açıqlanmayan otaq",
     "Unable to load! Check your network connectivity and try again.": "Yükləmək olmur! Şəbəkə bağlantınızı yoxlayın və yenidən cəhd edin.",
     "Dismiss": "Nəzərə almayın",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot-un sizə bildiriş göndərmək icazəsi yoxdur - brauzerinizin parametrlərini yoxlayın",
-    "Riot was not given permission to send notifications - please try again": "Riot bildiriş göndərmək üçün icazə verilmədi - lütfən yenidən cəhd edin",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s-un sizə bildiriş göndərmək icazəsi yoxdur - brauzerinizin parametrlərini yoxlayın",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s bildiriş göndərmək üçün icazə verilmədi - lütfən yenidən cəhd edin",
     "This email address was not found": "Bu e-poçt ünvanı tapılmadı",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "E-poçt adresiniz bu Ana serverdəki Matrix ID ilə əlaqəli görünmür.",
-    "Registration Required": "Qeydiyyat tələb olunur",
-    "You need to register to do this. Would you like to register now?": "Bunu etmək üçün qeydiyyatdan keçməlisiniz. İndi qeydiyyatdan keçmək istərdiniz?",
     "Restricted": "Məhduddur",
     "Failed to invite": "Dəvət alınmadı",
     "Failed to invite users to the room:": "İstifadəçiləri otağa dəvət etmək alınmadı:",
@@ -357,7 +320,6 @@
     "Gets or sets the room topic": "Otaq mövzusunu alır və ya təyin edir",
     "This room has no topic.": "Bu otağın mövzusu yoxdur.",
     "Sets the room name": "Otaq adını təyin edir",
-    "Unrecognised room alias:": "Tanınmamış otaq ləqəbi:",
     "Unbans user with given ID": "Verilmiş ID ilə istifadəçini qadağan etmək",
     "Define the power level of a user": "Bir istifadəçinin güc səviyyəsini müəyyənləşdirin",
     "Opens the Developer Tools dialog": "Geliştirici Alətlər dialoqunu açır",
@@ -375,7 +337,6 @@
     "Try using turn.matrix.org": "Turn.matrix.org istifadə edin",
     "The file '%(fileName)s' failed to upload.": "'%(fileName)s' faylı yüklənə bilmədi.",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "'%(fileName)s' faylı yükləmə üçün bu server ölçü həddini aşmışdır",
-    "Send cross-signing keys to homeserver": "Ev serveri üçün çarpaz imzalı açarları göndərin",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
     "Add rooms to the community": "Icmaya otaqlar əlavə edin",
     "Failed to invite the following users to %(groupId)s:": "Aşağıdakı istifadəçiləri %(groupId)s - ə dəvət etmək alınmadı:",
diff --git a/src/i18n/strings/be.json b/src/i18n/strings/be.json
index e8e94b747a..05e0baca4b 100644
--- a/src/i18n/strings/be.json
+++ b/src/i18n/strings/be.json
@@ -21,7 +21,7 @@
     "Close": "Зачыніць",
     "Notifications": "Апавяшчэнні",
     "Low Priority": "Нізкі прыярытэт",
-    "Riot does not know how to join a room on this network": "Riot не ведае, як увайсці ў пакой у гэтай сетке",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s не ведае, як увайсці ў пакой у гэтай сетке",
     "Members": "Удзельнікі",
     "Can't update user notification settings": "Немагчыма абнавіць налады апавяшчэнняў карыстальніка",
     "Failed to change settings": "Не атрымалася змяніць налады",
@@ -30,7 +30,6 @@
     "On": "Уключыць",
     "remove %(name)s from the directory.": "выдаліць %(name)s з каталога.",
     "Off": "Выключыць",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Выдаліць псеўданім пакоя %(alias)s і выдаліць %(name)s з каталога?",
     "Invite to this room": "Запрасіць у гэты пакой",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Апавяшчэнні па наступных ключавых словах прытрымліваюцца правілаў, якія не могуць быць адлюстраваны тут:",
     "Mentions only": "Толькі згадкі",
@@ -42,7 +41,6 @@
     "No rooms to show": "Няма пакояў для паказу",
     "Download this file": "Спампаваць гэты файл",
     "Operation failed": "Не атрымалася выканаць аперацыю",
-    "delete the alias.": "выдаліць псеўданім.",
     "Forget": "Забыць",
     "Mute": "Без гуку",
     "Error saving email notification preferences": "Памылка захавання налад апавяшчэнняў па электроннай пошце",
@@ -59,6 +57,5 @@
     "An error occurred whilst saving your email notification preferences.": "Адбылася памылка падчас захавання налады апавяшчэнняў па электроннай пошце.",
     "Room not found": "Пакой не знойдзены",
     "Notify for all other messages/rooms": "Апавяшчаць для ўсіх іншых паведамленняў/пакояў",
-    "There are advanced notifications which are not shown here": "Ёсць пашыраныя апавяшчэння, якія не паказаныя тут",
     "The server may be unavailable or overloaded": "Сервер можа быць недаступны ці перагружаны"
 }
diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index b31498ef0b..32652669af 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -58,24 +58,20 @@
     "This phone number is already in use": "Този телефонен номер е вече зает",
     "Failed to verify email address: make sure you clicked the link in the email": "Неуспешно потвърждаване на имейл адреса: уверете се, че сте кликнали върху връзката в имейла",
     "The platform you're on": "Платформата, която използвате",
-    "The version of Riot.im": "Версията на Riot.im",
+    "The version of %(brand)s": "Версията на %(brand)s",
     "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": "Дали използвате Richtext режим на Rich Text Editor",
     "Your homeserver's URL": "Адресът на Вашия Home сървър",
-    "Your identity server's URL": "Адресът на Вашия сървър за самоличност",
     "Analytics": "Статистика",
-    "The information being sent to us to help make Riot.im better includes:": "За да направим Riot по-добър, информацията изпратена до нас включва:",
+    "The information being sent to us to help make %(brand)s better includes:": "Информацията, която се изпраща за да ни помогне да подобрим %(brand)s включва:",
     "Call Failed": "Неуспешно повикване",
-    "Call": "Позвъни",
-    "Answer": "Отговори",
     "You are already in a call.": "Вече сте в разговор.",
     "VoIP is unsupported": "Не се поддържа VoIP",
     "You cannot place VoIP calls in this browser.": "Не може да осъществите VoIP разговори в този браузър.",
     "You cannot place a call with yourself.": "Не може да осъществите разговор със себе си.",
     "Existing Call": "Съществуващ разговор",
     "Warning!": "Внимание!",
-    "Review Devices": "Преглед на устройства",
     "Upload Failed": "Качването е неуспешно",
     "PM": "PM",
     "AM": "AM",
@@ -86,14 +82,13 @@
     "Which rooms would you like to add to this community?": "Кои стаи бихте желали да добавите в тази общност?",
     "Show these rooms to non-members on the community page and room list?": "Показване на тези стаи на не-членове в страницата на общността и в списъка със стаи?",
     "Add rooms to the community": "Добави стаи в общността",
-    "Room name or alias": "Име или псевдоним на стая",
     "Add to community": "Добави в общност",
     "Failed to invite the following users to %(groupId)s:": "Следните потребители не могат да бъдат поканени в %(groupId)s:",
     "Failed to invite users to community": "Потребителите не могат да бъдат поканени в общността",
     "Failed to invite users to %(groupId)s": "Потребителите не могат да бъдат поканени в %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Следните стаи не могат да бъдат добавени в %(groupId)s:",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot няма разрешение да Ви изпраща известия - моля проверете вашите настройки на браузъра",
-    "Riot was not given permission to send notifications - please try again": "Riot не е получил разрешение да изпраща известия - моля опитайте отново",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s няма разрешение да Ви изпраща известия - моля проверете вашите настройки на браузъра",
+    "%(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.": "Изглежда вашият имейл адрес не може да се асоциира с Matrix ID на този Home сървър.",
@@ -101,7 +96,6 @@
     "Restricted": "Ограничен",
     "Moderator": "Модератор",
     "Admin": "Администратор",
-    "Start a chat": "Започване на чат",
     "Failed to invite": "Неуспешна покана",
     "Failed to invite the following users to the %(roomName)s room:": "Следните потребителите не успяха да бъдат добавени в %(roomName)s:",
     "You need to be logged in.": "Трябва да влезете в профила си.",
@@ -110,8 +104,6 @@
     "Failed to send request.": "Неуспешно изпращане на заявката.",
     "This room is not recognised.": "Стаята не е разпозната.",
     "Power level must be positive integer.": "Нивото на достъп трябва да бъде позитивно число.",
-    "Call Anyway": "Позвъни въпреки това",
-    "Answer Anyway": "Отговори въпреки това",
     "Call Timeout": "Изтекло време за повикване",
     "The remote side failed to pick up": "Отсрещната страна не успя да отговори",
     "Unable to capture screen": "Неуспешно заснемане на екрана",
@@ -122,7 +114,6 @@
     "Missing user_id in request": "Липсва user_id в заявката",
     "/ddg is not a command": "/ddg не е команда",
     "To use it, just wait for autocomplete results to load and tab through them.": "За използване, изчакайте зареждането на списъка с предложения и изберете от него.",
-    "Unrecognised room alias:": "Непознат псевдоним на стая:",
     "Ignored user": "Игнориран потребител",
     "You are now ignoring %(userId)s": "Вече игнорирате %(userId)s",
     "Unignored user": "Неигнориран потребител",
@@ -172,14 +163,12 @@
     "%(widgetName)s widget removed by %(senderName)s": "Приспособлението %(widgetName)s беше премахнато от %(senderName)s",
     "Failure to create room": "Неуспешно създаване на стая",
     "Server may be unavailable, overloaded, or you hit a bug.": "Сървърът може би е претоварен, недостъпен или се натъкнахте на проблем.",
-    "Send anyway": "Изпрати въпреки това",
     "Unnamed Room": "Стая без име",
     "Your browser does not support the required cryptography extensions": "Вашият браузър не поддържа необходимите разширения за шифроване",
-    "Not a valid Riot keyfile": "Невалиден файл с ключ за Riot",
+    "Not a valid %(brand)s keyfile": "Невалиден файл с ключ за %(brand)s",
     "Authentication check failed: incorrect password?": "Неуспешна автентикация: неправилна парола?",
     "Failed to join room": "Неуспешно присъединяване към стаята",
     "Message Pinning": "Функция за закачане на съобщения",
-    "Use compact timeline layout": "Използване на компактно оформление за списъка със съобщения",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Показване на времето в 12-часов формат (напр. 2:30pm)",
     "Always show message timestamps": "Винаги показвай часа на съобщението",
     "Autoplay GIFs and videos": "Автоматично възпроизвеждане на GIF-файлове и видеа",
@@ -214,11 +203,8 @@
     "Confirm password": "Потвърждаване на парола",
     "Change Password": "Смяна на парола",
     "Authentication": "Автентикация",
-    "Device ID": "Идентификатор на устройство",
     "Last seen": "Последно видян",
     "Failed to set display name": "Неуспешно задаване на име",
-    "Disable Notifications": "Изключване на известия",
-    "Enable Notifications": "Включване на известия",
     "Cannot add any more widgets": "Не могат да се добавят повече приспособления",
     "The maximum permitted number of widgets have already been added to this room.": "Максимално разрешеният брой приспособления е вече добавен към тази стая.",
     "Add a widget": "Добави приспособление",
@@ -232,8 +218,6 @@
     "%(senderName)s uploaded a file": "%(senderName)s качи файл",
     "Options": "Настройки",
     "Please select the destination room for this message": "Моля, изберете стаята, в която искате да изпратите това съобщение",
-    "Blacklisted": "В черния списък",
-    "device id: ": "идентификатор на устройството: ",
     "Disinvite": "Отмени поканата",
     "Kick": "Изгони",
     "Disinvite this user?": "Отмени поканата към този потребител?",
@@ -245,7 +229,6 @@
     "Ban this user?": "Блокирай този потребител?",
     "Failed to ban user": "Неуспешно блокиране на потребителя",
     "Failed to mute user": "Неуспешно заглушаване на потребителя",
-    "Failed to toggle moderator status": "Неуспешна промяна на статуса на модератора",
     "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?": "Сигурни ли сте?",
@@ -253,11 +236,8 @@
     "Unignore": "Премахни игнорирането",
     "Ignore": "Игнорирай",
     "Mention": "Спомени",
-    "Direct chats": "Директни чатове",
-    "User Options": "Опции на потребителя",
     "Invite": "Покани",
     "Unmute": "Премахни заглушаването",
-    "Make Moderator": "Направи модератор",
     "Admin Tools": "Инструменти на администратора",
     "and %(count)s others...|other": "и %(count)s други...",
     "and %(count)s others...|one": "и още един...",
@@ -270,9 +250,7 @@
     "Video call": "Видео повикване",
     "Upload file": "Качи файл",
     "Send an encrypted reply…": "Изпрати шифрован отговор…",
-    "Send a reply (unencrypted)…": "Отговори (нешифрованo)…",
     "Send an encrypted message…": "Изпрати шифровано съобщение…",
-    "Send a message (unencrypted)…": "Изпрати съобщение (нешифровано)…",
     "You do not have permission to post to this room": "Нямате разрешение да публикувате в тази стая",
     "Server error": "Сървърна грешка",
     "Server unavailable, overloaded, or something else went wrong.": "Сървърът е недостъпен, претоварен или нещо друго се обърка.",
@@ -333,10 +311,7 @@
     "Add a topic": "Добавете тема",
     "Jump to first unread message.": "Отиди до първото непрочетено съобщение.",
     "not specified": "неопределен",
-    "Remote addresses for this room:": "Отдалечени адреси на тази стая:",
-    "Local addresses for this room:": "Локалните адреси на тази стая са:",
     "This room has no local addresses": "Тази стая няма локални адреси",
-    "New address (e.g. #foo:%(localDomain)s)": "Нов адрес (напр. #foo:%(localDomain)s)",
     "Invalid community ID": "Невалиден идентификатор на общност",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' е невалиден идентификатор на общност",
     "Flair": "Значка",
@@ -383,7 +358,6 @@
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Създайте общност, за да групирате потребители и стаи! Изградете персонализирана начална страница, за да маркирате своето пространство в Matrix Вселената.",
     "Jump to message": "Отиди до съобщението",
     "Jump to read receipt": "Отиди до потвърждението за прочитане",
-    "Revoke Moderator": "Премахване на правата на модератора",
     "Invalid file%(extra)s": "Невалиден файл%(extra)s",
     "Error decrypting image": "Грешка при разшифроване на снимка",
     "Error decrypting video": "Грешка при разшифроване на видео",
@@ -393,10 +367,6 @@
     "Copied!": "Копирано!",
     "Failed to copy": "Неуспешно копиране",
     "Add an Integration": "Добавяне на интеграция",
-    "Removed or unknown message type": "Премахнато или неизвестен тип съобщение",
-    "Message removed by %(userId)s": "Съобщението е премахнато от %(userId)s",
-    "Message removed": "Съобщението е премахнато",
-    "To continue, please enter your password.": "За да продължите, моля, въведете своята парола.",
     "An email has been sent to %(emailAddress)s": "Имейл беше изпратен на %(emailAddress)s",
     "Please check your email to continue registration.": "Моля, проверете имейла си, за да продължите регистрацията.",
     "Token incorrect": "Неправителен тоукън",
@@ -424,17 +394,10 @@
     "Delete widget": "Изтрий приспособлението",
     "Minimize apps": "Минимизирай приложенията",
     "Create new room": "Създай нова стая",
-    "Unblacklist": "Премахни от черния списък",
-    "Blacklist": "Добави в черен списък",
-    "Unverify": "Махни потвърждението",
-    "Verify...": "Потвърди...",
     "I have verified my email address": "Потвърдих имейл адреса си",
-    "NOT verified": "НЕ е потвърдено",
-    "verified": "потвърдено",
     "No results": "Няма резултати",
     "Communities": "Общности",
     "Home": "Начална страница",
-    "Could not connect to the integration server": "Неуспешно свързване със сървъра с интеграции",
     "Manage Integrations": "Управление на интеграциите",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)sсе присъединиха %(count)s пъти",
@@ -513,14 +476,8 @@
     "Unknown error": "Неизвестна грешка",
     "Incorrect password": "Неправилна парола",
     "Deactivate Account": "Затвори акаунта",
-    "Start verification": "Започни потвърждението",
     "Verification Pending": "Очакване на потвърждение",
-    "Verification": "Потвърждение",
-    "I verify that the keys match": "Потвърждавам, че ключовете съвпадат",
     "An error has occurred.": "Възникна грешка.",
-    "Share without verifying": "Сподели без потвърждение",
-    "Ignore request": "Игнорирай поканата",
-    "Encryption key request": "Заявка за ключ за шифроване",
     "Unable to restore session": "Неуспешно възстановяване на сесията",
     "Invalid Email Address": "Невалиден имейл адрес",
     "This doesn't appear to be a valid email address": "Това не изглежда да е валиден имейл адрес",
@@ -541,7 +498,6 @@
     "If you already have a Matrix account you can <a>log in</a> instead.": "Ако вече имате Matrix профил, можете да <a>влезете</a> с него.",
     "Private Chat": "Личен чат",
     "Public Chat": "Публичен чат",
-    "Alias (optional)": "Псевдоним (по избор)",
     "Name": "Име",
     "You must <a>register</a> to use this functionality": "Трябва да се <a>регистрирате</a>, за да използвате тази функционалност",
     "You must join the room to see its files": "Трябва да се присъедините към стаята, за да видите файловете, които съдържа",
@@ -579,7 +535,6 @@
     "Sign out": "Изход",
     "Error whilst fetching joined communities": "Грешка при извличането на общности, към които сте присъединени",
     "You have no visible notifications": "Нямате видими известия",
-    "Scroll to bottom of page": "Отиди до края на страницата",
     "%(count)s of your messages have not been sent.|other": "Някои от Вашите съобщение не бяха изпратени.",
     "%(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> сега. Също така може да изберете индивидуални съобщения, които да изпратите отново или да откажете.",
@@ -593,7 +548,6 @@
     "Search failed": "Търсенето е неуспешно",
     "Server may be unavailable, overloaded, or search timed out :(": "Сървърът може би е недостъпен, претоварен или времето за търсене изтече :(",
     "No more results": "Няма повече резултати",
-    "Unknown room %(roomId)s": "Неизвестна стая %(roomId)s",
     "Room": "Стая",
     "Failed to reject invite": "Неуспешно отхвърляне на поканата",
     "Reject all %(invitedRooms)s invites": "Отхвърли всички %(invitedRooms)s покани",
@@ -608,20 +562,18 @@
     "Uploading %(filename)s and %(count)s others|other": "Качване на %(filename)s и %(count)s други",
     "Uploading %(filename)s and %(count)s others|zero": "Качване на %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Качване на %(filename)s и %(count)s друг",
-    "Light theme": "Светла тема",
-    "Dark theme": "Тъмна тема",
     "Success": "Успешно",
     "<not supported>": "<не се поддържа>",
     "Import E2E room keys": "Импортирай E2E ключове",
     "Cryptography": "Криптография",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot събира анонимни статистики, за да ни позволи да подобрим приложението.",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s събира анонимни статистики, за да ни позволи да подобрим приложението.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Поверителността е важна за нас, затова не събираме лични или идентифициращи Вас данни.",
     "Learn more about how we use analytics.": "Научете повече за това как използваме статистическите данни.",
     "Labs": "Експерименти",
     "Check for update": "Провери за нова версия",
     "Start automatically after system login": "Автоматично стартиране след влизане в системата",
     "No media permissions": "Няма разрешения за медийните устройства",
-    "You may need to manually permit Riot to access your microphone/webcam": "Може да се наложи ръчно да разрешите на Riot да получи достъп до Вашия микрофон/уеб камера",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "Може да се наложи ръчно да разрешите на %(brand)s да получи достъп до Вашия микрофон/уеб камера",
     "No Microphones detected": "Няма открити микрофони",
     "No Webcams detected": "Няма открити уеб камери",
     "Default Device": "Устройство по подразбиране",
@@ -634,7 +586,7 @@
     "click to reveal": "натиснете за показване",
     "Homeserver is": "Home сървър:",
     "Identity Server is": "Сървър за самоличност:",
-    "riot-web version:": "Версия на riot-web:",
+    "%(brand)s version:": "Версия на %(brand)s:",
     "olm version:": "Версия на olm:",
     "Failed to send email": "Неуспешно изпращане на имейл",
     "The email address linked to your account must be entered.": "Имейл адресът, свързан с профила Ви, трябва да бъде въведен.",
@@ -657,7 +609,6 @@
     "Define the power level of a user": "Променя нивото на достъп на потребителя",
     "Deops user with given id": "Отнема правата на потребител с даден идентификатор",
     "Invites user with given id to current room": "Поканва потребител с даден идентификатор в текущата стая",
-    "Joins room with given alias": "Присъединяване към стая с даден псевдоним",
     "Kicks user with given id": "Изгонва потребителя с даден идентификатор",
     "Changes your display nickname": "Сменя Вашия псевдоним",
     "Searches DuckDuckGo for results": "Търси в DuckDuckGo за резултати",
@@ -669,17 +620,7 @@
     "Notify the whole room": "Извести всички в стаята",
     "Room Notification": "Известие за стая",
     "Users": "Потребители",
-    "unknown device": "неизвестно устройство",
-    "Ed25519 fingerprint": "Ed25519 отпечатък",
-    "User ID": "Потребителски идентификатор",
-    "Curve25519 identity key": "Curve25519 ключ за самоличност",
-    "Algorithm": "Алгоритъм",
-    "unencrypted": "нешифрован",
-    "Decryption error": "Грешка при разшифроването",
     "Session ID": "Идентификатор на сесията",
-    "Claimed Ed25519 fingerprint key": "Заявен ключов отпечатък Ed25519",
-    "End-to-end encryption information": "Информация за шифроването от край до край",
-    "Event information": "Информация за събитието",
     "Passphrases must match": "Паролите трябва да съвпадат",
     "Passphrase must not be empty": "Паролата не трябва да е празна",
     "Export room keys": "Експортиране на ключове за стаята",
@@ -692,16 +633,15 @@
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Когато тази страница съдържа информация идентифицираща Вас (като например стая, потребител или идентификатор на група), тези данни биват премахнати преди да бъдат изпратени до сървъра.",
     "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. Искате ли да продължите?",
     "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.": "Сигурни ли сте, че искате да премахнете (изтриете) това събитие? Забележете, че ако изтриете събитие за промяна на името на стая или тема, това може да обърне промяната.",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Ако преди сте използвали по-нова версия на Riot, Вашата сесия може да не бъде съвместима с текущата версия. Затворете този прозорец и се върнете в по-новата версия.",
+    "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, Вашата сесия може да не бъде съвместима с текущата версия. Затворете този прозорец и се върнете в по-новата версия.",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Това ще бъде името на профила Ви на <span></span> Home сървъра, или можете да изберете <a>друг сървър</a>.",
-    "Data from an older version of Riot 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.": "Засечени са данни от по-стара версия на Riot. Това ще доведе до неправилна работа на криптографията от край до край в по-старата версия. Шифрованите от край до край съобщения, които са били обменени наскоро (при използването на по-стара версия), може да не успеят да бъдат разшифровани в тази версия. Това също може да доведе до неуспех в обмяната на съобщения в тази версия. Ако имате проблеми, излезте и влезте отново в профила си. За да запазите историята на съобщенията, експортирайте и импортирайте отново Вашите ключове.",
+    "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. Това ще доведе до неправилна работа на криптографията от край до край в по-старата версия. Шифрованите от край до край съобщения, които са били обменени наскоро (при използването на по-стара версия), може да не успеят да бъдат разшифровани в тази версия. Това също може да доведе до неуспех в обмяната на съобщения в тази версия. Ако имате проблеми, излезте и влезте отново в профила си. За да запазите историята на съобщенията, експортирайте и импортирайте отново Вашите ключове.",
     "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.": "Няма връзка с Home сървъра. Моля, проверете Вашата връзка. Уверете се, че <a>SSL сертификатът на Home сървъра</a> е надежден и че някое разширение на браузъра не блокира заявките.",
-    "none": "няма",
     "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.": "Този процес Ви позволява да експортирате във файл ключовете за съобщения в шифровани стаи. Така ще можете да импортирате файла в друг Matrix клиент, така че той също да може да разшифрова такива съобщения.",
     "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 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.": "Този процес позволява да импортирате ключове за шифроване, които преди сте експортирали от друг Matrix клиент. Тогава ще можете да разшифровате всяко съобщение, което другият клиент може да разшифрова.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Експортираният файл може да бъде предпазен с парола. Трябва да въведете парола тук, за да разшифровате файла.",
-    "Did you know: you can use communities to filter your Riot.im experience!": "Знаете ли, че: може да използвате общности, за да филтрирате Вашето Riot.im преживяване!",
+    "Did you know: you can use communities to filter your %(brand)s experience!": "Знаете ли, че: може да използвате общности, за да филтрирате Вашето %(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.": "За да създадете филтър, дръпнете и пуснете аватара на общността върху панела за филтриране в най-лявата част на екрана. По всяко време може да натиснете върху аватар от панела, за да видите само стаите и хората от тази общност.",
     "Key request sent.": "Заявката за ключ е изпратена.",
     "Code": "Код",
@@ -721,7 +661,6 @@
     "Who can join this community?": "Кой може да се присъедини към тази общност?",
     "Everyone": "Всеки",
     "Fetching third party location failed": "Неуспешно извличане на адреса на стаята от друга мрежа",
-    "A new version of Riot is available.": "Налична е нова версия на Riot.",
     "Send Account Data": "Изпращане на Account Data",
     "All notifications are currently disabled for all targets.": "В момента известията са изключени за всички цели.",
     "Uploading report": "Качване на доклада",
@@ -740,8 +679,6 @@
     "Send Custom Event": "Изпрати потребителско събитие",
     "Advanced notification settings": "Разширени настройки за известяване",
     "Failed to send logs: ": "Неуспешно изпращане на логове: ",
-    "delete the alias.": "изтрий псевдонима.",
-    "To return to your account in future you need to <u>set a password</u>": "За да се върнете в профила си в бъдеще, трябва да <u>зададете парола</u>",
     "Forget": "Забрави",
     "You cannot delete this image. (%(code)s)": "Не можете да изтриете тази снимка. (%(code)s)",
     "Cancel Sending": "Откажи изпращането",
@@ -765,7 +702,6 @@
     "No update available.": "Няма нова версия.",
     "Noisy": "Шумно",
     "Collecting app version information": "Събиране на информация за версията на приложението",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Изтриване на псевдонима %(alias)s на стаята и премахване на %(name)s от директорията?",
     "Enable notifications for this account": "Включване на известия за този профил",
     "Invite to this community": "Покани в тази общност",
     "Search…": "Търсене…",
@@ -776,7 +712,7 @@
     "Forward Message": "Препрати съобщението",
     "You have successfully set a password and an email address!": "Вие успешно зададохте парола и имейл адрес!",
     "Remove %(name)s from the directory?": "Премахване на %(name)s от директорията?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot използва много разширени браузър харектеристики, някои от които не са налични или са все още експериментални в настоящия Ви браузър.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s използва много разширени браузър харектеристики, някои от които не са налични или са все още експериментални в настоящия Ви браузър.",
     "Developer Tools": "Инструменти за разработчика",
     "Preparing to send logs": "Подготовка за изпращане на логове",
     "Explore Account Data": "Преглед на данните от профила",
@@ -822,8 +758,7 @@
     "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.": "Логовете за дебъгване съдържат данни за използване на приложението, включващи потребителското Ви име, идентификаторите или псевдонимите на стаите или групите, които сте посетили, и потребителските имена на други потребители. Те не съдържат съобщения.",
     "Unhide Preview": "Покажи отново прегледа",
     "Unable to join network": "Неуспешно присъединяване към мрежата",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Възможна конфигурация на настройките за известия в клиент, различен от Riot. Не могат да бъдат променени в Riot, но важат въпреки това",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "За жалост, Вашият браузър <b>не</b> може да пусне Riot.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "За жалост, Вашият браузър <b>не</b> може да пусне %(brand)s.",
     "Messages in group chats": "Съобщения в групови чатове",
     "Yesterday": "Вчера",
     "Error encountered (%(errorDetail)s).": "Възникна грешка (%(errorDetail)s).",
@@ -833,7 +768,7 @@
     "Set Password": "Задаване на парола",
     "An error occurred whilst saving your email notification preferences.": "Възникна грешка при запазване на настройките за имейл известяване.",
     "Off": "Изкл.",
-    "Riot does not know how to join a room on this network": "Riot не знае как да се присъедини към стая от тази мрежа",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s не знае как да се присъедини към стая от тази мрежа",
     "Mentions only": "Само при споменаване",
     "You can now return to your account after signing out, and sign in on other devices.": "Вече можете да се върнете в профила си след излизане от него и да влезете от други устройства.",
     "Enable email notifications": "Активиране на имейл известия",
@@ -847,11 +782,9 @@
     "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...": "Проверяване за нова версия...",
-    "There are advanced notifications which are not shown here": "Съществуват разширени настройки за известия, които не са показани тук",
     "Missing roomId.": "Липсва идентификатор на стая.",
     "Every page you use in the app": "Всяка използвана страница от приложението",
     "e.g. <CurrentPageURL>": "например: <CurrentPageURL>",
-    "Your User Agent": "Вашият браузър",
     "Your device resolution": "Разделителната способност на устройството Ви",
     "Always show encryption icons": "Винаги показвай икони за шифроване",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Не може да се зареди събитието, на което е отговорено. Или не съществува или нямате достъп да го видите.",
@@ -866,9 +799,6 @@
     "e.g. %(exampleValue)s": "напр. %(exampleValue)s",
     "Send analytics data": "Изпращане на статистически данни",
     "Muted Users": "Заглушени потребители",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Моля, помогнете за подобряването на Riot.im като изпращате <UsageDataLink>анонимни данни за ползване</UsageDataLink>. Това ще използва бисквитка (моля, вижте нашата <PolicyLink>политика за бисквитки</PolicyLink>).",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Моля, помогнете за подобряването на Riot.im като изпращате <UsageDataLink>анонимни данни за ползване</UsageDataLink>. Това ще използва бисквитка.",
-    "Yes, I want to help!": "Да, искам да помогна!",
     "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.": "Видимостта на съобщенията в Matrix е подобно на имейл системата. Нашето забравяне означава, че: изпратените от Вас съобщения няма да бъдат споделяни с нови или нерегистрирани потребители, но регистрираните потребители имащи достъп до тях ще продължат да имат достъп до своето копие.",
@@ -912,9 +842,6 @@
     "Please <a>contact your service administrator</a> to continue using the service.": "Моля, <a>свържете се с администратора на услугата</a> за да продължите да я използвате.",
     "This homeserver has hit its Monthly Active User limit.": "Този сървър е достигнал лимита си за активни потребители на месец.",
     "This homeserver has exceeded one of its resource limits.": "Този сървър е надвишил някой от лимитите си.",
-    "Please <a>contact your service administrator</a> to get this limit increased.": "Моля, <a>свържете се с администратора на услугата</a> за да се увеличи този лимит.",
-    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "Този сървър е достигнал своя лимит за потребители на месец, така че <b>някои потребители не биха успели да влязат</b>.",
-    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Този сървър е достигнал някой от лимите си, така че <b>някои потребители не биха успели да влязат</b>.",
     "Upgrade Room Version": "Обнови версията на стаята",
     "Create a new room with the same name, description and avatar": "Създадем нова стая със същото име, описание и снимка",
     "Update any local room aliases to point to the new room": "Обновим всички локални адреси на стаята да сочат към новата",
@@ -926,8 +853,6 @@
     "Sorry, your homeserver is too old to participate in this room.": "Съжаляваме, вашият сървър е прекалено стар за да участва в тази стая.",
     "Please contact your homeserver administrator.": "Моля, свържете се се със сървърния администратор.",
     "Legal": "Юридически",
-    "Registration Required": "Нужна е регистрация",
-    "You need to register to do this. Would you like to register now?": "За да направите това е нужно да се регистрирате. Искате ли да се регистрирате сега?",
     "Unable to connect to Homeserver. Retrying...": "Неуспешно свързване със сървъра. Опитване отново...",
     "This room has been replaced and is no longer active.": "Тази стая е била заменена и вече не е активна.",
     "The conversation continues here.": "Разговора продължава тук.",
@@ -937,18 +862,13 @@
     "The room upgrade could not be completed": "Обновяването на тази стая не можа да бъде завършено",
     "Upgrade this room to version %(version)s": "Обновете тази стая до версия %(version)s",
     "Forces the current outbound group session in an encrypted room to be discarded": "Принудително прекратява текущата изходяща групова сесия в шифрована стая",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s добави %(addedAddresses)s като адрес за тази стая.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s добави %(addedAddresses)s като адреси за тази стая.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s премахна %(removedAddresses)s като адрес за тази стая.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s премахна %(removedAddresses)s като адреси за тази стая.",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s добави %(addedAddresses)s и премахна %(removedAddresses)s като адреси за тази стая.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s настрой основния адрес на тази стая на %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s премахна основния адрес на тази стая.",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Преди да изпратите логове, трябва да <a>отворите доклад за проблем в Github</a>.",
-    "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Riot вече използва 3-5 пъти по-малко памет, като зарежда информация за потребители само когато е нужна. Моля, изчакайте докато ресинхронизираме със сървъра!",
-    "Updating Riot": "Обновяване на Riot",
-    "You've previously used Riot 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, Riot needs to resync your account.": "Преди сте използвали Riot на %(host)s с включено постепенно зареждане на членове. В тази версия, тази настройка е изключена. Понеже локалният кеш не е съвместим при тези две настройки, Riot трябва да синхронизира акаунта Ви наново.",
-    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Ако другата версия на Riot все още е отворена в друг таб, моля затворете я. Използването на Riot на един адрес във версии с постепенно и без постепенно зареждане ще причини проблеми.",
+    "%(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 пъти по-малко памет, като зарежда информация за потребители само когато е нужна. Моля, изчакайте докато ресинхронизираме със сървъра!",
+    "Updating %(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 трябва да синхронизира акаунта Ви наново.",
+    "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 на един адрес във версии с постепенно и без постепенно зареждане ще причини проблеми.",
     "Incompatible local cache": "Несъвместим локален кеш",
     "Clear cache and resync": "Изчисти кеша и ресинхронизирай",
     "Please review and accept the policies of this homeserver:": "Моля, прегледайте и приемете политиките на този сървър:",
@@ -1000,22 +920,17 @@
     "Please review and accept all of the homeserver's policies": "Моля прегледайте и приемете всички политики на сървъра",
     "Failed to load group members": "Неуспешно зареждане на членовете на групата",
     "That doesn't look like a valid email address": "Това не изглежда като валиден имейл адрес",
-    "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 Riot to do this": "За да избегнете загубата на чат история, трябва да експортирате ключовете на стаята преди да излезете от профила си. Ще трябва да се върнете към по-новата версия на Riot за да направите това",
-    "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ": "Преди време сте използвали по-нова версия на Riot на %(host)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 за да направите това",
     "Incompatible Database": "Несъвместима база данни",
     "Continue With Encryption Disabled": "Продължи с изключено шифроване",
     "Checking...": "Проверяване...",
     "Unable to load backup status": "Неуспешно зареждане на състоянието на резервното копие",
     "Unable to restore backup": "Неуспешно възстановяване на резервно копие",
     "No backup found!": "Не е открито резервно копие!",
-    "Backup Restored": "Резервното копие е възстановено",
     "Failed to decrypt %(failedCount)s sessions!": "Неуспешно разшифроване на %(failedCount)s сесии!",
-    "Restored %(sessionCount)s session keys": "Възстановени бяха %(sessionCount)s сесийни ключа",
-    "Enter Recovery Passphrase": "Въведете парола за възстановяване",
     "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Получете достъп до защитената история на съобщенията и настройте защитен чат, чрез въвеждане на паролата за възстановяване.",
     "Next": "Напред",
     "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>",
-    "Enter Recovery Key": "Въведете ключ за възстановяване",
     "This looks like a valid recovery key!": "Това изглежда като валиден ключ за възстановяване!",
     "Not a valid recovery key": "Не е валиден ключ за възстановяване",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Получете достъп до защитената история на съобщенията и настройте защитен чат, чрез въвеждане на ключа за възстановяване.",
@@ -1024,23 +939,14 @@
     "General failure": "Обща грешка",
     "Failed to perform homeserver discovery": "Неуспешно откриване на конфигурацията за сървъра",
     "Sign in with single sign-on": "Влезте посредством single-sign-on",
-    "Great! This passphrase looks strong enough.": "Чудесно! Паролата изглежда сигурна.",
-    "Enter a passphrase...": "Въведете парола...",
     "That matches!": "Това съвпада!",
     "That doesn't match.": "Това не съвпада.",
     "Go back to set it again.": "Върнете се за да настройте нова.",
-    "Repeat your passphrase...": "Повторете паролата...",
-    "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Като предпазна мярка, можете да го използвате за възстановяване на шифрованата история на съобщенията, в случай че сте забравили паролата за възстановяване.",
-    "As a safety net, you can use it to restore your encrypted message history.": "Като предпазна мярка, можете да го използвате за възстановяване на шифрованата история на съобщенията.",
-    "Your Recovery Key": "Вашия ключ за възстановяване",
-    "Copy to clipboard": "Копирай в клипборд",
     "Download": "Свали",
     "<b>Print it</b> and store it somewhere safe": "<b>Принтирайте го</b> и го съхранявайте на безопасно място",
     "<b>Save it</b> on a USB key or backup drive": "<b>Запазете го</b> на USB или резервен диск",
     "<b>Copy it</b> to your personal cloud storage": "<b>Копирайте го</b> в персонално облачно пространство",
     "Set up Secure Message Recovery": "Настрой Възстановяване на Защитени Съобщения",
-    "Keep it safe": "Пазете го в безопасност",
-    "Create Key Backup": "Създай резервно копие на ключа",
     "Unable to create key backup": "Неуспешно създаване на резервно копие на ключа",
     "Retry": "Опитай пак",
     "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Без настроено Възстановяване на Защитени Съобщения, ще загубите защитената история на съобщенията когато излезете от профила си.",
@@ -1055,7 +961,6 @@
     "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.": "Ако не сте настройвали новия метод за възстановяване, вероятно някой се опитва да проникне в акаунта Ви. Веднага променете паролата на акаунта си и настройте нов метод за възстановяване от Настройки.",
     "Set up Secure Messages": "Настрой Защитени Съобщения",
     "Go to Settings": "Отиди в Настройки",
-    "Waiting for %(userId)s to confirm...": "Изчакване на %(userId)s да потвърди...",
     "Unrecognised address": "Неразпознат адрес",
     "User %(user_id)s may or may not exist": "Потребител %(user_id)s може да съществува или не",
     "Prompt before sending invites to potentially invalid matrix IDs": "Питай преди изпращане на покани към потенциално невалидни Matrix идентификатори",
@@ -1114,9 +1019,9 @@
     "Theme": "Тема",
     "Account management": "Управление на акаунта",
     "Deactivating your account is a permanent action - be careful!": "Деактивирането на акаунта е необратимо действие - внимавайте!",
-    "For help with using Riot, click <a>here</a>.": "За помощ при използването на Riot, кликнете <a>тук</a>.",
-    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "За помощ при използването на Riot, кликнете <a>тук</a> или започнете чат с бота ни използвайки бутона по-долу.",
-    "Chat with Riot Bot": "Чати с Riot Bot",
+    "For help with using %(brand)s, click <a>here</a>.": "За помощ при използването на %(brand)s, кликнете <a>тук</a>.",
+    "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> или започнете чат с бота ни използвайки бутона по-долу.",
+    "Chat with %(brand)s Bot": "Чати с %(brand)s Bot",
     "Help & About": "Помощ и относно",
     "Bug reporting": "Съобщаване за грешка",
     "FAQ": "Често задавани въпроси",
@@ -1127,7 +1032,6 @@
     "Timeline": "Списък със съобщения",
     "Autocomplete delay (ms)": "Забавяне преди подсказки (милисекунди)",
     "Roles & Permissions": "Роли и привилегии",
-    "To link to this room, please add an alias.": "За да генерирате връзки към тази стая, въведете адрес за нея.",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Промени в настройките за четене на историята касаят само за нови съобщения. Видимостта на съществуващата история не се променя.",
     "Security & Privacy": "Сигурност и поверителност",
     "Encryption": "Шифроване",
@@ -1144,21 +1048,14 @@
     "Room Name": "Име на стаята",
     "Room Topic": "Тема на стаята",
     "Join": "Присъедини се",
-    "Use Legacy Verification (for older clients)": "Използвай стар метод за потвърждение (за стари клиенти)",
-    "Verify by comparing a short text string.": "Потвърждение чрез сравняване на кратко текстово съобщение.",
-    "Begin Verifying": "Започни потвърждението",
-    "Waiting for partner to accept...": "Изчакване партньора да приеме...",
-    "Use two-way text verification": "Използвай двустранно текстово потвърждение",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Потвърди потребителя и го маркирай като доверен. Доверяването на потребители Ви дава допълнително спокойствие при използване на съобщения шифровани от край-до-край.",
     "Waiting for partner to confirm...": "Изчакване партньора да потвърди...",
     "Incoming Verification Request": "Входяща заявка за потвърждение",
     "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>прегледайте съществуващите проблеми</existingIssuesLink> (и гласувайте с +1) или <newIssueLink>създайте нов проблем</newIssueLink>, ако не сте намерили съществуващ.",
     "Report bugs & give feedback": "Съобщете за бъг и дайте обратна връзка",
     "Go back": "Върни се",
-    "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "Резервното копие не можа да бъде разшифровано с този ключ: потвърдете, че сте въвели правилния ключ за възстановяване.",
     "Update status": "Обнови статуса",
     "Set status": "Настрой статус",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "Може да използвате настройките за собствен сървър за да влезете в друг Matrix сървър, чрез указване на адреса му. Това Ви позволява да използвате приложението със съществуващ Matrix акаунт принадлежащ към друг сървър.",
     "Your Modular server": "Вашият Modular сървър",
     "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Въведете адреса на вашият Modular сървър. Той представлява или вашето собствено домейн име или поддомейн на <a>modular.im</a>.",
     "Server Name": "Име на сървър",
@@ -1261,9 +1158,6 @@
     "Headphones": "Слушалки",
     "Folder": "Папка",
     "Pin": "Кабърче",
-    "Recovery Key Mismatch": "Ключа за възстановяване не съвпада",
-    "Incorrect Recovery Passphrase": "Неправилна парола за възстановяване",
-    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "Резервното копие не можа да бъде разшифровано с тази парола: потвърдете, че сте въвели правилната парола.",
     "This homeserver would like to make sure you are not a robot.": "Сървърът иска да потвърди, че не сте робот.",
     "Change": "Промени",
     "Couldn't load page": "Страницата не можа да бъде заредена",
@@ -1283,22 +1177,14 @@
     "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Правете защитено резервно копие на ключовете, за да не ги загубите. <a>Научи повече.</a>",
     "Not now": "Не сега",
     "Don't ask me again": "Не ме питай пак",
-    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Нищо не се появява? Не всички клиенти поддържат интерактивно потвърждение. <button>Използвай стария метод за потвърждение</button>.",
     "I don't want my encrypted messages": "Не искам шифрованите съобщения",
     "Manually export keys": "Експортирай ключове ръчно",
     "You'll lose access to your encrypted messages": "Ще загубите достъп до шифрованите си съобщения",
     "Are you sure you want to sign out?": "Сигурни ли сте, че искате да излезете от профила?",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Внимание</b>: настройването на резервно копие на ключовете трябва да се прави само от доверен компютър.",
     "Hide": "Скрий",
-    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "Ще съхраним шифровано копие на ключовете на сървърът ни. Предпазете резервното копие с парола.",
     "For maximum security, this should be different from your account password.": "За максимална сигурност, по-добре паролата да е различна от тази за акаунта Ви.",
-    "Set up with a Recovery Key": "Настрой с ключ за възстановяване",
-    "Please enter your passphrase a second time to confirm.": "Въведете паролата отново за потвърждение.",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Ключът за възстановяване дава допълнителна сигурност - може да го използвате за да възстановите достъпа до шифрованите съобщения, в случай че забравите паролата.",
     "Your keys are being backed up (the first backup could take a few minutes).": "Прави се резервно копие на ключовете Ви (първото копие може да отнеме няколко минути).",
-    "Secure your backup with a passphrase": "Защитете резервното копие с парола",
-    "Confirm your passphrase": "Потвърдете паролата",
-    "Recovery key": "Ключ за възстановяване",
     "Success!": "Успешно!",
     "Allow Peer-to-Peer for 1:1 calls": "Позволи използването на директна връзка (P2P) за 1:1 повиквания",
     "Credits": "Благодарности",
@@ -1308,14 +1194,9 @@
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s изключи показването на значки в тази стая за следните групи: %(groups)s.",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s включи показването на значки в тази стая за %(newGroups)s и изключи показването на значки за %(oldGroups)s.",
     "Show read receipts sent by other users": "Показвай индикация за прочитане от други потребители",
-    "Order rooms in the room list by most important first instead of most recent": "Подреждай списъка със стаи според важност, а не според новост",
     "Scissors": "Ножици",
     "Error updating main address": "Грешка при обновяване на основния адрес",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Случи се грешка при обновяването на основния адрес за стаята. Може да не е позволено от сървъра, или да се е случила друга временна грешка.",
-    "Error creating alias": "Грешка при създаване на псевдоним",
-    "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "Случи се грешка при създаването на този псевдоним. Може да не е позволено от сървъра, или да се е случила друга временна грешка.",
-    "Error removing alias": "Грешка при премахването на псевдоним",
-    "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "Случи се грешка при премахването на този псевдоним. Може да не е позволено от сървъра, или да се е случила друга временна грешка.",
     "Error updating flair": "Грешка при обновяването на значка",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Случи се грешка при обновяването на значките за тази стая. Може да не е позволено от сървъра, или да се е случила друга временна грешка.",
     "Room Settings - %(roomName)s": "Настройки на стая - %(roomName)s",
@@ -1393,12 +1274,11 @@
     "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 иска да потвърди идентичността Ви. Ако позволите това, приспособлението ще може да потвърди потребителския Ви идентификатор, без да може да извършва действия с него.",
     "Remember my selection for this widget": "Запомни избора ми за това приспособление",
     "Deny": "Откажи",
-    "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot не успя да вземе списъка с протоколи от сървъра. Този сървър може да е прекалено стар за да поддържа чужди мрежи.",
-    "Riot failed to get the public room list.": "Riot не успя да вземе списъка с публични стаи.",
+    "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s не успя да вземе списъка с протоколи от сървъра. Този сървър може да е прекалено стар за да поддържа чужди мрежи.",
+    "%(brand)s failed to get the public room list.": "%(brand)s не успя да вземе списъка с публични стаи.",
     "The homeserver may be unavailable or overloaded.": "Сървърът може да не е наличен или претоварен.",
     "You have %(count)s unread notifications in a prior version of this room.|other": "Имате %(count)s непрочетени известия в предишна версия на тази стая.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Имате %(count)s непрочетено известие в предишна версия на тази стая.",
-    "A conference call could not be started because the integrations server is not available": "Не може да бъде започнат конферентен разговор, защото сървърът за интеграции не е достъпен",
     "The server does not support the room version specified.": "Сървърът не поддържа указаната версия на стая.",
     "Name or Matrix ID": "Име или Matrix идентификатор",
     "Changes your avatar in this current room only": "Променя снимката Ви само в тази стая",
@@ -1435,7 +1315,6 @@
     "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s не може да бъде прегледана предварително. Желаете ли да се влезете?",
     "This room doesn't exist. Are you sure you're at the right place?": "Стаята не съществува. Сигурни ли сте, че сте на правилното място?",
     "Try again later, or ask a room admin to check if you have access.": "Опитайте отново по-късно или помолете администратора да провери дали имате достъп.",
-    "Show recently visited rooms above the room list": "Покажи наскоро-посетените стаи над списъка със стаите",
     "Low bandwidth mode": "Режим на ниска пропускливост",
     "Uploaded sound": "Качен звук",
     "Sounds": "Звуци",
@@ -1476,8 +1355,8 @@
     "Identity server URL does not appear to be a valid identity server": "Адресът на сървърът за самоличност не изглежда да е валиден сървър за самоличност",
     "Cannot reach homeserver": "Неуспешна връзка със сървъра",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Уверете се, че интернет връзката ви е стабилна, или се свържете с администратора на сървъра",
-    "Your Riot is misconfigured": "Riot не е конфигуриран правилно",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Попитайте Riot администратора да провери <a>конфигурацията ви</a> за неправилни или дублирани записи.",
+    "Your %(brand)s is misconfigured": "%(brand)s не е конфигуриран правилно",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Попитайте %(brand)s администратора да провери <a>конфигурацията ви</a> за неправилни или дублирани записи.",
     "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.": "Може да възстановите паролата си, но някои функции няма да са достъпни докато сървъра за самоличност е офлайн. Ако продължавате да виждате това предупреждение, проверете конфигурацията или се свържете с администратора на сървъра.",
@@ -1587,10 +1466,10 @@
     "Deactivate user": "Деактивирай потребителя",
     "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) при опит да се провери поканата. Може да предадете тази информация на администратор на стаята.",
     "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Тази покана за %(roomName)s е била изпратена към адрес %(email)s, който не е асоцииран с профила ви",
-    "Link this email with your account in Settings to receive invites directly in Riot.": "Свържете този имейл адрес с профила си от Настройки за да получавате покани директно в Riot.",
+    "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": "Тази покана за %(roomName)s беше изпратена към адрес %(email)s",
-    "Use an identity server in Settings to receive invites directly in Riot.": "Използвайте сървър за самоличност от Настройки за да получавате покани директно в Riot.",
-    "Share this email in Settings to receive invites directly in Riot.": "Споделете този имейл в Настройки за да получавате покани директно в Riot.",
+    "Use an identity server in Settings to receive invites directly in %(brand)s.": "Използвайте сървър за самоличност от Настройки за да получавате покани директно в %(brand)s.",
+    "Share this email in Settings to receive invites directly in %(brand)s.": "Споделете този имейл в Настройки за да получавате покани директно в %(brand)s.",
     "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>.",
     "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Настройте имейл за възстановяване на профила. По желание, използвайте имейл или телефон за да бъдете откриваеми от сегашните ви контакти.",
@@ -1636,13 +1515,8 @@
     "Read Marker lifetime (ms)": "Живот на маркера за прочитане (мсек)",
     "Read Marker off-screen lifetime (ms)": "Живот на маркера за прочитане извън екрана (мсек)",
     "Changes the avatar of the current room": "Променя снимката на текущата стая",
-    "Room alias": "Псевдоним на стаята",
     "e.g. my-room": "например my-room",
-    "Please provide a room alias": "Въведете псевдоним на стаята",
-    "This alias is available to use": "Този псевдоним е свободен за ползване",
-    "This alias is already in use": "Този псевдоним вече се използва",
     "Please enter a name for the room": "Въведете име на стаята",
-    "Set a room alias to easily share your room with other people.": "Въведете псевдоним на стаята за лесно споделяне с други хора.",
     "This room is private, and can only be joined by invitation.": "Това е частна стая и присъединяването става само с покана.",
     "Create a public room": "Създай публична стая",
     "Create a private room": "Създай частна стая",
@@ -1724,7 +1598,6 @@
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s започна гласово обаждане. (не се поддържа от този браузър)",
     "%(senderName)s placed a video call.": "%(senderName)s започна видео обаждане.",
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s започна видео обаждане. (не се поддържа от този браузър)",
-    "Enable local event indexing and E2EE search (requires restart)": "Включи локални индексиране на събития и E2EE търсене (изисква рестартиране)",
     "Match system theme": "Напасване със системната тема",
     "My Ban List": "Моя списък с блокирания",
     "This is your list of users/servers you have blocked - don't leave the room!": "Това е списък с хора/сървъри, които сте блокирали - не напускайте стаята!",
@@ -1733,7 +1606,6 @@
     "Cannot connect to integration manager": "Неуспешна връзка с мениджъра на интеграции",
     "The integration manager is offline or it cannot reach your homeserver.": "Мениджъра на интеграции е офлайн или не може да се свърже със сървъра ви.",
     "Clear notifications": "Изчисти уведомленията",
-    "Send cross-signing keys to homeserver": "Изпрати ключове за кръстосано-подписване към сървъра",
     "Error upgrading room": "Грешка при обновяване на стаята",
     "Double check that your server supports the room version chosen and try again.": "Проверете дали сървъра поддържа тази версия на стаята и опитайте пак.",
     "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s премахна правилото блокиращо достъпа на потребители отговарящи на %(glob)s",
@@ -1777,7 +1649,6 @@
     "Error adding ignored user/server": "Грешка при добавяне на игнориран потребител/сървър",
     "Something went wrong. Please try again or view your console for hints.": "Нещо се обърка. Опитайте пак или вижте конзолата за информация какво не е наред.",
     "Error subscribing to list": "Грешка при абониране за списък",
-    "Please verify the room ID or alias and try again.": "Потвърдете идентификатора или адреса на стаята и опитайте пак.",
     "Error removing ignored user/server": "Грешка при премахване на игнориран потребител/сървър",
     "Error unsubscribing from list": "Грешка при отписването от списък",
     "Please try again or view your console for hints.": "Опитайте пак или вижте конзолата за информация какво не е наред.",
@@ -1792,7 +1663,7 @@
     "View rules": "Виж правилата",
     "You are currently subscribed to:": "В момента сте абонирани към:",
     "⚠ These settings are meant for advanced users.": "⚠ Тези настройки са за напреднали потребители.",
-    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Добавете тук потребители или сървъри, които искате да игнорирате. Използвайте звездички за да кажете на Riot да търси съвпадения с всеки символ. Например: <code>@bot:*</code> ще игнорира всички потребители с име 'bot' на кой да е сървър.",
+    "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> ще игнорира всички потребители с име 'bot' на кой да е сървър.",
     "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.": "Игнорирането на хора става чрез списъци за блокиране, които съдържат правила кой да бъде блокиран. Абонирането към списък за блокиране означава, че сървърите/потребителите блокирани от този списък ще бъдат скрити от вас.",
     "Personal ban list": "Персонален списък за блокиране",
     "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' - останете в тази стая за да работи списъкът с блокиране.",
@@ -1801,7 +1672,6 @@
     "Subscribed lists": "Абонирани списъци",
     "Subscribing to a ban list will cause you to join it!": "Абонирането към списък ще направи така, че да се присъедините към него!",
     "If this isn't what you want, please use a different tool to ignore users.": "Ако това не е каквото искате, използвайте друг инструмент за игнориране на потребители.",
-    "Room ID or alias of ban list": "Идентификатор или име на стая списък за блокиране",
     "Subscribe": "Абонирай ме",
     "Cross-signing": "Кръстосано-подписване",
     "This message cannot be decrypted": "Съобщението не може да бъде дешифровано",
@@ -1828,7 +1698,7 @@
     "Your avatar URL": "Адреса на профилната ви снимка",
     "Your user ID": "Потребителския ви идентификатор",
     "Your theme": "Вашата тема",
-    "Riot URL": "Riot URL адрес",
+    "%(brand)s URL": "%(brand)s URL адрес",
     "Room ID": "Идентификатор на стаята",
     "Widget ID": "Идентификатор на приспособлението",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Използването на това приспособление може да сподели данни <helpIcon /> с %(widgetDomain)s и с мениджъра на интеграции.",
@@ -1841,21 +1711,14 @@
     "Integrations are disabled": "Интеграциите са изключени",
     "Enable 'Manage Integrations' in Settings to do this.": "Включете 'Управление на интеграции' от настройките за направите това.",
     "Integrations not allowed": "Интеграциите не са разрешени",
-    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Вашият Riot не позволява да използвате мениджъра на интеграции за да направите това. Свържете се с администратор.",
+    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Вашият %(brand)s не позволява да използвате мениджъра на интеграции за да направите това. Свържете се с администратор.",
     "Automatically invite users": "Автоматично кани потребители",
     "Upgrade private room": "Обнови лична стая",
     "Upgrade public room": "Обнови публична стая",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Обновяването на стая е действие за напреднали и обикновено се препоръчва когато стаята е нестабилна поради бъгове, липсващи функции или проблеми със сигурността.",
-    "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Това обикновено влия само на това как стаята се обработва на сървъра. Ако имате проблеми с Riot, <a>съобщете за проблем</a>.",
+    "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>.",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Ще обновите стаята от <oldVersion /> до <newVersion />.",
     "Upgrade": "Обнови",
-    "Enter secret storage passphrase": "Въведете парола за секретно складиране",
-    "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Неуспешен достъп до секретно складиране. Уверете се, че сте въвели правилната парола.",
-    "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Внимание</b>: Трябва да достъпвате секретно складиране само от доверен компютър.",
-    "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Ако сте забравили паролата си, може да <button1>използвате ключ за възстановяване</button1> или да <button2>настройте опции за възстановяване</button2>.",
-    "Enter secret storage recovery key": "Въведете ключ за възстановяване на секретно складиране",
-    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Неуспешен достъп до секретно складиране. Подсигурете се, че сте въвели правилния ключ за възстановяване.",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "Ако сте забравили ключа си за възстановяване, може да <button>настройте нови опции за възстановяване</button>.",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Внимание</b>: Трябва да настройвате резервно копие на ключове само от доверен компютър.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Ако сте забравили ключа за възстановяване, може да <button>настройте нови опции за възстановяване</button>",
     "Notification settings": "Настройки на уведомленията",
@@ -1867,14 +1730,9 @@
     "User Status": "Потребителски статус",
     "Country Dropdown": "Падащо меню за избор на държава",
     "Verification Request": "Заявка за потвърждение",
-    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
     "Set up with a recovery key": "Настрой с ключ за възстановяване",
-    "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "Като предпазна мярка, ако забравите паролата, може да го използвате за да възстановите достъпа до шифрованите съобщения.",
-    "As a safety net, you can use it to restore your access to encrypted messages.": "Като предпазна мярка, може да го използвате за да възстановите достъпа до шифрованите съобщения.",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "Съхранявайте ключа за възстановяване на сигурно място, като в password manager (или сейф).",
     "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Ключа за възстановяване беше <b>копиран в клиборд</b>, поставете го в:",
     "Your recovery key is in your <b>Downloads</b> folder.": "Ключа за възстановяване е във вашата папка <b>Изтегляния</b>.",
-    "Storing secrets...": "Складиране на тайни...",
     "Unable to set up secret storage": "Неуспешна настройка на секретно складиране",
     "Show info about bridges in room settings": "Показвай информация за връзки с други мрежи в настройките на стаята",
     "This bridge is managed by <user />.": "Тази връзка с друга мрежа се управлява от <user />.",
@@ -1885,13 +1743,9 @@
     "Go": "Давай",
     "Failed to find the following users": "Неуспешно откриване на следните потребители",
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Следните потребители не съществуват или са невалидни и не могат да бъдат поканени: %(csvNames)s",
-    "The version of Riot": "Версията на Riot",
-    "Whether you're using Riot on a device where touch is the primary input mechanism": "Дали използвате Riot на устройство, на което основния механизъм за достъп е докосване",
-    "Whether you're using Riot as an installed Progressive Web App": "Дали използвате Riot като инсталирано прогресивно уеб приложение (PWA)",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Дали използвате %(brand)s на устройство, на което основния механизъм за достъп е докосване",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Дали използвате %(brand)s като инсталирано прогресивно уеб приложение (PWA)",
     "Your user agent": "Информация за браузъра ви",
-    "The information being sent to us to help make Riot better includes:": "Информацията, която се изпраща за да ни помогне да подобрим Riot включва:",
-    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "В тази стая има непознати сесии: ако продължите без да ги потвърдите, ще е възможно някой да подслуша обаждането ви.",
-    "Review Sessions": "Прегледай сесиите",
     "If you cancel now, you won't complete verifying the other user.": "Ако се откажете сега, няма да завършите верификацията на другия потребител.",
     "Use Single Sign On to continue": "Използвайте Single Sign On за да продължите",
     "Confirm adding this email address by using Single Sign On to prove your identity.": "Потвърдете добавянето на този имейл адрес като потвърдите идентичността си чрез Single Sign On.",
@@ -1902,13 +1756,11 @@
     "Confirm adding phone number": "Потвърдете добавянето на телефонен номер",
     "Click the button below to confirm adding this phone number.": "Кликнете бутона по-долу за да потвърдите добавянето на телефонния номер.",
     "If you cancel now, you won't complete verifying your other session.": "Ако се откажете сега, няма да завършите потвърждаването на другата ви сесия.",
-    "If you cancel now, you won't complete your secret storage operation.": "Ако се откажете сега, няма да завърши операцията по секретно складиране.",
     "Cancel entering passphrase?": "Откажете въвеждането на парола?",
     "Setting up keys": "Настройка на ключове",
     "Verify this session": "Потвърди тази сесия",
     "Encryption upgrade available": "Има обновление на шифроването",
     "Set up encryption": "Настрой шифроване",
-    "Unverified login. Was this you?": "Непотвърден вход. Вие ли бяхте?",
     "Sign In or Create Account": "Влезте или Създайте профил",
     "Use your account or create a new one to continue.": "Използвайте профила си или създайте нов за да продължите.",
     "Create Account": "Създай профил",
@@ -1948,10 +1800,7 @@
     "%(num)s hours from now": "след %(num)s часа",
     "about a day from now": "след около ден",
     "%(num)s days from now": "след %(num)s дни",
-    "Show a presence dot next to DMs in the room list": "Показвай точка за присъствие до директните съобщения в списъка със стаи",
     "Support adding custom themes": "Включи поддръжка за добавяне на собствени теми",
-    "Enable cross-signing to verify per-user instead of per-session (in development)": "Включи кръстосано-подписване за потвърждаване на потребител, вместо на отделни сесии (в процес на разработка)",
-    "Show padlocks on invite only rooms": "Показвай катинари на стаите изискващи покана",
     "Show typing notifications": "Показвай уведомления за писане",
     "Never send encrypted messages to unverified sessions from this session": "Никога не изпращай шифровани съобщения към непотвърдени сесии от тази сесия",
     "Never send encrypted messages to unverified sessions in this room from this session": "Никога не изпращай шифровани съобщения към непотвърдени сесии в тази стая от тази сесия",
@@ -1959,7 +1808,502 @@
     "Show rooms with unread notifications first": "Показвай първи стаите с непрочетени уведомления",
     "Show shortcuts to recently viewed rooms above the room list": "Показвай преки пътища до скоро-прегледаните стаи над списъка със стаи",
     "Enable message search in encrypted rooms": "Включи търсенето на съобщения в шифровани стаи",
-    "Keep secret storage passphrase in memory for this session": "Съхрани паролата за секретното складиране в паметта за тази сесия",
     "How fast should messages be downloaded.": "Колко бързо да се изтеглят съобщенията.",
-    "Manually verify all remote sessions": "Ръчно потвърждаване на всички отдалечени сесии"
+    "Manually verify all remote sessions": "Ръчно потвърждаване на всички отдалечени сесии",
+    "If you cancel now, you won't complete your operation.": "Ако се откажете сега, няма да завършите операцията.",
+    "Review where you’re logged in": "Прегледайте откъде сте влезли в профила си",
+    "New login. Was this you?": "Нов вход. Вие ли бяхте това?",
+    "%(name)s is requesting verification": "%(name)s изпрати запитване за верификация",
+    "Failed to set topic": "Неуспешно задаване на тема",
+    "Command failed": "Командата не се изпълни",
+    "Could not find user in room": "Неуспешно намиране на потребител в стаята",
+    "Please supply a widget URL or embed code": "Укажете URL адрес на приспособление или код за вграждане",
+    "Send a bug report with logs": "Изпратете доклад за грешка с логове",
+    "Verify this session by completing one of the following:": "Верифицирайте тази сесия чрез едно от следните действия:",
+    "Scan this unique code": "Сканирайте този уникален код",
+    "or": "или",
+    "Compare unique emoji": "Сравнете уникални емоджи",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Сравнете уникални емоджи, ако нямате камера на някое от устройствата",
+    "Start": "Започни",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Потвърдете, че емоджитата по-долу са показани и на двете сесии в един и същи ред:",
+    "Verify this session by confirming the following number appears on its screen.": "Потвърдете тази сесия, като потвърдите, че следното число се появява на екрана й.",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Изчакване на другата сесия, %(deviceName)s (%(deviceId)s) да потвърди…",
+    "Waiting for %(displayName)s to verify…": "Изчакване на %(displayName)s да потвърди…",
+    "Cancelling…": "Отказване…",
+    "They match": "Съвпадат",
+    "They don't match": "Не съвпадат",
+    "To be secure, do this in person or use a trusted way to communicate.": "За да е по-сигурно, направете го на живо или използвайте доверен начин за комуникация.",
+    "Lock": "Заключи",
+    "Later": "По-късно",
+    "Review": "Прегледай",
+    "Verify yourself & others to keep your chats safe": "Потвърдете себе си и останалите за да запазите чатовете си сигурни",
+    "Other users may not trust it": "Други потребители може да не се доверят",
+    "From %(deviceName)s (%(deviceId)s)": "От %(deviceName)s (%(deviceId)s)",
+    "This bridge was provisioned by <user />.": "Мостът е настроен от <user />.",
+    "Workspace: %(networkName)s": "Работна област: %(networkName)s",
+    "Channel: %(channelName)s": "Канал: %(channelName)s",
+    "Show less": "Покажи по-малко",
+    "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.": "Промяната на паролата в момента би нулирало всички ключове за шифроване-от-край-до-край, правейки историята на чата нечетима, освен ако първо не експортирате ключовете, а след промяната на паролата ги импортирате. В бъдеще, това ще бъде подобрено.",
+    "Your homeserver does not support cross-signing.": "Сървърът ви не поддържа кръстосано-подписване.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Профилът ви има самоличност за кръстосано подписване в секретно складиране, но все още не е доверено от тази сесия.",
+    "Reset cross-signing and secret storage": "Нулирай кръстосаното-подписване и секретното складиране",
+    "well formed": "коректен",
+    "unexpected type": "непознат тип",
+    "in memory": "в паметта",
+    "Self signing private key:": "Частен ключ за самоподписване:",
+    "cached locally": "кеширан локално",
+    "not found locally": "ненамерен локално",
+    "User signing private key:": "Частен ключ за подписване на потребители:",
+    "Session backup key:": "Ключ за резервно копие на сесията:",
+    "Homeserver feature support:": "Поддържани функции от сървъра:",
+    "exists": "съществува",
+    "Your homeserver does not support session management.": "Сървърът ви не поддържа управление на сесии.",
+    "Unable to load session list": "Неуспешно зареждане на списъка със сесии",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Потвърдете изтриването на тези сесии използвайки Single Sign On, за да докажете самоличността си.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Потвърдете изтриването на тази сесия използвайки Single Sign On, за да докажете самоличността си.",
+    "Confirm deleting these sessions": "Потвърдете изтриването на тези сесии",
+    "Click the button below to confirm deleting these sessions.|other": "Кликнете бутона по-долу за да потвърдите изтриването на тези сесии.",
+    "Click the button below to confirm deleting these sessions.|one": "Кликнете бутона по-долу за да потвърдите изтриването на тази сесия.",
+    "Delete sessions|other": "Изтрий сесиите",
+    "Delete sessions|one": "Изтрий сесията",
+    "Delete %(count)s sessions|other": "Изтрий %(count)s сесии",
+    "Delete %(count)s sessions|one": "Изтрий %(count)s сесия",
+    "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 ": "Кеширай шифровани съобщения по сигурен начин, за да могат да се появяват в резултати от търсения, използвайки ",
+    " to store messages from ": " за складиране на съобщения от ",
+    "rooms.": "стаи.",
+    "Manage": "Управление",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Кеширай шифровани съобщения локално по сигурен начин за да се появяват в резултати от търсения.",
+    "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, за да могат да бъдат складирани локално и по сигурен начин шифровани съобщения. Ако искате да експериментирате с тази функция, \"компилирайте\" версия на %(brand)s Desktop с <nativeLink>добавени компоненти за търсене</nativeLink>.",
+    "This session is backing up your keys. ": "Тази сесия прави резервни копия на ключовете ви. ",
+    "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>, но имате съществуващо резервно копие, което да възстановите и към което да добавяте от тук нататък.",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Свържете тази сесия с резервно копие на ключове преди да се отпишете от нея, за да не загубите ключове, които може би съществуват единствено в тази сесия.",
+    "Connect this session to Key Backup": "Свържи тази сесия с резервно копие на ключовете",
+    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Резервното копие има подпис от <verify>непозната</verify> сесия с идентификатор %(deviceId)s",
+    "Backup has a <validity>valid</validity> signature from this session": "Резервното копие има <validity>валиден</validity> подпис от тази сесия",
+    "Backup has an <validity>invalid</validity> signature from this session": "Резервното копие има <validity>невалиден</validity> подпис от тази сесия",
+    "Verify all your sessions to ensure your account & messages are safe": "Верифицирайте всички свой сесии за да подсигурите, че профила и съобщенията ви са защитени",
+    "Verify the new login accessing your account: %(name)s": "Верифицирайте новия вход достъпващ профила ви: %(name)s",
+    "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": "Това резервно копие е доверено, защото е било възстановено в текущата сесия",
+    "Your keys are <b>not being backed up from this session</b>.": "На ключовете ви <b>не се прави резервно копие от тази сесия</b>.",
+    "Enable desktop notifications for this session": "Включи уведомления на работния плот за тази сесия",
+    "Enable audible notifications for this session": "Включи звукови уведомления за тази сесия",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Паролата ви беше променена. Няма да получавате push уведомления на другите ви сесии докато не влезете отново в тях",
+    "Invalid theme schema.": "Невалиден формат на темата.",
+    "Error downloading theme information.": "Неуспешно изтегляне на информацията за темата.",
+    "Theme added!": "Темата беше добавена!",
+    "Custom theme URL": "Собствен URL адрес на тема",
+    "Add theme": "Добави тема",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "За да съобщените за проблем със сигурността свързан с Matrix, прочетете <a>Политиката за споделяне на проблеми със сигурността</a> на Matrix.org.",
+    "Keyboard Shortcuts": "Клавишни комбинации",
+    "Session ID:": "Сесиен идентификатор:",
+    "Session key:": "Сесиен ключ:",
+    "Message search": "Търсене на съобщения",
+    "Where you’re logged in": "Когато сте вписани",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Управлявайте имената или входа в сесиите си по-долу или <a>ги верифицирайте от профила си</a>.",
+    "A session's public name is visible to people you communicate with": "Публичното име на сесията е видимо за хората, с които комуникирате",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Тази стая препредава съобщения със следните платформи. <a>Научи повече.</a>",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Тази стая не препредава съобщения с други платформи. <a>Научи повече.</a>",
+    "Bridges": "Мостове",
+    "This user has not verified all of their sessions.": "Този потребител не е верифицирал всичките си сесии.",
+    "You have not verified this user.": "Не сте верифицирали този потребител.",
+    "You have verified this user. This user has verified all of their sessions.": "Верифицирали сте този потребител. Този потребител е верифицирал всичките си сесии.",
+    "Someone is using an unknown session": "Някой използва непозната сесия",
+    "This room is end-to-end encrypted": "Тази стая е шифрована от-край-до-край",
+    "Everyone in this room is verified": "Всички в тази стая са верифицирани",
+    "Mod": "Модератор",
+    "Your key share request has been sent - please check your other sessions for key share requests.": "Заявката ви за споделяне на ключ е изпратена - проверете останалите си сесии за заявки за споделяне на ключове.",
+    "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.": "Заявките за споделяне на ключове се изпращат до другите ви сесии автоматично. Ако сте отказали заявката от другите ви сесии, кликнете тук за да изпратите заявка за тази сесия отново.",
+    "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Ако другите ви сесии нямат ключа за това съобщения, няма да можете да ги дешифровате.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Поискай отново ключове за шифроване</requestLink> от другите сесии.",
+    "Encrypted by an unverified session": "Шифровано от неверифицирана сесия",
+    "Encrypted by a deleted session": "Шифровано от изтрита сесия",
+    "Invite only": "Само с покани",
+    "Scroll to most recent messages": "Отиди до най-скорошните съобщения",
+    "Send a reply…": "Изпрати отговор…",
+    "Send a message…": "Изпрати съобщение…",
+    "Reject & Ignore user": "Откажи и игнорирай потребителя",
+    "Unknown Command": "Непозната команда",
+    "Unrecognised command: %(commandText)s": "Неразпозната команда: %(commandText)s",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Може да използвате <code>/help</code> за да видите наличните команди. Или пък искахте да изпратите това като съобщение?",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "Съвет: Започнете съобщението си с <code>//</code> за да изпратите съобщение започващо с наклонена черта.",
+    "Send as message": "Изпрати като съобщение",
+    "Mark all as read": "Маркирай всичко като прочетено",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Възникна грешка при обновяване на алтернативните адреси на стаята. Или не е позволено от сървъра или се е случила временна грешка.",
+    "Local address": "Локален адрес",
+    "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.": "Публикуваните адреси могат да бъдат използвани от всеки човек, на кой да е сървър, за присъединяване към стаята. За да публикувате адрес, първо трябва да е настроен като локален адрес.",
+    "Other published addresses:": "Други публикувани адреси:",
+    "No other published addresses yet, add one below": "Все още няма други публикувани адреси, добавете такъв по-долу",
+    "New published address (e.g. #alias:server)": "Нов публикуван адрес (напр. #alias:server)",
+    "Local Addresses": "Локални адреси",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Настройте адреси за тази стая, така че потребителите да могат да намерят стаята през вашия сървър (%(localDomain)s)",
+    "Waiting for you to accept on your other session…": "Изчаква се да приемете от другата ви сесия…",
+    "Waiting for %(displayName)s to accept…": "Изчаква се %(displayName)s да приеме…",
+    "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.": "В шифровани стаи,  съобщенията ви са защитени и само вие и получателят имате уникалните ключове за да ги отключите.",
+    "Verify User": "Потвърди потребителя",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "За допълнителна сигурност, потвърдете този потребител като проверите еднократен код на устройствата ви.",
+    "Your messages are not secure": "Съобщенията ви не са защитени",
+    "One of the following may be compromised:": "Едно от следните неща може да е било компрометирано:",
+    "Your homeserver": "Сървърът ви",
+    "The homeserver the user you’re verifying is connected to": "Сървърът на потребителя, който верифицирате",
+    "Yours, or the other users’ internet connection": "Интернет връзката ви или тази на другите потребители",
+    "Yours, or the other users’ session": "Сесията ви или тази на другите потребители",
+    "%(count)s sessions|other": "%(count)s сесии",
+    "%(count)s sessions|one": "%(count)s сесия",
+    "Hide sessions": "Скрий сесиите",
+    "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 поддържа). Пробвайте с друг клиент.",
+    "Verify by scanning": "Верифицирай чрез сканиране",
+    "Ask %(displayName)s to scan your code:": "Попитайте %(displayName)s да сканира вашия код:",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Ако не можете да сканирате кода по-горе, верифицирайте сравнявайки уникални емоджита.",
+    "Verify by comparing unique emoji.": "Верифицирай чрез сравняване на уникални емоджита.",
+    "Verify by emoji": "Верифицирай чрез емоджи",
+    "Almost there! Is your other session showing the same shield?": "Почти е готово! Другата ви сесия показва ли същия щит?",
+    "Almost there! Is %(displayName)s showing the same shield?": "Почти е готово! Сесията %(displayName)s показва ли същия щит?",
+    "Verify all users in a room to ensure it's secure.": "Верифицирай всички потребители в стаята за да подсигурите безопасността.",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "В шифровани стаи, верифицирайте всички потребители за да подсигурите безопасността.",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Успешно верифицирахте %(deviceName)s (%(deviceId)s)!",
+    "You've successfully verified %(displayName)s!": "Успешно верифицирахте %(displayName)s!",
+    "Verified": "Потвърдено",
+    "Got it": "Разбрах",
+    "Start verification again from the notification.": "Започнете верифициране отново от уведомлението.",
+    "Start verification again from their profile.": "Започнете верифициране отново от профила им.",
+    "Verification timed out.": "Изтече времето за верификация.",
+    "You cancelled verification on your other session.": "Отказахте верификацията от другата сесия.",
+    "%(displayName)s cancelled verification.": "%(displayName)s отказа верификацията.",
+    "You cancelled verification.": "Отказахте верификацията.",
+    "Verification cancelled": "Верификацията беше отказана",
+    "Compare emoji": "Сравни емоджи",
+    "Encryption enabled": "Шифроването е включено",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Съобщенията в тази стая са ширфовани от-край-до-край. Научете повече и верифицирайте този потребител от профила им.",
+    "Encryption not enabled": "Шифроването не е включено",
+    "The encryption used by this room isn't supported.": "Шифроването използвано от тази стая не се поддържа.",
+    "You declined": "Отказахте",
+    "%(name)s declined": "%(name)s отказа",
+    "Accepting …": "Приемане…",
+    "Declining …": "Отказване…",
+    "Can't load this message": "Съобщението не може да се зареди",
+    "Submit logs": "Изпрати логове",
+    "Enter a server name": "Въведете име на сървър",
+    "Looks good": "Изглежда добре",
+    "Can't find this server or its room list": "Сървърът или списъка със стаи не може да бъде намерен",
+    "All rooms": "Всички стаи",
+    "Your server": "Вашият сървър",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "Сигурни ли сте, че искате да премахнете <b>%(serverName)s</b>",
+    "Remove server": "Премахни сървъра",
+    "Matrix": "Matrix",
+    "Add a new server": "Добави нов сървър",
+    "Enter the name of a new server you want to explore.": "Въведете името на новия сървър, който искате да прегледате.",
+    "Server name": "Име на сървър",
+    "Add a new server...": "Добави нов сървър...",
+    "%(networkName)s rooms": "%(networkName)s стаи",
+    "Matrix rooms": "Matrix стаи",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Напомняне: браузърът ви не се поддържа, така че не всичко може да работи правилно.",
+    "Destroy cross-signing keys?": "Унищожаване на ключовете за кръстосано-подписване?",
+    "You signed in to a new session without verifying it:": "Влязохте в нова сесия без да я верифицирате:",
+    "Verify your other session using one of the options below.": "Верифицирайте другите си сесии използвайки една от опциите по-долу.",
+    "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.": "Изтриването на ключовете за кръстосано-подписване е необратимо. Всички, с които сте се верифицирали ще видят предупреждения за сигурността. Почти със сигурност не искате да направите това, освен ако не сте загубили всички устройства, от които можете да подписвате кръстосано.",
+    "Clear cross-signing keys": "Изчисти ключовете за кръстосано-подписване",
+    "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.": "Изчистването на всички данни от сесията е необратимо. Шифрованите съобщения ще бъдат загубени, освен ако няма резервно копие на ключовете им.",
+    "Enable end-to-end encryption": "Включи шифроване от-край-до-край",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "Не може да изключите това по-късно. Мостовете и повечето ботове все още не работят с това.",
+    "Server did not require any authentication": "Сървърът не изисква никаква автентикация",
+    "Server did not return valid authentication information.": "Сървърът не върна валидна информация относно автентикация.",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "Потвърдете деактивацията на профила си използвайки Single Sign On за потвърждаване на самоличността.",
+    "Are you sure you want to deactivate your account? This is irreversible.": "Сигурни ли сте, че искате да деактивирате профила си? Това е необратимо.",
+    "Confirm account deactivation": "Потвърдете деактивирането на профила",
+    "There was a problem communicating with the server. Please try again.": "Имаше проблем при комуникацията със сървъра. Опитайте пак.",
+    "Verify session": "Потвърди сесията",
+    "Session name": "Име на сесията",
+    "Session key": "Ключ за сесията",
+    "Verification Requests": "Заявки за верификация",
+    "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.": "Верифицирайте това устройство за да го маркирате като доверено. Доверявайки се на това устройство дава на вас и на другите потребители допълнително спокойствие при използването на от-край-до-край-шифровани съобщения.",
+    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Верифицирането на това устройство ще го маркира като доверено, а потребителите, които са потвърдили вас също ще се доверяват на него.",
+    "Failed to invite the following users to chat: %(csvUsers)s": "Неуспешно поканване на следните потребители в чата: %(csvUsers)s",
+    "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.": "Нещо се обърка при опита да бъдат поканени потребителите.",
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "Не можахме да поканим тези потребители. Проверете потребителите, които искате да поканите и опитайте пак.",
+    "Recently Direct Messaged": "Скорошни директни чатове",
+    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Започнете чат с някой посредством име, потребителско име (като <userId/>) или имейл адрес.",
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Поканете някой посредством име, потребителско име (като <userId/>), имейл адрес или като <a>споделите тази стая</a>.",
+    "Opens chat with the given user": "Отваря чат с дадения потребител",
+    "Sends a message to the given user": "Изпраща съобщение до дадения потребител",
+    "Font scaling": "Мащабиране на шрифта",
+    "Font size": "Размер на шрифта",
+    "IRC display name width": "Ширина на IRC името",
+    "Waiting for your other session to verify…": "Изчакване другата сесията да потвърди…",
+    "Size must be a number": "Размера трябва да е число",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "Собствения размер на шрифта може да бъде единствено между %(min)s pt и %(max)s pt",
+    "Use between %(min)s pt and %(max)s pt": "Изберете между %(min)s pt и %(max)s pt",
+    "Appearance": "Изглед",
+    "Create room": "Създай стая",
+    "You've successfully verified your device!": "Успешно потвърдихте устройството си!",
+    "Message deleted": "Съобщението беше изтрито",
+    "Message deleted by %(name)s": "Съобщението беше изтрито от %(name)s",
+    "QR Code": "QR код",
+    "To continue, use Single Sign On to prove your identity.": "За да продължите, използвайте Single Sign On за да потвърдите самоличността си.",
+    "Confirm to continue": "Потвърдете за да продължите",
+    "Click the button below to confirm your identity.": "Кликнете бутона по-долу за да потвърдите самоличността си.",
+    "a new master key signature": "нов подпис на основния ключ",
+    "a new cross-signing key signature": "нов подпис на ключа за кръстосано-подписване",
+    "a device cross-signing signature": "подпис за кръстосано-подписване на устройства",
+    "a key signature": "подпис на ключ",
+    "%(brand)s encountered an error during upload of:": "%(brand)s срещна проблем при качването на:",
+    "Upload completed": "Качването завърши",
+    "Cancelled signature upload": "Отказано качване на подпис",
+    "Unable to upload": "Неуспешно качване",
+    "Signature upload success": "Успешно качване на подпис",
+    "Signature upload failed": "Неуспешно качване на подпис",
+    "Confirm by comparing the following with the User Settings in your other session:": "Потвърдете чрез сравняване на следното с Потребителски Настройки в другата ви сесия:",
+    "Confirm this user's session by comparing the following with their User Settings:": "Потвърдете сесията на този потребител чрез сравняване на следното с техните Потребителски Настройки:",
+    "If they don't match, the security of your communication may be compromised.": "Ако няма съвпадение, сигурността на комуникацията ви може би е компрометирана.",
+    "Your account is not secure": "Профилът ви не е защитен",
+    "Your password": "Паролата ви",
+    "This session, or the other session": "Тази сесия или другата сесия",
+    "The internet connection either session is using": "Интернет връзката, която сесиите използват",
+    "We recommend you change your password and recovery key in Settings immediately": "Препоръчваме веднага да промените паролата и ключа за възстановяване от Настройки",
+    "New session": "Нова сесия",
+    "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.": "Ако не сте се вписвали в тази сесия, профила ви може би е бил компрометиран.",
+    "This wasn't me": "Не бях аз",
+    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Това ще ви позволи да се върнете в профила си след излизането от него, както и да влизате от други сесии.",
+    "Verify other session": "Потвърди другата сесия",
+    "Enter recovery passphrase": "Въведете парола за възстановяване",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Неуспешен достъп до секретното складиране. Потвърдете, че сте въвели правилната парола за възстановяване.",
+    "Room name or address": "Име на стая или адрес",
+    "Joins room with given address": "Присъединява се към стая с дадения адрес",
+    "Unrecognised room address:": "Неразпознат адрес на стая:",
+    "Help us improve %(brand)s": "Помогнете ни да подобрим %(brand)s",
+    "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>.",
+    "I want to help": "Искам да помогна",
+    "Your homeserver has exceeded its user limit.": "Надвишен е лимитът за потребители на сървъра ви.",
+    "Your homeserver has exceeded one of its resource limits.": "Беше надвишен някой от лимитите на сървъра.",
+    "Contact your <a>server admin</a>.": "Свържете се със <a>сървърния администратор</a>.",
+    "Ok": "Добре",
+    "Set password": "Настрой парола",
+    "To return to your account in future you need to set a password": "За да се върнете в профила си в бъдеще е необходимо да настройте парола",
+    "Restart": "Рестартирай",
+    "Upgrade your %(brand)s": "Обновете %(brand)s",
+    "A new version of %(brand)s is available!": "Налична е нова версия на %(brand)s!",
+    "New version available. <a>Update now.</a>": "Налична е нова версия. <a>Обновете сега.</a>",
+    "Please verify the room ID or address and try again.": "Проверете идентификатора или адреса на стаята и опитайте пак.",
+    "Room ID or address of ban list": "Идентификатор или адрес на стая списък за блокиране",
+    "To link to this room, please add an address.": "За да споделите тази стая, добавете адрес.",
+    "Error creating address": "Неуспешно създаване на адрес",
+    "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "Възникна грешка при създаването на този адрес. Или не е позволен от сървъра или е временен проблем.",
+    "You don't have permission to delete the address.": "Нямате права да изтриете адреса.",
+    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Възникна грешка при премахването на този адрес. Или не съществува вече или е временен проблем.",
+    "Error removing address": "Грешка при премахването на адреса",
+    "Categories": "Категории",
+    "Room address": "Адрес на стаята",
+    "Please provide a room address": "Въведете адрес на стаята",
+    "This address is available to use": "Адресът е наличен за ползване",
+    "This address is already in use": "Адресът вече се използва",
+    "Set a room address to easily share your room with other people.": "Настройте адрес на стаята за да може лесно да я споделяте с други хора.",
+    "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 от сегашната за тази сесия. За да използвате сегашната версия отново с шифроване от-край-до-край, ще е необходимо да излезете и да влезете отново.",
+    "Enter recovery key": "Въведете ключ за възстановяване",
+    "Restoring keys from backup": "Възстановяване на ключове от резервно копие",
+    "Fetching keys from server...": "Изтегляне на ключове от сървъра...",
+    "%(completed)s of %(total)s keys restored": "%(completed)s от %(total)s ключа са възстановени",
+    "Recovery key mismatch": "Несъответствие в ключа за възстановяване",
+    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Резервното копие не можа да бъде разшифровано с този ключ за възстановяване: проверете дали сте въвели правилния ключ за възстановяване.",
+    "Incorrect recovery passphrase": "Неправилна парола за възстановяване",
+    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Резервното копие не можа да бъде разшифровано с тази парола за възстановяване: проверете дали сте въвели правилната парола за възстановяване.",
+    "Keys restored": "Ключовете бяха възстановени",
+    "Successfully restored %(sessionCount)s keys": "Успешно бяха възстановени %(sessionCount)s ключа",
+    "Address (optional)": "Адрес (незадължително)",
+    "Confirm your identity by entering your account password below.": "Потвърдете самоличността си чрез въвеждане на паролата за профила по-долу.",
+    "Sign in with SSO": "Влезте със SSO",
+    "Welcome to %(appName)s": "Добре дошли в %(appName)s",
+    "Liberate your communication": "Освободете комуникацията си",
+    "Send a Direct Message": "Изпрати директно съобщение",
+    "Explore Public Rooms": "Разгледай публичните стаи",
+    "Create a Group Chat": "Създай групов чат",
+    "Self-verification request": "Заявка за само-потвърждение",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "Изтрий %(alias)s адреса на стаята и премахни %(name)s от директорията?",
+    "delete the address.": "изтриване на адреса.",
+    "Verify this login": "Потвърди тази сесия",
+    "Session verified": "Сесията беше потвърдена",
+    "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 server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Администраторът на сървъра е изключил шифроване от край-до-край по подразбиране за лични стаи и за директни съобщения.",
+    "Emoji picker": "Избор на емоджи",
+    "People": "Хора",
+    "Switch to light mode": "Смени на светъл режим",
+    "Switch to dark mode": "Смени на тъмен режим",
+    "Switch theme": "Смени темата",
+    "Security & privacy": "Сигурност и поверителност",
+    "All settings": "Всички настройки",
+    "Feedback": "Обратна връзка",
+    "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.": "Излязохте от всички сесии и вече няма да получавате push уведомления. За да включите уведомленията пак, влезте наново от всяко устройство.",
+    "Syncing...": "Синхронизиране...",
+    "Signing In...": "Влизане...",
+    "If you've joined lots of rooms, this might take a while": "Това може да отнеме известно време, ако сте в много стаи",
+    "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:": "Това изисква най-новата версия на %(brand)s на другите ви устройства:",
+    "or another cross-signing capable Matrix client": "или друг Matrix клиент поддържащ кръстосано-подписване",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Сесията ви е потвърдена. Тя има достъп до шифрованите ви съобщения. Други потребители я виждат като доверена.",
+    "Your new session is now verified. Other users will see it as trusted.": "Новата ви сесия е потвърдена. Другите потребители ще я виждат като доверена.",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "Без да повишите сигурността на тази сесия, няма да имате достъп до шифрованите съобщения.",
+    "Go Back": "Върни се",
+    "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.": "Възвърнете достъп до профила си и до ключовете за шифроване съхранени в тази сесия. Без тях няма да можете да четете всички защитени съобщения в коя да е сесия.",
+    "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.": "Внимание: личните ви данни (включително ключове за шифроване) все още се съхраняват в тази сесия. Изчистете ги, ако сте приключили със сесията или искате да влезете в друг профил.",
+    "Confirm encryption setup": "Потвърждение на настройки за шифроване",
+    "Click the button below to confirm setting up encryption.": "Кликнете бутона по-долу за да потвърдите настройването на шифроване.",
+    "Enter your account password to confirm the upgrade:": "Въведете паролата за профила си за да потвърдите обновлението:",
+    "Restore your key backup to upgrade your encryption": "Възстановете резервното копие на ключа за да обновите шифроването",
+    "Restore": "Възстанови",
+    "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.": "Обновете тази сесия, за да може да потвърждава други сесии, давайки им достъп до шифрованите съобщения и маркирайки ги като доверени за другите потребители.",
+    "Enter a recovery passphrase": "Въведете парола за възстановяване",
+    "Great! This recovery passphrase looks strong enough.": "Чудесно! Тази парола за възстановяване изглежда достатъчно силна.",
+    "Use a different passphrase?": "Използвай друга парола?",
+    "Enter your recovery passphrase a second time to confirm it.": "Въведете паролата за възстановяване още веднъж за да потвърдите.",
+    "Confirm 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.": "Ключа за възстановяване е допълнителна гаранция - може да го използвате вместо паролата за възстановяване за да възстановите достъп до шифрованите съобщения.",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Направете копие на сигурно място, например password manager или сейф.",
+    "Your recovery key": "Ключът ви за възстановяване",
+    "Copy": "Копирай",
+    "Unable to query secret storage status": "Неуспешно допитване за състоянието на секретното складиране",
+    "Upgrade your encryption": "Обновете шифроването",
+    "Make a copy of your recovery key": "Направете копие на ключа за възстановяване",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Ще съхраним шифровано копие на ключовете ви на сървъра. Защитете резервното копие с парола за възстановяване.",
+    "Please enter your recovery passphrase a second time to confirm.": "Въведете паролата за възстановяване отново за да потвърдите.",
+    "Repeat your recovery passphrase...": "Повторете паролата си за възстановяване...",
+    "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.": "Ако не настройте защитено възстановяване на съобщения, няма да можете да възстановите историята на шифрованите си съобщения при излизане от профила или при използване на друга сесия.",
+    "Secure your backup with a recovery passphrase": "Защитете профила си с парола за възстановяване",
+    "Create key backup": "Създай резервно копие на ключовете",
+    "This session is encrypting history using the new recovery method.": "Тази сесия шифрова историята използвайки новия метод за възстановяване.",
+    "This session has detected that your recovery passphrase 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 disabled, messages from encrypted rooms won't appear in search results.": "Ако е изключено, съобщения от шифровани стаи няма да се показват в резултатите от търсения.",
+    "Disable": "Изключи",
+    "Not currently indexing messages for any room.": "В момента не се индексират съобщения в нито една стая.",
+    "Currently indexing: %(currentRoom)s": "В момента се индексира: %(currentRoom)s",
+    "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s кешира шифровани съобщения локално по сигурен начин, за да може те да се появяват в резултати от търсения:",
+    "Space used:": "Използвано пространство:",
+    "Indexed messages:": "Индексирани съобщения:",
+    "Indexed rooms:": "Индексирани стаи:",
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s от %(totalRooms)s",
+    "Message downloading sleep time(ms)": "Период на пауза между свалянията на съобщения (ms)",
+    "Navigation": "Навигация",
+    "Calls": "Обаждания",
+    "Room List": "Списък със стаи",
+    "Autocomplete": "Подсказване",
+    "Alt": "Alt",
+    "Alt Gr": "Alt Gr",
+    "Shift": "Shift",
+    "Super": "Super",
+    "Ctrl": "Ctrl",
+    "Toggle Bold": "Превключи удебеляването",
+    "Toggle Italics": "Превключи накланянето",
+    "Toggle Quote": "Превключи цитирането",
+    "New line": "Нов ред",
+    "Navigate recent messages to edit": "Движение из скорошни съобщения за редактиране",
+    "Jump to start/end of the composer": "Прескачане в началото/края на полето за писане",
+    "Navigate composer history": "Движение из историята на полето за писане",
+    "Cancel replying to a message": "Отказване на отговарянето на съобщение",
+    "Toggle microphone mute": "Превключване на заглушаването на микрофона",
+    "Toggle video on/off": "Превключване на видеото (вкл./изкл.)",
+    "Scroll up/down in the timeline": "Движение нагоре/надолу из съобщенията",
+    "Dismiss read marker and jump to bottom": "Игнориране на маркера за прочитане и отиване най-долу",
+    "Jump to oldest unread message": "Прескачане до най-старото непрочетено съобщение",
+    "Upload a file": "Качване на файл",
+    "Jump to room search": "Търсене на стаи",
+    "Navigate up/down in the room list": "Движение нагоре/надолу в списъка със стаи",
+    "Select room from the room list": "Избор на стая от списъка",
+    "Collapse room list section": "Свиване на раздел със стаи",
+    "Expand room list section": "Разширение на раздел със стаи",
+    "Clear room list filter field": "Изчистване на полето за филтрирането на списъка със стаи",
+    "Previous/next unread room or DM": "Предишна/следваща непрочетена стая или директно съобщение",
+    "Previous/next room or DM": "Предишна/следваща стая или директно съобщение",
+    "Toggle the top left menu": "Превключва основното меню (горе в ляво)",
+    "Close dialog or context menu": "Затваряне на прозорец или контекстно меню",
+    "Activate selected button": "Активиране на избрания бутон",
+    "Toggle right panel": "Превключване на десния панел",
+    "Toggle this dialog": "Превключване на този прозорец",
+    "Move autocomplete selection up/down": "Движение нагоре/надолу из подсказките",
+    "Cancel autocomplete": "Отказване на подсказките",
+    "Page Up": "Page Up",
+    "Page Down": "Page Down",
+    "Esc": "Esc",
+    "Enter": "Enter",
+    "Space": "Space",
+    "End": "End",
+    "No recently visited rooms": "Няма наскоро-посетени стаи",
+    "Sort by": "Подреди по",
+    "Activity": "Активност",
+    "A-Z": "Азбучен ред",
+    "Unread rooms": "Непрочетени стаи",
+    "Show %(count)s more|other": "Покажи още %(count)s",
+    "Show %(count)s more|one": "Покажи още %(count)s",
+    "Light": "Светла",
+    "Dark": "Тъмна",
+    "Use the improved room list (will refresh to apply changes)": "Използвай подобрения списък със стаи (ще презареди за да се приложи промяната)",
+    "Use custom size": "Използвай собствен размер",
+    "Use a system font": "Използвай системния шрифт",
+    "System font name": "Име на системния шрифт",
+    "Hey you. You're the best!": "Хей, ти. Върхът си!",
+    "Message layout": "Изглед на съобщенията",
+    "Compact": "Компактен",
+    "Modern": "Модерен",
+    "Customise your appearance": "Настройте изгледа",
+    "Appearance Settings only affect this %(brand)s session.": "Настройките на изгледа влияят само на тази %(brand)s сесия.",
+    "The authenticity of this encrypted message can't be guaranteed on this device.": "Автентичността на това шифровано съобщение не може да бъде гарантирана на това устройство.",
+    "Always show first": "Винаги показвай първо",
+    "Show": "Покажи",
+    "Message preview": "Преглед на съобщението",
+    "List options": "Опции на списъка",
+    "Leave Room": "Напусни стаята",
+    "Room options": "Настройки на стаята",
+    "Use Recovery Key or Passphrase": "Използвай ключ за възстановяване или парола",
+    "Use Recovery Key": "Използвай ключ за възстановяване",
+    "Use your account to sign in to the latest version": "Използвайте профила си за да влезете в последната версия",
+    "We’re excited to announce Riot is now Element": "Развълнувани сме да обявим, че Riot вече е Element",
+    "Riot is now Element!": "Riot вече е Element!",
+    "Learn More": "Научи повече",
+    "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 напусна разговора",
+    "Call ended": "Разговора приключи",
+    "You started a call": "Започнахте разговор",
+    "%(senderName)s started a call": "%(senderName)s започна разговор",
+    "Waiting for answer": "Изчакване на отговор",
+    "%(senderName)s is calling": "%(senderName)s се обажда",
+    "You created the room": "Създадохте стаята",
+    "%(senderName)s created the room": "%(senderName)s създаде стаята",
+    "You made the chat encrypted": "Направихте чата шифрован",
+    "%(senderName)s made the chat encrypted": "%(senderName)s направи чата шифрован",
+    "You made history visible to new members": "Направихте историята видима за нови членове",
+    "%(senderName)s made history visible to new members": "%(senderName)s направи историята видима за нови членове",
+    "You made history visible to anyone": "Направихте историята видима за всички",
+    "%(senderName)s made history visible to anyone": "%(senderName)s направи историята видима за всички",
+    "You made history visible to future members": "Направихте историята видима за бъдещи членове",
+    "%(senderName)s made history visible to future members": "%(senderName)s направи историята видима за бъдещи членове",
+    "You were invited": "Бяхте поканени",
+    "%(targetName)s was invited": "%(targetName)s беше поканен",
+    "You left": "Напуснахте",
+    "%(targetName)s left": "%(targetName)s напусна",
+    "You were kicked (%(reason)s)": "Бяхте изгонени (%(reason)s)",
+    "%(targetName)s was kicked (%(reason)s)": "%(targetName)s беше изгонен(а) (%(reason)s)",
+    "You were kicked": "Бяхте изгонени",
+    "%(targetName)s was kicked": "%(targetName)s беше изгонен(а)",
+    "You rejected the invite": "Отхвърлихте поканата",
+    "%(targetName)s rejected the invite": "%(targetName)s отхвърли поканата",
+    "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)"
 }
diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index aee9559eb7..6b954da9f2 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -6,9 +6,7 @@
     "Microphone": "Micròfon",
     "Camera": "Càmera",
     "Advanced": "Avançat",
-    "Algorithm": "Algoritme",
     "Always show message timestamps": "Mostra sempre la marca de temps del missatge",
-    "Alias (optional)": "Àlies (opcional)",
     "Cancel": "Cancel·la",
     "Close": "Tanca",
     "Create new room": "Crea una sala nova",
@@ -41,11 +39,6 @@
     "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ó",
     "Call Failed": "No s'ha pogut realitzar la trucada",
-    "Review Devices": "Revisió de dispositius",
-    "Call Anyway": "Truca de totes maneres",
-    "Answer Anyway": "Contesta de totes maneres",
-    "Call": "Truca",
-    "Answer": "Contesta",
     "The remote side failed to pick up": "El costat remot no ha contestat",
     "Unable to capture screen": "No s'ha pogut capturar la pantalla",
     "Existing Call": "Trucada existent",
@@ -87,14 +80,13 @@
     "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?",
     "Add rooms to the community": "Afegeix sales a la comunitat",
-    "Room name or alias": "Nom de la sala o àlies",
     "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:",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot no té permís per enviar-vos notificacions. Comproveu la configuració del vostre navegador",
-    "Riot was not given permission to send notifications - please try again": "Riot no ha rebut cap permís per enviar notificacions. Torneu-ho a provar",
+    "%(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",
     "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.",
@@ -102,7 +94,6 @@
     "Restricted": "Restringit",
     "Moderator": "Moderador",
     "Admin": "Administrador",
-    "Start a chat": "Comença un xat",
     "Failed to invite": "No s'ha pogut tramitar la invitació",
     "Failed to invite the following users to the %(roomName)s room:": "No s'ha pogut convidar a la sala %(roomName)s els següents usuaris:",
     "You need to be logged in.": "És necessari estar autenticat.",
@@ -119,7 +110,6 @@
     "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.",
-    "Unrecognised room alias:": "Àlies de sala no reconeguts:",
     "Ignored user": "Usuari ignorat",
     "You are now ignoring %(userId)s": "Esteu ignorant l'usuari %(userId)s",
     "Unignored user": "Usuari no ignorat",
@@ -170,15 +160,13 @@
     "%(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.",
-    "Send anyway": "Envia de totes maneres",
     "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",
-    "Not a valid Riot keyfile": "El fitxer no és un fitxer de claus de Riot vàlid",
+    "Not a valid %(brand)s keyfile": "El fitxer no és un fitxer de claus de %(brand)s vàlid",
     "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",
-    "Use compact timeline layout": "Utilitza el disseny compacte de la línia de temps",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Mostra les marques de temps en format de 12 hores (per exemple, 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",
@@ -211,11 +199,8 @@
     "Confirm password": "Confirma la contrasenya",
     "Change Password": "Canvia la contrasenya",
     "Authentication": "Autenticació",
-    "Device ID": "ID del dispositiu",
     "Last seen": "Vist per última vegada",
     "Failed to set display name": "No s'ha pogut establir el nom visible",
-    "Disable Notifications": "Desactiva les notificacions",
-    "Enable Notifications": "Activa les notificacions",
     "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í",
@@ -228,8 +213,6 @@
     "%(senderName)s uploaded a file": "%(senderName)s ha pujat un fitxer",
     "Options": "Opcions",
     "Please select the destination room for this message": "Si us plau, seleccioneu la sala destinatària per a aquest missatge",
-    "Blacklisted": "Llista negre",
-    "device id: ": "ID del dispositiu: ",
     "Disinvite": "Descarta la invitació",
     "Kick": "Fes fora",
     "Disinvite this user?": "Descartar la invitació per a aquest usuari?",
@@ -242,7 +225,6 @@
     "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 toggle moderator status": "No s'ha pogut canviar l'estat del moderador",
     "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?",
@@ -252,11 +234,7 @@
     "Jump to read receipt": "Vés a l'últim missatge llegit",
     "Mention": "Menciona",
     "Invite": "Convida",
-    "User Options": "Opcions d'usuari",
-    "Direct chats": "Xats directes",
     "Unmute": "No silenciïs",
-    "Revoke Moderator": "Revoca el moderador",
-    "Make Moderator": "Fes-lo moderador",
     "Admin Tools": "Eines d'administració",
     "and %(count)s others...|other": "i %(count)s altres...",
     "and %(count)s others...|one": "i un altre...",
@@ -269,9 +247,7 @@
     "Video call": "Trucada de vídeo",
     "Upload file": "Puja un fitxer",
     "Send an encrypted reply…": "Envia una resposta xifrada…",
-    "Send a reply (unencrypted)…": "Envia una resposta (sense xifrar)…",
     "Send an encrypted message…": "Envia un missatge xifrat…",
-    "Send a message (unencrypted)…": "Envia un missatge (sense xifrar)…",
     "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",
@@ -334,10 +310,7 @@
     "Jump to first unread message.": "Salta al primer missatge no llegit.",
     "Anyone who knows the room's link, including guests": "Qualsevol que conegui l'enllaç de la sala, inclosos els usuaris d'altres xarxes",
     "not specified": "sense especificar",
-    "Remote addresses for this room:": "Adreces remotes per a aquesta sala:",
-    "Local addresses for this room:": "Adreces locals d'aquesta sala:",
     "This room has no local addresses": "Aquesta sala no té adreces locals",
-    "New address (e.g. #foo:%(localDomain)s)": "Nova adreça (per exemple #foo:%(localDomain)s)",
     "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)",
@@ -359,10 +332,6 @@
     "Copied!": "Copiat!",
     "Failed to copy": "No s'ha pogut copiar",
     "Add an Integration": "Afegeix una integració",
-    "Removed or unknown message type": "El tipus de missatge ha sigut eliminat o és desconegut",
-    "Message removed by %(userId)s": "El missatge ha sigut eliminat per l'usuari %(userId)s",
-    "Message removed": "S'ha eliminat el missatge",
-    "To continue, please enter your password.": "Per poder continuar, si us plau, introduïu una contrasenya.",
     "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",
@@ -398,17 +367,12 @@
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "La supressió d'un giny l'elimina per a tots els usuaris d'aquesta sala. Esteu segur que voleu eliminar aquest giny?",
     "Delete widget": "Suprimeix el giny",
     "Minimize apps": "Minimitza les aplicacions",
-    "Blacklist": "Llista negre",
-    "Unverify": "Sense verificar",
-    "Verify...": "Verificar...",
     "No results": "Sense resultats",
     "Communities": "Comunitats",
     "Home": "Inici",
-    "Could not connect to the integration server": "No s'ha pogut connectar amb el servidor d'integració",
     "Manage Integrations": "Gestiona les integracions",
     "%(nameList)s %(transitionList)s": "%(transitionList)s%(nameList)s",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s han entrat",
-    "Unblacklist": "Treure de la llista negre",
     "%(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",
@@ -489,12 +453,7 @@
     "Unknown error": "S'ha produït un error desconegut",
     "Incorrect password": "Contrasenya incorrecta",
     "Deactivate Account": "Desactivar el compte",
-    "I verify that the keys match": "Verifico que les claus coincideixen",
     "An error has occurred.": "S'ha produït un error.",
-    "Start verification": "Inicia la verificació",
-    "Share without verifying": "Comparteix sense verificar",
-    "Ignore request": "Ignora la sol·licitud",
-    "Encryption key request": "Sol·licitud de claus",
     "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",
@@ -511,7 +470,7 @@
     "To get started, please pick a username!": "Per començar, seleccioneu un nom d'usuari!",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Aquest serà el nom del seu compte al <span></span> servidor amfitrió, o bé trieu-ne un altre <a>different server</a>.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Si ja teniu un compte a Matrix, podeu <a>log in</a>.",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Si anteriorment heu utilitzat un versió de Riot més recent, la vostra sessió podría ser incompatible amb aquesta versió. Tanqueu aquesta finestra i torneu a la versió més recent.",
+    "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.": "Si anteriorment heu utilitzat un versió de %(brand)s més recent, la vostra sessió podría ser incompatible amb aquesta versió. Tanqueu aquesta finestra i torneu a la versió més recent.",
     "Private Chat": "Xat privat",
     "Public Chat": "Xat públic",
     "Custom": "Personalitzat",
@@ -560,14 +519,13 @@
     "Failed to leave room": "No s'ha pogut sortir de la sala",
     "For security, this session has been signed out. Please sign in again.": "Per seguretat, aquesta sessió s'ha tancat. Torna a iniciar la sessió.",
     "Old cryptography data detected": "S'han detectat dades de criptografia antigues",
-    "Data from an older version of Riot 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 Riot. 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.",
+    "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",
     "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",
-    "Scroll to bottom of page": "Desplaça't fins a la part inferior de la pàgina",
     "%(count)s of your messages have not been sent.|other": "Alguns dels vostres missatges no s'han enviat.",
     "%(count)s of your messages have not been sent.|one": "El vostre missatge no s'ha enviat.",
     "Warning": "Avís",
@@ -579,7 +537,6 @@
     "Search failed": "No s'ha pogut cercar",
     "Server may be unavailable, overloaded, or search timed out :(": "Pot ser que el servidor no estigui disponible, que estigui sobrecarregat o que s'ha esgotat el temps de cerca :(",
     "No more results": "No hi ha més resultats",
-    "Unknown room %(roomId)s": "La sala %(roomId)s és desconeguda",
     "Room": "Sala",
     "Failed to reject invite": "No s'ha pogut rebutjar la invitació",
     "Fill screen": "Emplena la pantalla",
@@ -596,36 +553,26 @@
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "No hi ha ningú més aquí! T'agradaria <inviteText>convidar algú</inviteText> o <nowarnText>no avisar més que la sala està buida</nowarnText>?",
     "Uploading %(filename)s and %(count)s others|other": "Pujant %(filename)s i %(count)s més",
     "Uploading %(filename)s and %(count)s others|zero": "Pujant %(filename)s",
-    "Light theme": "Tema clar",
-    "Dark theme": "Tema fosc",
     "Sign out": "Tanca la sessió",
     "Import E2E room keys": "Importar claus E2E de sala",
     "Cryptography": "Criptografia",
     "Labs": "Laboraroris",
-    "riot-web version:": "Versió de riot-web:",
+    "%(brand)s version:": "Versió de %(brand)s:",
     "olm version:": "Versió d'olm:",
     "Incorrect username and/or password.": "Usuari i/o contrasenya incorrectes.",
     "The phone number entered looks invalid": "El número de telèfon introduït sembla erroni",
-    "none": "cap",
-    "Curve25519 identity key": "Clau de la identitat Curve25519",
-    "Claimed Ed25519 fingerprint key": "Empremta digital Ed25519 reclamada",
     "Session ID": "ID de la sessió",
-    "End-to-end encryption information": "Informació de xifratge d'extrem a extrem",
-    "Event information": "Informació d'esdeveniment",
-    "User ID": "ID de l'usuari",
-    "Decryption error": "Error de desxifratge",
     "Export room keys": "Exporta les claus de la sala",
     "Upload an avatar:": "Pujar un avatar:",
     "Confirm passphrase": "Introduïu una contrasenya",
     "Export": "Exporta",
     "Import room keys": "Importa les claus de la sala",
     "Import": "Importa",
-    "The version of Riot.im": "La versió del Riot.im",
+    "The version of %(brand)s": "La versió del %(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 identity server's URL": "L'URL del vostre servidor d'identitat",
     "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",
@@ -634,9 +581,8 @@
     "Your language of choice": "El teu idioma preferit",
     "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 Riot.im better includes:": "La informació enviada a Riot.im per ajudar-nos a millorar inclou:",
+    "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",
-    "A new version of Riot is available.": "Hi ha una versió nova del Riot disponible.",
     "Send Account Data": "Envia les dades del compte",
     "Advanced notification settings": "Paràmetres avançats de notificacions",
     "Uploading report": "S'està enviant l'informe",
@@ -657,8 +603,6 @@
     "Send Custom Event": "Envia els esdeveniments personalitzats",
     "All notifications are currently disabled for all targets.": "Actualment totes les notificacions estan inhabilitades per a tots els objectius.",
     "Failed to send logs: ": "No s'han pogut enviar els logs: ",
-    "delete the alias.": "esborra l'alies.",
-    "To return to your account in future you need to <u>set a password</u>": "Per poder tornar al vostre compte en un futur, heu de <u>set a password</u>",
     "Forget": "Oblida",
     "You cannot delete this image. (%(code)s)": "No podeu eliminar aquesta imatge. (%(code)s)",
     "Cancel Sending": "Cancel·la l'enviament",
@@ -684,7 +628,6 @@
     "No update available.": "No hi ha cap actualització disponible.",
     "Noisy": "Sorollós",
     "Collecting app version information": "S'està recollint la informació de la versió de l'aplicació",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Voleu esborrar de la sala l'alies %(alias)s i retirar %(name)s del directori?",
     "Enable notifications for this account": "Habilita les notificacions per aquest compte",
     "Invite to this community": "Convida a aquesta comunitat",
     "Search…": "Cerca…",
@@ -694,7 +637,7 @@
     "Enter keywords separated by a comma:": "Introduïu les paraules clau separades per una coma:",
     "Forward Message": "Reenvia el missatge",
     "Remove %(name)s from the directory?": "Voleu retirar %(name)s del directori?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot utilitza moltes funcions avançades del navegador, algunes de les quals no estan disponibles o són experimentals al vostre navegador actual.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s utilitza moltes funcions avançades del navegador, algunes de les quals no estan disponibles o són experimentals al vostre navegador actual.",
     "Developer Tools": "Eines de desenvolupador",
     "Preparing to send logs": "Preparant l'enviament de logs",
     "Explore Account Data": "Explora les dades del compte",
@@ -740,8 +683,7 @@
     "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.": "Els logs de depuració contenen dades d'ús de l'aplicació que inclouen el teu nom d'usuari, les IDs o pseudònims de les sales o grups que has visitat i els noms d'usuari d'altres usuaris. No contenen missatges.",
     "Unhide Preview": "Mostra la previsualització",
     "Unable to join network": "No s'ha pogut unir-se a la xarxa",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "És possible que els hàgiu configurat en un client diferent de Riot. No podeu modificar-los amb Riot, però encara s'apliquen",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Disculpeu, el seu navegador  <b>not</b> pot executar Riot.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Disculpeu, el seu navegador  <b>not</b> pot executar %(brand)s.",
     "Quote": "Cita",
     "Messages in group chats": "Missatges en xats de grup",
     "Yesterday": "Ahir",
@@ -750,7 +692,7 @@
     "Unable to fetch notification target list": "No s'ha pogut obtenir la llista d'objectius de les notificacions",
     "Set Password": "Establiu una contrasenya",
     "Off": "Apagat",
-    "Riot does not know how to join a room on this network": "El Riot no sap com unir-se a una sala en aquesta xarxa",
+    "%(brand)s does not know how to join a room on this network": "El %(brand)s no sap com unir-se a una sala en aquesta xarxa",
     "Mentions only": "Només mencions",
     "Failed to remove tag %(tagName)s from room": "No s'ha pogut esborrar l'etiqueta %(tagName)s de la sala",
     "You can now return to your account after signing out, and sign in on other devices.": "Ara podreu tornar a entrar al vostre compte des de altres dispositius.",
@@ -765,11 +707,9 @@
     "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...",
-    "There are advanced notifications which are not shown here": "Hi ha notificacions avançades que no es mostren aquí",
     "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 User Agent": "El vostre agent d'usuari",
     "Your device resolution": "La resolució del vostre 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.",
@@ -779,15 +719,11 @@
     "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.",
-    "Registration Required": "Es requereix registre",
-    "You need to register to do this. Would you like to register now?": "Us heu de registrar per fer això. Us voleu registrar ara?",
     "Failed to invite users to the room:": "No s'ha pogut convidar els usuaris a aquesta sala:",
-    "Waiting for %(userId)s to confirm...": "S'està esperant a que %(userId)s confirmi...",
     "Missing roomId.": "Manca l'ID de la 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",
-    "Joins room with given alias": "Us introdueix a la sala amb l'àlies donat",
     "Kicks user with given id": "Expulsa l'usuari amb l'id donat",
     "Bans user with given id": "Bandeja l'usuari amb l'id donat",
     "Ignores a user, hiding their messages from you": "Ignora un usuari, amagant-te els seus missatges",
@@ -809,11 +745,6 @@
     "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s ha permès que els convidats puguin entrar a la sala.",
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s ha prohibit l'entrada a la sala als visitants.",
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s ha canviat l'accés dels visitants a %(rule)s",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s ha afegit %(addedAddresses)s com a adreces d'aquesta sala.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s ha afegit %(addedAddresses)s com a adreça d'aquesta sala.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s ha retirat %(removedAddresses)s com a adreces d'aquesta sala.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s ha retirat %(removedAddresses)s com a adreça d'aquesta sala.",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s ha afegit %(addedAddresses)s i retirat %(removedAddresses)s com a adreces d'aquesta sala.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s ha canviat l'adreça principal d'aquesta sala a %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s ha retirat l'adreça principal d'aquesta sala.",
     "%(displayName)s is typing …": "%(displayName)s està escrivint…",
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 52c90cc3d7..7f799072cb 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -68,7 +68,6 @@
     "Microphone": "Mikrofon",
     "Camera": "Kamera",
     "Advanced": "Rozšířené",
-    "Algorithm": "Algoritmus",
     "Always show message timestamps": "Vždy zobrazovat časové značky zpráv",
     "Authentication": "Ověření",
     "A new password must be entered.": "Musíte zadat nové heslo.",
@@ -95,7 +94,6 @@
     "Command error": "Chyba příkazu",
     "Commands": "Příkazy",
     "Confirm password": "Potvrďte heslo",
-    "Could not connect to the integration server": "Nepodařilo se spojit se začleňovacím serverem",
     "Create Room": "Vytvořit místnost",
     "Cryptography": "Šifrování",
     "Current password": "Současné heslo",
@@ -105,13 +103,8 @@
     "Deactivate Account": "Deaktivovat účet",
     "Decline": "Odmítnout",
     "Decrypt %(text)s": "Dešifrovat %(text)s",
-    "Decryption error": "Chyba dešifrování",
     "Delete widget": "Vymazat widget",
     "Default": "Výchozí",
-    "Device ID": "ID zařízení",
-    "device id: ": "id zařízení: ",
-    "Direct chats": "Přímé zprávy",
-    "Disable Notifications": "Vypnout oznámení",
     "Disinvite": "Odvolat pozvání",
     "Download %(text)s": "Stáhnout %(text)s",
     "Drop File Here": "Přetáhněte soubor sem",
@@ -120,13 +113,10 @@
     "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",
-    "Enable Notifications": "Zapnout oznámení",
     "%(senderName)s ended the call.": "Uživatel %(senderName)s ukončil hovor.",
-    "End-to-end encryption information": "Informace o end-to-end šifrování",
     "Enter passphrase": "Zadejte heslo",
     "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.",
-    "Event information": "Informace o události",
     "Existing Call": "Probíhající hovor",
     "Export": "Exportovat",
     "Export E2E room keys": "Exportovat end-to-end klíče místnosti",
@@ -140,7 +130,6 @@
     "Failed to reject invite": "Nepodařilo se odmítnout pozvánku",
     "Failed to send request.": "Odeslání žádosti se nezdařilo.",
     "Failed to set display name": "Nepodařilo se nastavit zobrazované jméno",
-    "Failed to toggle moderator status": "Změna statusu moderátora se nezdařila",
     "Failed to unban": "Přijetí zpět 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",
@@ -177,10 +166,8 @@
     "Kicks user with given id": "Vykopne uživatele s daným id",
     "Last seen": "Naposledy aktivní",
     "Leave room": "Opustit místnost",
-    "Local addresses for this room:": "Místní adresy této místnosti:",
     "Moderator": "Moderátor",
     "Name": "Název",
-    "New address (e.g. #foo:%(localDomain)s)": "Nová adresa (např. #neco:%(localDomain)s)",
     "New passwords don't match": "Nová hesla se neshodují",
     "New passwords must match each other.": "Nová hesla se musí shodovat.",
     "not specified": "neurčeno",
@@ -188,7 +175,6 @@
     "<not supported>": "<nepodporováno>",
     "AM": "dop.",
     "PM": "odp.",
-    "NOT verified": "Neověřeno",
     "No display name": "Žádné zobrazované jméno",
     "No more results": "Žádné další výsledky",
     "No results": "Žádné výsledky",
@@ -204,19 +190,16 @@
     "Power level must be positive integer.": "Úroveň oprávnění musí být kladné celé číslo.",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (oprávnění %(powerLevelNumber)s)",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Tuto změnu nepůjde vrátit zpět, protože tomuto uživateli nastavujete stejnou úroveň oprávnění, jakou máte vy.",
-    "Alias (optional)": "Alias (nepovinný)",
     "Results from DuckDuckGo": "Výsledky z DuckDuckGo",
     "Return to login screen": "Vrátit k přihlašovací obrazovce",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot není oprávněn posílat vám oznámení – zkontrolujte prosím nastavení svého prohlížeče",
-    "Riot was not given permission to send notifications - please try again": "Riot nebyl oprávněn k posílání oznámení – zkuste to prosím znovu",
-    "riot-web version:": "verze riot-web:",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s není oprávněn posílat vám oznámení – zkontrolujte prosím nastavení svého prohlížeče",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s nebyl oprávněn k posílání oznámení – zkuste to prosím znovu",
+    "%(brand)s version:": "verze %(brand)s:",
     "Room %(roomId)s not visible": "Místnost %(roomId)s není viditelná",
     "Room Colour": "Barva místnosti",
     "%(roomName)s does not exist.": "%(roomName)s neexistuje.",
     "%(roomName)s is not accessible at this time.": "Místnost %(roomName)s není v tuto chvíli dostupná.",
     "Save": "Uložit",
-    "Scroll to bottom of page": "Přejít na konec stránky",
-    "Send anyway": "Přesto poslat",
     "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.",
@@ -232,7 +215,6 @@
     "Sign out": "Odhlásit",
     "%(count)s of your messages have not been sent.|other": "Některé z vašich zpráv nebyly odeslány.",
     "Someone": "Někdo",
-    "Start a chat": "Zahájit konverzaci",
     "Start authentication": "Začít ověření",
     "Submit": "Odeslat",
     "Success": "Úspěch",
@@ -263,7 +245,6 @@
     "Click to unmute video": "Klepněte pro povolení videa",
     "Click to unmute audio": "Klepněte pro povolení zvuku",
     "Displays action": "Zobrazí akci",
-    "Ed25519 fingerprint": "Ed25519 otisk",
     "Fill screen": "Vyplnit obrazovku",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s z %(fromPowerLevel)s na %(toPowerLevel)s",
     "This doesn't appear to be a valid email address": "Tato e-mailová adresa se zdá být neplatná",
@@ -280,13 +261,9 @@
     "%(senderName)s unbanned %(targetName)s.": "Uživatel %(senderName)s přijal 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í",
-    "unencrypted": "nešifrované",
     "unknown caller": "neznámý volající",
-    "unknown device": "neznámé zařízení",
-    "Unknown room %(roomId)s": "Neznámá místnost %(roomId)s",
     "Unmute": "Povolit",
     "Unnamed Room": "Nepojmenovaná místnost",
-    "Unrecognised room alias:": "Nerozpoznaný alias místnosti:",
     "Uploading %(filename)s and %(count)s others|zero": "Nahrávání souboru %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Nahrávání souboru %(filename)s a %(count)s dalších",
     "Uploading %(filename)s and %(count)s others|other": "Nahrávání souboru %(filename)s a %(count)s dalších",
@@ -294,13 +271,9 @@
     "Upload file": "Nahrát soubor",
     "Upload new:": "Nahrát nový:",
     "Usage": "Použití",
-    "Use compact timeline layout": "Použít kompaktní rozvržení časové osy",
-    "User ID": "ID uživatele",
     "Username invalid: %(errMessage)s": "Neplatné uživatelské jméno: %(errMessage)s",
     "Users": "Uživatelé",
     "Verification Pending": "Čeká na ověření",
-    "Verification": "Ověření",
-    "verified": "ověreno",
     "Verified key": "Ověřený klíč",
     "(no answer)": "(žádná odpověď)",
     "(unknown failure: %(reason)s)": "(neznámá chyba: %(reason)s)",
@@ -311,7 +284,6 @@
     "Which rooms would you like to add to this community?": "Které místnosti chcete přidat do této skupiny?",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Varování: osoba, kterou přidáte do této skupiny, bude veřejně viditelná každému, kdo zná ID skupiny",
     "Add rooms to the community": "Přidat místnosti do skupiny",
-    "Room name or alias": "Název nebo alias místnosti",
     "Add to community": "Přidat do skupiny",
     "Failed to invite the following users to %(groupId)s:": "Následující uživatele se nepodařilo přidat do %(groupId)s:",
     "Failed to invite users to community": "Nepodařilo se pozvat uživatele do skupiny",
@@ -364,8 +336,6 @@
     "%(senderDisplayName)s changed the room avatar to <img/>": "Uživatel %(senderDisplayName)s změnil avatar místnosti na <img/>",
     "Copied!": "Zkopírováno!",
     "Failed to copy": "Nepodařilo se zkopírovat",
-    "Removed or unknown message type": "Zpráva odstraněna nebo neznámého typu",
-    "Message removed by %(userId)s": "Zprávu odstranil uživatel %(userId)s",
     "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?",
     "The maximum permitted number of widgets have already been added to this room.": "V této místnosti již bylo dosaženo limitu pro maximální počet widgetů.",
     "Drop file here to upload": "Přetažením sem nahrajete",
@@ -375,12 +345,9 @@
     "Community ID": "ID skupiny",
     "example": "příklad",
     "Create": "Vytvořit",
-    "User Options": "Volby uživatele",
     "Please select the destination room for this message": "Vyberte prosím pro tuto zprávu cílovou místnost",
     "Jump to read receipt": "Skočit na poslední potvrzení o přečtení",
     "Invite": "Pozvat",
-    "Revoke Moderator": "Odebrat moderátorství",
-    "Make Moderator": "Udělit moderátorství",
     "and %(count)s others...|one": "a někdo další...",
     "Hangup": "Zavěsit",
     "Jump to message": "Přeskočit na zprávu",
@@ -398,9 +365,7 @@
     "(~%(count)s results)|one": "(~%(count)s výsledek)",
     "Upload avatar": "Nahrát avatar",
     "Mention": "Zmínit",
-    "Blacklisted": "Na černé listině",
     "Invited": "Pozvaní",
-    "Joins room with given alias": "Vstoupí do místnosti s daným aliasem",
     "Leave Community": "Opustit skupinu",
     "Leave %(groupName)s?": "Opustit %(groupName)s?",
     "Leave": "Opustit",
@@ -416,7 +381,6 @@
     "Privileged Users": "Privilegovaní uživatelé",
     "No users have specific privileges in this room": "Žádní uživatelé v této místnosti nemají zvláštní privilegia",
     "Publish this room to the public in %(domain)s's room directory?": "Zapsat tuto místnost do veřejného adresáře místností na %(domain)s?",
-    "Remote addresses for this room:": "Vzdálené adresy této místnosti:",
     "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)",
@@ -436,10 +400,8 @@
     "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",
     "Add an Integration": "Přidat začlenění",
-    "Message removed": "Zpráva odstraněna",
     "An email has been sent to %(emailAddress)s": "Na adresu %(emailAddress)s jsme poslali e-mail",
     "File to import": "Soubor k importu",
-    "none": "žádný",
     "Passphrases must match": "Hesla se musí shodovat",
     "Passphrase must not be empty": "Heslo nesmí být prázdné",
     "Export room keys": "Exportovat klíče místnosti",
@@ -454,7 +416,7 @@
     "Missing user_id in request": "V zadání chybí user_id",
     "(could not connect media)": "(média se nepodařilo spojit)",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s nastavil viditelnost budoucí zpráv v místnosti neznámým (%(visibility)s).",
-    "Not a valid Riot keyfile": "Neplatný soubor s klíčem Riot",
+    "Not a valid %(brand)s keyfile": "Neplatný soubor s klíčem %(brand)s",
     "Mirror local video feed": "Zrcadlit lokání video",
     "Enable inline URL previews by default": "Nastavit povolení náhledů URL adres jako výchozí",
     "Enable URL previews for this room (only affects you)": "Povolit náhledy URL adres pro tuto místnost (ovlivňuje pouze vás)",
@@ -477,7 +439,6 @@
     "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?",
-    "To continue, please enter your password.": "Aby jste mohli pokračovat, zadejte prosím své heslo.",
     "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",
@@ -501,10 +462,6 @@
     "Display your community flair in rooms configured to show it.": "Zobrazovat příslušnost ke skupině v místnostech, které to mají nastaveno.",
     "You're not currently a member of any communities.": "V současnosti nejste členem žádné skupiny.",
     "Unknown Address": "Neznámá adresa",
-    "Unblacklist": "Odblokovat",
-    "Blacklist": "Zablokovat",
-    "Unverify": "Zrušit ověření",
-    "Verify...": "Ověřit...",
     "Manage Integrations": "Správa integrací",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s%(count)s krát vstoupili",
@@ -571,13 +528,8 @@
     "Something went wrong whilst creating your community": "Něco se pokazilo během vytváření vaší skupiny",
     "Unknown error": "Neznámá chyba",
     "Incorrect password": "Nesprávné heslo",
-    "I verify that the keys match": "Ověřil jsem, klíče se shodují",
-    "Start verification": "Zahájit ověřování",
-    "Share without verifying": "Sdílet bez ověření",
-    "Ignore request": "Ignorovat žádost",
-    "Encryption key request": "Žádost o šifrovací klíč",
     "Unable to restore session": "Nelze obnovit relaci",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Pokud jste se v minulosti již přihlásili s novější verzi programu Riot, vaše relace nemusí být kompatibilní s touto verzí. Zavřete prosím toto okno a přihlaste se znovu pomocí nové verze.",
+    "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.": "Pokud jste se v minulosti již přihlásili s novější verzi programu %(brand)s, vaše relace nemusí být kompatibilní s touto verzí. Zavřete prosím toto okno a přihlaste se znovu pomocí nové verze.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Zkontrolujte svou e-mailovou schránku a klepněte na odkaz ve zprávě, kterou jsme vám poslali. V případě, že jste to už udělali, klepněte na tlačítko Pokračovat.",
     "This will allow you to reset your password and receive notifications.": "Toto vám umožní obnovit si heslo a přijímat oznámení e-mailem.",
     "Skip": "Přeskočit",
@@ -592,7 +544,7 @@
     "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>",
     "You must join the room to see its files": "Pro zobrazení souborů musíte do místnosti vstoupit",
-    "<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 kód stránky vaší skupiny</h1>\n<p>\n    Pomocí dlouhého popisu nejprve představte skupinu novým členům nebo uvěďte \n    nějaké důležité <a href=\"foo\">odkazy</a>\n</p>\n<p>\n    Pro vložení obrázků můžete používat i HTML značky '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 kód stránky vaší skupiny</h1>\n<p>\n    Pomocí dlouhého popisu nejprve představte skupinu novým členům nebo uvěďte \n    nějaké důležité <a href=\"foo\">odkazy</a>\n</p>\n<p>\n    Pro vložení obrázků můžete používat i HTML značky „img“\n</p>\n",
     "Add rooms to the community summary": "Přidat místnosti do přehledu skupiny",
     "Which rooms would you like to add to this summary?": "Které místnosti se přejete přidat do tohoto přehledu?",
     "Add to summary": "Přidat do přehledu",
@@ -632,15 +584,13 @@
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Kromě vás není v této místnosti nikdo jiný! Přejete si <inviteText>Pozvat další</inviteText> anebo <nowarnText>Přestat upozorňovat na prázdnou místnost</nowarnText>?",
     "Room": "Místnost",
     "Failed to load timeline position": "Bod v časové ose se nepodařilo načíst",
-    "Light theme": "Světlý vzhled",
-    "Dark theme": "Tmavý vzhled",
     "Analytics": "Analytické údaje",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot sbírá anonymní analytické údaje, které nám umožňují aplikaci dále zlepšovat.",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s sbírá anonymní analytické údaje, které nám umožňují aplikaci dále zlepšovat.",
     "Labs": "Experimentální funkce",
     "Reject all %(invitedRooms)s invites": "Odmítnutí všech %(invitedRooms)s pozvání",
     "Start automatically after system login": "Zahájit automaticky po přihlášení do systému",
     "No media permissions": "Žádná oprávnění k médiím",
-    "You may need to manually permit Riot to access your microphone/webcam": "Je možné, že budete potřebovat manuálně povolit Riot přístup k mikrofonu/webkameře",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "Je možné, že budete potřebovat manuálně povolit %(brand)s přístup k mikrofonu/webkameře",
     "Profile": "Profil",
     "The email address linked to your account must be entered.": "Musíte zadat e-mailovou adresu spojenou s vaším účtem.",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Na adresu %(emailAddress)s byla odeslána zpráva. Potom, co přejdete na odkaz z této zprávy, klepněte níže.",
@@ -655,25 +605,16 @@
     "Stops ignoring a user, showing their messages going forward": "Přestane ignorovat uživatele a začne zobrazovat jeho zprávy",
     "Notify the whole room": "Oznámení pro celou místnost",
     "Room Notification": "Oznámení místnosti",
-    "Curve25519 identity key": "Klíč totožnosti Curve25519",
-    "Claimed Ed25519 fingerprint key": "Údajný klíč s otiskem Ed25519",
     "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.",
     "Call Failed": "Hovor selhal",
-    "Review Devices": "Ověřit zařízení",
-    "Call Anyway": "Přesto zavolat",
-    "Answer Anyway": "Přesto přijmout",
-    "Call": "Hovor",
-    "Answer": "Přijmout",
     "Send": "Odeslat",
     "collapse": "sbalit",
     "expand": "rozbalit",
     "Old cryptography data detected": "Nalezeny starší šifrované datové zprávy",
-    "Data from an older version of Riot 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.": "Byly nalezeny datové zprávy ze starší verze Riot. Důsledkem bude, že end-to-end šifrování nebude ve starší verzi Riot správně fungovat. Šifrované zprávy ze starší verze nemusí být čitelné v nové verzi. Může dojít i k selhání zasílaní zpráv s touto verzí Riotu. Pokud zaznamenáte některý z uvedených problému, odhlaste se a znovu přihlaste. Pro zachování historie zpráv exportujte a znovu importujte své klíče.",
     "Warning": "Varování",
     "Fetching third party location failed": "Nepodařilo se zjistit umístění třetí strany",
-    "A new version of Riot is available.": "Je dostupná nová verze Riotu.",
-    "I understand the risks and wish to continue": "Rozumím rizikům a přeji si pokračovat",
+    "I understand the risks and wish to continue": "Rozumím a přesto chci pokračovat",
     "Send Account Data": "Poslat data o účtu",
     "Advanced notification settings": "Rozšířená nastavení oznámení",
     "Uploading report": "Nahrávání hlášení",
@@ -692,8 +633,6 @@
     "Waiting for response from server": "Čekám na odezvu ze serveru",
     "Send Custom Event": "Odeslat vlastní událost",
     "All notifications are currently disabled for all targets.": "Veškerá oznámení jsou aktuálně pro všechny cíle vypnuty.",
-    "delete the alias.": "smazat alias.",
-    "To return to your account in future you need to <u>set a password</u>": "Abyste se mohli ke svému účtu v budoucnu vrátit, musíte si <u>nastavit heslo</u>",
     "Forget": "Zapomenout",
     "You cannot delete this image. (%(code)s)": "Tento obrázek nemůžete smazat. (%(code)s)",
     "Cancel Sending": "Zrušit odesílání",
@@ -718,7 +657,6 @@
     "No update available.": "Není dostupná žádná aktualizace.",
     "Resend": "Poslat znovu",
     "Collecting app version information": "Sbírání informací o verzi aplikace",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Smazat alias místnosti %(alias)s a odstranit %(name)s z adresáře?",
     "Keywords": "Klíčová slova",
     "Enable notifications for this account": "Zapnout oznámení na tomto účtu",
     "Invite to this community": "Pozvat do této skupiny",
@@ -729,7 +667,7 @@
     "Forward Message": "Přeposlat",
     "You have successfully set a password and an email address!": "Úspěšně jste si nastavili heslo a e-mailovou adresu!",
     "Remove %(name)s from the directory?": "Odebrat %(name)s z adresáře?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot používá mnoho pokročilých funkcí, z nichž některé jsou ve vašem současném prohlížeči nedostupné nebo experimentální.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s používá mnoho pokročilých funkcí, z nichž některé jsou ve vašem současném prohlížeči nedostupné nebo experimentální.",
     "Developer Tools": "Nástroje pro vývojáře",
     "Explore Account Data": "Prozkoumat data o účtu",
     "Remove from Directory": "Odebrat z adresáře",
@@ -770,14 +708,13 @@
     "Show message in desktop notification": "Zobrazovat zprávu v oznámení na ploše",
     "Unhide Preview": "Zobrazit náhled",
     "Unable to join network": "Nelze se připojit k síti",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Snad jste je nastavili v jiném klientu než Riot. V Riotu je nemůžete upravit, ale přesto platí",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Omlouváme se, váš prohlížeč <b>není</b> schopný Riot spustit.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Omlouváme se, váš prohlížeč <b>není</b> schopný %(brand)s spustit.",
     "Uploaded on %(date)s by %(user)s": "Nahráno %(date)s uživatelem %(user)s",
     "Messages in group chats": "Zprávy ve skupinách",
     "Yesterday": "Včera",
     "Error encountered (%(errorDetail)s).": "Nastala chyba (%(errorDetail)s).",
     "Low Priority": "Nízká priorita",
-    "Riot does not know how to join a room on this network": "Riot neví, jak vstoupit do místosti na této síti",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s neví, jak vstoupit do místosti na této síti",
     "Set Password": "Nastavit heslo",
     "An error occurred whilst saving your email notification preferences.": "Při ukládání nastavení e-mailových oznámení nastala chyba.",
     "Off": "Vypnout",
@@ -797,20 +734,16 @@
     "Quote": "Citovat",
     "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!": "Vzhled a chování aplikace může být ve vašem aktuální prohlížeči nesprávné a některé nebo všechny funkce mohou být chybné. Chcete-li i přes to pokračovat, nebudeme vám bránit, ale se všemi problémy, na které narazíte, si musíte poradit sami!",
     "Checking for an update...": "Kontrola aktualizací...",
-    "There are advanced notifications which are not shown here": "Jsou k dispozici pokročilá oznámení, která zde nejsou zobrazena",
     "The platform you're on": "Vámi používaná platforma",
-    "The version of Riot.im": "Verze Riot.im",
+    "The version of %(brand)s": "Verze %(brand)su",
     "Your language of choice": "Váš jazyk",
-    "Which officially provided instance you are using, if any": "Kterou oficiální instanci Riot.im používáte (a jestli vůbec)",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Zda při psaní zpráv používáte rozbalenou lištu formátování textu",
     "Your homeserver's URL": "URL vašeho domovského serveru",
-    "Your identity server's URL": "URL Vámi používaného serveru identity",
     "e.g. %(exampleValue)s": "např. %(exampleValue)s",
     "Every page you use in the app": "Každou stránku v aplikaci, kterou navštívíte",
     "e.g. <CurrentPageURL>": "např. <CurrentPageURL>",
-    "Your User Agent": "Řetězec User Agent Vašeho zařízení",
     "Your device resolution": "Rozlišení obrazovky vašeho zařízení",
-    "The information being sent to us to help make Riot.im better includes:": "S cílem vylepšovat aplikaci Riot.im shromažďujeme následující údaje:",
+    "The information being sent to us to help make %(brand)s better includes:": "Abychom mohli %(brand)s zlepšovat, posíláte nám následující informace:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "V případě, že se na stránce vyskytují identifikační údaje, jako například název místnosti, ID uživatele, místnosti a nebo skupiny, jsou tyto údaje před odesláním na server odstraněny.",
     "Call in Progress": "Probíhající hovor",
     "A call is currently being placed!": "Právě probíhá jiný hovor!",
@@ -831,9 +764,7 @@
     "Demote": "Degradovat",
     "Share Link to User": "Sdílet odkaz na uživatele",
     "Send an encrypted reply…": "Odeslat šifrovanou odpověď …",
-    "Send a reply (unencrypted)…": "Odeslat odpověď (nešifrovaně) …",
     "Send an encrypted message…": "Odeslat šifrovanou zprávu …",
-    "Send a message (unencrypted)…": "Odeslat zprávu (nešifrovaně) …",
     "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",
@@ -850,15 +781,9 @@
     "The email field must not be blank.": "E-mail nemůže být prázdný.",
     "The phone number field must not be blank.": "Telefonní číslo nemůže být prázdné.",
     "The password field must not be blank.": "Heslo nemůže být prázdné.",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Prosím pomozte nám vylepšovat Riot.im odesíláním <UsageDataLink>anonymních údajů o používaní</UsageDataLink>. Použijeme k tomu cookies (přečtěte si <PolicyLink>jak cookies používáme</PolicyLink>).",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Prosím pomozte nám vylepšovat Riot.im odesíláním <UsageDataLink>anonymních údajů o používaní</UsageDataLink>. Na tento účel použijeme cookie.",
-    "Yes, I want to help!": "Ano, chci pomoci!",
     "Please <a>contact your service administrator</a> to continue using the service.": "Pro další používání vašeho zařízení prosím kontaktujte prosím <a>správce vaší služby</a>.",
     "This homeserver has hit its Monthly Active User limit.": "Tento domovský server dosáhl svého měsíčního limitu pro aktivní uživatele.",
     "This homeserver has exceeded one of its resource limits.": "Tento domovský server překročil některý z limitů.",
-    "Please <a>contact your service administrator</a> to get this limit increased.": "Pro zvýšení tohoto limitu prosím <a>kontaktujte správce své služby</a>.",
-    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "Tento domovský server dosáhl svého měsíčního limitu pro aktivní uživatele, proto se <b>někteří uživatelé nebudou moci přihlásit</b>.",
-    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Tento domovský server překročil některý z limitů, proto se <b>někteří uživatelé nebudou moci přihlásit</b>.",
     "Failed to remove widget": "Nepovedlo se odstranit widget",
     "An error ocurred whilst trying to remove the widget from the room": "Při odstraňování widgetu z místnosti nastala chyba",
     "Minimize apps": "Minimalizovat aplikace",
@@ -903,13 +828,12 @@
     "Who can join this community?": "Kdo může vstoupit do této skupiny?",
     "Everyone": "Všichni",
     "This room is not public. You will not be able to rejoin without an invite.": "Tato místnost není veřejná. Bez pozvánky nebudete moci znovu vstoupit.",
-    "Can't leave Server Notices room": "Místnost \"Server Notices\" nelze opustit",
+    "Can't leave Server Notices room": "Místnost „Server Notices“ nelze opustit",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Tato místnost je určena pro důležité zprávy od domovského serveru, a proto ji nelze opustit.",
     "Terms and Conditions": "Smluvní podmínky",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Chcete-li nadále používat domovský server %(homeserverDomain)s, měli byste si přečíst a odsouhlasit naše smluvní podmínky.",
     "Review terms and conditions": "Přečíst smluvní podmínky",
-    "Did you know: you can use communities to filter your Riot.im experience!": "Věděli jste, že práci s Riot.im si můžete zpříjemnit používáním skupin!",
-    "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 na panel filtrování na levé straně obrazovky. Potom můžete kdykoliv klepnout na avatar skupiny v tomto panelu a Riot vám bude zobrazovat jen místnosti a lidi z dané skupiny.",
+    "Did you know: you can use communities to filter your %(brand)s experience!": "Věděli jste, že práci s %(brand)s si můžete zpříjemnit používáním skupin!",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Dokud si nepřečtete a neodsouhlasíte <consentLink>naše smluvní podmínky</consentLink>, nebudete moci posílat žádné zprávy.",
     "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.": "Vaše zpráva nebyla odeslána, protože tento domovský server dosáhl svého měsíčního limitu pro aktivní uživatele. Pro další využívání služby prosím kontaktujte jejího <a>správce</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.": "Vaše zpráva nebyla odeslána, protože tento domovský server dosáhl limitu svých zdrojů. Pro další využívání služby prosím kontaktujte jejího <a>správce</a>.",
@@ -926,21 +850,13 @@
     "Manually export keys": "Export klíčů",
     "You'll lose access to your encrypted messages": "Přijdete o přístup k šifrovaným zprávám",
     "Are you sure you want to sign out?": "Opravdu se chcete odhlásit?",
-    "Updating Riot": "Aktualizujeme Riot",
-    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Jestli máte nějakou zpětnou vazbu nebo máte s Riotem nějaký problém, dejte nám vědět na GitHubu.",
+    "Updating %(brand)s": "Aktualizujeme %(brand)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.": "Abychom předešli řešení jednoho problému několikrát, podívejte se prosím nejdřív <existingIssuesLink>seznam existujících issue</existingIssuesLink> (a můžete jim dát 👍) nebo můžete <newIssueLink>vyrobit nové</newIssueLink>. Jenom nám prosím pište anglicky.",
     "Report bugs & give feedback": "Hlášení chyb a zpětná vazba",
     "Go back": "Zpět",
     "Failed to upgrade room": "Nepovedlo se upgradeovat místnost",
     "The room upgrade could not be completed": "Upgrade místnosti se nepovedlo dokončit",
     "Upgrade this room to version %(version)s": "Upgradování místnosti na verzi %(version)s",
-    "Use Legacy Verification (for older clients)": "Použít starší verzi ověření (funguje se staršími klienty)",
-    "Verify by comparing a short text string.": "Verfikujete porovnáním krátkého textu.",
-    "Begin Verifying": "Zahájit ověření",
-    "Waiting for partner to accept...": "Čekáme až partner přijme žádost...",
-    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Nic se neděje? Ne všichni klienti klienti podporují interaktivní ověření. <button>Použít starší verzi</button>.",
-    "Waiting for %(userId)s to confirm...": "Čekáme až to %(userId)s potvrdí...",
-    "Use two-way text verification": "Použít oboustranné ověření",
     "Security & Privacy": "Zabezpečení",
     "Encryption": "Šifrování",
     "Once enabled, encryption cannot be disabled.": "Po zapnutí, už nepůjde šifrování vypnout.",
@@ -953,7 +869,6 @@
     "Room Topic": "Téma místnosti",
     "Room avatar": "Avatar místnosti",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Změny viditelnosti historie této místnosti ovlivní jenom nové zprávy. Viditelnost starších zpráv zůstane, jaká byla v době jejich odeslání.",
-    "To link to this room, please add an alias.": "K vytvoření odkazu je potřeba vyrobit místnosti alias.",
     "Roles & Permissions": "Role a oprávnění",
     "Room information": "Informace o místnosti",
     "Internal room ID:": "Interní ID:",
@@ -999,9 +914,9 @@
     "Profile picture": "Profilový obrázek",
     "Display Name": "Zobrazované jméno",
     "Room Addresses": "Adresy místnosti",
-    "For help with using Riot, click <a>here</a>.": "Pro pomoc s používáním Riotu klepněte <a>sem</a>.",
-    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "Pro pomoc s používáním Riotu klepněte <a>sem</a> nebo následujícím tlačítkem zahajte konverzaci s robotem.",
-    "Chat with Riot Bot": "Konverzovat s Riot Botem",
+    "For help with using %(brand)s, click <a>here</a>.": "Pro pomoc s používáním %(brand)su klepněte <a>sem</a>.",
+    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "Pro pomoc s používáním %(brand)su klepněte <a>sem</a> nebo následujícím tlačítkem zahajte konverzaci s robotem.",
+    "Chat with %(brand)s Bot": "Konverzovat s %(brand)s Botem",
     "Ignored users": "Ignorovaní uživatelé",
     "Bulk options": "Hromadná možnost",
     "Key backup": "Záloha klíčů",
@@ -1024,8 +939,6 @@
     "Whether or not you're logged in (we don't record your username)": "Zda jste nebo nejste přihlášeni (vaše uživatelské jméno se nezaznamenává)",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Soubor '%(fileName)s' je větší než povoluje limit domovského serveru",
     "Unable to load! Check your network connectivity and try again.": "Stránku se nepovedlo načíst! Zkontrolujte prosím své připojení k internetu a zkuste to znovu.",
-    "Registration Required": "Je vyžadována registrace",
-    "You need to register to do this. Would you like to register now?": "Na toto potřebujete registraci. Chcete se zaregistrovat teď hned?",
     "Failed to invite users to the room:": "Nepovedlo se pozvat uživatele do místnosti:",
     "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.",
@@ -1037,11 +950,6 @@
     "%(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 added %(count)s %(addedAddresses)s as addresses for this room.|other": "Uživatel %(senderName)s přidal této místnosti nové adresy %(addedAddresses)s.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "Uživatel %(senderName)s přidal této místnosti novou adresu %(addedAddresses)s.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "Uživatel %(senderName)s odstranil této místnosti adresy %(removedAddresses)s.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "Uživatel %(senderName)s odstranil této místnosti adresu %(removedAddresses)s.",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "Uživatel %(senderName)s přidal této místnosti adresy %(addedAddresses)s a odebral %(removedAddresses)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.",
     "%(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 …",
@@ -1067,8 +975,8 @@
     "Reversed words aren't much harder to guess": "Otočená slova nejsou moc těžká na uhodnutí",
     "Predictable substitutions like '@' instead of 'a' don't help very much": "Časté substituce jako 'a' za '@' a 'S' za '$' moc nepomůžou",
     "Add another word or two. Uncommon words are better.": "Přidejte další slovo nebo dvě. Čím výjimečnější tím lepší.",
-    "Repeats like \"aaa\" are easy to guess": "Opakování jako \"aaa\" jsou jednoduché uhodnout",
-    "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Opakování typu \"abcabcabc\" jsou jen o málo složitější uhodnout než \"abc\"",
+    "Repeats like \"aaa\" are easy to guess": "Opakování jako „aaa“ lze snadno uhodnout",
+    "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Opakování typu „abcabcabc“ jsou jen o málo složitější k uhádnutí než „abc“",
     "Sequences like abc or 6543 are easy to guess": "Posloupnosti jako abc nebo 6543 je lehké uhodnout",
     "Recent years are easy to guess": "Nedávné roky je lehké uhodnout",
     "Dates are often easy to guess": "Data je většinou lehké uhodnout",
@@ -1184,54 +1092,30 @@
     "I don't want my encrypted messages": "Už své zašifrované zprávy nechci",
     "Checking...": "Kontroluji...",
     "Unable to load backup status": "Nepovedlo se načíst stav zálohy",
-    "Recovery Key Mismatch": "Klíč zálohy neodpovídá",
-    "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "Tímto klíčem se nepovedlo zálohu rozšifrovat: zkontrolujte prosím, že jste zadali správný klíč.",
-    "Incorrect Recovery Passphrase": "Nesprávné obnovovací heslo",
-    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "S tímto heslem se zálohu nepovedlo rozšifrovat: zkontrolujte prosím, že jste ho zadali správně.",
     "Unable to restore backup": "Nepovedlo se obnovit ze zálohy",
     "No backup found!": "Nenalezli jsme žádnou zálohu!",
-    "Backup Restored": "Záloha načtena",
     "Failed to decrypt %(failedCount)s sessions!": "Nepovedlo se rozšifrovat %(failedCount)s sezení!",
-    "Restored %(sessionCount)s session keys": "Obnovili jsme %(sessionCount)s klíčů",
-    "Enter Recovery Passphrase": "Zadejte heslo k záloze",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Varování</b>: záloha by měla být prováděna na důvěryhodném počítači.",
     "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Zadáním hesla k záloze získáte zpět přístup k šifrovaným zprávám a zabezpečené komunikaci.",
     "Next": "Další",
     "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Pokud jste zapomněli své obnovovací heslo, použijte <button1>obnovovací klíč</button1> nebo <button2>nastavte další možnosti obnovení</button2>",
-    "Enter Recovery Key": "Zadejte obnovovací klíč",
     "This looks like a valid recovery key!": "To vypadá jako správný klíč!",
     "Not a valid recovery key": "To není správný klíč",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Zadejte obnovovací klíč pro přístupu k historii zpráv a zabezpečené komunikaci.",
     "Recovery Method Removed": "Záloha klíčů byla odstraněna",
     "Go to Settings": "Přejít do nastavení",
-    "Enter a passphrase...": "Zadejte silné heslo...",
     "For maximum security, this should be different from your account password.": "Z bezpečnostních důvodů by toto heslo mělo být jiné než přihlašovací heslo.",
-    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "Na našich serverech uložíme šifrovanou zálohu vašich klíčů. Zvolte si silné heslo (např. delší frázi) aby byla záloha v bezpečí.",
-    "Great! This passphrase looks strong enough.": "Super! Na první pohled to vypadá dostatečně silně.",
     "Keep going...": "Pokračujte...",
-    "Set up with a Recovery Key": "Nastavit obnovovací klíč",
     "That matches!": "To odpovídá!",
     "That doesn't match.": "To nesedí.",
     "Go back to set it again.": "Nastavit heslo znovu.",
-    "Please enter your passphrase a second time to confirm.": "Pro ověření zadejte heslo znovu.",
-    "Repeat your passphrase...": "Zopakute heslo...",
-    "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Tento klíč můžete použít jako záchranou síť k obnově zašifrované historie pokud byste zapomněl/a heslo k záloze.",
-    "As a safety net, you can use it to restore your encrypted message history.": "Tento klíč můžete použít jako záchranou síť k obnově zašifrované historie.",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Obnovovací klíč je záchranná síť - lze použít k obnově šifrovaných zpráv i když zapomenete heslo.",
-    "Your Recovery Key": "Váš klíč pro obnovu zálohy",
-    "Copy to clipboard": "Zkopírovat do schránky",
     "Download": "Stáhnout",
     "<b>Print it</b> and store it somewhere safe": "<b>Vytiskněte</b> si ho a bezpečně ho uložte",
     "<b>Save it</b> on a USB key or backup drive": "<b>Uložte ho</b> na bezpečnou USB flash disk nebo zálohovací disk",
     "<b>Copy it</b> to your personal cloud storage": "<b>Zkopírujte si ho</b> na osobní cloudové úložiště",
     "Your keys are being backed up (the first backup could take a few minutes).": "Klíče se zálohují (první záloha může trvat pár minut).",
-    "Confirm your passphrase": "Potvrďte heslo",
-    "Recovery key": "Obnovovací klíč",
-    "Secure your backup with a passphrase": "Zabezpečte si zálohu silným heslem",
-    "Keep it safe": "Bezpečně ho uschovejte",
     "Starting backup...": "Začíná se zálohovat...",
     "Success!": "Úspěch!",
-    "Create Key Backup": "Vyrobit zálohu klíčů",
     "Unable to create key backup": "Nepovedlo se vyrobit zálohů klíčů",
     "Retry": "Zkusit znovu",
     "Set up Secure Messages": "Nastavit bezpečné obnovení zpráv",
@@ -1255,17 +1139,14 @@
     "Encrypted messages in group chats": "Šifrované zprávy ve skupinových konverzacích",
     "Open Devtools": "Otevřít nástroje pro vývojáře",
     "Credits": "Poděkování",
-    "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ": "Už jste na adrese %(host)s použili novější verzi Riotu. Jestli chcete znovu používat tuto verzi i s end-to-end šifrováním, je potřeba se odhlásit a znovu přihlásit. ",
-    "You've previously used Riot 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, Riot needs to resync your account.": "Na adrese %(host)s už jste použili Riot 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í, Riot potřebuje znovu synchronizovat údaje z vašeho účtu.",
-    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Pokud v jiné karťe otevřený jiný Riot, prosím zavřete ji, protože si dvě různé verze můžou navzájem působit problémy.",
-    "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Riot teď používá 3-5× méně paměti, protože si informace o ostatních uživatelích načítá až když je potřebuje. Prosím počkejte na dokončení synchronizace se serverem!",
+    "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.",
+    "%(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 teď používá 3-5× méně paměti, protože si informace o ostatních uživatelích načítá až když je potřebuje. Prosím počkejte na dokončení synchronizace se serverem!",
     "Update status": "Aktualizovat status",
     "Clear status": "Smazat status",
     "Set status": "Nastavit status",
     "Set a new status...": "Nastavit status...",
     "Hide": "Skrýt",
     "This homeserver would like to make sure you are not a robot.": "Domovský server se potřebuje přesvědčit, že nejste robot.",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "Ve vlastním nastavení serveru můžete nastavit použití vlastního domovského serveru. To vám umožní používat tuto aplikaci s existujícím Matrix účtem na jiném serveru.",
     "Please review and accept all of the homeserver's policies": "Pročtěte si a odsouhlaste prosím všechna pravidla domovského serveru",
     "Please review and accept the policies of this homeserver:": "Pročtěte si a odsouhlaste prosím pravidla domovského serveru:",
     "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Zadejte adresu serveru Modular. Můžete použít svou vlastní doménu a nebo subdoménu <a>modular.im</a>.",
@@ -1307,7 +1188,6 @@
     "User %(userId)s is already in the room": "Uživatel %(userId)s už je v této místnosti",
     "The user must be unbanned before they can be invited.": "Uživatel je vykázán, nelze ho pozvat.",
     "Show read receipts sent by other users": "Zobrazovat potvrzení o přijetí",
-    "Order rooms in the room list by most important first instead of most recent": "Seřadit místosti v seznamu podle důležitosti místo podle posledního použití",
     "Scissors": "Nůžky",
     "Accept all %(invitedRooms)s invites": "Přijmout pozvání do všech těchto místností: %(invitedRooms)s",
     "Change room avatar": "Změnit avatar místnosti",
@@ -1328,12 +1208,8 @@
     "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>": "Po zapnutí už nelze šifrování v této místnosti vypnout. Zprávy v šifrovaných místnostech mohou číst jenom členové místnosti, server se k obsahu nedostane. Šifrování místností nepodporuje většina botů a propojení. <a>Více informací o šifrování.</a>",
     "Error updating main address": "Nepovedlo se změnit hlavní adresu",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Nastala chyba při pokusu o nastavení hlavní adresy místnosti. Mohl to zakázat server, nebo to může být dočasná chyba.",
-    "Error creating alias": "Nepovedlo se vyrobit alias",
-    "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "Nastala chyba při pokusu o nastavení aliasu místnosti. Mohl to zakázat server, nebo to může být dočasná chyba.",
-    "Error removing alias": "Nepovedlo se odebrat alias",
-    "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "Nastala chyba při pokusu o odstranění aliasu místnosti. Je možné, že už neexistuje, nebo to může být dočasná chyba.",
     "Power level": "Úroveň oprávně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 Riot to do this": "Abyste po odhlášení nepřišli o přístup k historii šifrovaných konverzací, měli byste si před odhlášením exportovat šifrovací klíče místností. Prosím vraťte se k novější verzi Riotu a exportujte si klíče",
+    "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": "Abyste po odhlášení nepřišli o přístup k historii šifrovaných konverzací, měli byste si před odhlášením exportovat šifrovací klíče místností. Prosím vraťte se k novější verzi %(brand)su a exportujte si klíče",
     "Room Settings - %(roomName)s": "Nastavení místnosti - %(roomName)s",
     "A username can only contain lower case letters, numbers and '=_-./'": "Uživatelské jméno může obsahovat malá písmena, čísla a znaky '=_-./'",
     "Share Permalink": "Sdílet odkaz",
@@ -1341,8 +1217,7 @@
     "Create your Matrix account on %(serverName)s": "Vytvořte si účet Matrix na %(serverName)s",
     "Could not load user profile": "Nepovedlo se načíst profil uživatele",
     "Your Matrix account on %(serverName)s": "Váš účet Matrix na serveru %(serverName)s",
-    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Zda používáte funkci \"breadcrumb\" (ikony nad seznamem místností)",
-    "A conference call could not be started because the integrations server is not available": "Nelze spustit konferenční hovor, protože začleňovací server není dostupný",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Zda používáte funkci „breadcrumb“ (ikony nad seznamem místností)",
     "Replying With Files": "Odpovídání souborem",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Aktuálně nelze odpovědět souborem. Chcete soubor nahrát a poslat bez odpovídání?",
     "The file '%(fileName)s' failed to upload.": "Soubor '%(fileName)s' se nepodařilo nahrát.",
@@ -1451,10 +1326,9 @@
     "Enter username": "Zadejte uživatelské jméno",
     "Some characters not allowed": "Nějaké znaky jsou zakázané",
     "Create your Matrix account on <underlinedServerName />": "Vytvořte si účet Matrix na serveru <underlinedServerName />",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Aby Riot fungoval co nejlépe, nainstalujte si prosím <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, nebo <safariLink>Safari</safariLink>.",
     "Want more than a community? <a>Get your own server</a>": "Chcete víc? <a>Můžete mít vlastní server</a>",
-    "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot nemohl načíst seznam podporovaných protokolů z domovského serveru. Server je možná příliš zastaralý a nepodporuje komunikaci se síti třetích stran.",
-    "Riot failed to get the public room list.": "Riot nemohl načíst seznam veřejných místností.",
+    "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s nemohl načíst seznam podporovaných protokolů z domovského serveru. Server je možná příliš zastaralý a nepodporuje komunikaci se síti třetích stran.",
+    "%(brand)s failed to get the public room list.": "%(brand)s nemohl načíst seznam veřejných místností.",
     "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.",
@@ -1466,7 +1340,6 @@
     "Homeserver URL does not appear to be a valid Matrix homeserver": "Na URL domovského serveru asi není funkční Matrix server",
     "Invalid base_url for m.identity_server": "Neplatná base_url pro m.identity_server",
     "Identity server URL does not appear to be a valid identity server": "Na URL serveru identit asi není funkční Matrix server",
-    "Show recently visited rooms above the room list": "Zobrazovat nedávno navštívené místnosti nad jejich seznamem",
     "Low bandwidth mode": "Mód nízké spotřeby dat",
     "Uploaded sound": "Zvuk nahrán",
     "Sounds": "Zvuky",
@@ -1476,8 +1349,8 @@
     "Browse": "Procházet",
     "Cannot reach homeserver": "Nelze se připojit k domovskému serveru",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Ujistěte se, že máte stabilní internetové připojení. Případně problém řešte se správcem serveru",
-    "Your Riot is misconfigured": "Riot je špatně nakonfigurován",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Požádejte správce vašeho Riotu, aby zkontroloval <a>vaši konfiguraci</a>. Pravděpodobně obsahuje chyby nebo duplicity.",
+    "Your %(brand)s is misconfigured": "%(brand)s je špatně nakonfigurován",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Požádejte správce vašeho %(brand)su, aby zkontroloval <a>vaši konfiguraci</a>. Pravděpodobně obsahuje chyby nebo duplicity.",
     "Unexpected error resolving identity server configuration": "Chyba při hledání konfigurace serveru identity",
     "Use lowercase letters, numbers, dashes and underscores only": "Používejte pouze malá písmena, čísla, pomlčky a podtržítka",
     "Cannot reach identity server": "Nelze se připojit k serveru identity",
@@ -1540,7 +1413,6 @@
     "Removing…": "Odstaňování…",
     "Clear all data": "Smazat všechna data",
     "Please enter a name for the room": "Zadejte prosím název místnosti",
-    "Set a room alias to easily share your room with other people.": "Nastavte alias místnosti, abyste mohli místnost snadno sdílet s ostatními.",
     "This room is private, and can only be joined by invitation.": "Tato místnost je neveřejná a lze do ní vstoupit jen s pozvánkou.",
     "Create a public room": "Vytvořit veřejnou místnost",
     "Create a private room": "Vytvořit neveřejnou místnost",
@@ -1619,10 +1491,10 @@
     "Loading room preview": "Načítání náhdledu místnosti",
     "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Při ověřování pozvánky došlo k chybě (%(errcode)s). Předejte tuto informaci správci místnosti.",
     "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Pozvánka do místnosti %(roomName)s byla poslána na adresu %(email)s, která není k tomuto účtu přidána",
-    "Link this email with your account in Settings to receive invites directly in Riot.": "Přidejte si tento e-mail k účtu v Nastavení, abyste dostávali pozvání přímo v Riotu.",
+    "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Přidejte si tento e-mail k účtu v Nastavení, abyste dostávali pozvání přímo v %(brand)su.",
     "This invite to %(roomName)s was sent to %(email)s": "Pozvánka do %(roomName)s byla odeslána na adresu %(email)s",
-    "Use an identity server in Settings to receive invites directly in Riot.": "Používat server identit z nastavení k přijímání pozvánek přímo v Riotu.",
-    "Share this email in Settings to receive invites directly in Riot.": "Sdílet tento e-mail v nastavení, abyste mohli dostávat pozvánky přímo v Riotu.",
+    "Use an identity server in Settings to receive invites directly in %(brand)s.": "Používat server identit z nastavení k přijímání pozvánek přímo v %(brand)su.",
+    "Share this email in Settings to receive invites directly in %(brand)s.": "Sdílet tento e-mail v nastavení, abyste mohli dostávat pozvánky přímo v %(brand)su.",
     "%(count)s unread messages including mentions.|other": "%(count)s nepřečtených zpráv a zmínek.",
     "%(count)s unread messages including mentions.|one": "Nepřečtená zmínka.",
     "%(count)s unread messages.|other": "%(count)s nepřečtených zpráv.",
@@ -1662,11 +1534,7 @@
     "%(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",
-    "Room alias": "Alias místnosti",
     "e.g. my-room": "např. moje-mistnost",
-    "Please provide a room alias": "Zadejte prosím alias místnosti",
-    "This alias is available to use": "Tento alias je volný",
-    "This alias is already in use": "Tento alias už je používán",
     "Use bots, bridges, widgets and sticker packs": "Použít roboty, propojení, widgety a balíky samolepek",
     "Terms of Service": "Podmínky použití",
     "To continue you need to accept the terms of this service.": "Musíte souhlasit s podmínkami použití, abychom mohli pokračovat.",
@@ -1742,8 +1610,7 @@
     "%(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",
-    "Try out new ways to ignore people (experimental)": "Vyzkošejte nové metody ignorování lidí (experimentální)",
-    "Enable local event indexing and E2EE search (requires restart)": "Povolit lokální indexování a vyhledávání v end-to-end šifrovaných zprávách (vyžaduje restart)",
+    "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",
     "This is your list of users/servers you have blocked - don't leave the room!": "Toto je váš seznam blokovaných uživatelů/serverů - neopouštějte tuto místnost!",
@@ -1761,7 +1628,6 @@
     "Error adding ignored user/server": "Chyba při přidávání ignorovaného uživatele/serveru",
     "Something went wrong. Please try again or view your console for hints.": "Něco se nepovedlo. Zkuste pro prosím znovu nebo se podívejte na detaily do konzole.",
     "Error subscribing to list": "Nepovedlo se založit odběr",
-    "Please verify the room ID or alias and try again.": "Zkontrolujte prosím ID místnosti a zkuste to znovu.",
     "Error removing ignored user/server": "Ignorovaný uživatel/server nejde odebrat",
     "Error unsubscribing from list": "Nepovedlo se zrušit odběr",
     "Please try again or view your console for hints.": "Zkuste to prosím znovu a nebo se podívejte na detailní chybu do konzole.",
@@ -1776,14 +1642,12 @@
     "View rules": "Zobrazit pravidla",
     "You are currently subscribed to:": "Odebíráte:",
     "⚠ These settings are meant for advanced users.": "⚠ Tato nastavení jsou pro pokročilé uživatele.",
-    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Sem přidejte uživatele a servery, které chcete ignorovat. Můžete použít hvězdičku místo libovolných znaků. Například pravidlo <code>@bot:*</code> zablokuje všechny uživatele se jménem 'bot' na libovolném serveru.",
     "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.": "Lidé a servery jsou blokováni pomocí seznamů obsahující pravidla koho blokovat. Odebírání blokovacího seznamu znamená, že neuvidíte uživatele a servery na něm uvedené.",
     "Personal ban list": "Osobní seznam blokací",
     "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.": "Váš osobní seznam blokací obsahuje všechny uživatele a servery, které nechcete vidět. Po ignorování prvního uživatele/serveru se vytvoří nová místnost 'Můj seznam blokací' - zůstaňte v ní, aby seznam platil.",
     "Server or user ID to ignore": "Server nebo ID uživatele",
     "eg: @bot:* or example.org": "např.: @bot:* nebo example.org",
     "Subscribed lists": "Odebírané seznamy",
-    "Room ID or alias of ban list": "ID místnosti nebo alias seznamu blokování",
     "Subscribe": "Odebírat",
     "This message cannot be decrypted": "Zprávu nelze rozšifrovat",
     "Unencrypted": "Nešifrované",
@@ -1805,7 +1669,7 @@
     "Your avatar URL": "URL vašeho avataru",
     "Your user ID": "Vaše ID",
     "Your theme": "Váš motiv vzhledu",
-    "Riot URL": "URL Riotu",
+    "%(brand)s URL": "URL %(brand)su",
     "Room ID": "ID místnosti",
     "Widget ID": "ID widgetu",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Použití tohoto widgetu může sdílet data <helpIcon /> s %(widgetDomain)s a vaším správcem integrací.",
@@ -1817,21 +1681,14 @@
     "Integrations are disabled": "Integrace jsou zakázané",
     "Enable 'Manage Integrations' in Settings to do this.": "Pro provedení této akce povolte v nastavení správu integrací.",
     "Integrations not allowed": "Integrace nejsou povolené",
-    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Váš Riot neumožňuje použít správce integrací. Kontaktujte prosím správce.",
+    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Váš %(brand)s neumožňuje použít správce integrací. Kontaktujte prosím správce.",
     "Automatically invite users": "Automaticky zvát uživatele",
     "Upgrade private room": "Upgradovat soukromou místnost",
     "Upgrade public room": "Upgradovat veřejnou místnost",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Upgradování místnosti je pokročilá operace a je doporučeno jí provést pokud je místnost nestabilní kvůli chybám, chybějícím funkcím nebo zranitelnostem.",
-    "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Toto běžně ovlivňuje pouze zpracovávání místnosti na serveru. Pokud máte problém s Riotem, <a>nahlaste nám ho prosím</a>.",
+    "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>.": "Toto běžně ovlivňuje pouze zpracovávání místnosti na serveru. Pokud máte problém s %(brand)sem, <a>nahlaste nám ho prosím</a>.",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Upgradujeme tuto místnost z <oldVersion /> na <newVersion />.",
     "Upgrade": "Upgradovat",
-    "Enter secret storage passphrase": "Zadejte tajné heslo k bezpečnému úložišti",
-    "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Nepovedlo se přistoupit k bezpečnému úložišti. Zkontrolujte prosím, že je zadané správné heslo.",
-    "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Varování</b>: Přistupujte k bezpečnému úložišti pouze z důvěryhodných počítačů.",
-    "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Pokud si nepamatujete heslo, můžete použít <button1>svůj obnovovací klíč</button1> nebo <button2>si nastavte nové možnosti obnovení</button2>.",
-    "Enter secret storage recovery key": "Zadejte klíč k bezpečnému úložišti",
-    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Nepovedlo se dostat k bezpečnému úložišti. Ověřte prosím, že je zadaný správný klíč.",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "Pokud si nepamatujete obnovovací klíč, můžete si <button>nastavit nové možnosti obnovení</button>.",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Varování</b>: Nastavujte zálohu jen z důvěryhodných počítačů.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Pokud si nepamatujete obnovovací klíč, můžete si <button>nastavit nové možnosti obnovení</button>",
     "Notification settings": "Nastavení oznámení",
@@ -1841,14 +1698,9 @@
     "Remove for me": "Odstranit (jen pro mě)",
     "User Status": "Stav uživatele",
     "Verification Request": "Požadavek na ověření",
-    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
     "Set up with a recovery key": "Nastavit obnovovací klíč",
-    "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "Můžete jej použít jako záchranou síť na obnovení šifrovaných zpráv když zapomenete heslo.",
-    "As a safety net, you can use it to restore your access to encrypted messages.": "Můžete jej použít jako záchranou síť na obnovení šifrovaných zpráv.",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "Uschovejte svůj klíč na velmi bezpečném místě, například ve správci hesel (nebo v trezoru).",
     "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Váš obnovovací klíč byl <b>zkopírován do schránky</b>, vložte jej:",
     "Your recovery key is in your <b>Downloads</b> folder.": "Váš obnovovací klíč je ve složce <b>Stažené</b>.",
-    "Storing secrets...": "Ukládám tajná data...",
     "Unable to set up secret storage": "Nepovedlo se nastavit bezpečné úložiště",
     "The message you are trying to send is too large.": "Zpráva kterou se snažíte odeslat je příliš velká.",
     "not found": "nenalezeno",
@@ -1862,20 +1714,15 @@
     "Language Dropdown": "Menu jazyků",
     "Help": "Pomoc",
     "Country Dropdown": "Menu států",
-    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "V místnosti jsou neověřené relace: pokud budete pokračovat bez ověření, bude možné váš hovor odposlouchávat.",
     "Verify this session": "Ověřit tuto relaci",
     "Encryption upgrade available": "Je dostupná aktualizace šifrování",
     "Set up encryption": "Nastavit šifrování",
-    "Unverified session": "Neověřená relace",
     "Verifies a user, session, and pubkey tuple": "Ověří uživatele, relaci a veřejné klíče",
     "Unknown (user, session) pair:": "Neznámý pár (uživatel, relace):",
     "Session already verified!": "Relace je už ověřená!",
     "WARNING: Session already verified, but keys do NOT MATCH!": "VAROVÁNÍ: Relace je už ověřená, ale klíče NEODPOVÍDAJÍ!",
-    "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!": "VAROVÁNÍ: OVĚŘENÍ KLÍČŮ SELHALO! Podpisový klíč pro uživatele %(userId)s a relaci %(deviceId)s je \"%(fprint)s\", což neodpovídá klíči \"%(fingerprint)s\". Může to znamenat, že je vaše komunikace rušena!",
+    "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!": "VAROVÁNÍ: OVĚŘENÍ KLÍČŮ SELHALO! Podpisový klíč pro uživatele %(userId)s a relaci %(deviceId)s je „%(fprint)s“, což neodpovídá klíči „%(fingerprint)s“. Může to znamenat, že je vaše komunikace rušena!",
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Zadaný podpisový klíč odpovídá klíči relace %(deviceId)s od uživatele %(userId)s. Relace byla označena za platnou.",
-    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "Uživatel %(senderName)s přidal této místnosti adresu %(addedAddresses)s a %(count)s dalších",
-    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "Uživatel %(senderName)s odstranil této místnosti adresu %(removedAddresses)s a %(count)s dalších",
-    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "Uživatel %(senderName)s odstranil této místnosti %(countRemoved)s adres a přidal %(countAdded)s adres",
     "a few seconds ago": "před pár vteřinami",
     "about a minute ago": "před minutou",
     "%(num)s minutes ago": "před %(num)s minutami",
@@ -1890,17 +1737,11 @@
     "%(num)s hours from now": "za %(num)s hodin",
     "about a day from now": "asi za den",
     "%(num)s days from now": "za %(num)s dní",
-    "Show a presence dot next to DMs in the room list": "V seznamu místností zobrazovat informaci o přítomnosti",
-    "Enable cross-signing to verify per-user instead of per-session (in development)": "Povolit cross-signing pro ověření uživatelů místo zařízení (experimentální)",
     "Show info about bridges in room settings": "Zobrazovat v nastavení místnosti informace o propojeních",
-    "Show padlocks on invite only rooms": "Zobrazovat zámek u místností vyžadujících pozvání",
     "Never send encrypted messages to unverified sessions from this session": "Nikdy neposílat šifrované zprávy neověřených zařízením",
     "Never send encrypted messages to unverified sessions in this room from this session": "Nikdy v této místnosti neposílat šifrované zprávy neověřeným relacím",
     "Enable message search in encrypted rooms": "Povolit vyhledávání v šifrovaných místnostech",
-    "Keep secret storage passphrase in memory for this session": "Pro toto přihlášení si uchovat heslo k bezpečnému úložišti",
     "How fast should messages be downloaded.": "Jak rychle se mají zprávy stahovat.",
-    "Confirm the emoji below are displayed on both devices, in the same order:": "Ověřte, že jsou následující emoji zobrazeny na obou zařízeních ve stejném pořadí:",
-    "Verify this device by confirming the following number appears on its screen.": "Ověřit zařízení potvrzením, že jsou následující čísla zobrazena na jeho obrazovce.",
     "Waiting for %(displayName)s to verify…": "Čekám až nás %(displayName)s ověří…",
     "They match": "Odpovídají",
     "They don't match": "Neodpovídají",
@@ -1937,7 +1778,6 @@
     "Manage": "Spravovat",
     "Securely cache encrypted messages locally for them to appear in search results.": "Bezpečně uchovávat zprávy na tomto zařízení aby se v nich dalo vyhledávat.",
     "Enable": "Povolit",
-    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot neumí bezpečně uchovávat zprávy když běží v prohlížeči. Pokud chcete vyhledávat v šifrovaných zprávách, použijte <riotLink>Riot Desktop</riotLink>.",
     "This session is backing up your keys. ": "Tato relace zálohuje vaše klíče. ",
     "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.": "Tato relace <b>nezálohuje vaše klíče</b>, ale už máte zálohu ze které je můžete obnovit.",
     "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Než se odhlásíte, připojte tuto relaci k záloze klíčů, abyste nepřišli o klíče, které mohou být jen v této relaci.",
@@ -1952,7 +1792,6 @@
     "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Záloha má <validity>neplatný</validity> podpis z <verify>neověřené</verify> relace <device></device>",
     "Backup is not signed by any of your sessions": "Záloha nemá podpis z žádné vaší relace",
     "This backup is trusted because it has been restored on this session": "Záloze věříme, protože už byla v této relaci načtena",
-    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Zálohovací klíč je uložen v bezpečném úložišti, ale jeho načtení není v této relaci povolené. Zapněte prosím cross-signing v Experimentálních funkcích abyste mohli modifikovat stav zálohy.",
     "Backup key stored: ": "Zálohovací klíč je uložen: ",
     "Your keys are <b>not being backed up from this session</b>.": "Vaše klíče <b>nejsou z této relace zálohovány</b>.",
     "Enable desktop notifications for this session": "Povolit v této relaci oznámení",
@@ -1962,7 +1801,6 @@
     "Session key:": "Klíč relace:",
     "Message search": "Vyhledávání ve zprávách",
     "Cross-signing": "Cross-signing",
-    "Sessions": "Relace",
     "A session's public name is visible to people you communicate with": "Lidé, se kterými komunikujete, mohou veřejný název zobrazit",
     "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>",
@@ -1973,10 +1811,6 @@
     "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",
     "Everyone in this room is verified": "V této místnosti jsou všichni ověřeni",
-    "Some sessions for this user are not trusted": "Některé relace tohoto uživatele jsou nedůvěryhodné",
-    "All sessions for this user are trusted": "Všem relacím tohoto uživatele věříme",
-    "Some sessions in this encrypted room are not trusted": "Některé relace v této místnosti jsou nedůvěryhodné",
-    "All sessions in this encrypted room are trusted": "Všem relacím v této místosti věříme",
     "Mod": "Moderátor",
     "Your key share request has been sent - please check your other sessions for key share requests.": "Požadavek na sdílení klíčů byl odeslán - podívejte se prosím na své ostatní relace, jestli vám přišel.",
     "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.": "Požadavky na sdílení klíčů jsou vašim ostatním relacím odesílány automaticky. Pokud jste nějaký zamítli nebo ignorovali, tímto tlačítkem si ho můžete poslat znovu.",
@@ -1985,7 +1819,6 @@
     "Encrypted by an unverified session": "Šifrované neověřenou relací",
     "Encrypted by a deleted session": "Šifrované smazanou relací",
     "Invite only": "Pouze na pozvání",
-    "No sessions with registered encryption keys": "Žádné relace se šifrovacími klíči",
     "Send a reply…": "Odpovědět…",
     "Send a message…": "Napsat zprávu…",
     "Direct Messages": "Přímé zprávy",
@@ -2015,8 +1848,6 @@
     "If you can't scan the code above, verify by comparing unique emoji.": "Pokud vám skenování kódů nefunguje, ověřte se porovnáním emoji.",
     "You've successfully verified %(displayName)s!": "Úspěšně jste ověřili uživatele %(displayName)s!",
     "Got it": "Dobře",
-    "Verification timed out. Start verification again from their profile.": "Čas na ověření vypršel. Začněte znovu z druhého profilu.",
-    "%(displayName)s cancelled verification. Start verification again from their profile.": "Uživatel %(displayName)s zrušil ověření. Spustit ho můžete znovu z jeho profilu.",
     "Encryption enabled": "Šifrování je zapnuté",
     "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Zprávy v této místnosti jsou šifrované end-to-end. Více informací a možnost ověření uživatele najdete v jeho profilu.",
     "Encryption not enabled": "Šifrování je vypnuté",
@@ -2024,11 +1855,8 @@
     "Clear all data in this session?": "Smazat všechna data v této relaci?",
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Výmaz všech dat v relaci je nevratný. Pokud nemáte zálohované šifrovací klíče, přijdete o šifrované zprávy.",
     "Verify session": "Ověřit relaci",
-    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Abychom ověřili, že je relace důvěryhodná, zkontrolujte prosím, že klíč v uživatelském nastavení na tom zařízení odpovídá následujícímu klíči:",
-    "To verify that this session can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this session matches the key below:": "Abychom ověřili, že tato relace je důvěryhodná, kontaktujte prosím jejího vlastníka nějakým dalším způsobem (osobně, telefonicky, apod.). Zkontrolujte spolu, že klíč v uživatelském nastavení na druhém zařízení odpovídá následujícímu klíči:",
     "Session name": "Název relace",
     "Session key": "Klíč relace",
-    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "Pokud odpovídá, zmáčkněte tlačítko ověřit. Pokud ne, druhé zařízení je pravděpodobně falešné a chcete ho zablokovat.",
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Ověření uživatele označí jeho relace za důvěryhodné a vaše relace budou důvěryhodné pro něj.",
     "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.": "Ověření zařízení ho označí za důvěryhodné. Ověření konkrétního zařízení vám dát trochu klidu mysli navíc při používání šifrovaných zpráv.",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Ověření zařízení ho označí za důvěryhodné a uživatelé, kteří věří vám budou také tomuto zařízení důvěřovat.",
@@ -2041,33 +1869,17 @@
     "Recent Conversations": "Nedávné konverzace",
     "Suggestions": "Návrhy",
     "Recently Direct Messaged": "Nedávno kontaktovaní",
-    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Pokud nemůžete někoho najít, zeptejte se na uživatelské jméno, pošlete jim svoje (%(userId)s) a nebo pošlete <a>odkaz na svůj profil</a>.",
     "Go": "Ok",
-    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Pokud nemůžete někoho najít, zeptejte se na uživatelské jméno (např. @uzivatel:example.com) a nebo pošlete <a>odkaz na tuto místnost</a>.",
-    "You added a new session '%(displayName)s', which is requesting encryption keys.": "Přidali jste novou relaci '%(displayName)s', která požaduje šifrovací klíče.",
-    "Your unverified session '%(displayName)s' is requesting encryption keys.": "Vaše neověřená relace '%(displayName)s' požaduje šifrovací klíče.",
-    "Loading session info...": "Načítám informace o relaci...",
     "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 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.",
-    "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "Máte zakázané posílání zpráv neověřeným relacím; abyste mohli zprávu odeslat, musíte je ověřit.",
-    "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Doporučujeme projít ověřovací proces pro každou relaci abyste ověřili, že patří tomu, komu očekáváte. Můžete ale poslat zprávu i bez ověření, pokud chcete.",
-    "Room contains unknown sessions": "V místnosti jsou neověřené relace",
-    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "V místnosti \"%(RoomName)s\" jsou relace, které jste ještě nikdy neviděli.",
-    "Unknown sessions": "Neznámá relace",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "Zadejte svoje heslo a získejte přístup k bezpečnému úložišti historie zpráv a k identitě pro cross-signing pro snadné ověřování vašich relací.",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Zadejte svůj obnovovací klíč a získejte přístup k bezpečnému úložišti historie zpráv a k identitě pro cross-signing pro snadné ověřování vašich relací.",
     "Recovery key mismatch": "Obnovovací klíč neodpovídá",
     "Incorrect recovery passphrase": "Nesprávné heslo pro obnovení",
-    "Backup restored": "Záloha byla nahrána",
     "Enter recovery passphrase": "Zadejte heslo pro obnovení zálohy",
     "Enter recovery key": "Zadejte obnovovací klíč",
     "Confirm your identity by entering your account password below.": "Potvrďte svou identitu zadáním hesla ke svému účtu.",
-    "Message not sent due to unknown sessions being present": "Zpráva nebyla odeslána, protože jsou v místnosti neznámé relace",
-    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Zobrazit relace</showSessionsText>, <sendAnywayText>i tak odeslat</sendAnywayText>, a nebo  <cancelText>zrušit</cancelText>.",
-    "Verify this session to grant it access to encrypted messages.": "Ověřte relaci, aby získala přístup k šifrovaným zprávám.",
     "Start": "Začít",
     "Session verified": "Relace je ověřena",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Vaše nová relace je teď ověřená. Má přístup k šifrovaným zprávám a ostatní uživatelé jí budou věřit.",
@@ -2079,35 +1891,26 @@
     "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.": "Všude jsme vás odhlásili, takže nedostáváte žádná oznámení. Můžete je znovu povolit tím, že se na všech svých zařízeních znovu přihlásíte.",
     "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.": "Získejte znovu přístup k účtu a obnovte si šifrovací klíče uložené v této relaci. Bez nich nebudete schopni číst zabezpečené zprávy na některých zařízeních.",
     "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.",
-    "Sender session information": "Informace o relaci odesílatele",
     "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.",
-    "If you cancel now, you won't complete your secret storage operation.": "Pokud teď proces zrušíte, tak se nedokončí operace s bezpečným úložištěm.",
     "Cancel entering passphrase?": "Zrušit zadávání hesla?",
     "Setting up keys": "Příprava klíčů",
-    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Riotu 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í Riot Desktop s <nativeLink>přidanými komponentami</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)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!",
     "If this isn't what you want, please use a different tool to ignore users.": "Pokud to nechcete, tak prosím použijte jiný nástroj na blokování uživatelů.",
-    "You cancelled verification. Start verification again from their profile.": "Zrušili jste ověření. Můžete začít znovu z druhého profilu.",
-    "Complete security": "Dokončení ověření",
     "Restore your key backup to upgrade your encryption": "Pro aktualizaci šifrování obnovte klíče ze zálohy",
     "Restore": "Obnovit",
     "Enter your account password to confirm the upgrade:": "Potvrďte, že chcete aktualizaci provést zadáním svého uživatelského hesla:",
     "You'll need to authenticate with the server to confirm the upgrade.": "Server si vás potřebuje ověřit, abychom mohli provést aktualizaci.",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Aktualizujte tuto přihlášenou relaci abyste mohli ověřovat ostatní relace. Tím jim dáte přístup k šifrovaným konverzacím a ostatní uživatelé je jim budou automaticky věřit.",
-    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Zapněte v této přihlášené relaci šifrování abyste mohli ověřovat ostatní relace. Tím jim dáte přístup k šifrovaným konverzacím a ostatní uživatelé je jim budou automaticky věřit.",
-    "Show typing notifications": "Zobrazovat oznámení \"... právě píše...\"",
+    "Show typing notifications": "Zobrazovat oznámení „... právě píše...“",
     "Reset cross-signing and secret storage": "Obnovit bezpečné úložiště a cross-signing",
     "Destroy cross-signing keys?": "Nenávratně smazat klíče pro cross-signing?",
     "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.": "Smazání klíčů pro cross-signing je definitivní. Každý, kdo vás ověřil, teď uvidí bezpečnostní varování. Pokud jste zrovna neztratili všechna zařízení, ze kterých se můžete ověřit, tak to asi nechcete udělat.",
     "Clear cross-signing keys": "Smazat klíče pro cross-signing",
-    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Zabezpečte si šifrovací klíče silným heslem. Pro lepší bezpečnost by mělo být jiné než vaše heslo k přihlášení:",
-    "Enter a passphrase": "Zadejte heslo",
-    "The version of Riot": "Verze Riotu",
-    "Whether you're using Riot on a device where touch is the primary input mechanism": "Zda používáte Riot na dotykovém zařízení",
-    "Whether you're using Riot as an installed Progressive Web App": "Zda používáte Riot jako nainstalovanou Progresivní Webovou Aplikaci",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Zda používáte %(brand)s na dotykovém zařízení",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Zda používáte %(brand)s jako nainstalovanou Progresivní Webovou Aplikaci",
     "Your user agent": "Identifikace vašeho prohlížeče",
-    "The information being sent to us to help make Riot better includes:": "Abychom mohli Riot zlepšovat, posíláme si následující informace:",
     "Verify this session by completing one of the following:": "Ověřte tuto relaci dokončením jednoho z následujících:",
     "Scan this unique code": "Naskenujte tento jedinečný kód",
     "or": "nebo",
@@ -2116,22 +1919,15 @@
     "Not Trusted": "Nedůvěryhodné",
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) se přihlásil do nové relace a neověřil ji:",
     "Ask this user to verify their session, or manually verify it below.": "Poproste tohoto uživatele aby svojí relaci ověřil a nebo jí níže můžete ověřit manuálně.",
-    "Manually Verify": "Ověřit manuálně",
-    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot 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 Riot podporuje. Zkuste použít jiného klienta.",
+    "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",
-    "accepting …": "přijímání …",
-    "declining …": "odmítání …",
-    "Back up my encryption keys, securing them with the same passphrase": "Zazálohovat šifrovací klíče zabezpečené tím stejným heslem",
-    "Enter your passphrase a second time to confirm it.": "Pro ověření zadejte své heslo podruhé.",
     "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",
-    "You can now verify your other devices, and other users to keep your chats safe.": "Teď můžete ověřit své ostatní zařízení a další uživatelé, aby vaše komunikace byla bezpečná.",
     "Upgrade your encryption": "Aktualizovat šifrování",
     "Make a copy of your recovery key": "Vytvořit kopii svého obnovovacího klíče",
-    "You're done!": "Hotovo!",
     "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.": "Bez nastavení Bezpečného Obnovení Zpráv nebudete moci obnovit historii šifrovaných zpráv pokud se odhlásíte nebo použijete jinou relaci.",
     "Create key backup": "Vytvořit zálohu klíčů",
     "This session is encrypting history using the new recovery method.": "Tato relace šifruje historii zpráv s podporou nového způsobu obnovení.",
@@ -2139,18 +1935,15 @@
     "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.": "Pokud se vám to stalo neúmyslně, můžete znovu nastavit zálohu zpráv pro tuto relaci. To znovu zašifruje historii zpráv novým způsobem.",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Když je to zakázané, zprávy v šifrovaných místnostech se nebudou objevovat ve výsledcích vyhledávání.",
     "Disable": "Zakázat",
-    "Not currently downloading messages for any room.": "Aktuálně se nestahují žádné zprávy.",
-    "Downloading mesages for %(currentRoom)s.": "Stahují se zprávy pro %(currentRoom)s.",
-    "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot si bezpečně uchovává šifrované zprávy lokálně, aby v nich mohl vyhledávat:",
+    "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s si bezpečně uchovává šifrované zprávy lokálně, aby v nich mohl vyhledávat:",
     "Space used:": "Použitý prostor:",
     "Indexed messages:": "Indexované zprávy:",
     "Indexed rooms:": "Indexované místnosti:",
-    "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s z %(totalRooms)s",
     "Message downloading sleep time(ms)": "Čas na stažení zprávy (ms)",
     "Sign In or Create Account": "Přihlásit nebo vytvořit nový účet",
     "Use your account or create a new one to continue.": "Pro pokračování se přihlaste existujícím účtem, nebo si vytvořte nový.",
     "Create Account": "Vytvořit účet",
-    "Order rooms by name": "Seřadit místnosti podle názvz",
+    "Order rooms by name": "Seřadit místnosti podle názvu",
     "Show rooms with unread notifications first": "Zobrazovat místnosti s nepřečtenými oznámeními navrchu",
     "Show shortcuts to recently viewed rooms above the room list": "Zobrazovat zkratky do nedávno zobrazených místností navrchu",
     "Cancelling…": "Rušení…",
@@ -2169,10 +1962,7 @@
     "Displays information about a user": "Zobrazuje informace o uživateli",
     "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.",
-    "Currently indexing: %(currentRoom)s.": "Aktuálně indexujeme: %(currentRoom)s.",
     "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s z %(totalRooms)s",
-    "Review Sessions": "Prověřit relace",
-    "Unverified login. Was this you?": "Neověřené přihlášeni. Jste to vy?",
     "%(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.",
@@ -2185,12 +1975,8 @@
     "Interactively verify by Emoji": "Interaktivní ověření s emotikonami",
     "Support adding custom themes": "Umožnit přidání vlastního vzhledu",
     "Manually verify all remote sessions": "Manuálně ověřit všechny relace",
-    "Update your secure storage": "Aktualizovat vaše bezpečné úložistě",
     "cached locally": "uložen lokálně",
     "not found locally": "nenalezen lolálně",
-    "Secret Storage key format:": "Formát klíče Bezpečného Úložistě:",
-    "outdated": "zastaralý",
-    "up to date": "aktuální",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Individuálně ověřit každou uživatelovu relaci a označit jí za důvěryhodnou, bez důvěry v cross-signing.",
     "Invalid theme schema.": "Neplatné schéma vzhledu.",
     "Error downloading theme information.": "Nepovedlo se stáhnout informace o vzhledu.",
@@ -2200,7 +1986,6 @@
     "Keyboard Shortcuts": "Klávesové zkratky",
     "Scroll to most recent messages": "Přejít na poslední zprávy",
     "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Nepovedlo se změnit alternativní adresy místnosti. Možná to server neumožňuje a nebo je to dočasná chyba.",
-    "You don't have permission to delete the alias.": "Nemáte oprávnění odebrat alias.",
     "Local address": "Lokální adresa",
     "Published Addresses": "Publikovaná adresa",
     "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.": "Publikovaná adresa může být použíta kýmkoli na libovolném serveru pro přidání se do místnosti. Abyste mohli adresu publikovat, musí být nejdříve nastavená jako lokální.",
@@ -2237,5 +2022,147 @@
     "Waiting for you to accept on your other session…": "Čekáme na vaše přijetí v druhé relaci…",
     "Almost there! Is your other session showing the same shield?": "Téměř hotovo! Je vaše druhá relace také ověřená?",
     "Almost there! Is %(displayName)s showing the same shield?": "Téměř hotovo! Je relace %(displayName)s také ověřená?",
-    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Ověřili jste %(deviceName)s (%(deviceId)s)!"
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Ověřili jste %(deviceName)s (%(deviceId)s)!",
+    "If you cancel now, you won't complete your operation.": "Pokud teď akci stornujete, nebudete jí moci dokončit.",
+    "Review where you’re logged in": "Zobrazit kde jste přihlášení",
+    "New login. Was this you?": "Nové přihlášní. Jste to vy?",
+    "%(name)s is requesting verification": "%(name)s žádá o ověření",
+    "Failed to set topic": "Nepovedlo se nastavit téma",
+    "Command failed": "Příkaz selhal",
+    "Could not find user in room": "Nepovedlo se najít uživatele v místnosti",
+    "Please supply a widget URL or embed code": "Zadejte prosím URL widgetu nebo jeho kód",
+    "Send a bug report with logs": "Zaslat hlášení o chybě",
+    "You signed in to a new session without verifying it:": "Přihlásili jste se do nové relace, ale neoveřili jste ji:",
+    "Verify your other session using one of the options below.": "Ověřte ostatní relací jedním z následujících způsobů.",
+    "Click the button below to confirm deleting these sessions.|other": "Zmáčknutím tlačítka potvrdíte smazání těchto relací.",
+    "Click the button below to confirm deleting these sessions.|one": "Zmáčknutím tlačítka potvrdíte smazání této relace.",
+    "Delete sessions|other": "Smazat relace",
+    "Delete sessions|one": "Smazat relaci",
+    "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.",
+    "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í.",
+    "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",
+    "Can't load this message": "Tuto zprávu nelze načíst",
+    "Submit logs": "Odeslat záznamy o chybě",
+    "Looks good": "To vypadá dobře",
+    "Can't find this server or its room list": "Server nebo jeho seznam místností se nepovedlo nalézt",
+    "All rooms": "Všechny místnosti",
+    "Your server": "Váš server",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "Opravdu chcete odstranit <b>%(serverName)s</b>",
+    "Remove server": "Odstranit server",
+    "Matrix": "Matrix",
+    "Add a new server": "Přidat nový server",
+    "Enter the name of a new server you want to explore.": "Zadejte jméno serveru, který si chcete prohlédnout.",
+    "Server name": "Jméno serveru",
+    "Add a new server...": "Přidat nový server...",
+    "%(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.",
+    "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í.",
+    "Are you sure you want to deactivate your account? This is irreversible.": "Opravdu chcete deaktivovat účet? Je to nevratné.",
+    "Confirm account deactivation": "Potvrďte deaktivaci účtu",
+    "There was a problem communicating with the server. Please try again.": "Došlo k potížím při komunikaci se serverem. Zkuste to prosím znovu.",
+    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Začněte s někým konverzovat za pomocí jména, přihlašovacího jména (jako <userId/>) nebo emailu.",
+    "Opens chat with the given user": "Otevře konverzaci s tímto uživatelem",
+    "Sends a message to the given user": "Pošle zprávu danému uživateli",
+    "Waiting for your other session to verify…": "Čekáme na ověření od vaší druhé relace…",
+    "Verify all your sessions to ensure your account & messages are safe": "Ověřte všechny své relace, abyste zaručili, že jsou vaše zprávy a účet bezpečné",
+    "Verify the new login accessing your account: %(name)s": "Ověřte nové přihlášení na váš účet: %(name)s",
+    "Room name or address": "Jméno nebo adresa místnosti",
+    "Joins room with given address": "Přidat se do místnosti s danou adresou",
+    "Unrecognised room address:": "Nerozpoznaná adresa místnosti:",
+    "Font size": "Velikost písma",
+    "IRC display name width": "šířka zobrazovného IRC jména",
+    "unexpected type": "neočekávaný typ",
+    "Session backup key:": "Klíč k záloze relace:",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Pomocí Jednotného přihlášení potvrdit odstranění těchto relací.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Pomocí Jednotného přihlášení potvrdit odstranění této relace.",
+    "Size must be a number": "Velikost musí být číslo",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "Vlastní velikost písma může být pouze mezi %(min)s pt a %(max)s pt",
+    "Use between %(min)s pt and %(max)s pt": "Použijte velikost mezi %(min)s pt a %(max)s pt",
+    "Appearance": "Vzhled",
+    "Please verify the room ID or address and try again.": "Ověřte prosím, že ID místnosti je správné a zkuste to znovu.",
+    "Room ID or address of ban list": "ID nebo adresa seznamu zablokovaných",
+    "Help us improve %(brand)s": "Pomozte nám zlepšovat %(brand)s",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Zasílat <UsageDataLink>anonymní data o použití aplikace</UsageDataLink>, která nám pomáhají %(brand)s zlepšovat. Bedeme na to používat <PolicyLink>soubory cookie</PolicyLink>.",
+    "I want to help": "Chci pomoci",
+    "Your homeserver has exceeded its user limit.": "Na vašem domovském serveru byl překročen limit počtu uživatelů.",
+    "Your homeserver has exceeded one of its resource limits.": "Na vašem domovském serveru byl překročen limit systémových požadavků.",
+    "Contact your <a>server admin</a>.": "Kontaktujte <a>administrátora serveru</a>.",
+    "Ok": "Ok",
+    "Set password": "Nastavit heslo",
+    "To return to your account in future you need to set a password": "Abyste se k účtu mohli v budoucnu vrátit, je potřeba nastavit heslo",
+    "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?",
+    "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",
+    "Light": "Světlý",
+    "Dark": "Tmavý",
+    "You joined the call": "Připojili jste se k hovoru",
+    "%(senderName)s joined the call": "%(senderName)s se připojil k hovoru",
+    "Call in progress": "Probíhá hovor",
+    "Show rooms with unread messages first": "Zobrazovat místnosti s nepřečtenými zprávami jako první",
+    "Show previews of messages": "Zobrazovat náhledy zpráv",
+    "Sort by": "Řadit dle",
+    "Activity": "Aktivity",
+    "A-Z": "A–Z",
+    "List options": "Možnosti seznamu",
+    "Show %(count)s more|other": "Zobrazit %(count)s dalších",
+    "Show %(count)s more|one": "Zobrazit %(count)s další",
+    "Use default": "Použít výchozí",
+    "Mentions & Keywords": "Zmínky a klíčová slova",
+    "Notification options": "Možnosti oznámení",
+    "Favourited": "Oblíbená",
+    "Leave Room": "Opustit místnost",
+    "Forget Room": "Zapomenout místnost",
+    "Room options": "Možnosti místnosti",
+    "This room is public": "Tato místnost je veřejná",
+    "Away": "Pryč",
+    "Error creating address": "Chyba při tvorbě adresy",
+    "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "Při vytváření adresy došlo k chybě. Mohl to zakázat server, nebo mohlo dojít k dočasnému selhání.",
+    "You don't have permission to delete the address.": "Nemáte oprávnění adresu smazat.",
+    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Při odstraňování adresy došlo k chybě. Adresa již nemusí ekzistovat, nebo mohlo dojít k dočasné chybě.",
+    "Error removing address": "Chyba při odstraňování adresy",
+    "Message deleted on %(date)s": "Zpráva byla odstraněna %(date)s",
+    "Edited at %(date)s": "Upraveno %(date)s",
+    "Click to view edits": "Klikněte pro zobrazení úprav",
+    "Categories": "Kategorie",
+    "QR Code": "QR kód",
+    "Room address": "Adresa místnosti",
+    "Please provide a room address": "Zadejte prosím adresu místnosti",
+    "This address is available to use": "Tato adresa je dostupná",
+    "This address is already in use": "Tato adresa je již používána",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Připomínka: váš prohlížeč není podporován, takže vaše zkušenost může být nepředvídatelná.",
+    "Set a room address to easily share your room with other people.": "Nastavte adresu místnosti, abyste ji mohli snadno sdílet s lidmi.",
+    "To continue, use Single Sign On to prove your identity.": "Pro pokračování prokažte svou identitu pomocí Jednotného přihlášení.",
+    "Confirm to continue": "Pro pokračování potvrďte",
+    "Click the button below to confirm your identity.": "Klikněte na tlačítko níže pro potvrzení vaší identity.",
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Pozvěte někoho za použití jeho jména, uživatelského jména (např. <userId/>), e-mailové adresy, a nebo <a>sdílejte tuto místnost</a>.",
+    "a new master key signature": "nový podpis hlavního klíče",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Pro nejlepší zážitek si prosím nainstalujte prohlížeč <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, nebo <safariLink>Safari</safariLink>.",
+    "We’re excited to announce Riot is now Element": "S nadšením oznamujeme, že Riot je nyní Element",
+    "Enable experimental, compact IRC style layout": "Povolit experimentální, kompaktní zobrazení zpráv ve stylu IRC",
+    "New version available. <a>Update now.</a>": "Je dostupná nová verze. <a>Aktualizovat nyní.</a>",
+    "Message layout": "Zobrazení zpráv",
+    "Compact": "Kompaktní",
+    "Modern": "Moderní",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Zadejte jméno písma, které máte naistalované v systému, a %(brand)s se jej pokusí použít.",
+    "Customise your appearance": "Přizpůsobte si vzhled aplikace",
+    "Appearance Settings only affect this %(brand)s session.": "Nastavení vzhledu působí jen v této relaci programu %(brand)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.": "Sem přídejte servery a uživatele, které chcete ignorovat. Hvězdička pro %(brand)s zastupuje libovolný počet kterýchkoliv znaků. Např. <code>@bot:*</code> bude ignorovat všechny uživatele se jménem „bot“ na kterémkoliv serveru.",
+    "Signature upload success": "Podpis úspěšně nahrán",
+    "Signature upload failed": "Podpis se nepodařilo nahrát",
+    "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.": "Je-li jiná verze programu %(brand)s stále otevřená na jiné kartě, tak ji prosím zavřete, neboť užívání programu %(brand)s stejným hostitelem se zpožděným nahráváním současně povoleným i zakázaným bude působit problémy."
 }
diff --git a/src/i18n/strings/cy.json b/src/i18n/strings/cy.json
index 5795f3b5de..99c5296be5 100644
--- a/src/i18n/strings/cy.json
+++ b/src/i18n/strings/cy.json
@@ -5,8 +5,8 @@
     "Failed to verify email address: make sure you clicked the link in the email": "Methiant gwirio cyfeiriad e-bost: gwnewch yn siŵr eich bod wedi clicio'r ddolen yn yr e-bost",
     "Add Phone Number": "Ychwanegu Rhif Ffôn",
     "The platform you're on": "Y platfform rydych chi arno",
-    "The version of Riot.im": "Fersiwn Riot.im",
+    "The version of %(brand)s": "Fersiwn %(brand)s",
     "Whether or not you're logged in (we don't record your username)": "Os ydych wedi mewngofnodi ai peidio (nid ydym yn cofnodi'ch enw defnyddiwr)",
     "Your language of choice": "Eich iaith o ddewis",
-    "The version of Riot": "Fersiwn Riot"
+    "The version of %(brand)s": "Fersiwn %(brand)s"
 }
diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index 2fc17fe709..f44d724643 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -9,29 +9,12 @@
     "New passwords must match each other.": "Nye adgangskoder skal matche hinanden.",
     "A new password must be entered.": "Der skal indtastes en ny adgangskode.",
     "The email address linked to your account must be entered.": "Den emailadresse, der tilhører til din adgang, skal indtastes.",
-    "unknown device": "ukendt enhed",
-    "NOT verified": "IKKE verificeret",
-    "Blacklisted": "blokeret",
-    "verified": "verificeret",
     "Name": "Navn",
-    "Device ID": "Enheds-ID",
-    "Verification": "Verifikation",
-    "Ed25519 fingerprint": "Ed25519 fingerprint",
-    "User ID": "Bruger ID",
-    "Curve25519 identity key": "Curve25519 identitetsnøgle",
-    "Claimed Ed25519 fingerprint key": "Påstået Ed25519 fingeraftryk nøgle",
-    "none": "ingen",
-    "Algorithm": "Algoritme",
-    "unencrypted": "ukrypteret",
-    "Decryption error": "Dekrypteringsfejl",
     "Session ID": "Sessions ID",
-    "End-to-end encryption information": "End-to-end krypterings oplysninger",
-    "Event information": "Hændelses information",
     "Displays action": "Viser handling",
     "Bans user with given id": "Forbyder bruger med givet id",
     "Deops user with given id": "Fjerner OP af bruger med givet id",
     "Invites user with given id to current room": "Inviterer bruger med givet id til nuværende rum",
-    "Joins room with given alias": "Deltager i rum med givet alias",
     "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",
@@ -48,7 +31,6 @@
     "Banned users": "Bortviste brugere",
     "Click here to fix": "Klik her for at rette",
     "Continue": "Fortsæt",
-    "Could not connect to the integration server": "Kunne ikke oprette forbindelse til integrationsserveren",
     "Create Room": "Opret rum",
     "Cryptography": "Kryptografi",
     "Deactivate Account": "Deaktiver brugerkonto",
@@ -130,20 +112,18 @@
     "Which rooms would you like to add to this community?": "Hvilke rum vil du tilføje til dette fællesskab?",
     "Show these rooms to non-members on the community page and room list?": "Vis disse rum til ikke-medlemmer på fællesskabssiden og rumlisten?",
     "Add rooms to the community": "Tilføj rum til fællesskabet",
-    "Room name or alias": "Rum navn eller alias",
     "Add to community": "Tilføj til fællesskab",
     "Failed to invite the following users to %(groupId)s:": "Kunne ikke invitere de følgende brugere til %(groupId)s:",
     "Failed to invite users to community": "Kunne ikke invitere brugere til fællesskab",
     "Failed to invite users to %(groupId)s": "Kunne ikke invitere brugere til %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Kunne ikke tilføje de følgende rum til %(groupId)s:",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot har ikke tilladelse til at sende dig notifikationer - tjek venligst dine browserindstillinger",
-    "Riot was not given permission to send notifications - please try again": "Riot fik ikke tilladelse til at sende notifikationer - Vær sød at prøve igen",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s har ikke tilladelse til at sende dig notifikationer - tjek venligst dine browserindstillinger",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s fik ikke tilladelse til at sende notifikationer - Vær sød at prøve igen",
     "Unable to enable Notifications": "Kunne ikke slå Notifikationer til",
     "This email address was not found": "Denne emailadresse blev ikke fundet",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Din emailadresse lader ikke til at være tilknyttet et Matrix ID på denne Homeserver.",
     "Restricted": "Begrænset",
     "Moderator": "Moderator",
-    "Start a chat": "Start en chat",
     "Operation failed": "Operation mislykkedes",
     "Failed to invite": "Kunne ikke invitere",
     "Failed to invite the following users to the %(roomName)s room:": "Kunne ikke invitere de følgende brugere til %(roomName)s rummet:",
@@ -161,7 +141,6 @@
     "Usage": "Brug",
     "/ddg is not a command": "/ddg er ikke en kommando",
     "To use it, just wait for autocomplete results to load and tab through them.": "For at bruge det skal du bare vente på at autocomplete resultaterne indlæses, og så bruge Tab for at bladre igennem dem.",
-    "Unrecognised room alias:": "Ugenkendt rum alias:",
     "Ignored user": "Ignoreret bruger",
     "You are now ignoring %(userId)s": "Du ignorerer nu %(userId)s",
     "Unignored user": "Holdt op med at ignorere bruger",
@@ -198,7 +177,6 @@
     "Submit debug logs": "Indsend debug-logfiler",
     "Online": "Online",
     "Fetching third party location failed": "Hentning af tredjeparts placering mislykkedes",
-    "A new version of Riot is available.": "En ny version a Riot er tilgængelig.",
     "Send Account Data": "Send Konto Data",
     "All notifications are currently disabled for all targets.": "Alle meddelelser er for øjeblikket deaktiveret for alle mål.",
     "Uploading report": "Uploader rapport",
@@ -219,8 +197,6 @@
     "Send Custom Event": "Send Brugerdefineret Begivenhed",
     "Off": "Slukket",
     "Advanced notification settings": "Avancerede notifikationsindstillinger",
-    "delete the alias.": "Slet aliaset.",
-    "To return to your account in future you need to <u>set a password</u>": "For at komme ind på din konto i fremtiden skal du <u>indstille et password</u>",
     "Forget": "Glem",
     "You cannot delete this image. (%(code)s)": "Du kan ikke slette dette billede. (%(code)s)",
     "Cancel Sending": "Stop Forsendelse",
@@ -246,7 +222,6 @@
     "No update available.": "Ingen opdatering tilgængelig.",
     "Noisy": "Støjende",
     "Collecting app version information": "Indsamler app versionsoplysninger",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Slet rumaliaset %(alias)s og fjern %(name)s fra kataloget?",
     "Keywords": "Søgeord",
     "Enable notifications for this account": "Aktivér underretninger for dette brugernavn",
     "Invite to this community": "Inviter til dette fællesskab",
@@ -257,7 +232,7 @@
     "Enter keywords separated by a comma:": "Indtast søgeord adskilt af et komma:",
     "Forward Message": "Videresend Besked",
     "Remove %(name)s from the directory?": "Fjern %(name)s fra kataloget?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot bruger mange avancerede browser funktioner, hvoraf nogle af dem ikke er tilgængelige eller er eksperimentelle i din browser.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s bruger mange avancerede browser funktioner, hvoraf nogle af dem ikke er tilgængelige eller er eksperimentelle i din browser.",
     "Event sent!": "Begivenhed sendt!",
     "Explore Account Data": "Udforsk Konto Data",
     "Saturday": "Lørdag",
@@ -297,8 +272,7 @@
     "Show message in desktop notification": "Vis besked i skrivebordsnotifikation",
     "Unhide Preview": "Vis Forhåndsvisning",
     "Unable to join network": "Kan ikke forbinde til netværket",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Du har muligvis konfigureret dem i en anden klient end Riot. Du kan ikke tune dem i Riot, men de gælder stadig",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Beklager, din browser kan <b>ikke</b> køre Riot.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Beklager, din browser kan <b>ikke</b> køre %(brand)s.",
     "Quote": "Citat",
     "Messages in group chats": "Beskeder i gruppechats",
     "Yesterday": "I går",
@@ -308,7 +282,7 @@
     "Unable to fetch notification target list": "Kan ikke hente meddelelsesmålliste",
     "Set Password": "Indstil Password",
     "Resend": "Send igen",
-    "Riot does not know how to join a room on this network": "Riot ved ikke, hvordan man kan deltage i et rum på dette netværk",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s ved ikke, hvordan man kan deltage i et rum på dette netværk",
     "Mentions only": "Kun nævninger",
     "Failed to remove tag %(tagName)s from room": "Kunne ikke fjerne tag(s): %(tagName)s fra rummet",
     "Wednesday": "Onsdag",
@@ -322,7 +296,6 @@
     "Thank you!": "Tak!",
     "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!": "Med din nuværnde broser kan udseendet og fornemmelsen af programmet være helt forkert og nogle funktioner virker måske ikke. Hvis du alligevel vil prøve så kan du fortsætte, men det er på egen risiko!",
     "Checking for an update...": "Checker om der er en opdatering...",
-    "There are advanced notifications which are not shown here": "Der er avancerede meddelelser, som ikke vises her",
     "Logs sent": "Logfiler sendt",
     "Reply": "Besvar",
     "All messages (noisy)": "Alle meddelelser (højlydt)",
@@ -331,33 +304,25 @@
     "View Community": "Vis community",
     "Preparing to send logs": "Forbereder afsendelse af logfiler",
     "The platform you're on": "Den platform du bruger",
-    "The version of Riot.im": "Versionen af Riot.im",
+    "The version of %(brand)s": "%(brand)s versionen",
     "Whether or not you're logged in (we don't record your username)": "Om du er logget på eller ej (vi logger ikke dit brugernavn)",
     "Your language of choice": "Dit foretrukne sprog",
     "Which officially provided instance you are using, if any": "Hvilken officiel tilgængelig instans du bruger, hvis nogen",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Om du bruger Rich Text-tilstanden i editoren",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Om du bruger \"brødkrummer\"-funktionen (avatarer over rumlisten)",
     "Your homeserver's URL": "Din homeservers URL",
-    "Your identity server's URL": "Din identitetsservers URL",
     "e.g. %(exampleValue)s": "f.eks. %(exampleValue)s",
     "Every page you use in the app": "Hver side du bruger i appen",
     "e.g. <CurrentPageURL>": "f.eks. <CurrentPageURL>",
-    "Your User Agent": "Din user agent",
     "Your device resolution": "Din skærmopløsning",
     "Analytics": "Analyse data",
-    "The information being sent to us to help make Riot.im better includes:": "Information som sendes til os for at kunne forbedre Riot.im inkluderer:",
+    "The information being sent to us to help make %(brand)s better includes:": "Informationen der sendes til os for at hjælpe os med at gøre %(brand)s bedre inkluderer:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Hvis denne side indeholder identificerbar information, så som rum, bruger eller gruppe ID, bliver disse fjernet før dataene sendes til serveren.",
     "Call Failed": "Opkald mislykkedes",
-    "Review Devices": "Gennemse enheder",
-    "Call Anyway": "Ring op alligevel",
-    "Answer Anyway": "Svar alligevel",
-    "Call": "Ring",
-    "Answer": "Svar",
     "Call failed due to misconfigured server": "Opkaldet mislykkedes pga. fejlkonfigureret server",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Bed administratoren af din homeserver (<code>%(homeserverDomain)s</code>) om at konfigurere en TURN server for at opkald virker pålideligt.",
     "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.": "Alternativt kan du prøve at bruge den offentlige server <code>turn.matrix.org</code>, men det er ikke lige så pålideligt, og din IP-adresse deles med den server. Du kan også administrere dette under Indstillinger.",
     "Try using turn.matrix.org": "Prøv at bruge turn.matrix.org",
-    "A conference call could not be started because the integrations server is not available": "Et gruppeopkald kunne ikke startes, fordi integrationsserveren ikke er tilgængelig",
     "Call in Progress": "Igangværende opkald",
     "A call is currently being placed!": "Et opkald er allerede ved at blive oprettet!",
     "A call is already in progress!": "Et opkald er allerede i gang!",
@@ -370,13 +335,10 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Serveren kan være utilgængelig, overbelastet, eller også har du fundet en fejl.",
     "The server does not support the room version specified.": "Serveren understøtter ikke den oplyste rumversion.",
     "Failure to create room": "Rummet kunne ikke oprettes",
-    "Send anyway": "Send alligevel",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s. %(monthName)s %(fullYear)s",
     "Name or Matrix ID": "Navn eller Matrix-ID",
     "Unnamed Room": "Unavngivet rum",
     "Unable to load! Check your network connectivity and try again.": "Kunne ikke hente! Tjek din netværksforbindelse og prøv igen.",
-    "Registration Required": "Registrering påkrævet",
-    "You need to register to do this. Would you like to register now?": "Du behøver registrere dig for at gøre dette. Vil du registrere nu?",
     "Failed to invite users to the room:": "Kunne ikke invitere brugere til rummet:",
     "Missing roomId.": "roomId mangler.",
     "Messages": "Beskeder",
@@ -422,11 +384,6 @@
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s aktiverede etiket for %(groups)s i dette rum.",
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s deaktiverede etiket for %(groups)s i dette rum.",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s aktiverede etiket for %(newGroups)s og deaktiverede etiket for %(oldGroups)s i dette rum.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s tilføjede %(addedAddresses)s som adresser for dette rum.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s tilføjede %(addedAddresses)s som adresse for dette rum.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s fjernede %(removedAddresses)s som adresser for dette rum.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s fjernede %(removedAddresses)s som adresse for dette rum.",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s fjernede %(addedAddresses)s og tilføjede %(removedAddresses)s som adresser for dette rum.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s satte hovedadressen af dette rum til %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s fjernede hovedadressen for dette rum.",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s tilbagetrak invitationen til %(targetDisplayName)s om at deltage i rummet.",
@@ -440,16 +397,14 @@
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ændrede de fastgjorte beskeder for rummet.",
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s widget tilføjet af %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s fjernet af %(senderName)s",
-    "Light theme": "Lyst tema",
-    "Dark theme": "Mørkt tema",
     "%(displayName)s is typing …": "%(displayName)s skriver …",
     "%(names)s and %(count)s others are typing …|other": "%(names)s og %(count)s andre skriver …",
     "%(names)s and %(count)s others are typing …|one": "%(names)s og en anden skriver …",
     "%(names)s and %(lastPerson)s are typing …": "%(names)s og %(lastPerson)s skriver …",
     "Cannot reach homeserver": "Homeserveren kan ikke kontaktes",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Vær sikker at du har en stabil internetforbindelse, eller kontakt serveradministratoren",
-    "Your Riot is misconfigured": "Din Riot er konfigureret forkert",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Bed din Riot administrator om at kontrollere <a>din konfiguration</a> for forkerte eller dobbelte poster.",
+    "Your %(brand)s is misconfigured": "Din %(brand)s er konfigureret forkert",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Bed din %(brand)s administrator om at kontrollere <a>din konfiguration</a> for forkerte eller dobbelte poster.",
     "Cannot reach identity server": "Identitetsserveren kan ikke kontaktes",
     "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.": "Du kan registrere dig, men nogle funktioner vil ikke være tilgængelige inden identitetsserveren er online igen. Hvis du bliver ved med at se denne advarsel, tjek din konfiguration eller kontakt en serveradministrator.",
     "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.": "Du kan nulstille dit kodeord, men nogle funktioner vil ikke være tilgængelige inden identitetsserveren er online igen. Hvis du bliver ved med at se denne advarsel, tjek din konfiguration eller kontakt en serveradministrator.",
@@ -465,7 +420,7 @@
     "%(items)s and %(count)s others|one": "%(items)s og en anden",
     "%(items)s and %(lastItem)s": "%(items)s og %(lastItem)s",
     "Your browser does not support the required cryptography extensions": "Din browser understøtter ikke de påkrævede kryptografiske udvidelser",
-    "Not a valid Riot keyfile": "Ikke en gyldig Riot nøglefil",
+    "Not a valid %(brand)s keyfile": "Ikke en gyldig %(brand)s nøglefil",
     "Authentication check failed: incorrect password?": "Godkendelse mislykkedes: forkert kodeord?",
     "Unrecognised address": "Ukendt adresse",
     "You do not have permission to invite people to this room.": "Du har ikke tilladelse til at invitere personer til dette rum.",
@@ -515,10 +470,8 @@
     "Render simple counters in room header": "Vis simple tællere i rumhovedet",
     "Multiple integration managers": "Flere integrationsmanagere",
     "Enable Emoji suggestions while typing": "Aktiver emoji forslag under indtastning",
-    "Use compact timeline layout": "Brug kompakt tidslinje",
     "Show a placeholder for removed messages": "Vis en pladsholder for fjernede beskeder",
-    "The version of Riot": "Riot versionen",
-    "Whether you're using Riot on a device where touch is the primary input mechanism": "Hvorvidt du benytter Riot på en enhed, hvor touch er den primære input-grænseflade",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Hvorvidt du benytter %(brand)s på en enhed, hvor touch er den primære input-grænseflade",
     "Your user agent": "Din user agent",
     "Use Single Sign On to continue": "Brug Single Sign On til at fortsætte",
     "Confirm adding this email address by using Single Sign On to prove your identity.": "Bekræft tilføjelsen af denne email adresse ved at bruge Single Sign On til at bevise din identitet.",
@@ -529,10 +482,7 @@
     "Confirm adding this phone number by using Single Sign On to prove your identity.": "Bekræft tilføjelsen af dette telefonnummer ved at bruge Single Sign On til at bevise din identitet.",
     "Confirm adding phone number": "Bekræft tilføjelse af telefonnummer",
     "Click the button below to confirm adding this phone number.": "Klik på knappen herunder for at bekræfte tilføjelsen af dette telefonnummer.",
-    "Whether you're using Riot as an installed Progressive Web App": "Om du anvender Riot som en installeret Progressiv Web App",
-    "The information being sent to us to help make Riot better includes:": "Informationen der sendes til os for at hjælpe os med at gøre Riot bedre inkluderer:",
-    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Der er ukendte sessions i dette rum: Hvis du fortsætter uden at verificere dem, vil det være muligt for andre at smuglytte til dit opkald.",
-    "Review Sessions": "Overse sessions",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Om du anvender %(brand)s som en installeret Progressiv Web App",
     "If you cancel now, you won't complete verifying the other user.": "Hvis du annullerer du, vil du ikke have færdiggjort verifikationen af den anden bruger.",
     "If you cancel now, you won't complete verifying your other session.": "Hvis du annullerer nu, vil du ikke have færdiggjort verifikationen af din anden session.",
     "If you cancel now, you won't complete your operation.": "Hvis du annullerer nu, vil du ikke færdiggøre din operation.",
@@ -542,7 +492,6 @@
     "Verify this session": "Verificér denne session",
     "Encryption upgrade available": "Opgradering af kryptering tilgængelig",
     "Set up encryption": "Opsæt kryptering",
-    "Unverified login. Was this you?": "Ikke-verificeret login. Var det dig?",
     "Identity server has no terms of service": "Identity serveren har ingen 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.": "Denne handling kræver adgang til default identitets serveren <server /> for at validere en email adresse eller et telefonnummer, men serveren har ingen terms of service.",
     "Only continue if you trust the owner of the server.": "Fortsæt kun hvis du stoler på ejeren af denne server.",
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index e928282fa8..3d5ba3722e 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -9,29 +9,12 @@
     "New passwords must match each other.": "Die neuen Passwörter müssen identisch sein.",
     "A new password must be entered.": "Es muss ein neues Passwort eingegeben werden.",
     "The email address linked to your account must be entered.": "Es muss die mit dem Benutzerkonto verbundene E-Mail-Adresse eingegeben werden.",
-    "unknown device": "Unbekanntes Gerät",
-    "NOT verified": "NICHT verifiziert",
-    "Blacklisted": "Blockiert",
-    "verified": "verifiziert",
     "Name": "Name",
-    "Device ID": "Geräte-ID",
-    "Verification": "Verifizierung",
-    "Ed25519 fingerprint": "Ed25519-Fingerprint",
-    "User ID": "Benutzer-ID",
-    "Curve25519 identity key": "Curve25519-Identitäts-Schlüssel",
-    "Claimed Ed25519 fingerprint key": "Geforderter Ed25519-Fingerprint-Schlüssel",
-    "none": "nicht vorhanden",
-    "Algorithm": "Algorithmus",
-    "unencrypted": "unverschlüsselt",
-    "Decryption error": "Fehler beim Entschlüsseln",
     "Session ID": "Sitzungs-ID",
-    "End-to-end encryption information": "Informationen zur Ende-zu-Ende-Verschlüsselung",
-    "Event information": "Ereignis-Information",
     "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",
-    "Joins room with given alias": "Raum wird mit dem angegebenen Alias betreten",
     "Kicks user with given id": "Benutzer mit der angegebenen ID kicken",
     "Changes your display nickname": "Ändert deinen angezeigten Nicknamen",
     "Change Password": "Passwort ändern",
@@ -93,13 +76,11 @@
     "Signed Out": "Abgemeldet",
     "Sign out": "Abmelden",
     "Someone": "Jemand",
-    "Start a chat": "Chat starten",
     "Success": "Erfolg",
     "This doesn't appear to be a valid email address": "Dies scheint keine gültige E-Mail-Adresse zu sein",
     "This room is not accessible by remote Matrix servers": "Remote-Matrix-Server können auf diesen Raum nicht zugreifen",
     "Admin": "Administrator",
     "Server may be unavailable, overloaded, or you hit a bug.": "Server ist nicht verfügbar, überlastet oder du bist auf einen Softwarefehler gestoßen.",
-    "Could not connect to the integration server": "Konnte keine Verbindung zum Integrations-Server herstellen",
     "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",
@@ -121,8 +102,8 @@
     "Existing Call": "Bereits bestehender Anruf",
     "Failed to verify email address: make sure you clicked the link in the email": "Verifizierung der E-Mail-Adresse fehlgeschlagen: Bitte stelle sicher, dass du den Link in der E-Mail angeklickt hast",
     "Failure to create room": "Raumerstellung fehlgeschlagen",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot hat keine Berechtigung, um Benachrichtigungen zu senden - bitte Browser-Einstellungen überprüfen",
-    "Riot was not given permission to send notifications - please try again": "Riot hat keine Berechtigung für das Senden von Benachrichtigungen erhalten - bitte erneut versuchen",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s hat keine Berechtigung, um Benachrichtigungen zu senden - bitte Browser-Einstellungen überprüfen",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s hat keine Berechtigung für das Senden von Benachrichtigungen erhalten - bitte erneut versuchen",
     "This email address is already in use": "Diese E-Mail-Adresse wird bereits verwendet",
     "This email address was not found": "Diese E-Mail-Adresse konnte nicht gefunden werden",
     "The remote side failed to pick up": "Die Gegenstelle konnte nicht abheben",
@@ -134,7 +115,7 @@
     "You are already in a call.": "Du bist bereits in einem Gespräch.",
     "You cannot place a call with yourself.": "Du kannst keinen Anruf mit dir selbst starten.",
     "You cannot place VoIP calls in this browser.": "VoIP-Gespräche werden von diesem Browser nicht unterstützt.",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Deine E-Mail-Adresse scheint nicht mit einer Matrix-ID auf diesem Heimserver verbunden zu sein.",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Deine E-Mail-Adresse scheint nicht mit einer Matrix-ID auf diesem Home-Server verbunden zu sein.",
     "Sun": "So",
     "Mon": "Mo",
     "Tue": "Di",
@@ -218,7 +199,6 @@
     "Click to mute video": "Klicken, um das Video stummzuschalten",
     "Command error": "Befehlsfehler",
     "Decrypt %(text)s": "%(text)s entschlüsseln",
-    "Direct chats": "Direkt-Chats",
     "Disinvite": "Einladung zurückziehen",
     "Download %(text)s": "%(text)s herunterladen",
     "Failed to ban user": "Verbannen des Benutzers fehlgeschlagen",
@@ -232,13 +212,10 @@
     "Incorrect verification code": "Falscher Verifizierungscode",
     "Join Room": "Dem Raum beitreten",
     "Kick": "Kicken",
-    "Local addresses for this room:": "Lokale Adressen dieses Raumes:",
-    "New address (e.g. #foo:%(localDomain)s)": "Neue Adresse (z. B. #foo:%(localDomain)s)",
     "not specified": "nicht spezifiziert",
     "No more results": "Keine weiteren Ergebnisse",
     "No results": "Keine Ergebnisse",
     "OK": "OK",
-    "Revoke Moderator": "Moderator-Status zurückziehen",
     "Search": "Suchen",
     "Search failed": "Suche ist fehlgeschlagen",
     "Server error": "Server-Fehler",
@@ -249,17 +226,14 @@
     "This room has no local addresses": "Dieser Raum hat keine lokale Adresse",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Es wurde versucht, einen bestimmten Punkt im Chatverlauf dieses Raumes zu laden. Dir fehlt jedoch die Berechtigung, die betreffende Nachricht zu sehen.",
     "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.",
-    "Unknown room %(roomId)s": "Unbekannter Raum %(roomId)s",
     "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.",
-    "Make Moderator": "Zum Moderator ernennen",
     "Room": "Raum",
     "Cancel": "Abbrechen",
     "Click to unmute video": "Klicken, um die Video-Stummschaltung zu deaktivieren",
     "Click to unmute audio": "Klicken, um den Ton wieder einzuschalten",
     "Failed to load timeline position": "Laden der Chat-Position fehlgeschlagen",
-    "Failed to toggle moderator status": "Umschalten des Moderator-Status fehlgeschlagen",
     "Autoplay GIFs and videos": "GIF-Dateien und Videos automatisch abspielen",
     "%(items)s and %(lastItem)s": "%(items)s und %(lastItem)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s. %(monthName)s %(fullYear)s %(time)s",
@@ -273,8 +247,7 @@
     "New passwords don't match": "Die neuen Passwörter stimmen nicht überein",
     "olm version:": "Version von olm:",
     "Passwords can't be empty": "Passwortfelder dürfen nicht leer sein",
-    "riot-web version:": "Version von riot-web:",
-    "Scroll to bottom of page": "Zum Seitenende springen",
+    "%(brand)s version:": "Version von %(brand)s:",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Zeitstempel im 12-Stunden-Format anzeigen (z. B. 2:30pm)",
     "Email address": "E-Mail-Adresse",
     "Error decrypting attachment": "Fehler beim Entschlüsseln des Anhangs",
@@ -296,15 +269,12 @@
     "Confirm Removal": "Entfernen bestätigen",
     "Unknown error": "Unbekannter Fehler",
     "Incorrect password": "Ungültiges Passwort",
-    "To continue, please enter your password.": "Zum fortfahren bitte Passwort eingeben.",
-    "I verify that the keys match": "Ich bestätige, dass die Schlüssel identisch sind",
     "Unable to restore session": "Sitzungswiederherstellung fehlgeschlagen",
     "Unknown Address": "Unbekannte Adresse",
-    "Verify...": "Verifizieren...",
     "ex. @bob:example.com": "z. B. @bob:example.com",
     "Add User": "Benutzer hinzufügen",
     "Custom Server Options": "Benutzerdefinierte Server-Optionen",
-    "Dismiss": "Ablehnen",
+    "Dismiss": "Ausblenden",
     "Please check your email to continue registration.": "Bitte prüfe deine E-Mails, um mit der Registrierung fortzufahren.",
     "Token incorrect": "Token fehlerhaft",
     "Please enter the code it contains:": "Bitte gib den darin enthaltenen Code ein:",
@@ -315,23 +285,19 @@
     "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:": "Das Einladen der folgenden Benutzer in den Raum \"%(roomName)s\" ist fehlgeschlagen:",
+    "Failed to invite the following users to the %(roomName)s room:": "Folgende Benutzer 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.",
-    "Analytics": "Anonymisierte Analysedaten",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot sammelt anonymisierte Analysedaten, um die Anwendung kontinuierlich verbessern zu können.",
+    "Analytics": "Datenverkehrsanalyse",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s sammelt anonymisierte Analysedaten, um die Anwendung kontinuierlich verbessern zu können.",
     "Add an Integration": "Eine Integration hinzufügen",
-    "Removed or unknown message type": "Gelöschte Nachricht oder unbekannter Nachrichten-Typ",
     "URL Previews": "URL-Vorschau",
     "Offline": "Offline",
     "Online": "Online",
     " (unsupported)": " (nicht unterstützt)",
     "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.": "Dieser Prozess erlaubt es dir, die zuvor von einem anderen Matrix-Client exportierten Verschlüsselungs-Schlüssel zu importieren. Danach kannst du alle Nachrichten entschlüsseln, die auch bereits auf dem anderen Client entschlüsselt werden konnten.",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Wenn du zuvor eine aktuellere Version von Riot verwendet hast, ist deine Sitzung eventuell inkompatibel mit dieser Version. Bitte schließe dieses Fenster und kehre zur aktuelleren Version zurück.",
-    "Blacklist": "Blockieren",
-    "Unblacklist": "Entblockieren",
-    "Unverify": "Verifizierung widerrufen",
+    "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.": "Wenn du zuvor eine aktuellere Version von %(brand)s verwendet hast, ist deine Sitzung eventuell inkompatibel mit dieser Version. Bitte schließe dieses Fenster und kehre zur aktuelleren Version zurück.",
     "Drop file here to upload": "Datei hier loslassen zum hochladen",
     "Idle": "Untätig",
     "Ongoing conference call%(supportedText)s.": "Laufendes Konferenzgespräch%(supportedText)s.",
@@ -344,7 +310,7 @@
     "No Webcams detected": "Keine Webcam erkannt",
     "No Microphones detected": "Keine Mikrofone erkannt",
     "No media permissions": "Keine Medienberechtigungen",
-    "You may need to manually permit Riot to access your microphone/webcam": "Gegebenenfalls kann es notwendig sein, dass du Riot manuell den Zugriff auf dein Mikrofon bzw. deine Webcam gewähren musst",
+    "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",
     "Microphone": "Mikrofon",
     "Camera": "Kamera",
@@ -356,13 +322,9 @@
     "Anyone": "Jeder",
     "Are you sure you want to leave the room '%(roomName)s'?": "Bist du sicher, dass du den Raum '%(roomName)s' verlassen möchtest?",
     "Custom level": "Benutzerdefiniertes Berechtigungslevel",
-    "device id: ": "Geräte-ID: ",
     "Publish this room to the public in %(domain)s's room directory?": "Diesen Raum im Raum-Verzeichnis von %(domain)s veröffentlichen?",
     "Register": "Registrieren",
     "Save": "Speichern",
-    "Remote addresses for this room:": "Remote-Adressen für diesen Raum:",
-    "Unrecognised room alias:": "Unbekannter Raum-Alias:",
-    "Use compact timeline layout": "Kompaktes Chatverlauf-Layout verwenden",
     "Verified key": "Verifizierter Schlüssel",
     "You have <a>disabled</a> URL previews by default.": "Du hast die URL-Vorschau standardmäßig <a>deaktiviert</a>.",
     "You have <a>enabled</a> URL previews by default.": "Du hast die URL-Vorschau standardmäßig <a>aktiviert</a>.",
@@ -390,14 +352,11 @@
     "Accept": "Akzeptieren",
     "Active call (%(roomName)s)": "Aktiver Anruf (%(roomName)s)",
     "Admin Tools": "Admin-Werkzeuge",
-    "Alias (optional)": "Alias (optional)",
     "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.": "Verbindung zum Heimserver fehlgeschlagen - bitte überprüfe die Internetverbindung und stelle sicher, dass dem <a>SSL-Zertifikat deines Heimservers</a> vertraut wird und dass Anfragen nicht durch eine Browser-Erweiterung blockiert werden.",
     "Close": "Schließen",
     "Custom": "Erweitert",
     "Decline": "Ablehnen",
-    "Disable Notifications": "Benachrichtigungen deaktivieren",
     "Drop File Here": "Lasse Datei hier los",
-    "Enable Notifications": "Benachrichtigungen aktivieren",
     "Failed to upload profile picture!": "Hochladen des Profilbild's fehlgeschlagen!",
     "Incoming call from %(name)s": "Eingehender Anruf von %(name)s",
     "Incoming video call from %(name)s": "Eingehender Videoanruf von %(name)s",
@@ -410,9 +369,8 @@
     "%(roomName)s does not exist.": "%(roomName)s existert nicht.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s ist aktuell nicht zugreifbar.",
     "Seen by %(userName)s at %(dateTime)s": "Gesehen von %(userName)s um %(dateTime)s",
-    "Send anyway": "Trotzdem senden",
     "Start authentication": "Authentifizierung beginnen",
-    "This room": "In diesem Raum",
+    "This room": "diesen Raum",
     "unknown caller": "Unbekannter Anrufer",
     "Unnamed Room": "Unbenannter Raum",
     "Upload new:": "Neue(s) hochladen:",
@@ -423,20 +381,16 @@
     "(no answer)": "(keine Antwort)",
     "(unknown failure: %(reason)s)": "(Unbekannter Fehler: %(reason)s)",
     "Your browser does not support the required cryptography extensions": "Dein Browser unterstützt die benötigten Verschlüsselungs-Erweiterungen nicht",
-    "Not a valid Riot keyfile": "Keine gültige Riot-Schlüsseldatei",
+    "Not a valid %(brand)s keyfile": "Keine gültige %(brand)s-Schlüsseldatei",
     "Authentication check failed: incorrect password?": "Authentifizierung fehlgeschlagen: Falsches Passwort?",
     "Do you want to set an email address?": "Möchtest du eine E-Mail-Adresse setzen?",
     "This will allow you to reset your password and receive notifications.": "Dies ermöglicht es dir, dein Passwort zurückzusetzen und Benachrichtigungen zu empfangen.",
     "Skip": "Überspringen",
-    "Start verification": "Verifizierung starten",
-    "Share without verifying": "Ohne Verifizierung verwenden",
-    "Ignore request": "Anforderung ignorieren",
-    "Encryption key request": "Anforderung von Verschlüsselungs-Schlüsseln",
     "Check for update": "Suche nach Updates",
     "Add a widget": "Widget hinzufügen",
     "Allow": "Erlauben",
     "Delete widget": "Widget entfernen",
-    "Define the power level of a user": "Setze das Berechtigungslevel eines Benutzers",
+    "Define the power level of a user": "Berechtigungsstufe einer/s Benutzer!n setzen",
     "Edit": "Bearbeiten",
     "Enable automatic language detection for syntax highlighting": "Automatische Spracherkennung für die Syntax-Hervorhebung aktivieren",
     "To get started, please pick a username!": "Um zu starten, wähle bitte einen Nutzernamen!",
@@ -449,8 +403,8 @@
     "Featured Users:": "Hervorgehobene Benutzer:",
     "Automatically replace plain text Emoji": "Klartext-Emoji automatisch ersetzen",
     "Failed to upload image": "Bild-Hochladen fehlgeschlagen",
-    "AM": "a.m.",
-    "PM": "p.m.",
+    "AM": "a. m.",
+    "PM": "p. m.",
     "The maximum permitted number of widgets have already been added to this room.": "Die maximal erlaubte Anzahl an hinzufügbaren Widgets für diesen Raum wurde erreicht.",
     "Cannot add any more widgets": "Kann keine weiteren Widgets hinzufügen",
     "%(widgetName)s widget added by %(senderName)s": "%(senderName)s hat das Widget %(widgetName)s hinzugefügt",
@@ -461,18 +415,14 @@
     "Ignore": "Ignorieren",
     "You are now ignoring %(userId)s": "%(userId)s wird jetzt ignoriert",
     "You are no longer ignoring %(userId)s": "%(userId)s wird nicht mehr ignoriert",
-    "Message removed by %(userId)s": "Nachricht wurde von %(userId)s entfernt",
     "Leave": "Verlassen",
     "Failed to invite the following users to %(groupId)s:": "Die folgenden Benutzer 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",
-    "Light theme": "Helles Thema",
-    "Dark theme": "Dunkles Thema",
     "You have entered an invalid address.": "Du hast eine ungültige Adresse eingegeben.",
     "Matrix ID": "Matrix-ID",
     "Unignore": "Ignorieren aufheben",
-    "User Options": "Benutzer-Optionen",
     "Unignored user": "Benutzer nicht mehr ignoriert",
     "Ignored user": "Benutzer ignoriert",
     "Stops ignoring a user, showing their messages going forward": "Beendet das Ignorieren eines Benutzers, nachfolgende Nachrichten werden wieder angezeigt",
@@ -486,7 +436,6 @@
     "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:",
     "Which rooms would you like to add to this summary?": "Welche Räume möchtest du zu dieser Übersicht hinzufügen?",
-    "Room name or alias": "Raum-Name oder Alias",
     "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.",
@@ -517,7 +466,7 @@
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Warnung: Jede Person, die du einer Community hinzufügst, wird für alle, die die Community-ID kennen, öffentlich sichtbar sein",
     "Invite new community members": "Neue Community-Mitglieder einladen",
     "Invite to Community": "In die Community einladen",
-    "Which rooms would you like to add to this community?": "Welche Räume möchtest du zu dieser Community hinzufügen?",
+    "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",
@@ -553,7 +502,6 @@
     "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",
-    "Message removed": "Nachricht entfernt",
     "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?",
@@ -648,7 +596,7 @@
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
-    "%(duration)sd": "%(duration)sd",
+    "%(duration)sd": "%(duration)sT",
     "Online for %(duration)s": "Online seit %(duration)s",
     "Idle for %(duration)s": "Untätig seit %(duration)s",
     "Offline for %(duration)s": "Offline seit %(duration)s",
@@ -660,47 +608,39 @@
     "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.",
     "Call Failed": "Anruf fehlgeschlagen",
-    "Review Devices": "Geräte ansehen",
-    "Call Anyway": "Trotzdem anrufen",
-    "Answer Anyway": "Trotzdem annehmen",
-    "Call": "Anrufen",
-    "Answer": "Annehmen",
     "Send": "Senden",
     "collapse": "Verbergen",
     "expand": "Erweitern",
     "Old cryptography data detected": "Alte Kryptografiedaten erkannt",
     "Warning": "Warnung",
-    "Data from an older version of Riot 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.": "Es wurden Daten von einer älteren Version von Riot entdeckt. Dies wird zu Fehlern in der Ende-zu-Ende-Verschlüsselung der älteren Version geführt haben. Ende-zu-Ende verschlüsselte Nachrichten, die ausgetauscht wruden, während die ältere Version genutzt wurde, werden in dieser Version nicht entschlüsselbar sein. Es kann auch zu Fehlern mit Nachrichten führen, die mit dieser Version versendet werden. Wenn du Probleme feststellst, melde dich ab und wieder an. Um die Historie zu behalten, ex- und reimportiere deine Schlüssel.",
+    "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.": "Es wurden Daten von einer älteren Version von %(brand)s entdeckt. Dies wird zu Fehlern in der Ende-zu-Ende-Verschlüsselung der älteren Version geführt haben. Ende-zu-Ende verschlüsselte Nachrichten, die ausgetauscht wruden, während die ältere Version genutzt wurde, werden in dieser Version nicht entschlüsselbar sein. Es kann auch zu Fehlern mit Nachrichten führen, die mit dieser Version versendet werden. Wenn du Probleme feststellst, melde dich ab und wieder an. Um die Historie zu behalten, ex- und reimportiere deine Schlüssel.",
     "Send an encrypted reply…": "Verschlüsselte Antwort senden…",
-    "Send a reply (unencrypted)…": "Unverschlüsselte Antwort senden…",
     "Send an encrypted message…": "Verschlüsselte Nachricht senden…",
-    "Send a message (unencrypted)…": "Unverschlüsselte Nachricht senden…",
     "Replying": "Antwortet",
     "Minimize apps": "Apps minimieren",
     "%(count)s of your messages have not been sent.|one": "Deine Nachricht wurde nicht gesendet.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Alle erneut senden</resendText> oder <cancelText>alle abbrechen</cancelText>. Du kannst auch einzelne Nachrichten erneut senden oder abbrechen.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Nachricht jetzt erneut senden</resendText> oder <cancelText>senden abbrechen</cancelText> now.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privatsphäre ist uns wichtig, deshalb sammeln wir keine persönlichen oder identifizierbaren Daten für unsere Analysen.",
-    "The information being sent to us to help make Riot.im better includes:": "Die Informationen, die an uns gesendet werden um Riot.im zu verbessern enthalten:",
+    "The information being sent to us to help make %(brand)s better includes:": "Zu den Informationen, die uns zugesandt werden, um zu helfen, %(brand)s besser zu machen, gehören:",
     "The platform you're on": "Benutzte Plattform",
-    "The version of Riot.im": "Riot.im Version",
+    "The version of %(brand)s": "Die %(brand)s-Version",
     "Your language of choice": "Deine ausgewählte Sprache",
     "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": "Die URL deines Homeservers",
-    "Your identity server's URL": "Die URL deines Identitätsservers",
+    "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.",
     "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.",
-    "Which officially provided instance you are using, if any": "Welche offiziell angebotene Instanz du nutzt, wenn es der Fall ist",
+    "Which officially provided instance you are using, if any": "Welche offiziell angebotene Instanz du nutzt, wenn überhaupt eine",
     "<a>In reply to</a> <pill>": "<a>Als Antwort auf</a> <pill>",
     "This room is not public. You will not be able to rejoin without an invite.": "Dies ist kein öffentlicher Raum. Du wirst diesen nicht ohne Einladung wieder beitreten können.",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s änderte den Anzeigenamen auf %(displayName)s.",
     "Failed to set direct chat tag": "Fehler beim Setzen der Direkt-Chat-Markierung",
-    "Failed to remove tag %(tagName)s from room": "Fehler beim Entfernen des \"%(tagName)s\"-Tags von dem Raum",
+    "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 Riot.im experience!": "Wusstest du: Du kannst Communities nutzen um deine Riot.im-Erfahrung zu filtern!",
+    "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.",
     "Clear filter": "Filter zurücksetzen",
     "Key request sent.": "Schlüssel-Anfragen gesendet.",
@@ -721,7 +661,6 @@
     "Everyone": "Jeder",
     "Stickerpack": "Stickerpack",
     "Fetching third party location failed": "Das Abrufen des Drittanbieterstandorts ist fehlgeschlagen",
-    "A new version of Riot is available.": "Eine neue Version von Riot ist verfügbar.",
     "Send Account Data": "Benutzerkonto-Daten senden",
     "All notifications are currently disabled for all targets.": "Aktuell sind alle Benachrichtigungen für alle Ziele deaktiviert.",
     "Uploading report": "Lade Bericht hoch",
@@ -739,8 +678,6 @@
     "Send Custom Event": "Benutzerdefiniertes Event senden",
     "Advanced notification settings": "Erweiterte Benachrichtigungs-Einstellungen",
     "Failed to send logs: ": "Senden von Logs fehlgeschlagen: ",
-    "delete the alias.": "Lösche den Alias.",
-    "To return to your account in future you need to <u>set a password</u>": "Um in Zukunft auf dein Benutzerkonto zugreifen zu können, musst du <u>ein Passwort setzen</u>",
     "Forget": "Entfernen",
     "You cannot delete this image. (%(code)s)": "Das Bild kann nicht gelöscht werden. (%(code)s)",
     "Cancel Sending": "Senden abbrechen",
@@ -765,7 +702,6 @@
     "No update available.": "Kein Update verfügbar.",
     "Noisy": "Laut",
     "Collecting app version information": "App-Versionsinformationen werden abgerufen",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Soll der Raum-Alias %(alias)s gelöscht und der %(name)s aus dem Verzeichnis entfernt werden?",
     "Keywords": "Schlüsselwörter",
     "Enable notifications for this account": "Benachrichtigungen für dieses Benutzerkonto aktivieren",
     "Invite to this community": "In diese Community einladen",
@@ -776,21 +712,21 @@
     "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?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot nutzt zahlreiche fortgeschrittene Browser-Funktionen, die teilweise in deinem aktuell verwendeten Browser noch nicht verfügbar sind oder sich noch im experimentellen Status befinden.",
+    "%(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",
     "Remember, you can always set an email address in user settings if you change your mind.": "Vergiss nicht, dass du in den Benutzereinstellungen jederzeit eine E-Mail-Adresse setzen kannst, wenn du deine Meinung änderst.",
     "Explore Account Data": "Konto-Daten erkunden",
     "All messages (noisy)": "Alle Nachrichten (laut)",
     "Saturday": "Samstag",
-    "I understand the risks and wish to continue": "Ich verstehe das Risiko und möchte fortfahren",
+    "I understand the risks and wish to continue": "Ich verstehe die Risiken und möchte fortfahren",
     "Direct Chat": "Direkt-Chat",
     "The server may be unavailable or overloaded": "Der Server ist vermutlich nicht erreichbar oder überlastet",
     "Reject": "Ablehnen",
     "Failed to set Direct Message status of room": "Konnte den direkten Benachrichtigungsstatus nicht setzen",
     "Monday": "Montag",
     "Remove from Directory": "Aus dem Raum-Verzeichnis entfernen",
-    "Enable them now": "Aktiviere diese jetzt",
+    "Enable them now": "Diese jetzt aktivieren",
     "Toolbox": "Werkzeugkasten",
     "Collecting logs": "Protokolle werden abgerufen",
     "You must specify an event type!": "Du musst einen Event-Typ spezifizieren!",
@@ -822,8 +758,7 @@
     "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.": "Fehlerberichte enthalten Anwendungsdaten wie deinen Nutzernamen, Raum- und Gruppen-ID's und Aliase die du besucht hast sowie Nutzernamen anderer Nutzer. Sie enthalten keine Nachrichten.",
     "Unhide Preview": "Vorschau wieder anzeigen",
     "Unable to join network": "Es ist nicht möglich, dem Netzwerk beizutreten",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Du hast sie eventuell auf einem anderen Matrix-Client und nicht in Riot konfiguriert. Sie können in Riot nicht verändert werden, gelten aber trotzdem",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Es tut uns leid, aber dein Browser kann Riot <b>nicht</b> ausführen.",
+    "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",
     "Yesterday": "Gestern",
     "Error encountered (%(errorDetail)s).": "Es ist ein Fehler aufgetreten (%(errorDetail)s).",
@@ -831,7 +766,7 @@
     "Unable to fetch notification target list": "Liste der Benachrichtigungsempfänger konnte nicht abgerufen werden",
     "Set Password": "Passwort einrichten",
     "Off": "Aus",
-    "Riot does not know how to join a room on this network": "Riot weiß nicht, wie es einem Raum auf diesem Netzwerk beitreten soll",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s weiß nicht, wie es einem Raum auf diesem Netzwerk beitreten soll",
     "Mentions only": "Nur, wenn du erwähnt wirst",
     "You can now return to your account after signing out, and sign in on other devices.": "Du kannst nun zu deinem Benutzerkonto zurückkehren, nachdem du dich abgemeldet hast. Anschließend kannst du dich an anderen Geräten anmelden.",
     "Enable email notifications": "E-Mail-Benachrichtigungen aktivieren",
@@ -847,11 +782,9 @@
     "Uploaded on %(date)s by %(user)s": "Hochgeladen: %(date)s von %(user)s",
     "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!": "In deinem aktuell verwendeten Browser können Aussehen und Handhabung der Anwendung unter Umständen noch komplett fehlerhaft sein, so dass einige bzw. im Extremfall alle Funktionen nicht zur Verfügung stehen. Du kannst es trotzdem versuchen und fortfahren, bist dabei aber bezüglich aller auftretenden Probleme auf dich allein gestellt!",
     "Checking for an update...": "Nach Updates suchen...",
-    "There are advanced notifications which are not shown here": "Es existieren erweiterte Benachrichtigungen, welche hier nicht angezeigt werden",
     "Missing roomId.": "Fehlende Raum-ID.",
     "Every page you use in the app": "Jede Seite, die du in der App benutzt",
     "e.g. <CurrentPageURL>": "z.B. <CurrentPageURL>",
-    "Your User Agent": "Dein User-Agent",
     "Your device resolution": "Deine Bildschirmauflösung",
     "Popout widget": "Widget ausklinken",
     "Always show encryption icons": "Immer Verschlüsselungssymbole zeigen",
@@ -866,9 +799,6 @@
     "Send analytics data": "Analysedaten senden",
     "e.g. %(exampleValue)s": "z.B. %(exampleValue)s",
     "Muted Users": "Stummgeschaltete Benutzer",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Bitte hilf uns Riot.im zu verbessern, in dem du <UsageDataLink>anonyme Nutzungsdaten</UsageDataLink> schickst. Dies wird ein Cookie benutzen (bitte beachte auch unsere <PolicyLink>Cookie-Richtlinie</PolicyLink>).",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Bitte hilf uns Riot.im zu verbessern, in dem du <UsageDataLink>anonyme Nutzungsdaten</UsageDataLink> schickst. Dies wird ein Cookie benutzen.",
-    "Yes, I want to help!": "Ja, ich möchte helfen!",
     "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.": "Sie 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.",
@@ -912,9 +842,6 @@
     "Please <a>contact your service administrator</a> to continue using the service.": "Bitte <a>kontaktiere deinen Systemadministrator</a> um diesen Dienst weiter zu nutzen.",
     "This homeserver has hit its Monthly Active User limit.": "Dieser Heimserver hat sein Limit an monatlich aktiven Nutzern erreicht.",
     "This homeserver has exceeded one of its resource limits.": "Dieser Heimserver hat einen seiner Ressourcen-Limits überschritten.",
-    "Please <a>contact your service administrator</a> to get this limit increased.": "Bitte <a>kontaktiere deinen Systemadministrator</a> um dieses Limit zu erhöht zu bekommen.",
-    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "Dieser Heimserver hat sein Limit an monatlich aktiven Nutzern erreicht, sodass <b>einige Nutzer sich nicht anmelden können</b>.",
-    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Dieser Heimserver hat einen seiner Ressourcen-Limits überschritten, sodass <b>einige Benutzer nicht in der Lage sind sich anzumelden</b>.",
     "Upgrade Room Version": "Raum-Version aufrüsten",
     "Create a new room with the same name, description and avatar": "Einen neuen Raum mit demselben Namen, Beschreibung und Profilbild erstellen",
     "Update any local room aliases to point to the new room": "Alle lokalen Raum-Aliase aktualisieren, damit sie auf den neuen Raum zeigen",
@@ -934,21 +861,14 @@
     "The room upgrade could not be completed": "Die Raum-Aufrüstung konnte nicht fertiggestellt werden",
     "Upgrade this room to version %(version)s": "Diesen Raum zur Version %(version)s aufrüsten",
     "Forces the current outbound group session in an encrypted room to be discarded": "Erzwingt, dass die aktuell ausgehende Gruppen-Sitzung in einem verschlüsseltem Raum verworfen wird",
-    "Registration Required": "Registrierung erforderlich",
-    "You need to register to do this. Would you like to register now?": "Du musst dich registrieren um dies zu tun. Möchtest du dich jetzt registrieren?",
     "Unable to connect to Homeserver. Retrying...": "Verbindung mit Heimserver nicht möglich. Versuche erneut...",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s fügte %(addedAddresses)s als Adresse zu diesem Raum hinzu.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s fügte %(addedAddresses)s als Adressen zu diesem Raum hinzu.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s entfernte %(removedAddresses)s als Adresse von diesem Raum.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s entfernte %(removedAddresses)s als Adressen von diesem Raum.",
     "%(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.",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s fügte %(addedAddresses)s hinzu und entfernte %(removedAddresses)s als Adressen 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.",
-    "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Riot 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!",
-    "Updating Riot": "Aktualisiere Riot",
-    "You've previously used Riot 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, Riot needs to resync your account.": "Du hast zuvor Riot 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 Riot dein Konto neu synchronisieren.",
-    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Wenn Riot mit der alten Version in einem anderen Tab geöffnet ist, schließe dies bitte, da das parallele Nutzen von Riot auf demselben Host mit aktivierten und deaktivierten verzögertem Laden, Probleme verursachen wird.",
+    "%(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!",
+    "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.",
     "Incompatible local cache": "Inkompatibler lokaler Zwischenspeicher",
     "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:",
@@ -960,30 +880,21 @@
     "Delete Backup": "Sicherung löschen",
     "Backup version: ": "Sicherungsversion: ",
     "Algorithm: ": "Algorithmus: ",
-    "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 Riot to do this": "Um zu vermeiden, dass Ihr Chat-Verlauf verloren geht, müssen Sie Ihre Raum-Schlüssel exportieren, bevor Sie sich abmelden. Dazu müssen Sie auf die neuere Version von Riot zurückgehen",
+    "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": "Um zu vermeiden, dass Ihr Chat-Verlauf verloren geht, müssen Sie Ihre Raum-Schlüssel exportieren, bevor Sie sich abmelden. Dazu müssen Sie auf die neuere Version von %(brand)s zurückgehen",
     "Incompatible Database": "Inkompatible Datenbanken",
     "Continue With Encryption Disabled": "Mit deaktivierter Verschlüsselung fortfahren",
-    "Enter a passphrase...": "Passphrase eingeben...",
-    "Next": "Nächstes",
+    "Next": "Weiter",
     "That matches!": "Das passt!",
     "That doesn't match.": "Das passt nicht.",
     "Go back to set it again.": "Gehe zurück und setze es erneut.",
-    "Repeat your passphrase...": "Wiederhole deine Passphrase...",
-    "Your Recovery Key": "Dein Wiederherstellungsschlüssel",
-    "Copy to clipboard": "In Zwischenablage kopieren",
     "Download": "Herunterladen",
     "<b>Print it</b> and store it somewhere safe": "<b>Drucke ihn aus</b> und lagere ihn an einem sicheren Ort",
     "<b>Save it</b> on a USB key or backup drive": "<b>Speichere ihn</b> auf einem USB-Schlüssel oder Sicherungsslaufwerk",
     "<b>Copy it</b> to your personal cloud storage": "<b>Kopiere ihn</b> in deinen persönlichen Cloud-Speicher",
-    "Keep it safe": "Lagere ihn sicher",
-    "Create Key Backup": "Erzeuge Schlüsselsicherung",
     "Unable to create key backup": "Konnte Schlüsselsicherung nicht erstellen",
     "Retry": "Erneut probieren",
     "Unable to restore backup": "Konnte Sicherung nicht wiederherstellen",
     "No backup found!": "Keine Sicherung gefunden!",
-    "Backup Restored": "Sicherung wiederhergestellt",
-    "Enter Recovery Passphrase": "Gebe Wiederherstellungs-Passphrase ein",
-    "Enter Recovery Key": "Gebe Wiederherstellungsschlüssel ein",
     "This looks like a valid recovery key!": "Dies sieht wie ein gültiger Wiederherstellungsschlüssel aus!",
     "Not a valid recovery key": "Kein valider Wiederherstellungsschlüssel",
     "There was an error joining the room": "Es gab einen Fehler beim Raum-Beitreten",
@@ -1033,10 +944,8 @@
     "Checking...": "Überprüfe...",
     "Unable to load backup status": "Konnte Backupstatus nicht laden",
     "Failed to decrypt %(failedCount)s sessions!": "Konnte %(failedCount)s Sitzungen nicht entschlüsseln!",
-    "Restored %(sessionCount)s session keys": "%(sessionCount)s Sitzungsschlüssel wiederhergestellt",
     "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Greifen Sie auf Ihre sichere Nachrichtenhistorie zu und richten Sie einen sicheren Nachrichtenversand ein, indem Sie Ihre Wiederherstellungspassphrase eingeben.",
     "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Wenn du deinen Wiederherstellungspassphrase vergessen hast, kannst du <button1>deinen Wiederherstellungsschlüssel benutzen</button1> oder <button2>neue Wiederherstellungsoptionen einrichten</button2>",
-    "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ": "Du hast kürzlich eine neuere Version von Riot auf %(host)s verwendet. Um diese Version erneut mit Ende-zu-Ende-Verschlüsselung zu nutzen, musst du dich ab- und wieder anmelden. ",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Greifen Sie auf Ihren sicheren Nachrichtenverlauf zu und richten Sie durch Eingabe Ihres Wiederherstellungsschlüssels einen sicheren Nachrichtenversand ein.",
     "Set a new status...": "Setze einen neuen Status...",
     "Clear status": "Status löschen",
@@ -1044,9 +953,6 @@
     "Invalid identity server discovery response": "Ungültige Antwort beim Aufspüren des Identitätsservers",
     "General failure": "Allgemeiner Fehler",
     "Failed to perform homeserver discovery": "Fehler beim Aufspüren des Heimservers",
-    "Great! This passphrase looks strong enough.": "Gut! Diese Passphrase sieht stark genug aus.",
-    "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Als Sicherheitsnetz kannst du ihn benutzen um deine verschlüsselte Nachrichtenhistorie wiederherzustellen, falls du deine Wiederherstellungspassphrase vergessen hast.",
-    "As a safety net, you can use it to restore your encrypted message history.": "Als Sicherheitsnetz kannst du ihn benutzen um deine verschlüsselte Nachrichtenhistorie wiederherzustellen.",
     "Set up Secure Message Recovery": "Richte Sichere Nachrichten-Wiederherstellung ein",
     "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Ohne Sichere Nachrichten-Wiederherstellung einzurichten, wirst du deine sichere Nachrichtenhistorie verlieren, wenn du dich abmeldest.",
     "If you don't want to set this up now, you can later in Settings.": "Wenn du dies jetzt nicht einrichten willst, kannst du dies später in den Einstellungen tun.",
@@ -1055,7 +961,6 @@
     "Set up Secure Messages": "Richte sichere Nachrichten ein",
     "Go to Settings": "Gehe zu Einstellungen",
     "Sign in with single sign-on": "Melden Sie sich mit Single Sign-On an",
-    "Waiting for %(userId)s to confirm...": "Warte auf Bestätigung für  %(userId)s ...",
     "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",
@@ -1103,7 +1008,7 @@
     "Room information": "Rauminformationen",
     "Internal room ID:": "Interne Raum ID:",
     "Room version": "Raum Version",
-    "Room version:": "Raum Version:",
+    "Room version:": "Raum-Version:",
     "Developer options": "Entwickleroptionen",
     "General": "Allgemein",
     "Set a new account password...": "Neues Benutzerkonto-Passwort festlegen...",
@@ -1112,9 +1017,9 @@
     "Language and region": "Sprache und Region",
     "Theme": "Design",
     "Account management": "Benutzerkontenverwaltung",
-    "For help with using Riot, click <a>here</a>.": "Um Hilfe zur Benutzung von Riot zu erhalten, klicke <a>hier</a>.",
-    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "Um Hilfe zur Benutzung von Riot zu erhalten, klicke <a>hier</a> oder beginne einen Chat mit unserem Bot, indem du den unteren Button klickst.",
-    "Chat with Riot Bot": "Chatte mit dem Riot Bot",
+    "For help with using %(brand)s, click <a>here</a>.": "Um Hilfe zur Benutzung von %(brand)s zu erhalten, klicke <a>hier</a>.",
+    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "Um Hilfe zur Benutzung von %(brand)s zu erhalten, klicke <a>hier</a> oder beginne einen Chat mit unserem Bot, indem du den unteren Button klickst.",
+    "Chat with %(brand)s Bot": "Chatte mit dem %(brand)s Bot",
     "Help & About": "Hilfe & Über",
     "Bug reporting": "Fehler melden",
     "FAQ": "Häufige Fragen",
@@ -1198,7 +1103,6 @@
     "Timeline": "Chatverlauf",
     "Autocomplete delay (ms)": "Verzögerung zur Autovervollständigung (ms)",
     "Roles & Permissions": "Rollen & Berechtigungen",
-    "To link to this room, please add an alias.": "Um zu diesem Raum zu verlinken, füge bitte einen Alias hinzu.",
     "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.",
     "Security & Privacy": "Sicherheit & Datenschutz",
     "Encryption": "Verschlüsselung",
@@ -1215,11 +1119,6 @@
     "Room Name": "Raum-Name",
     "Room Topic": "Raum-Thema",
     "Join": "Beitreten",
-    "Use Legacy Verification (for older clients)": "Legacy Verifizierung verwenden (für veraltete Clients)",
-    "Verify by comparing a short text string.": "Verifizieren durch Vergleichen eines kurzen Textes.",
-    "Begin Verifying": "Verifizierung beginnen",
-    "Waiting for partner to accept...": "Warte auf Annahme durch den Gesprächspartner...",
-    "Use two-way text verification": "Bidirektionale Textverifizierung verwenden",
     "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",
@@ -1231,11 +1130,8 @@
     "Credits": "Danksagungen",
     "Starting backup...": "Starte Backup...",
     "Success!": "Erfolgreich!",
-    "Recovery key": "Wiederherstellungsschlüssel",
-    "Confirm your passphrase": "Bestätige deine Passphrase",
-    "Secure your backup with a passphrase": "Sichere dein Backup mit einer Passphrase",
     "Your keys are being backed up (the first backup could take a few minutes).": "Deine Schlüssel werden gesichert (Das erste Backup könnte ein paar Minuten in Anspruch nehmen).",
-    "Voice & Video": "Sprache & Video",
+    "Voice & Video": "Sprach- & Videoanruf",
     "Never lose encrypted messages": "Verliere niemals verschlüsselte Nachrichten",
     "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Nachrichten in diesem Raum sind mit einer Ende-zu-Ende-Verschlüsselung gesichert. Nur du und dein(e) Gesprächspartner haben die Schlüssel, um die Nachrichten zu lesen.",
     "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Speichere deine Schlüssel an einem sicheren Ort, um diese nicht zu verlieren. <a>Lerne wie.</a>",
@@ -1245,14 +1141,12 @@
     "Are you sure you want to sign out?": "Bist du sicher, dass du dich abmelden möchtest?",
     "Manually export keys": "Manueller Schlüssel Export",
     "Composer": "Nachrichteneingabefeld",
-    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Es ist nichts aufgetaucht? Noch nicht alle Clients unterstützen die interaktive Verifikation. <button>Nutze alte Verifikation</button>.",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Überprüfen Sie diesen Benutzer, um ihn als vertrauenswürdig zu kennzeichnen. Benutzern zu vertrauen gibt Ihnen zusätzliche Sicherheit bei der Verwendung von Ende-zu-Ende-verschlüsselten Nachrichten.",
     "I don't want my encrypted messages": "Ich möchte meine verschlüsselten Nachrichten nicht",
     "You'll lose access to your encrypted messages": "Du wirst den Zugang zu deinen verschlüsselten Nachrichten verlieren",
     "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Wenn du Fehler bemerkst oder eine Rückmeldung geben möchtest, teile dies uns auf GitHub mit.",
     "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.": "Um doppelte Issues zu vermeiden, <existingIssuesLink>schauen Sie bitte zuerst die existierenden Issues an</existingIssuesLink> (und fügen Sie ein \"+1\" hinzu), oder <newIssueLink>erstellen Sie ein neues Issue</newIssueLink>, wenn Sie keines finden können.",
-    "Report bugs & give feedback": "Melde Fehler & gebe Rückmeldungen",
-    "Recovery Key Mismatch": "Wiederherstellungsschlüssel passt nicht",
+    "Report bugs & give feedback": "Melde Fehler & gib Rückmeldungen",
     "Update status": "Aktualisiere Status",
     "Set status": "Setze Status",
     "Hide": "Verberge",
@@ -1286,19 +1180,11 @@
     "Create account": "Konto anlegen",
     "Registration has been disabled on this homeserver.": "Registrierungen wurden auf diesem Heimserver deaktiviert.",
     "Keep going...": "Fortfahren...",
-    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "Wir werden deine Schlüsselsicherung <b>verschlüsselt</b> auf dem Server speichern. Schütze dafür deine Sicherung mit einer Passphrase.",
     "For maximum security, this should be different from your account password.": "Für maximale Sicherheit, sollte dies anders als dein Konto-Passwort sein.",
-    "Set up with a Recovery Key": "Wiederherstellungsschlüssel einrichten",
-    "Please enter your passphrase a second time to confirm.": "Bitte gebe deine Passphrase ein weiteres mal zur Bestätigung ein.",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Dein Wiederherstellungsschlüssel ist ein Sicherungsnetz - Du kannst ihn benutzen um Zugang zu deinen verschlüsselten Nachrichten zu bekommen, wenn du deine Passphrase vergisst.",
     "A new recovery passphrase and key for Secure Messages have been detected.": "Eine neue Wiederherstellungspassphrase und -Schlüssel für sichere Nachrichten wurde festgestellt.",
     "Recovery Method Removed": "Wiederherstellungsmethode gelöscht",
     "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.": "Wenn du die Wiederherstellungsmethode nicht gelöscht hast, kann ein Angreifer versuchen Zugang zu deinem Konto zu bekommen. Ändere dein Passwort und richte sofort eine neue Wiederherstellungsmethode in den Einstellungen ein.",
-    "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "Sicherung konnte mit diesem Schlüssel nicht entschlüsselt werden: Bitte stelle sicher, dass du den richtigen Wiederherstellungsschlüssel eingegeben hast.",
-    "Incorrect Recovery Passphrase": "Falsche Wiederherstellungspassphrase",
-    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "Sicherung konnte nicht mit dieser Passphrase entschlüsselt werden: Bitte stelle sicher, dass du die richtige Wiederherstellungspassphrase eingegeben hast.",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Warnung</b>: Du solltest die Schlüsselsicherung nur auf einem vertrauenswürdigen Gerät einrichten.",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "Du kannst die angepassten Serveroptionen benutzen um dich an einem anderen Matrixserver anzumelden indem du eine andere Heimserver-Adresse angibst. Dies erlaubt dir diese Anwendung mit einem anderen Matrixkonto auf einem anderen Heimserver zu nutzen.",
     "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Gib die Adresse deines Modular-Heimservers an. Es kann deine eigene Domain oder eine Subdomain von <a>modular.im</a> sein.",
     "Unable to query for supported registration methods.": "Konnte unterstützte Registrierungsmethoden nicht abrufen.",
     "Bulk options": "Sammeloptionen",
@@ -1311,7 +1197,6 @@
     "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.",
     "Show read receipts sent by other users": "Zeige Lesebestätigungen anderer Benutzer",
-    "Order rooms in the room list by most important first instead of most recent": "Sortiere Räume in der Raumliste nach Wichtigkeit und nicht nach letzter Aktivität",
     "Scissors": "Scheren",
     "<a>Upgrade</a> to your own domain": "<a>Upgrade</a> zu deiner eigenen Domain",
     "Accept all %(invitedRooms)s invites": "Akzeptiere alle %(invitedRooms)s Einladungen",
@@ -1336,10 +1221,6 @@
     "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>",
     "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 creating alias": "Fehler beim Erstellen eines Aliases",
-    "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "Es gab einen Fehler beim Erstellen eines Aliases. Entweder ist es dir vom Server nicht erlaubt oder es gab ein temporäres Problem.",
-    "Error removing alias": "Fehler beim entfernen eines Aliases",
-    "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "Es gab einen Fehler beim Entfernen eines Aliases. Er existiert vielleicht nicht mehr oder es gab ein temporäres Problem.",
     "Error updating flair": "Konnte Abzeichen nicht aktualisieren",
     "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",
@@ -1348,15 +1229,14 @@
     "Share Permalink": "Teile permanenten Link",
     "Sign in to your Matrix account on %(serverName)s": "Melde dich mit deinem Matrixkonto auf %(serverName)s an",
     "Create your Matrix account on %(serverName)s": "Erstelle ein Matrixkonto auf %(serverName)s",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Bitte installiere <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, oder <safariLink>Safari</safariLink> für die beste Erfahrung.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Bitte installiere <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, oder <safariLink>Safari</safariLink> für das beste Erlebnis.",
     "Want more than a community? <a>Get your own server</a>": "Du möchtest mehr als eine Community? <a>Hol dir deinen eigenen Server</a>",
     "Could not load user profile": "Konnte Nutzerprofil nicht laden",
     "Your Matrix account on %(serverName)s": "Dein Matrixkonto auf %(serverName)s",
     "Name or Matrix ID": "Name oder Matrix ID",
-    "Your Riot is misconfigured": "Dein Riot ist falsch konfiguriert",
+    "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.",
     "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)",
-    "A conference call could not be started because the integrations server is not available": "Ein Konferenzanruf konnte nicht gestartet werden, da der Integrationsserver nicht verfügbar ist",
     "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.",
     "Replying With Files": "Mit Dateien antworten",
@@ -1367,12 +1247,12 @@
     "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": "Sended das Emoji in Regenbogenfarben",
+    "Sends the given emote coloured as a rainbow": "Sendet das Emoji 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",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Stelle sicher, dass du eine stabile Internetverbindung hast oder wende dich an deinen Server-Administrator",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Wende dich an deinen Riot Admin um <a>deine Konfiguration</a> auf ungültige oder doppelte Einträge zu überprüfen.",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Wende dich an deinen %(brand)s Admin um <a>deine Konfiguration</a> auf ungültige oder doppelte Einträge zu überprüfen.",
     "Unexpected error resolving identity server configuration": "Ein unerwarteter Fehler ist beim Laden der Identitätsserver-Konfiguration aufgetreten",
     "Cannot reach identity server": "Der Identitätsserver ist nicht erreichbar",
     "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.": "Du kannst dich registrieren, aber manche Funktionen werden nicht verfügbar sein bis der Identitätsserver wieder online ist. Wenn diese Warnmeldung weiterhin angezeigt wird, überprüfe deine Konfiguration oder kontaktiere deinen Server-Administrator.",
@@ -1381,7 +1261,6 @@
     "No homeserver URL provided": "Keine Heimserver-URL angegeben",
     "Unexpected error resolving homeserver configuration": "Ein unerwarteter Fehler ist beim Laden der Heimserver-Konfiguration aufgetreten",
     "The user's homeserver does not support the version of the room.": "Die Raumversion wird vom Heimserver des Benutzers nicht unterstützt.",
-    "Show recently visited rooms above the room list": "Zeige kürzlich besuchte Räume oberhalb der Raumliste",
     "Show hidden events in timeline": "Zeige versteckte Ereignisse in der Chronik",
     "Low bandwidth mode": "Modus für niedrige Bandbreite",
     "Reset": "Zurücksetzen",
@@ -1417,8 +1296,8 @@
     "Actions": "Aktionen",
     "Displays list of commands with usages and descriptions": "Zeigt eine Liste von Befehlen mit Verwendungen und Beschreibungen an",
     "Call failed due to misconfigured server": "Anruf aufgrund eines falsch konfigurierten Servers fehlgeschlagen",
-    "Try using turn.matrix.org": "Versuchen Sie es mit turn.matrix.org",
-    "You do not have the required permissions to use this command.": "Sie haben nicht die erforderlichen Berechtigungen, um diesen Befehl zu verwenden.",
+    "Try using turn.matrix.org": "Versuche es mit turn.matrix.org",
+    "You do not have the required permissions to use this command.": "Du hast nicht die erforderlichen Berechtigungen, um diesen Befehl zu verwenden.",
     "Multiple integration managers": "Mehrere Integrationsmanager",
     "Public Name": "Öffentlicher Name",
     "Identity Server URL must be HTTPS": "Die Identity Server-URL muss HTTPS sein",
@@ -1470,16 +1349,11 @@
     "Double check that your server supports the room version chosen and try again.": "Überprüfe nochmal ob dein Server die ausgewählte Raumversion unterstützt und versuche es nochmal.",
     "%(senderName)s placed a voice call.": "%(senderName)s hat einen Sprachanruf getätigt.",
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s hat einen Sprachanruf getätigt. (Nicht von diesem Browser unterstützt)",
-    "%(senderName)s placed a video call.": "%(senderName)s hat einen Sprachanruf getätigt.",
-    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s hat einen Sprachanruf getätigt. (Nicht von diesem Browser unterstützt)",
+    "%(senderName)s placed a video call.": "%(senderName)s hat einen Videoanruf getätigt.",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s hat einen Videoanruf getätigt. (Nicht von diesem Browser unterstützt)",
     "Verify this session": "Sitzung verifizieren",
     "Set up encryption": "Verschlüsselung einrichten",
-    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s hat %(addedAddresses)s und %(count)s Adressen zu diesem Raum hinzugefügt",
-    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s hat %(removedAddresses)s und %(count)s andere Adressen aus diesem Raum entfernt",
-    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s hat %(countRemoved)s entfernt und %(countAdded)s Adressen zu diesem Raum hinzugefügt",
-    "%(senderName)s turned on end-to-end encryption.": "%(senderName)s hat die Ende-zu-Ende Verschlüsselung aktiviert.",
-    "%(senderName)s turned on end-to-end encryption (unrecognised algorithm %(algorithm)s).": "%(senderName)s hat die Ende-zu-Ende Verschlüsselung aktiviert (unbekannter Algorithmus %(algorithm)s).",
-    "%(senderName)s updated an invalid ban rule": "%(senderName)s hat eine ungültige Bannregel aktualisiert",
+    "%(senderName)s updated an invalid ban rule": "%(senderName)s aktualisierte eine ungültige Ausschluss-Regel",
     "The message you are trying to send is too large.": "Die Nachricht, die du versuchst zu senden, ist zu lang.",
     "a few seconds ago": "vor ein paar Sekunden",
     "about a minute ago": "vor etwa einer Minute",
@@ -1502,7 +1376,7 @@
     "Verify": "Verifizieren",
     "Decline (%(counter)s)": "Zurückweisen (%(counter)s)",
     "not found": "nicht gefunden",
-    "rooms.": "Räume.",
+    "rooms.": "Räumen zu speichern.",
     "Manage": "Verwalten",
     "Securely cache encrypted messages locally for them to appear in search results.": "Speichere verschlüsselte Nachrichten sicher lokal zwischen, sodass sie in Suchergebnissen erscheinen können.",
     "Enable": "Aktivieren",
@@ -1531,7 +1405,6 @@
     "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",
-    "Please verify the room ID or alias and try again.": "Bitte überprüfe die Raum ID oder den Alias und versuche es erneut.",
     "Error removing ignored user/server": "Fehler beim Entfernen eines ignorierten Benutzers/Servers",
     "Error unsubscribing from list": "Fehler beim Deabonnieren der Liste",
     "Please try again or view your console for hints.": "Bitte versuche es erneut oder sieh für weitere Hinweise in deine Konsole.",
@@ -1543,49 +1416,39 @@
     "View rules": "Regeln betrachten",
     "You are currently subscribed to:": "Du abonnierst momentan:",
     "⚠ These settings are meant for advanced users.": "⚠ Diese Einstellungen sind für fortgeschrittene Nutzer gedacht.",
-    "The version of Riot": "Die Version von Riot",
-    "Whether you're using Riot on a device where touch is the primary input mechanism": "Ob du Riot auf einem Gerät verwendest, bei dem Berührung der primäre Eingabemechanismus ist",
-    "Whether you're using Riot as an installed Progressive Web App": "Ob Sie Riot als installierte progressive Web-App verwenden",
+    "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",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Ob Sie %(brand)s als installierte progressive Web-App verwenden",
     "Your user agent": "Dein User-Agent",
-    "The information being sent to us to help make Riot better includes:": "Zu den Informationen, die uns zugesandt werden, um zu helfen, Riot besser zu machen, gehören:",
-    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Es sind unbekannte Sitzungen in diesem Raum: Wenn du ohne Verifizierung fortfährst, wird es für jemanden möglich sein, deinen Anruf zu belauschen.",
     "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.",
     "If you cancel now, you won't complete verifying your other session.": "Wenn Sie jetzt abbrechen, werden Sie die Verifizierung der anderen Sitzung nicht beenden können.",
-    "If you cancel now, you won't complete your secret storage operation.": "Wenn Sie jetzt abbrechen, werden Sie die Geheimlagerungsoperation nicht beenden können.",
     "Cancel entering passphrase?": "Eingabe der Passphrase abbrechen?",
     "Setting up keys": "Einrichten der Schlüssel",
     "Encryption upgrade available": "Verschlüsselungs-Update verfügbar",
-    "Unverified session": "Ungeprüfte Sitzung",
     "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: 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 Ihre Kommunikation abgehört wird!",
+    "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 End-zu-End-Verschlüsselungsschlüssel in allen Sitzungen zurückgesetzt, sodass der verschlüsselte Chat-Verlauf nicht mehr lesbar ist, es sei denn, Sie exportieren zuerst Ihre Raumschlüssel und importieren sie anschließend wieder. In Zukunft wird dies verbessert werden.",
     "Delete %(count)s sessions|other": "Lösche %(count)s Sitzungen",
     "Backup is not signed by any of your sessions": "Die Sicherung ist von keiner Ihrer Sitzungen unterzeichnet",
     "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Ihr Passwort wurde erfolgreich geändert. Sie erhalten keine Push-Benachrichtigungen zu anderen Sitzungen, bis Sie sich wieder bei diesen anmelden",
-    "Sessions": "Sitzungen",
     "Notification sound": "Benachrichtigungston",
-    "Set a new custom sound": "Setze einen neuen benutzerdefinierten Sound",
+    "Set a new custom sound": "Setze einen neuen benutzerdefinierten Ton",
     "Browse": "Durchsuche",
     "Direct Messages": "Direktnachrichten",
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Sie können <code>/help</code> benutzen, um verfügbare Befehle aufzulisten. Wollten Sie dies als Nachricht senden?",
     "Direct message": "Direktnachricht",
-    "Set a room alias to easily share your room with other people.": "Setze ein Raum-Alias, um deinen Raum einfach mit anderen Personen zu teilen.",
     "Suggestions": "Vorschläge",
     "Recently Direct Messaged": "Kürzlich direkt verschickt",
-    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Wenn Sie niemanden finden können, fragen Sie nach deren Benutzernamen, teilen Sie ihren Benutzernamen (%(userId)s) oder <a>Profil-Link</a>.",
     "Go": "Los",
-    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Wenn Sie niemanden finden können, fragen Sie nach deren Benutzernamen (z.B. @benutzer:server.de) oder <a>teilen Sie diesen Raum</a>.",
     "Command Help": "Befehl Hilfe",
     "To help us prevent this in future, please <a>send us logs</a>.": "Um uns zu helfen, dies in Zukunft zu vermeiden, <a>senden Sie uns bitte Logs</a>.",
-    "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Wir empfehlen Ihnen, den Verifizierungsprozess für jede Sitzung zu durchlaufen, um zu bestätigen, dass sie ihrem rechtmäßigen Eigentümer gehören, aber Sie können die Nachricht auch ohne Verifizierung erneut senden, wenn Sie dies bevorzugen.",
     "Notification settings": "Benachrichtigungseinstellungen",
-    "Help": "Hilfe",
-    "Filter": "Filter",
+    "Help": "Hilf uns",
+    "Filter": "Filtern",
     "Filter rooms…": "Räume filtern…",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Sie haben %(count)s ungelesene Benachrichtigungen in einer früheren Version dieses Raumes.",
     "Go Back": "Gehe zurück",
@@ -1593,15 +1456,10 @@
     "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.": "Sie haben diesen Benutzer verifiziert. Dieser Benutzer hat alle seine Sitzungen verifiziert.",
-    "Some sessions for this user are not trusted": "Einige Sitzungen für diesen Benutzer sind nicht vertrauenswürdig",
-    "All sessions for this user are trusted": "Alle Sitzungen für diesen Benutzer sind vertrauenswürdig",
-    "Some sessions in this encrypted room are not trusted": "Einige Sitzungen in diesem verschlüsselten Raum sind nicht vertrauenswürdig",
-    "All sessions in this encrypted room are trusted": "Alle Sitzungen in diesem verschlüsselten Raum sind vertrauenswürdig",
     "Your key share request has been sent - please check your other sessions for key share requests.": "Ihre Anfrage zur Schlüssel-Teilung wurde gesendet - bitte überprüfen Sie Ihre anderen Sitzungen auf Anfragen zur Schlüssel-Teilung.",
     "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.": "Anfragen zum Teilen von Schlüsseln werden automatisch an Ihre anderen Sitzungen gesendet. Wenn Sie die Anfragen zum Teilen von Schlüsseln in Ihren anderen Sitzungen abgelehnt oder abgewiesen haben, klicken Sie hier, um die Schlüssel für diese Sitzung erneut anzufordern.",
     "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Wenn Ihre anderen Sitzungen nicht über den Schlüssel für diese Nachricht verfügen, können Sie sie nicht entschlüsseln.",
     "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Fordern Sie Verschlüsselungsschlüssel aus Ihren anderen Sitzungen erneut an</requestLink>.",
-    "No sessions with registered encryption keys": "Keine Sitzungen mit registrierten Verschlüsselungsschlüsseln",
     "Room %(name)s": "Raum %(name)s",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Ein Upgrade dieses Raums schaltet die aktuelle Instanz des Raums ab und erstellt einen aktualisierten Raum mit demselben Namen.",
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) hat sich zu einer neuen Sitzung angemeldet, ohne sie zu verifizieren:",
@@ -1630,18 +1488,9 @@
     "Session name": "Name der Sitzung",
     "This will allow you to return to your account after signing out, and sign in on other sessions.": "So können Sie nach der Abmeldung zu Ihrem Konto zurückkehren und sich bei anderen Sitzungen anmelden.",
     "Use bots, bridges, widgets and sticker packs": "Benutze Bots, Bridges, Widgets und Sticker-Packs",
-    "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "Sie blockieren derzeit nicht verifizierte Sitzungen; um Nachrichten an diese Sitzungen zu senden, müssen Sie sie verifizieren.",
-    "Room contains unknown sessions": "Raum enthält unbekannte Sitzungen",
-    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "\"%(RoomName)s\" enthält Sitzungen, die Sie noch nie zuvor gesehen haben.",
-    "Unknown sessions": "Unbekannte Sitzungen",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "Greifen Sie durch Eingabe Ihrer Passphrase auf Ihren sicheren Nachrichtenverlauf und Ihre Quersignatur-Identität zu, um andere Sitzungen zu überprüfen.",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Greifen Sie durch Eingabe Ihres Wiederherstellungsschlüssels auf Ihren sicheren Nachrichtenverlauf und Ihre Quersignatur-Identität zur Überprüfung anderer Sitzungen zu.",
-    "Message not sent due to unknown sessions being present": "Nachricht wird nicht gesendet, da unbekannte Sitzungen vorhanden sind",
-    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Sitzungen anzeigen</showSessionsText>, <sendAnywayText>trotzdem senden</sendAnywayText> oder <cancelText>abbrechen</cancelText>.",
     "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 Sie Ihr Passwort ändern, werden alle End-to-End-Verschlüsselungsschlüssel für alle Ihre Sitzungen zurückgesetzt, sodass der verschlüsselte Chat-Verlauf nicht mehr lesbar ist. Richten Sie ein Schlüssel-Backup ein oder exportieren Sie Ihre Raumschlüssel aus einer anderen Sitzung, bevor Sie Ihr Passwort zurücksetzen.",
     "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.": "Sie wurden von allen Sitzungen abgemeldet und erhalten keine Push-Benachrichtigungen mehr. Um die Benachrichtigungen wieder zu aktivieren, melden Sie sich 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.": "Aktualisieren Sie diese Sitzung, damit sie andere Sitzungen verifizieren kann, indem sie ihnen Zugang zu verschlüsselten Nachrichten gewährt und sie für andere Benutzer als vertrauenswürdig markiert.",
-    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Richten Sie für diese Sitzung eine Verschlüsselung ein, damit sie andere Sitzungen verifizieren kann, indem sie ihnen Zugang zu verschlüsselten Nachrichten gewährt und sie für andere Benutzer 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.",
@@ -1659,7 +1508,6 @@
     "Start": "Starte",
     "Discovery": "Kontakte",
     "Done": "Erledigt",
-    "Manually Verify": "Manuell verifizieren",
     "Trusted": "Vertrauenswürdig",
     "Not trusted": "Nicht vertrauenswürdig",
     "%(count)s verified sessions|one": "1 verifizierte Sitzung",
@@ -1714,8 +1562,7 @@
     "You're previewing %(roomName)s. Want to join it?": "Du betrachtest %(roomName)s. Willst du beitreten?",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s hat die alternative Adresse 2%(addresses)s für diesen Raum hinzugefügt.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s hat die Adresse für diesen Raum geändert.",
-    "Review Sessions": "Sitzungen überprüfen",
-    "Displays information about a user": "Zeigt Informationen über einen Benutzer",
+    "Displays information about a user": "Zeigt Informationen über ein/e Benutzer!n",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s hat den Raumnamen von %(oldRoomName)s zu %(newRoomName)s geändert.",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s hat die alternative Adresse %(addresses)s für diesen Raum hinzugefügt.",
     "%(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.",
@@ -1731,7 +1578,7 @@
     "%(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 erstellte eine Ausschluss-Regel für Räume, 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",
     "Do you want to chat with %(user)s?": "Möchtest du mit %(user)s chatten?",
@@ -1751,7 +1598,7 @@
     "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 Sitzungsname ist sichtbar für die Personen mit denen du kommunizierst",
+    "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",
@@ -1767,9 +1614,7 @@
     "Create a public room": "Erstelle einen öffentlichen Raum",
     "Show advanced": "Weitere Einstellungen anzeigen",
     "Verify session": "Sitzung verifizieren",
-    "To verify that this session can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this session matches the key below:": "Um diese Sitzung zu verifizieren kontaktiere bitte den Benutzer über einen anderen Kanal (z.B. persönlich oder mit einem Telefonanruf) und frage ihn ob der Sitzungsschlüssel in seinen Benutzereinstellungen mit dem hier angezeigten übereinstimmt:",
     "Session key": "Sitzungsschlüssel",
-    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "Wenn die Sitzungsschlüssel übereinstimmen, drücke den Knopf zur Bestätigung. Stimmen sie nicht überein versucht jemand diese Sitzung abzufangen und du solltest diese Sitzung blockieren.",
     "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.",
@@ -1780,47 +1625,40 @@
     "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.",
-    "Sender session information": "Absender Sitzungsinformationen",
     "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.",
     "Your recovery key": "Dein Wiederherstellungsschlüssel",
     "Copy": "In Zwischenablage kopieren",
     "Make a copy of your recovery key": "Speichere deinen Wiederherstellungsschlüssel",
-    "Unverified login. Was this you?": "Nicht verifizierte Anmeldung. Bist du es gewesen?",
     "Sends a message as html, without interpreting it as markdown": "Verschickt eine Nachricht im html-Format, ohne sie in Markdown zu formatieren",
     "Show rooms with unread notifications first": "Räume mit nicht gelesenen Benachrichtungen zuerst zeigen",
     "Show shortcuts to recently viewed rooms above the room list": "Kurzbefehlezu den kürzlich gesichteteten Räumen über der Raumliste anzeigen",
-    "Use Single Sign On to continue": "Benutze „Single Sign-On“ (Einmalanmeldung) um fortzufahren",
+    "Use Single Sign On to continue": "Nutze „Single Sign-On“ (Einmal-Anmeldung) um fortzufahren",
     "Confirm adding this email address by using Single Sign On to prove your identity.": "Bestätige das Hinzufügen dieser E-Mail-Adresse mit „Single Sign-On“, um deine Identität nachzuweisen.",
     "Single Sign On": "Single Sign-On",
-    "Confirm adding email": "Bestätige das Hinzfugen der Email-Addresse",
-    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Bestätige das Hinzufügen dieser Telefonnumer, indem du deine Identität mittels Single Sign-On nachweist.",
-    "Click the button below to confirm adding this phone number.": "Betätige unten die Schaltfläche um das Hinzufügen dieser Telefonnummer zu bestätigen.",
+    "Confirm adding email": "Hinzufügen der E-Mail-Adresse bestätigen",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Bestätige das Hinzufügen dieser Telefonnummer, indem du deine Identität mittels „Single Sign-On“ nachweist.",
+    "Click the button below to confirm adding this phone number.": "Klicke unten die Schaltfläche, um die hinzugefügte Telefonnummer zu bestätigen.",
     "If you cancel now, you won't complete your operation.": "Wenn du jetzt abbrichst, wirst du deinen Vorgang nicht fertigstellen.",
     "%(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",
-    "Click the button below to confirm adding this email address.": "Klicken Sie auf die Schaltfläche unten, um das Hinzufügen dieser E-Mail-Adresse zu bestätigen.",
-    "Confirm adding phone number": "Bestätigen Sie das Hinzufügen der Telefonnummer.",
+    "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": "Hinzufügen der 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 vertrauenswürdig",
+    "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",
-    "Enable cross-signing to verify per-user instead of per-session": "Aktiviere Cross-Signing um pro Benutzer statt pro Sitzung zu verifizieren",
     "Ask this user to verify their session, or manually verify it below.": "Bitte diese/n Nutzer!n, seine/ihre Sitzung zu verifizieren, oder verifiziere diese unten manuell.",
-    "Enable local event indexing and E2EE search (requires restart)": "Aktiviere lokale Ereignis-Indizierung und E2EE-Suche (erfordert Neustart)",
     "a few seconds from now": "in ein paar Sekunden",
-    "Show a presence dot next to DMs in the room list": "Verfügbarkeitspunkt neben den Direktnachrichten in der Raumliste anzeigen",
-    "Show padlocks on invite only rooms": "Zeige Schlösser an Räumen, welchen nur mit Einladung beigetreten werden kann",
-    "Keep recovery passphrase in memory for this session": "Behalte die Wiederherstellungspassphrase für diese Sitzung im Speicher",
     "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 sollten Nachrichten heruntergeladen werden?",
+    "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",
     "Waiting for %(displayName)s to verify…": "Warte darauf, dass %(displayName)s bestätigt…",
     "Cancelling…": "Abbrechen…",
@@ -1833,7 +1671,6 @@
     "Workspace: %(networkName)s": "Arbeitsbereich: %(networkName)s",
     "Channel: %(channelName)s": "Kanal: %(channelName)s",
     "Show less": "Weniger zeigen",
-    "<b>Warning</b>: You should only do this on a trusted computer.": "<b>Achtung</b>: Du solltest das nur auf einem vertrauenswürdigen Gerät tun.",
     "<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.",
     "Forgotten your password?": "Passwort vergessen?",
@@ -1854,6 +1691,722 @@
     "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",
-    "Confirm recovery passphrase": "Bestätige die Wiederherstellungspassphrase",
-    "Please enter your recovery passphrase a second time to confirm.": "Bitte gib deine Wiederherstellungspassphrase ein zweites Mal ein um sie zu bestätigen."
+    "Please enter your recovery passphrase a second time to confirm.": "Bitte gib deine Wiederherstellungspassphrase ein zweites Mal ein um sie zu bestätigen.",
+    "Review where you’re logged in": "Überprüfe, wo du eingeloggt bist",
+    "New login. Was this you?": "Neue Anmeldung. Warst du das?",
+    "Please supply a widget URL or embed code": "Bitte gib eine Widget-URL oder einen Einbettungscode an",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Gibt den per SMS an +%(msisdn)s gesendeten Bestätigungscode ein.",
+    "Someone is using an unknown session": "Jemand verwendet eine unbekannte Sitzung",
+    "This room is end-to-end encrypted": "Dieser Raum ist Ende-zu-Ende verschlüsselt",
+    "You are not subscribed to any lists": "Du hast keine Listen abonniert",
+    "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.",
+    "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.",
+    "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.",
+    "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",
+    "Session ID:": "Sitzungs-ID:",
+    "Message search": "Nachrichtensuche",
+    "Cross-signing": "Cross-Signing",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Dieser Raum verbindet Nachrichten mit den folgenden Plattformen. <a>Mehr erfahren.</a>",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Dieser Raum verbindet keine Nachrichten mit Plattformen. <a>Mehr erfahren.</a>",
+    "Bridges": "Bridges",
+    "Uploaded sound": "Hochgeladener Ton",
+    "Upgrade this room to the recommended room version": "Aktualisiere diesen Raum auf die empfohlene Raumversion",
+    "this room": "Dieser Raum",
+    "View older messages in %(roomName)s.": "Zeige alte Nachrichten in %(roomName)s.",
+    "Send a bug report with logs": "Sende Fehlermeldung mit Protokoll",
+    "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",
+    "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)",
+    "Your homeserver does not support cross-signing.": "Dein Heimserver unterstützt cross-signing nicht.",
+    "Cross-signing and secret storage are enabled.": "Cross-signing und der sichere Speicher wurden eingerichtet.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Dein Konto hat eine cross-signing Identität im sicheren Speicher aber diese Sitzung wird noch nicht vertraut.",
+    "Cross-signing and secret storage are not yet set up.": "Cross-signing und der sichere Speicher wurden noch nicht eingerichtet.",
+    "Reset cross-signing and secret storage": "Setze cross-signing und den sicheren Speicher zurück",
+    "Bootstrap cross-signing and secret storage": "Richte cross-signing und den sicheren Speicher ein",
+    "unexpected type": "unbekannter Typ",
+    "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",
+    "Self signing private key:": "Selbst signierter privater Schlüssel:",
+    "cached locally": "lokal zwischengespeichert",
+    "not found locally": "lokal nicht gefunden",
+    "User signing private key:": "Privater Benutzer-Schlüssel:",
+    "Session backup key:": "Sitzungswiederherstellungsschlüssel:",
+    "Secret storage public key:": "Öffentlicher Schlüssel des sicheren Speichers:",
+    "in account data": "in den Kontodaten",
+    "Homeserver feature support:": "Heimserverunterstützung:",
+    "exists": "existiert",
+    "Delete sessions|other": "Lösche Sitzungen",
+    "Delete sessions|one": "Lösche Sitzung",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Sitzungen eines Benutzers einzeln verifizieren. Geräten, die ein Benutzer als vertrauenswürdig markiert hat, wird nicht automatisch vertraut (cross-signing).",
+    "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 aus ",
+    "%(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>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.",
+    "Error downloading theme information.": "Fehler beim herunterladen des Themas.",
+    "Theme added!": "Design hinzugefügt!",
+    "Custom theme URL": "URL des benutzerdefinierten Designs",
+    "Add theme": "Design hinzufügen",
+    "Keyboard Shortcuts": "Tastaturkürzel",
+    "Where you’re logged in": "Wo du dich angemeldet hast",
+    "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",
+    "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",
+    "Mod": "Mod",
+    "Invite only": "Nur auf Einladung",
+    "Scroll to most recent messages": "Springe zur neusten Nachricht",
+    "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.",
+    "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",
+    "Send a reply…": "Sende eine Antwort…",
+    "Send a message…": "Sende eine Nachricht…",
+    "Bold": "Fett",
+    "Italics": "Kursiv",
+    "Strikethrough": "Durchgestrichen",
+    "Code block": "Quelltext",
+    "Recent rooms": "Letzte Räume",
+    "Loading …": "Lade …",
+    "Join the conversation with an account": "Tritt der Unterhaltung mit einem Konto bei",
+    "You were kicked from %(roomName)s by %(memberName)s": "Du wurdest von %(memberName)s aus %(roomName)s entfernt",
+    "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.",
+    "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.",
+    "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.",
+    "%(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.",
+    "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.",
+    "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.",
+    "Mark all as read": "Alle als gelesen markieren",
+    "Local address": "Lokale Adresse",
+    "Published Addresses": "Öffentliche Adresse",
+    "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.": "Öffentliche Adressen können von jedem verwendet werden um den Raum zu betreten. Um eine Adresse zu veröffentlichen musst du zunächst eine lokale Adresse anlegen.",
+    "Other published addresses:": "Andere öffentliche Adressen:",
+    "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",
+    "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.",
+    "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.",
+    "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",
+    "<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.",
+    "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.",
+    "Start verification again from their profile.": "Starte die Verifikation aus dem Benutzerprofil erneut.",
+    "Verification timed out.": "Verifikationsanfrage abgelaufen.",
+    "You cancelled verification on your other session.": "Du hast die Verifikationsanfrage in der anderen Sitzung abgelehnt.",
+    "%(displayName)s cancelled verification.": "%(displayName)s hat die Verifikationsanfrage abgelehnt.",
+    "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>",
+    "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",
+    "Show all": "Alle zeigen",
+    "Reactions": "Reaktionen",
+    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> hat mit %(content)s reagiert</reactedWith>",
+    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>hat mit %(shortName)s reagiert</reactedWith>",
+    "Message deleted": "Nachricht gelöscht",
+    "Message deleted by %(name)s": "Nachricht von %(name)s gelöscht",
+    "Edited at %(date)s. Click to view edits.": "Am %(date)s geändert. Klicke um Änderungen anzuzeigen.",
+    "Can't load this message": "Kann diese Nachricht nicht laden",
+    "Submit logs": "Logs übermitteln",
+    "Frequently Used": "Häufig verwendet",
+    "Smileys & People": "Smileys & Leute",
+    "Animals & Nature": "Tiere & Natur",
+    "Food & Drink": "Essen & Trinken",
+    "Activities": "Aktivitäten",
+    "Travel & Places": "Reisen & Orte",
+    "Objects": "Objekte",
+    "Symbols": "Symbole",
+    "Flags": "Flaggen",
+    "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 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.",
+    "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",
+    "Rotate Right": "Nach rechts drehen",
+    "Rotate clockwise": "Im Uhrzeigersinn drehen",
+    "Language Dropdown": "Sprachauswahl",
+    "%(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",
+    "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",
+    "All rooms": "Alle Räume",
+    "Your server": "Dein Server",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "Bist du sicher dass du <b>%(serverName)s</b> entfernen möchtest",
+    "Remove server": "Server entfernen",
+    "Matrix": "Matrix",
+    "Add a new server": "Einen Server hinzufügen",
+    "Enter the name of a new server you want to explore.": "Gib den Namen des Servers an den du erforschen möchtest.",
+    "Server name": "Servername",
+    "Add a new server...": "Füge einen Server hinzu...",
+    "%(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.",
+    "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.",
+    "Removing…": "Löschen…",
+    "Destroy cross-signing keys?": "Cross-signing Schlüssel löschen?",
+    "Clear cross-signing keys": "Entferne Cross-signing Schlüssel",
+    "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",
+    "Server did not return valid authentication information.": "Der Server lieferte keine gültigen Authentifizierungsinformationen.",
+    "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",
+    "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",
+    "a new master key signature": "Eine neue Hauptschlüssel Signatur",
+    "a new cross-signing key signature": "Eine neue cross-signing Schlüssel Signatur",
+    "a device cross-signing signature": "Eine Geräte Schlüssel Signatur",
+    "a key signature": "Eine Schlüssel Signatur",
+    "Your password": "Dein Passwort",
+    "This session, or the other session": "Diese oder die andere Sitzung",
+    "Alt Gr": "Alt Gr",
+    "Shift": "Umschalt",
+    "Super": "Windows/Apple",
+    "Ctrl": "Strg",
+    "Toggle Bold": "Fett",
+    "Toggle Italics": "Kursiv",
+    "Toggle Quote": "Zitat",
+    "New line": "Neue Zeile",
+    "Page Up": "Bild hoch",
+    "Page Down": "Bild runter",
+    "Esc": "Esc",
+    "Enter": "Enter",
+    "Space": "Leertaste",
+    "End": "Ende",
+    "Enable 'Manage Integrations' in Settings to do this.": "Aktiviere hierzu in den Einstellungen \"Integrationen verwalten\".",
+    "The internet connection either session is using": "Die Internetverbindung, die eine der beiden Sitzung verwendet",
+    "We recommend you change your password and recovery key in Settings immediately": "Wir empfehlen, dein Passwort und deine Wiederherstellungsschlüssel sofort in den Einstellungen zu ändern",
+    "New session": "Neue Sitzung",
+    "Use this session to verify your new one, granting it access to encrypted messages:": "Verwende diese Sitzung, um deine neue Sitzung zu verifizieren und ihr Zugriff auf verschlüsselte Nachrichten zu gewähren:",
+    "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",
+    "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",
+    "Your browser likely removed this data when running low on disk space.": "Dein Browser hat diese Daten wahrscheinlich entfernt als der Festplattenspeicher knapp wurde.",
+    "Integration Manager": "Integrationsverwaltung",
+    "Find others by phone or email": "Finde Andere per Telefon oder E-Mail",
+    "Be found by phone or email": "Sei per Telefon oder E-Mail auffindbar",
+    "Upload files (%(current)s of %(total)s)": "Dateien hochladen (%(current)s von %(total)s)",
+    "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Die Datei ist <b>zu groß</b>, um hochgeladen zu werden. Die maximale Dateigröße ist %(limit)s, aber diese Datei ist %(sizeOfThisFile)s groß.",
+    "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",
+    "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",
+    "Remember my selection for this widget": "Speichere meine Auswahl für dieses Widget",
+    "Restoring keys from backup": "Schlüssel aus der Sicherung wiederherstellen",
+    "Fetching keys from server...": "Lade Schlüssel vom Server...",
+    "%(completed)s of %(total)s keys restored": "%(completed)s von %(total)s Schlüsseln wiederhergestellt",
+    "Keys restored": "Schlüssel wiederhergestellt",
+    "Successfully restored %(sessionCount)s keys": "%(sessionCount)s Schlüssel erfolgreich wiederhergestellt",
+    "Reload": "Neu laden",
+    "Take picture": "Foto machen",
+    "User Status": "Benutzerstatus",
+    "Country Dropdown": "Landauswahl",
+    "Recovery key mismatch": "Nicht übereinstimmende Wiederherstellungsschlüssel",
+    "Incorrect recovery passphrase": "Falsche Wiederherstellungspassphrase",
+    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Wenn du deine Wiederherstellungsschlüssel vergessen hast, kannst du <button>neue Wiederherstellungsoptionen einrichten</button>",
+    "Resend edit": "Bearbeitung erneut senden",
+    "Resend %(unsentCount)s reaction(s)": "%(unsentCount)s Reaktion(en) erneut senden",
+    "Resend removal": "Entfernen erneut senden",
+    "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Fehlender öffentlicher Captcha-Schlüssel in der Heimserver-Konfiguration. Bitte melde dies deinem Heimserver-Administrator.",
+    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Da kein Identitätsserver konfiguriert ist, kannst du keine E-Mail-Adresse hinzufügen, um dein Kennwort in Zukunft zurückzusetzen.",
+    "Use an email address to recover your account": "Verwende eine E-Mail-Adresse, um dein Konto wiederherzustellen",
+    "Enter email address (required on this homeserver)": "E-Mail-Adresse eingeben (auf diesem Heimserver erforderlich)",
+    "Doesn't look like a valid email address": "Das sieht nicht nach einer gültigen E-Mail-Adresse aus",
+    "Enter phone number (required on this homeserver)": "Telefonnummer eingeben (auf diesem Heimserver erforderlich)",
+    "Doesn't look like a valid phone number": "Das sieht nicht nach einer gültigen Telefonnummer aus",
+    "Sign in with SSO": "Mit Single-Sign-On anmelden",
+    "Welcome to %(appName)s": "Willkommen bei %(appName)s",
+    "Send a Direct Message": "Sende eine Direktnachricht",
+    "Create a Group Chat": "Erstelle einen Gruppenchat",
+    "Use lowercase letters, numbers, dashes and underscores only": "Verwende nur Kleinbuchstaben, Zahlen, Bindestriche und Unterstriche",
+    "Enter your custom identity server URL <a>What does this mean?</a>": "URL deines benutzerdefinierten Identitätsservers eingeben <a>Was bedeutet das?</a>",
+    "%(brand)s failed to get the public room list.": "%(brand)s konnte die Liste der öffentlichen Räume nicht laden.",
+    "Verify this login": "Diese Anmeldung verifizieren",
+    "Syncing...": "Synchronisiere...",
+    "Signing In...": "Melde an...",
+    "The homeserver may be unavailable or overloaded.": "Der Heimserver ist möglicherweise nicht verfügbar oder überlastet.",
+    "Jump to first unread room.": "Zum ersten ungelesenen Raum springen.",
+    "Jump to first invite.": "Zur ersten Einladung springen.",
+    "You have %(count)s unread notifications in a prior version of this room.|other": "Du hast %(count)s ungelesene Benachrichtigungen in einer früheren Version dieses Raums.",
+    "Session verified": "Sitzung verifiziert",
+    "Failed to get autodiscovery configuration from server": "Abrufen der Autodiscovery-Konfiguration vom Server fehlgeschlagen",
+    "Invalid base_url for m.homeserver": "Ungültige base_url für m.homeserver",
+    "Homeserver URL does not appear to be a valid Matrix homeserver": "Die Heimserver-URL scheint kein gültiger Matrix-Heimserver zu sein",
+    "Invalid base_url for m.identity_server": "Ungültige base_url für m.identity_server",
+    "Identity server URL does not appear to be a valid identity server": "Die Identitätsserver-URL scheint kein gültiger Identitätsserver zu sein",
+    "This account has been deactivated.": "Dieses Konto wurde deaktiviert.",
+    "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.",
+    "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",
+    "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?",
+    "Click the link in the email you received to verify and then click continue again.": "Klicke auf den Link in der Bestätigungs-E-Mail, und dann auf Weiter.",
+    "Unable to revoke sharing for phone number": "Widerrufen der geteilten Telefonnummer nicht möglich",
+    "Unable to share phone number": "Teilen der Telefonnummer nicht möglich",
+    "%(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.",
+    "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.",
+    "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",
+    "Cancelled signature upload": "Hochladen der Signatur abgebrochen",
+    "Unable to upload": "Hochladen nicht möglich",
+    "Signature upload success": "Signatur erfolgreich hochgeladen",
+    "Signature upload failed": "Hochladen der Signatur fehlgeschlagen",
+    "Confirm by comparing the following with the User Settings in your other session:": "Bestätige indem du das folgende mit deinen Benutzereinstellungen in deiner anderen Sitzung vergleichst:",
+    "Confirm this user's session by comparing the following with their User Settings:": "Bestätige die Sitzung dieses Benutzers indem du das folgende mit seinen Benutzereinstellungen vergleichst:",
+    "If they don't match, the security of your communication may be compromised.": "Wenn sie nicht übereinstimmen kann die Sicherheit eurer Kommunikation kompromittiert sein.",
+    "Your homeserver doesn't seem to support this feature.": "Dein Heimserver scheint diese Funktion nicht zu unterstützen.",
+    "Message edits": "Nachrichtenänderungen",
+    "Your account is not secure": "Dein Konto ist nicht sicher",
+    "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:": "Um diesen Raum zu aktualisieren, muss die aktuelle Instanz des Raums geschlossen und an ihrer Stelle ein neuer Raum erstellt werden. Um den Raummitgliedern die bestmögliche Erfahrung zu bieten, werden wir:",
+    "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Einen Raum zu aktualisieren ist eine komplexe Aktion und wird normalerweise empfohlen, wenn ein Raum aufgrund von Fehlern, fehlenden Funktionen oder Sicherheitslücken instabil ist.",
+    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Einige Sitzungsdaten, einschließlich der Verschlüsselungsschlüssel, fehlen. Melde dich ab, wieder an und stelle die Schlüssel aus der Sicherung wieder her um dies zu beheben.",
+    "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.": "Ein Widget unter %(widgetUrl)s möchte deine Identität überprüfen. Wenn du dies zulässt, kann das Widget deine Nutzer-ID überprüfen, jedoch keine Aktionen in deinem Namen ausführen.",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Der sichere Speicher konnte nicht geladen werden. Bitte stelle sicher dass du die richtige Wiederherstellungspassphrase eingegeben hast.",
+    "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 den richtigen 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",
+    "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",
+    "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.",
+    "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Dein neues Konto (%(newAccountId)s) ist registriert, aber du hast dich bereits in mit einem anderen Konto (%(loggedInUserId)s) angemeldet.",
+    "This requires the latest %(brand)s on your other devices:": "Dies benötigt die neuste Version von %(brand)s auf deinen anderen Geräten:",
+    "Failed to re-authenticate due to a homeserver problem": "Erneute Authentifizierung aufgrund eines Problems im Heimserver fehlgeschlagen",
+    "Failed to re-authenticate": "Erneute Authentifizierung fehlgeschlagen",
+    "Command Autocomplete": "Auto-Vervollständigung aktivieren",
+    "Community Autocomplete": "Community-Auto-Vervollständigung",
+    "DuckDuckGo Results": "DuckDuckGo Ergebnisse",
+    "Great! This recovery passphrase looks strong enough.": "Super! Diese Wiederherstellungspassphrase sieht stark genug aus.",
+    "Enter a recovery passphrase": "Gib eine Wiederherstellungspassphrase ein",
+    "Emoji Autocomplete": "Emoji-Auto-Vervollständigung",
+    "Room Autocomplete": "Raum-Auto-Vervollständigung",
+    "User Autocomplete": "Nutzer-Auto-Vervollständigung",
+    "Restore your key backup to upgrade your encryption": "Schlüsselsicherung wiederherstellen, um deine Verschlüsselung zu aktualisieren",
+    "Restore": "Wiederherstellen",
+    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Dein Wiederherstellungsschlüssel wurde <b>in die Zwischenablage kopiert</b>. Füge ihn ein in:",
+    "Your recovery key is in your <b>Downloads</b> folder.": "Dein Wiederherstellungsschlüssel ist in deinem <b>Download-Ordner</b>.",
+    "Upgrade your encryption": "Deine Verschlüsselung aktualisieren",
+    "Unable to set up secret storage": "Sicherer Speicher kann nicht eingerichtet werden",
+    "Repeat your recovery passphrase...": "Gib die Wiederherstellungspassphrase erneut ein...",
+    "Secure your backup with a recovery passphrase": "Verschlüssele deine Sicherung mit einer Wiederherstellungspassphrase",
+    "Create key backup": "Schlüsselsicherung erstellen",
+    "This session is encrypting history using the new recovery method.": "Diese Sitzung verschlüsselt den Verlauf mit der neuen Wiederherstellungsmethode.",
+    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Diese Sitzung hat festgestellt, dass deine Wiederherstellungspassphrase und dein Schlüssel für sichere Nachrichten entfernt wurden.",
+    "Currently indexing: %(currentRoom)s": "Indiziere: %(currentRoom)s",
+    "Navigation": "Navigation",
+    "Calls": "Anrufe",
+    "Room List": "Raumliste",
+    "Autocomplete": "Auto-Vervollständigung",
+    "Alt": "Alt",
+    "Toggle microphone mute": "Schalte Mikrophon stumm",
+    "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 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",
+    "Not currently indexing messages for any room.": "Derzeit werden keine Nachrichten für Räume indiziert.",
+    "Space used:": "Speicherplatzbedarf:",
+    "Indexed messages:": "Indizierte Nachrichten:",
+    "Indexed rooms:": "Indizierte Räume:",
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s von %(totalRooms)s",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Der Wiederherstellungsschlüssel ist ein Sicherheitsnetz - du kannst damit deine verschlüsselten Nachrichten wiederherstellen wenn du deine Wiederherstellungspassphrase vergessen hast.",
+    "Unable to query secret storage status": "Status des sicheren Speichers kann nicht gelesen werden",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Wir werden eine verschlüsselte Kopie deiner Schlüssel auf unserem Server speichern. Schütze deine Sicherung mit einer Wiederherstellungspassphrase.",
+    "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.": "Ohne eine Schlüsselsicherung kann dein verschlüsselter Nachrichtenverlauf nicht wiederhergestellt werden wenn du dich abmeldest oder eine andere Sitzung verwendest.",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Es gab einen Fehler beim Ändern des Raum-Aliases. Entweder erlaubt es der Server nicht oder es gab ein temporäres Problem.",
+    "Self-verification request": "Selbstverifikationsanfrage",
+    "or another cross-signing capable Matrix client": "oder einen anderen Matrix Client der Cross-signing fähig ist",
+    "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s verwendet einen sicheren Zwischenspeicher für verschlüsselte Nachrichten, damit sie in den Suchergebnissen angezeigt werden:",
+    "Liberate your communication": "Befreie deine Kommunikation",
+    "Message downloading sleep time(ms)": "Wartezeit zwischen dem Herunterladen von Nachrichten (ms)",
+    "Navigate recent messages to edit": "Letzte Nachrichten zur Bearbeitung ansehen",
+    "Jump to start/end of the composer": "Springe zum Anfang/Ende der Nachrichteneingabe",
+    "Navigate composer history": "Verlauf der Nachrichteneingabe durchsuchen",
+    "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.": "Wenn du dies versehentlich getan hast, kannst du in dieser Sitzung \"sichere Nachrichten\" einrichten, die den Nachrichtenverlauf dieser Sitzung mit einer neuen Wiederherstellungsmethode erneut verschlüsseln.",
+    "Cancel replying to a message": "Nachricht beantworten abbrechen",
+    "Navigate up/down in the room list": "In der Raumliste nach oben/unten navigieren",
+    "Select room from the room list": "Wähle eine Raum aus der Raumliste",
+    "Collapse room list section": "Raumliste einklappen",
+    "Expand room list section": "Raumliste ausklappen",
+    "Clear room list filter field": "Raumlistenfilter zurücksetzen",
+    "Scroll up/down in the timeline": "In den Nachrichten vor/zurück blättern",
+    "Previous/next unread room or DM": "Vorheriger/Nächster ungelesener Raum oder Direktnachricht",
+    "Previous/next room or DM": "Vorheriger/Nächster Raum oder Direktnachricht",
+    "Toggle the top left menu": "Menü oben links ein-/ausblenden",
+    "Activate selected button": "Ausgewählten Button aktivieren",
+    "Toggle right panel": "Rechtes Panel ein-/ausblenden",
+    "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",
+    "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.",
+    "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",
+    "Click the button below to confirm setting up encryption.": "Klick die Schaltfläche unten um die Einstellungen der Verschlüsselung zu bestätigen.",
+    "Font scaling": "Schriftskalierung",
+    "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",
+    "Appearance": "Erscheinungsbild",
+    "Create room": "Raum erstellen",
+    "Jump to oldest unread message": "Zur ältesten ungelesenen Nachricht springen",
+    "Upload a file": "Eine Datei hochladen",
+    "Dismiss read marker and jump to bottom": "Entferne Lesemarker und springe nach unten",
+    "Room name or address": "Raumname oder -adresse",
+    "Joins room with given address": "Tritt dem Raum unter der angegebenen Adresse bei",
+    "Unrecognised room address:": "Unbekannte Raumadresse:",
+    "Help us improve %(brand)s": "Hilf uns %(brand)s zu verbessern",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Hilf uns %(brand)s zu verbessern, indem du <UsageDataLink>anonyme Nutzungsdaten</UsageDataLink> schickst. Dies wird ein <PolicyLink>Cookie</PolicyLink> verwenden.",
+    "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>.",
+    "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",
+    "Restart": "Neustarten",
+    "Upgrade your %(brand)s": "Aktualisiere dein %(brand)s",
+    "A new version of %(brand)s is available!": "Eine neue Version von %(brand)s ist verfügbar!",
+    "New version available. <a>Update now.</a>": "Neue Version verfügbar. <a>Jetzt aktualisieren.</a>",
+    "Please verify the room ID or address and try again.": "Bitte überprüfe die Raum-ID oder -adresse und versuche es erneut.",
+    "To link to this room, please add an address.": "Um den Raum zu verlinken, füge bitte eine Adresse hinzu.",
+    "Emoji picker": "Emoji Auswahl",
+    "Error creating address": "Fehler beim Anlegen der Adresse",
+    "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "Es gab einen Fehler beim Anlegen der Adresse. Entweder erlaubt es der Server nicht oder es gab ein temporäres Problem.",
+    "You don't have permission to delete the address.": "Du hast nicht die Berechtigung die Adresse zu löschen.",
+    "Error removing address": "Fehler beim Löschen der Adresse",
+    "Categories": "Kategorien",
+    "Room address": "Raumadresse",
+    "Please provide a room address": "Bitte gib eine Raumadresse an",
+    "This address is available to use": "Diese Adresse ist verfügbar",
+    "This address is already in use": "Diese Adresse wird bereits verwendet",
+    "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.",
+    "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.",
+    "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.": "Du hast für diese Sitzung zuvor eine neuere Version von %(brand)s verwendet. Um diese Version mit Ende-zu-Ende-Verschlüsselung wieder zu benutzen, musst du dich erst ab- und dann wieder anmelden.",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "Soll die Raum-Adresse %(alias)s gelöscht und %(name)s aus dem Raum-Verzeichnis entfernt werden?",
+    "Switch to light mode": "Zum hellen Thema wechseln",
+    "Switch to dark mode": "Zum dunklen Thema wechseln",
+    "Switch theme": "Design ändern",
+    "Security & privacy": "Sicherheit & Datenschutz",
+    "All settings": "Alle Einstellungen",
+    "Feedback": "Feedback",
+    "Room ID or address of ban list": "Raum-ID oder Adresse der Verbotsliste",
+    "No recently visited rooms": "Keine kürzlich besuchten Räume",
+    "Sort by": "Sortieren nach",
+    "Unread rooms": "Ungelesene Räume",
+    "Always show first": "Zeige immer zuerst",
+    "Show": "Zeige",
+    "Message preview": "Nachrichtenvorschau",
+    "List options": "Optionen anzeigen",
+    "Show %(count)s more|other": "Zeige %(count)s weitere",
+    "Show %(count)s more|one": "Zeige %(count)s weitere",
+    "Leave Room": "Verlasse Raum",
+    "Room options": "Raumoptionen",
+    "Activity": "Aktivität",
+    "A-Z": "A-Z",
+    "Looks good!": "Sieht gut aus!",
+    "Use Recovery Key or Passphrase": "Verwende einen Wiederherstellungsschlüssel oder deine Passphrase",
+    "Use Recovery Key": "Verwende einen Wiederherstellungsschlüssel",
+    "Light": "Hell",
+    "Dark": "Dunkel",
+    "Use the improved room list (will refresh to apply changes)": "Verwende die verbesserte Raumliste (lädt die Anwendung neu)",
+    "Use custom size": "Verwende individuelle Größe",
+    "Hey you. You're the best!": "Hey du. Du bist der Beste!",
+    "Message layout": "Nachrichtenlayout",
+    "Compact": "Kompakt",
+    "Modern": "Modern",
+    "Use a system font": "Verwende die System-Schriftart",
+    "System font name": "System-Schriftart",
+    "Customise your appearance": "Verändere das Erscheinungsbild",
+    "Appearance Settings only affect this %(brand)s session.": "Einstellungen zum Erscheinungsbild wirken sich nur auf diese %(brand)s Sitzung aus.",
+    "The authenticity of this encrypted message can't be guaranteed on this device.": "Die Echtheit dieser verschlüsselten Nachricht kann auf diesem Gerät nicht garantiert werden.",
+    "You joined the call": "Du bist dem Anruf beigetreten",
+    "%(senderName)s joined the call": "%(senderName)s ist dem Anruf beigetreten",
+    "Call in progress": "Laufendes Gespräch",
+    "You left the call": "Du hast den Anruf verlassen",
+    "%(senderName)s left the call": "%(senderName)s hat den Anruf verlassen",
+    "Call ended": "Anruf beendet",
+    "You started a call": "Du hast einen Anruf gestartet",
+    "%(senderName)s started a call": "%(senderName)s hat einen Anruf gestartet",
+    "Waiting for answer": "Warte auf Antwort",
+    "%(senderName)s is calling": "%(senderName)s ruft an",
+    "You created the room": "Du hast den Raum erstellt",
+    "%(senderName)s created the room": "%(senderName)s hat den Raum erstellt",
+    "You made the chat encrypted": "Du hast den Raum verschlüsselt",
+    "%(senderName)s made the chat encrypted": "%(senderName)s hat den Raum verschlüsselt",
+    "You made history visible to new members": "Du hast die bisherige Kommunikation für neue Teilnehmern sichtbar gemacht",
+    "%(senderName)s made history visible to new members": "%(senderName)s hat die bisherige Kommunikation für neue Teilnehmern sichtbar gemacht",
+    "You made history visible to anyone": "Du hast die bisherige Kommunikation für alle sichtbar gemacht",
+    "%(senderName)s made history visible to anyone": "%(senderName)s hat die bisherige Kommunikation für alle sichtbar gemacht",
+    "You made history visible to future members": "Du hast die bisherige Kommunikation für zukünftige Teilnehmer sichtbar gemacht",
+    "%(senderName)s made history visible to future members": "%(senderName)s hat die bisherige Kommunikation für zukünftige Teilnehmer sichtbar gemacht",
+    "You were invited": "Du wurdest eingeladen",
+    "%(targetName)s was invited": "%(targetName)s wurde eingeladen",
+    "You left": "Du hast den Raum verlassen",
+    "%(targetName)s left": "%(targetName)s hat den Raum verlassen",
+    "You were kicked (%(reason)s)": "Du wurdest herausgeworfen (%(reason)s)",
+    "%(targetName)s was kicked (%(reason)s)": "%(targetName)s wurde herausgeworfen (%(reason)s)",
+    "You were kicked": "Du wurdest herausgeworfen",
+    "%(targetName)s was kicked": "%(targetName)s wurde herausgeworfen",
+    "You rejected the invite": "Du hast die Einladung abgelehnt",
+    "%(targetName)s rejected the invite": "%(targetName)s hat die Einladung abgelehnt",
+    "You were uninvited": "Deine Einladung wurde zurückgezogen",
+    "%(targetName)s was uninvited": "Die Einladung für %(targetName)s wurde zurückgezogen",
+    "You were banned (%(reason)s)": "Du wurdest verbannt (%(reason)s)",
+    "%(targetName)s was banned (%(reason)s)": "%(targetName)s wurde verbannt (%(reason)s)",
+    "You were banned": "Du wurdest verbannt",
+    "%(targetName)s was banned": "%(targetName)s wurde verbannt",
+    "You joined": "Du bist beigetreten",
+    "%(targetName)s joined": "%(targetName)s ist beigetreten",
+    "You changed your name": "Du hast deinen Namen geändert",
+    "%(targetName)s changed their name": "%(targetName)s hat den Namen geändert",
+    "You changed your avatar": "Du hast deinen Avatar geändert",
+    "%(targetName)s changed their avatar": "%(targetName)s hat den Avatar geändert",
+    "%(senderName)s %(emote)s": "%(senderName)s %(emote)s",
+    "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
+    "You changed the room name": "Du hast den Raumnamen geändert",
+    "%(senderName)s changed the room name": "%(senderName)s hat den Raumnamen geändert",
+    "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
+    "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
+    "You uninvited %(targetName)s": "Du hast die Einladung für %(targetName)s zurückgezogen",
+    "%(senderName)s uninvited %(targetName)s": "%(senderName)s hat die Einladung für %(targetName)s zurückgezogen",
+    "You invited %(targetName)s": "Du hast %(targetName)s eingeladen",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s hat %(targetName)s eingeladen",
+    "You changed the room topic": "Du hast das Raumthema geändert",
+    "%(senderName)s changed the room topic": "%(senderName)s hat das Raumthema geändert",
+    "New spinner design": "Neue Warteanimation",
+    "Use a more compact ‘Modern’ layout": "Verwende ein kompakteres 'modernes' Layout",
+    "Message deleted on %(date)s": "Nachricht am %(date)s gelöscht",
+    "Wrong file type": "Falscher Dateityp",
+    "Wrong Recovery Key": "Falscher Wiederherstellungsschlüssel",
+    "Invalid Recovery Key": "Ungültiger Wiederherstellungsschlüssel",
+    "Riot is now Element!": "Riot ist jetzt Element!",
+    "Learn More": "Mehr erfahren",
+    "Unknown caller": "Unbekannter Anrufer",
+    "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.",
+    "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",
+    "Enable advanced debugging for the room list": "Erweiterte Fehlersuche für die Raumliste aktivieren",
+    "Enable experimental, compact IRC style layout": "Kompaktes, experimentelles Layout im IRC-Stil aktivieren",
+    "User menu": "Benutzermenü",
+    "%(brand)s Web": "%(brand)s Web",
+    "%(brand)s Desktop": "%(brand)s Desktop",
+    "%(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",
+    "Mentions & Keywords": "Erwähnungen & Schlüsselwörter",
+    "Notification options": "Benachrichtigungsoptionen",
+    "Forget Room": "Vergesse Raum",
+    "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.",
+    "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:",
+    "Use your account to sign in to the latest version of the app at <a />": "Verwende dein Konto um dich an der neusten Version der App anzumelden<a />",
+    "We’re excited to announce Riot is now Element!": "Wir freuen uns bekanntzugeben: Riot ist jetzt Element!",
+    "Learn more at <a>element.io/previously-riot</a>": "Erfahre mehr unter <a>element.io/previously-riot</a>",
+    "The person who invited you already left the room.": "Die Person, die dich eingeladen hat, hat den Raum bereits verlassen.",
+    "The person who invited you already left the room, or their server is offline.": "Die Person, die dich eingeladen hat, hat den Raum bereits verlassen oder ihr Server ist offline.",
+    "Change notification settings": "Benachrichtigungseinstellungen ändern",
+    "Your server isn't responding to some <a>requests</a>.": "Dein Server antwortet nicht auf einige <a>Anfragen</a>.",
+    "Go to Element": "Zu Element gehen",
+    "Server isn't responding": "Server antwortet nicht",
+    "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "Server reagiert nicht auf einige deiner Anfragen. Im Folgenden sind einige der wahrscheinlichsten Gründe aufgeführt.",
+    "The server (%(serverName)s) took too long to respond.": "Der Server (%(serverName)s) brauchte zu lange zum antworten.",
+    "Your firewall or anti-virus is blocking the request.": "Deine Firewall oder Anti-Virus-Programm blockiert die Anfrage.",
+    "A browser extension is preventing the request.": "Eine Browser-Erweiterung verhindert die Anfrage.",
+    "The server is offline.": "Der Server ist offline.",
+    "The server has denied your request.": "Der Server hat deine Anfrage abgewiesen.",
+    "Your area is experiencing difficulties connecting to the internet.": "Deine Region hat Schwierigkeiten, eine Verbindung zum Internet herzustellen.",
+    "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.",
+    "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.",
+    "The server is not configured to indicate what the problem is (CORS).": "Der Server ist nicht so konfiguriert, dass das Problem angezeigt wird (CORS).",
+    "Recent changes that have not yet been received": "Letzte Änderungen, die noch nicht eingegangen sind",
+    "Set a Security Phrase": "Sicherheitsphrase setzen",
+    "Confirm Security Phrase": "Sicherheitsphrase bestätigen",
+    "Save your Security Key": "Sicherungsschlüssel sichern",
+    "Security Phrase": "Sicherheitsphrase",
+    "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Gib deine Sicherheitsphrase ein oder <button>benutze deinen Sicherheitsschlüssel</button> um fortzufahren.",
+    "Security Key": "Sicherheitsschlüssel",
+    "Use your Security Key to continue.": "Benutze deinen Sicherheitsschlüssel um fortzufahren.",
+    "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.": "Du kannst in den benutzerdefinierten Server-Optionen eine andere Heimserver URL angeben, um dich bei anderen Matrix Servern anzumelden. Dadurch kannst du %(brand)s mit einem existierenden Matrix-Account auf einem anderen Home-Server nutzen.",
+    "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>.": "Gib die Adresse deines Element Matrix Services-Heimservers ein. Es kann deine eigene Domain oder eine Subdomain von <a>element.io</a> sein.",
+    "No files visible in this room": "Keine Dateien in diesem Raum",
+    "Attach files from chat or just drag and drop them anywhere in a room.": "Hänge Dateien aus dem Chat an oder ziehe sie einfach per Drag & Drop an eine beliebige Stelle im Raum.",
+    "You’re all caught up": "Alles gesichtet",
+    "You have no visible notifications in this room.": "Du hast keine sichtbaren Benachrichtigungen in diesem Raum.",
+    "Search rooms": "Räume suchen",
+    "%(brand)s Android": "%(brand)s Android",
+    "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Schütze dich vor dem Verlust des Zugriffs auf verschlüsselte Nachrichten und Daten, indem du Verschlüsselungsschlüssel auf deinem Server sicherst.",
+    "Generate a Security Key": "Sicherheitsschlüssel generieren",
+    "We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "Wir generieren einen Sicherheitsschlüssel, den du an einem sicheren Ort wie z. B. in einem Passwort-Manager oder einem Safe aufbewahren kannst.",
+    "Enter a Security Phrase": "Sicherheitsphrase eingeben",
+    "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Verwende für deine Sicherung eine geheime Phrase, die nur du kennst, und speichere optional einen Sicherheitsschlüssel.",
+    "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.": "Gibt für deine Datensicherung eine geheime Phrase ein, die nur du kennst. Um sicher zu gehen, benutze nicht dein Account-Passwort.",
+    "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "Bewahre deinen Sicherheitsschlüssel an einem sicheren Ort wie z. B. in einem Passwort-Manager oder einem Safe auf. Er wird zum Schutz deiner verschlüsselten Daten verwendet.",
+    "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Wenn du jetzt abbrichst, kannst du verschlüsselte Nachrichten und Daten verlieren, wenn du den Zugriff auf deine Logins verlierst.",
+    "You can also set up Secure Backup & manage your keys in Settings.": "Du kannst auch in den Einstellungen eine Sicherung erstellen & deine Schlüssel verwalten.",
+    "Set up Secure backup": "Sicheres Backup einrichten"
 }
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index 8bbcf47cbe..118c87e153 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -19,7 +19,6 @@
     "Microphone": "Μικρόφωνο",
     "Camera": "Κάμερα",
     "Advanced": "Προχωρημένα",
-    "Algorithm": "Αλγόριθμος",
     "Authentication": "Πιστοποίηση",
     "A new password must be entered.": "Ο νέος κωδικός πρόσβασης πρέπει να εισαχθεί.",
     "%(senderName)s answered the call.": "Ο χρήστης %(senderName)s απάντησε την κλήση.",
@@ -38,7 +37,6 @@
     "and %(count)s others...|one": "και ένας ακόμα...",
     "and %(count)s others...|other": "και %(count)s άλλοι...",
     "Anyone who knows the room's link, including guests": "Οποιοσδήποτε γνωρίζει τον σύνδεσμο του δωματίου, συμπεριλαμβανομένων των επισκεπτών",
-    "Blacklisted": "Στη μαύρη λίστα",
     "Change Password": "Αλλαγή κωδικού πρόσβασης",
     "%(senderName)s changed their profile picture.": "Ο %(senderName)s άλλαξε τη φωτογραφία του προφίλ του.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "Ο %(senderDisplayName)s άλλαξε το όνομα του δωματίου σε %(roomName)s.",
@@ -52,26 +50,18 @@
     "Create Room": "Δημιουργία δωματίου",
     "Cryptography": "Κρυπτογραφία",
     "Current password": "Τωρινός κωδικός πρόσβασης",
-    "Curve25519 identity key": "Κλειδί ταυτότητας Curve25519",
     "Custom level": "Προσαρμοσμένο επίπεδο",
     "/ddg is not a command": "/ddg δεν αναγνωρίζεται ως εντολή",
     "Deactivate Account": "Απενεργοποίηση λογαριασμού",
     "Decrypt %(text)s": "Αποκρυπτογράφηση %(text)s",
-    "Decryption error": "Σφάλμα αποκρυπτογράφησης",
     "Default": "Προεπιλογή",
-    "Device ID": "Αναγνωριστικό συσκευής",
-    "device id: ": "αναγνωριστικό συσκευής: ",
-    "Direct chats": "Απευθείας συνομιλίες",
     "Disinvite": "Ανάκληση πρόσκλησης",
     "Download %(text)s": "Λήψη %(text)s",
-    "Ed25519 fingerprint": "Αποτύπωμα Ed25519",
     "Email": "Ηλεκτρονική διεύθυνση",
     "Email address": "Ηλεκτρονική διεύθυνση",
     "Emoji": "Εικονίδια",
     "%(senderName)s ended the call.": "%(senderName)s τερμάτισε την κλήση.",
-    "End-to-end encryption information": "Πληροφορίες σχετικά με τη κρυπτογράφηση από άκρο σε άκρο (End-to-end encryption)",
     "Error decrypting attachment": "Σφάλμα κατά την αποκρυπτογράφηση της επισύναψης",
-    "Event information": "Πληροφορίες συμβάντος",
     "Existing Call": "Υπάρχουσα κλήση",
     "Export": "Εξαγωγή",
     "Export E2E room keys": "Εξαγωγή κλειδιών κρυπτογράφησης για το δωμάτιο",
@@ -110,7 +100,6 @@
     "Labs": "Πειραματικά",
     "Leave room": "Αποχώρηση από το δωμάτιο",
     "%(targetName)s left the room.": "Ο χρήστης %(targetName)s έφυγε από το δωμάτιο.",
-    "Local addresses for this room:": "Τοπική διεύθυνση για το δωμάτιο:",
     "Logout": "Αποσύνδεση",
     "Low priority": "Χαμηλής προτεραιότητας",
     "Click here to fix": "Κάνε κλικ εδώ για διόρθωση",
@@ -121,10 +110,8 @@
     "Join Room": "Είσοδος σε δωμάτιο",
     "Moderator": "Συντονιστής",
     "Name": "Όνομα",
-    "New address (e.g. #foo:%(localDomain)s)": "Νέα διεύθυνση (e.g. #όνομα:%(localDomain)s)",
     "New passwords don't match": "Οι νέοι κωδικοί πρόσβασης είναι διαφορετικοί",
     "New passwords must match each other.": "Οι νέοι κωδικοί πρόσβασης πρέπει να ταιριάζουν.",
-    "none": "κανένα",
     "(not supported by this browser)": "(δεν υποστηρίζεται από τον περιηγητή)",
     "<not supported>": "<δεν υποστηρίζεται>",
     "No more results": "Δεν υπάρχουν αποτελέσματα",
@@ -135,7 +122,7 @@
     "Passwords can't be empty": "Οι κωδικοί πρόσβασης δεν γίνετε να είναι κενοί",
     "Phone": "Τηλέφωνο",
     "Register": "Εγγραφή",
-    "riot-web version:": "Έκδοση riot-web:",
+    "%(brand)s version:": "Έκδοση %(brand)s:",
     "Room Colour": "Χρώμα δωματίου",
     "Rooms": "Δωμάτια",
     "Save": "Αποθήκευση",
@@ -145,7 +132,6 @@
     "Sign in": "Συνδέση",
     "Sign out": "Αποσύνδεση",
     "Someone": "Κάποιος",
-    "Start a chat": "Έναρξη συνομιλίας",
     "This email address is already in use": "Η διεύθυνση ηλ. αλληλογραφίας χρησιμοποιείται ήδη",
     "This email address was not found": "Δεν βρέθηκε η διεύθυνση ηλ. αλληλογραφίας",
     "Success": "Επιτυχία",
@@ -161,7 +147,6 @@
     "Add": "Προσθήκη",
     "Admin Tools": "Εργαλεία διαχειριστή",
     "No media permissions": "Χωρίς δικαιώματα πολυμέσων",
-    "Alias (optional)": "Ψευδώνυμο (προαιρετικό)",
     "Ban": "Αποκλεισμός",
     "Banned users": "Αποκλεισμένοι χρήστες",
     "Call Timeout": "Λήξη χρόνου κλήσης",
@@ -172,12 +157,9 @@
     "Click to unmute audio": "Κάντε κλικ για άρση σίγασης του ήχου",
     "Custom": "Προσαρμοσμένο",
     "Decline": "Απόρριψη",
-    "Disable Notifications": "Απενεργοποίηση ειδοποιήσεων",
     "Drop File Here": "Αποθέστε εδώ το αρχείο",
-    "Enable Notifications": "Ενεργοποίηση ειδοποιήσεων",
     "Enter passphrase": "Εισαγωγή συνθηματικού",
     "Failed to set display name": "Δεν ήταν δυνατό ο ορισμός του ονόματος εμφάνισης",
-    "Failed to toggle moderator status": "Δεν ήταν δυνατή η εναλλαγή κατάστασης του συντονιστή",
     "Failed to upload profile picture!": "Δεν ήταν δυνατή η αποστολή της εικόνας προφίλ!",
     "Home": "Αρχική",
     "Last seen": "Τελευταία εμφάνιση",
@@ -190,17 +172,14 @@
     "Profile": "Προφίλ",
     "Public Chat": "Δημόσια συνομιλία",
     "Reason": "Αιτία",
-    "Revoke Moderator": "Ανάκληση συντονιστή",
     "%(targetName)s rejected the invitation.": "Ο %(targetName)s απέρριψε την πρόσκληση.",
     "Reject invitation": "Απόρριψη πρόσκλησης",
-    "Remote addresses for this room:": "Απομακρυσμένες διευθύνσεις για το δωμάτιο:",
     "Results from DuckDuckGo": "Αποτελέσματα από DuckDuckGo",
     "Return to login screen": "Επιστροφή στην οθόνη σύνδεσης",
     "Room %(roomId)s not visible": "Το δωμάτιο %(roomId)s δεν είναι ορατό",
     "%(roomName)s does not exist.": "Το %(roomName)s δεν υπάρχει.",
     "Searches DuckDuckGo for results": "Γίνεται αναζήτηση στο DuckDuckGo για αποτελέσματα",
     "Seen by %(userName)s at %(dateTime)s": "Διαβάστηκε από τον/την %(userName)s στις %(dateTime)s",
-    "Send anyway": "Αποστολή ούτως ή άλλως",
     "Send Reset Email": "Αποστολή μηνύματος επαναφοράς",
     "%(senderDisplayName)s sent an image.": "Ο %(senderDisplayName)s έστειλε μια φωτογραφία.",
     "Session ID": "Αναγνωριστικό συνεδρίας",
@@ -217,19 +196,14 @@
     "Unban": "Άρση αποκλεισμού",
     "%(senderName)s unbanned %(targetName)s.": "Ο χρήστης %(senderName)s έδιωξε τον χρήστη %(targetName)s.",
     "Unable to enable Notifications": "Αδυναμία ενεργοποίησης των ειδοποιήσεων",
-    "unencrypted": "μη κρυπτογραφημένο",
     "unknown caller": "άγνωστος καλών",
-    "unknown device": "άγνωστη συσκευή",
-    "Unknown room %(roomId)s": "Άγνωστο δωμάτιο %(roomId)s",
     "Unmute": "Άρση σίγασης",
     "Unnamed Room": "Ανώνυμο δωμάτιο",
-    "Unrecognised room alias:": "Μη αναγνωρίσιμο ψευδώνυμο:",
     "Upload avatar": "Αποστολή προσωπικής εικόνας",
     "Upload Failed": "Απέτυχε η αποστολή",
     "Upload file": "Αποστολή αρχείου",
     "Upload new:": "Αποστολή νέου:",
     "Usage": "Χρήση",
-    "User ID": "Αναγνωριστικό χρήστη",
     "Username invalid: %(errMessage)s": "Μη έγκυρο όνομα χρήστη: %(errMessage)s",
     "Users": "Χρήστες",
     "Video call": "Βιντεοκλήση",
@@ -264,7 +238,6 @@
     "Upload an avatar:": "Αποστολή προσωπικής εικόνας:",
     "This server does not support authentication with a phone number.": "Αυτός ο διακομιστής δεν υποστηρίζει πιστοποίηση με αριθμό τηλεφώνου.",
     "An error occurred: %(error_string)s": "Προέκυψε ένα σφάλμα: %(error_string)s",
-    "Make Moderator": "Ορισμός συντονιστή",
     "Room": "Δωμάτιο",
     "(~%(count)s results)|one": "(~%(count)s αποτέλεσμα)",
     "(~%(count)s results)|other": "(~%(count)s αποτελέσματα)",
@@ -281,11 +254,8 @@
     "Confirm Removal": "Επιβεβαίωση αφαίρεσης",
     "Unknown error": "Άγνωστο σφάλμα",
     "Incorrect password": "Λανθασμένος κωδικός πρόσβασης",
-    "To continue, please enter your password.": "Για να συνεχίσετε, παρακαλούμε πληκτρολογήστε τον κωδικό πρόσβασής σας.",
     "Unable to restore session": "Αδυναμία επαναφοράς συνεδρίας",
     "Unknown Address": "Άγνωστη διεύθυνση",
-    "Blacklist": "Μαύρη λίστα",
-    "Verify...": "Επιβεβαίωση...",
     "ex. @bob:example.com": "π.χ @bob:example.com",
     "Add User": "Προσθήκη χρήστη",
     "Token incorrect": "Εσφαλμένο διακριτικό",
@@ -304,7 +274,6 @@
     "Username available": "Διαθέσιμο όνομα χρήστη",
     "Username not available": "Μη διαθέσιμο όνομα χρήστη",
     "Something went wrong!": "Κάτι πήγε στραβά!",
-    "Could not connect to the integration server": "Αδυναμία σύνδεσης στον διακομιστή ενσωμάτωσης",
     "Error: Problem communicating with the given homeserver.": "Σφάλμα: πρόβλημα κατά την επικοινωνία με τον ορισμένο διακομιστή.",
     "Failed to ban user": "Δεν ήταν δυνατό ο αποκλεισμός του χρήστη",
     "Failed to change power level": "Δεν ήταν δυνατή η αλλαγή του επιπέδου δύναμης",
@@ -325,17 +294,15 @@
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "Ο %(senderName)s έκανε το μελλοντικό ιστορικό του δωματίου δημόσιο άγνωστο (%(visibility)s).",
     "Missing user_id in request": "Λείπει το user_id στο αίτημα",
     "not specified": "μη καθορισμένο",
-    "NOT verified": "ΧΩΡΙΣ επαλήθευση",
     "No display name": "Χωρίς όνομα",
     "No users have specific privileges in this room": "Κανένας χρήστης δεν έχει συγκεκριμένα δικαιώματα σε αυτό το δωμάτιο",
     "Only people who have been invited": "Μόνο άτομα που έχουν προσκληθεί",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Παρακαλούμε ελέγξτε την ηλεκτρονική σας αλληλογραφία και κάντε κλικ στον σύνδεσμο που περιέχει. Μόλις γίνει αυτό, κάντε κλίκ στο κουμπί συνέχεια.",
     "%(senderName)s removed their profile picture.": "Ο %(senderName)s αφαίρεσε τη φωτογραφία του προφίλ του.",
     "%(senderName)s requested a VoIP conference.": "Ο %(senderName)s αιτήθηκε μια συνδιάσκεψη VoIP.",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Το Riot δεν έχει δικαιώματα για αποστολή ειδοποιήσεων - παρακαλούμε ελέγξτε τις ρυθμίσεις του περιηγητή σας",
-    "Riot was not given permission to send notifications - please try again": "Δεν δόθηκαν δικαιώματα αποστολής ειδοποιήσεων στο Riot - παρακαλούμε προσπαθήστε ξανά",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "Το %(brand)s δεν έχει δικαιώματα για αποστολή ειδοποιήσεων - παρακαλούμε ελέγξτε τις ρυθμίσεις του περιηγητή σας",
+    "%(brand)s was not given permission to send notifications - please try again": "Δεν δόθηκαν δικαιώματα αποστολής ειδοποιήσεων στο %(brand)s - παρακαλούμε προσπαθήστε ξανά",
     "%(roomName)s is not accessible at this time.": "Το %(roomName)s δεν είναι προσβάσιμο αυτή τη στιγμή.",
-    "Scroll to bottom of page": "Μετάβαση στο τέλος της σελίδας",
     "Server may be unavailable, overloaded, or search timed out :(": "Ο διακομιστής μπορεί να είναι μη διαθέσιμος, υπερφορτωμένος, ή να έχει λήξει η αναζήτηση :(",
     "Server may be unavailable, overloaded, or you hit a bug.": "Ο διακομιστής μπορεί να είναι μη διαθέσιμος, υπερφορτωμένος, ή να πέσατε σε ένα σφάλμα.",
     "Server unavailable, overloaded, or something else went wrong.": "Ο διακομιστής μπορεί να είναι μη διαθέσιμος, υπερφορτωμένος, ή κάτι άλλο να πήγε στραβά.",
@@ -346,8 +313,6 @@
     "Uploading %(filename)s and %(count)s others|other": "Γίνεται αποστολή του %(filename)s και %(count)s υπολοίπων",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (δύναμη %(powerLevelNumber)s)",
     "Verification Pending": "Εκκρεμεί επιβεβαίωση",
-    "Verification": "Επιβεβαίωση",
-    "verified": "επαληθεύτηκε",
     "Verified key": "Επιβεβαιωμένο κλειδί",
     "VoIP conference finished.": "Ολοκληρώθηκε η συνδιάσκεψη VoIP.",
     "VoIP conference started.": "Ξεκίνησησε η συνδιάσκεψη VoIP.",
@@ -364,15 +329,13 @@
     "Connectivity to the server has been lost.": "Χάθηκε η συνδεσιμότητα στον διακομιστή.",
     "Please select the destination room for this message": "Παρακαλούμε επιλέξτε ένα δωμάτιο προορισμού για αυτό το μήνυμα",
     "Analytics": "Αναλυτικά δεδομένα",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Το Riot συλλέγει ανώνυμα δεδομένα επιτρέποντας μας να βελτιώσουμε την εφαρμογή.",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "Το %(brand)s συλλέγει ανώνυμα δεδομένα επιτρέποντας μας να βελτιώσουμε την εφαρμογή.",
     "Failed to invite": "Δεν ήταν δυνατή η πρόσκληση",
-    "I verify that the keys match": "Επιβεβαιώνω πως ταιριάζουν τα κλειδιά",
     "Please check your email to continue registration.": "Παρακαλούμε ελέγξτε την ηλεκτρονική σας αλληλογραφία για να συνεχίσετε με την εγγραφή.",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Αν δεν ορίσετε μια διεύθυνση ηλεκτρονικής αλληλογραφίας, δεν θα θα μπορείτε να επαναφέρετε τον κωδικό πρόσβασης σας. Είστε σίγουροι;",
-    "Removed or unknown message type": "Αφαιρέθηκε ή άγνωστος τύπος μηνύματος",
     " (unsupported)": " (μη υποστηριζόμενο)",
     "%(senderDisplayName)s changed the room avatar to <img/>": "Ο %(senderDisplayName)s άλλαξε την εικόνα του δωματίου σε <img/>",
-    "You may need to manually permit Riot to access your microphone/webcam": "Μπορεί να χρειαστεί να ορίσετε χειροκίνητα την πρόσβαση του Riot στο μικρόφωνο/κάμερα",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "Μπορεί να χρειαστεί να ορίσετε χειροκίνητα την πρόσβαση του %(brand)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.": "Δεν είναι δυνατή η σύνδεση στον διακομιστή - παρακαλούμε ελέγξτε την συνδεσιμότητα, βεβαιωθείτε ότι το <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>.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "Ο %(senderName)s άλλαξε το επίπεδο δύναμης του %(powerLevelDiffText)s.",
@@ -393,7 +356,6 @@
     "Failed to invite the following users to the %(roomName)s room:": "Δεν ήταν δυνατή η πρόσκληση των παρακάτω χρηστών στο δωμάτιο %(roomName)s:",
     "Deops user with given id": "Deop χρήστη με το συγκεκριμένο αναγνωριστικό",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Συμμετάσχετε με <voiceText>φωνή</voiceText> ή <videoText>βίντεο</videoText>.",
-    "Joins room with given alias": "Συνδέεστε στο δωμάτιο με δοσμένο ψευδώνυμο",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Εμφάνιση χρονικών σημάνσεων σε 12ωρη μορφή ώρας (π.χ. 2:30 μ.μ.)",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Η διεύθυνση της ηλ. αλληλογραφίας σας δεν φαίνεται να συσχετίζεται με μια ταυτότητα Matrix σε αυτόν τον Διακομιστή Φιλοξενίας.",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Δεν θα μπορέσετε να αναιρέσετε αυτήν την αλλαγή καθώς προωθείτε τον χρήστη να έχει το ίδιο επίπεδο δύναμης με τον εαυτό σας.",
@@ -407,33 +369,24 @@
     "Failed to kick": "Δεν ήταν δυνατή η απομάκρυνση",
     "(no answer)": "(χωρίς απάντηση)",
     "(unknown failure: %(reason)s)": "(άγνωστο σφάλμα: %(reason)s)",
-    "Unblacklist": "Άρση αποκλεισμού",
-    "Unverify": "Άρση επιβεβαίωσης",
     "Ongoing conference call%(supportedText)s.": "Κλήση συνδιάσκεψης σε εξέλιξη %(supportedText)s.",
     "Your browser does not support the required cryptography extensions": "Ο περιηγητής σας δεν υποστηρίζει τα απαιτούμενα πρόσθετα κρυπτογράφησης",
-    "Not a valid Riot keyfile": "Μη έγκυρο αρχείο κλειδιού Riot",
+    "Not a valid %(brand)s keyfile": "Μη έγκυρο αρχείο κλειδιού %(brand)s",
     "Authentication check failed: incorrect password?": "Αποτυχία ελέγχου πιστοποίησης: λανθασμένος κωδικός πρόσβασης;",
-    "Claimed Ed25519 fingerprint key": "Απαιτήθηκε κλειδί αποτυπώματος Ed25519",
     "Displays action": "Εμφανίζει την ενέργεια",
     "To use it, just wait for autocomplete results to load and tab through them.": "Για να το χρησιμοποιήσετε, απλά περιμένετε μέχρι να φορτωθούν τα αποτέλεσμα αυτόματης συμπλήρωσης. Έπειτα επιλέξτε ένα από αυτά χρησιμοποιώντας τον στηλοθέτη.",
-    "Use compact timeline layout": "Χρήση συμπαγούς διάταξης χρονολογίου",
     "(could not connect media)": "(αδυναμία σύνδεσης με το πολυμέσο)",
     "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.": "Αυτή η διαδικασία σας επιτρέπει να εξαγάγετε τα κλειδιά για τα μηνύματα που έχετε λάβει σε κρυπτογραφημένα δωμάτια σε ένα τοπικό αρχείο. Στη συνέχεια, θα μπορέσετε να εισάγετε το αρχείο σε άλλο πρόγραμμα του Matrix, έτσι ώστε το πρόγραμμα να είναι σε θέση να αποκρυπτογραφήσει αυτά τα μηνύματα.",
     "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 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.": "Αυτή η διαδικασία σας επιτρέπει να εισαγάγετε κλειδιά κρυπτογράφησης που έχετε προηγουμένως εξάγει από άλλο πρόγραμμα του Matrix. Στη συνέχεια, θα μπορέσετε να αποκρυπτογραφήσετε τυχόν μηνύματα που το άλλο πρόγραμμα θα μπορούσε να αποκρυπτογραφήσει.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Το αρχείο εξαγωγής θα είναι προστατευμένο με συνθηματικό. Θα χρειαστεί να πληκτρολογήσετε το συνθηματικό εδώ για να αποκρυπτογραφήσετε το αρχείο.",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Αν χρησιμοποιούσατε προηγουμένως μια πιο πρόσφατη έκδοση του Riot, η συνεδρία σας ίσως είναι μη συμβατή με αυτήν την έκδοση. Κλείστε αυτό το παράθυρο και επιστρέψτε στην πιο πρόσφατη έκδοση.",
+    "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, η συνεδρία σας ίσως είναι μη συμβατή με αυτήν την έκδοση. Κλείστε αυτό το παράθυρο και επιστρέψτε στην πιο πρόσφατη έκδοση.",
     "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. Θα θέλατε να συνεχίσετε;",
     "Do you want to set an email address?": "Θέλετε να ορίσετε μια διεύθυνση ηλεκτρονικής αλληλογραφίας;",
     "This will allow you to reset your password and receive notifications.": "Αυτό θα σας επιτρέψει να επαναφέρετε τον κωδικό πρόσβαση σας και θα μπορείτε να λαμβάνετε ειδοποιήσεις.",
     "Skip": "Παράβλεψη",
-    "Start verification": "Έναρξη επιβεβαίωσης",
-    "Share without verifying": "Κοινή χρήση χωρίς επιβεβαίωση",
-    "Ignore request": "Παράβλεψη αιτήματος",
-    "Encryption key request": "Αίτημα κλειδιού κρυπτογράφησης",
     "Check for update": "Έλεγχος για ενημέρωση",
     "Fetching third party location failed": "Η λήψη τοποθεσίας απέτυχε",
-    "A new version of Riot is available.": "Μία νέα έκδοση του Riot είναι διαθέσιμη.",
     "All notifications are currently disabled for all targets.": "Όλες οι ειδοποιήσεις είναι προς το παρόν απενεργοποιημένες για όλες τις συσκευές.",
     "Uploading report": "Αποστολή αναφοράς",
     "Sunday": "Κυριακή",
@@ -446,15 +399,13 @@
     "You are not receiving desktop notifications": "Δεν λαμβάνετε ειδοποιήσεις στην επιφάνεια εργασίας",
     "Friday": "Παρασκευή",
     "Update": "Ενημέρωση",
-    "Riot does not know how to join a room on this network": "To Riot δεν γνωρίζει πως να συνδεθεί σε δωμάτια που ανήκουν σ' αυτό το δίκτυο",
+    "%(brand)s does not know how to join a room on this network": "To %(brand)s δεν γνωρίζει πως να συνδεθεί σε δωμάτια που ανήκουν σ' αυτό το δίκτυο",
     "On": "Ενεργό",
     "Changelog": "Αλλαγές",
     "Waiting for response from server": "Αναμονή απάντησης από τον διακομιστή",
     "Leave": "Αποχώρηση",
     "Uploaded on %(date)s by %(user)s": "Απεστάλη στις %(date)s από %(user)s",
     "Advanced notification settings": "Προχωρημένες ρυθμίσεις ειδοποιήσεων",
-    "delete the alias.": "διέγραψε το ψευδώνυμο.",
-    "To return to your account in future you need to <u>set a password</u>": "Για να επιστρέψετε στον λογαριασμό σας μελλοντικα πρέπει να ορίσετε έναν <u>κωδικό πρόσβασης</u>",
     "Forget": "Παράλειψη",
     "World readable": "Εμφανές σε όλους",
     "You cannot delete this image. (%(code)s)": "Δεν μπορείτε να διαγράψετε αυτή την εικόνα. (%(code)s)",
@@ -479,7 +430,6 @@
     "No update available.": "Δεν υπάρχει διαθέσιμη ενημέρωση.",
     "Noisy": "Δυνατά",
     "Collecting app version information": "Συγκέντρωση πληροφοριών σχετικά με την έκδοση της εφαρμογής",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Διαγραφή του ψευδώνυμου %(alias)s και αφαίρεση του %(name)s από το ευρετήριο;",
     "Keywords": "Λέξεις κλειδιά",
     "Enable notifications for this account": "Ενεργοποίηση ειδοποιήσεων για τον λογαριασμό",
     "Messages containing <span>keywords</span>": "Μηνύματα που περιέχουν <span>λέξεις κλειδιά</span>",
@@ -488,7 +438,7 @@
     "Enter keywords separated by a comma:": "Προσθέστε λέξεις κλειδιά χωρισμένες με κόμμα:",
     "I understand the risks and wish to continue": "Κατανοώ του κινδύνους και επιθυμώ να συνεχίσω",
     "Remove %(name)s from the directory?": "Αφαίρεση του %(name)s από το ευρετήριο;",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Το Riot χρησιμοποιεί αρκετά προχωρημένα χαρακτηριστικά των περιηγητών Ιστού, ορισμένα από τα οποία δεν είναι διαθέσιμα ή είναι σε πειραματικό στάδιο στον περιηγητή σας.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "Το %(brand)s χρησιμοποιεί αρκετά προχωρημένα χαρακτηριστικά των περιηγητών Ιστού, ορισμένα από τα οποία δεν είναι διαθέσιμα ή είναι σε πειραματικό στάδιο στον περιηγητή σας.",
     "Unnamed room": "Ανώνυμο δωμάτιο",
     "Remove from Directory": "Αφαίρεση από το ευρετήριο",
     "Saturday": "Σάββατο",
@@ -524,8 +474,7 @@
     "Search…": "Αναζήτηση…",
     "Unhide Preview": "Προεπισκόπηση",
     "Unable to join network": "Δεν είναι δυνατή η σύνδεση στο δίκτυο",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Ισως να έχετε κάνει τις ρυθμίσεις σε άλλη εφαρμογή εκτός του Riot. Δεν μπορείτε να τις αλλάξετε μέσω του Riot αλλά ισχύουν κανονικά",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Λυπούμαστε, αλλά ο περιηγητές σας <b>δεν</b> υποστηρίζεται από το Riot.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Λυπούμαστε, αλλά ο περιηγητές σας <b>δεν</b> υποστηρίζεται από το %(brand)s.",
     "Messages in group chats": "Μηνύματα σε ομαδικές συνομιλίες",
     "Yesterday": "Χθές",
     "Error encountered (%(errorDetail)s).": "Παρουσιάστηκε σφάλμα (%(errorDetail)s).",
@@ -545,23 +494,16 @@
     "Quote": "Παράθεση",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Με τον τρέχον περιηγητή, η εμφάνιση και η αίσθηση της εφαρμογής ενδέχεται να είναι εντελώς εσφαλμένη και ορισμένες ή όλες οι λειτουργίες ενδέχεται να μην λειτουργούν. Εάν θέλετε να το δοκιμάσετε ούτως ή άλλως μπορείτε να συνεχίσετε, αλλά είστε μόνοι σας σε ό, τι αφορά τα προβλήματα που μπορεί να αντιμετωπίσετε!",
     "Checking for an update...": "Γίνεται έλεγχος για ενημέρωση...",
-    "There are advanced notifications which are not shown here": "Υπάρχουν προχωρημένες ειδοποιήσεις οι οποίες δεν εμφανίζονται εδώ",
-    "Your identity server's URL": "Το URL του διακομιστή ταυτοποίησής σας",
     "The platform you're on": "Η πλατφόρμα στην οποία βρίσκεστε",
-    "The version of Riot.im": "Η έκδοση του Riot.im",
+    "The version of %(brand)s": "Η έκδοση του %(brand)s",
     "Your language of choice": "Η γλώσσα επιλογής σας",
     "Your homeserver's URL": "Το URL του διακομιστή φιλοξενίας σας",
     "Every page you use in the app": "Κάθε σελίδα που χρησιμοποιείτε στην εφαρμογή",
     "e.g. <CurrentPageURL>": "π.χ. <CurrentPageURL>",
     "Your device resolution": "Η ανάλυση της συσκευής σας",
-    "The information being sent to us to help make Riot.im better includes:": "Οι πληροφορίες που στέλνονται σε εμάς με σκοπό την βελτίωση του Riot.im περιλαμβάνουν:",
+    "The information being sent to us to help make %(brand)s better includes:": "Οι πληροφορίες που στέλνονται σε εμάς με σκοπό την βελτίωση του %(brand)s περιλαμβάνουν:",
     "Call Failed": "Η κλήση απέτυχε",
     "e.g. %(exampleValue)s": "π.χ. %(exampleValue)s",
-    "Review Devices": "Ανασκόπηση συσκευών",
-    "Call Anyway": "Πραγματοποίηση Κλήσης όπως και να 'χει",
-    "Answer Anyway": "Απάντηση όπως και να 'χει",
-    "Call": "Κλήση",
-    "Answer": "Απάντηση",
     "AM": "ΠΜ",
     "PM": "ΜΜ",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
@@ -577,7 +519,6 @@
     "Failed to invite users to %(groupId)s": "Αποτυχία πρόσκλησης χρηστών στο %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Αποτυχία προσθήκης στο %(groupId)s των δωματίων:",
     "Show these rooms to non-members on the community page and room list?": "Εμφάνιση αυτών των δωματίων σε μη-μέλη στην σελίδα της κοινότητας και στη λίστα δωματίων;",
-    "Room name or alias": "Όνομα η ψευδώνυμο δωματίου",
     "Restricted": "Περιορισμένο/η",
     "Unable to create widget.": "Αδυναμία δημιουργίας γραφικού στοιχείου.",
     "You are not in this room.": "Δεν είστε μέλος αυτού του δωματίου.",
@@ -600,11 +541,8 @@
     "Disinvite this user?": "Απόσυρση της πρόσκλησης αυτού του χρήστη;",
     "Mention": "Αναφορά",
     "Invite": "Πρόσκληση",
-    "User Options": "Επιλογές Χρήστη",
     "Send an encrypted reply…": "Αποστολή κρυπτογραφημένης απάντησης…",
-    "Send a reply (unencrypted)…": "Αποστολή απάντησης (μη κρυπτογραφημένης)…",
     "Send an encrypted message…": "Αποστολή κρυπτογραφημένου μηνύματος…",
-    "Send a message (unencrypted)…": "Αποστολή μηνύματος (μη κρυπτογραφημένου)…",
     "Unpin Message": "Ξεκαρφίτσωμα μηνύματος",
     "Jump to message": "Πηγαίντε στο μήνυμα",
     "No pinned messages.": "Κανένα καρφιτσωμένο μήνυμα.",
@@ -626,13 +564,11 @@
     "Which officially provided instance you are using, if any": "Ποιά επίσημα παρεχόμενη έκδοση χρησιμοποιείτε, εάν χρησιμοποιείτε κάποια",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Χωρίς να έχει σημασία εάν χρησιμοποιείτε την λειτουργία \"Πλούσιο Κείμενο\" του Επεξεργαστή Πλουσίου Κειμένου",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Χωρίς να έχει σημασία εάν χρησιμοποιείτε το χαρακτηριστικό 'ψίχουλα' (τα άβαταρ πάνω από την λίστα δωματίων)",
-    "Your User Agent": "Ο Πράκτορας Χρήστη σας",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the 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.": "Παρακαλείστε να ρωτήσετε τον διαχειριστή του διακομιστή φιλοξενίας σας (<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",
-    "A conference call could not be started because the integrations server is not available": "Μια κλήση συνδιάσκεψης δεν μπορούσε να ξεκινήσει διότι ο διακομιστής ενσωμάτωσης είναι μη διαθέσιμος",
     "Call in Progress": "Κλήση σε Εξέλιξη",
     "A call is currently being placed!": "Μια κλήση πραγματοποιείτε τώρα!",
     "A call is already in progress!": "Μια κλήση είναι σε εξέλιξη ήδη!",
@@ -649,8 +585,6 @@
     "Only continue if you trust the owner of the server.": "Συνεχίστε μόνο εάν εμπιστεύεστε τον ιδιοκτήτη του διακομιστή.",
     "Trust": "Εμπιστοσύνη",
     "Unable to load! Check your network connectivity and try again.": "Αδυναμία φόρτωσης! Ελέγξτε την σύνδεση του δικτύου και προσπαθήστε ξανά.",
-    "Registration Required": "Απαιτείτε Εγγραφή",
-    "You need to register to do this. Would you like to register now?": "Χρειάζεται να γίνει εγγραφή για αυτό. Θα θέλατε να κάνετε εγγραφή τώρα;",
     "Failed to invite users to the room:": "Αποτυχία πρόσκλησης χρηστών στο δωμάτιο:",
     "Missing roomId.": "Λείπει η ταυτότητα δωματίου.",
     "Messages": "Μηνύματα",
@@ -669,6 +603,6 @@
     "This room has no topic.": "Το δωμάτιο αυτό δεν έχει κανένα θέμα.",
     "Sets the room name": "Θέτει το θέμα του δωματίου",
     "Use an identity server": "Χρησιμοποιήστε ένα διακομιστή ταυτοτήτων",
-    "Your Riot is misconfigured": "Οι παράμετροι του Riot σας είναι λανθασμένα ρυθμισμένοι",
+    "Your %(brand)s is misconfigured": "Οι παράμετροι του %(brand)s σας είναι λανθασμένα ρυθμισμένοι",
     "Explore rooms": "Εξερευνήστε δωμάτια"
 }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3b432c410d..8bfc3ed703 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -14,33 +14,27 @@
     "Click the button below to confirm adding this phone number.": "Click the button below to confirm adding this phone number.",
     "Add Phone Number": "Add Phone Number",
     "The platform you're on": "The platform you're on",
-    "The version of Riot": "The version of Riot",
+    "The version of %(brand)s": "The version of %(brand)s",
     "Whether or not you're logged in (we don't record your username)": "Whether or not you're logged in (we don't record your username)",
     "Your language of choice": "Your language of choice",
     "Which officially provided instance you are using, if any": "Which officially provided instance you are using, if any",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Whether or not you're using the Richtext mode of the Rich Text Editor",
     "Your homeserver's URL": "Your homeserver's URL",
-    "Whether you're using Riot on a device where touch is the primary input mechanism": "Whether you're using Riot on a device where touch is the primary input mechanism",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Whether you're using %(brand)s on a device where touch is the primary input mechanism",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)",
-    "Whether you're using Riot as an installed Progressive Web App": "Whether you're using Riot as an installed Progressive Web App",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Whether you're using %(brand)s as an installed Progressive Web App",
     "e.g. %(exampleValue)s": "e.g. %(exampleValue)s",
     "Every page you use in the app": "Every page you use in the app",
     "e.g. <CurrentPageURL>": "e.g. <CurrentPageURL>",
     "Your user agent": "Your user agent",
     "Your device resolution": "Your device resolution",
     "Analytics": "Analytics",
-    "The information being sent to us to help make Riot better includes:": "The information being sent to us to help make Riot better includes:",
+    "The information being sent to us to help make %(brand)s better includes:": "The information being sent to us to help make %(brand)s better includes:",
     "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.",
     "Error": "Error",
     "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",
-    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.",
-    "Review Sessions": "Review Sessions",
-    "Call Anyway": "Call Anyway",
-    "Answer Anyway": "Answer Anyway",
-    "Call": "Call",
-    "Answer": "Answer",
     "Call Timeout": "Call Timeout",
     "The remote side failed to pick up": "The remote side failed to pick up",
     "Call failed due to misconfigured server": "Call failed due to misconfigured server",
@@ -68,15 +62,11 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
     "The server does not support the room version specified.": "The server does not support the room version specified.",
     "Failure to create room": "Failure to create room",
-    "If you cancel now, you won't complete verifying the other user.": "If you cancel now, you won't complete verifying the other user.",
-    "If you cancel now, you won't complete verifying your other session.": "If you cancel now, you won't complete verifying your other session.",
-    "If you cancel now, you won't complete your operation.": "If you cancel now, you won't complete your operation.",
     "Cancel entering passphrase?": "Cancel entering passphrase?",
-    "Enter passphrase": "Enter passphrase",
+    "Are you sure you want to cancel entering passphrase?": "Are you sure you want to cancel entering passphrase?",
+    "Go Back": "Go Back",
     "Cancel": "Cancel",
     "Setting up keys": "Setting up keys",
-    "Send anyway": "Send anyway",
-    "Send": "Send",
     "Sun": "Sun",
     "Mon": "Mon",
     "Tue": "Tue",
@@ -102,11 +92,6 @@
     "%(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",
-    "Verify this session": "Verify this session",
-    "Encryption upgrade available": "Encryption upgrade available",
-    "Set up encryption": "Set up encryption",
-    "Review where you’re logged in": "Review where you’re logged in",
-    "New login. Was this you?": "New login. Was this you?",
     "Who would you like to add to this community?": "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 new community members",
@@ -115,7 +100,7 @@
     "Which rooms would you like to add to this community?": "Which rooms would you like to add to this community?",
     "Show these rooms to non-members on the community page and room list?": "Show these rooms to non-members on the community page and room list?",
     "Add rooms to the community": "Add rooms to the community",
-    "Room name or alias": "Room name or alias",
+    "Room name or address": "Room name or address",
     "Add to community": "Add to community",
     "Failed to invite the following users to %(groupId)s:": "Failed to invite the following users to %(groupId)s:",
     "Failed to invite users to community": "Failed to invite users to community",
@@ -127,8 +112,8 @@
     "Only continue if you trust the owner of the server.": "Only continue if you trust the owner of the server.",
     "Trust": "Trust",
     "%(name)s is requesting verification": "%(name)s is requesting verification",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
-    "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
+    "%(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.",
@@ -161,6 +146,7 @@
     "Actions": "Actions",
     "Advanced": "Advanced",
     "Other": "Other",
+    "Command error": "Command error",
     "Usage": "Usage",
     "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",
@@ -185,9 +171,9 @@
     "Use an identity server": "Use an identity server",
     "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or 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.",
     "Use an identity server to invite by email. Manage in Settings.": "Use an identity server to invite by email. Manage in Settings.",
-    "Joins room with given alias": "Joins room with given alias",
+    "Joins room with given address": "Joins room with given address",
     "Leave room": "Leave room",
-    "Unrecognised room alias:": "Unrecognised room alias:",
+    "Unrecognised room address:": "Unrecognised room address:",
     "Kicks user with given id": "Kicks user with given id",
     "Bans user with given id": "Bans user with given id",
     "Unbans user with given ID": "Unbans user with given ID",
@@ -221,6 +207,8 @@
     "Send a bug report with logs": "Send a bug report with logs",
     "Logs sent": "Logs sent",
     "Thank you!": "Thank you!",
+    "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",
     "Displays action": "Displays action",
     "Reason": "Reason",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepted the invitation for %(displayName)s.",
@@ -308,11 +296,13 @@
     "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s",
     "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s",
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s",
-    "Light theme": "Light theme",
-    "Dark theme": "Dark theme",
-    "Not Trusted": "Not Trusted",
+    "Light": "Light",
+    "Dark": "Dark",
+    "You signed in to a new session without verifying it:": "You signed in to a new session without verifying it:",
+    "Verify your other session using one of the options below.": "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) signed in to a new session without verifying it:",
     "Ask this user to verify their session, or manually verify it below.": "Ask this user to verify their session, or manually verify it below.",
+    "Not Trusted": "Not Trusted",
     "Manually Verify by Text": "Manually Verify by Text",
     "Interactively verify by Emoji": "Interactively verify by Emoji",
     "Done": "Done",
@@ -322,8 +312,8 @@
     "%(names)s and %(lastPerson)s are typing …": "%(names)s and %(lastPerson)s are typing …",
     "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 Riot is misconfigured": "Your Riot is misconfigured",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.",
+    "Your %(brand)s is misconfigured": "Your %(brand)s is misconfigured",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.",
     "Cannot reach identity server": "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 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.": "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.",
@@ -355,7 +345,7 @@
     "%(num)s days from now": "%(num)s days from now",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
     "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
-    "Not a valid Riot keyfile": "Not a valid Riot keyfile",
+    "Not a valid %(brand)s keyfile": "Not a valid %(brand)s keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
     "Unrecognised address": "Unrecognised address",
     "You do not have permission to invite people to this room.": "You do not have permission to invite people to this room.",
@@ -392,10 +382,65 @@
     "Common names and surnames are easy to guess": "Common names and surnames are easy to guess",
     "Straight rows of keys are easy to guess": "Straight rows of keys are easy to guess",
     "Short keyboard patterns are easy to guess": "Short keyboard patterns are easy to guess",
+    "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",
+    "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",
+    "Notifications": "Notifications",
+    "You are not receiving desktop notifications": "You are not receiving desktop notifications",
+    "Enable them now": "Enable them now",
+    "Close": "Close",
+    "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>.",
+    "Warning": "Warning",
+    "Ok": "Ok",
+    "Set password": "Set password",
+    "To return to your account in future you need to set a password": "To return to your account in future you need to set a password",
+    "Set Password": "Set Password",
+    "Set up encryption": "Set up encryption",
+    "Encryption upgrade available": "Encryption upgrade available",
+    "Verify this session": "Verify this session",
+    "Set up": "Set up",
+    "Upgrade": "Upgrade",
+    "Verify": "Verify",
+    "Verify yourself & others to keep your chats safe": "Verify yourself & others to keep your chats safe",
+    "Other users may not trust it": "Other users may not trust it",
+    "New login. Was this you?": "New login. Was this you?",
+    "Verify the new login accessing your account: %(name)s": "Verify the new login accessing your account: %(name)s",
+    "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!",
+    "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.",
     "Please contact your homeserver administrator.": "Please contact your homeserver administrator.",
+    "The person who invited you already left the room.": "The person who invited you already left the room.",
+    "The person who invited you already left the room, or their server is offline.": "The person who invited you already left the room, or their server is offline.",
     "Failed to join room": "Failed to join room",
+    "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",
+    "Call ended": "Call ended",
+    "You started a call": "You started a call",
+    "%(senderName)s started a call": "%(senderName)s started a call",
+    "Waiting for answer": "Waiting for answer",
+    "%(senderName)s is calling": "%(senderName)s is calling",
+    "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
+    "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
+    "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
+    "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
+    "Change notification settings": "Change notification settings",
+    "New spinner design": "New spinner design",
     "Message Pinning": "Message Pinning",
     "Custom user status messages": "Custom user status messages",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Group & filter rooms by custom tags (refresh to apply changes)",
@@ -403,10 +448,14 @@
     "Multiple integration managers": "Multiple integration managers",
     "Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
     "Support adding custom themes": "Support adding custom themes",
-    "Enable cross-signing to verify per-user instead of per-session": "Enable cross-signing to verify per-user instead of per-session",
+    "Show message previews for reactions in DMs": "Show message previews for reactions in DMs",
+    "Show message previews for reactions in all rooms": "Show message previews for reactions in all rooms",
+    "Enable advanced debugging for the room list": "Enable advanced debugging for the room list",
     "Show info about bridges in room settings": "Show info about bridges in room settings",
+    "Font size": "Font size",
+    "Use custom size": "Use custom size",
     "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
-    "Use compact timeline layout": "Use compact timeline layout",
+    "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)",
     "Show avatar changes": "Show avatar changes",
@@ -426,6 +475,8 @@
     "Mirror local video feed": "Mirror local video feed",
     "Enable Community Filter Panel": "Enable Community Filter Panel",
     "Match system theme": "Match system theme",
+    "Use a system font": "Use a system font",
+    "System font name": "System font name",
     "Allow Peer-to-Peer for 1:1 calls": "Allow Peer-to-Peer for 1:1 calls",
     "Send analytics data": "Send analytics data",
     "Never send encrypted messages to unverified sessions from this session": "Never send encrypted messages to unverified sessions from this session",
@@ -446,12 +497,14 @@
     "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",
-    "Keep recovery passphrase in memory for this session": "Keep recovery passphrase in memory for this session",
     "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",
     "Collecting app version information": "Collecting app version information",
     "Collecting logs": "Collecting logs",
-    "Uploading report": "Uploading report",
+    "Uploading logs": "Uploading logs",
+    "Downloading logs": "Downloading logs",
     "Waiting for response from server": "Waiting for response from server",
     "Messages containing my display name": "Messages containing my display name",
     "Messages containing my username": "Messages containing my username",
@@ -466,11 +519,11 @@
     "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 (%(roomName)s)": "Active call (%(roomName)s)",
-    "unknown caller": "unknown caller",
-    "Incoming voice call from %(name)s": "Incoming voice call from %(name)s",
-    "Incoming video call from %(name)s": "Incoming video call from %(name)s",
-    "Incoming call from %(name)s": "Incoming call from %(name)s",
+    "Active call": "Active call",
+    "Unknown caller": "Unknown caller",
+    "Incoming voice call": "Incoming voice call",
+    "Incoming video call": "Incoming video call",
+    "Incoming call": "Incoming call",
     "Decline": "Decline",
     "Accept": "Accept",
     "The other party cancelled the verification.": "The other party cancelled the verification.",
@@ -490,6 +543,7 @@
     "Verify this user by confirming the following number appears on their screen.": "Verify this user by confirming the following number appears on their screen.",
     "Unable to find a supported verification method.": "Unable to find a supported verification method.",
     "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…",
+    "Waiting for your other session to verify…": "Waiting for your other session to verify…",
     "Waiting for %(displayName)s to verify…": "Waiting for %(displayName)s to verify…",
     "Cancelling…": "Cancelling…",
     "They match": "They match",
@@ -559,16 +613,7 @@
     "Headphones": "Headphones",
     "Folder": "Folder",
     "Pin": "Pin",
-    "Verify all your sessions to ensure your account & messages are safe": "Verify all your sessions to ensure your account & messages are safe",
-    "Later": "Later",
-    "Review": "Review",
-    "Verify yourself & others to keep your chats safe": "Verify yourself & others to keep your chats safe",
-    "Other users may not trust it": "Other users may not trust it",
-    "Update your secure storage": "Update your secure storage",
-    "Set up": "Set up",
-    "Upgrade": "Upgrade",
-    "Verify": "Verify",
-    "Verify the new login accessing your account: %(name)s": "Verify the new login accessing your account: %(name)s",
+    "Your server isn't responding to some <a>requests</a>.": "Your server isn't responding to some <a>requests</a>.",
     "From %(deviceName)s (%(deviceId)s)": "From %(deviceName)s (%(deviceId)s)",
     "Decline (%(counter)s)": "Decline (%(counter)s)",
     "Accept <policyLink /> to continue:": "Accept <policyLink /> to continue:",
@@ -607,18 +652,16 @@
     "not found": "not found",
     "Cross-signing private keys:": "Cross-signing private keys:",
     "in secret storage": "in secret storage",
-    "Self signing private key:": "Self signing private key:",
+    "Master private key:": "Master private key:",
     "cached locally": "cached locally",
     "not found locally": "not found locally",
+    "Self signing private key:": "Self signing private key:",
     "User signing private key:": "User signing private key:",
     "Session backup key:": "Session backup key:",
     "Secret storage public key:": "Secret storage public key:",
     "in account data": "in account data",
     "Homeserver feature support:": "Homeserver feature support:",
     "exists": "exists",
-    "Secret Storage key format:": "Secret Storage key format:",
-    "outdated": "outdated",
-    "up to date": "up to date",
     "Your homeserver does not support session management.": "Your homeserver does not support session management.",
     "Unable to load session list": "Unable to load session list",
     "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Confirm deleting these sessions by using Single Sign On to prove your identity.",
@@ -636,16 +679,14 @@
     "Last seen": "Last seen",
     "Failed to set display name": "Failed to set display name",
     "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.",
-    "Disable Notifications": "Disable Notifications",
-    "Enable Notifications": "Enable Notifications",
     "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.",
     "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",
-    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.",
-    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.",
+    "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.": "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.",
+    "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.": "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.",
     "Connecting to integration manager...": "Connecting to integration manager...",
     "Cannot connect to integration manager": "Cannot connect to integration manager",
     "The integration manager is offline or it cannot reach your homeserver.": "The integration manager is offline or it cannot reach your homeserver.",
@@ -673,7 +714,6 @@
     "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>",
     "Backup is not signed by any of your sessions": "Backup is not signed by any of your sessions",
     "This backup is trusted because it has been restored on this session": "This backup is trusted because it has been restored on this session",
-    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.",
     "Backup version: ": "Backup version: ",
     "Algorithm: ": "Algorithm: ",
     "Backup key stored: ": "Backup key stored: ",
@@ -699,8 +739,8 @@
     "Unable to fetch notification target list": "Unable to fetch notification target list",
     "Notification targets": "Notification targets",
     "Advanced notification settings": "Advanced notification settings",
-    "There are advanced notifications which are not shown here": "There are advanced notifications which are not shown here",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply",
+    "There are advanced notifications which are not shown here.": "There are advanced notifications which are not shown here.",
+    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.",
     "Enable desktop notifications for this session": "Enable desktop notifications for this session",
     "Show message in desktop notification": "Show message in desktop notification",
     "Enable audible notifications for this session": "Enable audible notifications for this session",
@@ -745,36 +785,50 @@
     "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.",
+    "Error encountered (%(errorDetail)s).": "Error encountered (%(errorDetail)s).",
+    "Checking for an update...": "Checking for an update...",
+    "No update available.": "No update available.",
+    "Downloading update...": "Downloading update...",
+    "New version available. <a>Update now.</a>": "New version available. <a>Update now.</a>",
+    "Check for update": "Check for update",
+    "Hey you. You're the best!": "Hey you. You're the best!",
+    "Size must be a number": "Size must be a number",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "Custom font size can only be between %(min)s pt and %(max)s pt",
+    "Use between %(min)s pt and %(max)s pt": "Use between %(min)s pt and %(max)s pt",
+    "Invalid theme schema.": "Invalid theme schema.",
+    "Error downloading theme information.": "Error downloading theme information.",
+    "Theme added!": "Theme added!",
+    "Custom theme URL": "Custom theme URL",
+    "Add theme": "Add theme",
+    "Theme": "Theme",
+    "Message layout": "Message layout",
+    "Compact": "Compact",
+    "Modern": "Modern",
+    "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.",
+    "Customise your appearance": "Customise your appearance",
+    "Appearance Settings only affect this %(brand)s session.": "Appearance Settings only affect this %(brand)s session.",
     "Flair": "Flair",
     "Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?",
     "Success": "Success",
     "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them",
-    "Invalid theme schema.": "Invalid theme schema.",
-    "Error downloading theme information.": "Error downloading theme information.",
-    "Theme added!": "Theme added!",
     "Profile": "Profile",
     "Email addresses": "Email addresses",
     "Phone numbers": "Phone numbers",
     "Set a new account password...": "Set a new account password...",
     "Account": "Account",
     "Language and region": "Language and region",
-    "Custom theme URL": "Custom theme URL",
-    "Add theme": "Add theme",
-    "Theme": "Theme",
     "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!",
     "Deactivate Account": "Deactivate Account",
-    "Warning": "Warning",
     "General": "General",
     "Discovery": "Discovery",
     "Deactivate account": "Deactivate account",
     "Legal": "Legal",
     "Credits": "Credits",
-    "For help with using Riot, click <a>here</a>.": "For help with using Riot, click <a>here</a>.",
-    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.",
-    "Chat with Riot Bot": "Chat with Riot Bot",
-    "Check for update": "Check for update",
+    "For help with using %(brand)s, click <a>here</a>.": "For help with using %(brand)s, click <a>here</a>.",
+    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.",
+    "Chat with %(brand)s Bot": "Chat with %(brand)s Bot",
     "Help & About": "Help & About",
     "Bug reporting": "Bug reporting",
     "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.",
@@ -784,7 +838,7 @@
     "FAQ": "FAQ",
     "Keyboard Shortcuts": "Keyboard Shortcuts",
     "Versions": "Versions",
-    "riot-web version:": "riot-web version:",
+    "%(brand)s version:": "%(brand)s version:",
     "olm version:": "olm version:",
     "Homeserver is": "Homeserver is",
     "Identity Server is": "Identity Server is",
@@ -796,7 +850,7 @@
     "Error adding ignored user/server": "Error adding ignored user/server",
     "Something went wrong. Please try again or view your console for hints.": "Something went wrong. Please try again or view your console for hints.",
     "Error subscribing to list": "Error subscribing to list",
-    "Please verify the room ID or alias and try again.": "Please verify the room ID or alias and try again.",
+    "Please verify the room ID or address and try again.": "Please verify the room ID or address and try again.",
     "Error removing ignored user/server": "Error removing ignored user/server",
     "Error unsubscribing from list": "Error unsubscribing from list",
     "Please try again or view your console for hints.": "Please try again or view your console for hints.",
@@ -804,7 +858,6 @@
     "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",
@@ -813,7 +866,7 @@
     "You are currently subscribed to:": "You are currently subscribed to:",
     "Ignored users": "Ignored users",
     "⚠ These settings are meant for advanced users.": "⚠ These settings are meant for advanced users.",
-    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.",
+    "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.": "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.",
     "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.": "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.",
     "Personal ban list": "Personal ban list",
     "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.": "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.",
@@ -823,9 +876,8 @@
     "Subscribed lists": "Subscribed lists",
     "Subscribing to a ban list will cause you to join it!": "Subscribing to a ban list will cause you to join it!",
     "If this isn't what you want, please use a different tool to ignore users.": "If this isn't what you want, please use a different tool to ignore users.",
-    "Room ID or alias of ban list": "Room ID or alias of ban list",
+    "Room ID or address of ban list": "Room ID or address of ban list",
     "Subscribe": "Subscribe",
-    "Notifications": "Notifications",
     "Start automatically after system login": "Start automatically after system login",
     "Always show the window menu bar": "Always show the window menu bar",
     "Show tray icon and minimize window to it on close": "Show tray icon and minimize window to it on close",
@@ -848,15 +900,16 @@
     "Key backup": "Key backup",
     "Message search": "Message search",
     "Cross-signing": "Cross-signing",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.",
     "Security & Privacy": "Security & Privacy",
     "Where you’re logged in": "Where you’re logged in",
     "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.",
     "A session's public name is visible to people you communicate with": "A session's public name is visible to people you communicate with",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot collects anonymous analytics to allow us to improve the application.",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s collects anonymous analytics to allow us to improve the application.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.",
     "Learn more about how we use analytics.": "Learn more about how we use analytics.",
     "No media permissions": "No media permissions",
-    "You may need to manually permit Riot to access your microphone/webcam": "You may need to manually permit Riot to access your microphone/webcam",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "You may need to manually permit %(brand)s to access your microphone/webcam",
     "Missing media permissions, click the button below to request.": "Missing media permissions, click the button below to request.",
     "Request media permissions": "Request media permissions",
     "No Audio Outputs detected": "No Audio Outputs detected",
@@ -925,7 +978,7 @@
     "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>": "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>",
     "Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
     "Click here to fix": "Click here to fix",
-    "To link to this room, please add an alias.": "To link to this room, please add an alias.",
+    "To link to this room, please add an address.": "To link to this room, please add an address.",
     "Only people who have been invited": "Only people who have been invited",
     "Anyone who knows the room's link, apart from guests": "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, including guests",
@@ -981,10 +1034,6 @@
     "Someone is using an unknown session": "Someone is using an unknown session",
     "This room is end-to-end encrypted": "This room is end-to-end encrypted",
     "Everyone in this room is verified": "Everyone in this room is verified",
-    "Some sessions for this user are not trusted": "Some sessions for this user are not trusted",
-    "All sessions for this user are trusted": "All sessions for this user are trusted",
-    "Some sessions in this encrypted room are not trusted": "Some sessions in this encrypted room are not trusted",
-    "All sessions in this encrypted room are trusted": "All sessions in this encrypted room are trusted",
     "Edit message": "Edit message",
     "Mod": "Mod",
     "This event could not be displayed": "This event could not be displayed",
@@ -1000,55 +1049,10 @@
     "Encrypted by an unverified session": "Encrypted by an unverified session",
     "Unencrypted": "Unencrypted",
     "Encrypted by a deleted session": "Encrypted by a deleted session",
+    "The authenticity of this encrypted message can't be guaranteed on this device.": "The authenticity of this encrypted message can't be guaranteed on this device.",
     "Please select the destination room for this message": "Please select the destination room for this message",
-    "Invite only": "Invite only",
     "Scroll to most recent messages": "Scroll to most recent messages",
     "Close preview": "Close preview",
-    "device id: ": "device id: ",
-    "Disinvite": "Disinvite",
-    "Kick": "Kick",
-    "Disinvite this user?": "Disinvite this user?",
-    "Kick this user?": "Kick this user?",
-    "Failed to kick": "Failed to kick",
-    "Ban": "Ban",
-    "Unban this user?": "Unban this user?",
-    "Ban this user?": "Ban this user?",
-    "Failed to ban user": "Failed to ban user",
-    "No recent messages by %(user)s found": "No recent messages by %(user)s found",
-    "Try scrolling up in the timeline to see if there are any earlier ones.": "Try scrolling up in the timeline to see if there are any earlier ones.",
-    "Remove recent messages by %(user)s": "Remove recent messages by %(user)s",
-    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?",
-    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "You are about to remove 1 message by %(user)s. This cannot be undone. Do you wish to continue?",
-    "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.",
-    "Remove %(count)s messages|other": "Remove %(count)s messages",
-    "Remove %(count)s messages|one": "Remove 1 message",
-    "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 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",
-    "Failed to mute user": "Failed to mute user",
-    "Failed to toggle moderator status": "Failed to toggle moderator status",
-    "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?": "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",
-    "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?",
-    "No sessions with registered encryption keys": "No sessions with registered encryption keys",
-    "Sessions": "Sessions",
-    "Jump to read receipt": "Jump to read receipt",
-    "Mention": "Mention",
-    "Invite": "Invite",
-    "Share Link to User": "Share Link to User",
-    "User Options": "User Options",
-    "Start a chat": "Start a chat",
-    "Direct chats": "Direct chats",
-    "Remove recent messages": "Remove recent messages",
-    "Unmute": "Unmute",
-    "Mute": "Mute",
-    "Revoke Moderator": "Revoke Moderator",
-    "Make Moderator": "Make Moderator",
-    "Admin Tools": "Admin Tools",
     "and %(count)s others...|other": "and %(count)s others...",
     "and %(count)s others...|one": "and one other...",
     "Invite to this room": "Invite to this room",
@@ -1058,13 +1062,12 @@
     "Voice call": "Voice call",
     "Video call": "Video call",
     "Hangup": "Hangup",
+    "Emoji picker": "Emoji picker",
     "Upload file": "Upload file",
     "Send an encrypted reply…": "Send an encrypted reply…",
     "Send a reply…": "Send a reply…",
     "Send an encrypted message…": "Send an encrypted message…",
     "Send a message…": "Send a message…",
-    "Send a reply (unencrypted)…": "Send a reply (unencrypted)…",
-    "Send a message (unencrypted)…": "Send a message (unencrypted)…",
     "The conversation continues here.": "The conversation continues here.",
     "This room has been replaced and is no longer active.": "This room has been replaced and is no longer active.",
     "You do not have permission to post to this room": "You do not have permission to post to this room",
@@ -1094,7 +1097,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",
-    "Recent rooms": "Recent rooms",
+    "No recently visited rooms": "No recently visited rooms",
     "No rooms to show": "No rooms to show",
     "Unnamed room": "Unnamed room",
     "World readable": "World readable",
@@ -1106,15 +1109,21 @@
     "Forget room": "Forget room",
     "Search": "Search",
     "Share room": "Share room",
-    "Community Invites": "Community Invites",
     "Invites": "Invites",
     "Favourites": "Favourites",
-    "Direct Messages": "Direct Messages",
+    "People": "People",
     "Start chat": "Start chat",
     "Rooms": "Rooms",
+    "Add room": "Add room",
+    "Create new room": "Create new room",
+    "Explore public rooms": "Explore public rooms",
     "Low priority": "Low priority",
-    "Historical": "Historical",
     "System Alerts": "System Alerts",
+    "Historical": "Historical",
+    "Custom Tag": "Custom Tag",
+    "Can't see what you’re looking for?": "Can't see what you’re looking for?",
+    "Explore all public rooms": "Explore all public rooms",
+    "%(count)s results|other": "%(count)s results",
     "This room": "This room",
     "Joining room …": "Joining room …",
     "Loading …": "Loading …",
@@ -1135,10 +1144,10 @@
     "You can still join it because this is a public room.": "You can still join it because this is a public room.",
     "Join the discussion": "Join the discussion",
     "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "This invite to %(roomName)s was sent to %(email)s which is not associated with your account",
-    "Link this email with your account in Settings to receive invites directly in Riot.": "Link this email with your account in Settings to receive invites directly in Riot.",
+    "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Link this email with your account in Settings to receive invites directly in %(brand)s.",
     "This invite to %(roomName)s was sent to %(email)s": "This invite to %(roomName)s was sent to %(email)s",
-    "Use an identity server in Settings to receive invites directly in Riot.": "Use an identity server in Settings to receive invites directly in Riot.",
-    "Share this email in Settings to receive invites directly in Riot.": "Share this email in Settings to receive invites directly in Riot.",
+    "Use an identity server in Settings to receive invites directly in %(brand)s.": "Use an identity server in Settings to receive invites directly in %(brand)s.",
+    "Share this email in Settings to receive invites directly in %(brand)s.": "Share this email in Settings to receive invites directly in %(brand)s.",
     "Do you want to chat with %(user)s?": "Do you want to chat with %(user)s?",
     "<userName/> wants to chat": "<userName/> wants to chat",
     "Start chatting": "Start chatting",
@@ -1158,12 +1167,31 @@
     "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Securely back up your keys to avoid losing them. <a>Learn more.</a>",
     "Not now": "Not now",
     "Don't ask me again": "Don't ask me again",
-    "Options": "Options",
+    "Appearance": "Appearance",
+    "Show rooms with unread messages first": "Show rooms with unread messages first",
+    "Show previews of messages": "Show previews of messages",
+    "Sort by": "Sort by",
+    "Activity": "Activity",
+    "A-Z": "A-Z",
+    "List options": "List options",
+    "Jump to first unread room.": "Jump to first unread room.",
+    "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",
+    "Use default": "Use default",
+    "All messages": "All messages",
+    "Mentions & Keywords": "Mentions & Keywords",
+    "Notification options": "Notification options",
+    "Forget Room": "Forget Room",
+    "Favourited": "Favourited",
+    "Favourite": "Favourite",
+    "Low Priority": "Low Priority",
+    "Leave Room": "Leave Room",
+    "Room options": "Room options",
     "%(count)s unread messages including mentions.|other": "%(count)s unread messages including mentions.",
     "%(count)s unread messages including mentions.|one": "1 unread mention.",
     "%(count)s unread messages.|other": "%(count)s unread messages.",
     "%(count)s unread messages.|one": "1 unread message.",
-    "Unread mentions.": "Unread mentions.",
     "Unread messages.": "Unread messages.",
     "Add a topic": "Add a topic",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.",
@@ -1174,7 +1202,6 @@
     "All Rooms": "All Rooms",
     "Search…": "Search…",
     "Server error": "Server error",
-    "Command error": "Command error",
     "Server unavailable, overloaded, or something else went wrong.": "Server unavailable, overloaded, or something else went wrong.",
     "Unknown Command": "Unknown Command",
     "Unrecognised command: %(commandText)s": "Unrecognised command: %(commandText)s",
@@ -1189,6 +1216,7 @@
     "Show Stickers": "Show Stickers",
     "Failed to revoke invite": "Failed to revoke invite",
     "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.",
+    "Admin Tools": "Admin Tools",
     "Revoke invite": "Revoke invite",
     "Invited by %(sender)s": "Invited by %(sender)s",
     "Jump to first unread message.": "Jump to first unread message.",
@@ -1196,11 +1224,11 @@
     "Error updating main address": "Error updating main address",
     "There was an error updating the room's main address. 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.",
     "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 alternative addresses. It may not be allowed by the server or a temporary failure occurred.",
-    "Error creating alias": "Error creating alias",
-    "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.",
-    "You don't have permission to delete the alias.": "You don't have permission to delete the alias.",
-    "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "There was an error removing that alias. It may no longer exist or a temporary error occurred.",
-    "Error removing alias": "Error removing alias",
+    "Error creating address": "Error creating address",
+    "There was an error creating that address. 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.",
+    "You don't have permission to delete the address.": "You don't have permission to delete the address.",
+    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "There was an error removing that address. It may no longer exist or a temporary error occurred.",
+    "Error removing address": "Error removing address",
     "Main address": "Main address",
     "not specified": "not specified",
     "This room has no local addresses": "This room has no local addresses",
@@ -1255,16 +1283,52 @@
     "%(count)s sessions|other": "%(count)s sessions",
     "%(count)s sessions|one": "%(count)s session",
     "Hide sessions": "Hide sessions",
+    "Jump to read receipt": "Jump to read receipt",
+    "Mention": "Mention",
+    "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 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",
+    "Kick": "Kick",
+    "Disinvite this user?": "Disinvite this user?",
+    "Kick this user?": "Kick this user?",
+    "Failed to kick": "Failed to kick",
+    "No recent messages by %(user)s found": "No recent messages by %(user)s found",
+    "Try scrolling up in the timeline to see if there are any earlier ones.": "Try scrolling up in the timeline to see if there are any earlier ones.",
+    "Remove recent messages by %(user)s": "Remove recent messages by %(user)s",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "You are about to remove 1 message by %(user)s. This cannot be undone. Do you wish to continue?",
+    "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.",
+    "Remove %(count)s messages|other": "Remove %(count)s messages",
+    "Remove %(count)s messages|one": "Remove 1 message",
+    "Remove recent messages": "Remove recent messages",
+    "Ban": "Ban",
+    "Unban this user?": "Unban this user?",
+    "Ban this user?": "Ban this user?",
+    "Failed to ban user": "Failed to ban user",
+    "Failed to mute user": "Failed to mute user",
+    "Unmute": "Unmute",
+    "Mute": "Mute",
     "Remove from community": "Remove from community",
     "Disinvite this user from community?": "Disinvite this user from community?",
     "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?",
+    "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?": "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",
     "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 Riot 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 Riot 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.": "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.",
     "Verify by scanning": "Verify by scanning",
     "Ask %(displayName)s to scan your code:": "Ask %(displayName)s to scan your code:",
     "If you can't scan the code above, verify by comparing unique emoji.": "If you can't scan the code above, verify by comparing unique emoji.",
@@ -1272,10 +1336,10 @@
     "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?",
-    "No": "No",
     "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!",
     "You've successfully verified %(deviceName)s (%(deviceId)s)!": "You've successfully verified %(deviceName)s (%(deviceId)s)!",
     "You've successfully verified %(displayName)s!": "You've successfully verified %(displayName)s!",
     "Verified": "Verified",
@@ -1333,6 +1397,9 @@
     "Reactions": "Reactions",
     "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reacted with %(content)s</reactedWith>",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>",
+    "Message deleted": "Message deleted",
+    "Message deleted by %(name)s": "Message deleted by %(name)s",
+    "Message deleted on %(date)s": "Message deleted on %(date)s",
     "%(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/>",
@@ -1342,13 +1409,12 @@
     "Failed to copy": "Failed to copy",
     "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",
+    "Click to view edits": "Click to view edits",
     "Edited at %(date)s. Click to view edits.": "Edited at %(date)s. Click to view edits.",
     "edited": "edited",
     "Can't load this message": "Can't load this message",
     "Submit logs": "Submit logs",
-    "Removed or unknown message type": "Removed or unknown message type",
-    "Message removed by %(userId)s": "Message removed by %(userId)s",
-    "Message removed": "Message removed",
     "Failed to load group members": "Failed to load group members",
     "Filter community members": "Filter community members",
     "Invite to this community": "Invite to this community",
@@ -1366,24 +1432,6 @@
     "Something went wrong when trying to get your communities.": "Something went wrong when trying to get your communities.",
     "Display your community flair in rooms configured to show it.": "Display your community flair in rooms configured to show it.",
     "You're not currently a member of any communities.": "You're not currently a member of any communities.",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.",
-    "Yes, I want to help!": "Yes, I want to help!",
-    "You are not receiving desktop notifications": "You are not receiving desktop notifications",
-    "Enable them now": "Enable them now",
-    "What's New": "What's New",
-    "Update": "Update",
-    "What's new?": "What's new?",
-    "A new version of Riot is available.": "A new version of Riot is available.",
-    "To return to your account in future you need to <u>set a password</u>": "To return to your account in future you need to <u>set a password</u>",
-    "Set Password": "Set Password",
-    "Please <a>contact your service administrator</a> to get this limit increased.": "Please <a>contact your service administrator</a> to get this limit increased.",
-    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.",
-    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.",
-    "Error encountered (%(errorDetail)s).": "Error encountered (%(errorDetail)s).",
-    "Checking for an update...": "Checking for an update...",
-    "No update available.": "No update available.",
-    "Downloading update...": "Downloading update...",
     "Frequently Used": "Frequently Used",
     "Smileys & People": "Smileys & People",
     "Animals & Nature": "Animals & Nature",
@@ -1393,6 +1441,7 @@
     "Objects": "Objects",
     "Symbols": "Symbols",
     "Flags": "Flags",
+    "Categories": "Categories",
     "Quick Reactions": "Quick Reactions",
     "Cancel search": "Cancel search",
     "Unknown Address": "Unknown Address",
@@ -1401,7 +1450,7 @@
     "Your avatar URL": "Your avatar URL",
     "Your user ID": "Your user ID",
     "Your theme": "Your theme",
-    "Riot URL": "Riot URL",
+    "%(brand)s URL": "%(brand)s URL",
     "Room ID": "Room ID",
     "Widget ID": "Widget ID",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.",
@@ -1418,17 +1467,11 @@
     "Maximize apps": "Maximize apps",
     "Popout widget": "Popout widget",
     "More options": "More options",
-    "Create new room": "Create new room",
-    "Unblacklist": "Unblacklist",
-    "Blacklist": "Blacklist",
-    "Unverify": "Unverify",
-    "Verify...": "Verify...",
     "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.",
     "collapse": "collapse",
     "expand": "expand",
-    "Communities": "Communities",
     "You cannot delete this image. (%(code)s)": "You cannot delete this image. (%(code)s)",
     "Uploaded on %(date)s by %(user)s": "Uploaded on %(date)s by %(user)s",
     "Rotate Left": "Rotate Left",
@@ -1493,14 +1536,15 @@
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)smade no changes",
     "Power level": "Power level",
     "Custom level": "Custom level",
+    "QR Code": "QR Code",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.",
     "<a>In reply to</a> <pill>": "<a>In reply to</a> <pill>",
-    "Room alias": "Room alias",
+    "Room address": "Room address",
     "e.g. my-room": "e.g. my-room",
     "Some characters not allowed": "Some characters not allowed",
-    "Please provide a room alias": "Please provide a room alias",
-    "This alias is available to use": "This alias is available to use",
-    "This alias is already in use": "This alias is already in use",
+    "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",
     "Sign in with single sign-on": "Sign in with single sign-on",
     "And %(count)s more...|other": "And %(count)s more...",
@@ -1536,9 +1580,11 @@
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.",
     "Preparing to send logs": "Preparing to send logs",
     "Failed to send logs: ": "Failed to send logs: ",
+    "Preparing to download logs": "Preparing to download logs",
     "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Reminder: Your browser is unsupported, so your experience may be unpredictable.",
     "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.",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.",
+    "Download logs": "Download logs",
     "GitHub issue": "GitHub issue",
     "Notes": "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.": "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.",
@@ -1566,10 +1612,10 @@
     "example": "example",
     "Create": "Create",
     "Please enter a name for the room": "Please enter a name for the room",
-    "Set a room alias to easily share your room with other people.": "Set a room alias to easily share your room with other people.",
+    "Set a room address to easily share your room with other people.": "Set a room address to easily share your room with other people.",
     "This room is private, and can only be joined by invitation.": "This room is private, and can only be joined by invitation.",
-    "Enable end-to-end encryption": "Enable end-to-end encryption",
     "You can’t disable this later. Bridges & most bots won’t work yet.": "You can’t disable this later. Bridges & most bots won’t work yet.",
+    "Enable end-to-end encryption": "Enable end-to-end encryption",
     "Create a public room": "Create a public room",
     "Create a private room": "Create a private room",
     "Name": "Name",
@@ -1580,37 +1626,23 @@
     "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)",
     "Create Room": "Create Room",
     "Sign out": "Sign out",
-    "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 Riot to do this": "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 Riot to do this",
-    "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ": "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ",
+    "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": "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",
+    "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.": "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.",
     "Incompatible Database": "Incompatible Database",
     "Continue With Encryption Disabled": "Continue With Encryption Disabled",
-    "Server did not require any authentication": "Server did not require any authentication",
-    "Server did not return valid authentication information.": "Server did not return valid authentication information.",
     "Confirm your account deactivation by using Single Sign On to prove your identity.": "Confirm your account deactivation by using Single Sign On to prove your identity.",
     "Are you sure you want to deactivate your account? This is irreversible.": "Are you sure you want to deactivate your account? This is irreversible.",
     "Confirm account deactivation": "Confirm account deactivation",
     "To continue, please enter your password:": "To continue, please enter your password:",
     "There was a problem communicating with the server. Please try again.": "There was a problem communicating with the server. Please try again.",
+    "Server did not require any authentication": "Server did not require any authentication",
+    "Server did not return valid authentication information.": "Server did not return valid authentication information.",
     "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>": "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>",
     "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.": "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.",
     "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.": "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)": "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)",
-    "Verify session": "Verify session",
-    "Use Legacy Verification (for older clients)": "Use Legacy Verification (for older clients)",
-    "Verify by comparing a short text string.": "Verify by comparing a short text string.",
-    "Begin Verifying": "Begin Verifying",
-    "Waiting for partner to accept...": "Waiting for partner to accept...",
-    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.",
-    "Waiting for %(userId)s to confirm...": "Waiting for %(userId)s to confirm...",
-    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:",
-    "To verify that this session can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this session matches the key below:": "To verify that this session can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this session matches the key below:",
-    "Use two-way text verification": "Use two-way text verification",
-    "Session name": "Session name",
-    "Session ID": "Session ID",
-    "Session key": "Session key",
-    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.",
-    "I verify that the keys match": "I verify that the keys match",
     "Back": "Back",
+    "Send": "Send",
     "Send Custom Event": "Send Custom Event",
     "You must specify an event type!": "You must specify an event type!",
     "Event sent!": "Event sent!",
@@ -1636,7 +1668,10 @@
     "Integrations are disabled": "Integrations are disabled",
     "Enable 'Manage Integrations' in Settings to do this.": "Enable 'Manage Integrations' in Settings to do this.",
     "Integrations not allowed": "Integrations not allowed",
-    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.",
+    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.",
+    "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.",
     "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.",
@@ -1646,39 +1681,37 @@
     "Recent Conversations": "Recent Conversations",
     "Suggestions": "Suggestions",
     "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.",
     "Go": "Go",
-    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.",
-    "You added a new session '%(displayName)s', which is requesting encryption keys.": "You added a new session '%(displayName)s', which is requesting encryption keys.",
-    "Your unverified session '%(displayName)s' is requesting encryption keys.": "Your unverified session '%(displayName)s' is requesting encryption keys.",
-    "Start verification": "Start verification",
-    "Share without verifying": "Share without verifying",
-    "Ignore request": "Ignore request",
-    "Loading session info...": "Loading session info...",
-    "Encryption key request": "Encryption key request",
+    "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>.",
     "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",
     "a key signature": "a key signature",
-    "Riot encountered an error during upload of:": "Riot encountered an error during upload of:",
+    "%(brand)s encountered an error during upload of:": "%(brand)s encountered an error during upload of:",
     "Upload completed": "Upload completed",
     "Cancelled signature upload": "Cancelled signature upload",
     "Unable to upload": "Unable to upload",
     "Signature upload success": "Signature upload success",
     "Signature upload failed": "Signature upload failed",
-    "You've previously used Riot 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, Riot needs to resync your account.": "You've previously used Riot 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, Riot needs to resync your account.",
-    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.",
+    "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.": "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.",
+    "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.": "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.",
     "Incompatible local cache": "Incompatible local cache",
     "Clear cache and resync": "Clear cache and resync",
-    "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!",
-    "Updating Riot": "Updating Riot",
+    "%(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 now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!",
+    "Updating %(brand)s": "Updating %(brand)s",
     "I don't want my encrypted messages": "I don't want my encrypted messages",
     "Manually export keys": "Manually export keys",
     "You'll lose access to your encrypted messages": "You'll lose access to your encrypted messages",
     "Are you sure you want to sign out?": "Are you sure you want to sign out?",
     "Confirm by comparing the following with the User Settings in your other session:": "Confirm by comparing the following with the User Settings in your other session:",
     "Confirm this user's session by comparing the following with their User Settings:": "Confirm this user's session by comparing the following with their User Settings:",
+    "Session name": "Session name",
+    "Session ID": "Session ID",
+    "Session key": "Session key",
     "If they don't match, the security of your communication may be compromised.": "If they don't match, the security of your communication may be compromised.",
+    "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",
     "Your account is not secure": "Your account is not secure",
@@ -1711,15 +1744,28 @@
     "Upgrade private room": "Upgrade private room",
     "Upgrade public room": "Upgrade public room",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.",
-    "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.",
+    "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>.": "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>.",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "You'll upgrade this room from <oldVersion /> to <newVersion />.",
+    "Resend": "Resend",
+    "You're all caught up.": "You're all caught up.",
+    "Server isn't responding": "Server isn't responding",
+    "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "Your server isn't responding to some of your requests. Below are some of the most likely reasons.",
+    "The server (%(serverName)s) took too long to respond.": "The server (%(serverName)s) took too long to respond.",
+    "Your firewall or anti-virus is blocking the request.": "Your firewall or anti-virus is blocking the request.",
+    "A browser extension is preventing the request.": "A browser extension is preventing the request.",
+    "The server is offline.": "The server is offline.",
+    "The server has denied your request.": "The server has denied your request.",
+    "Your area is experiencing difficulties connecting to the internet.": "Your area is experiencing difficulties connecting to the internet.",
+    "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",
     "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",
     "Refresh": "Refresh",
     "Unable to restore session": "Unable to restore session",
     "We encountered an error trying to restore your previous session.": "We encountered an error trying to restore your previous session.",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.",
+    "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.": "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.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.",
     "Verification Pending": "Verification Pending",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Please check your email and click on the link it contains. Once this is done, click continue.",
@@ -1748,7 +1794,7 @@
     "Share Community": "Share Community",
     "Share Room Message": "Share Room Message",
     "Link to selected message": "Link to selected message",
-    "COPY": "COPY",
+    "Copy": "Copy",
     "Command Help": "Command Help",
     "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",
@@ -1764,11 +1810,6 @@
     "Summary": "Summary",
     "Document": "Document",
     "Next": "Next",
-    "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.",
-    "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.",
-    "Room contains unknown sessions": "Room contains unknown sessions",
-    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "\"%(RoomName)s\" contains sessions that you haven't seen before.",
-    "Unknown sessions": "Unknown sessions",
     "Upload files (%(current)s of %(total)s)": "Upload files (%(current)s of %(total)s)",
     "Upload files": "Upload files",
     "Upload all": "Upload all",
@@ -1786,17 +1827,15 @@
     "Remember my selection for this widget": "Remember my selection for this widget",
     "Allow": "Allow",
     "Deny": "Deny",
-    "Enter recovery passphrase": "Enter recovery passphrase",
+    "Wrong file type": "Wrong file type",
+    "Looks good!": "Looks good!",
+    "Wrong Recovery Key": "Wrong Recovery Key",
+    "Invalid Recovery Key": "Invalid Recovery 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.",
-    "<b>Warning</b>: You should only do this on a trusted computer.": "<b>Warning</b>: You should only do this on a trusted computer.",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Access your secure message history and your cross-signing identity for verifying other sessions 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",
-    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Unable to access secret storage. Please verify that you entered the correct 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 your cross-signing identity for verifying other sessions by entering your recovery key.": "Access your secure message history and your cross-signing identity for verifying other sessions 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>.",
+    "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.",
     "Restoring keys from backup": "Restoring keys from backup",
     "Fetching keys from server...": "Fetching keys from server...",
     "%(completed)s of %(total)s keys restored": "%(completed)s of %(total)s keys restored",
@@ -1810,20 +1849,23 @@
     "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",
     "<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",
     "<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>",
     "Private Chat": "Private Chat",
     "Public Chat": "Public Chat",
     "Custom": "Custom",
-    "Alias (optional)": "Alias (optional)",
+    "Address (optional)": "Address (optional)",
     "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",
-    "Resend": "Resend",
     "Resend edit": "Resend edit",
     "Resend %(unsentCount)s reaction(s)": "Resend %(unsentCount)s reaction(s)",
     "Resend removal": "Resend removal",
@@ -1836,18 +1878,14 @@
     "Share Message": "Share Message",
     "Source URL": "Source URL",
     "Collapse Reply Thread": "Collapse Reply Thread",
-    "End-to-end encryption information": "End-to-end encryption information",
     "Report Content": "Report Content",
     "Failed to set Direct Message status of room": "Failed to set Direct Message status of room",
     "Failed to forget room %(errCode)s": "Failed to forget room %(errCode)s",
     "Notification settings": "Notification settings",
     "All messages (noisy)": "All messages (noisy)",
-    "All messages": "All messages",
     "Mentions only": "Mentions only",
     "Leave": "Leave",
     "Forget": "Forget",
-    "Favourite": "Favourite",
-    "Low Priority": "Low Priority",
     "Direct Chat": "Direct Chat",
     "Clear status": "Clear status",
     "Update status": "Update status",
@@ -1862,12 +1900,14 @@
     "Take picture": "Take picture",
     "Remove for everyone": "Remove for everyone",
     "Remove for me": "Remove for me",
+    "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 this app 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 this app 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.": "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.",
     "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",
@@ -1881,9 +1921,12 @@
     "Submit": "Submit",
     "Start authentication": "Start authentication",
     "Unable to validate homeserver/identity server": "Unable to validate homeserver/identity server",
-    "Your Modular server": "Your 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>.": "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</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>.": "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.",
@@ -1898,10 +1941,6 @@
     "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",
-    "Enter password": "Enter password",
-    "Password is allowed, but unsafe": "Password is allowed, but unsafe",
-    "Nice, strong password!": "Nice, strong password!",
-    "Keep going...": "Keep going...",
     "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)",
@@ -1928,15 +1967,16 @@
     "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 />",
     "Sign in with SSO": "Sign in with SSO",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Sorry, your browser is <b>not</b> able to run Riot.",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Sorry, your browser is <b>not</b> able to run %(brand)s.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.",
     "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!": "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!",
     "I understand the risks and wish to continue": "I understand the risks and wish to continue",
     "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",
     "You must join the room to see its files": "You must join the room to see its files",
-    "There are no visible files in this room": "There are no visible files in this room",
+    "No files visible in this room": "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.",
     "<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",
     "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?",
@@ -1984,9 +2024,7 @@
     "Send a Direct Message": "Send a Direct Message",
     "Explore Public Rooms": "Explore Public Rooms",
     "Create a Group Chat": "Create a Group Chat",
-    "Explore": "Explore",
-    "Filter": "Filter",
-    "Filter rooms…": "Filter rooms…",
+    "Explore rooms": "Explore rooms",
     "Failed to reject invitation": "Failed to reject invitation",
     "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 room '%(roomName)s'?": "Are you sure you want to leave the room '%(roomName)s'?",
@@ -2000,28 +2038,30 @@
     "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.",
     "Review terms and conditions": "Review terms and conditions",
     "Old cryptography data detected": "Old cryptography data detected",
-    "Data from an older version of Riot 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 Riot 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.": "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 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 Riot.im experience!": "Did you know: you can use communities to filter your Riot.im experience!",
+    "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!",
     "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.": "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.",
     "Error whilst fetching joined communities": "Error whilst fetching joined communities",
+    "Communities": "Communities",
     "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 have no visible notifications": "You have no visible notifications",
-    "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.",
-    "Riot failed to get the public room list.": "Riot failed to get the public room list.",
+    "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.",
+    "%(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.",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Delete the room alias %(alias)s and remove %(name)s from the directory?",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "Delete the room address %(alias)s and remove %(name)s from the directory?",
     "Remove %(name)s from the directory?": "Remove %(name)s from the directory?",
     "Remove from Directory": "Remove from Directory",
     "remove %(name)s from the directory.": "remove %(name)s from the directory.",
-    "delete the alias.": "delete the alias.",
+    "delete the address.": "delete the address.",
     "The server may be unavailable or overloaded": "The server may be unavailable or overloaded",
     "Unable to join network": "Unable to join network",
-    "Riot does not know how to join a room on this network": "Riot does not know how to join a room on this network",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s does not know how to join a room on this network",
     "Room not found": "Room not found",
     "Couldn't find a matching Matrix room": "Couldn't find a matching Matrix room",
     "Fetching third party location failed": "Fetching third party location failed",
@@ -2031,9 +2071,8 @@
     "Find a room…": "Find a room…",
     "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": "Explore rooms",
-    "Message not sent due to unknown sessions being present": "Message not sent due to unknown sessions being present",
-    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.",
+    "Clear filter": "Clear filter",
+    "Search rooms": "Search rooms",
     "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.",
@@ -2043,17 +2082,12 @@
     "%(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.",
     "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.",
-    "Active call": "Active call",
     "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>?",
-    "Jump to first unread room.": "Jump to first unread room.",
-    "Jump to first invite.": "Jump to first invite.",
-    "Add room": "Add room",
     "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",
     "Server may be unavailable, overloaded, or search timed out :(": "Server may be unavailable, overloaded, or search timed out :(",
     "No more results": "No more results",
-    "Unknown room %(roomId)s": "Unknown room %(roomId)s",
     "Room": "Room",
     "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.",
@@ -2063,16 +2097,19 @@
     "Click to mute video": "Click to mute video",
     "Click to unmute audio": "Click to unmute audio",
     "Click to mute audio": "Click to mute audio",
-    "Clear filter": "Clear filter",
     "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",
-    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
-    "Guest": "Guest",
-    "Your profile": "Your profile",
     "Uploading %(filename)s and %(count)s others|other": "Uploading %(filename)s and %(count)s others",
     "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",
+    "Switch to light mode": "Switch to light mode",
+    "Switch to dark mode": "Switch to dark mode",
+    "Switch theme": "Switch theme",
+    "Security & privacy": "Security & privacy",
+    "All settings": "All settings",
+    "Feedback": "Feedback",
+    "User menu": "User menu",
     "Could not load user profile": "Could not load user profile",
     "Verify this login": "Verify this login",
     "Session verified": "Session verified",
@@ -2128,14 +2165,18 @@
     "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",
     "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 Riot on your other devices:": "This requires the latest Riot on your other devices:",
+    "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",
+    "%(brand)s Desktop": "%(brand)s Desktop",
+    "%(brand)s iOS": "%(brand)s iOS",
+    "%(brand)s Android": "%(brand)s Android",
     "or another cross-signing capable Matrix client": "or another cross-signing capable Matrix client",
-    "Use Recovery Passphrase or Key": "Use Recovery Passphrase or Key",
     "Your new session is now verified. It has access to your encrypted messages, and 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.",
     "Your new session is now verified. Other users will see it as trusted.": "Your new session is now verified. Other users will see it as trusted.",
     "Without completing security on this session, it won’t have access to encrypted messages.": "Without completing security on this session, it won’t have access to encrypted messages.",
-    "Go Back": "Go Back",
     "Failed to re-authenticate due to a homeserver problem": "Failed to re-authenticate due to a homeserver problem",
     "Incorrect password": "Incorrect password",
     "Failed to re-authenticate": "Failed to re-authenticate",
@@ -2160,27 +2201,12 @@
     "Room Autocomplete": "Room Autocomplete",
     "Users": "Users",
     "User Autocomplete": "User Autocomplete",
-    "unknown device": "unknown device",
-    "NOT verified": "NOT verified",
-    "Blacklisted": "Blacklisted",
-    "verified": "verified",
-    "Device ID": "Device ID",
-    "Verification": "Verification",
-    "Ed25519 fingerprint": "Ed25519 fingerprint",
-    "User ID": "User ID",
-    "Curve25519 identity key": "Curve25519 identity key",
-    "none": "none",
-    "Claimed Ed25519 fingerprint key": "Claimed Ed25519 fingerprint key",
-    "Algorithm": "Algorithm",
-    "unencrypted": "unencrypted",
-    "Decryption error": "Decryption error",
-    "Event information": "Event information",
-    "Sender session information": "Sender session information",
     "Passphrases must match": "Passphrases must match",
     "Passphrase must not be empty": "Passphrase must not be empty",
     "Export room keys": "Export room keys",
     "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.": "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.",
     "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.": "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.",
+    "Enter passphrase": "Enter passphrase",
     "Confirm passphrase": "Confirm passphrase",
     "Export": "Export",
     "Import room keys": "Import room keys",
@@ -2188,48 +2214,57 @@
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.",
     "File to import": "File to import",
     "Import": "Import",
+    "Confirm encryption setup": "Confirm encryption setup",
+    "Click the button below to confirm setting up encryption.": "Click the button below to confirm setting up encryption.",
+    "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.",
+    "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.",
     "Enter your account password to confirm the upgrade:": "Enter your account password to confirm the upgrade:",
     "Restore your key backup to upgrade your encryption": "Restore your key backup to upgrade your encryption",
     "Restore": "Restore",
     "You'll need to authenticate with the server to confirm the upgrade.": "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 this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.",
-    "Great! This recovery passphrase looks strong enough.": "Great! This recovery passphrase looks strong enough.",
-    "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:": "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to 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 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 recovery passphrase": "Enter a recovery passphrase",
-    "Back up encrypted message keys": "Back up encrypted message keys",
-    "Set up with a recovery key": "Set up with a recovery key",
+    "Great! This recovery passphrase looks strong enough.": "Great! This recovery passphrase looks strong enough.",
     "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.",
     "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.",
+    "Download": "Download",
+    "Unable to query secret storage status": "Unable to query secret storage status",
+    "Retry": "Retry",
+    "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.",
+    "You can also set up Secure Backup & manage your keys in Settings.": "You can also set up Secure Backup & manage your keys in Settings.",
+    "Set up Secure backup": "Set up Secure backup",
+    "Upgrade your encryption": "Upgrade your encryption",
+    "Set a Security Phrase": "Set a Security Phrase",
+    "Confirm Security Phrase": "Confirm Security Phrase",
+    "Save your Security Key": "Save your Security Key",
+    "Unable to set up secret storage": "Unable to set up secret storage",
+    "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.",
+    "For maximum security, this should be different from your account password.": "For maximum security, this should be different from your account password.",
+    "Set up with a recovery key": "Set up with a recovery key",
+    "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.",
     "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",
-    "Copy": "Copy",
-    "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.",
     "<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",
-    "Unable to query secret storage status": "Unable to query secret storage status",
-    "Retry": "Retry",
-    "You can now verify your other devices, and other users to keep your chats safe.": "You can now verify your other devices, and other users to keep your chats safe.",
-    "Upgrade your encryption": "Upgrade your encryption",
-    "Confirm recovery passphrase": "Confirm recovery passphrase",
-    "Make a copy of your recovery key": "Make a copy of your recovery key",
-    "You're done!": "You're done!",
-    "Unable to set up secret storage": "Unable to set up secret storage",
-    "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.",
-    "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...",
-    "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 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",
+    "Make a copy of your recovery key": "Make a copy of your recovery key",
     "Starting backup...": "Starting backup...",
     "Success!": "Success!",
     "Create key backup": "Create key backup",
@@ -2251,7 +2286,7 @@
     "Disable": "Disable",
     "Not currently indexing messages for any room.": "Not currently indexing messages for any room.",
     "Currently indexing: %(currentRoom)s": "Currently indexing: %(currentRoom)s",
-    "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot is securely caching encrypted messages locally for them to appear in search results:",
+    "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s is securely caching encrypted messages locally for them to appear in search results:",
     "Space used:": "Space used:",
     "Indexed messages:": "Indexed messages:",
     "Indexed rooms:": "Indexed rooms:",
@@ -2279,13 +2314,16 @@
     "Cancel replying to a message": "Cancel replying to a message",
     "Toggle microphone mute": "Toggle microphone mute",
     "Toggle video on/off": "Toggle video on/off",
+    "Scroll up/down in the timeline": "Scroll up/down in the timeline",
+    "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",
     "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",
     "Collapse room list section": "Collapse room list section",
     "Expand room list section": "Expand room list section",
     "Clear room list filter field": "Clear room list filter field",
-    "Scroll up/down in the timeline": "Scroll up/down in the timeline",
     "Previous/next unread room or DM": "Previous/next unread room or DM",
     "Previous/next room or DM": "Previous/next room or DM",
     "Toggle the top left menu": "Toggle the top left menu",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 05f29c3887..a4249a93eb 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -11,12 +11,11 @@
     "No Microphones detected": "No Microphones detected",
     "No Webcams detected": "No Webcams detected",
     "No media permissions": "No media permissions",
-    "You may need to manually permit Riot to access your microphone/webcam": "You may need to manually permit Riot to access your microphone/webcam",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "You may need to manually permit %(brand)s to access your microphone/webcam",
     "Default Device": "Default Device",
     "Microphone": "Microphone",
     "Camera": "Camera",
     "Advanced": "Advanced",
-    "Algorithm": "Algorithm",
     "Always show message timestamps": "Always show message timestamps",
     "Authentication": "Authentication",
     "%(items)s and %(lastItem)s": "%(items)s and %(lastItem)s",
@@ -37,7 +36,6 @@
     "Ban": "Ban",
     "Banned users": "Banned users",
     "Bans user with given id": "Bans user with given id",
-    "Blacklisted": "Blacklisted",
     "Call Timeout": "Call Timeout",
     "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>.",
     "Change Password": "Change Password",
@@ -47,7 +45,6 @@
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s removed the room name.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s changed the topic to \"%(topic)s\".",
     "Changes your display nickname": "Changes your display nickname",
-    "Claimed Ed25519 fingerprint key": "Claimed Ed25519 fingerprint key",
     "Click here to fix": "Click here to fix",
     "Click to mute audio": "Click to mute audio",
     "Click to mute video": "Click to mute video",
@@ -58,35 +55,26 @@
     "Commands": "Commands",
     "Confirm password": "Confirm password",
     "Continue": "Continue",
-    "Could not connect to the integration server": "Could not connect to the integration server",
     "Create Room": "Create Room",
     "Cryptography": "Cryptography",
     "Current password": "Current password",
-    "Curve25519 identity key": "Curve25519 identity key",
     "Custom level": "Custom level",
     "/ddg is not a command": "/ddg is not a command",
     "Deactivate Account": "Deactivate Account",
     "Decrypt %(text)s": "Decrypt %(text)s",
-    "Decryption error": "Decryption error",
     "Deops user with given id": "Deops user with given id",
     "Default": "Default",
     "Delete widget": "Delete widget",
-    "Device ID": "Device ID",
-    "device id: ": "device id: ",
-    "Direct chats": "Direct chats",
     "Disinvite": "Disinvite",
     "Displays action": "Displays action",
     "Download %(text)s": "Download %(text)s",
-    "Ed25519 fingerprint": "Ed25519 fingerprint",
     "Edit": "Edit",
     "Email": "Email",
     "Email address": "Email address",
     "Emoji": "Emoji",
     "%(senderName)s ended the call.": "%(senderName)s ended the call.",
-    "End-to-end encryption information": "End-to-end encryption information",
     "Error": "Error",
     "Error decrypting attachment": "Error decrypting attachment",
-    "Event information": "Event information",
     "Existing Call": "Existing Call",
     "Export": "Export",
     "Export E2E room keys": "Export E2E room keys",
@@ -106,7 +94,6 @@
     "Failed to send email": "Failed to send email",
     "Failed to send request.": "Failed to send request.",
     "Failed to set display name": "Failed to set display name",
-    "Failed to toggle moderator status": "Failed to toggle moderator status",
     "Failed to unban": "Failed to unban",
     "Failed to verify email address: make sure you clicked the link in the email": "Failed to verify email address: make sure you clicked the link in the email",
     "Failure to create room": "Failure to create room",
@@ -136,7 +123,6 @@
     "Sign in with": "Sign in with",
     "Join Room": "Join Room",
     "%(targetName)s joined the room.": "%(targetName)s joined the room.",
-    "Joins room with given alias": "Joins room with given alias",
     "Jump to first unread message.": "Jump to first unread message.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s kicked %(targetName)s.",
     "Kick": "Kick",
@@ -144,7 +130,6 @@
     "Labs": "Labs",
     "Ignore": "Ignore",
     "Unignore": "Unignore",
-    "User Options": "User Options",
     "You are now ignoring %(userId)s": "You are now ignoring %(userId)s",
     "You are no longer ignoring %(userId)s": "You are no longer ignoring %(userId)s",
     "Unignored user": "Unignored user",
@@ -154,7 +139,6 @@
     "Leave room": "Leave room",
     "%(targetName)s left the room.": "%(targetName)s left the room.",
     "Publish this room to the public in %(domain)s's room directory?": "Publish this room to the public in %(domain)s's room directory?",
-    "Local addresses for this room:": "Local addresses for this room:",
     "Logout": "Logout",
     "Low priority": "Low priority",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s made future room history visible to all room members, from the point they are invited.",
@@ -168,15 +152,12 @@
     "Moderator": "Moderator",
     "Mute": "Mute",
     "Name": "Name",
-    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
     "New passwords don't match": "New passwords don't match",
     "New passwords must match each other.": "New passwords must match each other.",
-    "none": "none",
     "not specified": "not specified",
     "Notifications": "Notifications",
     "(not supported by this browser)": "(not supported by this browser)",
     "<not supported>": "<not supported>",
-    "NOT verified": "NOT verified",
     "No more results": "No more results",
     "No results": "No results",
     "No users have specific privileges in this room": "No users have specific privileges in this room",
@@ -194,25 +175,22 @@
     "Privileged Users": "Privileged Users",
     "Profile": "Profile",
     "Reason": "Reason",
-    "Revoke Moderator": "Revoke Moderator",
     "Register": "Register",
     "%(targetName)s rejected the invitation.": "%(targetName)s rejected the invitation.",
     "Reject invitation": "Reject invitation",
-    "Remote addresses for this room:": "Remote addresses for this room:",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removed their display name (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s removed their profile picture.",
     "Remove": "Remove",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s requested a VoIP conference.",
     "Results from DuckDuckGo": "Results from DuckDuckGo",
     "Return to login screen": "Return to login screen",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
-    "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
-    "riot-web version:": "riot-web version:",
+    "%(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",
+    "%(brand)s version:": "%(brand)s version:",
     "Room %(roomId)s not visible": "Room %(roomId)s not visible",
     "Room Colour": "Room Color",
     "Rooms": "Rooms",
     "Save": "Save",
-    "Scroll to bottom of page": "Scroll to bottom of page",
     "Search": "Search",
     "Search failed": "Search failed",
     "Searches DuckDuckGo for results": "Searches DuckDuckGo for results",
@@ -233,7 +211,6 @@
     "Sign out": "Sign out",
     "%(count)s of your messages have not been sent.|other": "Some of your messages have not been sent.",
     "Someone": "Someone",
-    "Start a chat": "Start a chat",
     "Submit": "Submit",
     "Success": "Success",
     "This email address is already in use": "This email address is already in use",
@@ -255,22 +232,14 @@
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s unbanned %(targetName)s.",
     "Unable to capture screen": "Unable to capture screen",
     "Unable to enable Notifications": "Unable to enable Notifications",
-    "unencrypted": "unencrypted",
-    "unknown device": "unknown device",
     "unknown error code": "unknown error code",
-    "Unknown room %(roomId)s": "Unknown room %(roomId)s",
     "Unmute": "Unmute",
-    "Unrecognised room alias:": "Unrecognized room alias:",
     "Upload avatar": "Upload avatar",
     "Upload Failed": "Upload Failed",
     "Upload file": "Upload file",
     "Usage": "Usage",
-    "Use compact timeline layout": "Use compact timeline layout",
-    "User ID": "User ID",
     "Users": "Users",
     "Verification Pending": "Verification Pending",
-    "Verification": "Verification",
-    "verified": "verified",
     "Verified key": "Verified key",
     "Video call": "Video call",
     "Voice call": "Voice call",
@@ -323,7 +292,6 @@
     "Upload an avatar:": "Upload an avatar:",
     "This server does not support authentication with a phone number.": "This server does not support authentication with a phone number.",
     "An error occurred: %(error_string)s": "An error occurred: %(error_string)s",
-    "Make Moderator": "Make Moderator",
     "There are no visible files in this room": "There are no visible files in this room",
     "Room": "Room",
     "Connectivity to the server has been lost.": "Connectivity to the server has been lost.",
@@ -335,7 +303,7 @@
     "Analytics": "Analytics",
     "Banned by %(displayName)s": "Banned by %(displayName)s",
     "Options": "Options",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot collects anonymous analytics to allow us to improve the application.",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s collects anonymous analytics to allow us to improve the application.",
     "Passphrases must match": "Passphrases must match",
     "Passphrase must not be empty": "Passphrase must not be empty",
     "Export room keys": "Export room keys",
@@ -355,15 +323,9 @@
     "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.",
     "Unknown error": "Unknown error",
     "Incorrect password": "Incorrect password",
-    "To continue, please enter your password.": "To continue, please enter your password.",
-    "I verify that the keys match": "I verify that the keys match",
     "Unable to restore session": "Unable to restore session",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.",
+    "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.": "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.",
     "Unknown Address": "Unknown Address",
-    "Unblacklist": "Unblacklist",
-    "Blacklist": "Blacklist",
-    "Unverify": "Unverify",
-    "Verify...": "Verify...",
     "ex. @bob:example.com": "ex. @bob:example.com",
     "Add User": "Add User",
     "Custom Server Options": "Custom Server Options",
@@ -378,7 +340,6 @@
     "Error decrypting video": "Error decrypting video",
     "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?",
-    "Removed or unknown message type": "Removed or unknown message type",
     "URL Previews": "URL Previews",
     "Drop file here to upload": "Drop file here to upload",
     " (unsupported)": " (unsupported)",
@@ -393,13 +354,10 @@
     "Accept": "Accept",
     "Add": "Add",
     "Admin Tools": "Admin Tools",
-    "Alias (optional)": "Alias (optional)",
     "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.",
     "Close": "Close",
     "Custom": "Custom",
     "Decline": "Decline",
-    "Disable Notifications": "Disable Notifications",
-    "Enable Notifications": "Enable Notifications",
     "Create new room": "Create new room",
     "Room directory": "Room directory",
     "Start chat": "Start chat",
@@ -419,7 +377,6 @@
     "%(roomName)s does not exist.": "%(roomName)s does not exist.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s is not accessible at this time.",
     "Seen by %(userName)s at %(dateTime)s": "Seen by %(userName)s at %(dateTime)s",
-    "Send anyway": "Send anyway",
     "Start authentication": "Start authentication",
     "The phone number entered looks invalid": "The phone number entered looks invalid",
     "This room": "This room",
@@ -441,15 +398,11 @@
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "If you already have a Matrix account you can <a>log in</a> instead.",
     "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
-    "Not a valid Riot keyfile": "Not a valid Riot keyfile",
+    "Not a valid %(brand)s keyfile": "Not a valid %(brand)s keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
     "Do you want to set an email address?": "Do you want to set an email address?",
     "This will allow you to reset your password and receive notifications.": "This will allow you to reset your password and receive notifications.",
     "Skip": "Skip",
-    "Start verification": "Start verification",
-    "Share without verifying": "Share without verifying",
-    "Ignore request": "Ignore request",
-    "Encryption key request": "Encryption key request",
     "Check for update": "Check for update",
     "Allow": "Allow",
     "Cannot add any more widgets": "Cannot add any more widgets",
@@ -461,7 +414,6 @@
     "Unable to create widget.": "Unable to create widget.",
     "You are not in this room.": "You are not in this room.",
     "You do not have permission to do that in this room.": "You do not have permission to do that in this room.",
-    "Message removed by %(userId)s": "Message removed by %(userId)s",
     "Example": "Example",
     "Create": "Create",
     "Pinned Messages": "Pinned Messages",
@@ -473,7 +425,6 @@
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s widget removed by %(senderName)s",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s changed the pinned messages for the room.",
     "Fetching third party location failed": "Fetching third party location failed",
-    "A new version of Riot is available.": "A new version of Riot is available.",
     "All notifications are currently disabled for all targets.": "All notifications are currently disabled for all targets.",
     "Uploading report": "Uploading report",
     "Sunday": "Sunday",
@@ -491,8 +442,6 @@
     "Waiting for response from server": "Waiting for response from server",
     "Leave": "Leave",
     "Advanced notification settings": "Advanced notification settings",
-    "delete the alias.": "delete the alias.",
-    "To return to your account in future you need to <u>set a password</u>": "To return to your account in future you need to <u>set a password</u>",
     "Forget": "Forget",
     "World readable": "World readable",
     "You cannot delete this image. (%(code)s)": "You cannot delete this image. (%(code)s)",
@@ -518,7 +467,6 @@
     "Resend": "Resend",
     "Files": "Files",
     "Collecting app version information": "Collecting app version information",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Delete the room alias %(alias)s and remove %(name)s from the directory?",
     "Keywords": "Keywords",
     "Unpin Message": "Unpin Message",
     "Enable notifications for this account": "Enable notifications for this account",
@@ -528,7 +476,7 @@
     "Enter keywords separated by a comma:": "Enter keywords separated by a comma:",
     "Search…": "Search…",
     "Remove %(name)s from the directory?": "Remove %(name)s from the directory?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.",
     "Unnamed room": "Unnamed room",
     "Remember, you can always set an email address in user settings if you change your mind.": "Remember, you can always set an email address in user settings if you change your mind.",
     "All messages (noisy)": "All messages (noisy)",
@@ -565,8 +513,7 @@
     "Forward Message": "Forward Message",
     "Unhide Preview": "Unhide Preview",
     "Unable to join network": "Unable to join network",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Sorry, your browser is <b>not</b> able to run Riot.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Sorry, your browser is <b>not</b> able to run %(brand)s.",
     "Uploaded on %(date)s by %(user)s": "Uploaded on %(date)s by %(user)s",
     "Messages in group chats": "Messages in group chats",
     "Yesterday": "Yesterday",
@@ -575,7 +522,7 @@
     "Unable to fetch notification target list": "Unable to fetch notification target list",
     "Set Password": "Set Password",
     "Off": "Off",
-    "Riot does not know how to join a room on this network": "Riot does not know how to join a room on this network",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s does not know how to join a room on this network",
     "Mentions only": "Mentions only",
     "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
     "You can now return to your account after signing out, and sign in on other devices.": "You can now return to your account after signing out, and sign in on other devices.",
@@ -587,27 +534,19 @@
     "View Source": "View Source",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "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...",
-    "There are advanced notifications which are not shown here": "There are advanced notifications which are not shown here",
     "The platform you're on": "The platform you're on",
-    "The version of Riot.im": "The version of Riot.im",
+    "The version of %(brand)s": "The version of %(brand)s",
     "Your language of choice": "Your language of choice",
     "Which officially provided instance you are using, if any": "Which officially provided instance you are using, if any",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Whether or not you're using the Richtext mode of the Rich Text Editor",
     "Your homeserver's URL": "Your homeserver's URL",
-    "Your identity server's URL": "Your identity server's URL",
     "e.g. %(exampleValue)s": "e.g. %(exampleValue)s",
     "Every page you use in the app": "Every page you use in the app",
     "e.g. <CurrentPageURL>": "e.g. <CurrentPageURL>",
-    "Your User Agent": "Your User Agent",
     "Your device resolution": "Your device resolution",
-    "The information being sent to us to help make Riot.im better includes:": "The information being sent to us to help make Riot.im better includes:",
+    "The information being sent to us to help make %(brand)s better includes:": "The information being sent to us to help make %(brand)s better includes:",
     "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.",
     "Call Failed": "Call Failed",
-    "Review Devices": "Review Devices",
-    "Call Anyway": "Call Anyway",
-    "Answer Anyway": "Answer Anyway",
-    "Call": "Call",
-    "Answer": "Answer",
     "Call in Progress": "Call in Progress",
     "A call is currently being placed!": "A call is currently being placed!",
     "A call is already in progress!": "A call is already in progress!",
@@ -621,14 +560,11 @@
     "Which rooms would you like to add to this community?": "Which rooms would you like to add to this community?",
     "Show these rooms to non-members on the community page and room list?": "Show these rooms to non-members on the community page and room list?",
     "Add rooms to the community": "Add rooms to the community",
-    "Room name or alias": "Room name or alias",
     "Add to community": "Add to community",
     "Failed to invite the following users to %(groupId)s:": "Failed to invite the following users to %(groupId)s:",
     "Failed to invite users to community": "Failed to invite users to community",
     "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
-    "Registration Required": "Registration Required",
-    "You need to register to do this. Would you like to register now?": "You need to register to do this. Would you like to register now?",
     "Restricted": "Restricted",
     "Missing roomId.": "Missing roomId.",
     "Opens the Developer Tools dialog": "Opens the Developer Tools dialog",
@@ -642,7 +578,6 @@
     "Unrecognised address": "Unrecognized address",
     "Whether or not you're logged in (we don't record your username)": "Whether or not you're logged in (we don't record your username)",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)",
-    "A conference call could not be started because the integrations server is not available": "A conference call could not be started because the integrations server is not available",
     "Replying With Files": "Replying With Files",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "At this time it is not possible to reply with a file. Would you like to upload this file without replying?",
     "The file '%(fileName)s' failed to upload.": "The file '%(fileName)s' failed to upload.",
@@ -671,18 +606,13 @@
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s enabled flair for %(groups)s in this room.",
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s disabled flair for %(groups)s in this room.",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s added %(addedAddresses)s as addresses for this room.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s added %(addedAddresses)s as an address for this room.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s removed %(removedAddresses)s as addresses for this room.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s removed %(removedAddresses)s as an address for this room.",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s set the main address for this room to %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s removed the main address for this room.",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.",
     "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s widget modified by %(senderName)s",
     "%(displayName)s is typing …": "%(displayName)s is typing …",
     "%(names)s and %(count)s others are typing …|other": "%(names)s and %(count)s others are typing …",
-    "Your Riot is misconfigured": "Your Riot is misconfigured",
+    "Your %(brand)s is misconfigured": "Your %(brand)s is misconfigured",
     "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.",
     "Try using turn.matrix.org": "Try using turn.matrix.org",
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 42a6ed52ca..8d07db7eaf 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -46,22 +46,20 @@
     "Which rooms would you like to add to this community?": "Kiujn ĉambrojn vi volas aldoni al ĉi tiu komunumo?",
     "Show these rooms to non-members on the community page and room list?": "Montri tiujn ĉambrojn al malanoj en la komunuma paĝo kaj ĉambrolisto?",
     "Add rooms to the community": "Aldoni ĉambrojn al la komunumo",
-    "Room name or alias": "Nomo aŭ kromnomo de ĉambro",
     "Add to community": "Aldoni al komunumo",
     "Failed to invite the following users to %(groupId)s:": "Malsukcesis inviti jenajn uzantojn al %(groupId)s:",
     "Failed to invite users to community": "Malsukcesis inviti novajn uzantojn al komunumo",
     "Failed to invite users to %(groupId)s": "Malsukcesis inviti uzantojn al %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Malsukcesis aldoni jenajn ĉambrojn al %(groupId)s:",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot ne havas permeson sciigi vin – bonvolu kontroli la agordojn de via foliumilo",
-    "Riot was not given permission to send notifications - please try again": "Riot ne ricevis permeson sendi sciigojn – bonvolu reprovi",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s ne havas permeson sciigi vin – bonvolu kontroli la agordojn de via foliumilo",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s ne ricevis permeson sendi sciigojn – bonvolu reprovi",
     "Unable to enable Notifications": "Ne povas ŝalti sciigojn",
     "This email address was not found": "Tiu ĉi retpoŝtadreso ne troviĝis",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Via retpoŝtareso ŝajne ne ligiĝas al Matrix-identigilo sur tiu ĉi hejmservilo.",
-    "Default": "Norma",
+    "Default": "Ordinara",
     "Restricted": "Limigita",
     "Moderator": "Ĉambrestro",
     "Admin": "Administranto",
-    "Start a chat": "Komenci babilon",
     "Operation failed": "Ago malsukcesis",
     "Failed to invite": "Invito malsukcesis",
     "Failed to invite the following users to the %(roomName)s room:": "Malsukcesis inviti la jenajn uzantojn al la ĉambro %(roomName)s:",
@@ -70,7 +68,7 @@
     "Unable to create widget.": "Ne povas krei fenestraĵon.",
     "Failed to send request.": "Malsukcesis sendi peton.",
     "This room is not recognised.": "Ĉi tiu ĉambro ne estas rekonita.",
-    "Power level must be positive integer.": "Nivelo de potenco devas esti entjero pozitiva.",
+    "Power level must be positive integer.": "Povnivelo devas esti entjero pozitiva.",
     "You are not in this room.": "Vi ne estas en tiu ĉi ĉambro.",
     "You do not have permission to do that in this room.": "Vi ne havas permeson fari tion en tiu ĉambro.",
     "Missing room_id in request": "En peto mankas room_id",
@@ -79,7 +77,6 @@
     "Usage": "Uzo",
     "/ddg is not a command": "/ddg ne estas komando",
     "To use it, just wait for autocomplete results to load and tab through them.": "Por uzi ĝin, atendu aperon de sugestaj rezultoj, kaj tabu tra ili.",
-    "Unrecognised room alias:": "Nerekonita ĉambra kromnomo:",
     "Ignored user": "Malatentata uzanto",
     "You are now ignoring %(userId)s": "Vi nun malatentas uzanton %(userId)s",
     "Unignored user": "Reatentata uzanto",
@@ -97,7 +94,7 @@
     "%(senderName)s changed their profile picture.": "%(senderName)s ŝanĝis sian profilbildon.",
     "%(senderName)s set a profile picture.": "%(senderName)s agordis profilbildon.",
     "VoIP conference started.": "Rettelefona voko komenciĝis.",
-    "%(targetName)s joined the room.": "%(targetName)s venis en la ĉambro.",
+    "%(targetName)s joined the room.": "%(targetName)s venis en la ĉambron.",
     "VoIP conference finished.": "Rettelefona voko finiĝis.",
     "%(targetName)s rejected the invitation.": "%(targetName)s rifuzis la inviton.",
     "%(targetName)s left the room.": "%(targetName)s forlasis la ĉambron.",
@@ -122,7 +119,7 @@
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s videbligis estontan historion de la ĉambro al ĉiuj.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s videbligis estontan historion de la ĉambro al nekonata (%(visibility)s).",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s al %(toPowerLevel)s",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ŝanĝis la potencan nivelon de %(powerLevelDiffText)s.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ŝanĝis la povnivelon de %(powerLevelDiffText)s.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ŝanĝis la fiksitajn mesaĝojn de la ĉambro.",
     "%(widgetName)s widget modified by %(senderName)s": "Fenestraĵon %(widgetName)s ŝanĝis %(senderName)s",
     "%(widgetName)s widget added by %(senderName)s": "Fenestraĵon %(widgetName)s aldonis %(senderName)s",
@@ -131,21 +128,14 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Servilo povas esti neatingebla, troŝarĝita, aŭ vi renkontis cimon.",
     "Unnamed Room": "Sennoma Ĉambro",
     "Your browser does not support the required cryptography extensions": "Via foliumilo ne subtenas la bezonatajn ĉifrajn kromprogramojn",
-    "Not a valid Riot keyfile": "Nevalida ŝlosila dosiero de Riot",
+    "Not a valid %(brand)s keyfile": "Nevalida ŝlosila dosiero de %(brand)s",
     "Authentication check failed: incorrect password?": "Aŭtentikiga kontrolo malsukcesis: ĉu pro malĝusta pasvorto?",
     "Failed to join room": "Malsukcesis aliĝi al ĉambro",
-    "Message Pinning": "Fikso de mesaĝoj",
-    "Use compact timeline layout": "Uzi densan okazordan aranĝon",
+    "Message Pinning": "Fiksado de mesaĝoj",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Montri tempindikojn en 12-hora formo (ekz. 2:30 post.)",
     "Always show message timestamps": "Ĉiam montri mesaĝajn tempindikojn",
     "Autoplay GIFs and videos": "Memfare ludi GIF-bildojn kaj filmojn",
     "Call Failed": "Voko malsukcesis",
-    "Review Devices": "Kontroli aparatojn",
-    "Call Anyway": "Tamen voki",
-    "Answer Anyway": "Tamen respondi",
-    "Call": "Voki",
-    "Answer": "Respondi",
-    "Send anyway": "Tamen sendi",
     "Send": "Sendi",
     "Enable automatic language detection for syntax highlighting": "Ŝalti memagan rekonon de lingvo por sintaksa markado",
     "Automatically replace plain text Emoji": "Memfare anstataŭigi tekstajn mienetojn",
@@ -172,19 +162,16 @@
     "New passwords don't match": "Novaj pasvortoj ne akordas",
     "Passwords can't be empty": "Pasvortoj ne povas esti malplenaj",
     "Continue": "Daŭrigi",
-    "Export E2E room keys": "Elporti ĝiscele ĉifrajn ŝlosilojn de la ĉambro",
+    "Export E2E room keys": "Elporti tutvoje ĉifrajn ŝlosilojn de la ĉambro",
     "Do you want to set an email address?": "Ĉu vi volas agordi retpoŝtadreson?",
     "Current password": "Nuna pasvorto",
     "Password": "Pasvorto",
     "New Password": "Nova pasvorto",
-    "Confirm password": "Konfirmi pasvorton",
+    "Confirm password": "Konfirmu pasvorton",
     "Change Password": "Ŝanĝi pasvorton",
     "Authentication": "Aŭtentikigo",
-    "Device ID": "Aparata identigilo",
     "Last seen": "Laste vidita",
     "Failed to set display name": "Malsukcesis agordi vidigan nomon",
-    "Disable Notifications": "Malŝalti sciigojn",
-    "Enable Notifications": "Ŝalti sciigojn",
     "Cannot add any more widgets": "Pluaj fenestraĵoj ne aldoneblas",
     "The maximum permitted number of widgets have already been added to this room.": "La maksimuma permesata nombro de fenestraĵoj jam aldoniĝis al tiu ĉambro.",
     "Add a widget": "Aldoni fenestraĵon",
@@ -198,8 +185,6 @@
     "%(senderName)s uploaded a file": "%(senderName)s alŝutis dosieron",
     "Options": "Agordoj",
     "Please select the destination room for this message": "Bonvolu elekti celan ĉambron por tiu mesaĝo",
-    "Blacklisted": "Senpova legi ĉifritajn mesaĝojn",
-    "device id: ": "aparata identigilo: ",
     "Disinvite": "Malinviti",
     "Kick": "Forpeli",
     "Disinvite this user?": "Ĉu malinviti ĉi tiun uzanton?",
@@ -211,9 +196,8 @@
     "Ban this user?": "Ĉu forbari ĉi tiun uzanton?",
     "Failed to ban user": "Malsukcesis forbari uzanton",
     "Failed to mute user": "Malsukcesis silentigi uzanton",
-    "Failed to toggle moderator status": "Malsukcesis baskuligi estrecon",
-    "Failed to change power level": "Malsukcesis ŝanĝi nivelon de potenco",
-    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Tiun ĉi ŝanĝon vi ne povos fareblos, ĉar vi donas al la uzanto la saman nivelon de potenco, kiun havas vi mem.",
+    "Failed to change power level": "Malsukcesis ŝanĝi povnivelon",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Tiun ĉi ŝanĝon vi ne povos malfari, ĉar vi donas al la uzanto la saman povnivelon, kiun havas vi mem.",
     "Are you sure?": "Ĉu vi certas?",
     "Unignore": "Reatenti",
     "Ignore": "Malatenti",
@@ -222,18 +206,14 @@
     "Jump to read receipt": "Salti al legokonfirmo",
     "Mention": "Mencio",
     "Invite": "Inviti",
-    "User Options": "Agordoj de uzanto",
-    "Direct chats": "Rektaj babiloj",
     "Unmute": "Malsilentigi",
     "Mute": "Silentigi",
-    "Revoke Moderator": "Forigi estrajn rajtojn",
-    "Make Moderator": "Kunestrigi",
     "Admin Tools": "Estriloj",
     "and %(count)s others...|other": "kaj %(count)s aliaj…",
     "and %(count)s others...|one": "kaj unu alia…",
     "Invited": "Invititaj",
     "Filter room members": "Filtri ĉambranojn",
-    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (potenco je %(powerLevelNumber)s)",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (povnivelo je %(powerLevelNumber)s)",
     "Attachment": "Aldonaĵo",
     "Hangup": "Fini vokon",
     "Voice call": "Voĉvoko",
@@ -246,7 +226,7 @@
     "Unpin Message": "Malfiksi mesaĝon",
     "Jump to message": "Salti al mesaĝo",
     "No pinned messages.": "Neniuj fiksitaj mesaĝoj.",
-    "Loading...": "Enleganta…",
+    "Loading...": "Enlegante…",
     "Pinned Messages": "Fiksitaj mesaĝoj",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
@@ -275,7 +255,7 @@
     "Search": "Serĉi",
     "Community Invites": "Komunumaj invitoj",
     "Invites": "Invitoj",
-    "Favourites": "Ŝatataj",
+    "Favourites": "Elstarigitaj",
     "Rooms": "Ĉambroj",
     "Low priority": "Malpli gravaj",
     "Historical": "Estintaj",
@@ -291,14 +271,14 @@
     "Banned users": "Forbaritaj uzantoj",
     "This room is not accessible by remote Matrix servers": "Ĉi tiu ĉambro ne atingeblas por foraj serviloj de Matrix",
     "Leave room": "Eliri ĉambron",
-    "Favourite": "Ŝatata",
+    "Favourite": "Elstarigi",
     "Guests cannot join this room even if explicitly invited.": "Gastoj ne povas aliĝi ĉi tiun ĉambron eĉ kun malimplica invito.",
     "Click here to fix": "Klaku ĉi tie por riparo",
     "Who can access this room?": "Kiu povas aliri ĉi tiun ĉambron?",
     "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 ĉambrujo de %(domain)s?",
+    "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?",
     "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)",
@@ -311,10 +291,7 @@
     "Jump to first unread message.": "Salti al unua nelegita mesaĝo.",
     "Close": "Fermi",
     "not specified": "nespecifita",
-    "Remote addresses for this room:": "Foraj adresoj de ĉi tiu ĉambro:",
-    "Local addresses for this room:": "Lokaj adresoj por ĉi tiu ĉambro:",
     "This room has no local addresses": "Ĉi tiu ĉambro ne havas lokajn adresojn",
-    "New address (e.g. #foo:%(localDomain)s)": "Nova adreso (ekz-e #io:%(localDomain)s)",
     "Invalid community ID": "Nevalida komunuma identigilo",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' ne estas valida komunuma identigilo",
     "New community ID (e.g. +foo:%(localDomain)s)": "Nova komunuma identigilo (ekz-e +io:%(localDomain)s)",
@@ -335,9 +312,6 @@
     "Copied!": "Kopiita!",
     "Failed to copy": "Malsukcesis kopii",
     "Add an Integration": "Aldoni kunigon",
-    "Removed or unknown message type": "Forigita aŭ nekonata tipo de mesaĝo",
-    "Message removed by %(userId)s": "Mesaĝo forigita de %(userId)s",
-    "Message removed": "Mesaĝo forigita",
     "Custom Server Options": "Propraj servilaj elektoj",
     "Dismiss": "Rezigni",
     "powered by Matrix": "funkciigata de Matrix",
@@ -348,7 +322,6 @@
     "Leave": "Foriri",
     "Register": "Registri",
     "Add rooms to this community": "Aldoni ĉambrojn al ĉi tiu komunumo",
-    "To continue, please enter your password.": "Por daŭrigi, bonvolu enigi vian pasvorton.",
     "An email has been sent to %(emailAddress)s": "Retletero sendiĝis al %(emailAddress)s",
     "Please check your email to continue registration.": "Bonvolu kontroli vian retpoŝton por daŭrigi la registriĝon.",
     "Token incorrect": "Malĝusta ĵetono",
@@ -380,12 +353,10 @@
     "Delete Widget": "Forigi fenestraĵon",
     "Delete widget": "Forigi fenestraĵon",
     "Create new room": "Krei novan ĉambron",
-    "Verify...": "Kontroli…",
     "No results": "Neniuj rezultoj",
     "Communities": "Komunumoj",
     "Home": "Hejmo",
-    "Could not connect to the integration server": "Malsukcesis konektiĝi al la kuniga servilo",
-    "Manage Integrations": "Administri integrojn",
+    "Manage Integrations": "Administri kunigojn",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s%(count)s-foje aliĝis",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)saliĝis",
@@ -441,7 +412,7 @@
     "collapse": "maletendi",
     "expand": "etendi",
     "Custom level": "Propra nivelo",
-    "Room directory": "Ĉambra dosierujo",
+    "Room directory": "Listo de ĉambroj",
     "Username not available": "Uzantonomo ne disponeblas",
     "Username invalid: %(errMessage)s": "Uzantonomo ne validas: %(errMessage)s",
     "Username available": "Uzantonomo disponeblas",
@@ -470,18 +441,13 @@
     "Unknown error": "Nekonata eraro",
     "Incorrect password": "Malĝusta pasvorto",
     "Deactivate Account": "Malaktivigi konton",
-    "I verify that the keys match": "Mi kontrolas, ke la ŝlosiloj akordas",
     "An error has occurred.": "Okazis eraro.",
     "OK": "Bone",
-    "Start verification": "Komenci kontrolon",
-    "Share without verifying": "Kunhavigi sen kontrolo",
-    "Ignore request": "Malatenti peton",
-    "Encryption key request": "Peto por ĉifra ŝlosilo",
     "Unable to restore session": "Salutaĵo ne rehaveblas",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Se vi antaŭe uzis pli novan version de Riot, via salutaĵo eble ne akordos kun ĉi tiu versio. Fermu ĉi tiun fenestron kaj revenu al la pli nova versio.",
+    "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.": "Se vi antaŭe uzis pli novan version de %(brand)s, via salutaĵo eble ne akordos kun ĉi tiu versio. Fermu ĉi tiun fenestron kaj revenu al la pli nova versio.",
     "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": "Atendanta kontrolon",
+    "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'.",
     "Unable to add email address": "Ne povas aldoni retpoŝtadreson",
     "Unable to verify email address.": "Retpoŝtadreso ne kontroleblas.",
@@ -489,13 +455,10 @@
     "Skip": "Preterpasi",
     "An error occurred: %(error_string)s": "Okazis eraro: %(error_string)s",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Tio ĉi estos la nomo de via konto sur la hejmservilo <span></span>, aŭ vi povas elekti <a>alian servilon</a>.",
-    "Blacklist": "Malpermesi legadon de ĉifritaj mesaĝoj",
-    "Unverify": "Malkontroli",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Se vi jam havas Matrix-konton, vi povas <a>saluti</a> anstataŭe.",
     "Private Chat": "Privata babilo",
     "Public Chat": "Publika babilo",
     "Custom": "Propra",
-    "Alias (optional)": "Kromnomo (malnepra)",
     "Name": "Nomo",
     "You must <a>register</a> to use this functionality": "Vi devas <a>registriĝî</a> por uzi tiun ĉi funkcion",
     "You must join the room to see its files": "Vi devas aliĝi al la ĉambro por vidi tie dosierojn",
@@ -509,7 +472,7 @@
     "Failed to remove the room from the summary of %(groupId)s": "Malsukcesis forigi la ĉambron de la superrigardo de %(groupId)s",
     "The room '%(roomName)s' could not be removed from the summary.": "Ĉambro ;%(roomName)s' ne forigeblas de la superrigardo.",
     "Add users to the community summary": "Aldoni uzantojn al la komunuma superrigardo",
-    "Who would you like to add to this summary?": "Kiun vi ŝatus aldoni al tiu ĉi superrigardo?",
+    "Who would you like to add to this summary?": "Kiun vi volas aldoni al tiu ĉi superrigardo?",
     "Failed to add the following users to the summary of %(groupId)s:": "Malsukcesis aldoni la jenajn uzantojn al la superrigardo de %(groupId)s:",
     "Add a User": "Aldoni uzanton",
     "Failed to remove a user from the summary of %(groupId)s": "Malsukcesis forigi uzanton de la superrigardo de %(groupId)s",
@@ -538,25 +501,23 @@
     "Are you sure you want to leave the room '%(roomName)s'?": "Ĉu vi certe volas forlasi la ĉambron '%(roomName)s'?",
     "Failed to leave room": "Malsukcesis forlasi la ĉambron",
     "Signed Out": "Adiaŭinta",
-    "Old cryptography data detected": "Malnovaj kriptografiaj datumoj troviĝis",
-    "Data from an older version of Riot 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.": "Datumoj el malnova versio de Riot troviĝis. Ĉi tio malfunkciigos ĝiscelan ĉifradon en la malnova versio. Ĝiscele ĉifritaj mesaĝoj interŝanĝitaj freŝtempe per la malnova versio eble ne malĉifreblos. Tio povas kaŭzi malsukceson ankaŭ al mesaĝoj interŝanĝitaj kun tiu ĉi versio. Se vin trafos problemoj, adiaŭu kaj resalutu. Por reteni mesaĝan historion, elportu kaj reenportu viajn ŝlosilojn.",
+    "Old cryptography data detected": "Malnovaj datumoj de ĉifroteĥnikaro troviĝis",
+    "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.": "Datumoj el malnova versio de %(brand)s troviĝis. Ĉi tio malfunkciigos tutvojan ĉifradon en la malnova versio. Tutvoje ĉifritaj mesaĝoj interŝanĝitaj freŝtempe per la malnova versio eble ne malĉifreblos. Tio povas kaŭzi malsukceson ankaŭ al mesaĝoj interŝanĝitaj kun tiu ĉi versio. Se vin trafos problemoj, adiaŭu kaj resalutu. Por reteni mesaĝan historion, elportu kaj reenportu viajn ŝlosilojn.",
     "Logout": "Adiaŭi",
     "Your Communities": "Viaj komunumoj",
     "Error whilst fetching joined communities": "Akirado de viaj komunumoj eraris",
     "Create a new community": "Krei novan komunumon",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Kreu komunumon por kunigi uzantojn kaj ĉambrojn! Fari propran hejmpaĝon por montri vian spacon en la universo de Matrix.",
     "You have no visible notifications": "Neniuj videblaj sciigoj",
-    "Scroll to bottom of page": "Rulumi al susbo de la paĝo",
     "Connectivity to the server has been lost.": "Konekto al la servilo perdiĝis.",
     "Sent messages will be stored until your connection has returned.": "Senditaj mesaĝoj konserviĝos ĝis via konekto refunkcios.",
     "Active call": "Aktiva voko",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Neniu alia ĉeestas! Ĉu vi ŝatus <inviteText>inviti aliajn</inviteText> aŭ <nowarnText>ĉesigi avertadon pri la malplena ĉambro</nowarnText>?",
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Neniu alia ĉeestas! Ĉu vi volas <inviteText>inviti aliajn</inviteText> aŭ <nowarnText>ĉesigi avertadon pri la malplena ĉambro</nowarnText>?",
     "You seem to be uploading files, are you sure you want to quit?": "Ŝajne vi alŝutas dosierojn nun; ĉu vi tamen volas foriri?",
     "You seem to be in a call, are you sure you want to quit?": "Ŝajne vi vokas nun; ĉu vi tamen volas foriri?",
     "Search failed": "Serĉo malsukcesis",
     "Server may be unavailable, overloaded, or search timed out :(": "Aŭ la servilo estas neatingebla aŭ troŝarĝita, aŭ la serĉo eltempiĝis :(",
     "No more results": "Neniuj pliaj rezultoj",
-    "Unknown room %(roomId)s": "Nekonata ĉambro %(roomId)s",
     "Room": "Ĉambro",
     "Failed to reject invite": "Malsukcesis rifuzi inviton",
     "Fill screen": "Plenigi ekranon",
@@ -567,25 +528,23 @@
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Provis enlegi certan parton de ĉi tiu historio, sed vi ne havas permeson vidi ĝin.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Provis enlegi certan parton de ĉi tiu historio, sed malsukcesis ĝin trovi.",
     "Failed to load timeline position": "Malsukcesis enlegi lokon en historio",
-    "Uploading %(filename)s and %(count)s others|other": "Alŝutanta dosieron %(filename)s kaj %(count)s aliajn",
-    "Uploading %(filename)s and %(count)s others|zero": "Alŝutanta dosieron %(filename)s",
-    "Uploading %(filename)s and %(count)s others|one": "Alŝutanta dosieron %(filename)s kaj %(count)s alian",
-    "Light theme": "Hela haŭto",
-    "Dark theme": "Malhela haŭto",
+    "Uploading %(filename)s and %(count)s others|other": "Alŝutante dosieron %(filename)s kaj %(count)s aliajn",
+    "Uploading %(filename)s and %(count)s others|zero": "Alŝutante dosieron %(filename)s",
+    "Uploading %(filename)s and %(count)s others|one": "Alŝutante dosieron %(filename)s kaj %(count)s alian",
     "Sign out": "Adiaŭi",
     "Success": "Sukceso",
     "Unable to remove contact information": "Ne povas forigi kontaktajn informojn",
     "<not supported>": "<nesubtenata>",
-    "Import E2E room keys": "Enporti ĝiscele ĉifrajn ĉambrajn ŝlosilojn",
-    "Cryptography": "Kriptografio",
+    "Import E2E room keys": "Enporti tutvoje ĉifrajn ĉambrajn ŝlosilojn",
+    "Cryptography": "Ĉifroteĥnikaro",
     "Analytics": "Analizo",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot kolektas sennomaj analizajn datumojn por helpi plibonigadon de la programo.",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s kolektas sennomaj analizajn datumojn por helpi plibonigadon de la programo.",
     "Labs": "Eksperimentaj funkcioj",
     "Check for update": "Kontroli ĝisdatigojn",
     "Reject all %(invitedRooms)s invites": "Rifuzi ĉiujn %(invitedRooms)s invitojn",
     "Start automatically after system login": "Memfare ruli post operaciuma saluto",
     "No media permissions": "Neniuj permesoj pri aŭdvidaĵoj",
-    "You may need to manually permit Riot to access your microphone/webcam": "Eble vi devos permane permesi al Riot atingon de viaj mikrofono/kamerao",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "Eble vi devos permane permesi al %(brand)s atingon de viaj mikrofono/kamerao",
     "No Microphones detected": "Neniu mikrofono troviĝis",
     "No Webcams detected": "Neniu kamerao troviĝis",
     "Default Device": "Implicita aparato",
@@ -599,7 +558,7 @@
     "click to reveal": "klaku por malkovri",
     "Homeserver is": "Hejmservilo estas",
     "Identity Server is": "Identiga servilo estas",
-    "riot-web version:": "versio de riot-web:",
+    "%(brand)s version:": "versio de %(brand)s:",
     "olm version:": "versio de olm:",
     "Failed to send email": "Malsukcesis sendi retleteron",
     "The email address linked to your account must be entered.": "Vi devas enigi retpoŝtadreson ligitan al via konto.",
@@ -621,10 +580,9 @@
     "This server does not support authentication with a phone number.": "Ĉi tiu servilo ne subtenas aŭtentikigon per telefona numero.",
     "Displays action": "Montras agon",
     "Bans user with given id": "Forbaras uzanton kun la donita identigilo",
-    "Define the power level of a user": "Difini la potencan nivelon de uzanto",
+    "Define the power level of a user": "Difini la povnivelon de uzanto",
     "Deops user with given id": "Senestrigas uzanton kun donita identigilo",
     "Invites user with given id to current room": "Invitas uzanton per identigilo al la nuna ĉambro",
-    "Joins room with given alias": "Aliĝas al ĉambro per kromnomo",
     "Kicks user with given id": "Forpelas uzanton kun la donita identigilo",
     "Changes your display nickname": "Ŝanĝas vian vidigan nomon",
     "Searches DuckDuckGo for results": "Serĉas rezultojn per DuckDuckGo",
@@ -636,20 +594,7 @@
     "Notify the whole room": "Sciigi la tutan ĉambron",
     "Room Notification": "Ĉambra sciigo",
     "Users": "Uzantoj",
-    "unknown device": "nekonata aparato",
-    "NOT verified": "nekontrolita",
-    "verified": "kontrolita",
-    "Verification": "Kontrolo",
-    "Ed25519 fingerprint": "Premsigno laŭ Ed25519",
-    "User ID": "Identigaĵo de uzanto",
-    "Curve25519 identity key": "Identiga ŝlosilo laŭ Curve25519",
-    "Claimed Ed25519 fingerprint key": "Asertita premsigno laŭ Ed25519",
-    "Algorithm": "Algoritmo",
-    "unencrypted": "neĉifritaj",
-    "Decryption error": "Malĉifra eraro",
     "Session ID": "Identigilo de salutaĵo",
-    "End-to-end encryption information": "Informoj pri tutvoja ĉifrado",
-    "Event information": "Informoj pri okazaĵo",
     "Passphrases must match": "Pasfrazoj devas akordi",
     "Passphrase must not be empty": "Pasfrazoj maldevas esti malplenaj",
     "Export room keys": "Elporti ĉambrajn ŝlosilojn",
@@ -664,21 +609,16 @@
     "File to import": "Enportota dosiero",
     "Import": "Enporti",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Forigo de fenestraĵo efektiviĝos por ĉiuj uzantoj en ĉi tiu ĉambro. Ĉu vi certe volas ĝin forigi?",
-    "Unblacklist": "Repermesi legadon de ĉifritaj mesaĝoj",
-    "none": "neniu",
-    "The version of Riot.im": "Tiu ĉi versio de Riot.im",
+    "The version of %(brand)s": "La versio de %(brand)s",
     "Your language of choice": "Via preferata lingvo",
-    "The information being sent to us to help make Riot.im better includes:": "Informoj sendataj al ni por plibonigi la servon Riot.im inkluzivas:",
+    "The information being sent to us to help make %(brand)s better includes:": "La informoj sendataj al ni por plibonigi %(brand)son inkluzivas:",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s ŝanĝis sian vidigan nomon al %(displayName)s.",
     "Send an encrypted reply…": "Sendi ĉifritan respondon…",
-    "Send a reply (unencrypted)…": "Sendi respondon (neĉifritan)…",
     "Send an encrypted message…": "Sendi ĉifritan mesaĝon…",
-    "Send a message (unencrypted)…": "Sendi mesaĝon (neĉifritan)…",
     "Replying": "Respondante",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privato gravas al ni, tial ni ne kolektas personajn aŭ spureblajn datumojn por nia analizo.",
     "Learn more about how we use analytics.": "Lernu pli pri nia uzo de analiziloj.",
     "Your homeserver's URL": "URL de via hejmservilo",
-    "Your identity server's URL": "URL de via identiga servilo",
     "The platform you're on": "Via platformo",
     "Which officially provided instance you are using, if any": "Kiun oficiale disponeblan nodon vi uzas, se iun ajn",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Ĉu vi uzas la riĉtekstan reĝimon de la riĉteksta redaktilo aŭ ne",
@@ -687,8 +627,7 @@
     "Failed to add tag %(tagName)s to room": "Malsukcesis aldoni etikedon %(tagName)s al ĉambro",
     "Submit debug logs": "Sendi sencimigan protokolon",
     "Fetching third party location failed": "Malsukcesis trovi lokon de ekstera liveranto",
-    "A new version of Riot is available.": "Nova versio de Riot haveblas.",
-    "I understand the risks and wish to continue": "Mi komprenas la riskojn kaj volas daŭrigi",
+    "I understand the risks and wish to continue": "Mi komprenas la riskon kaj volas pluiĝi",
     "Send Account Data": "Sendi kontajn informojn",
     "Advanced notification settings": "Specialaj agordoj de sciigoj",
     "Uploading report": "Alŝutante raporton",
@@ -706,8 +645,6 @@
     "Waiting for response from server": "Atendante respondon el la servilo",
     "Send Custom Event": "Sendi propran okazon",
     "All notifications are currently disabled for all targets.": "Ĉiuj sciigoj nun estas malŝaltitaj por ĉiuj aparatoj.",
-    "delete the alias.": "forigi la kromnomon.",
-    "To return to your account in future you need to <u>set a password</u>": "Por reveni al via konto estonte, vi devas <u>agordi pasvorton</u>",
     "Forget": "Forgesi",
     "You cannot delete this image. (%(code)s)": "Vi ne povas forigi tiun ĉi bildon. (%(code)s)",
     "Cancel Sending": "Nuligi sendon",
@@ -731,8 +668,7 @@
     "Members": "Anoj",
     "No update available.": "Neniuj ĝisdatigoj haveblas.",
     "Resend": "Resendi",
-    "Collecting app version information": "Kolektanta informon pri versio de la aplikaĵo",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Ĉu forigi la ĉambran kromnomon %(alias)s kaj forigi %(name)s de la ujo?",
+    "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>",
@@ -742,7 +678,7 @@
     "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?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot uzas multajn specialajn funkciojn, el kiuj kelkaj ne disponeblas aŭ estas eksperimentaj en via nuna foliumilo.",
+    "%(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",
     "All messages (noisy)": "Ĉiuj mesaĝoj (lauta)",
@@ -766,7 +702,7 @@
     "Send logs": "Sendi protokolojn",
     "All messages": "Ĉiuj mesaĝoj",
     "Call invitation": "Invito al voko",
-    "Downloading update...": "Elŝutanta ĝisdatigon…",
+    "Downloading update...": "Elŝutante ĝisdatigon…",
     "State Key": "Stata ŝlosilo",
     "Failed to send custom event.": "Malsukcesis sendi propran okazon.",
     "What's new?": "Kio novas?",
@@ -786,8 +722,7 @@
     "Show message in desktop notification": "Montradi mesaĝojn en labortablaj sciigoj",
     "Unhide Preview": "Malkaŝi antaŭrigardon",
     "Unable to join network": "Ne povas konektiĝi al la reto",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Vi eble agordis ilin en alia kliento. Vi ne povas agordi ilin en Riot, sed ili ankoraŭ validas",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Pardonon, via foliumilo <b>ne kapablas</b> funkciigi klienton Riot.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Pardonon, via foliumilo <b>ne kapablas</b> funkciigi klienton %(brand)s.",
     "Uploaded on %(date)s by %(user)s": "Alŝutita je %(date)s de %(user)s",
     "Messages in group chats": "Mesaĝoj en grupaj babiloj",
     "Yesterday": "Hieraŭ",
@@ -796,7 +731,7 @@
     "Unable to fetch notification target list": "Ne povas akiri la liston de celoj por sciigoj",
     "Set Password": "Agordi pasvorton",
     "Off": "For",
-    "Riot does not know how to join a room on this network": "Riot ne scias aliĝi al ĉambroj en tiu ĉi reto",
+    "%(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",
     "You can now return to your account after signing out, and sign in on other devices.": "Vi nun rajtas reveni al via konto post adiaŭo, kaj saluti per ĝi kun aliaj aparatoj.",
@@ -810,16 +745,14 @@
     "View Source": "Vidi fonton",
     "Event Content": "Enhavo de okazo",
     "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!": "Kun via nuna foliumilo, la aspekto kaj funkciado de la aplikaĵo povas esti tute malĝusta, kaj kelkaj aŭ ĉiu funkcioj eble ne tute funkcios. Se vi tamen volas provi, vi povas daŭrigi, sed vi ricevos nenian subtenon se vi renkontos problemojn!",
-    "Checking for an update...": "Serĉanta ĝisdatigojn…",
-    "There are advanced notifications which are not shown here": "Ekzistas specialaj sciigoj, kiuj ne montriĝas ĉi tie",
+    "Checking for an update...": "Serĉante ĝisdatigojn…",
     "Logs sent": "Protokolo sendiĝis",
     "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.": "Sencimigaj protokoloj enhavas informojn pri uzo de aplikaĵo, inkluzive vian uzantonomon, la identigilojn aŭ nomojn de la ĉambroj aŭ grupoj kiujn vi vizitis, kaj la uzantonomojn de aliaj uzantoj. Ili ne enhavas mesaĝojn.",
     "Failed to send logs: ": "Malsukcesis sendi protokolon: ",
-    "Preparing to send logs": "Pretiganta sendon de protokolo",
+    "Preparing to send logs": "Pretigante sendon de protokolo",
     "e.g. %(exampleValue)s": "ekz. %(exampleValue)s",
     "Every page you use in the app": "Ĉiu paĝo kiun vi uzas en la aplikaĵo",
     "e.g. <CurrentPageURL>": "ekz. <CurrentPageURL>",
-    "Your User Agent": "Via klienta aplikaĵo",
     "Your device resolution": "La distingumo de via aparato",
     "Call in Progress": "Voko farata",
     "A call is already in progress!": "Voko estas jam farata!",
@@ -827,14 +760,7 @@
     "Send analytics data": "Sendi statistikajn datumojn",
     "Key request sent.": "Peto de ŝlosilo sendita.",
     "Permission Required": "Necesas permeso",
-    "Registration Required": "Necesas registriĝo",
-    "You need to register to do this. Would you like to register now?": "Por fari ĉi tion, vi bezonas registriĝi. Ĉu vi volas registriĝi nun?",
     "Missing roomId.": "Mankas identigilo de la ĉambro.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s aldonis %(addedAddresses)s kiel adresojn por la ĉambro.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s aldonis %(addedAddresses)s kiel adreson por la ĉambro.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s forigis %(removedAddresses)s kiel adresojn por la ĉambro.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s forigis %(removedAddresses)s kiel adreson por la ĉambro.",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s aldonis %(addedAddresses)s kaj forigis %(removedAddresses)s kiel adresojn por la ĉambro.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s agordis la ĉefan adreson por la ĉambro al %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s forigis la ĉefan adreson de la ĉambro.",
     "Please <a>contact your service administrator</a> to continue using the service.": "Bonvolu <a>kontakti administranton de la servo</a> por daŭre uzadi la servon.",
@@ -844,7 +770,7 @@
     "Opens the Developer Tools dialog": "Maflermas evoluigistan interagujon",
     "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. Reprovanta…",
+    "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.",
     "User %(user_id)s does not exist": "Uzanto %(user_id)s ne ekzistas",
     "Unknown server error": "Nekonata servila eraro",
@@ -874,7 +800,7 @@
     "There was an error joining the room": "Aliĝo al la ĉambro eraris",
     "Sorry, your homeserver is too old to participate in this room.": "Pardonon, via hejmservilo estas tro malnova por partoprenado en la ĉambro.",
     "Please contact your homeserver administrator.": "Bonvolu kontakti la administranton de via hejmservilo.",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Montri memorigilon por ŝalti Sekuran Ricevon de Mesaĝoj en ĉifrataj ĉambroj",
+    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Montri memorigilon por ŝalti Sekuran ricevon de mesaĝoj en ĉifrataj ĉambroj",
     "Show developer tools": "Montri verkistajn ilojn",
     "Messages containing @room": "Mesaĝoj enhavantaj @room",
     "Encrypted messages in one-to-one chats": "Ĉifritaj mesaĝoj en duopaj babiloj",
@@ -882,8 +808,8 @@
     "Delete Backup": "Forigi savkopion",
     "Language and region": "Lingvo kaj regiono",
     "Theme": "Haŭto",
-    "General": "Ĝenerala",
-    "<a>In reply to</a> <pill>": "<a>Respondanta al</a> <pill>",
+    "General": "Ĝeneralaj",
+    "<a>In reply to</a> <pill>": "<a>Responde al</a> <pill>",
     "Share Message": "Diskonigi",
     "Whether or not you're logged in (we don't record your username)": "Ĉu vi salutis aŭ ne (ni ne registras vian uzantonomon)",
     "You do not have permission to start a conference call in this room": "Vi ne havas permeson komenci grupvokon en ĉi tiu ĉambro",
@@ -962,9 +888,9 @@
     "Phone numbers": "Telefonnumeroj",
     "Legal": "Jura",
     "Credits": "Dankoj",
-    "For help with using Riot, click <a>here</a>.": "Por helpo kun uzo de Riot, alklaku <a>ĉi tie</a>.",
-    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "Por helpo kun uzo de Riot, alklaku <a>ĉi tie</a> aŭ komencu babilon kun nia roboto uzante la butonon sube.",
-    "Chat with Riot Bot": "Babilu kun la roboto Riot Bot",
+    "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.",
+    "Chat with %(brand)s Bot": "Babilu kun la roboto %(brand)s Bot",
     "Help & About": "Helpo kaj Prio",
     "Bug reporting": "Cim-raportado",
     "FAQ": "Oftaj demandoj",
@@ -974,14 +900,14 @@
     "Room list": "Ĉambrolisto",
     "Ignored users": "Malatentaj uzantoj",
     "Key backup": "Sekurkopio de ŝlosilo",
-    "Security & Privacy": "Sekureco & Privateco",
+    "Security & Privacy": "Sekureco kaj Privateco",
     "Voice & Video": "Voĉo kaj vido",
-    "Room information": "Ĉambraj informoj",
+    "Room information": "Informoj pri ĉambro",
     "Internal room ID:": "Ena ĉambra identigilo:",
     "Room version": "Ĉambra versio",
     "Room version:": "Ĉambra versio:",
-    "Developer options": "Verkantaj opcioj",
-    "Room Addresses": "Ĉambra adresoj",
+    "Developer options": "Programistaj elektebloj",
+    "Room Addresses": "Adresoj de ĉambro",
     "Change room avatar": "Ŝanĝi profilbildon de ĉambro",
     "Change room name": "Ŝanĝi nomon de ĉambro",
     "Change main address for the room": "Ŝanĝi ĉefan adreson de la ĉambro",
@@ -989,7 +915,7 @@
     "Change permissions": "Ŝanĝi permesojn",
     "Change topic": "Ŝanĝi temon",
     "Modify widgets": "Aliigi fenestraĵojn",
-    "Default role": "Norma rolo",
+    "Default role": "Ordinara rolo",
     "Send messages": "Sendi mesaĝojn",
     "Invite users": "Inviti uzantojn",
     "Change settings": "Ŝanĝi agordojn",
@@ -998,7 +924,7 @@
     "Remove messages": "Forigi mesaĝojn",
     "Notify everyone": "Sciigi ĉiujn",
     "Muted Users": "Silentigitaj uzantoj",
-    "Roles & Permissions": "Roloj & Permesoj",
+    "Roles & Permissions": "Roloj kaj Permesoj",
     "Enable encryption?": "Ĉu ŝalti ĉifradon?",
     "Share Link to User": "Kunhavigi ligilon al uzanto",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Vidita de %(displayName)s (%(userName)s) je %(dateTime)s",
@@ -1010,14 +936,13 @@
     "Room avatar": "Profilbildo de ĉambro",
     "Room Name": "Nomo de ĉambro",
     "Room Topic": "Temo de ĉambro",
-    "Yes, I want to help!": "Jes. Mi volas helpi!",
     "Failed to remove widget": "Malsukcesis forigi fenestraĵon",
     "Join": "Aliĝi",
     "Invite anyway": "Tamen inviti",
     "To continue, please enter your password:": "Por daŭrigi, bonvoluenigi vian pasvorton:",
-    "Updating Riot": "Ĝisdatigante Riot",
+    "Updating %(brand)s": "Ĝisdatigante %(brand)s",
     "Go back": "Reen iri",
-    "Room Settings - %(roomName)s": "Ĉambraj agordoj — %(roomName)s",
+    "Room Settings - %(roomName)s": "Agordoj de ĉambro – %(roomName)s",
     "Failed to upgrade room": "Malsukcesis gradaltigi ĉambron",
     "Refresh": "Aktualigi",
     "Checking...": "Kontrolante…",
@@ -1025,7 +950,7 @@
     "Share User": "Kunhavigi uzanton",
     "Share Community": "Kunhavigi komunumon",
     "Share Room Message": "Kunhavigi ĉambran mesaĝon",
-    "COPY": "KOPIO",
+    "COPY": "KOPII",
     "Next": "Sekva",
     "Clear status": "Vakigi staton",
     "Update status": "Ĝisdatigi staton",
@@ -1067,17 +992,13 @@
     "General failure": "Ĝenerala fiasko",
     "Create account": "Krei konton",
     "Create your account": "Krei vian konton",
-    "Great! This passphrase looks strong enough.": "Bonege! Ĉi tiu pasfrazo ŝajnas sufiĉe forta.",
     "Keep going...": "Daŭrigu…",
-    "Enter a passphrase...": "Enigu pasfrazon…",
     "That matches!": "Tio akordas!",
     "That doesn't match.": "Tio ne akordas.",
-    "Repeat your passphrase...": "Ripetu vian pasfrazon...",
     "Download": "Elŝuti",
     "Success!": "Sukceso!",
     "Retry": "Reprovi",
     "Set up": "Agordi",
-    "A conference call could not be started because the integrations server is not available": "Grupa voko ne povis komenciĝi, ĉar la kuniga servilo estas neatingebla",
     "Replying With Files": "Respondado kun dosieroj",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Nun ne eblas respondi kun dosiero. Ĉu vi volas alŝuti la dosieron sen respondo?",
     "The file '%(fileName)s' failed to upload.": "Malsukcesis alŝuti dosieron « %(fileName)s ».",
@@ -1123,7 +1044,6 @@
     "Send typing notifications": "Sendi sciigojn pri tajpado",
     "Allow Peer-to-Peer for 1:1 calls": "Permesi samtavolan teĥnikon por duopaj vokoj",
     "Prompt before sending invites to potentially invalid matrix IDs": "Averti antaŭ ol sendi invitojn al eble nevalidaj Matrix-identigiloj",
-    "Order rooms in the room list by most important first instead of most recent": "Ordigi ĉambrojn en listo de ĉambroj laŭ graveco anstataŭ freŝeco",
     "Messages containing my username": "Mesaĝoj enhavantaj mian uzantnomon",
     "When rooms are upgraded": "Kiam ĉambroj gradaltiĝas",
     "The other party cancelled the verification.": "La alia kontrolano nuligis la kontrolon.",
@@ -1142,7 +1062,7 @@
     "Custom user status messages": "Propraj uzantoaj statmesaĝoj",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Grupigi kaj filtri ĉambrojn per propraj etikedoj (aktualigu por ŝanĝojn apliki)",
     "Restore from Backup": "Rehavi el savkopio",
-    "Backing up %(sessionsRemaining)s keys...": "Savkopianta %(sessionsRemaining)s ŝlosilojn…",
+    "Backing up %(sessionsRemaining)s keys...": "Savkopiante %(sessionsRemaining)s ŝlosilojn…",
     "All keys backed up": "Ĉiuj ŝlosiloj estas savkopiitaj",
     "Backup version: ": "Versio de savkopio: ",
     "Algorithm: ": "Algoritmo: ",
@@ -1160,7 +1080,7 @@
     "View older messages in %(roomName)s.": "Montri pli malnovajn mesaĝojn en %(roomName)s.",
     "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 <chromeLink>Ĥromon</chromeLink>, <firefoxLink>Fajrfokson</firefoxLink>, aŭ <safariLink>Safarion</safariLink> por la plej bonaj spertoj.",
+    "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.",
     "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?",
@@ -1170,10 +1090,6 @@
     "Invited by %(sender)s": "Invitita de %(sender)s",
     "Error updating main address": "Ĝisdatigo de la ĉefa adreso eraris",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Ĝisdatigo de la ĉefa adreso de la ĉambro eraris. Aŭ la servilo tion ne permesas, aŭ io misfunkciis.",
-    "Error creating alias": "Kreo de kromnomo eraris",
-    "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "Kreo de tiu kromnomo eraris. Aŭ la servilo tion ne permesas, aŭ io misfunkciis.",
-    "Error removing alias": "Forigo de kromnomo eraris",
-    "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "Forigo de tiu kromnomo eraris. Aŭ ĝi ne plu ekzistas, aŭ io misfunkciis.",
     "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 ĉifritaj ĉambroj, kiel ĉi tiu, antaŭrigardoj al URL-oj estas implicite malŝaltitaj por certigi, ke via hejmservilo (kie la antaŭrigardoj estas generataj) ne povas kolekti informojn pri ligiloj en ĉi tiu ĉambro.",
     "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.": "Kiam iu metas URL-on en sian mesaĝon, antaŭrigardo al tiu URL povas montriĝi, por doni pliajn informojn pri tiu ligilo, kiel ekzemple la titolon, priskribon, kaj bildon el la retejo.",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>reagis per %(shortName)s</reactedWith>",
@@ -1181,11 +1097,6 @@
     "Click here to see older messages.": "Klaku ĉi tien por vidi pli malnovajn mesaĝojn.",
     "edited": "redaktita",
     "Failed to load group members": "Malsukcesis enlegi grupanojn",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Bonvolu helpi plibonigi projekton Riot.im per sendado de <UsageDataLink>sennomaj datumoj pri uzado</UsageDataLink>. Tio funkciados per kuketo (bonvolu vidi nian <PolicyLink>Politikon pri kuketoj</PolicyLink>).",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Bonvolu helpi plibonigi projekton Riot.im per sendado de <UsageDataLink>sennomaj datumoj pri uzado</UsageDataLink>. Tio funkciados per kuketo.",
-    "Please <a>contact your service administrator</a> to get this limit increased.": "Bonvolu <a>kontakti vian administranton</a> por plialtigi ĉi tiun limon.",
-    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "Ĉi tiu hejmservilo atingis sian monatan limon de aktivaj uzantoj, do <b>iuj uzantoj ne povos saluti</b>.",
-    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Ĉi tiu hejmservilo pasis trans unu el siaj rimedaj limoj, do <b>iuj uzantoj ne povos saluti</b>.",
     "An error ocurred whilst trying to remove the widget from the room": "Forigo de la fenestraĵo el la ĉambro eraris",
     "Minimize apps": "Plejetigi aplikaĵojn",
     "Maximize apps": "Plejgrandigi aplikaĵojn",
@@ -1197,10 +1108,10 @@
     "Edit message": "Redakti mesaĝon",
     "This room has already been upgraded.": "Ĉi tiu ĉambro jam gradaltiĝis.",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Ĉi tiu ĉambro uzas ĉambran version <roomVersion />, kiun la hejmservilo markis kiel <i>nestabilan</i>.",
-    "Your Riot is misconfigured": "Via kliento Riot estas misagordita",
-    "Joining room …": "Aliĝanta al ĉambro …",
-    "Loading …": "Enleganta …",
-    "Rejecting invite …": "Rifuzanta inviton …",
+    "Your %(brand)s is misconfigured": "Via kliento %(brand)s estas misagordita",
+    "Joining room …": "Aliĝante al ĉambro …",
+    "Loading …": "Enlegante …",
+    "Rejecting invite …": "Rifuzante inviton …",
     "Join the conversation with an account": "Aliĝu al la interparolo per konto",
     "Sign Up": "Registriĝi",
     "Sign In": "Saluti",
@@ -1238,12 +1149,6 @@
     "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.": "Malaktivigo de via konto <b>implicite ne forgesigas viajn mesaĝojn al ni.</b> Se vi volas, ke ni ilin forgesu, bonvolu marki la suban markbutonon.",
     "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.": "Videbleco de mesaĝoj en Matrix similas tiun de retpoŝto. Nia forgeso de viaj mesaĝoj signifas, ke ili haviĝos al neniu nova aŭ neregistrita uzanto, sed registritaj uzantoj, kiuj jam havas viajn mesaĝojn, ankoraŭ povos aliri siajn kopiaĵojn.",
     "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)": "Bonvolu dum malaktivigo forgesi ĉiujn mesaĝojn, kiujn mi sendis. (<b>Averto:</b> tio vidigos al osaj uzantoj neplenajn interparolojn.)",
-    "Use Legacy Verification (for older clients)": "Uzi malnovecan kontrolon (por malnovaj klientoj)",
-    "Verify by comparing a short text string.": "Kontrolu per komparo de mallonga teksto.",
-    "Begin Verifying": "Komenci kontrolon",
-    "Waiting for partner to accept...": "Atendanta akcepton de kunulo…",
-    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Ĉu neniu aperas? Ankoraŭ ne ĉiuj klientoj subtenas interagan kontrolon. <button>Uzi malnovecan kontrolon</button>.",
-    "Waiting for %(userId)s to confirm...": "Atendanta konfirmon de %(userId)s…",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Kontrolu ĉi tiun uzanton por marki ĝin fidata. Fidado devas vin trankviligi dum uzado de tutvoja ĉifrado.",
     "Waiting for partner to confirm...": "Atendas konfirmon de kunulo…",
     "Incoming Verification Request": "Venas kontrolpeto",
@@ -1279,7 +1184,6 @@
     "Unable to load backup status": "Ne povas legi staton de savkopio",
     "Collapse Reply Thread": "Maletendi respondan fadenon",
     "This homeserver would like to make sure you are not a robot.": "Ĉi tiu hejmservilo volas certigi, ke vi ne estas roboto.",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "Vi povas uzi proprajn servilajn elektojn por saluti aliajn servilojn de Matrix per alia hejmservila URL. Tio ebligos uzi ĉi tiun aplikaĵon kun jama Matrix-konto en alia hejmservilo.",
     "Please review and accept all of the homeserver's policies": "Bonvolu tralegi kaj akcepti ĉioman politikon de ĉi tiu hejmservilo",
     "Please review and accept the policies of this homeserver:": "Bonvolu tralegi kaj akcepti la politikon de ĉi tiu hejmservilo:",
     "Unable to validate homeserver/identity server": "Ne povas kontroli hejmservilon aŭ identigan servilon",
@@ -1313,20 +1217,18 @@
     "<a>Log in</a> to your new account.": "<a>Saluti</a> per via nova konto.",
     "You can now close this window or <a>log in</a> to your new account.": "Vi nun povas fermi ĉi tiun fenestron, aŭ <a>saluti</a> per via nova konto.",
     "Registration Successful": "Registro sukcesis",
-    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "Ni konservos ĉifritan kopiaĵon de viaj ŝlosiloj sur nia servilo. Protektu vian savkopion per pasfrazo por ĝin sekurigi.",
     "For maximum security, this should be different from your account password.": "Por plej granda sekureco, ĝi malsamu la pasvorton al via konto.",
-    "Please enter your passphrase a second time to confirm.": "Bonvolu vian pasfrazon konfirme enigi duan fojon.",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Ĉu vi uzas la funkcion « spuroj » (profilbildoj super la listo de ĉambroj)",
     "Adds a custom widget by URL to the room": "Aldonas propran fenestraĵon al la ĉambro per URL",
     "You cannot modify widgets in this room.": "Vi ne rajtas modifi fenestraĵojn en ĉi tiu ĉambro.",
     "Forces the current outbound group session in an encrypted room to be discarded": "Devigas la aktualan eliran grupan salutaĵon en ĉifrita ĉambro forĵetiĝi",
-    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s ŝaltis etikedojn por %(groups)s en ĉi tiu ĉambro.",
-    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s malŝaltis etikedojn por %(groups)s en ĉi tiu ĉambro.",
-    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s ŝaltis etikedojn por %(newGroups)s kaj malŝaltis etikedojn por %(oldGroups)s en ĉi tiu ĉambro.",
+    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s ŝaltis insignojn por %(groups)s en ĉi tiu ĉambro.",
+    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s malŝaltis insignojn por %(groups)s en ĉi tiu ĉambro.",
+    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s ŝaltis insignojn por %(newGroups)s kaj malŝaltis insignojn por %(oldGroups)s en ĉi tiu ĉambro.",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s nuligis inviton en la ĉambron por %(targetDisplayName)s.",
     "Cannot reach homeserver": "Ne povas atingi hejmservilon",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Certiĝu ke vi havas stabilan retkonekton, aŭ kontaktu la administranton de la servilo",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Petu vian Riot-administranton kontroli <a>vian agordaron</a> je malĝustaj aŭ duoblaj eroj.",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Petu vian %(brand)s-administranton kontroli <a>vian agordaron</a> je malĝustaj aŭ duoblaj eroj.",
     "Cannot reach identity server": "Ne povas atingi identigan servilon",
     "Please <a>contact your service administrator</a> to continue using this service.": "Bonvolu <a>kontakti vian servo-administranton</a> por daŭrigi uzadon de tiu ĉi servo.",
     "Failed to perform homeserver discovery": "Malsukcesis trovi hejmservilon",
@@ -1342,7 +1244,6 @@
     "Short keyboard patterns are easy to guess": "Mallongaj ripetoj de klavoj estas facile diveneblaj",
     "Enable Community Filter Panel": "Ŝalti komunume filtran panelon",
     "Enable widget screenshots on supported widgets": "Ŝalti bildojn de fenestraĵoj por subtenataj fenestraĵoj",
-    "Show recently visited rooms above the room list": "Montri freŝe vizititajn ĉambrojn super la listo de ĉambroj",
     "Show hidden events in timeline": "Montri kaŝitajn okazojn en historio",
     "Low bandwidth mode": "Reĝimo de malmulta kapacito",
     "Start using Key Backup": "Ekuzi Savkopiadon de ŝlosiloj",
@@ -1370,28 +1271,26 @@
     "Removing…": "Forigante…",
     "I don't want my encrypted messages": "Mi ne volas miajn ĉifritajn mesaĝojn",
     "No backup found!": "Neniu savkopio troviĝis!",
-    "Backup Restored": "Savkopio rehavita",
     "Resend edit": "Resendi redakton",
     "Go to Settings": "Iri al agordoj",
-    "Flair": "Etikedo",
+    "Flair": "Insigno",
     "No Audio Outputs detected": "Neniu soneligo troviĝis",
     "Send %(eventType)s events": "Sendi okazojn de tipo « %(eventType)s »",
     "Select the roles required to change various parts of the room": "Elektu la rolojn postulatajn por ŝanĝado de diversaj partoj de la ĉambro",
     "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>": "Post ŝalto, ĉifrado de ĉambro ne povas esti malŝaltita. Mesaĝoj senditaj al ĉifrata ĉambro ne estas videblaj por la servilo, nur por la partoprenantoj de la ĉambro. Ŝalto de ĉifrado eble malfunkciigos iujn robotojn kaj pontojn. <a>Eksciu plion pri ĉifrado.</a>",
-    "To link to this room, please add an alias.": "Por ligili al la ĉambro, bonvolu aldoni kromnomon.",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Ŝanĝoj al legebleco de historio nur efektiviĝos por osaj mesaĝoj de ĉi tiu ĉambro. La videbleco de jama historio ne ŝanĝiĝos.",
     "Encryption": "Ĉifrado",
     "Once enabled, encryption cannot be disabled.": "Post ŝalto, ne plu eblas malŝalti ĉifradon.",
     "Encrypted": "Ĉifrata",
-    "The conversation continues here.": "La interparolo pluas ĉi tie.",
+    "The conversation continues here.": "La interparolo daŭras ĉi tie.",
     "This room has been replaced and is no longer active.": "Ĉi tiu ĉambro estas anstataŭita, kaj ne plu aktivas.",
     "Loading room preview": "Preparas antaŭrigardon al la ĉambro",
-    "Only room administrators will see this warning": "Nur ĉambraj administrantoj vidos ĉi tiun averton",
-    "Error updating flair": "Eraris ĝisdatigo de etikedo",
-    "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Eraris ĝisdatigo de etikedo por ĉi tiu ĉambro. Aŭ la servilo ne permesas ĝin, aŭ dumtempa eraro okazis.",
-    "Showing flair for these communities:": "Montras etikedojn de la jenaj komunumoj:",
-    "This room is not showing flair for any communities": "Ĉi tiu ĉambro montras etikedojn de neniuj komunumoj",
-    "Display your community flair in rooms configured to show it.": "Montri etikedon de via komunumo en ĉambroj agorditaj por montri ĝin.",
+    "Only room administrators will see this warning": "Nur administrantoj de ĉambro vidos ĉi tiun averton",
+    "Error updating flair": "Eraris ĝisdatigo de insigno",
+    "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Eraris ĝisdatigo de insigno por ĉi tiu ĉambro. Aŭ la servilo ne permesas ĝin, aŭ dumtempa eraro okazis.",
+    "Showing flair for these communities:": "Montras insignojn de la jenaj komunumoj:",
+    "This room is not showing flair for any communities": "Ĉi tiu ĉambro montras insignojn de neniuj komunumoj",
+    "Display your community flair in rooms configured to show it.": "Montri insignon de via komunumo en ĉambroj agorditaj por montri ĝin.",
     "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)snenion ŝanĝis je %(count)s fojoj",
     "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)snenion ŝanĝis",
     "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)snenion ŝanĝis je %(count)s fojoj",
@@ -1399,15 +1298,14 @@
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Ne povas enlegi la responditan okazon; aŭ ĝi ne ekzistas, aŭ vi ne rajtas vidi ĝin.",
     "Clear all data": "Vakigi ĉiujn datumojn",
     "Community IDs cannot be empty.": "Identigilo de komunumo ne estu malplena.",
-    "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 Riot to do this": "Por eviti perdon de via babila historio, vi devas elporti la ŝlosilojn de viaj ĉambroj antaŭ adiaŭo. Por tio vi bezonos reveni al la pli nova versio de Riot",
-    "You've previously used a newer version of Riot on %(host)s. 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 Riot je %(host)s. Por ree uzi ĉi tiun version kun ĉifrado, vi devos adiaŭi kaj resaluti. ",
+    "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": "Por eviti perdon de via babila historio, vi devas elporti la ŝlosilojn de viaj ĉambroj antaŭ adiaŭo. Por tio vi bezonos reveni al la pli nova versio de %(brand)s",
     "Incompatible Database": "Neakorda datumbazo",
     "View Servers in Room": "Montri servilojn en ĉambro",
-    "You've previously used Riot 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, Riot needs to resync your account.": "Vi antaŭe uzis Riot-on je %(host)s kun ŝaltita malfrua enlegado de anoj. En ĉi tiu versio, malfrua enlegado estas malŝaltita. Ĉar la loka kaŝmemoro de ambaŭ versioj ne akordas, Riot bezonas respeguli vian konton.",
-    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Se la alia versio de Riot ankoraŭ estas malfermita en alia langeto, bonvolu tiun fermi, ĉar uzado de Riot je la sama gastiganto, kun malfrua enlegado samtempe ŝaltita kaj malŝaltita, kaŭzos problemojn.",
+    "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.": "Vi antaŭe uzis %(brand)s-on je %(host)s kun ŝaltita malfrua enlegado de anoj. En ĉi tiu versio, malfrua enlegado estas malŝaltita. Ĉar la loka kaŝmemoro de ambaŭ versioj ne akordas, %(brand)s bezonas respeguli vian konton.",
+    "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 la alia versio de %(brand)s ankoraŭ estas malfermita en alia langeto, bonvolu tiun fermi, ĉar uzado de %(brand)s je la sama gastiganto, kun malfrua enlegado samtempe ŝaltita kaj malŝaltita, kaŭzos problemojn.",
     "Incompatible local cache": "Neakorda loka kaŝmemoro",
     "Clear cache and resync": "Vakigi kaŝmemoron kaj respeguli",
-    "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Riot nun uzas 3–5-oble malpli da memoro, ĉar ĝi enlegas informojn pri aliaj uzantoj nur tiam, kiam ĝi bezonas. Bonvolu atendi ĝis ni respegulos la servilon!",
+    "%(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 nun uzas 3–5-oble malpli da memoro, ĉar ĝi enlegas informojn pri aliaj uzantoj nur tiam, kiam ĝi bezonas. Bonvolu atendi ĝis ni respegulos la servilon!",
     "You'll lose access to your encrypted messages": "Vi perdos aliron al viaj ĉifritaj mesaĝoj",
     "Are you sure you want to sign out?": "Ĉu vi certe volas adiaŭi?",
     "Your homeserver doesn't seem to support this feature.": "Via hejmservilo ŝajne ne subtenas ĉi tiun funkcion.",
@@ -1421,18 +1319,11 @@
     "Missing session data": "Mankas datumoj de salutaĵo",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Iuj datumoj de salutaĵo, inkluzive viajn ĉifrajn ŝlosilojn, mankas. Por tion korekti, resalutu, kaj rehavu la ŝlosilojn el savkopio.",
     "Your browser likely removed this data when running low on disk space.": "Via foliumilo probable forigos ĉi tiujn datumojn kiam al ĝi mankos spaco sur disko.",
-    "Recovery Key Mismatch": "Malakordo de rehava ŝlosilo",
-    "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "Savkopio ne povas esti malĉifrita per ĉi tiu ŝlosilo: bonvolu kontroli, ke vi enigis la ĝustan rehavan ŝlosilon.",
-    "Incorrect Recovery Passphrase": "Malĝusta rehava pasfrazo",
-    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "Savkopio ne sukcesis malĉifriĝi per ĉi tiu pasfrazo: bonvolu kontroli, ĉu vi enigis la ĝustan rehavan pasfrazon.",
     "Unable to restore backup": "Ne povas rehavi savkopion",
     "Failed to decrypt %(failedCount)s sessions!": "Malsukcesis malĉifri%(failedCount)s salutaĵojn!",
-    "Restored %(sessionCount)s session keys": "Rehavis %(sessionCount)s ŝlosilojn de salutaĵo",
-    "Enter Recovery Passphrase": "Enigu rehavan pasfrazon",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Averto</b>: vi agordu ŝlosilan savkopion nur per fidata komputilo.",
     "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Aliru vian sekuran mesaĝan historion kaj agordu sekuran mesaĝadon per enigo de via rehava pasfrazo.",
     "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Se vi forgesis vian rehavan pasfrazon, vi povas <button1>uzi viajn rehavan ŝlosilon</button1> aŭ <button2>agordi novajn rehavajn elektojn</button2>",
-    "Enter Recovery Key": "Enigu rehavan ŝlosilon",
     "This looks like a valid recovery key!": "Ŝajnas esti valida rehava ŝlosilo!",
     "Not a valid recovery key": "Ne estas valida rehava ŝlosilo",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Aliru vian sekuran mesaĝan historion kaj agordu sekuran mesaĝadon per enigo de via rehava ŝlosilo.",
@@ -1450,10 +1341,10 @@
     "Terms and Conditions": "Uzokondiĉoj",
     "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 Riot.im experience!": "Ĉu vi sciis: vi povas uzi komunumojn por filtri vian sperton de Riot.im!",
+    "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.",
-    "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot malsukcesis akiri liston de protokoloj de la hejmservilo. Eble la hejmservilo estas tro malnova por subteni eksterajn retojn.",
-    "Riot failed to get the public room list.": "Riot malsukcesis akiri la liston de publikaj ĉambroj.",
+    "%(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.",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Vi ne povas sendi mesaĝojn ĝis vi tralegos kaj konsentos <consentLink>niajn uzokondiĉojn</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.": "Via mesaĝo ne sendiĝis, ĉar tiu ĉi hejmservilo atingis sian monatan limon de aktivaj uzantoj. Bonvolu <a>kontakti vian administranton de servo</a> por plue uzadi la servon.",
@@ -1466,9 +1357,9 @@
     "If you don't want to set this up now, you can later in Settings.": "Se vi ne volas agordi tion nun, vi povas fari ĝin poste per agordoj.",
     "Don't ask again": "Ne demandi ree",
     "New Recovery Method": "Nova rehava metodo",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "Novaj rehava pasfrazo kaj ŝlosilo por sekuraj mesaĝoj troviĝis.",
+    "A new recovery passphrase and key for Secure Messages have been detected.": "Novaj rehava pasfrazo kaj ŝlosilo por Sekuraj mesaĝoj troviĝis.",
     "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 vi ne agordis la novan rehavan metodon, eble atakanto provas aliri vian konton. Vi tuj ŝanĝu la pasvorton de via konto, kaj agordu novan rehavan metodon en la agordoj.",
-    "Set up Secure Messages": "Agordi sekurajn mesaĝojn",
+    "Set up Secure Messages": "Agordi Sekurajn mesaĝojn",
     "Recovery Method Removed": "Rehava metodo foriĝis",
     "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 vi ne forigis la rehavan metodon, eble atakanto provas aliri vian konton. Vi tuj ŝanĝu la pasvorton de via konto, kaj agordu novan rehavan metodon en la agordoj.",
     "Use a longer keyboard pattern with more turns": "Uzu pli longan tekston kun plia varieco",
@@ -1477,38 +1368,26 @@
     "Demote yourself?": "Ĉu malrangaltigi vin mem?",
     "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.": "Vi ne povos malfari tiun ŝanĝon, ĉar vi malrangaltigas vin mem; se vi estas la lasta povohava uzanto en la ĉambro, estos neeble vian povon rehavi.",
     "Demote": "Malrangaltigi",
-    "Power level": "Povonivelo",
-    "Use two-way text verification": "Uzi duflankan tekstan kontrolon",
+    "Power level": "Povnivelo",
     "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:": "Gradaltigo de ĉi tiu ĉambro bezonas fermi ĝin, kaj krei novan por anstataŭi ĝin. Por plejbonigi sperton de la ĉambranoj, ni:",
     "Invalid homeserver discovery response": "Nevalida eltrova respondo de hejmservilo",
     "Failed to get autodiscovery configuration from server": "Malsukcesis akiri agordojn de memaga eltrovado de la servilo",
     "Homeserver URL does not appear to be a valid Matrix homeserver": "URL por hejmservilo ŝajne ne ligas al valida hejmservilo de Matrix",
     "Invalid identity server discovery response": "Nevalida eltrova respondo de identiga servilo",
     "Identity server URL does not appear to be a valid identity server": "URL por identiga servilo ŝajne ne ligas al valida identiga servilo",
-    "Sign in with single sign-on": "Salutu per ununura saluto",
+    "Sign in with single sign-on": "Saluti per ununura saluto",
     "Failed to re-authenticate due to a homeserver problem": "Malsukcesis reaŭtentikigi pro hejmservila problemo",
     "Failed to re-authenticate": "Malsukcesis reaŭtentikigi",
     "Enter your password to sign in and regain access to your account.": "Enigu vian pasvorton por saluti kaj rehavi aliron al via konto.",
     "Sign in and regain access to your account.": "Saluti kaj rehavi aliron al via konto.",
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Vi ne povas saluti per via konto. Bonvolu kontakti administranton de via hejmservilo por akiri pliajn informojn.",
-    "Set up with a Recovery Key": "Agordi per rehava ŝlosilo",
     "Go back to set it again.": "Reiru por reagordi ĝin.",
-    "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Asekure vi povas uzi ĝin por rehavi vian historion de ĉifritaj mesaĝoj se vi forgesos vian rehavan pasfrazon.",
-    "As a safety net, you can use it to restore your encrypted message history.": "Asekure vi povas uzi ĝin por rehavi vian historion de ĉifritaj mesaĝoj.",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Via rehava ŝlosilo estas asekuro – vi povos uzi ĝin por rehavi aliron al viaj ĉifritaj mesaĝoj, se vi forgesos vian pasfrazon.",
-    "Your Recovery Key": "Via rehava ŝlosilo",
-    "Copy to clipboard": "Kopii al tondujo",
     "<b>Print it</b> and store it somewhere safe": "<b>Presu ĝin</b> kaj konservu ĝin en sekura loko",
     "<b>Save it</b> on a USB key or backup drive": "<b>Konservu ĝin</b> en poŝmemorilo aŭ savkopia disko",
     "<b>Copy it</b> to your personal cloud storage": "<b>Kopiu ĝin</b> al via persona enreta konservejo",
     "Your keys are being backed up (the first backup could take a few minutes).": "Viaj ŝlosiloj estas savkopiataj (la unua savkopio povas daŭri kelkajn minutojn).",
-    "Set up Secure Message Recovery": "Agordi sekuran rehavon de mesaĝoj",
-    "Secure your backup with a passphrase": "Sekurigi vian savkopion per pasfrazo",
-    "Confirm your passphrase": "Konfirmu vian pasfrazon",
-    "Recovery key": "Rehava ŝlosilo",
-    "Keep it safe": "Sekurigu ĝin",
-    "Starting backup...": "Komencanta savkopion…",
-    "Create Key Backup": "Krei savkopion de ŝlosiloj",
+    "Set up Secure Message Recovery": "Agordi Sekuran rehavon de mesaĝoj",
+    "Starting backup...": "Komencante savkopion…",
     "Unable to create key backup": "Ne povas krei savkopion de ŝlosiloj",
     "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Sen agordo de Sekura rehavo de mesaĝoj, vi perdos vian sekuran historion de mesaĝoj per adiaŭo.",
     "Bulk options": "Amasaj elektebloj",
@@ -1571,10 +1450,10 @@
     "Always show the window menu bar": "Ĉiam montri la fenestran menubreton",
     "Upgrade the room": "Gradaltigi la ĉambron",
     "Enable room encryption": "Ŝalti ĉifradon de la ĉambro",
-    "Error changing power level requirement": "Eraris ŝanĝo de postulo de potenconivelo",
-    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Eraris ŝanĝo de la postuloj de la ĉambro pri potenconivelo. Certigu, ke vi havas sufiĉajn permesojn, kaj reprovu.",
-    "Error changing power level": "Eraris ŝanĝo de potenconivelo",
-    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Eraris ŝanĝo de potenconivelo de la uzanto. Certigu, ke vi havas sufiĉajn permesojn, kaj reprovu.",
+    "Error changing power level requirement": "Eraris ŝanĝo de postulo de povnivelo",
+    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Eraris ŝanĝo de la postuloj de la ĉambro pri povnivelo. Certigu, ke vi havas sufiĉajn permesojn, kaj reprovu.",
+    "Error changing power level": "Eraris ŝanĝo de povnivelo",
+    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Eraris ŝanĝo de povnivelo de la uzanto. Certigu, ke vi havas sufiĉajn permesojn, kaj reprovu.",
     "Remove %(email)s?": "Ĉu forigi %(email)s?",
     "Remove %(phone)s?": "Ĉu forigi %(phone)s?",
     "No recent messages by %(user)s found": "Neniuj freŝaj mesaĝoj de %(user)s troviĝis",
@@ -1638,10 +1517,10 @@
     "Recent rooms": "Freŝaj vizititaj ĉambroj",
     "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Eraris (%(errcode)s) validigo de via invito. Vi povas transdoni ĉi tiun informon al ĉambra administranto.",
     "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Ĉi tiu invito al %(roomName)s sendiĝis al %(email)s, kiu ne estas ligita al via konto",
-    "Link this email with your account in Settings to receive invites directly in Riot.": "Ligu ĉi tiun retpoŝtadreson al via konto en Agordoj por ricevadi invitojn rekte per Riot.",
+    "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Ligu ĉi tiun retpoŝtadreson al via konto en Agordoj por ricevadi invitojn rekte per %(brand)s.",
     "This invite to %(roomName)s was sent to %(email)s": "La invito al %(roomName)s sendiĝis al %(email)s",
-    "Use an identity server in Settings to receive invites directly in Riot.": "Uzu identigan servilon en Agordoj por ricevadi invitojn rekte per Riot.",
-    "Share this email in Settings to receive invites directly in Riot.": "Havigu ĉi tiun retpoŝtadreson per Agordoj por ricevadi invitojn rekte per Riot.",
+    "Use an identity server in Settings to receive invites directly in %(brand)s.": "Uzu identigan servilon en Agordoj por ricevadi invitojn rekte per %(brand)s.",
+    "Share this email in Settings to receive invites directly in %(brand)s.": "Havigu ĉi tiun retpoŝtadreson per Agordoj por ricevadi invitojn rekte per %(brand)s.",
     "%(count)s unread messages including mentions.|other": "%(count)s nelegitaj mesaĝoj, inkluzive menciojn.",
     "%(count)s unread messages including mentions.|one": "1 nelegita mencio.",
     "%(count)s unread messages.|other": "%(count)s nelegitaj mesaĝoj.",
@@ -1675,16 +1554,11 @@
     "Quick Reactions": "Rapidaj reagoj",
     "Cancel search": "Nuligi serĉon",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Bonvolu <newIssueLink>raporti novan problemon</newIssueLink> je GitHub, por ke ni povu ĝin esplori.",
-    "Room alias": "Kromnomo de ĉambro",
     "e.g. my-room": "ekzemple mia-chambro",
-    "Please provide a room alias": "Bonvolu doni kromnomon de ĉambro",
-    "This alias is available to use": "Ĉi tiu kromnomo estas disponebla",
-    "This alias is already in use": "Ĉi tiu kromnomo jam estas uzata",
     "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Uzu identigan servilon por inviti per retpoŝto. <default>Uzu la norman (%(defaultIdentityServerName)s)</default> aŭ administru per <settings>Agordoj</settings>.",
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Uzu identigan servilon por inviti per retpoŝto. Administru per <settings>Agordoj</settings>.",
     "Close dialog": "Fermi interagujon",
     "Please enter a name for the room": "Bonvolu enigi nomon por la ĉambro",
-    "Set a room alias to easily share your room with other people.": "Agordu kromnomon de la ĉambro por facile ĝin kunhavigi al aliaj homoj.",
     "This room is private, and can only be joined by invitation.": "Ĉi tiu ĉambro estas privata, kaj eblas aliĝi nur per invito.",
     "Create a public room": "Krei publikan ĉambron",
     "Create a private room": "Krei privatan ĉambron",
@@ -1695,7 +1569,7 @@
     "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Bloki aliĝojn al ĉi tiu ĉambro de uzantoj el aliaj Matrix-serviloj (Ĉi tiun agordon ne eblas poste ŝanĝi!)",
     "Please fill why you're reporting.": "Bonvolu skribi, kial vi raportas.",
     "Report Content to Your Homeserver Administrator": "Raporti enhavon al la administrantode via hejmservilo",
-    "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.": "Per raporto de ĝi tiu mesaĝo vi sendos ĝian unikan « eventan identigilon » al la administranto de via hejmservilo. Se mesaĝoj en ĉi tiu ĉambro estas ĉifrataj, la administranto de via hejmservilo ne povos legi la tekston de la mesaĝo, nek rigardi dosierojn aŭ bildojn.",
+    "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.": "Per raporto de ĉi tiu mesaĝo vi sendos ĝian unikan « eventan identigilon » al la administranto de via hejmservilo. Se mesaĝoj en ĉi tiu ĉambro estas ĉifrataj, la administranto de via hejmservilo ne povos legi la tekston de la mesaĝo, nek rigardi dosierojn aŭ bildojn.",
     "Send report": "Sendi raporton",
     "Command Help": "Helpo pri komando",
     "To continue you need to accept the terms of this service.": "Por pluigi, vi devas akcepti la uzokondiĉojn de ĉi tiu servo.",
@@ -1728,7 +1602,6 @@
     "Decline (%(counter)s)": "Malakcepti (%(counter)s)",
     "Clear notifications": "Vakigi sciigojn",
     "Error subscribing to list": "Eraris abono al listo",
-    "Please verify the room ID or alias and try again.": "Bonvolu kontroli la identigilon aŭ kromnomon de la ĉambro kaj reprovu.",
     "Error removing ignored user/server": "Eraris forigo de la malatentata uzanto/servilo",
     "Error unsubscribing from list": "Eraris malabono de la listo",
     "Please try again or view your console for hints.": "Bonvolu reprovi aŭ serĉi helpilojn en via konzolo.",
@@ -1744,17 +1617,12 @@
     "Your avatar URL": "URL de via profilbildo",
     "Your user ID": "Via identigilo de uzanto",
     "Your theme": "Via haŭto",
-    "Riot URL": "URL de Riot",
+    "%(brand)s URL": "URL de %(brand)s",
     "Room ID": "Identigilo de ĉambro",
     "Widget ID": "Identigilo de fenestraĵo",
     "Widgets do not use message encryption.": "Fenestraĵoj ne uzas ĉifradon de mesaĝoj.",
     "Widget added by": "Fenestraĵon aldonis",
     "This widget may use cookies.": "Ĉi tiu fenestraĵo povas uzi kuketojn.",
-    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s aldonis %(addedAddresses)s kaj %(count)s aliajn adresojn al ĉi tiu ĉambro",
-    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s forigis %(removedAddresses)s kaj %(count)s aliajn adresojn el ĉi tiu ĉambro",
-    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s forigis %(countRemoved)s kaj aldonis %(countAdded)s adresojn al ĉi tiu ĉambro",
-    "%(senderName)s turned on end-to-end encryption.": "%(senderName)s ŝaltis tutvojan ĉifradon.",
-    "%(senderName)s turned on end-to-end encryption (unrecognised algorithm %(algorithm)s).": "%(senderName)s ŝaltis tutvojan ĉifradon (nerekonita algoritmo %(algorithm)s).",
     "a few seconds ago": "antaŭ kelkaj sekundoj",
     "about a minute ago": "antaŭ ĉirkaŭ minuto",
     "%(num)s minutes ago": "antaŭ %(num)s minutoj",
@@ -1812,21 +1680,14 @@
     "Start": "Komenci",
     "Done": "Fini",
     "Go Back": "Reiri",
-    "Verify other users in their profile.": "Kontrolu aliajn uzantojn en iliaj profiloj.",
     "Upgrade your encryption": "Gradaltigi vian ĉifradon",
-    "Encryption upgraded": "Ĉifrado gradaltigita",
-    "Encryption setup complete": "Agordo de ĉifrado finita",
-    "The version of Riot": "La versio de Riot",
-    "Whether you're using Riot on a device where touch is the primary input mechanism": "Ĉu vi uzas Rioton per aparato, kies ĉefa enigilo estas tuŝado",
-    "The information being sent to us to help make Riot better includes:": "La informoj sendataj al ni por plibonigi Rioton inkluzivas:",
-    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Nekonataj salutaĵoj ĉeestas la ĉambron; se vi daŭrigos ne kontrolinte ilin, iu povos subaŭskulti vian vokon.",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Ĉu vi uzas %(brand)son per aparato, kies ĉefa enigilo estas tuŝado",
     "If you cancel now, you won't complete verifying the other user.": "Se vi nuligos nun, vi ne finos kontrolon de la alia uzanto.",
     "If you cancel now, you won't complete verifying your other session.": "Se vi nuligos nun, vi ne finos kontrolon de via alia salutaĵo.",
     "Cancel entering passphrase?": "Ĉu nuligi enigon de pasfrazo?",
     "Setting up keys": "Agordo de klavoj",
     "Verify this session": "Kontroli ĉi tiun salutaĵon",
     "Encryption upgrade available": "Ĝisdatigo de ĉifrado haveblas",
-    "Unverified session": "Nekontrolita salutaĵo",
     "Sign In or Create Account": "Salutu aŭ kreu konton",
     "Use your account or create a new one to continue.": "Por daŭrigi, uzu vian konton aŭ kreu novan.",
     "Create Account": "Krei konton",
@@ -1834,7 +1695,7 @@
     "Double check that your server supports the room version chosen and try again.": "Bone kontrolu, ĉu via servilo subtenas la elektitan version de ĉambro, kaj reprovu.",
     "Verifies a user, session, and pubkey tuple": "Kontrolas opon de uzanto, salutaĵo, kaj publika ŝlosilo",
     "Unknown (user, session) pair:": "Nekonata duopo (uzanto, salutaĵo):",
-    "Session already verified!": "Kunsido jam estas kontrolita!",
+    "Session already verified!": "Salutaĵo jam estas kontrolita!",
     "WARNING: Session already verified, but keys do NOT MATCH!": "AVERTO: Salutaĵo jam estas kontrolita, sed la ŝlosiloj NE AKORDAS!",
     "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!": "AVERTO: MALSUKCESIS KONTROLO DE ŜLOSILOJ! La subskriba ŝlosilo de %(userId)s kaj session %(deviceId)s estas «%(fprint)s», kiu ne akordas la donitan ŝlosilon «%(fingerprint)s». Tio povus signifi, ke via komunikado estas spionata!",
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "La subskriba ŝlosilo, kiun vi donis, akordas la subskribas ŝlosilon, kinu vi ricevis de la salutaĵo %(deviceId)s de la uzanto %(userId)s. Salutaĵo estis markita kontrolita.",
@@ -1853,26 +1714,19 @@
     "or": "aŭ",
     "Compare unique emoji": "Komparu unikajn bildsignojn",
     "Compare a unique set of emoji if you don't have a camera on either device": "Komparu unikan aron de bildsignoj se vi ne havas kameraon sur la alia aparato",
-    "Confirm the emoji below are displayed on both devices, in the same order:": "Konfirmu, ke la ĉi-subaj bildsignoj estas montrataj sur ambaŭ aparatoj, samorde:",
-    "Verify this device by confirming the following number appears on its screen.": "Kontrolu ĉi tiun aparaton per kontrolo, ke la jena nombro aperas sur ĝia ekrano.",
     "Waiting for %(displayName)s to verify…": "Atendas kontrolon de %(displayName)s…",
-    "Cancelling…": "Nuliganta…",
+    "Cancelling…": "Nuligante…",
     "They match": "Ili akordas",
     "They don't match": "Ili ne akordas",
     "To be secure, do this in person or use a trusted way to communicate.": "Por plia sekureco, faru tion persone, aŭ uzu alian fidatan komunikilon.",
     "Verify yourself & others to keep your chats safe": "Kontrolu vin mem kaj aliajn por sekurigi viajn babilojn",
     "Channel: %(channelName)s": "Kanalo: %(channelName)s",
-    "Show less": "Montri pli",
-    "Show more": "Montri malpli",
+    "Show less": "Montri malpli",
+    "Show more": "Montri pli",
     "Help": "Helpo",
-    "Message not sent due to unknown sessions being present": "Mesaĝo ne sendiĝis pro ĉeesto de nekonataj salutaĵoj",
-    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Montri salutaĵojn</showSessionsText>, <sendAnywayText>tamen sendi</sendAnywayText> aŭ <cancelText>nuligi</cancelText>.",
-    "Complete security": "Plena sekureco",
-    "Verify this session to grant it access to encrypted messages.": "Kontrolu ĉi tiun salutaĵon por doni al ĝi aliron al la ĉifritaj mesaĝoj.",
     "Session verified": "Salutaĵo kontroliĝis",
     "Copy": "Kopii",
     "Your user agent": "Via klienta aplikaĵo",
-    "If you cancel now, you won't complete your secret storage operation.": "Se vi nuligos nun, vi ne finos la operacion de la sekreta deponejo.",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s ŝanĝis nomon de la ĉambro de %(oldRoomName)s al %(newRoomName)s.",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s aldonis la alternativajn adresojn %(addresses)s por ĉi tiu ĉambro.",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s aldonis alternativan adreson %(addresses)s por ĉi tiu ĉambro.",
@@ -1901,29 +1755,23 @@
     "Not Trusted": "Nefidata",
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) salutis novan salutaĵon ne kontrolante ĝin:",
     "Ask this user to verify their session, or manually verify it below.": "Petu, ke ĉi tiu la uzanto kontrolu sian salutaĵon, aŭ kontrolu ĝin permane sube.",
-    "Manually Verify": "Permane kontroli",
-    "Show a presence dot next to DMs in the room list": "Montri punkton de ĉeesteco apud rektaj ĉambroj en la listo de ĉambroj",
     "Support adding custom themes": "Subteni aldonadon de propraj haŭtoj",
-    "Enable cross-signing to verify per-user instead of per-session (in development)": "Ŝalti transirajn subskribojn por kontroli uzantojn anstataŭ aparatojn (ankoraŭ evoluigate)",
-    "Enable local event indexing and E2EE search (requires restart)": "Ŝalti lokan indeksadon de okazoj kaj serĉon en tutvoja ĉifrado (bezonas restartigon)",
     "Show info about bridges in room settings": "Montri informon pri pontoj en agordoj de ĉambro",
-    "Show padlocks on invite only rooms": "Montri serurojn sur ĉambroj por invititaj",
-    "Keep secret storage passphrase in memory for this session": "Teni pasfrazon de sekreta deponejo en memoro dum ĉi tiu salutaĵo",
     "Review": "Rekontroli",
     "This bridge was provisioned by <user />.": "Ĉi tiu ponto estas provizita de <user />.",
     "This bridge is managed by <user />.": "Ĉi tiu ponto estas administrata de <user />.",
     "Workspace: %(networkName)s": "Labortablo: %(networkName)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.": "Ŝanĝo de pasvorto nuntempe restarigos ĉiujn tutvoje ĉifrajn ŝlosilojn en ĉiuj salutaĵoj, malebligante legadon de ĉifrita historio, malse vi unue elportus la ŝlosilojn de viaj ĉambroj kaj reenportus ilin poste. Ĉi tion ni plibonigos ose.",
-    "Your homeserver does not support cross-signing.": "Via hejmservilo ne subtenas transirajn subskribojn.",
-    "Cross-signing and secret storage are enabled.": "Transiraj subskriboj kaj sekreta deponejo estas ŝaltitaj.",
-    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Via konto havas identecon de transiraj subskriboj en sekreta deponejo, sed ĉi tiu salutaĵo ankoraŭ ne fidas ĝin.",
-    "Cross-signing and secret storage are not yet set up.": "Transiraj subskriboj kaj sekreta deponejo ankoraŭ ne agordiĝis.",
-    "Reset cross-signing and secret storage": "Remeti transirajn subskribojn kaj sekretan deponejon",
-    "Bootstrap cross-signing and secret storage": "Praŝargi transirajn subskribojn kaj sekretan deponejon",
-    "Cross-signing public keys:": "Transiraj publikaj ŝlosiloj:",
+    "Your homeserver does not support cross-signing.": "Via hejmservilo ne subtenas delegajn subskribojn.",
+    "Cross-signing and secret storage are enabled.": "Delegaj subskriboj kaj sekreta deponejo estas ŝaltitaj.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Via konto havas identecon por delegaj subskriboj en sekreta deponejo, sed ĉi tiu salutaĵo ankoraŭ ne fidas ĝin.",
+    "Cross-signing and secret storage are not yet set up.": "Delegaj subskriboj kaj sekreta deponejo ankoraŭ ne agordiĝis.",
+    "Reset cross-signing and secret storage": "Remeti delegajn subskribojn kaj sekretan deponejon",
+    "Bootstrap cross-signing and secret storage": "Pretigi delegajn subskribojn kaj sekretan deponejon",
+    "Cross-signing public keys:": "Delegaj publikaj ŝlosiloj:",
     "in memory": "en memoro",
     "not found": "ne trovita",
-    "Cross-signing private keys:": "Transiraj privataj ŝlosiloj:",
+    "Cross-signing private keys:": "Delegaj privataj ŝlosiloj:",
     "in secret storage": "en sekreta deponejo",
     "Secret storage public key:": "Publika ŝlosilo de sekreta deponejo:",
     "in account data": "en datumoj de konto",
@@ -1939,8 +1787,7 @@
     "Manage": "Administri",
     "Securely cache encrypted messages locally for them to appear in search results.": "Sekure kaŝmemori ĉifritajn mesaĝojn loke, por aperigi ilin en serĉrezultoj.",
     "Enable": "Ŝalti",
-    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Riot malhavas kelkajn partojn bezonajn por sekura loka kaŝmemorado de ĉirfitaj mesaĝoj. Se vi volas eksperimenti pri ĉi tiu kapablo, kunmetu propran klienton «Riot Dekstop» kun <nativeLink>aldonitaj serĉopartoj</nativeLink>.",
-    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot ne povas sekure loke kaŝmemori ĉifritajn mesaĝojn, rulate en reta foliumilo. Uzu la klienton <riotLink>Riot Desktop</riotLink> por aperigi ĉirfritajn mesaĝojn en serĉorezultoj.",
+    "%(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 malhavas kelkajn partojn bezonajn por sekura loka kaŝmemorado de ĉirfitaj mesaĝoj. Se vi volas eksperimenti pri ĉi tiu kapablo, kunmetu propran klienton «%(brand)s Dekstop» kun <nativeLink>aldonitaj serĉopartoj</nativeLink>.",
     "Connecting to integration manager...": "Konektante al kunigilo…",
     "This session is backing up your keys. ": "Ĉi tiu salutaĵo savkopias viajn ŝlosilojn. ",
     "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.": "Ĉi tiu salutaĵo <b>ne savkopias viajn ŝlosilojn</b>, sed vi jam havas savkopion, el kiu vi povas rehavi datumojn, kaj ilin kreskigi plue.",
@@ -1957,7 +1804,6 @@
     "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Savkopio havas <validity>nevalidan</validity> subskribon de <verify>nekontrolita</verify> salutaĵo <device></device>",
     "Backup is not signed by any of your sessions": "Savkopio estas subskribita de neniu el viaj salutaĵoj",
     "This backup is trusted because it has been restored on this session": "Ĉi tiu savkopio estas fidata, ĉar ĝi estis rehavita en ĉi tiu salutaĵo",
-    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Savkopia ŝlosilo estas deponita en sekreta deponejo, sed tiu funkcio ne estas ŝaltita en ĉi tiu salutaĵo. Bonvolu ŝalti transirajn subskribojn en Laboratorio por modifi la staton de savkopiado.",
     "Backup key stored: ": "Savkopia ŝlosilo deponita: ",
     "Your keys are <b>not being backed up from this session</b>.": "Viaj ŝlosiloj <b>ne estas savkopiataj el ĉi tiu salutaĵo</b>.",
     "Enable desktop notifications for this session": "Ŝalti labortablajn sciigojn por ĉi tiu salutaĵo",
@@ -1965,7 +1811,7 @@
     "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Uzu kunigilon <b>(%(serverName)s)</b> por administrado de robotoj, fenestraĵoj, kaj glumarkaroj.",
     "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Uzu kunigilon por administrado de robotoj, fenestraĵoj, kaj glumarkaroj.",
     "Manage integrations": "Administri kunigojn",
-    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Kunigiloj ricevas agordajn datumojn, kaj povas modifi fenestraĵojn, sendi invitojn al ĉambroj, kaj vianome agordi nivelojn de potenco.",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Kunigiloj ricevas agordajn datumojn, kaj povas modifi fenestraĵojn, sendi invitojn al ĉambroj, kaj vianome agordi povnivelojn.",
     "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Via pasvorto sukcese ŝanĝiĝis. Vi ne ricevados pasivajn sciigojn en aliaj salutaĵoj, ĝis vi ilin resalutos",
     "Error downloading theme information.": "Eraris elŝuto de informoj pri haŭto.",
     "Theme added!": "Haŭto aldoniĝis!",
@@ -1981,7 +1827,6 @@
     "Server rules": "Servilaj reguloj",
     "User rules": "Uzantulaj reguloj",
     "You are currently ignoring:": "Vi nun malatentas:",
-    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Aldonu ĉi tien uzantojn kaj servilojn, kiujn vi volas malatenti. Uzu steleton por akordigi ĉiajn signojn. Ekzemple, <code>@bot:*</code> malatentigus ĉiujn uzantojn kun la nomo «bot» sur ĉiu servilo.",
     "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.",
     "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.",
@@ -1989,12 +1834,10 @@
     "eg: @bot:* or example.org": "ekz: @bot:* aŭ ekzemplo.org",
     "Subscribing to a ban list will cause you to join it!": "Abono de listo de forbaroj aligos vin al ĝi!",
     "If this isn't what you want, please use a different tool to ignore users.": "Se vi ne volas tion, bonvolu uzi alian ilon por malatenti uzantojn.",
-    "Room ID or alias of ban list": "Identigilo de ĉambro aŭ kromnomo de listo de forbaroj",
     "Session ID:": "Identigilo de salutaĵo:",
     "Session key:": "Ŝlosilo de salutaĵo:",
     "Message search": "Serĉado de mesaĝoj",
-    "Cross-signing": "Transiraj subskriboj",
-    "Sessions": "Salutaĵ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",
     "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>",
@@ -2003,10 +1846,6 @@
     "You have not verified this user.": "Vi ne kontrolis tiun ĉi uzanton.",
     "You have verified this user. This user has verified all of their sessions.": "Vi kontrolis tiun ĉi uzanton. Ĝi kontrolis ĉiomon da siaj salutaĵoj.",
     "Someone is using an unknown session": "Iu uzas nekonatan salutaĵon",
-    "Some sessions for this user are not trusted": "Iuj salutaĵoj de ĉi tiu uzanto ne estas fidataj",
-    "All sessions for this user are trusted": "Ĉiuj salutaĵoj de ĉi tiu uzanto estas fidataj",
-    "Some sessions in this encrypted room are not trusted": "Iuj salutaĵoj en ĉi tiu ĉifrita ĉambro ne estas fidataj",
-    "All sessions in this encrypted room are trusted": "Ĉiuj salutaĵoj en ĉi tiu ĉifrita ĉambro estas fidataj",
     "Your key share request has been sent - please check your other sessions for key share requests.": "Via peto pri havigo de ŝlosilo estas sendita – bonvolu kontroli viajn aliajn salutaĵojn je petojn pri havigo de ŝlosiloj.",
     "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.": "Petoj pri havigo de ŝlosiloj estas memage sendataj al viaj aliaj salutaĵoj. Se vi rifuzis aŭ forigis la peton pri havigo de ŝlosiloj en aliaj viaj salutaĵoj, klaku ĉi tien por ree peti ŝlosilojn por ĉi tiu salutaĵo.",
     "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Se viaj aliaj salutaĵoj ne havas la ŝlosilon por ĉi tiu mesaĝo, vi ne povos ilin malĉifri.",
@@ -2015,17 +1854,11 @@
     "Encrypted by a deleted session": "Ĉifrita de forigita salutaĵo",
     "Invite only": "Nur por invititaj",
     "Close preview": "Fermi antaŭrigardon",
-    "No sessions with registered encryption keys": "Neniuj salutaĵoj kun registritaj ĉifraj ŝlosiloj",
     "Unrecognised command: %(commandText)s": "Nerekonita komando: %(commandText)s",
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Vi povas komandi <code>/help</code> por listigi uzeblajn komandojn. Ĉu vi intencis sendi ĉi tion kiel mesaĝon?",
     "Hint: Begin your message with <code>//</code> to start it with a slash.": "Helpeto: Komencu vian mesaĝon per <code>//</code> por komenci ĝin per suprenstreko.",
     "Mark all as read": "Marki ĉion legita",
     "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Eraris ĝisdatigo de la alternativaj adresoj de la ĉambro. Eble la servilo ne permesas tion, aŭ io dumtempe ne funkcias.",
-    "You don't have permission to delete the alias.": "Vi ne havas permeson forigi la kromnomon.",
-    "Alternative addresses for this room:": "Alternativaj adresoj de ĉi tiu ĉambro:",
-    "This room has no alternative addresses": "Ĉi tiu ĉambro ne havas alternativajn adresojn",
-    "New address (e.g. #foo:domain)": "Nova adreso (ekz. #foo:domain)",
-    "Local addresses (unmoderated content)": "Lokaj adresoj (nereguligata enhavo)",
     "Waiting for %(displayName)s to accept…": "Atendante akcepton de %(displayName)s…",
     "Accepting…": "Akceptante…",
     "Messages in this room are end-to-end encrypted.": "Mesaĝoj en ĉi tiu ĉambro estas tutvoje ĉifrataj.",
@@ -2043,7 +1876,7 @@
     "%(count)s sessions|one": "%(count)s salutaĵo",
     "Hide sessions": "Kaŝi salutaĵojn",
     "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> en %(roomName)s",
-    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "La salutaĵo, kiun vi provas kontroli, ne subtenas skanadon de rapidrespondaj kodoj nek kontrolon per bildsignoj, kiujn subtenas Riot. Provu per alia kliento.",
+    "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.": "La salutaĵo, kiun vi provas kontroli, ne subtenas skanadon de rapidrespondaj kodoj nek kontrolon per bildsignoj, kiujn subtenas %(brand)s. Provu per alia kliento.",
     "Verify by scanning": "Kontroli per skanado",
     "Ask %(displayName)s to scan your code:": "Petu de %(displayName)s skani vian kodon:",
     "Verify by emoji": "Kontroli per bildsignoj",
@@ -2051,11 +1884,8 @@
     "Verify by comparing unique emoji.": "Kontrolu per komparo de unikaj bildsignoj.",
     "You've successfully verified %(displayName)s!": "Vi sukcese kontrolis uzanton %(displayName)s!",
     "Got it": "Komprenite",
-    "Verification timed out. Start verification again from their profile.": "Kontrolo atingis tempolimon. Rekomencu la kontrolon de ĝia profilo.",
-    "%(displayName)s cancelled verification. Start verification again from their profile.": "%(displayName)s nuligis la kontrolon. Rekomencu ĝin de ĝia profilo.",
-    "You cancelled verification. Start verification again from their profile.": "Vi nuligis la kontrolon. Rekomencu ĝin de ĝia profilo.",
     "Encryption enabled": "Ĉifrado estas ŝaltita",
-    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Mesaĝojn en ĉi tiu ĉambro estas tutvoje ĉifrataj. Eksciu plion kaj kontrolu ĉi tiun uzanton el ĝia profilo.",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Mesaĝoj en ĉi tiu ĉambro estas tutvoje ĉifrataj. Eksciu plion kaj kontrolu ĉi tiun uzanton per ĝia profilo.",
     "Encryption not enabled": "Ĉifrado ne estas ŝaltita",
     "The encryption used by this room isn't supported.": "La ĉifro uzata de ĉi tiu ĉambro ne estas subtenata.",
     "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Vi malatentis ĉi tiun uzanton, ĝia mesaĝo estas do kaŝita. <a>Tamen montri.</a>",
@@ -2068,23 +1898,20 @@
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Uzo de tiu ĉi fenestraĵo eble havigos datumojn <helpIcon /> kun %(widgetDomain)s kaj via kunigilo.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Uzo de tiu ĉi fenestraĵo eble havigos datumojn <helpIcon /> kun %(widgetDomain)s.",
     "Language Dropdown": "Lingva falmenuo",
-    "Destroy cross-signing keys?": "Ĉu detrui transire ĉifrajn ŝlosilojn?",
-    "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.": "Forigo de transire ĉifraj ŝlosiloj estas porĉiama. Ĉiu, kun kiu vi interkontrolis, vidos avertojn pri sekureco. Vi preskaŭ certe ne volas ĉi tion fari, malse vi perdis ĉiun aparaton, el kiu vi povus transire subskribadi.",
-    "Clear cross-signing keys": "Vakigi transire ĉifrajn ŝlosilojn",
+    "Destroy cross-signing keys?": "Ĉu detrui delege ĉifrajn ŝlosilojn?",
+    "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.": "Forigo de delege ĉifraj ŝlosiloj estas porĉiama. Ĉiu, kun kiu vi interkontrolis, vidos avertojn pri sekureco. Vi preskaŭ certe ne volas ĉi tion fari, malse vi perdis ĉiun aparaton, el kiu vi povus delege subskribadi.",
+    "Clear cross-signing keys": "Vakigi delege ĉifrajn ŝlosilojn",
     "Clear all data in this session?": "Ĉu vakigi ĉiujn datumojn en ĉi tiu salutaĵo?",
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Vakigo de ĉiuj datumoj el ĉi tiu salutaĵo estas porĉiama. Ĉifritaj mesaĝoj perdiĝos, malse iliaj ŝlosiloj savkopiiĝis.",
     "Verify session": "Kontroli salutaĵon",
-    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Por kontroli, ke ĉi tiu salutaĵo estas fidinda, bonvolu kontroli, ke la ŝlosilo, kiun vi vidas en Agordoj de uzanto en tiu aparato, akordas kun la suba:",
-    "To verify that this session can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this session matches the key below:": "Por kontroli, ke ĉi tiu salutaĵo estas fidinda, bonvolu kontakti ĝian posedanton alimaniere (ekz. persone aŭ telefone), kaj demandu al ĝi, ĉu la ŝlosilo, kiun ĝi vidas en siaj Agordoj de uzanto por ĉi tiu salutaĵo akordas kun la suba:",
     "Session name": "Nomo de salutaĵo",
     "Session key": "Ŝlosilo de salutaĵo",
-    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "Se ĝi akordas, premu la kontrolan butonon sube. Se ne, iu alia spionas la salutaĵon kaj vi probable volos premi la forlistigan butonon anstataŭe.",
     "Verification Requests": "Petoj de kontrolo",
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Kontrolo de tiu ĉi uzanto markos ĝian salutaĵon fidata, kaj ankaŭ markos vian salutaĵon fidata por ĝi.",
     "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.": "Kontrolu ĉi tiun aparaton por marki ĝin fidata. Fidado povas pacigi la menson de vi kaj aliaj uzantoj dum uzado de tutvoje ĉifrataj mesaĝoj.",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Kontrolo de ĉi tiu aparato markos ĝin fidata, kaj ankaŭ la uzantoj, kiuj interkontrolis kun vi, fidos ĉi tiun aparaton.",
     "Enable 'Manage Integrations' in Settings to do this.": "Ŝaltu «Administri kunigojn» en Agordoj, por fari ĉi tion.",
-    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Via Rioto ne permesas al vi uzi kunigilon por tio. Bonvolu kontakti administranton.",
+    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Via %(brand)so ne permesas al vi uzi kunigilon por tio. Bonvolu kontakti administranton.",
     "Failed to invite the following users to chat: %(csvUsers)s": "Malsukcesis inviti la jenajn uzantojn al babilo: %(csvUsers)s",
     "We couldn't create your DM. Please check the users you want to invite and try again.": "Ni ne povis krei vian rektan ĉambron. Bonvolu kontroli, kiujn uzantojn vi invitas, kaj reprovu.",
     "Something went wrong trying to invite the users.": "Io eraris dum invito de la uzantoj.",
@@ -2093,12 +1920,7 @@
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "La jenaj uzantoj eble ne ekzistas aŭ ne validas, kaj ne povas invitiĝi: %(csvNames)s",
     "Recent Conversations": "Freŝaj interparoloj",
     "Recently Direct Messaged": "Freŝaj rektaj ĉambroj",
-    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Se vi ne povas iun trovi, petu ĝian uzantonomon, kaj havigu al ĝi vian uzantonomon (%(userId)s) aŭ <a>ligilon al profilo</a>.",
     "Go": "Iri",
-    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Se vi ne povas iun trovi, petu ĝian uzantonomon (ekz. @uzanto:servilo.net), aŭ prezentu al ĝi <a>tiun ĉi ĉambron</a>.",
-    "You added a new session '%(displayName)s', which is requesting encryption keys.": "Vi aldonis novas salutaĵon «%(displayName)s», kiu petas ĉifrajn ŝlosilojn.",
-    "Your unverified session '%(displayName)s' is requesting encryption keys.": "Via nekontrolita salutaĵo «%(displayName)s» petas ĉifrajn ŝlosilojn.",
-    "Loading session info...": "Enlegante informojn pri salutaĵo…",
     "Your account is not secure": "Via konto ne estas sekura",
     "Your password": "Via pasvorto",
     "This session, or the other session": "Ĉi tiu salutaĵo, aŭ la alia salutaĵo",
@@ -2109,27 +1931,12 @@
     "If you didn’t sign in to this session, your account may be compromised.": "Se vi ne salutis ĉi tiun salutaĵon, via konto eble estas malkonfidencigita.",
     "This wasn't me": "Tio ne estis mi",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Gradaltigo de ĉambro estas altnivela ago kaj estas kutime rekomendata kiam ĉambro estas malstabila pro eraroj, mankantaj funkcioj, aŭ malsekuraĵoj.",
-    "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Ĉi tio kutime influas nur traktadon de la ĉambro de la servilo. Se vi spertas problemojn pri Riot, bonvolu <a>raporti problemon</a>.",
+    "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>.": "Ĉi tio kutime influas nur traktadon de la ĉambro de la servilo. Se vi spertas problemojn pri %(brand)s, bonvolu <a>raporti problemon</a>.",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Vi gradaltigos ĉi tiun ĉambron de <oldVersion /> al <newVersion />.",
     "This will allow you to return to your account after signing out, and sign in on other sessions.": "Ĉi tio ebligos saluti aliajn salutaĵojn, kaj reveni al via konto post adiaŭo.",
-    "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "Vi nun forlistigas nekontrolitajn salutaĵojn; por sendi mesaĝojn al tiuj salutaĵoj, vi devas ilin kontroli.",
-    "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Ni rekomendas, ke vi trairu la kontrolon de ĉiu salutaĵo por konfirmi, ke ili apartenas al siaj ĝustaj posedantoj, sed laŭplaĉe vi povas ankaŭ sendi la mesaĝon sen kontrolo.",
-    "Room contains unknown sessions": "Ĉambro enhavas nekonatajn salutaĵojn",
-    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "«%(RoomName)s» enhavas salutaĵojn, kiujn vi ne vidis antaŭe.",
-    "Unknown sessions": "Nekonataj salutaĵoj",
     "Verification Request": "Kontrolpeto",
-    "Enter secret storage passphrase": "Enigu pasfrazon de sekreta deponejo",
-    "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Ne povis atingi sekretan deponejon. Bonvolu kontroli, ke vi enigis la ĝustan pasfrazon.",
-    "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Averto</b>: vi aliru sekretan deponejon nur de fidata komputilo.",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "Aliru viajn sekuran historion de mesaĝoj kaj identecon de transiraj subskriboj por kontrolo de aliaj salutaĵoj per enigo de via pasfrazo.",
-    "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Se vi forgesis vian pasfrazon, vi povas <button1>uzi vian rehavan ŝlosilon</button1> aŭ <button2>reagordi rehavon</button2>.",
-    "Enter secret storage recovery key": "Enigu rehavan ŝlosilon de la sekreta deponejo",
-    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Ne povas atingi sekretan deponejon. Bonvolu kontroli, ke vi enigis la ĝustan rehavan ŝlosilon.",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Aliru vian sekuran historion de mesaĝoj kaj vian identecon de transiraj subskriboj por kontrolo de aliaj salutaĵoj per enigo de via rehava ŝlosilo.",
-    "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>.",
     "Recovery key mismatch": "Malakordo de rehavaj ŝlosiloj",
     "Incorrect recovery passphrase": "Malĝusta rehava pasfrazo",
-    "Backup restored": "Savkopio rehavita",
     "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.",
@@ -2141,7 +1948,6 @@
     "Country Dropdown": "Landa falmenuo",
     "Confirm your identity by entering your account password below.": "Konfirmu vian identecon per enigo de la pasvorto de via konto sube.",
     "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Mankas publika ŝlosilo por testo de homeco en hejmservila agordaro. Bonvolu raporti tion al la administranto de via hejmservilo.",
-    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Via nova salutaĵo nun estas kontrolita. Ĝi povas atingi viajn ĉifritajn mesaĝojn, kaj aliaj uzantoj vidos ĝin fidata.",
     "Your new session is now verified. Other users will see it as trusted.": "Via nova salutaĵo nun estas kontrolita. Aliaj uzantoj vidos ĝin fidata.",
     "Without completing security on this session, it won’t have access to encrypted messages.": "Sen plenigo de sekureco en ĉi tiu salutaĵo, ĝi ne povos atingi ĉifritajn mesaĝojn.",
@@ -2149,25 +1955,17 @@
     "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.": "Vi adiaŭis ĉiujn viajn salutaĵojn kaj ne plu ricevados pasivajn sciigojn. Por reŝalti sciigojn, vi resalutu per ĉiu el viaj aparatoj.",
     "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.": "Reprenu aliron al via konto kaj rehavu ĉifrajn ŝlosilojn deponitajn en ĉi tiu salutaĵo. Sen ili, vi ne povos legi ĉiujn viajn sekurajn mesaĝojn en iu ajn salutaĵo.",
     "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.": "Viaj personaj datumoj (inkluzive ĉifrajn ŝlosilojn) estas ankorŭ deponitaj en ĉi tiu salutaĵo. Vakigu ĝin, se vi ne plu uzos ĉi tiun salutaĵon, aŭ volas saluti alian konton.",
-    "Sender session information": "Informoj pri salutaĵo de sendinto",
     "Enter your account password to confirm the upgrade:": "Enigu pasvorton de via konto por konfirmi la gradaltigon:",
     "Restore your key backup to upgrade your encryption": "Rehavu vian savkopion de ŝlosiloj por gradaltigi vian ĉifradon",
     "Restore": "Rehavi",
     "You'll need to authenticate with the server to confirm the upgrade.": "Vi devos aŭtentikigi kun la servilo por konfirmi la gradaltigon.",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Gradaltigu ĉi tiun salutaĵon por ebligi al ĝi kontroladon de aliaj salutaĵoj, donante al ili aliron al ĉifritaj mesaĵoj, kaj markante ilin fidataj por aliaj uzantoj.",
-    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Starigu ĉifradon en ĉi tiu salutaĵo por ebligi al ĝi kontroladon de aliaj salutaĵoj, donante al ili aliron al ĉifritaj mesaĵoj, kaj markante ilin fidataj por aliaj uzantoj.",
-    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Sekurigu viajn ĉifrajn ŝlosilojn per pasfrazo. Por plejgranda sekureco, ĝi malsamu la pasvorton de via konto:",
-    "Enter a passphrase": "Enigu pasfrazon",
-    "Back up my encryption keys, securing them with the same passphrase": "Savkopiu miajn ĉifrajn ŝlosilojn, sekurigante ilin per la sama pasfrazo",
     "Set up with a recovery key": "Starigi kun rehava ŝlosilo",
-    "Enter your passphrase a second time to confirm it.": "Enigu vian pasfrazon duan fojon por konfirmi ĝin.",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Tenu ĝian kopion en sekura loko, ekzemple mastrumilo de pasvortoj, aŭ eĉ sekurkesto.",
     "Your recovery key": "Via rehava ŝlosilo",
     "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Via rehava ŝlosilo estis <b>kopiita al via tondujo</b>, algluu ĝin al:",
     "Your recovery key is in your <b>Downloads</b> folder.": "Via rehava ŝlosilo estas en via dosierujo kun <b>Elŝutoj</b>.",
-    "You can now verify your other devices, and other users to keep your chats safe.": "Vi nun povas kontroli aliajn viajn aparatojn, kaj aliajn uzantojn, por teni viajn babilojn sekurajn.",
     "Make a copy of your recovery key": "Fari kopionde via rehava ŝlosilo",
-    "You're done!": "Vi finis!",
     "Unable to set up secret storage": "Ne povas starigi sekretan deponejon",
     "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.": "Sen Sekura rehavo de mesaĝoj, vi ne povos rehavi vian historion de ĉifritaj mesaĝoj se vi adiaŭos aŭ uzos alian salutaĵon.",
     "Create key backup": "Krei savkopion de ŝlosiloj",
@@ -2177,8 +1975,7 @@
     "If disabled, messages from encrypted rooms won't appear in search results.": "Post malŝalto, mesaĝoj el ĉifritaj ĉambroj ne aperos en serĉorezultoj.",
     "Disable": "Malŝalti",
     "Not currently indexing messages for any room.": "Mesaĝoj estas indeksataj en neniu ĉambro.",
-    "Currently indexing: %(currentRoom)s.": "Nun indeksante: %(currentRoom)s.",
-    "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot sekure loke kaŝmemoras ĉifritajn mesaĝojn por aperigi ilin en serĉorezultoj:",
+    "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s sekure loke kaŝmemoras ĉifritajn mesaĝojn por aperigi ilin en serĉorezultoj:",
     "Space used:": "Spaco uzita:",
     "Indexed messages:": "Indeksitaj masaĝoj:",
     "Indexed rooms:": "Indeksitaj ĉambroj:",
@@ -2208,28 +2005,21 @@
     "Add a new server...": "Aldoni novan servilon…",
     "%(networkName)s rooms": "Ĉambroj de %(networkName)s",
     "Matrix rooms": "Ĉambroj de Matrix",
-    "Open an existing session & use it to verify this one, granting it access to encrypted messages.": "Malfermi jaman salutaĵon kaj kontroli ĉi tiun per ĝi, permesante al ĝi aliron al ĉifritaj mesaĝoj.",
-    "Waiting…": "Atendante…",
-    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "Se vi ne povas iun atingi, <button>uzu vian rehavan ŝlosilon aŭ pasfrazon.</button>",
     "Manually Verify by Text": "Permane kontroli tekste",
     "Interactively verify by Emoji": "Interage kontroli bildosigne",
     "Self signing private key:": "Memsubskriba privata ŝlosilo:",
     "cached locally": "kaŝmemorita loke",
     "not found locally": "ne trovita loke",
     "User signing private key:": "Uzantosubskriba privata ŝlosilo:",
-    "Secret Storage key format:": "Ŝlosila formo de sekreta deponejo:",
-    "outdated": "eksdata",
-    "up to date": "ĝisdata",
     "Keyboard Shortcuts": "Klavkombinoj",
     "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Komencu interparolon kun iu per ĝia nomo, uzantonomo (kiel <userId/>), aŭ retpoŝtadreso.",
     "a new master key signature": "nova ĉefŝlosila subskribo",
-    "a new cross-signing key signature": "nova transire subskriba ŝlosila subskribo",
-    "a device cross-signing signature": "aparata transire subskriba ŝlosila subskribo",
+    "a new cross-signing key signature": "nova subskribo de delega ŝlosilo",
+    "a device cross-signing signature": "delega subskribo de aparato",
     "a key signature": "ŝlosila subskribo",
-    "Riot encountered an error during upload of:": "Riot eraris dum alŝuto de:",
+    "%(brand)s encountered an error during upload of:": "%(brand)s eraris dum alŝuto de:",
     "Upload completed": "Alŝuto finiĝis",
     "Cancelled signature upload": "Alŝuto de subskribo nuliĝis",
-    "Unabled to upload": "Ne povas alŝuti",
     "Signature upload success": "Alŝuto de subskribo sukcesis",
     "Signature upload failed": "Alŝuto de subskribo malsukcesis",
     "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:",
@@ -2275,13 +2065,10 @@
     "Enter": "Eniga klavo",
     "Space": "Spaco",
     "End": "Finen-klavo",
-    "Whether you're using Riot as an installed Progressive Web App": "Ĉu vi uzas Rioton kiel Progresan retan aplikaĵon",
-    "Review Sessions": "Rekontroli salutaĵojn",
-    "Unverified login. Was this you?": "Nekontrolita salutaĵo. Ĉu tio estis vi?",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Ĉu vi uzas %(brand)son kiel Progresan retan aplikaĵon",
     "Manually verify all remote sessions": "Permane kontroli ĉiujn forajn salutaĵojn",
-    "Update your secure storage": "Ĝisdatigi vian sekuran deponejon",
     "Session backup key:": "Savkopia ŝlosilo de salutaĵo:",
-    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Unuope kontroli ĉiun salutaĵon de uzanto por marki ĝin fidata, ne fidante transire subskribitajn aparatojn.",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Unuope kontroli ĉiun salutaĵon de uzanto por marki ĝin fidata, ne fidante delege subskribitajn aparatojn.",
     "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.",
@@ -2294,5 +2081,311 @@
     "Confirm adding this email address by using Single Sign On to prove your identity.": "Konfirmi aldonon de ĉi tiu retpoŝtadreso, uzante ununuran saluton por pruvi vian identecon.",
     "Single Sign On": "Ununura saluto",
     "Confirm adding email": "Konfirmi aldonon de retpoŝtadreso",
-    "Click the button below to confirm adding this email address.": "Klaku la ĉi-suban butonon por konfirmi aldonon de ĉi tiu retpoŝtadreso."
+    "Click the button below to confirm adding this email address.": "Klaku la ĉi-suban butonon por konfirmi aldonon de ĉi tiu retpoŝtadreso.",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Konfirmu aldonon de ĉi tiu telefonnumero per identiĝo per ununura saluto.",
+    "Confirm adding phone number": "Konfirmu aldonon de telefonnumero",
+    "Click the button below to confirm adding this phone number.": "Klaku la ĉi-suban butonon por konfirmi aldonon de ĉi tiu telefonnumero.",
+    "If you cancel now, you won't complete your operation.": "Se vi nuligos nun, vi ne finos vian agon.",
+    "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",
+    "Failed to set topic": "Malsukcesis agordi temon",
+    "Command failed": "Komando malsukcesis",
+    "Could not find user in room": "Ne povis trovi uzanton en ĉambro",
+    "Please supply a widget URL or embed code": "Bonvolu provizi URL-on al fenestraĵo aŭ enkorpigi kodon",
+    "Send a bug report with logs": "Sendi erarraporton kun protokolo",
+    "You signed in to a new session without verifying it:": "Vi salutis novan salutaĵon sen kontrolo:",
+    "Verify your other session using one of the options below.": "Kontrolu vian alian salutaĵon per unu el la ĉi-subaj elektebloj.",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Konfirmu, ke la ĉi-subaj bildsignoj aperas samorde en ambaŭ salutaĵoj:",
+    "Verify this session by confirming the following number appears on its screen.": "Kontrolu ĉi tiun salutaĵon per konfirmo, ke la jena nombro aperas sur ĝia ekrano.",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Atendante konfirmon de via alia salutaĵo, %(deviceName)s (%(deviceId)s)…",
+    "Verify all your sessions to ensure your account & messages are safe": "Kontrolu ĉiujn viajn salutaĵojn por certigi, ke viaj konto kaj mesaĝoj sekuras",
+    "Verify the new login accessing your account: %(name)s": "Kontrolu la novan saluton alirantan vian konton: %(name)s",
+    "From %(deviceName)s (%(deviceId)s)": "De %(deviceName)s (%(deviceId)s)",
+    "well formed": "bone formita",
+    "unexpected type": "neatendita tipo",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Konfirmu forigon de ĉi tiuj salutaĵoj per identiĝo per ununura saluto.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Konfirmu forigon de ĉi tiu salutaĵo per identiĝo per ununura saluto.",
+    "Confirm deleting these sessions": "Konfirmi forigon de ĉi tiuj salutaĵoj",
+    "Click the button below to confirm deleting these sessions.|other": "Klaku la ĉi-suban butonon por konfirmi forigon de ĉi tiuj salutaĵoj.",
+    "Click the button below to confirm deleting these sessions.|one": "Klaku la ĉi-suban butonon por konfirmi forigon de ĉi tiu salutaĵo.",
+    "Delete sessions|other": "Forigi salutaĵojn",
+    "Delete sessions|one": "Forigi salutaĵon",
+    "Where you’re logged in": "Kie vi salutis",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Sube administru la nomojn de viaj salutaĵoj kaj ilin adiaŭu, aŭ <a>kontrolu ilin en via profilo de uzanto</a>.",
+    "Waiting for you to accept on your other session…": "Atendante vian akcepton en via alia salutaĵo…",
+    "Almost there! Is your other session showing the same shield?": "Preskaŭ finite! Ĉu via alia salutaĵo montras la saman ŝildon?",
+    "Almost there! Is %(displayName)s showing the same shield?": "Preskaŭ finite! Ĉu %(displayName)s montras la saman ŝildon?",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Vi sukcese kontrolis %(deviceName)s (%(deviceId)s)!",
+    "Start verification again from the notification.": "Rekomencu kontroladon el la sciigo.",
+    "Start verification again from their profile.": "Rekomencu kontroladon el ĝia profilo.",
+    "Verification timed out.": "Kontrolo atingis tempolimon.",
+    "You cancelled verification on your other session.": "Vi nuligis kontrolon en via alia salutaĵo.",
+    "%(displayName)s cancelled verification.": "%(displayName)s nuligis kontrolon.",
+    "You cancelled verification.": "Vi nuligis kontrolon.",
+    "Can't load this message": "Ne povas enlegi ĉi tiun mesaĝon",
+    "Submit logs": "Alŝuti protokolon",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Rememorigo: via foliumilo ne estas subtenata, kaj via sperto do povas esti stranga.",
+    "Enable end-to-end encryption": "Ŝalti tutvojan ĉifradon",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "Vi ne povas ĉi tion malŝalti poste. Pontoj kaj plej multaj robotoj ankoraŭ ne funkcios.",
+    "Server did not require any authentication": "Servilo bezonis nenian kontrolon de aŭtentiko",
+    "Server did not return valid authentication information.": "Servilo ne redonis validajn informojn pri kontrolo de aŭtentiko.",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "Knfirmu malaktivigon de via konto per identiĝo per ununura saluto.",
+    "Are you sure you want to deactivate your account? This is irreversible.": "Ĉu vi certe volas malaktivigi vian konton? Tio ne malfareblas.",
+    "Confirm account deactivation": "Konfirmi malaktivigon de konto",
+    "There was a problem communicating with the server. Please try again.": "Eraris komunikado kun la servilo. Bonvolu reprovi.",
+    "Unable to upload": "Ne povas alŝuti",
+    "Verify other session": "Kontroli alian salutaĵon",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Ne povas aliri sekretan deponejon. Bonvolu kontroli, ke vi enigis la ĝustan rehavan pasfrazon.",
+    "Restoring keys from backup": "Rehavo de ŝlosiloj el savkopio",
+    "Fetching keys from server...": "Akirante ŝlosilojn el servilo…",
+    "%(completed)s of %(total)s keys restored": "%(completed)s el %(total)s ŝlosiloj rehaviĝis",
+    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Savkopio ne estis malĉifrebla per ĉi tiu rehava ŝlosilo: bonvolu kontroli, ke vi enigis la ĝustan rehavan ŝlosilon.",
+    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Savkopio ne estis malĉifrebla per ĉi tiu rehava pasfrazo: bonvolu kontroli, ke vi enigis la ĝustan rehavan pasfrazon.",
+    "Keys restored": "Ŝlosiloj rehaviĝis",
+    "Successfully restored %(sessionCount)s keys": "Sukcese rehavis %(sessionCount)s ŝlosilojn",
+    "Sign in with SSO": "Saluti per ununura saluto",
+    "Welcome to %(appName)s": "Bonvenu al %(appName)s",
+    "Liberate your communication": "Liberigu vian komunikadon",
+    "Send a Direct Message": "Sendi rektan mesaĝon",
+    "Explore Public Rooms": "Esplori publikajn ĉambrojn",
+    "Create a Group Chat": "Krei grupan babilon",
+    "Self-verification request": "Memkontrola peto",
+    "Verify this login": "Kontroli ĉi tiun saluton",
+    "Syncing...": "Spegulante…",
+    "Signing In...": "Salutante…",
+    "If you've joined lots of rooms, this might take a while": "Se vi aliĝis al multaj ĉambroj, tio povas daŭri longe",
+    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Konfirmu vian identecon per kontrolo de ĉi tiu saluto el unu el viaj aliaj salutaĵoj, permesante al ĝi legadon de ĉifritaj mesaĝoj.",
+    "This requires the latest %(brand)s on your other devices:": "Ĉi tio bezonas la plej freŝan version de %(brand)s en viaj aliaj aparatoj:",
+    "or another cross-signing capable Matrix client": "aŭ alian Matrix-klienton kapablan je delegaj subskriboj",
+    "Great! This recovery passphrase looks strong enough.": "Bonege! Ĉi tiu rehava pasfrazo ŝajnas sufiĉe forta.",
+    "Enter a recovery passphrase": "Enigu rehavan pasfrazon",
+    "Enter your recovery passphrase a second time to confirm it.": "Enigu vian rehavan pasfrazon duafoje por konfirmi ĝin.",
+    "Confirm your recovery passphrase": "Konfirmi vian rehavan pasfrazon",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Via rehava ŝlosilo asekuras vin – vi povas ĝin uzi por rehavi aliron al viaj ĉifritaj mesaĝoj se vi forgesas vian rehavan pasfrazon.",
+    "Unable to query secret storage status": "Ne povis peti staton de sekreta deponejo",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Ni deponos ĉifritan kopion de viaj ŝlosiloj en nia servilo. Sekurigu vian savkopion per rehava pasfrazo.",
+    "Please enter your recovery passphrase a second time to confirm.": "Bonvolu enigi vian rehavan pasfrazon duafoje por konfirmi.",
+    "Repeat your recovery passphrase...": "Ripetu vian rehavan pasfrazon…",
+    "Secure your backup with a recovery passphrase": "Sekurigu vian savkopion per rehava pasfrazo",
+    "Currently indexing: %(currentRoom)s": "Nun indeksante: %(currentRoom)s",
+    "Cancel replying to a message": "Nuligi respondon al mesaĝo",
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Invitu iun per ĝia nomo, uzantonomo (kiel <userId/>), retpoŝtadreso, aŭ <a>kunhavigu la ĉambron</a>.",
+    "Message deleted": "Mesaĝo foriĝis",
+    "Message deleted by %(name)s": "Mesaĝon forigis %(name)s",
+    "Opens chat with the given user": "Malfermas babilon kun la uzanto",
+    "Sends a message to the given user": "Sendas mesaĝon al la uzanto",
+    "Waiting for your other session to verify…": "Atendante kontrolon de via alia salutaĵo…",
+    "You've successfully verified your device!": "Vi sukcese kontrolis vian aparaton!",
+    "To continue, use Single Sign On to prove your identity.": "Por daŭrigi, pruvu vian identecon per ununura saluto.",
+    "Confirm to continue": "Konfirmu por daŭrigi",
+    "Click the button below to confirm your identity.": "Klaku sube la butonon por konfirmi vian identecon.",
+    "Confirm encryption setup": "Konfirmi agordon de ĉifrado",
+    "Click the button below to confirm setting up encryption.": "Klaku sube la butonon por konfirmi agordon de ĉifrado.",
+    "QR Code": "Rapidresponda kodo",
+    "Dismiss read marker and jump to bottom": "Forigi legomarkon kaj iri al fundo",
+    "Jump to oldest unread message": "Iri al plej malnova nelegita mesaĝo",
+    "Upload a file": "Alŝuti dosieron",
+    "Create room": "Krei ĉambron",
+    "IRC display name width": "Larĝo de vidiga nomo de IRC",
+    "Font scaling": "Skalado de tiparoj",
+    "Font size": "Grando de tiparo",
+    "Size must be a number": "Grando devas esti nombro",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "Propra grando de tiparo povas interi nur %(min)s punktojn kaj %(max)s punktojn",
+    "Use between %(min)s pt and %(max)s pt": "Uzi inter %(min)s punktoj kaj %(max)s punktoj",
+    "Appearance": "Aspekto",
+    "Room name or address": "Nomo aŭ adreso de ĉambro",
+    "Joins room with given address": "Aligas al ĉambro kun donita adreso",
+    "Unrecognised room address:": "Nerekonita adreso de ĉambro:",
+    "Please verify the room ID or address and try again.": "Bonvolu kontroli identigilon aŭ adreson de la ĉambro kaj reprovi.",
+    "Room ID or address of ban list": "Ĉambra identigilo aŭ adreso de listo de forbaroj",
+    "To link to this room, please add an address.": "Por ligi al ĉi tiu ĉambro, bonvolu aldoni adreson.",
+    "Error creating address": "Eraris kreado de adreso",
+    "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "Eraris kreado de tiu adreso. Eble ĝi ne estas permesata de la servilo, aŭ okazis portempa fiasko.",
+    "You don't have permission to delete the address.": "Vi ne rajtas forigi la adreson.",
+    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Eraris forigo de la adreso. Eble ĝi ne plu ekzistas, aŭ okazis portempa eraro.",
+    "Error removing address": "Eraris forigo de adreso",
+    "Categories": "Kategorioj",
+    "Room address": "Adreso de ĉambro",
+    "Please provide a room address": "Bonvolu doni adreson de ĉambro",
+    "This address is available to use": "Ĉi tiu adreso estas uzebla",
+    "This address is already in use": "Ĉi tiu adreso jam estas uzata",
+    "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 address.": "forigi la adreson.",
+    "Use a different passphrase?": "Ĉu uzi alian pasfrazon?",
+    "Help us improve %(brand)s": "Helpu al ni plibonigi %(brand)son",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Sendi <UsageDataLink>sennomajn datumojn pri uzado</UsageDataLink>, kiuj helpos al ni plibonigi %(brand)son. Ĉi tio uzos <PolicyLink>kuketon</PolicyLink>.",
+    "I want to help": "Mi volas helpi",
+    "Your homeserver has exceeded its user limit.": "Via hejmservilo atingis sian limon de uzantoj.",
+    "Your homeserver has exceeded one of its resource limits.": "Via hejmservilo atingis iun limon de rimedoj.",
+    "Contact your <a>server admin</a>.": "Kontaktu <a>administranton de via servilo</a>.",
+    "Ok": "Bone",
+    "Set password": "Agordi pasvorton",
+    "To return to your account in future you need to set a password": "Por reveni ose al via konto, vi devas agordi pasvorton",
+    "Restart": "Restartigi",
+    "Upgrade your %(brand)s": "Gradaltigi vian %(brand)son",
+    "A new version of %(brand)s is available!": "Nova versio de %(brand)s estas disponebla!",
+    "New version available. <a>Update now.</a>": "Nova versio estas disponebla. <a>Ĝisdatigu nun.</a>",
+    "Emoji picker": "Elektilo de bildsignoj",
+    "Use your account to sign in to the latest version": "Uzu vian konton por saluti la plej freŝan version",
+    "We’re excited to announce Riot is now Element": "Ni ekscite anoncas, ke Riot nun estas Elemento",
+    "Riot is now Element!": "Riot nun estas Elemento!",
+    "Learn More": "Eksciu plion",
+    "Light": "Hela",
+    "Dark": "Malhela",
+    "You joined the call": "Vi aliĝis al la voko",
+    "%(senderName)s joined the call": "%(senderName)s aliĝis al la voko",
+    "Call in progress": "Voko okazas",
+    "You left the call": "Vi foriris de la voko",
+    "%(senderName)s left the call": "%(senderName)s foriris de la voko",
+    "Call ended": "Voko finiĝis",
+    "You started a call": "Vi komencis vokon",
+    "%(senderName)s started a call": "%(senderName)s komencis vokon",
+    "Waiting for answer": "Atendante respondon",
+    "%(senderName)s is calling": "%(senderName)s vokas",
+    "You created the room": "Vi kreis la ĉambron",
+    "%(senderName)s created the room": "%(senderName)s kreis la ĉambron",
+    "You made the chat encrypted": "Vi ekĉifris la babilon",
+    "%(senderName)s made the chat encrypted": "%(senderName)s ekĉifris la babilon",
+    "You made history visible to new members": "Vi videbligis la historion al novaj anoj",
+    "%(senderName)s made history visible to new members": "%(senderName)s videbligis la historion al novaj anoj",
+    "You made history visible to anyone": "Vi videbligis la historion al ĉiu ajn",
+    "%(senderName)s made history visible to anyone": "%(senderName)s videbligis la historion al ĉiu ajn",
+    "You made history visible to future members": "Vi videbligis la historion al osaj anoj",
+    "%(senderName)s made history visible to future members": "%(senderName)s videbligis la historion al osaj anoj",
+    "You were invited": "Vi estis invitita",
+    "%(targetName)s was invited": "%(senderName)s estis invitita",
+    "You left": "Vi foriris",
+    "%(targetName)s left": "%(senderName)s foriris",
+    "You were kicked (%(reason)s)": "Vi estis forpelita (%(reason)s)",
+    "%(targetName)s was kicked (%(reason)s)": "%(targetName)s estis forpelita (%(reason)s)",
+    "You were kicked": "Vi estis forpelita",
+    "%(targetName)s was kicked": "%(targetName)s estis forpelita",
+    "You rejected the invite": "Vi rifuzis la inviton",
+    "%(targetName)s rejected the invite": "%(targetName)s rifuzis la inviton",
+    "You were uninvited": "Vi estis malinvitita",
+    "%(targetName)s was uninvited": "%(targetName)s estis malinvitita",
+    "You were banned (%(reason)s)": "Vi estis forbarita (%(reason)s)",
+    "%(targetName)s was banned (%(reason)s)": "%(targetName)s estis forbarita (%(reason)s)",
+    "You were banned": "Vi estis forbarita",
+    "%(targetName)s was banned": "%(targetName)s estis forbarita",
+    "You joined": "Vi aliĝis",
+    "%(targetName)s joined": "%(targetName)s aliĝis",
+    "You changed your name": "Vi ŝanĝis vian nomon",
+    "%(targetName)s changed their name": "%(targetName)s ŝanĝis sian nomon",
+    "You changed your avatar": "Vi ŝanĝis vian profilbildon",
+    "%(targetName)s changed their avatar": "%(targetName)s ŝanĝis sian profilbildon",
+    "%(senderName)s %(emote)s": "%(senderName)s %(emote)s",
+    "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
+    "You changed the room name": "Vi ŝanĝis la nomon de la ĉambro",
+    "%(senderName)s changed the room name": "%(senderName)s ŝanĝis la nomon de la ĉambro",
+    "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
+    "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
+    "You uninvited %(targetName)s": "Vi malinvitis uzanton %(targetName)s",
+    "%(senderName)s uninvited %(targetName)s": "%(senderName)s malinvitis uzanton %(targetName)s",
+    "You invited %(targetName)s": "Vi invitis uzanton %(targetName)s",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s invitis uzanton %(targetName)s",
+    "You changed the room topic": "Vi ŝanĝis la temon de la ĉambro",
+    "%(senderName)s changed the room topic": "%(senderName)s ŝanĝis la temon de la ĉambro",
+    "Use the improved room list (will refresh to apply changes)": "Uzi la plibonigitan ĉambrobreton (aktualigos la paĝon por apliki la ŝanĝojn)",
+    "Use custom size": "Uzi propran grandon",
+    "Use a more compact ‘Modern’ layout": "Uzi pli densan »Modernan« aranĝon",
+    "Use a system font": "Uzi sisteman tiparon",
+    "System font name": "Nomo de sistema tiparo",
+    "Enable experimental, compact IRC style layout": "Ŝalti eksperimentan, densan IRC-ecan aranĝon",
+    "Unknown caller": "Nekonata vokanto",
+    "Incoming voice call": "Envena voĉvoko",
+    "Incoming video call": "Envena vidvoko",
+    "Incoming call": "Envena voko",
+    "%(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 povas sekure kaŝkopii ĉifritajn mesaĝojn loke, funkciante per foliumilo. Uzu <desktopLink>%(brand)s Desktop</desktopLink> por aperigi ĉifritajn mesaĝojn en serĉrezultoj.",
+    "There are advanced notifications which are not shown here.": "Ekzistas specialaj sciigoj, kiuj ne estas montrataj ĉi tie.",
+    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Vi eble agordis ilin en kliento alia ol %(brand)s. Vi ne povas agordi ilin en %(brand)s, sed ili tamen estas aplikataj.",
+    "Hey you. You're the best!": "He, vi. Vi bonegas!",
+    "Message layout": "Aranĝo de mesaĝoj",
+    "Compact": "Densa",
+    "Modern": "Moderna",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Agordu la nomon de tiparo instalita en via sistemo kaj %(brand)s provos ĝin uzi.",
+    "Customise your appearance": "Adaptu vian aspekton",
+    "Appearance Settings only affect this %(brand)s session.": "Agordoj de aspekto nur efikos sur ĉi tiun salutaĵon de %(brand)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.": "Aldonu uzantojn kaj servilojn, kiujn vi volas malatenti, ĉi tien. Uzu steletojn por ke %(brand)s atendu iujn ajn signojn. Ekzemple, <code>@bot:*</code> malatentigus ĉiujn uzantojn, kiuj havas la nomon «bot» sur ĉiu ajn servilo.",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "La administranto de via servilo malŝaltis implicitan tutvojan ĉifradon en privataj kaj rektaj ĉambroj.",
+    "Make this room low priority": "Doni al la ĉambro malaltan prioritaton",
+    "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",
+    "Unread rooms": "Nelegitaj ĉambroj",
+    "Always show first": "Ĉiam montri unuaj",
+    "Show": "Montri",
+    "Message preview": "Antaŭrigardo al mesaĝo",
+    "Sort by": "Ordigi laŭ",
+    "Activity": "Aktiveco",
+    "A-Z": "A–Z",
+    "List options": "Elektebloj pri listo",
+    "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",
+    "Notification options": "Elektebloj pri sciigoj",
+    "Favourited": "Elstarigita",
+    "Leave Room": "Foriri de ĉambro",
+    "Forget Room": "Forgesi ĉambron",
+    "Room options": "Elektebloj pri ĉambro",
+    "Message deleted on %(date)s": "Mesaĝo forigita je %(date)s",
+    "Use your account to sign in to the latest version of the app at <a />": "Uzu vian konton por saluti la plej freŝan version de la aplikaĵo je <a />",
+    "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>.": "Vi jam estas salutinta kaj preta ĉi tie, sed vi povas ankaŭ ekhavi la plej freŝajn versiojn de la aplikaĵoj sur ĉiuj platformoj je <a>element.io/get-started</a>.",
+    "Go to Element": "Iri al Elemento",
+    "We’re excited to announce Riot is now Element!": "Ni estas ekscititaj anonci, ke Riot nun estas Elemento!",
+    "Learn more at <a>element.io/previously-riot</a>": "Eksciu plion je <a>element.io/previously-riot</a>",
+    "Wrong file type": "Neĝusta dosiertipo",
+    "Looks good!": "Ŝajnas bona!",
+    "Wrong Recovery Key": "Neĝusta rehava ŝlosilo",
+    "Invalid Recovery Key": "Nevalida rehava ŝlosilo",
+    "Security Phrase": "Sekureca frazo",
+    "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Enigu vian sekurecan frazon aŭ <button>uzu vian sekurecan ŝlosilon</button> por daŭrigi.",
+    "Security Key": "Sekureca ŝlosilo",
+    "Use your Security Key to continue.": "Uzu vian sekurecan ŝlosilon por daŭrigi.",
+    "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.": "Vi povas uzi proprajn elekteblojn pri servilo por saluti aliajn servilojn de Matrix, per specifo de alia URL de hejmservilo. Tio ebligas al vi uzi la programon %(brand)s kun jama konto de Matrix je alia hejmservilo.",
+    "Search rooms": "Serĉi ĉambrojn",
+    "Switch to light mode": "Ŝalti helan reĝimon",
+    "Switch to dark mode": "Ŝalti malhelan reĝimon",
+    "Switch theme": "Ŝalti haŭton",
+    "Security & privacy": "Sekureco kaj privateco",
+    "All settings": "Ĉiuj agordoj",
+    "User menu": "Menuo de uzanto",
+    "Use Recovery Key or Passphrase": "Uzi rehavan ŝlosilon aŭ pasfrazon",
+    "Use Recovery Key": "Uzi rehavan ŝlosilon",
+    "%(brand)s Web": "%(brand)s por Reto",
+    "%(brand)s Desktop": "%(brand)s por Labortablo",
+    "%(brand)s iOS": "%(brand)s por iOS",
+    "%(brand)s X for Android": "%(brand)s X por Android",
+    "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Malhelpu perdon de aliro al ĉifritaj mesaĝoj kaj datumoj per savkopiado de ĉifraj ŝlosiloj al via servilo.",
+    "Generate a Security Key": "Generi sekurecan ŝlosilon",
+    "We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "Ni estigos sekurecan ŝlosilon, kiun vi devus konservi en sekura loko, ekzemple administrilo de pasvortoj, aŭ sekurŝranko.",
+    "Enter a Security Phrase": "Enigiu sekurecan frazon",
+    "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Uzu sekretan frazon kiun konas nur vi, kaj laŭplaĉe konservu sekurecan ŝlosilon, uzotan por savkopiado.",
+    "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.": "Enigu sekurecan pasfrazon kiun konas nur vi, ĉar ĝi protektos viajn datumojn. Por esti certa, vi ne reuzu la pasvorton de via konto.",
+    "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "Deponu vian sekurecan ŝlosilon en sekura loko, ekzemple administrilo de pasvortoj aŭ sekurŝranko, ĉar ĝi protektos viajn ĉifritajn datumojn.",
+    "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Se vi nuligos nun, vi eble perdos ĉifritajn mesaĝojn kaj datumojn se vi perdos aliron al viaj salutoj.",
+    "You can also set up Secure Backup & manage your keys in Settings.": "Vi ankaŭ povas agordi Sekuran savkopiadon kaj administri viajn ŝlosilojn per Agordoj.",
+    "Set up Secure backup": "Agordi Sekuran savkopiadon",
+    "Set a Security Phrase": "Agordi Sekurecan frazon",
+    "Confirm Security Phrase": "Konfirmi Sekurecan frazon",
+    "Save your Security Key": "Konservi vian Sekurecan ŝlosilon",
+    "New spinner design": "Nova fasono de la turniĝilo",
+    "Show rooms with unread messages first": "Montri ĉambrojn kun nelegitaj mesaĝoj kiel unuajn",
+    "Show previews of messages": "Montri antaŭrigardojn al mesaĝoj",
+    "This room is public": "Ĉi tiu ĉambro estas publika",
+    "Away": "For",
+    "Edited at %(date)s": "Redaktita je %(date)s",
+    "Click to view edits": "Klaku por vidi redaktojn",
+    "Are you sure you want to cancel entering passphrase?": "Ĉu vi certe volas nuligi enigon de pasfrazo?",
+    "Enable advanced debugging for the room list": "Ŝalti altnivelan erarserĉadon por la ĉambrobreto",
+    "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
+    "Custom Tag": "Propra etikedo",
+    "Feedback": "Prikomenti"
 }
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 872bd7ab4c..1619bb7616 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -5,7 +5,6 @@
     "Access Token:": "Token de Acceso:",
     "Admin": "Administrador",
     "Advanced": "Avanzado",
-    "Algorithm": "Algoritmo",
     "Always show message timestamps": "Siempre mostrar las marcas temporales de mensajes",
     "Authentication": "Autenticación",
     "%(items)s and %(lastItem)s": "%(items)s y %(lastItem)s",
@@ -24,7 +23,6 @@
     "Ban": "Vetar",
     "Banned users": "Usuarios vetados",
     "Bans user with given id": "Veta al usuario con la ID dada",
-    "Blacklisted": "Prohibido",
     "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",
@@ -33,7 +31,6 @@
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s cambió el nombre de la sala a %(roomName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s cambió el tema a \"%(topic)s\".",
     "Changes your display nickname": "Cambia tu apodo público",
-    "Claimed Ed25519 fingerprint key": "Clave de huella digital Ed25519 reclamada",
     "Click here to fix": "Haz clic aquí para arreglar",
     "Click to mute audio": "Haz clic para silenciar el audio",
     "Click to mute video": "Haz clic para silenciar el vídeo",
@@ -44,31 +41,23 @@
     "Commands": "Comandos",
     "Confirm password": "Confirmar contraseña",
     "Continue": "Continuar",
-    "Could not connect to the integration server": "No se pudo conectar al servidor de integración",
     "Create Room": "Crear Sala",
     "Cryptography": "Criptografía",
     "Current password": "Contraseña actual",
-    "Curve25519 identity key": "Clave de identidad Curve25519",
     "/ddg is not a command": "/ddg no es un comando",
     "Deactivate Account": "Desactivar Cuenta",
     "Decrypt %(text)s": "Descifrar %(text)s",
-    "Decryption error": "Error de descifrado",
     "Deops user with given id": "Degrada al usuario con la ID dada",
     "Default": "Por Defecto",
-    "Device ID": "ID de Dispositivo",
-    "Direct chats": "Conversaciones directas",
     "Disinvite": "Deshacer invitación",
     "Displays action": "Muestra la acción",
     "Download %(text)s": "Descargar %(text)s",
-    "Ed25519 fingerprint": "Huella digital Ed25519",
     "Email": "Correo electrónico",
     "Email address": "Dirección de correo electrónico",
     "Emoji": "Emoticones",
     "%(senderName)s ended the call.": "%(senderName)s finalizó la llamada.",
-    "End-to-end encryption information": "Información de cifrado de extremo a extremo",
     "Error": "Error",
     "Error decrypting attachment": "Error al descifrar adjunto",
-    "Event information": "Información de eventos",
     "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ó",
@@ -85,7 +74,6 @@
     "Failed to send email": "No se pudo enviar el correo electrónico",
     "Failed to send request.": "El envío de la solicitud falló.",
     "Failed to set display name": "No se pudo establecer el nombre público",
-    "Failed to toggle moderator status": "Falló al cambiar estatus de moderador",
     "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",
@@ -112,14 +100,12 @@
     "Sign in with": "Quiero iniciar sesión con",
     "Join Room": "Unirse a la Sala",
     "%(targetName)s joined the room.": "%(targetName)s se unió a la sala.",
-    "Joins room with given alias": "Se une a la sala con el alias dado",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s expulsó a %(targetName)s.",
     "Kick": "Expulsar",
     "Kicks user with given id": "Expulsa al usuario con la ID dada",
     "Labs": "Laboratorios",
     "Leave room": "Salir de la sala",
     "%(targetName)s left the room.": "%(targetName)s salió de la sala.",
-    "Local addresses for this room:": "Direcciones locales para esta sala:",
     "Logout": "Cerrar Sesión",
     "Low priority": "Prioridad baja",
     "Accept": "Aceptar",
@@ -130,15 +116,11 @@
     "Default Device": "Dispositivo por defecto",
     "Microphone": "Micrófono",
     "Camera": "Cámara",
-    "Alias (optional)": "Alias (opcional)",
     "Anyone": "Todos",
     "Close": "Cerrar",
     "Custom": "Personalizado",
     "Custom level": "Nivel personalizado",
     "Decline": "Rechazar",
-    "device id: ": "ID de dispositivo: ",
-    "Disable Notifications": "Deshabilitar Notificaciones",
-    "Enable Notifications": "Habilitar Notificaciones",
     "Enter passphrase": "Ingresar frase de contraseña",
     "Error: Problem communicating with the given homeserver.": "Error: No es posible comunicar con el servidor doméstico indicado.",
     "Export": "Exportar",
@@ -177,19 +159,15 @@
     "Failed to invite the following users to the %(roomName)s room:": "No se pudo invitar a los siguientes usuarios a la sala %(roomName)s:",
     "Unknown error": "Error desconocido",
     "Incorrect password": "Contraseña incorrecta",
-    "To continue, please enter your password.": "Para continuar, ingresa tu contraseña por favor.",
-    "I verify that the keys match": "Verifico que las claves coinciden",
     "Unable to restore session": "No se puede recuperar la sesión",
     "Room Colour": "Color de la sala",
     "%(roomName)s does not exist.": "%(roomName)s no existe.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s no es accesible en este momento.",
     "Rooms": "Salas",
     "Save": "Guardar",
-    "Scroll to bottom of page": "Bajar al final de la página",
     "Search": "Buscar",
     "Search failed": "Falló la búsqueda",
     "Seen by %(userName)s at %(dateTime)s": "Visto por %(userName)s el %(dateTime)s",
-    "Send anyway": "Enviar de todos modos",
     "Send Reset Email": "Enviar Correo Electrónico de Restauración",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s envió una imagen.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s invitó a %(targetDisplayName)s a unirse a la sala.",
@@ -206,7 +184,6 @@
     "Sign out": "Cerrar sesión",
     "%(count)s of your messages have not been sent.|other": "Algunos de sus mensajes no han sido enviados.",
     "Someone": "Alguien",
-    "Start a chat": "Iniciar una conversación",
     "Start authentication": "Iniciar autenticación",
     "Submit": "Enviar",
     "Success": "Éxito",
@@ -214,7 +191,7 @@
     "Active call (%(roomName)s)": "Llamada activa (%(roomName)s)",
     "Add a topic": "Añadir un tema",
     "No media permissions": "Sin permisos para el medio",
-    "You may need to manually permit Riot to access your microphone/webcam": "Probablemente necesite dar permisos manualmente a Riot para su micrófono/cámara",
+    "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.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s eliminó el nombre de la sala.",
@@ -226,15 +203,12 @@
     "Moderator": "Moderador",
     "Mute": "Silenciar",
     "Name": "Nombre",
-    "New address (e.g. #foo:%(localDomain)s)": "Dirección nueva (ej. #foo:%(localDomain)s)",
     "New passwords don't match": "Las contraseñas nuevas no coinciden",
     "New passwords must match each other.": "Las contraseñas nuevas deben coincidir.",
-    "none": "ninguno",
     "not specified": "sin especificar",
     "Notifications": "Notificaciones",
     "(not supported by this browser)": "(no soportado por este navegador)",
     "<not supported>": "<no soportado>",
-    "NOT verified": "SIN verificar",
     "No display name": "Sin nombre público",
     "No more results": "No hay más resultados",
     "No results": "No hay resultados",
@@ -254,20 +228,18 @@
     "Profile": "Perfil",
     "Public Chat": "Sala pública",
     "Reason": "Motivo",
-    "Revoke Moderator": "Eliminar Moderador",
     "Register": "Registrar",
     "%(targetName)s rejected the invitation.": "%(targetName)s rechazó la invitación.",
     "Reject invitation": "Rechazar invitación",
-    "Remote addresses for this room:": "Direcciones remotas para esta sala:",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s eliminó su nombre público (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s eliminó su imagen de perfil.",
     "Remove": "Eliminar",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s solicitó una conferencia de vozIP.",
     "Results from DuckDuckGo": "Resultados desde DuckDuckGo",
     "Return to login screen": "Regresar a la pantalla de inicio de sesión",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot no tiene permiso para enviarte notificaciones - por favor, comprueba los ajustes de tu navegador",
-    "Riot was not given permission to send notifications - please try again": "No se le dio permiso a Riot para enviar notificaciones - por favor, inténtalo nuevamente",
-    "riot-web version:": "versión de riot-web:",
+    "%(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:",
     "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)",
@@ -287,10 +259,7 @@
     "Room directory": "Directorio de salas",
     "Custom Server Options": "Opciones de Servidor Personalizado",
     "unknown error code": "Código de error desconocido",
-    "Start verification": "Iniciar verificación",
     "Skip": "Omitir",
-    "Share without verifying": "Compartir sin verificar",
-    "Ignore request": "Ignorar solicitud",
     "Do you want to set an email address?": "¿Quieres poner una dirección de correo electrónico?",
     "This will allow you to reset your password and receive notifications.": "Esto te permitirá reiniciar tu contraseña y recibir notificaciones.",
     "Authentication check failed: incorrect password?": "La verificación de autenticación falló: ¿contraseña incorrecta?",
@@ -311,8 +280,6 @@
     "Unable to capture screen": "No es posible capturar la pantalla",
     "Unable to enable Notifications": "No es posible habilitar las Notificaciones",
     "unknown caller": "Persona que llama desconocida",
-    "unknown device": "dispositivo desconocido",
-    "Unknown room %(roomId)s": "Sala desconocida %(roomId)s",
     "Unnamed Room": "Sala sin nombre",
     "Uploading %(filename)s and %(count)s others|zero": "Subiendo %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Subiendo %(filename)s y otros %(count)s",
@@ -322,13 +289,9 @@
     "Upload file": "Subir archivo",
     "Upload new:": "Subir nuevo:",
     "Usage": "Uso",
-    "Use compact timeline layout": "Usar diseño de cronología compacto",
-    "User ID": "ID de Usuario",
     "Username invalid: %(errMessage)s": "Nombre de usuario no válido: %(errMessage)s",
     "Users": "Usuarios",
     "Verification Pending": "Verificación Pendiente",
-    "Verification": "Verificación",
-    "verified": "verificado",
     "Verified key": "Clave verificada",
     "Video call": "Llamada de vídeo",
     "Voice call": "Llamada de voz",
@@ -353,9 +316,7 @@
     "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.",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s le quitó el veto a %(targetName)s.",
-    "unencrypted": "sin cifrar",
     "Unmute": "Dejar de silenciar",
-    "Unrecognised room alias:": "Alias de sala no reconocido:",
     "%(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",
@@ -386,11 +347,6 @@
     "Aug": "Ago",
     "Add rooms to this community": "Agregar salas a esta comunidad",
     "Call Failed": "La Llamada Falló",
-    "Review Devices": "Revisar Dispositivos",
-    "Call Anyway": "Llamar de todos modos",
-    "Answer Anyway": "Contestar de Todos Modos",
-    "Call": "Llamar",
-    "Answer": "Contestar",
     "Sep": "Sep",
     "Oct": "Oct",
     "Nov": "Nov",
@@ -400,11 +356,10 @@
     "Online": "En línea",
     "Submit debug logs": "Enviar registros de depuración",
     "The platform you're on": "La plataforma en la que te encuentras",
-    "The version of Riot.im": "La versión de Riot.im",
+    "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 identity server's URL": "La URL de tu servidor de identidad",
-    "The information being sent to us to help make Riot.im better includes:": "La información que se nos envía para ayudar a mejorar Riot.im incluye:",
+    "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?",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Advertencia: cualquier persona que añadas a una comunidad será públicamente visible a cualquiera que conozca la ID de la comunidad",
@@ -412,7 +367,6 @@
     "Invite to Community": "Invitar a la Comunidad",
     "Which rooms would you like to add to this community?": "¿Qué salas te gustaría añadir a esta comunidad?",
     "Fetching third party location failed": "Falló la obtención de la ubicación de un tercero",
-    "A new version of Riot is available.": "Una nueva versión de Riot está disponible.",
     "I understand the risks and wish to continue": "Entiendo los riesgos y deseo continuar",
     "Send Account Data": "Enviar Datos de la Cuenta",
     "Advanced notification settings": "Ajustes avanzados de notificaciones",
@@ -436,8 +390,6 @@
     "Send Custom Event": "Enviar evento personalizado",
     "All notifications are currently disabled for all targets.": "Las notificaciones están deshabilitadas para todos los objetivos.",
     "Failed to send logs: ": "Error al enviar registros: ",
-    "delete the alias.": "eliminar el alias.",
-    "To return to your account in future you need to <u>set a password</u>": "Para regresar a tu cuenta en el futuro debes <u>establecer una contraseña</u>",
     "Forget": "Olvidar",
     "World readable": "Legible por todo el mundo",
     "You cannot delete this image. (%(code)s)": "No puedes eliminar esta imagen. (%(code)s)",
@@ -463,7 +415,6 @@
     "No update available.": "No hay actualizaciones disponibles.",
     "Noisy": "Ruidoso",
     "Collecting app version information": "Recolectando información de la versión de la aplicación",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "¿Borrar el alias de la sala %(alias)s y eliminar %(name)s del directorio?",
     "Keywords": "Palabras clave",
     "Enable notifications for this account": "Habilitar notificaciones para esta cuenta",
     "Invite to this community": "Invitar a esta comunidad",
@@ -474,7 +425,7 @@
     "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?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot usa muchas características avanzadas del navegador, algunas de las cuales no están disponibles en su navegador actual.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s usa muchas características avanzadas del navegador, algunas de las cuales no están disponibles en su navegador actual.",
     "Event sent!": "Evento enviado!",
     "Preparing to send logs": "Preparando para enviar registros",
     "Unnamed room": "Sala sin nombre",
@@ -520,13 +471,12 @@
     "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",
     "Unable to join network": "No se puede unir a la red",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Es posible que los hayas configurado en un cliente que no sea Riot. No puedes ajustarlos en Riot, pero todavía se aplican",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "¡Lo sentimos! Su navegador <b>no puede</b> ejecutar Riot.",
+    "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 en grupo",
     "Yesterday": "Ayer",
     "Error encountered (%(errorDetail)s).": "Error encontrado (%(errorDetail)s).",
     "Low Priority": "Prioridad Baja",
-    "Riot does not know how to join a room on this network": "Riot no sabe cómo unirse a una sala en esta red",
+    "%(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",
     "Mentions only": "Solo menciones",
@@ -537,7 +487,7 @@
     "Event Type": "Tipo de Evento",
     "No rooms to show": "No hay salas para mostrar",
     "Download this file": "Descargar este archivo",
-    "Pin Message": "Marcar Mensaje",
+    "Pin Message": "Fijar Mensaje",
     "Failed to change settings": "Error al cambiar los ajustes",
     "View Community": "Ver la comunidad",
     "Developer Tools": "Herramientas de desarrollo",
@@ -547,9 +497,7 @@
     "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...",
-    "There are advanced notifications which are not shown here": "Hay notificaciones avanzadas que no se muestran aquí",
     "Every page you use in the app": "Cada página que utilizas en la aplicación",
-    "Your User Agent": "Tu Agente de Usuario",
     "Your device resolution": "La resolución de tu dispositivo",
     "Which officially provided instance you are using, if any": "Qué instancia proporcionada oficialmente estás utilizando, si estás utilizando alguna",
     "e.g. %(exampleValue)s": "ej. %(exampleValue)s",
@@ -566,7 +514,6 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(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",
-    "Room name or alias": "Nombre o alias de sala",
     "Add to community": "Añadir a la comunidad",
     "Failed to invite the following users to %(groupId)s:": "No se pudo invitar a los siguientes usuarios a %(groupId)s:",
     "Failed to invite users to community": "No se pudo invitar usuarios a la comunidad",
@@ -587,7 +534,7 @@
     "%(widgetName)s widget added by %(senderName)s": "componente %(widgetName)s añadido por %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "componente %(widgetName)s eliminado por %(senderName)s",
     "Your browser does not support the required cryptography extensions": "Su navegador no soporta las extensiones de criptografía requeridas",
-    "Not a valid Riot keyfile": "No es un archivo de claves de Riot válido",
+    "Not a valid %(brand)s keyfile": "No es un archivo de claves de %(brand)s válido",
     "Message Pinning": "Mensajes con chincheta",
     "Always show encryption icons": "Mostrar siempre iconos de cifrado",
     "Automatically replace plain text Emoji": "Sustituir automáticamente Emojis de texto",
@@ -618,12 +565,8 @@
     "Mention": "Mencionar",
     "Invite": "Invitar",
     "Share Link to User": "Compartir Enlace al Usuario",
-    "User Options": "Opciones de Usuario",
-    "Make Moderator": "Convertir a Moderador",
     "Send an encrypted reply…": "Enviar una respuesta cifrada…",
-    "Send a reply (unencrypted)…": "Enviar una respuesta (sin cifrar)…",
     "Send an encrypted message…": "Enviar un mensaje cifrado…",
-    "Send a message (unencrypted)…": "Enviar un mensaje (sin cifrar)…",
     "Jump to message": "Ir a mensaje",
     "No pinned messages.": "No hay mensajes con chincheta.",
     "Loading...": "Cargando...",
@@ -675,9 +618,6 @@
     "Failed to copy": "Falló la copia",
     "Add an Integration": "Añadir una Integración",
     "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á a punto de ir a un sitio de terceros de modo que pueda autenticar su cuenta para usarla con %(integrationsUrl)s. ¿Desea continuar?",
-    "Removed or unknown message type": "Tipo de mensaje desconocido o eliminado",
-    "Message removed by %(userId)s": "Mensaje eliminado por %(userId)s",
-    "Message removed": "Mensaje eliminado",
     "An email has been sent to %(emailAddress)s": "Se envió un correo electrónico a %(emailAddress)s",
     "Please check your email to continue registration.": "Por favor consulta tu correo electrónico para continuar con el registro.",
     "Token incorrect": "Token incorrecto",
@@ -706,9 +646,6 @@
     "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.",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Por favor, ayude a mejorar Riot.im enviando <UsageDataLink>información anónima de uso</UsageDataLink>. Esto usará una cookie (por favor, vea nuestra <PolicyLink>Política de cookies</PolicyLink>).",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Por favor, ayude a mejorar Riot.im enviando <UsageDataLink>información anónima de uso</UsageDataLink>. Esto usará una cookie.",
-    "Yes, I want to help!": "Sí, ¡quiero ayudar!",
     "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?",
@@ -716,10 +653,6 @@
     "An error ocurred whilst trying to remove the widget from the room": "Ocurrió un error mientras se intentaba eliminar el widget de la sala",
     "Minimize apps": "Minimizar apps",
     "Popout widget": "Widget en ventana externa",
-    "Unblacklist": "Dejar de Prohibir",
-    "Blacklist": "Prohibir",
-    "Unverify": "Anular Verificación",
-    "Verify...": "Verificar...",
     "Communities": "Comunidades",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s se unieron %(count)s veces",
@@ -800,12 +733,11 @@
     "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:",
-    "Encryption key request": "Solicitud de clave de cifrado",
     "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.",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Si ha usado anteriormente una versión más reciente de Riot, su sesión puede ser incompatible con ésta. Cierre la ventana y vuelva a la versión más reciente.",
+    "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.": "Si ha usado anteriormente una versión más reciente de %(brand)s, su sesión puede ser incompatible con ésta. Cierre la ventana y vuelva a la versión más reciente.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Limpiando el almacenamiento del navegador puede arreglar el problema, pero le desconectará y cualquier historial de conversación cifrado se volverá ilegible.",
     "Username not available": "Nombre de usuario no disponible",
     "An error occurred: %(error_string)s": "Ocurrió un error: %(error_string)s",
@@ -868,9 +800,9 @@
     "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.",
     "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 Riot 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 Riot. 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 Riot.im experience!": "Sabía que: puede usar comunidades para filtrar su experiencia con Riot.im",
+    "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.",
     "Error whilst fetching joined communities": "Error al recuperar las comunidades a las que estás unido",
     "Create a new community": "Crear una comunidad nueva",
@@ -885,10 +817,8 @@
     "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",
-    "Light theme": "Tema claro",
-    "Dark theme": "Tema oscuro",
     "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.",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot recopila análisis de estadísticas anónimas para permitirnos mejorar la aplicación.",
+    "%(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.",
     "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",
@@ -911,9 +841,6 @@
     "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.",
-    "Please <a>contact your service administrator</a> to get this limit increased.": "Por favor, <a>contacta al administrador de tu servicio</a> para aumentar este límite.",
-    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "Este servidor doméstico ha alcanzado su límite Mensual de Usuarios Activos, por lo que <b>algunos usuarios no podrán iniciar sesión</b>.",
-    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Este servidor doméstico ha excedido uno de sus límites de recursos, por lo que <b>algunos usuarios no podrán iniciar sesión</b>.",
     "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",
@@ -935,17 +862,10 @@
     "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...",
-    "Registration Required": "Se Requiere Registro",
-    "You need to register to do this. Would you like to register now?": "Necesitas registrarte para hacer esto. ¿Te gustaría registrarte ahora?",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s añadió %(addedAddresses)s como direcciones para esta sala.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s añadió %(addedAddresses)s como una dirección para esta sala.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s eliminó %(removedAddresses)s como direcciones para esta sala.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s eliminó %(removedAddresses)s como una dirección para esta sala.",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s añadió %(addedAddresses)s y eliminó %(removedAddresses)s como direcciones para esta sala.",
     "%(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.",
-    "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Riot 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!",
-    "Updating Riot": "Actualizando Riot",
+    "%(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!",
+    "Updating %(brand)s": "Actualizando %(brand)s",
     "Room version:": "Versión de la sala:",
     "Developer options": "Opciones de desarrollador",
     "Room version": "Versión de la sala",
@@ -977,10 +897,10 @@
     "User %(user_id)s does not exist": "El usuario %(user_id)s no existe",
     "User %(user_id)s may or may not exist": "El usuario %(user_id)s podría o no existir",
     "Unknown server error": "Error desconocido del servidor",
-    "Use a few words, avoid common phrases": "Usa varias palabras, evita frases comunes",
+    "Use a few words, avoid common phrases": "Usa algunas palabras, evita frases comunes",
     "No need for symbols, digits, or uppercase letters": "No hacen falta símbolos, números o letrás en mayúscula",
     "Avoid repeated words and characters": "Evita repetir palabras y letras",
-    "Avoid sequences": "Evita frases",
+    "Avoid sequences": "Evita secuencias",
     "Avoid recent years": "Evita años recientes",
     "Avoid years that are associated with you": "Evita años que estén asociados contigo",
     "Avoid dates and years that are associated with you": "Evita fechas y años que están asociados contigo",
@@ -1001,7 +921,7 @@
     "A word by itself is easy to guess": "Una palabra es fácil de adivinar",
     "Names and surnames by themselves are easy to guess": "Nombres y apellidos son fáciles de adivinar",
     "Common names and surnames are easy to guess": "Nombres y apellidos comunes son fáciles de adivinar",
-    "Straight rows of keys are easy to guess": "Palabras formadas por repeticiones de teclas son fáciles de adivinar",
+    "Straight rows of keys are easy to guess": "Palabras formadas por secuencias de teclas alineadas son fáciles de adivinar",
     "Short keyboard patterns are easy to guess": "Patrones de tecleo cortos son fáciles de adivinar",
     "There was an error joining the room": "Hubo un error al unirse a la sala",
     "Custom user status messages": "Mensajes de estado de usuario personalizados",
@@ -1120,9 +1040,9 @@
     "Account management": "Gestión de la cuenta",
     "Deactivating your account is a permanent action - be careful!": "Desactivar tu cuenta es permanente - ¡Cuidado!",
     "Credits": "Créditos",
-    "For help with using Riot, click <a>here</a>.": "Si necesitas ayuda usando Riot, haz clic <a>aquí</a>.",
-    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "Si necesitas ayuda usando Riot, haz clic <a>aquí</a> o abre un chat con nuestro bot usando el botón de abajo.",
-    "Chat with Riot Bot": "Hablar con Riot Bot",
+    "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",
@@ -1131,7 +1051,6 @@
     "Room list": "Lista de salas",
     "Autocomplete delay (ms)": "Retardo autocompletado (ms)",
     "Roles & Permissions": "Roles & Permisos",
-    "To link to this room, please add an alias.": "Para enlazar a esta sala, debes crear un alias.",
     "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",
@@ -1160,29 +1079,20 @@
     "Invite anyway": "Invitar igualmente",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Antes de enviar logs, debes <a>crear un GitHub issue</a> para describir el problema.",
     "Unable to load commit detail: %(msg)s": "No se pudo cargar el detalle del commit: %(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 Riot to do this": "Para evitar perder tu historial de chat, debes exportar las claves de la sala antes de salir. Debes volver a la versión actual de Riot para esto",
-    "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ": "Has usado anteriormente una versión reciente de Riot en %(host)s. Para usar esta versión otra vez con cifrado de extremo a extremo, necesitarás salir y entrar otra vez. ",
+    "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 tu historial de chat, debes exportar las claves de la sala antes de salir. Debes volver a la versión actual de %(brand)s para esto",
     "Incompatible Database": "Base de datos incompatible",
     "Continue With Encryption Disabled": "Seguir con cifrado desactivado",
-    "Use Legacy Verification (for older clients)": "Usar verificación obsoleta (para clientes antiguos)",
-    "Verify by comparing a short text string.": "Verificar usando un texto pequeño.",
-    "Begin Verifying": "Comenzar la verificación",
-    "Waiting for partner to accept...": "Esperando a que empiece el compañero...",
-    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "¿No aparece nada? No todos los clientes soportan la verificación interactiva aún. <button>Puedes usar la verificación obsoleta</button>.",
-    "Waiting for %(userId)s to confirm...": "Esperando a que confirme %(userId)s...",
-    "Use two-way text verification": "Usar verificación de texto en dos sentidos",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifica ese usuario para marcar como confiable. Confiar en usuarios aporta mucha tranquilidad en los mensajes cifrados de extremo a extremo.",
     "Waiting for partner to confirm...": "Esperando que confirme el compañero...",
     "Incoming Verification Request": "Petición de verificación entrante",
     "%(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 más largo y con más vueltas",
+    "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",
     "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 Riot is misconfigured": "Riot tiene un error de configuración",
+    "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)",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Uses o no los 'breadcrumbs' (iconos sobre la lista de salas)",
-    "A conference call could not be started because the integrations server is not available": "No se pudo iniciar la conferencia porque el servidor de integraciones no está disponible",
     "Replying With Files": "Respondiendo con archivos",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "En este momento no es posible responder con un archivo. ¿Te gustaría subir el archivo sin responder?",
     "The file '%(fileName)s' failed to upload.": "Falló en subir el archivo '%(fileName)s'.",
@@ -1203,20 +1113,18 @@
     "%(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",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Solicita al administrador de Riot que compruebe si hay entradas duplicadas o erróneas en <a>tu configuración</a>.",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Solicita al administrador de %(brand)s que compruebe si hay entradas duplicadas o erróneas en <a>tu configuración</a>.",
     "Cannot reach identity server": "No se puede conectar con el servidor de identidad",
     "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.": "Te puedes registrar, pero algunas funcionalidades no estarán disponibles hasta que se pueda conectar con el servidor de identidad. Si continúas viendo este aviso, comprueba tu configuración o contacta con el administrador del servidor.",
     "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.": "Puedes cambiar tu contraseña, pero algunas funcionalidades no estarán disponibles hasta que el servidor de identidad esté disponible. Si continúas viendo este aviso, comprueba tu configuración o contacta con el administrador del servidor.",
     "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.": "Puedes iniciar sesión, pero algunas funcionalidades no estarán disponibles hasta que el servidor de identidad esté disponible. Si continúas viendo este mensaje, comprueba tu configuración o contacta con el administrador del servidor.",
-    "No homeserver URL provided": "No se ha indicado la URL del servidor",
+    "No homeserver URL provided": "No se ha indicado la URL del servidor local",
     "Unexpected error resolving homeserver configuration": "Error inesperado en la configuración del servidor",
     "Unexpected error resolving identity server configuration": "Error inesperado en la configuración del servidor de identidad",
     "User %(userId)s is already in the room": "El usuario %(userId)s ya está en la sala",
     "The user must be unbanned before they can be invited.": "El usuario debe ser desbloqueado antes de poder ser invitado.",
     "The user's homeserver does not support the version of the room.": "El servidor del usuario no soporta la versión de la sala.",
     "Show read receipts sent by other users": "Mostrar las confirmaciones de lectura enviadas por otros usuarios",
-    "Order rooms in the room list by most important first instead of most recent": "Ordenar la lista de salas por importancia en vez de por reciente",
-    "Show recently visited rooms above the room list": "Mostrar salas visitadas recientemente sobre la lista de salas",
     "Show hidden events in timeline": "Mostrar eventos ocultos en la línea de tiempo",
     "Low bandwidth mode": "Modo de ancho de banda bajo",
     "Got It": "Entendido",
@@ -1254,10 +1162,9 @@
     "%(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)",
-    "Enable local event indexing and E2EE search (requires restart)": "Active el indexado de eventos locales y la búsqueda E2EE (necesita reiniciar)",
     "Match system theme": "Usar el tema del sistema",
     "Show previews/thumbnails for images": "Mostrar vistas previas para las imágenes",
-    "When rooms are upgraded": "Cuando se mejoran las salas",
+    "When rooms are upgraded": "Cuando las salas son actualizadas",
     "My Ban List": "Mi lista de baneos",
     "This is your list of users/servers you have blocked - don't leave the room!": "Esta es la lista de usuarios y servidores que ha bloqueado - ¡No deje la sala!",
     "Decline (%(counter)s)": "Declinar (%(counter)s)",
@@ -1276,21 +1183,16 @@
     "Jump to first unread room.": "Saltar a la primera sala sin leer.",
     "You have %(count)s unread notifications in a prior version of this room.|other": "Tiene %(count)s notificaciones sin leer en una versión anterior de esta sala.",
     "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.",
-    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Hay sesiones desconocidas en esta sala: si continúas sin verificarlas, será posible que alguien escuche secretamente tu llamada.",
     "Setting up keys": "Configurando claves",
     "Verify this session": "Verificar esta sesión",
     "Encryption upgrade available": "Mejora de encriptación disponible",
     "Set up encryption": "Configurar la encriptación",
-    "Unverified session": "Sesión sin verificar",
     "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:",
     "Session already verified!": "¡La sesión ya ha sido verificada!",
     "WARNING: Session already verified, but keys do NOT MATCH!": "ATENCIÓN: ¡La sesión ya ha sido verificada, pero las claves NO CONCUERDAN!",
     "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!": "¡ATENCIÓN: LA VERIFICACIÓN DE LA CLAVE HA FALLADO! La clave de firma para %(userId)s y sesión %(deviceId)s es \"%(fprint)s\", la cual no coincide con la clave proporcionada \"%(fingerprint)s\". ¡Esto podría significar que tus comunicaciones están siendo interceptadas!",
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "La clave de firma que proporcionaste coincide con la clave de firma que recibiste de la sesión %(deviceId)s de %(userId)s. Sesión marcada como verificada.",
-    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s añadió %(addedAddresses)s y %(count)s otras direcciones a esta sala",
-    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s eliminó %(removedAddresses)s y %(count)s otras direcciones de esta sala",
-    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s eliminó %(countRemoved)s y añadió %(countAdded)s direcciones a esta sala",
     "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s eliminó la regla que bloquea a usuarios que coinciden con %(glob)s",
     "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s eliminó la regla que bloquea a salas que coinciden con %(glob)s",
     "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s eliminó la regla que bloquea a servidores que coinciden con %(glob)s",
@@ -1333,14 +1235,9 @@
     "Recent Conversations": "Conversaciones recientes",
     "Suggestions": "Sugerencias",
     "Recently Direct Messaged": "Enviado Mensaje Directo recientemente",
-    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Si no encuentras a alguien, pídele su usuario, comparte tu usuario (%(userId)s) o <a>enlace de perfil</a>.",
     "Go": "Ir",
-    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Si no encuentras a alguien, pídele su usuario (p.ej. @user:server.com) o <a>comparte esta sala</a>.",
-    "You added a new session '%(displayName)s', which is requesting encryption keys.": "Has añadido una nueva sesión '%(displayName)s', la cual está pidiendo claves de encriptación.",
-    "Your unverified session '%(displayName)s' is requesting encryption keys.": "Tu sesión no verificada '%(displayName)s' esta pidiendo claves de encriptación.",
-    "Loading session info...": "Cargando información de sesión...",
-    "You've previously used Riot 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, Riot needs to resync your account.": "Has usado Riot 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, Riot necesita resincronizar tu cuenta.",
-    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Si la otra versión de Riot esta todavía abierta en otra pestaña, por favor, ciérrala, ya que usar Riot 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 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.",
     "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",
@@ -1355,7 +1252,7 @@
     "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 homeserver",
+    "Report Content to Your Homeserver Administrator": "Reportar contenido a tu administrador del Servidor Doméstico",
     "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:",
@@ -1363,7 +1260,7 @@
     "Upgrade private room": "Actualizar sala privada",
     "Upgrade public room": "Actualizar sala pública",
     "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 Riot, 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 Riot, por favor<a>reporta un fallo</a>.",
+    "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?",
     "A username can only contain lower case letters, numbers and '=_-./'": "Un nombre de usuario solo puede contener letras minúsculas, números y '=_-./'",
@@ -1382,9 +1279,6 @@
     "Summary": "Resumen",
     "Document": "Documento",
     "Next": "Siguiente",
-    "Room contains unknown sessions": "La sala contiene sesiones desconocidas",
-    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "\"%(RoomName)s\" contiene sesiones que no has visto antes.",
-    "Unknown sessions": "Sesiones desconocidas",
     "Upload files (%(current)s of %(total)s)": "Subir archivos  (%(current)s de %(total)s)",
     "Upload files": "Subir archivos",
     "Upload all": "Subir todo",
@@ -1406,7 +1300,6 @@
     "Ignored/Blocked": "Ignorado/Bloqueado",
     "Error adding ignored user/server": "Error al añadir usuario/servidor ignorado",
     "Error subscribing to list": "Error al suscribirse a la lista",
-    "Please verify the room ID or alias and try again.": "Por favor, verifica el ID de la sala o el alias e inténtalo de nuevo.",
     "Error removing ignored user/server": "Error al eliminar usuario/servidor ignorado",
     "Error unsubscribing from list": "Error al cancelar la suscripción a la lista",
     "None": "Ninguno",
@@ -1422,12 +1315,9 @@
     "Personal ban list": "Lista de bloqueo personal",
     "Server or user ID to ignore": "Servidor o ID de usuario a ignorar",
     "eg: @bot:* or example.org": "p. ej.: @bot:* o ejemplo.org",
-    "The version of Riot": "La version de Riot",
     "Your user agent": "Tu agente de usuario",
-    "The information being sent to us to help make Riot better includes:": "La información que se nos envía para ayudarnos a mejorar Riot incluye:",
     "If you cancel now, you won't complete verifying the other user.": "Si cancelas ahora, no completarás la verificación del otro usuario.",
     "If you cancel now, you won't complete verifying your other session.": "Si cancelas ahora, no completarás la verificación de tu otra sesión.",
-    "If you cancel now, you won't complete your secret storage operation.": "Si cancelas ahora, no completarás tu operación de almacén secreto.",
     "Cancel entering passphrase?": "¿Cancelar la introducción de frase de contraseña?",
     "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s actualizó la regla bloqueando salas que coinciden con %(glob)s por %(reason)s",
     "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s actualizó la regla bloqueando servidores que coinciden con %(glob)s por %(reason)s",
@@ -1442,11 +1332,11 @@
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s actualizó una regla de bloqueo que correspondía a %(oldGlob)s a %(newGlob)s por %(reason)s",
     "The message you are trying to send is too large.": "El mensaje que estás intentando enviar es demasiado largo.",
     "a few seconds ago": "hace unos segundos",
-    "about a minute ago": "hace un minuto",
+    "about a minute ago": "hace aproximadamente un minuto",
     "%(num)s minutes ago": "hace %(num)s minutos",
-    "about an hour ago": "hace una hora",
+    "about an hour ago": "hace aprox. una hora",
     "%(num)s hours ago": "hace %(num)s horas",
-    "about a day ago": "hace un día",
+    "about a day ago": "hace aprox. un día",
     "%(num)s days ago": "hace %(num)s días",
     "a few seconds from now": "dentro de unos segundos",
     "about a minute from now": "dentro de un minuto",
@@ -1459,18 +1349,15 @@
     "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",
-    "Keep secret storage passphrase in memory for this session": "Mantener la frase de contraseña en memoria para esta sesión",
     "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",
     "or": "o",
     "Compare unique emoji": "Comparar emoji único",
     "Compare a unique set of emoji if you don't have a camera on either device": "Comparar un conjunto de emojis si no tienes cámara en ninguno de los dispositivos",
-    "Start": "Comenzar",
-    "Confirm the emoji below are displayed on both devices, in the same order:": "Confirma que los emojis a continuación son mostrados en ambos dispositivos, en el mismo orden:",
-    "Verify this device by confirming the following number appears on its screen.": "Verifica este dispositivo confirmando que el siguiente número aparece en su pantalla.",
+    "Start": "Inicio",
     "Waiting for %(displayName)s to verify…": "Esperando la verificación de %(displayName)s …",
-    "Review": "Revisar",
+    "Review": "Revise",
     "in secret storage": "en almacén secreto",
     "Secret storage public key:": "Clave pública del almacén secreto:",
     "in account data": "en datos de cuenta",
@@ -1483,7 +1370,6 @@
     "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",
-    "Sessions": "Sesiones",
     "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.",
@@ -1493,7 +1379,7 @@
     "Browse": "Navegar",
     "Change room avatar": "Cambiar avatar de sala",
     "Change room name": "Cambiar nombre de sala",
-    "Change main address for the room": "Cambiar dirección principal para la sala",
+    "Change main address for the room": "Cambiar la dirección principal para la sala",
     "Change history visibility": "Cambiar visibilidad del historial",
     "Change permissions": "Cambiar permisos",
     "Change topic": "Cambiar tema",
@@ -1508,7 +1394,7 @@
     "Send messages": "Enviar mensajes",
     "Invite users": "Invitar usuarios",
     "Change settings": "Cambiar la configuración",
-    "Kick users": "Echar a usuarios",
+    "Kick users": "Expulsar usuarios",
     "Ban users": "Bloquear a usuarios",
     "Remove messages": "Eliminar mensajes",
     "Notify everyone": "Notificar a todos",
@@ -1536,5 +1422,658 @@
     "Disconnect from the identity server <idserver />?": "¿Desconectarse del servidor de identidad <idserver />?",
     "Disconnect": "Desconectarse",
     "You should:": "Deberías:",
-    "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s de %(totalRooms)s"
+    "Use Single Sign On to continue": "Procede con Registro Único para continuar",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Confirma la adición de esta dirección de correo electrónico usando el Registro Único para probar tu identidad.",
+    "Single Sign On": "Registro Único",
+    "Confirm adding email": "Confirmar la adición del correo electrónico",
+    "Click the button below to confirm adding this email address.": "Haz clic en el botón de abajo para confirmar la adición de esta dirección de correo electrónico.",
+    "Confirm": "Confirmar",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Confirme la adición de este número de teléfono usando el Registro Único para probar su identidad...",
+    "Confirm adding phone number": "Confirmar la adición del número de teléfono",
+    "Click the button below to confirm adding this phone number.": "Haga clic en el botón de abajo para confirmar la adición de este número de teléfono.",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Si estés usando %(brand)s en un dispositivo donde una pantalla táctil es el principal mecanismo de entrada",
+    "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ú?",
+    "%(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.",
+    "Create Account": "Crear cuenta",
+    "Sign In": "Iniciar sesión",
+    "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",
+    "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",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s cambió el nombre de la sala %(oldRoomName)s a %(newRoomName)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s añadió las direcciones alternativas %(addresses)s para esta sala.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s añadió la dirección alternativa %(addresses)s para esta sala.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s quitó la dirección alternativa %(addresses)s para esta sala.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s quitó la dirección alternativa %(addresses)s para esta sala.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s cambió las direcciones alternativas de esta sala.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s cambió la dirección principal y las alternativas de esta sala.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s cambió las direcciones de esta sala.",
+    "You signed in to a new session without verifying it:": "Iniciaste una nueva sesión sin verificarla:",
+    "Verify your other session using one of the options below.": "Verifique su otra sesión utilizando una de las siguientes opciones.",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) inició una nueva sesión sin verificarla:",
+    "Ask this user to verify their session, or manually verify it below.": "Pídale a este usuario que verifique su sesión, o verifíquela manualmente a continuación.",
+    "Not Trusted": "No es de confianza",
+    "Manually Verify by Text": "Verificar manualmente mediante texto",
+    "Interactively verify by Emoji": "Verifica interactivamente con unEmoji",
+    "Done": "Listo",
+    "Support adding custom themes": "Soporta la adición de temas personalizados",
+    "Show info about bridges in room settings": "Mostrar información sobre puentes en la configuración de salas",
+    "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)",
+    "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": "Verifica 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:",
+    "Verify this session by confirming the following number appears on its screen.": "Verifique esta sesión confirmando que el siguiente número aparece en su pantalla.",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Esperando a que su otra sesión, %(deviceName)s (%(deviceId)s), verifica…",
+    "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",
+    "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.",
+    "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.",
+    "Reset cross-signing and secret storage": "Resetear las señales cruzadas y el almacenamiento secreto",
+    "Bootstrap cross-signing and secret storage": "Reconfiguración de firma cruzada y almacenamiento secreto",
+    "well formed": "bien formado",
+    "unexpected type": "tipo inesperado",
+    "Cross-signing public keys:": "Firmando las llaves públicas de manera cruzada:",
+    "Cross-signing private keys:": "Firmando las llaves privadas de manera cruzada:",
+    "Self signing private key:": "Clave privada autofirmada:",
+    "cached locally": "almacenado localmente",
+    "not found locally": "no encontrado localmente",
+    "User signing private key:": "Usuario firmando llave privada:",
+    "Session backup key:": "Llave / Código de respaldo de la sesión:",
+    "Homeserver feature support:": "Características apoyadas por servidor local:",
+    "exists": "existe",
+    "Your homeserver does not support session management.": "Su servidor local no soporta la gestión de sesiones.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Confirme eliminar estas sesiones, probando su identidad con el Registro Único.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Confirme eliminar esta sesión, probando su identidad con el Registro Único.",
+    "Confirm deleting these sessions": "Confirmar la eliminación de estas sesiones",
+    "Click the button below to confirm deleting these sessions.|other": "Haga clic en el botón de abajo para confirmar la eliminación de estas sesiones.",
+    "Click the button below to confirm deleting these sessions.|one": "Haga clic en el botón de abajo para confirmar la eliminación de esta sesión.",
+    "Delete sessions|other": "Eliminar sesiones",
+    "Delete sessions|one": "Eliminar sesión",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Verificar individualmente cada sesión utilizada por un usuario para marcarla como de confianza, no confiando en dispositivos de firma cruzada.",
+    "Securely cache encrypted messages locally for them to appear in search results, using ": "Almacenar localmente, de manera segura,  los mensajes cifrados localmente para que aparezcan en los resultados de la búsqueda, utilizando ",
+    " to store messages from ": " para almacenar mensajes de ",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Almacenar localmente, de manera segura, a los mensajes cifrados localmente para que aparezcan en los resultados de búsqueda.",
+    "%(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)s le faltan algunos componentes necesarios para el almacenamiento seguro de mensajes cifrados a nivel local. Si quieres experimentar con esta característica, construye un Escritorio %(brand)s personalizado con <nativeLink> componentes de búsqueda añadidos</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.": "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>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",
+    "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",
+    "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 />",
+    "wait and try again later": "espera y vuelve a intentarlo más tarde",
+    "Disconnect anyway": "Desconectar de todas formas",
+    "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 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.",
+    "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.",
+    "Please try again or view your console for hints.": "Por favor, inténtalo de nuevo o mira tu consola para encontrar pistas.",
+    "Ban list rules - %(roomName)s": "Reglas de la lista negra - %(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.": "Añade los usuarios y servidores que quieras ignorar aquí. Usa asteriscos para que %(brand)s coincida cualquier conjunto de caracteres. Por ejemplo, <code>@bot:*</code> ignoraría a todos los usuarios,en cualquier servidor, que tengan el nombre 'bot' .",
+    "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.": "Ignorar usuarios se hace mediante listas negras que contienen reglas sobre a quién bloquear. Suscribirse a una lista negra significa que los usuarios/servidores bloqueados serán invisibles para tí.",
+    "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.": "Tu lista negra personal contiene todos los usuarios/servidores de los que no quieres ver mensajes. Después de ignorar su primer usuario/servidor, una nueva sala aparecerá en su lista de salas llamada \"Mi lista negra (de bloqueo)\" - permanezca en esta sala para mantener la lista de prohibición en efecto.",
+    "Subscribed lists": "Listados a que subscribiste",
+    "Subscribing to a ban list will cause you to join it!": "¡Suscribirse a una lista negra hará unirte a ella!",
+    "If this isn't what you want, please use a different tool to ignore users.": "Si esto no es lo que quieres, por favor usa una herramienta diferente para ignorar usuarios.",
+    "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",
+    "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)",
+    "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)",
+    "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>",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Esta sala no está haciendo puente con ninguna plataforma. <a>Aprende más</a>",
+    "Bridges": "Puentes",
+    "Uploaded sound": "Sonido subido",
+    "Reset": "Resetear",
+    "Unable to revoke sharing for email address": "No se logró revocar el compartir para la dirección de correo electrónico",
+    "Unable to share email address": "No se logró compartir la dirección de correo electrónico",
+    "Click the link in the email you received to verify and then click continue again.": "Haga clic en el enlace del correo electrónico que recibió para verificar y luego nuevamente haga clic en continuar.",
+    "Revoke": "Revocar",
+    "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.",
+    "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.",
+    "This user has not verified all of their sessions.": "Este usuario no ha verificado todas sus sesiones.",
+    "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",
+    "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.",
+    "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",
+    "%(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",
+    "e.g. my-room": "p.ej. mi-sala",
+    "Some characters not allowed": "Algunos caracteres no están permitidos",
+    "Sign in with single sign-on": "Ingresar con un Registro Único",
+    "Enter a server name": "Introduzca un nombre de servidor",
+    "Looks good": "Se ve bien",
+    "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>?",
+    "Remove server": "Quitar servidor",
+    "Matrix": "Matrix",
+    "Add a new server": "Añadir un nuevo servidor",
+    "Enter the name of a new server you want to explore.": "Introduce el nombre de un nuevo servidor que quieras explorar.",
+    "Server name": "Nombre del servidor",
+    "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. 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.",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Recordatorio: Su navegador no es compatible, por lo que su experiencia puede ser impredecible.",
+    "GitHub issue": "reporte GitHub",
+    "Notes": "Notas",
+    "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.",
+    "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.",
+    "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.",
+    "Create a public room": "Crear una sala pública",
+    "Create a private room": "Crear una sala pública",
+    "Topic (optional)": "Tema (opcional)",
+    "Make this room public": "Convierte esta sala en pública",
+    "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 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.",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "Confirme la desactivación de su cuenta, usando Registro Único para probar su identidad.",
+    "Are you sure you want to deactivate your account? This is irreversible.": "¿Está seguro de que quiere desactivar su cuenta? Es irreversible.",
+    "Confirm account deactivation": "Confirmar la desactivación de la cuenta",
+    "There was a problem communicating with the server. Please try again.": "Hubo un problema de comunicación con el servidor. Por favor, inténtelo de nuevo.",
+    "Verify session": "Verificar sesión",
+    "Session name": "Nombre de sesión",
+    "Session key": "Código de sesión",
+    "View Servers in Room": "Ver servidores en la sala",
+    "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.",
+    "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.",
+    "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.",
+    "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 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>",
+    "Joining room …": "Uniéndose a sala …",
+    "Loading …": "Cargando …",
+    "Rejecting invite …": "Rechazando invitación …",
+    "Join the conversation with an account": "Unirse a la conversación con una cuenta",
+    "Sign Up": "Registrarse",
+    "You were kicked from %(roomName)s by %(memberName)s": "%(memberName)s te ha explusado de la sala %(roomName)s",
+    "Reason: %(reason)s": "Razón: %(reason)s",
+    "Forget this room": "Olvidar esta sala",
+    "Re-join": "Re-entrar",
+    "You were banned from %(roomName)s by %(memberName)s": "%(memberName)s te ha expulsado de %(roomName)s",
+    "Something went wrong with your invite to %(roomName)s": "Algo salió a mal invitando a %(roomName)s",
+    "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",
+    "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?",
+    "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",
+    "Invite only": "Sólamente por invitación",
+    "Scroll to most recent messages": "Desplácese 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.",
+    "Remove recent messages by %(user)s": "Eliminar mensajes recientes de %(user)s",
+    "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|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?",
+    "Deactivate user": "Desactivar usuario",
+    "Failed to deactivate user": "Error en desactivar usuario",
+    "Remove recent messages": "Eliminar mensajes recientes",
+    "Send a reply…": "Enviar una respuesta …",
+    "Send a message…": "Enviar un mensaje…",
+    "Bold": "Negrita",
+    "Italics": "Cursivo",
+    "Strikethrough": "Tachado",
+    "Code block": "Bloque de código",
+    "Room %(name)s": "Sala %(name)s",
+    "Recent rooms": "Salas recientes",
+    "Direct Messages": "Mensaje Directo",
+    "Loading room preview": "Cargando vista previa de la sala",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Un código de error (%(errcode)s) fue devuelto al tratar de validar su invitación. Podrías intentar pasar esta información a un administrador de la sala.",
+    "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Esta invitación a la sala %(roomName)s fue enviada a %(email)s que no está asociada a su cuenta",
+    "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Para recibir invitaciones directamente en %(brand)s, en Configuración, debes vincular este correo electrónico con tu cuenta.",
+    "This invite to %(roomName)s was sent to %(email)s": "Esta invitación a %(roomName)s fue enviada a %(email)s",
+    "Use an identity server in Settings to receive invites directly in %(brand)s.": "Utilice un servidor de identidad en Configuración para recibir invitaciones directamente en %(brand)s.",
+    "Share this email in Settings to receive invites directly in %(brand)s.": "Comparte este correo electrónico en Configuración para recibir invitaciones directamente en %(brand)s.",
+    "<userName/> wants to chat": "<userName/> quiere chatear",
+    "Start chatting": "Empieza a chatear",
+    "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>.",
+    "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?",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "Sugerencia: Comienza tu mensaje con <code>//</code> para que inicie con una barra inclinada.",
+    "Send as message": "Enviar como mensaje",
+    "Failed to connect to integration manager": "Error al conectarse con el administrador de integración",
+    "Failed to revoke invite": "Error al revocar la invitación",
+    "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "No se logró revocar la invitación. El servidor puede sufrir un problema temporal o usted no tiene los permisos suficientes para revocar la invitación.",
+    "Revoke invite": "Revocar invitación",
+    "Invited by %(sender)s": "Invitado por %(sender)s",
+    "Mark all as read": "Marcar todo como leído",
+    "Error updating main address": "Error al actualizar la dirección principal",
+    "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Hubo un error al actualizar la dirección principal de la sala. Posiblemente el servidor no lo permita o se produjo 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.": "Hubo un error al actualizar la dirección alternativa de la sala. Posiblemente el servidor no lo permita o se produjo un error temporal.",
+    "Local address": "Dirección local",
+    "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",
+    "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)",
+    "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.",
+    "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.",
+    "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",
+    "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",
+    "Not trusted": "No de confianza",
+    "%(count)s verified sessions|other": "%(count)s sesiones verificadas",
+    "%(count)s verified sessions|one": "1 sesión verificada",
+    "Hide verified sessions": "Ocultar sesiones verificadas",
+    "%(count)s sessions|other": "%(count)s sesiones",
+    "%(count)s sessions|one": "%(count)s sesión",
+    "Hide sessions": "Ocultar sesiones",
+    "Direct message": "Mensaje directo",
+    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> en %(roomName)s",
+    "This client does not support end-to-end encryption.": "Este cliente no es compatible con el cifrado de extremo a extremo.",
+    "Security": "Seguridad",
+    "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.": "La sesión que está tratando de verificar no soporta el escaneo de un código QR o la verificación mediante emoji, que es lo que soporta %(brand)s. Inténtalo con un cliente diferente.",
+    "Verify by scanning": "Verificar mediante escaneo",
+    "Ask %(displayName)s to scan your code:": "Pídele a %(displayName)s que escanee tu código:",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Si no puedes escanear el código de arriba, verifica comparando emoji únicos.",
+    "Verify by comparing unique emoji.": "Verifica comparando emoji únicos.",
+    "Verify by emoji": "Verificar con emoji",
+    "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.",
+    "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",
+    "Got it": "Lo he entendido",
+    "Start verification again from the notification.": "Inicie la verificación nuevamente a partir de la notificación.",
+    "Start verification again from their profile.": "Empieza la verificación de nuevo desde su perfil.",
+    "Verification timed out.": "El tiempo máximo para la verificación se ha agotado.",
+    "You cancelled verification on your other session.": "Canceló la verificación de su otra sesión.",
+    "%(displayName)s cancelled verification.": "%(displayName)s canceló la verificación.",
+    "You cancelled verification.": "Usted canceló la verificación.",
+    "Verification cancelled": "Verificación cancelada",
+    "Compare emoji": "Comparar emoji",
+    "Encryption enabled": "Encriptación habilitada",
+    "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",
+    "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>",
+    "You verified %(name)s": "Usted verificó %(name)s",
+    "You cancelled verifying %(name)s": "Usted canceló la verificación de %(name)s",
+    "%(name)s cancelled verifying": "%(name)s canceló la verificación",
+    "You accepted": "Usted aceptó",
+    "%(name)s accepted": "%(name)s aceptó",
+    "You declined": "Usted declinó",
+    "You cancelled": "Usted canceló",
+    "%(name)s declined": "%(name)s declinó",
+    "%(name)s cancelled": "%(name)s canceló",
+    "Accepting …": "Aceptando…",
+    "Declining …": "Declinando…",
+    "%(name)s wants to verify": "%(name)s quiere verificar",
+    "You sent a verification request": "Usted envió una solicitud de verificación",
+    "Show all": "Mostrar todo",
+    "Reactions": "Reacciones",
+    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reaccionó con %(content)s</reactedWith>",
+    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith> reaccionó con %(shortName)s</reactedWith>",
+    "Message deleted": "Mensaje eliminado",
+    "Message deleted by %(name)s": "Mensaje eliminado por %(name)s",
+    "Edited at %(date)s. Click to view edits.": "Editado el día %(date)s. Haga clic para ver las ediciones.",
+    "edited": "editado",
+    "Can't load this message": "No puedo cargar este mensaje",
+    "Submit logs": "Enviar registros",
+    "Frequently Used": "Usado con frecuencia",
+    "Smileys & People": "Caritas y personas",
+    "Animals & Nature": "Animales y naturaleza",
+    "Food & Drink": "Comidas y bebidas",
+    "Activities": "Actividades",
+    "Travel & Places": "Viajes y lugares",
+    "Objects": "Objetos",
+    "Symbols": "Símbolos",
+    "Flags": "Banderas",
+    "Quick Reactions": "Reacciones rápidas",
+    "Cancel search": "Cancelar búsqueda",
+    "Any of the following data may be shared:": "Cualquiera de los siguientes datos puede ser compartido:",
+    "Your display name": "Su nombre mostrado",
+    "Your avatar URL": "La URL de su avatar",
+    "Your user ID": "Su identificación (ID) de usuario",
+    "Your theme": "Su tema",
+    "%(brand)s URL": "URL de %(brand)s",
+    "Room ID": "Identidad (ID) de la sala",
+    "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.",
+    "Widget added by": "Widget añadido por",
+    "This widget may use cookies.": "Este widget posiblemente utilice cookies.",
+    "Maximize apps": "Maximizar apps",
+    "More options": "Mas opciones",
+    "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Por favor, <newIssueLink>crea un nuevo nodo </newIssueLink> en GitHub para que podamos investigar este error.",
+    "Rotate Left": "Girar a la izquierda",
+    "Upload completed": "Subida completada",
+    "Cancelled signature upload": "Subida de firma cancelada",
+    "Unable to upload": "No se puede subir",
+    "Signature upload success": "Subida de firma exitosa",
+    "Signature upload failed": "Subida de firma falló",
+    "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 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.",
+    "Command Help": "Ayuda del comando",
+    "Integration Manager": "Administrador de integración",
+    "Verify other session": "Verifique otra sesión",
+    "Verification Request": "Solicitud de verificación",
+    "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.": "Un widget localizado en %(widgetUrl)s desea verificar su identidad. Permitiendo esto, el widget podrá verificar su identidad de usuario, pero no realizar acciones como usted.",
+    "Enter recovery passphrase": "Introduzca la contraseña de recuperación",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "No se puede acceder al almacenamiento secreto. Por favor, compruebe que ha introducido la frase de recuperación correcta.",
+    "Enter recovery key": "Introduzca la clave de recuperación",
+    "This looks like a valid recovery key!": "¡Esto tiene pinta de una llave de recuperación válida!",
+    "Not a valid recovery key": "Clave de recuperación no válida",
+    "Restoring keys from backup": "Restaurando las claves desde copia de seguridad",
+    "Fetching keys from server...": "Obteniendo las claves desde el servidor...",
+    "%(completed)s of %(total)s keys restored": "%(completed)s de %(total)s llaves restauradas",
+    "Unable to load backup status": "No se puede cargar el estado de la copia de seguridad",
+    "Recovery key mismatch": "No coincide la clave de recuperación",
+    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "La copia de seguridad no pudo ser descifrada con esta clave de recuperación: por favor, comprueba que hayas introducido la clave de recuperación correcta.",
+    "Incorrect recovery passphrase": "Contraseña de recuperación incorrecta",
+    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "La copia de seguridad no pudo ser descifrada con esta contraseña de recuperación: por favor, comprueba que hayas introducido la contraseña de recuperación correcta.",
+    "Unable to restore backup": "No se pudo restaurar la copia de seguridad",
+    "No backup found!": "¡No se encontró una copia de seguridad!",
+    "Keys restored": "Se restauraron las claves",
+    "Failed to decrypt %(failedCount)s sessions!": "¡Error en descifrar %(failedCount) sesiones!",
+    "Successfully restored %(sessionCount)s keys": "%(sessionCount)s claves restauradas con éxito",
+    "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Advertencia</b>: deberías configurar la copia de seguridad de claves solamente usando un ordenador de confianza.",
+    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Acceda a su historial de mensajes seguros y configure la mensajería segura introduciendo su contraseña de recuperación.",
+    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Si has olvidado tu contraseña de recuperación puedes <button1> usar tu clave de recuperación </button1> o <button2> configurar nuevas opciones de recuperación </button2>",
+    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Advertencia</b>: Configurar la copia de seguridad de claves solamente usando un ordenador de confianza.",
+    "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 removal": "Reenviar la eliminación",
+    "Share Permalink": "Compartir Permalink",
+    "Report Content": "Reportar contenido",
+    "Notification settings": "Configuración de notificaciones",
+    "Clear status": "Borrar estado",
+    "Update status": "Actualizar estado",
+    "Set status": "Establecer estado",
+    "Set a new status...": "Establecer un estado nuevo...",
+    "Hide": "Ocultar",
+    "Help": "Ayuda",
+    "Reload": "Recargar",
+    "Take picture": "Tomar una foto",
+    "Remove for everyone": "Eliminar para todos",
+    "Remove for me": "Eliminar para mi",
+    "User Status": "Estado de usuario",
+    "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:",
+    "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>.",
+    "Server Name": "Nombre del servidor",
+    "The username field must not be blank.": "El campo del nombre de usuario no puede estar en blanco.",
+    "Username": "Nombre de usuario",
+    "Not sure of your password? <a>Set a new one</a>": "¿No estás seguro de tu contraseña? <a>Escoge una nueva</a>",
+    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "No se ha configurado ningún servidor de identidad, por lo que no se puede añadir una dirección de correo electrónico para restablecer la contraseña en el futuro.",
+    "Use an email address to recover your account": "Utilice una dirección de correo electrónico para recuperar su cuenta",
+    "Enter email address (required on this homeserver)": "Introduzca una dirección de correo electrónico (requerida en este servidor)",
+    "Doesn't look like a valid email address": "No parece una dirección de correo electrónico válida",
+    "Enter password": "Introduzca su contraseña",
+    "Password is allowed, but unsafe": "Contraseña permitida, pero no es segura",
+    "Nice, strong password!": "¡Fantástico, una contraseña fuerte!",
+    "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)",
+    "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",
+    "Email (optional)": "Correo electrónico (opcional)",
+    "Phone (optional)": "Teléfono (opcional)",
+    "Create your Matrix account on %(serverName)s": "Crea tu cuenta de Matrix en %(serverName)s",
+    "Create your Matrix account on <underlinedServerName />": "Crea tu cuenta de Matrix en <underlinedServerName />",
+    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Configura un correo electrónico para la recuperación de la cuenta. Opcionalmente utilice correo electrónico o teléfono para que los contactos existentes puedan descubrirlo.",
+    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Configura un correo electrónico para la recuperación de la cuenta. Opcionalmente utilice el correo electrónico para poder ser descubierto por contactos existentes.",
+    "Enter your custom homeserver URL <a>What does this mean?</a>": "Ingrese la URL de su servidor doméstico <a>¿Qué significa esto?</a>",
+    "Homeserver URL": "URL del servidor doméstico",
+    "Enter your custom identity server URL <a>What does this mean?</a>": "Introduzca la URL de su servidor de identidad personalizada <a> ¿Qué significa esto?</a>",
+    "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",
+    "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",
+    "Sign in to your Matrix account on %(serverName)s": "Inicie sesión en su cuenta de Matrix en %(serverName)s",
+    "Sign in to your Matrix account on <underlinedServerName />": "Inicie sesión en su cuenta de Matrix en <underlinedServerName />",
+    "Sign in with SSO": "Ingrese con SSO",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Por favor, instale <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, o <safariLink>Safari</safariLink> para la mejor experiencia.",
+    "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",
+    "Welcome to %(appName)s": "Bienvenido a %(appName)s",
+    "Liberate your communication": "Libere su comunicación",
+    "Send a Direct Message": "Envía un mensaje directo",
+    "Explore Public Rooms": "Explorar salas públicas",
+    "Create a Group Chat": "Crear un chat grupal",
+    "Explore": "Explorar",
+    "Filter": "Filtrar",
+    "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 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",
+    "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>.",
+    "Explore rooms": "Explorar salas",
+    "Jump to first invite.": "Salte a la primera invitación.",
+    "Add room": "Añadir sala",
+    "Guest": "Invitado",
+    "Your profile": "Su perfil",
+    "Could not load user profile": "No se pudo cargar el perfil de usuario",
+    "Verify this login": "Verifique este inicio de sesión",
+    "Session verified": "Sesión verificada",
+    "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.": "Cambiar la contraseña restablecerá cualquier clave de cifrado de extremo a extremo en todas sus sesiones, haciendo ilegible el historial de chat cifrado. Configura la copia de seguridad de las claves o exporta las claves de la sala de otra sesión antes de restablecer la contraseña.",
+    "Your Matrix account on %(serverName)s": "Su cuenta de Matrix en %(serverName)s",
+    "Your Matrix account on <underlinedServerName />": "Su cuenta de Matrix en <underlinedServerName />",
+    "No identity server is configured: add one in server settings to reset your password.": "No hay ningún servidor de identidad configurado: añada uno en la configuración del servidor para poder restablecer su contraseña.",
+    "Sign in instead": "Regístrese",
+    "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",
+    "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",
+    "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 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)",
+    "Help us improve %(brand)s": "Ayúdanos a mejorar %(brand)s",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Enviar <UsageDataLink>información anónima de uso</UsageDataLink> nos ayudaría bastante a mejorar %(brand)s. Esto cuenta como utilizar <PolicyLink>una cookie</PolicyLink>.",
+    "I want to help": "Quiero ayudar",
+    "Ok": "Ok",
+    "Set password": "Establecer contraseña",
+    "To return to your account in future you need to set a password": "Para poder regresar a tu cuenta en un futuro necesitas establecer una contraseña",
+    "Restart": "Reiniciar",
+    "Upgrade your %(brand)s": "Actualiza tu %(brand)s",
+    "A new version of %(brand)s is available!": "¡Una nueva versión de %(brand)s se encuentra disponible!",
+    "You joined the call": "Te has unido a la llamada",
+    "%(senderName)s joined the call": "%(senderName)s se ha unido a la llamada",
+    "Call in progress": "Llamada en progreso",
+    "You left the call": "Has abandonado la llamada",
+    "%(senderName)s left the call": "%(senderName)s dejo la llamada",
+    "Call ended": "La llamada ha finalizado",
+    "You started a call": "Has iniciado una llamada",
+    "%(senderName)s started a call": "%(senderName)s inicio una llamada",
+    "Waiting for answer": "Esperado por una respuesta",
+    "%(senderName)s is calling": "%(senderName)s está llamando",
+    "%(senderName)s created the room": "%(senderName)s creo la sala",
+    "You were invited": "Has sido invitado",
+    "%(targetName)s was invited": "%(targetName)s ha sido invitado",
+    "%(targetName)s left": "%(targetName)s se ha ido",
+    "You were kicked (%(reason)s)": "Has sido expulsado por %(reason)s",
+    "You rejected the invite": "Has rechazado la invitación",
+    "%(targetName)s rejected the invite": "%(targetName)s rechazo la invitación",
+    "You were banned (%(reason)s)": "Has sido baneado por %(reason)s",
+    "%(targetName)s was banned (%(reason)s)": "%(targetName)s fue baneado por %(reason)s",
+    "You were banned": "Has sido baneado",
+    "%(targetName)s was banned": "%(targetName)s fue baneado",
+    "You joined": "Te has unido",
+    "%(targetName)s joined": "%(targetName)s se ha unido",
+    "You changed your name": "Has cambiado tu nombre",
+    "%(targetName)s changed their name": "%(targetName)s cambio su nombre",
+    "You changed your avatar": "Ha cambiado su avatar",
+    "%(targetName)s changed their avatar": "%(targetName)s ha cambiado su avatar",
+    "You changed the room name": "Has cambiado el nombre de la sala",
+    "%(senderName)s changed the room name": "%(senderName)s cambio el nombre de la sala",
+    "You invited %(targetName)s": "Has invitado a %(targetName)s"
 }
diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 5d60c1c5d9..95253f5256 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -5,30 +5,23 @@
     "Add Email Address": "Lisa e-posti aadress",
     "Failed to verify email address: make sure you clicked the link in the email": "E-posti aadressi kontrollimine ei õnnestunud: palun vaata, et sa kindlasti klõpsisid saabunud kirjas olnud viidet",
     "The platform you're on": "Sinu kasutatav arvutisüsteem",
-    "The version of Riot": "Riot'i versioon",
-    "Whether or not you're logged in (we don't record your username)": "Kas sa oled sisseloginud või  mitte (me ei salvesta sinu kasutajanime)",
+    "The version of %(brand)s": "%(brand)s'i versioon",
+    "Whether or not you're logged in (we don't record your username)": "Kas sa oled sisseloginud või mitte (me ei salvesta sinu kasutajanime)",
     "Your language of choice": "Sinu keelevalik",
     "Your homeserver's URL": "Sinu koduserveri aadress",
     "e.g. <CurrentPageURL>": "näiteks <CurrentPageURL>",
     "Your user agent": "Sinu kasutajaagent",
     "Your device resolution": "Sinu seadme resolutsioon",
     "Analytics": "Analüütika",
-    "The information being sent to us to help make Riot better includes:": "Riot'i arendamiseks meile saadetava info hulgas on:",
+    "The information being sent to us to help make %(brand)s better includes:": "%(brand)s'i arendamiseks meile saadetava info hulgas on:",
     "Error": "Viga",
     "Unable to load! Check your network connectivity and try again.": "Laadimine ei õnnestunud! Kontrolli oma võrguühendust ja proovi uuesti.",
     "Dismiss": "Loobu",
     "Call Failed": "Kõne ebaõnnestus",
-    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Selles jututoas on teadmata sessioone: kui sa jätkad ilma nende verifitseerimiseta, siis kolmas osapool võib kuulata seda kõnet pealt.",
-    "Review Sessions": "Vaata sessioonid üle",
-    "Call Anyway": "Helista ikkagi",
-    "Answer Anyway": "Vasta ikkagi",
-    "Call": "Helista",
-    "Answer": "Vasta",
     "Call Timeout": "Kõne aegumine",
     "The remote side failed to pick up": "Teine osapool ei võtnud kõnet vastu",
     "Call failed due to misconfigured server": "Kõne ebaõnnestus valesti seadistatud serveri tõttu",
     "Cancel": "Loobu",
-    "Send anyway": "Saada siiski",
     "Send": "Saada",
     "Jan": "jaan",
     "Feb": "veeb",
@@ -47,7 +40,7 @@
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
     "Verify this session": "Verifitseeri see sessioon",
     "Which rooms would you like to add to this community?": "Milliseid jututubasid sooviksid lisada siia kogukonda?",
-    "Show these rooms to non-members on the community page and room list?": "Kas näitan neid jututubasid kogukonna lehel ja tubade loendis mitte-liikmetele?",
+    "Show these rooms to non-members on the community page and room list?": "Kas näitan neid jututubasid kogukonna lehel ja tubade loendis kogukonna mitte-liikmetele?",
     "Add rooms to the community": "Lisa siia kogukonda jututubasid",
     "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",
@@ -63,9 +56,8 @@
     "Verify this session by completing one of the following:": "Verifitseeri see sessioon täites ühe alljärgnevatest:",
     "Verify this user by confirming the following emoji appear on their screen.": "Verifitseeri see kasutaja tehes kindlaks et järgnev emoji kuvatakse tema ekraanil.",
     "Verify this session by confirming the following number appears on its screen.": "Verifitseeri see sessioon tehes kindlaks, et järgnev number kuvatakse tema ekraanil.",
-    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "Riot'i kasutamisega seotud abiteabe otsimiseks klõpsi <a>seda viidet</a> või vajutades järgnevat nuppu alusta vestlust meie robotiga.",
-    "Chat with Riot Bot": "Vestle Riot'i robotiga",
-    "Start a chat": "Alusta vestlust",
+    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "%(brand)s'i kasutamisega seotud abiteabe otsimiseks klõpsi <a>seda viidet</a> või vajutades järgnevat nuppu alusta vestlust meie robotiga.",
+    "Chat with %(brand)s Bot": "Vestle %(brand)s'i robotiga",
     "Invite to this room": "Kutsu siia jututuppa",
     "Voice call": "Häälkõne",
     "Video call": "Videokõne",
@@ -75,8 +67,6 @@
     "Send a reply…": "Saada vastus…",
     "Send an encrypted message…": "Saada krüptitud sõnum…",
     "Send a message…": "Saada sõnum…",
-    "Send a reply (unencrypted)…": "Saada krüptimata vastus…",
-    "Send a message (unencrypted)…": "Saada krüpteerimata sõnum…",
     "The conversation continues here.": "Vestlus jätkub siin.",
     "Recent rooms": "Hiljutised jututoad",
     "No rooms to show": "Ei saa kuvada ühtegi jututuba",
@@ -108,10 +98,6 @@
     "Encryption enabled": "Krüptimine on kasutusel",
     "Add rooms to this community": "Lisa siia kogukonda jututubasid",
     "Create new room": "Loo uus jututuba",
-    "Unblacklist": "Eemalda mustast nimekirjast",
-    "Blacklist": "Kanna musta nimekirja",
-    "Unverify": "Eemalda õigeks tunnistamine",
-    "Verify...": "Tunnista õigeks...",
     "Join": "Liitu",
     "No results": "Tulemusi pole",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Selle vea uurimiseks palun <newIssueLink>loo uus veateade</newIssueLink> meie GitHub'is.",
@@ -129,7 +115,7 @@
     "Matrix rooms": "Matrix'i jututoad",
     "Explore Room State": "Uuri jututoa olekut",
     "Explore Account Data": "Uuri konto andmeid",
-    "Private Chat": "Privaatne vestlus",
+    "Private Chat": "Omavaheline privaatne vestlus",
     "Public Chat": "Avalik vestlus",
     "Other users can invite you to rooms using your contact details": "Teades sinu kontaktinfot võivad teised kutsuda sind osalema jututubades",
     "Add rooms to the community summary": "Lisa jututoad kogukonna ülevaatesse",
@@ -144,5 +130,2278 @@
     "Explore rooms": "Uuri jututubasid",
     "If you've joined lots of rooms, this might take a while": "Kui oled liitunud paljude jututubadega, siis see võib natuke aega võtta",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Kui see seadistus pole kasutusel, siis krüptitud jututubade sõnumeid otsing ei vaata.",
-    "Indexed rooms:": "Indekseeritud jututoad:"
+    "Indexed rooms:": "Indekseeritud jututoad:",
+    "Remove": "Eemalda",
+    "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.": "Sa peaksid enne ühenduse katkestamisst <b>eemaldama isiklikud andmed</b> id-serverist <idserver />. Kahjuks id-server <idserver /> ei ole hetkel võrgus või pole kättesaadav.",
+    "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Me soovitame, et eemaldad enne ühenduse katkestamist oma e-posti aadressi ja telefoninumbrid isikutuvastusserverist.",
+    "Remove messages": "Kustuta sõnumeid",
+    "Unable to remove contact information": "Kontaktiinfo eemaldamine ebaõnnestus",
+    "Remove %(email)s?": "Eemalda %(email)s?",
+    "Remove %(phone)s?": "Eemalda %(phone)s?",
+    "Remove recent messages by %(user)s": "Eemalda %(user)s hiljutised sõnumid",
+    "Replying With Files": "Vasta faili(de)ga",
+    "Invite new community members": "Kutsu uusi liikmeid kogukonda",
+    "rooms.": "jututubadest.",
+    "Notify for all other messages/rooms": "Teavita kõikidest teistest sõnumitest/jututubadest",
+    "Members only (since the point in time of selecting this option)": "Ainult liikmetele (alates selle seadistuse kasutuselevõtmisest)",
+    "Members only (since they were invited)": "Ainult liikmetele (alates nende kutsumise ajast)",
+    "Members only (since they joined)": "Ainult liikmetele (alates liitumisest)",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "Oled kustutamas %(user)s %(count)s sõnumit. Seda tegevust ei saa hiljem tagasi pöörata. Kas sa kindlasti soovid jätkata?",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "Oled kustutamas ühte %(user)s sõnumit. Seda tegevust ei saa hiljem tagasi pöörata. Kas sa kindlasti soovid jätkata?",
+    "Remove %(count)s messages|other": "Eemalda %(count)s sõnumit",
+    "Remove %(count)s messages|one": "Eemalda 1 sõnum",
+    "Remove recent messages": "Eemalda hiljutised sõnumid",
+    "Filter room members": "Filtreeri jututoa liikmeid",
+    "Members": "Liikmed",
+    "Files": "Failid",
+    "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",
+    "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.",
+    "Failed to remove room from community": "Jututoa eemaldamine kogukonnast ebaõnnestus",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "Jututoa %(roomName)s eemaldamine %(groupId)s kogukonnast ebaõnnestus",
+    "Only visible to community members": "Nähtav ainult kogukonna liikmetele",
+    "Filter community rooms": "Filtreeri kogukonna jututubasid",
+    "Failed to remove widget": "Vidina eemaldamine ebaõnnestus",
+    "An error ocurred whilst trying to remove the widget from the room": "Vidina eemaldamisel jututoast tekkis viga",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "Kas sa oled kindel et soovid eemadlada <b>%(serverName)s</b>",
+    "Remove server": "Eemalda server",
+    "%(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 teemanime.",
+    "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",
+    "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",
+    "Unable to reject invite": "Ei õnnestu kutset tagasi lükata",
+    "Resend": "Saada uuesti",
+    "Resend edit": "Saada muudetud sõnum uuesti",
+    "Resend %(unsentCount)s reaction(s)": "Saada uuesti %(unsentCount)s reaktsioon(i)",
+    "Resend removal": "Saada eemaldamine uuesti",
+    "Cancel Sending": "Tühista saatmine",
+    "Forward Message": "Edasta sõnum",
+    "Pin Message": "Klammerda sõnum",
+    "View Decrypted Source": "Vaata dekrüptitud lähtekoodi",
+    "Unhide Preview": "Näita eelvaadet",
+    "Share Permalink": "Jaga püsiviidet",
+    "Share Message": "Jaga sõnumit",
+    "Source URL": "Lähteaadress",
+    "Collapse Reply Thread": "Ahenda vastuste jutulõnga",
+    "Notification settings": "Teavituste seadistused",
+    "All messages (noisy)": "Kõik sõnumid (lärmakas)",
+    "All messages": "Kõik sõnumid",
+    "Mentions only": "Ainult mainimised",
+    "Leave": "Lahku",
+    "Forget": "Unusta",
+    "Favourite": "Lemmik",
+    "Low Priority": "Vähetähtis",
+    "Direct Chat": "Otsevestlus",
+    "Clear status": "Eemalda olek",
+    "Update status": "Uuenda olek",
+    "Set status": "Määra olek",
+    "Set a new status...": "Määra uus olek...",
+    "View Community": "Näita kogukonda",
+    "Hide": "Peida",
+    "Home": "Avaleht",
+    "Sign in": "Logi sisse",
+    "Help": "Abiteave",
+    "Reload": "Lae uuesti",
+    "Take picture": "Tee foto",
+    "Remove for everyone": "Eemalda kõigilt",
+    "Remove for me": "Eemalda minult",
+    "User Status": "Kasutaja olek",
+    "You must join the room to see its files": "Failide nägemiseks pead jututoaga liituma",
+    "There are no visible files in this room": "Jututoas pole nähtavaid faile",
+    "Failed to remove the room from the summary of %(groupId)s": "Jututoa eemaldamine %(groupId)s kogukonna ülevaatelehelt ebaõnnestus",
+    "Failed to remove a user from the summary of %(groupId)s": "Kasutaja eemaldamine %(groupId)s kogukonna ülevaatelehelt ebaõnnestus",
+    "Create a Group Chat": "Loo rühmavestlus",
+    "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?",
+    "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",
+    "Room List": "Jututubade loend",
+    "Alt": "Alt",
+    "Alt Gr": "Alt Gr",
+    "Shift": "Shift",
+    "Super": "Super",
+    "Ctrl": "Ctrl",
+    "Toggle Bold": "Lülita paks kiri sisse/välja",
+    "Toggle Italics": "Lülita kaldkiri sisse/välja",
+    "Toggle Quote": "Lülita tsiteerimine sisse/välja",
+    "New line": "Reavahetus",
+    "Cancel replying to a message": "Tühista sõnumile vastamine",
+    "Toggle microphone mute": "Lülita mikrofoni summutamine sisse/välja",
+    "Toggle video on/off": "Lülita video kasutamine sisse/välja",
+    "Jump to room search": "Suundu jututoa otsingusse",
+    "Navigate up/down in the room list": "Suundu jututubade loendis üles/alla",
+    "Select room from the room list": "Vali tubade loendist jututuba",
+    "Collapse room list section": "Ahenda jututubade loendi valikut",
+    "Expand room list section": "Laienda jututubade loendi valikut",
+    "Create Account": "Loo konto",
+    "Sign In": "Logi sisse",
+    "Send a bug report with logs": "Saada veakirjeldus koos logikirjetega",
+    "Group & filter rooms by custom tags (refresh to apply changes)": "Rühmita ja filtreeri jututubasid kohandatud siltide alusel (muudatuste rakendamiseks värskenda vaade)",
+    "Try out new ways to ignore people (experimental)": "Proovi uusi kasutajate eiramise viise (katseline)",
+    "Uploading report": "Laen üles veakirjeldust",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Kui soovid teatada Matrix'iga seotud turvaveast, siis palun tutvu enne Matrix.org <a>Turvalisuse avalikustamise juhendiga</a>.",
+    "Server or user ID to ignore": "Serverid või kasutajate tunnused, mida soovid eirata",
+    "Ignore": "Eira",
+    "If this isn't what you want, please use a different tool to ignore users.": "Kui tulemus pole see mida soovisid, siis pruugi muud vahendit kasutajate eiramiseks.",
+    "Mention": "Maini",
+    "Share Link to User": "Jaga viidet kasutaja kohta",
+    "Admin Tools": "Haldustoimingud",
+    "Online": "Võrgus",
+    "Reject & Ignore user": "Hülga ja eira kasutaja",
+    "%(count)s unread messages including mentions.|one": "1 lugemata mainimine.",
+    "Filter results": "Filtreeri tulemusi",
+    "Report bugs & give feedback": "Teata vigadest ja anna tagasisidet",
+    "Report Content to Your Homeserver Administrator": "Teata sisust Sinu koduserveri haldurile",
+    "Send report": "Saada veateade",
+    "(HTTP status %(httpStatus)s)": "(HTTP staatuse kood %(httpStatus)s)",
+    "Please set a password!": "Palun määra salasõna!",
+    "This will allow you to return to your account after signing out, and sign in on other sessions.": "See võimaldab sul tagasi tulla oma kasutajakonto juurde ka peale väljalogimist ning logida sisse muudesse sessioonidesse.",
+    "Share Room": "Jaga jututuba",
+    "Link to most recent message": "Viide kõige viimasele sõnumile",
+    "Share User": "Jaga viidet kasutaja kohta",
+    "Share Community": "Jaga viidet kogukonna kohta",
+    "Share Room Message": "Jaga jututoa sõnumit",
+    "Link to selected message": "Viide valitud sõnumile",
+    "COPY": "KOPEERI",
+    "Command Help": "Abiteave käskude kohta",
+    "To help us prevent this in future, please <a>send us logs</a>.": "Tagamaks et sama ei juhtuks tulevikus, palun <a>saada meile salvestatud logid</a>.",
+    "Missing session data": "Sessiooni andmed on puudu",
+    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Osa sessiooniandmetest, sealhulgas sõnumi krüptovõtmed, on puudu. Vea parandamiseks logi välja ja sisse, vajadusel taasta võtmed varundusest.",
+    "Your browser likely removed this data when running low on disk space.": "On võimalik et sinu brauser kustutas need andmed, sest kõvakettaruumist jäi puudu.",
+    "Integration Manager": "Lõiminguhaldur",
+    "Find others by phone or email": "Leia teisi kasutajaid telefoninumbri või e-posti aadressi alusel",
+    "Be found by phone or email": "Ole leitav telefoninumbri või e-posti aadressi alusel",
+    "Terms of Service": "Kasutustingimused",
+    "To continue you need to accept the terms of this service.": "Jätkamaks pead nõustuma kasutustingimustega.",
+    "Service": "Teenus",
+    "Summary": "Kokkuvõte",
+    "Document": "Dokument",
+    "Next": "Järgmine",
+    "Report Content": "Teata sisust haldurile",
+    "powered by Matrix": "põhineb Matrix'il",
+    "Custom Server Options": "Serveri kohaldatud seadistused",
+    "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Robotilõksu avalik võti on puudu koduserveri seadistustes. Palun teata sellest oma koduserveri haldurile.",
+    "Filter": "Filtreeri",
+    "Clear filter": "Eemalda filter",
+    "Copy": "Kopeeri",
+    "Clear room list filter field": "Tühjenda jututubade filtriväli",
+    "Mute": "Summuta",
+    "Settings": "Seadistused",
+    "You're not currently a member of any communities.": "Sa ei ole hetkel ainsamagi kogukonna liige.",
+    "Create a new community": "Loo uus kogukond",
+    "Never send encrypted messages to unverified sessions from this session": "Ära iialgi saada sellest sessioonist krüptitud sõnumeid verifitseerimata sessioonidesse",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Ära iialgi saada sellest sessioonist krüptitud sõnumeid verifitseerimata sessioonidesse selles jututoas",
+    "Sign In or Create Account": "Logi sisse või loo uus konto",
+    "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.",
+    "Encrypted": "Krüptitud",
+    "Who can access this room?": "Kes pääsevad ligi siia jututuppa?",
+    "Who can read history?": "Kes võivad lugeda ajalugu?",
+    "Encrypted by an unverified session": "Krüptitud verifitseerimata sessiooni poolt",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Sõnumid selles jututoas on läbivalt krüptitud. Uuri lisaks ja verifitseeri see kasutaja tema kasutajaprofiilis.",
+    "Encryption not enabled": "Krüptimine ei ole kasutusel",
+    "The encryption used by this room isn't supported.": "Selles jututoas kasutatud krüptimine ei ole toetatud.",
+    "Error decrypting audio": "Viga helivoo dekrüptimisel",
+    "React": "Reageeri",
+    "Reply": "Vasta",
+    "Edit": "Muuda",
+    "Message Actions": "Tegevused sõnumitega",
+    "Attachment": "Manus",
+    "Error decrypting attachment": "Viga manuse dekrüptimisel",
+    "Decrypt %(text)s": "Dekrüpti %(text)s",
+    "Download %(text)s": "Lae alla %(text)s",
+    "Invalid file%(extra)s": "Vigane fail %(extra)s",
+    "Error decrypting image": "Viga pildi dekrüptimisel",
+    "Show image": "Näita pilti",
+    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Sa oled seda kasutajat eiranud ja seega tema sõnum on peidetud. <a>Näita seda ikkagi.</a>",
+    "You verified %(name)s": "Sa verifitseerisid %(name)s",
+    "You cancelled verifying %(name)s": "Sa tühistasid %(name)s verifitseerimise",
+    "%(name)s cancelled verifying": "%(name)s tühistas verifitseerimise",
+    "You accepted": "Sa nõustusid",
+    "%(name)s accepted": "%(name)s nõustus",
+    "You declined": "Sa keeldusid",
+    "You cancelled": "Sa tühistasid",
+    "%(name)s declined": "%(name)s keeldus",
+    "%(name)s cancelled": "%(name)s tühistas",
+    "Accepting …": "Nõustun …",
+    "Declining …": "Keeldun …",
+    "%(name)s wants to verify": "%(name)s soovib verifitseerida",
+    "You sent a verification request": "Sa saatsid verifitseerimispalve",
+    "Error decrypting video": "Viga videovoo dekrüptimisel",
+    "Show all": "Näita kõiki",
+    "Reactions": "Reageerimised",
+    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reageeris: %(content)s</reactedWith>",
+    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>reageeris(id) %(shortName)s</reactedWith>",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s muutis %(roomName)s jututoa avatari",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s eemaldas jututoa avatari.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s vahetas jututoa avatariks <img/>",
+    "This room is a continuation of another conversation.": "See jututuba on järg varasemale vestlusele.",
+    "Click here to see older messages.": "Vanemate sõnumite nägemiseks klõpsi siia.",
+    "Copied!": "Kopeeritud!",
+    "Failed to copy": "Kopeerimine ebaõnnestus",
+    "Edited at %(date)s. Click to view edits.": "Muudetud %(date)s. Klõpsi et näha varasemaid versioone.",
+    "edited": "muudetud",
+    "Can't load this message": "Selle sõnumi laadimine ei õnnestu",
+    "Submit logs": "Saada rakenduse logid",
+    "Invite to this community": "Kutsu selle kogukonna liikmeks",
+    "Something went wrong!": "Midagi läks nüüd valesti!",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Jututoa %(roomName)s nähtavust %(groupId)s kogukonnas ei õnnestunud värskendada.",
+    "Visibility in Room List": "Nähtavus jututubade loendis",
+    "Visible to everyone": "Nähtav kõigile",
+    "Something went wrong when trying to get your communities.": "Sinu kogukondade laadimisel läks midagi nüüd viltu.",
+    "You are not receiving desktop notifications": "Sa hetkel ei saa oma arvuti töölauakeskkonna teavitusi",
+    "Enable them now": "Võta need nüüd kasutusele",
+    "What's New": "Meie uudised",
+    "Update": "Uuenda",
+    "What's new?": "Mida on meil uut?",
+    "Your server": "Sinu server",
+    "Matrix": "Matrix",
+    "Add a new server": "Lisa uus server",
+    "Server name": "Serveri nimi",
+    "Add a new server...": "Lisa uus server...",
+    "Matrix ID": "Matrix'i kasutajatunnus",
+    "Matrix Room ID": "Matrix'i jututoa tunnus",
+    "email address": "e-posti aadress",
+    "That doesn't look like a valid email address": "See ei tundu olema e-posti aadressi moodi",
+    "You have entered an invalid address.": "Sa oled sisestanud vigase e-posti aadressi.",
+    "Try using one of the following valid address types: %(validTypesList)s.": "Proovi mõnda nendest sobilikest aadressitüüpidest: %(validTypesList)s.",
+    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Blokeeri teiste matrixi koduserverite kasutajate liitumine selle jututoaga (seda ei saa hiljem enam muuta!)",
+    "Create Room": "Loo jututuba",
+    "Sign out": "Logi välja",
+    "Incompatible Database": "Mitteühilduv andmebaas",
+    "Continue With Encryption Disabled": "Jätka ilma krüptimiseta",
+    "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Kui sa ei leia otsitavat jututuba, siis palu sinna kutset või <a>loo uus jututuba</a>.",
+    "%(duration)ss": "%(duration)s sekund(it)",
+    "%(duration)sm": "%(duration)s minut(it)",
+    "%(duration)sh": "%(duration)s tund(i)",
+    "%(duration)sd": "%(duration)s päev(a)",
+    "Online for %(duration)s": "Võrgus %(duration)s",
+    "Idle for %(duration)s": "Jõude %(duration)s",
+    "Offline for %(duration)s": "Võrgust väljas %(duration)s",
+    "Unknown for %(duration)s": "Teadmata olek viimased %(duration)s",
+    "Idle": "Jõude",
+    "Offline": "Võrgust väljas",
+    "Unknown": "Teadmata olek",
+    "Seen by %(userName)s at %(dateTime)s": "Nähtud %(userName)s poolt %(dateTime)s",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Nähtud %(displayName)s (%(userName)s) poolt %(dateTime)s",
+    "Replying": "Vastan",
+    "Room %(name)s": "Jututuba %(name)s",
+    "Unnamed room": "Nimeta jututuba",
+    "World readable": "Kogu maailmale avali",
+    "Guests can join": "Külalised võivad liituda",
+    "(~%(count)s results)|other": "(~%(count)s tulemust)",
+    "(~%(count)s results)|one": "(~%(count)s tulemus)",
+    "Join Room": "Liitu jututoaga",
+    "Forget room": "Unusta jututuba",
+    "Search": "Otsing",
+    "Share room": "Jaga jututuba",
+    "Community Invites": "Kutsed kogukonda",
+    "Invites": "Kutsed",
+    "Favourites": "Lemmikud",
+    "Low priority": "Vähetähtis",
+    "Historical": "Ammune",
+    "System Alerts": "Süsteemi teated",
+    "This room": "See jututuba",
+    "Joining room …": "Liitun jututoaga …",
+    "Loading …": "Laen …",
+    "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)",
+    "New published address (e.g. #alias:server)": "Uus avaldatud aadess (näiteks #alias:server)",
+    "New community ID (e.g. +foo:%(localDomain)s)": "Uus kogukonna tunnus (näiteks +midagi:%(localDomain)s)",
+    "e.g. my-room": "näiteks minu-jututuba",
+    "Can't find this server or its room list": "Ei leia seda serverit ega tema jututubade loendit",
+    "Couldn't find a matching Matrix room": "Ei leidnud vastavat Matrix'i jututuba",
+    "Find a room…": "Leia jututuba…",
+    "Find a room… (e.g. %(exampleRoom)s)": "Otsi jututuba… (näiteks %(exampleRoom)s)",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Üritasin laadida teatud hetke selle jututoa ajajoonelt, kuid ei suutnud seda leida.",
+    "Options": "Valikud",
+    "Searches DuckDuckGo for results": "Otsi DuckDuckGo abil",
+    "Securely cache encrypted messages locally for them to appear in search results, using ": "Turvaliselt puhverda krüptitud sõnumeid kohalikus arvutis selleks, et nad oleks otsitavad kasutades ",
+    "this room": "see jututuba",
+    "Quote": "Tsiteeri",
+    "This Room": "See jututuba",
+    "Sun": "Pühapäev",
+    "Mon": "Esmaspäev",
+    "Tue": "Teisipäev",
+    "Wed": "Kolmapäev",
+    "Thu": "Neljapäev",
+    "Fri": "Reede",
+    "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",
+    "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",
+    "New login. Was this you?": "Uus sisselogimine. Kas see olid sina?",
+    "Who would you like to add to this community?": "Kas sa sooviksid seda lisada kogukonda?",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Hoiatus: kõik kogukonda lisatud kasutajad on nähtavad kõigile, kes teavad kogukonna tunnust",
+    "Name or Matrix ID": "Nimi või Matrix'i tunnus",
+    "Invite to Community": "Kutsu kogukonda",
+    "Add to community": "Lisa kogukonda",
+    "Failed to invite the following users to %(groupId)s:": "Järgnevate kasutajate kutsumine %(groupId)s liikmeks ebaõnnestus:",
+    "Failed to invite users to community": "Kasutajate kutsumine kogukonda ebaõnnestus",
+    "Failed to invite users to %(groupId)s": "Kasutajate kutsumine %(groupId)s kogukonna liikmeks ebaõnnestus",
+    "Unnamed Room": "Ilma nimeta jututuba",
+    "Identity server has no terms of service": "Isikutuvastusserveril puuduvad kasutustingimused",
+    "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.": "E-posti aadressi või telefoninumbri kontrolliks see tegevus eeldab päringut vaikimisi isikutuvastusserverisse <server />, aga sellel serveril puuduvad kasutustingimused.",
+    "Only continue if you trust the owner of the server.": "Jätka vaid siis, kui sa usaldad serveri omanikku.",
+    "Trust": "Usalda",
+    "%(name)s is requesting verification": "%(name)s soovib verifitseerimist",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Turvaliselt puhverda krüptitud sõnumid kohalikku arvutisse ja võimalda kasutada neid otsingus.",
+    "%(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 on puudu need komponendid, mis võimaldavad otsida kohalikest turvaliselt puhverdatud krüptitud sõnumitest. Kui sa tahaksid sellist funktsionaalsust katsetada, siis pead kompileerima %(brand)s'i variandi, kus <nativeLink>need komponendid on lisatud</nativeLink>.",
+    "Message search": "Otsing sõnumite seast",
+    "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 :(",
+    "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",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s ei saanud luba teavituste kuvamiseks - palun proovi uuesti",
+    "Room Notification": "Jututoa teavitus",
+    "Displays information about a user": "Näitab teavet kasutaja kohta",
+    "This homeserver has hit its Monthly Active User limit.": "See koduserver on saavutanud igakuise aktiivsete kasutajate piiri.",
+    "about a minute ago": "umbes minut tagasi",
+    "about an hour ago": "umbes tund aega tagasi",
+    "%(num)s hours ago": "%(num)s tundi tagasi",
+    "about a day ago": "umbes päev tagasi",
+    "%(num)s days ago": "%(num)s päeva tagasi",
+    "about a minute from now": "umbes minuti pärast",
+    "about an hour from now": "umbes tunni pärast",
+    "%(num)s hours from now": "%(num)s tunni pärast",
+    "about a day from now": "umbes päeva pärast",
+    "%(num)s days from now": "%(num)s päeva pärast",
+    "Are you sure?": "Kas sa oled kindel?",
+    "Jump to read receipt": "Hüppa lugemisteatise juurde",
+    "Invite": "Kutsu",
+    "Unmute": "Eemalda summutamine",
+    "Create a public room": "Loo avalik jututuba",
+    "Create a private room": "Loo omavaheline jututuba",
+    "Name": "Nimi",
+    "Topic (optional)": "Teema (valikuline)",
+    "Make this room public": "Tee see jututuba avalikuks",
+    "Hide advanced": "Peida lisaseadistused",
+    "Show advanced": "Näita lisaseadistusi",
+    "Server did not require any authentication": "Server ei nõudnud mitte mingisugust autentimist",
+    "Recent Conversations": "Hiljutised vestlused",
+    "Suggestions": "Soovitused",
+    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Alusta vestlust kasutades teise osapoole nime, kasutajanime (näiteks <userId/>) või e-posti aadressi.",
+    "Go": "Mine",
+    "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.": "Sinu sõnumit ei saadetud, kuna see koduserver on saavutanud igakuise aktiivsete kasutajate piiri. Teenuse kasutamiseks palun <a>võta ühendust serveri haldajaga</a>.",
+    "Add room": "Lisa jututuba",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s kutsus vestlema kasutajat %(targetName)s.",
+    "%(targetName)s joined the room.": "%(targetName)s liitus jututoaga.",
+    "%(senderName)s answered the call.": "%(senderName)s vastas kõnele.",
+    "%(senderName)s ended the call.": "%(senderName)s lõpetas kõne.",
+    "%(senderName)s placed a voice call.": "%(senderName)s alustas häälkõnet.",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s alustas häälkõnet. (sellel brauseril puudub niisuguste kõnede tugi)",
+    "%(senderName)s placed a video call.": "%(senderName)s alustas videokõnet.",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s alustas videokõnet. (sellel brauseril puudub niisuguste kõnede tugi)",
+    "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s määras, et jututuppa pääseb vaid kutsega.",
+    "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s muutis liitumisreeglid järgnevaks - %(rule)s",
+    "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s on lubanud külalistel jututoaga liituda.",
+    "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s on määranud et külalised ei saa jututoaga liituda.",
+    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s muutis külaliste ligipääsureeglid alljärgnevaks - %(rule)s",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s saatis pildi.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s muutis selle jututoa põhiaadressiks %(address)s.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s eemaldas põhiaadressi sellest jututoast.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s lisas sellele jututoale täiendava aadressi %(addresses)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s lisas sellele jututoale täiendava aadressi %(addresses)s.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s eemaldas täiendavad aadressid %(addresses)s sellelt jututoalt.",
+    "%(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.",
+    "Someone": "Keegi",
+    "(not supported by this browser)": "(ei ole toetatud selles brauseris)",
+    "(could not connect media)": "(ühendus teise osapoolega ei õnnestunud)",
+    "(no answer)": "(ei ole vastust)",
+    "(unknown failure: %(reason)s)": "(teadmata viga: %(reason)s)",
+    "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s võttis %(targetDisplayName)s'lt tagasi jututoaga liitumise kutse.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s saatis %(targetDisplayName)s'le kutse jututoaga liitumiseks.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s määras, et jututoa tulevane ajalugu on nähtav kõikidele selle liikmetele nende kutsumise hetkest.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s määras, et jututoa tulevane ajalugu on nähtav kõikidele selle liikmetele nende liitumise hetkest.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s määras, et jututoa tulevane ajalugu on nähtav kõikidele selle liikmetele.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s seadistas, et jututoa tulevane ajalugu on kõigile nähtav.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s seadistas, et jututoa tulevase ajaloo nähtavuse olek on (%(visibility)s).",
+    "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s muutis vidinat %(widgetName)s",
+    "%(widgetName)s widget added by %(senderName)s": "%(senderName)s lisas vidina %(widgetName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s eemaldas vidina %(widgetName)s",
+    "Muted Users": "Summutatud kasutajad",
+    "This room is end-to-end encrypted": "See jututuba on läbivalt krüptitud",
+    "Everyone in this room is verified": "Kõik kasutajad siin nututoas on verifitseeritud",
+    "Edit message": "Muuda sõnumit",
+    "%(senderName)s sent an image": "%(senderName)s saatis pildi",
+    "%(senderName)s sent a video": "%(senderName)s saatis video",
+    "%(senderName)s uploaded a file": "%(senderName)s laadis üles faili",
+    "Your key share request has been sent - please check your other sessions for key share requests.": "Sinu krüptovõtme jagamise päring on saadetud - palun oma teisi sessioone krüptovõtme jagamise päringu osas.",
+    "This message cannot be decrypted": "Seda sõnumit ei sa dekrüptida",
+    "Unencrypted": "Krüptimata",
+    "Encrypted by a deleted session": "Krüptitud kustutatud sessiooni poolt",
+    "Please select the destination room for this message": "Palun vali jututuba, kuhu soovid seda sõnumit saata",
+    "Invite only": "Ainult kutse",
+    "Scroll to most recent messages": "Mine viimaste sõnumite juurde",
+    "Close preview": "Sulge eelvaade",
+    "Disinvite": "Eemalda kutse",
+    "Kick": "Müksa välja",
+    "Disinvite this user?": "Kas võtad selle kasutaja kutse tagasi?",
+    "Kick this user?": "Kas müksad selle kasutaja jututoast välja?",
+    "Failed to kick": "Jututoast väljamüksamine ei õnnestunud",
+    "No recent messages by %(user)s found": "Kasutajalt %(user)s ei leitud hiljutisi sõnumeid",
+    "Try scrolling up in the timeline to see if there are any earlier ones.": "Vaata kas ajajoonel ülespool leidub varasemaid sõnumeid.",
+    "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Kui sõnumeid on väga palju, siis võib nüüd aega kuluda. Oodates palun ära tee ühtegi päringut ega andmevärskendust.",
+    "Failed to mute user": "Kasutaja summutamine ebaõnnestus",
+    "%(creator)s created and configured the room.": "%(creator)s lõi ja seadistas jututoa.",
+    "Click to unmute video": "Klõpsi video heli taastamiseks",
+    "Click to mute video": "Klõpsi video heli summutamiseks",
+    "Click to unmute audio": "Klõpsi heli taastamiseks",
+    "Click to mute audio": "Klõpsi heli summutamiseks",
+    "Your profile": "Sinu profiil",
+    "How fast should messages be downloaded.": "Kui kiiresti peaksime sõnumeid alla laadima.",
+    "Error downloading theme information.": "Viga teema teabefaili allalaadimisel.",
+    "Close": "Sulge",
+    "Add a widget": "Lisa vidin",
+    "Drop File Here": "Lohista fail siia",
+    "Drop file here to upload": "Faili üleslaadimiseks lohista ta siia",
+    " (unsupported)": " (ei ole toetatud)",
+    "This user has not verified all of their sessions.": "See kasutaja ei ole verifitseerinud kõiki nende sessioone.",
+    "You have not verified this user.": "Sa ei ole seda kasutajat verifitseerinud.",
+    "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",
+    "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",
+    "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.",
+    "Currently indexing: %(currentRoom)s": "Parasjagu indekseerin: %(currentRoom)s",
+    "Space used:": "Kasutatud andmeruum:",
+    "Indexed messages:": "Indekseeritud sõnumid:",
+    "Failed to add tag %(tagName)s to room": "Sildi %(tagName)s lisamine jututoale ebaõnnestus",
+    "Close dialog or context menu": "Sulge dialoogiaken või kontekstimenüü",
+    "Page Up": "Page Up",
+    "Page Down": "Page Down",
+    "Esc": "Esc",
+    "Enter": "Enter",
+    "Space": "Tühikuklahv",
+    "End": "End",
+    "Unable to add email address": "E-posti aadressi lisamine ebaõnnestus",
+    "Add": "Lisa",
+    "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Sinu aadressi kontrollimiseks saatsime sulle e-kirja. Palun järgi kirjas näidatud juhendit ja siis klõpsi alljärgnevat nuppu.",
+    "Email Address": "E-posti aadress",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Saatsime tekstisõnumi numbrile +%(msisdn)s. Palun sisesta seal kuvatud kontrollkood.",
+    "Phone Number": "Telefoninumber",
+    "Cannot add any more widgets": "Rohkem vidinaid ei õnnestu lisada",
+    "The maximum permitted number of widgets have already been added to this room.": "Suurim lubatud vidinate arv on siia jututuppa juba lisatud.",
+    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Liitu kas <voiceText>häälkõnega</voiceText> või <videoText>videokõnega</videoText>.",
+    "Ongoing conference call%(supportedText)s.": "Toimuv rühmavestlus %(supportedText)s.",
+    "Advanced": "Teave arendajatele",
+    "Gets or sets the room topic": "Otsib või määrab jututoa teema",
+    "Sets the room name": "Määrab jututoa nime",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s eemaldas jututoa nime.",
+    "%(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 võrgusildade kohta",
+    "Upload": "Lae üles",
+    "Save": "Salvesta",
+    "General": "Üldist",
+    "Notifications": "Teavitused",
+    "Security & Privacy": "Turvalisus ja privaatsus",
+    "No Audio Outputs detected": "Ei leidnud ühtegi heliväljundit",
+    "No Microphones detected": "Ei leidnud ühtegi mikrofoni",
+    "No Webcams detected": "Ei leidnud ühtegi veebikaamerat",
+    "Default Device": "Vaikimisi seade",
+    "Audio Output": "Heliväljund",
+    "Microphone": "Mikrofon",
+    "Camera": "Kaamera",
+    "Voice & Video": "Heli ja video",
+    "This room is not accessible by remote Matrix servers": "See jututuba ei ole leitav teiste Matrix'i serverite jaoks",
+    "Upgrade this room to the recommended room version": "Uuenda see jututoa versioon soovitatud versioonini",
+    "View older messages in %(roomName)s.": "Näita vanemat tüüpi sõnumeid jututoas %(roomName)s.",
+    "Room information": "Info jututoa kohta",
+    "Internal room ID:": "Jututoa sisemine tunnus:",
+    "Room version": "Jututoa versioon",
+    "Room version:": "Jututoa versioon:",
+    "Developer options": "Valikud arendajale",
+    "Open Devtools": "Ava arendusvahendid",
+    "Change room name": "Muuda jututoa nime",
+    "Roles & Permissions": "Rollid ja õigused",
+    "Room Name": "Jututoa nimi",
+    "Room Topic": "Jututoa teema",
+    "Room Settings - %(roomName)s": "Jututoa seadistused - %(roomName)s",
+    "General failure": "Üldine viga",
+    "Where you’re logged in": "Kus sa oled võrku loginud",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Halda alljärgnevas oma sessioonide nimesid, logi neist välja või <a>verifitseeri neid oma kasutajaprofiilis</a>.",
+    "A session's public name is visible to people you communicate with": "Sessiooni avalik nimi on nähtav neile, kellega sa suhtled",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "Võimaldamaks meil rakendust parandada kogub %(brand)s anonüümset analüütikat.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privaatsus on meile oluline ning seega me ei kogu ei isiklikke ega isikustatavaid andmeid.",
+    "Learn more about how we use analytics.": "Loe lisaks kuidas me kasutama analüütikat.",
+    "No media permissions": "Meediaõigused puuduvad",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "Sa võib-olla pead andma %(brand)s'ile loa mikrofoni ja veebikaamera kasutamiseks",
+    "Missing media permissions, click the button below to request.": "Meediaga seotud õigused puuduvad. Nende nõutamiseks klõpsi järgnevat nuppu.",
+    "Request media permissions": "Nõuta meediaõigusi",
+    "Frequently Used": "Enamkasutatud",
+    "Smileys & People": "Vigurnäod ja inimesed",
+    "Animals & Nature": "Loomad ja loodus",
+    "Food & Drink": "Toit ja jook",
+    "Activities": "Tegevused",
+    "Travel & Places": "Reisimine ja kohad",
+    "Objects": "Esemed",
+    "Symbols": "Sümbolid",
+    "Flags": "Lipud",
+    "Quick Reactions": "Reageeri lennult",
+    "Unknown Address": "Teadmata aadress",
+    "Any of the following data may be shared:": "Järgnevaid andmeid võib jagada:",
+    "Your display name": "Sinu kuvatav nimi",
+    "Your avatar URL": "Sinu avatari aadress",
+    "Your user ID": "Sinu kasutajatunnus",
+    "Your theme": "Sinu teema",
+    "%(brand)s URL": "%(brand)s'i aadress",
+    "Room ID": "Jututoa tunnus",
+    "Widget ID": "Vidina tunnus",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s muutis oma kuvatava nime %(displayName)s-ks.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s määras oma kuvatava nime %(displayName)s-ks.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s eemaldas oma kuvatava nime (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s eemaldas om profiilipildi.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s muutis oma profiilipilti.",
+    "%(senderName)s set a profile picture.": "%(senderName)s määras oma profiilipildi.",
+    "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
+    "Your browser does not support the required cryptography extensions": "Sinu brauser ei toeta vajalikke krüptoteeke",
+    "Not a valid %(brand)s keyfile": "See ei ole sobilik võtmefail %(brand)s'i jaoks",
+    "Authentication check failed: incorrect password?": "Autentimine ebaõnnestus: kas salasõna pole õige?",
+    "Unrecognised address": "Tundmatu aadress",
+    "You do not have permission to invite people to this room.": "Sul pole õigusi siia jututuppa osalejate kutsumiseks.",
+    "User %(userId)s is already in the room": "Kasutaja %(userId)s on juba jututoas",
+    "User %(user_id)s does not exist": "Kasutajat %(user_id)s pole olemas",
+    "User %(user_id)s may or may not exist": "Kasutaja %(user_id)s võib olla olemas, aga võib ka mitte olla olemas",
+    "The user's homeserver does not support the version of the room.": "Kasutaja koduserver ei toeta selle jututoa versiooni.",
+    "Unknown server error": "Tundmatu serveriviga",
+    "This is a top-10 common password": "See on kümne levinuima salasõna seas",
+    "This is a top-100 common password": "See on saja levinuima salasõna seas",
+    "This is a very common password": "See on väga levinud salasõna",
+    "This is similar to a commonly used password": "See on sarnane tavaliselt kasutatavatele salasõnadele",
+    "Support adding custom themes": "Toeta kohandatud teemade lisamist",
+    "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!",
+    "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",
+    "Current password": "Praegune salasõna",
+    "Password": "Salasõna",
+    "New Password": "Uus salasõna",
+    "Confirm password": "Korda uut salasõna",
+    "Change Password": "Muuda salasõna",
+    "Failed to set display name": "Kuvatava nime määramine ebaõnnestus",
+    "Display Name": "Kuvatav nimi",
+    "Profile picture": "Profiilipilt",
+    "Failed to change password. Is your password correct?": "Salasõna muutmine ebaõnnestus. Kas sinu salasõna on ikka õige?",
+    "Invalid theme schema.": "Vigane teemafail.",
+    "Theme added!": "Teema sai lisatud!",
+    "Profile": "Profiil",
+    "Email addresses": "E-posti aadressid",
+    "Phone numbers": "Telefoninumbrid",
+    "Set a new account password...": "Määra kontole uus salasõna...",
+    "Account": "Kasutajakonto",
+    "Language and region": "Keel ja piirkond",
+    "Custom theme URL": "Kohandatud teema URL",
+    "Add theme": "Lisa teema",
+    "Theme": "Teema",
+    "Start verification again from their profile.": "Alusta verifitseerimist uuesti nende profiilist.",
+    "Set Password": "Määra salasõna",
+    "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Allpool loetletud Matrix'i kasutajatunnustele ei leidunud profiile. Kas sa ikkagi tahaksid neile kutse saata?",
+    "To continue, please enter your password:": "Jätkamiseks palun sisesta oma salasõna:",
+    "Your password": "Sinu salasõna",
+    "We recommend you change your password and recovery key in Settings immediately": "Me soovitame et vaheta koheselt Seadistuste lehelt oma salasõna ja taastevõti",
+    "Could not load user profile": "Kasutajaprofiili laadimine ei õnnestunud",
+    "Set a display name:": "Määra kuvatav nimi:",
+    "Send typing notifications": "Anna märku teisele osapoolele, kui mina sõnumit kirjutan",
+    "Show typing notifications": "Anna märku, kui teine osapool sõnumit kirjutab",
+    "Automatically replace plain text Emoji": "Automaatelt asenda vormindamata tekst emotikoniga",
+    "Mirror local video feed": "Peegelda kohalikku videovoogu",
+    "Enable Community Filter Panel": "Kasuta kogukondade filtreerimispaneeli",
+    "Allow Peer-to-Peer for 1:1 calls": "Luba võrdõigusvõrgu loogikat kasutavad omavahelised kõned",
+    "Send analytics data": "Saada arendajatele analüütikat",
+    "Enable inline URL previews by default": "Luba URL'ide vaikimisi eelvaated",
+    "Enable URL previews for this room (only affects you)": "Luba URL'ide eelvaated selle jututoa jaoks (mõjutab vaid sind)",
+    "Enable URL previews by default for participants in this room": "Luba URL'ide vaikimisi eelvaated selles jututoas osalejate jaoks",
+    "Room Colour": "Jututoa värv",
+    "Enable widget screenshots on supported widgets": "Kui vidin seda toetab, siis luba tal teha ekraanitõmmiseid",
+    "Prompt before sending invites to potentially invalid matrix IDs": "Hoiata enne kutse saatmist võimalikule vigasele Matrix'i kasutajatunnusele",
+    "Show developer tools": "Näita arendaja tööriistu",
+    "Show hidden events in timeline": "Näita peidetud sündmusi ajajoonel",
+    "Low bandwidth mode": "Vähese ribalaiusega režiim",
+    "Composer": "Sõnumite kirjutamine",
+    "Jump to start/end of the composer": "Hüppa sõnumite kirjutamise algusesse või lõppu",
+    "Navigate composer history": "Vaata sõnumite kirjutamise ajalugu",
+    "Show previews/thumbnails for images": "Näita piltide eelvaateid või väikepilte",
+    "Collecting logs": "Kogun logisid",
+    "Waiting for response from server": "Ootan serverilt vastust",
+    "Messages containing my username": "Sõnumid, mis sisaldavad minu kasutajatunnust",
+    "Messages containing @room": "Sõnumid, mis sisaldavad sõna @room",
+    "Messages in one-to-one chats": "Kahepoolsete vestluste sõnumid",
+    "Encrypted messages in one-to-one chats": "Kahepoolsete vestluste krüptitud sõnumid",
+    "Messages in group chats": "Rühmavestluste sõnumid",
+    "Encrypted messages in group chats": "Rühmavestluste krüptitud sõnumid",
+    "When I'm invited to a room": "Kui mind kutsutakse jututuppa",
+    "Call invitation": "Kõnekutse",
+    "Messages sent by bot": "Robotite saadetud sõnumid",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Parima kasutuskogemuse jaoks palun paigalda <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> või <safariLink>Safari</safariLink>.",
+    "I understand the risks and wish to continue": "Ma mõistan riske ja soovin jätkata",
+    "URL Previews": "URL'ide eelvaated",
+    "You have <a>enabled</a> URL previews by default.": "Vaikimisi oled URL'ide eelvaated <a>võtnud kasutusele</a>.",
+    "You have <a>disabled</a> URL previews by default.": "Vaikimisi oled URL'ide eelvaated <a>lülitanud välja</a>.",
+    "URL previews are enabled by default for participants in this room.": "URL'ide eelvaated on vaikimisi kasutusel selles jututoas osalejate jaoks.",
+    "URL previews are disabled by default for participants in this room.": "URL'ide eelvaated on vaikimisi lülitatud välja selles jututoas osalejate jaoks.",
+    "Enable Emoji suggestions while typing": "Näita kirjutamise ajal emoji-soovitusi",
+    "Show a placeholder for removed messages": "Näita kustutatud sõnumite asemel kohatäidet",
+    "Show join/leave messages (invites/kicks/bans unaffected)": "Näita jututubade liitumise ja lahkumise teateid (ei käi kutsete, müksamiste ja keelamiste kohta)",
+    "Show avatar changes": "Näita avataride muutusi",
+    "Show read receipts sent by other users": "Näita teiste kasutajate lugemisteatiseid",
+    "Always show message timestamps": "Alati näita sõnumite ajatempleid",
+    "Autoplay GIFs and videos": "Esita GIF-animatsioonid ja videod automaatselt",
+    "Always show encryption icons": "Alati näita krüptimise oleku ikoone",
+    "Show avatars in user and room mentions": "Näita avatare kasutajate ja jututubade mainimistes",
+    "Manually verify all remote sessions": "Verifitseeri käsitsi kõik välised sessioonid",
+    "Collecting app version information": "Kogun teavet rakenduse versiooni kohta",
+    "unknown caller": "tundmatu helistaja",
+    "Incoming voice call from %(name)s": "Saabuv häälkõne kasutajalt %(name)s",
+    "Incoming video call from %(name)s": "Saabuv videokõne kasutajalt %(name)s",
+    "Incoming call from %(name)s": "Saabuv kõne kasutajalt %(name)s",
+    "Decline": "Keeldu",
+    "Accept": "Võta vastu",
+    "The other party cancelled the verification.": "Teine osapool tühistas verifitseerimise.",
+    "Verified!": "Verifitseeritud!",
+    "You've successfully verified this user.": "Sa oled edukalt verifitseerinud selle kasutaja.",
+    "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Turvalised sõnumid selle kasutajaga on läbivalt krüptitud ning kolmandad osapooled ei saa neid lugeda.",
+    "Got It": "Selge lugu",
+    "Scan this unique code": "Skaneeri seda unikaalset koodi",
+    "or": "või",
+    "Compare unique emoji": "Võrdle unikaalseid emoji'sid",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Kui sul mõlemas seadmes pole kaamerat, siis võrdle unikaalset emoji'de komplekti",
+    "Start": "Alusta",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Kontrolli, et allpool näidatud emoji'd on kuvatud mõlemas sessioonis samas järjekorras:",
+    "Verify this user by confirming the following number appears on their screen.": "Verifitseeri see kasutaja tehes kindlaks, et järgnev number kuvatakse tema ekraanil.",
+    "Unable to find a supported verification method.": "Ei suuda leida toetatud verifitseerimismeetodit.",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Ootan, et sinu teine sessioon %(deviceName)s (%(deviceId)s) verifitseeriks…",
+    "Waiting for %(displayName)s to verify…": "Ootan kasutaja %(displayName)s verifitseerimist…",
+    "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.",
+    "Dog": "Koer",
+    "Cat": "Kass",
+    "Lion": "Lõvi",
+    "Horse": "Hobune",
+    "Unicorn": "Ükssarvik",
+    "Pig": "Siga",
+    "Elephant": "Elevant",
+    "Rabbit": "Jänes",
+    "Panda": "Panda",
+    "Rooster": "Kukk",
+    "Penguin": "Pingviin",
+    "Turtle": "Kilpkonn",
+    "Fish": "Kala",
+    "Octopus": "Kaheksajalg",
+    "Butterfly": "Liblikas",
+    "Flower": "Lill",
+    "Tree": "Puu",
+    "Cactus": "Kaktus",
+    "Mushroom": "Seen",
+    "Globe": "Maakera",
+    "Moon": "Kuu",
+    "Cloud": "Pilv",
+    "Fire": "Tuli",
+    "Banana": "Banaan",
+    "Apple": "Õun",
+    "Strawberry": "Maasikas",
+    "Corn": "Mais",
+    "Pizza": "Pitsa",
+    "Cake": "Kook",
+    "Heart": "Süda",
+    "Smiley": "Smaili",
+    "Robot": "Robot",
+    "Hat": "Müts",
+    "Glasses": "Prillid",
+    "Spanner": "Mutrivõti",
+    "Santa": "Jõuluvana",
+    "Thumbs up": "Pöidlad püsti",
+    "Umbrella": "Vihmavari",
+    "Hourglass": "Liivakell",
+    "Clock": "Kell",
+    "Gift": "Kingitus",
+    "Light bulb": "Lambipirn",
+    "Book": "Raamat",
+    "Pencil": "Pliiats",
+    "Paperclip": "Kirjaklamber",
+    "Scissors": "Käärid",
+    "Lock": "Lukk",
+    "Key": "Võti",
+    "Hammer": "Haamer",
+    "Telephone": "Telefon",
+    "Flag": "Lipp",
+    "Train": "Rong",
+    "Bicycle": "Jalgratas",
+    "Aeroplane": "Lennuk",
+    "Rocket": "Rakett",
+    "Trophy": "Auhind",
+    "Ball": "Pall",
+    "Guitar": "Kitarr",
+    "Trumpet": "Trompet",
+    "Bell": "Kelluke",
+    "Anchor": "Ankur",
+    "Headphones": "Kõrvaklapid",
+    "Folder": "Kaust",
+    "Pin": "Knopka",
+    "Verify all your sessions to ensure your account & messages are safe": "Selleks et sinu konto ja sõnumid oleks turvatud, verifitseeri kõik oma sessioonid",
+    "Later": "Hiljem",
+    "Review": "Vaata üle",
+    "Verify yourself & others to keep your chats safe": "Selleks et sinu vestlused oleks turvatud, verifitseeri end ja teisi",
+    "Other users may not trust it": "Teised kasutajad ei pruugi seda usaldada",
+    "Set up": "Võta kasutusele",
+    "Upgrade": "Uuenda",
+    "Verify": "Verifitseeri",
+    "Verify the new login accessing your account: %(name)s": "Verifitseeri uus kasutajasessioon, mis pruugib sinu kontot: %(name)s",
+    "From %(deviceName)s (%(deviceId)s)": "Seadmest %(deviceName)s (%(deviceId)s)",
+    "Decline (%(counter)s)": "Lükka tagasi (%(counter)s)",
+    "Accept <policyLink /> to continue:": "Jätkamiseks nõustu <policyLink />'ga:",
+    "Show less": "Näita vähem",
+    "Show more": "Näita rohkem",
+    "Warning!": "Hoiatus!",
+    "Do you want to set an email address?": "Kas sa soovid seadistada e-posti aadressi?",
+    "Close dialog": "Sulge dialoog",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Meeldetuletus: sinu brauser ei ole toetatud ja seega rakenduse kasutuskogemus võib olla ennustamatu.",
+    "Toggle this dialog": "Lülita see dialoog sisse/välja",
+    "Enter your password to sign in and regain access to your account.": "Sisselogimiseks ja oma kontole ligipääsu saamiseks sisesta oma salasõna.",
+    "Forgotten your password?": "Kas sa unustasid oma salasõna?",
+    "Sign in and regain access to your account.": "Logi sisse ja pääse tagasi oma kasutajakonto juurde.",
+    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Sa ei saa oma kasutajakontole sisse logida. Lisateabe saamiseks palun võta ühendust oma koduserveri halduriga.",
+    "Your recovery key": "Sinu taastevõti",
+    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Sinu taastevõti on <b>kopeeritud lõikelauale</b>, aseta ta:",
+    "<b>Print it</b> and store it somewhere safe": "<b>Trüki ta välja</b> ja hoia turvalises kohas",
+    "<b>Save it</b> on a USB key or backup drive": "<b>Salvesta ta</b> mälupulgale või varunduskettale",
+    "<b>Copy it</b> to your personal cloud storage": "<b>Kopeeri ta</b> isiklikku andmehoidlasse mis asub pilves",
+    "Retry": "Proovi uuesti",
+    "Upgrade your encryption": "Uuenda oma krüptimist",
+    "Make a copy of your recovery key": "Tee oma taastevõtmest koopia",
+    "Go to Settings": "Ava seadistused",
+    "Set up Secure Messages": "Võta kasutusele krüptitud sõnumid",
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s / %(totalRooms)s",
+    "Message downloading sleep time(ms)": "Paus millisekundites sõnumite allalaadimisel",
+    "Scroll up/down in the timeline": "Liigu ajajoonel üles/alla",
+    "Previous/next unread room or DM": "Eelmine/järgmine lugemata otsevestlus või sõnum jututoas",
+    "Previous/next room or DM": "Eelmine/järgmine otsevestlus või jututuba",
+    "Toggle the top left menu": "Lülita ülemine vasak menüü sisse/välja",
+    "Activate selected button": "Aktiveeri valitud nupp",
+    "Toggle right panel": "Lülita parem paan sisse/välja",
+    "%(count)s of your messages have not been sent.|other": "Mõned sinu sõnumid on saatmata.",
+    "%(count)s of your messages have not been sent.|one": "Sinu sõnum on saatmata.",
+    "You seem to be in a call, are you sure you want to quit?": "Tundub, et sul parasjagu on kõne pooleli. Kas sa kindlasti soovid väljuda?",
+    "Room": "Jututuba",
+    "Failed to reject invite": "Kutse tagasilükkamine ei õnnestunud",
+    "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",
+    "Verify this login": "Verifitseeri see sisselogimissessioon",
+    "Session verified": "Sessioon on verifitseeritud",
+    "Failed to send email": "E-kirja saatmine ebaõnnestus",
+    "The email address linked to your account must be entered.": "Sa pead sisestama oma kontoga seotud e-posti aadressi.",
+    "A new password must be entered.": "Palun sisesta uus salasõna.",
+    "New passwords must match each other.": "Uued salasõnad peavad omavahel klappima.",
+    "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.": "Salasõna muutmine tühistab kõik läbiva krüptimise võtmed sinu kõikides sessioonides ning seega muutub kogu sinu vestluste ajalugu loetamatuks. Palun kindlasti kas sea üles võtmete varundamine või ekspordi mõnest muust sessioonist jututubade võtmed enne senise salasõna tühistamist.",
+    "Your Matrix account on %(serverName)s": "Sinu Matrix'i konto serveris %(serverName)s",
+    "Your Matrix account on <underlinedServerName />": "Sinu Matrix'i kasutajakonto serveris <underlinedServerName />",
+    "This homeserver does not support login using email address.": "See koduserver ei võimalda e-posti aadressi kasutamist sisselogimisel.",
+    "Please <a>contact your service administrator</a> to continue using this service.": "Jätkamaks selle teenuse kasutamist palun <a>võta ühendust oma teenuse haldajaga</a>.",
+    "This account has been deactivated.": "See kasutajakonto on deaktiveeritud.",
+    "Incorrect username and/or password.": "Vigane kasutajanimi ja/või salasõna.",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Sa kasutad sisselogimiseks serverit %(hs)s, mitte aga matrix.org'i.",
+    "Failed to perform homeserver discovery": "Koduserveri leidmine ebaõnnestus",
+    "The phone number entered looks invalid": "Sisestatud telefoninumber tundub vigane",
+    "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.",
+    "Syncing...": "Sünkroniseerin...",
+    "Signing In...": "Login sisse...",
+    "Create account": "Loo kasutajakonto",
+    "Failed to fetch avatar URL": "Ei õnnestunud laadida profiilipildi ehk avatari aadressi",
+    "Upload an avatar:": "Lae üles profiilipilt ehk avatar:",
+    "Unable to query for supported registration methods.": "Ei õnnestunud pärida toetatud registreerimismeetodite loendit.",
+    "Registration has been disabled on this homeserver.": "Väline registreerimine ei ole selles koduserveris kasutusel.",
+    "This server does not support authentication with a phone number.": "See server ei toeta autentimist telefoninumbri alusel.",
+    "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Sinu uus kasutajakonto (%(newAccountId)s) on registreeritud, kuid sa jube oled sisse loginud teise kasutajakontoga (%(loggedInUserId)s).",
+    "Continue with previous account": "Jätka senise konto kasutamist",
+    "<a>Log in</a> to your new account.": "<a>Logi sisse</a> oma uuele kasutajakontole.",
+    "Registration Successful": "Registreerimine õnnestus",
+    "Create your account": "Loo endale konto",
+    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Kinnita oma isikusamasust verifitseerides seda sisselogimissessiooni mõnest oma muust sessioonist. Sellega tagad ka ligipääsu krüptitud sõnumitele.",
+    "This requires the latest %(brand)s on your other devices:": "Selleks on sul vaja muudes seadmetes kõige uuemat %(brand)s'i versiooni:",
+    "You're signed out": "Sa oled loginud välja",
+    "Clear personal data": "Kustuta privaatsed andmed",
+    "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.": "Hoiatus: Sinu privaatsed andmed (sealhulgas krüptimisvõtmed) on jätkuvalt salvestatud selles sessioonis. Eemalda nad, kui oled lõpetanud selle sessiooni kasutamise või soovid sisse logida muu kasutajakontoga.",
+    "Commands": "Käsud",
+    "Results from DuckDuckGo": "Otsingutulemused DuckDuckGo saidist",
+    "DuckDuckGo Results": "DuckDuckGo otsingutulemused",
+    "Emoji": "Emoji",
+    "Notify the whole room": "Teavita kogu jututuba",
+    "Users": "Kasutajad",
+    "Terms and Conditions": "Kasutustingimused",
+    "Logout": "Logi välja",
+    "Your Communities": "Sinu kogukonnad",
+    "Error whilst fetching joined communities": "Viga nende kogukondade laadimisel, millega sa oled liitunud",
+    "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.",
+    "Room not found": "Jututuba ei leidunud",
+    "Preview": "Eelvaade",
+    "View": "Näita",
+    "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Sa ei saa saata ühtego sõnumit enne, kui oled läbi lugenud ja nõustunud <consentLink>meie kasutustingimustega</consentLink>.",
+    "Couldn't load page": "Lehe laadimine ei õnnestunud",
+    "You must <a>register</a> to use this functionality": "Selle funktsionaalsuse kasutamiseks pead sa <a>registreeruma</a>",
+    "<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>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\n</p>\n",
+    "Add to summary": "Lisa kokkuvõtte lehele",
+    "Add a Room": "Lisa jututuba",
+    "The room '%(roomName)s' could not be removed from the summary.": "Valitud %(roomName)s jututoa eemaldamine koondinfost ei õnnestunud.",
+    "Add users to the community summary": "Lisa kasutajad kogukonna kokkuvõtte lehele",
+    "Who would you like to add to this summary?": "Keda sa sooviksid lisada siia kokkuvõtte lehele?",
+    "Failed to add the following users to the summary of %(groupId)s:": "Järgnevate kasutajate lisamine %(groupId)s kogukonna koondinfo lehele ei õnnestunud:",
+    "Add a User": "Lisa kasutaja",
+    "The user '%(displayName)s' could not be removed from the summary.": "Kasutaja %(displayName)s eemaldamine koondinfo lehelt ei õnnestunud.",
+    "Failed to upload image": "Pildi üleslaadimine ei õnnestunud",
+    "Failed to update community": "Kogukonna uuendamine ei õnnestunud",
+    "Unable to accept invite": "Ei saanud kutset vastu võtta",
+    "Unable to join community": "Ei õnnetunud liituda kogukonnaga",
+    "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Sa oled selle kogukonna haldur. Sa ei saa uuesti liituda ilma kutseta mõnelt teiselt administraatori õigustes liikmelt.",
+    "Leave Community": "Lahku kogukonnast",
+    "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>",
+    "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",
+    "Join this community": "Liitu selle kogukonnaga",
+    "Leave this community": "Lahku sellest kogukonnast",
+    "You are an administrator of this community": "Sa oled selle kogukonna haldur",
+    "You are a member of this community": "Sa oled kogukonna liige",
+    "Who can join this community?": "Kes võib liituda selle kogukonnaga?",
+    "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",
+    "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",
+    "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'?",
+    "Unknown error": "Teadmata viga",
+    "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Selleks et jätkata koduserveri %(homeserverDomain)s kasutamist sa pead üle vaatama ja nõustuma meie kasutustingimustega.",
+    "Permissions": "Õigused",
+    "Select the roles required to change various parts of the room": "Vali rollid, mis on vajalikud jututoa eri osade muutmiseks",
+    "Enable encryption?": "Kas võtame krüptimise kasutusele?",
+    "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>": "Kui kord juba kasutusele võetud, siis krüptimist enam hiljem ära lõpetada ei saa. Krüptitud sõnumeid ei saa lugeda ei vaheapealses veebiliikluses ega serveris ja vaid jututoa liikmed saavad neid lugeda. Krüptimise kasutusele võtmine takistada nii robotite kui sõnumisildade tööd. <a>Lisateave krüptimise kohta.</a>",
+    "Guests cannot join this room even if explicitly invited.": "Külalised ei saa selle jututoaga liituda ka siis, kui neid on otseselt kutsutud.",
+    "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.",
+    "Unknown Command": "Tundmatu käsk",
+    "Unrecognised command: %(commandText)s": "Tundmatu käsk: %(commandText)s",
+    "Send as message": "Saada sõnumina",
+    "Failed to connect to integration manager": "Ühendus integratsioonihalduriga ei õnnestunud",
+    "You don't currently have any stickerpacks enabled": "Sul pole ühtegi kleepsupakki kasutusel",
+    "Add some now": "Lisa nüüd mõned",
+    "Stickerpack": "Kleepsupakk",
+    "Hide Stickers": "Peida kleepsud",
+    "Show Stickers": "Näita kleepse",
+    "Failed to revoke invite": "Kutse tühistamine ei õnnestunud",
+    "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Kutse tühistamine ei õnnestunud. Serveri töös võib olla ajutine tõrge või sul pole piisavalt õigusi kutse tühistamiseks.",
+    "Revoke invite": "Tühista kutse",
+    "Invited by %(sender)s": "Kutsutud %(sender)s poolt",
+    "Jump to first unread message.": "Mine esimese lugemata sõnumi juurde.",
+    "Mark all as read": "Märgi kõik loetuks",
+    "Error updating main address": "Viga põhiaadressi uuendamisel",
+    "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Jututoa põhiaadressi uuendamisel tekkis viga. See kas pole serveris lubatud või tekkis mingi ajutine viga.",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Jututoa lisaaadressi uuendamisel tekkis viga. See kas pole serveris lubatud või tekkis mingi ajutine viga.",
+    "Main address": "Põhiaadress",
+    "not specified": "määratlemata",
+    "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",
+    "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",
+    "Re-join": "Liitu uuesti",
+    "You were banned from %(roomName)s by %(memberName)s": "%(memberName)s keelas sulle ligipääsu jututuppa %(roomName)s",
+    "Something went wrong with your invite to %(roomName)s": "Midagi läks viltu sinu kutsega %(roomName)s jututuppa",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Sinu kutse kontrollimisel tekkis viga (%(errcode)s). Kui võimalik, siis proovi see info edastada jututoa haldurile.",
+    "unknown error code": "tundmatu veakood",
+    "You can only join it with a working invite.": "Sa võid liituda vaid toimiva kutse alusel.",
+    "Try to join anyway": "Proovi siiski liituda",
+    "You can still join it because this is a public room.": "Kuna tegemist on avaliku jututoaga, siis võid ikkagi liituda.",
+    "Join the discussion": "Liitu vestlusega",
+    "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "See kutse jututuppa %(roomName)s saadeti e-posti aadressile %(email)s, mis ei ole seotud sinu kontoga",
+    "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Selleks et saada kutseid otse %(brand)s'isse, seosta see e-posti aadress seadete all oma kontoga.",
+    "This invite to %(roomName)s was sent to %(email)s": "Kutse %(roomName)s jututuppa saadeti %(email)s e-posti aadressile",
+    "Use an identity server in Settings to receive invites directly in %(brand)s.": "Selleks et saada kutseid otse %(brand)s'isse peab seadistustes olema määratud isikutuvastusserver.",
+    "Share this email in Settings to receive invites directly in %(brand)s.": "Selleks, et saada kutseid otse %(brand)s'isse, jaga oma seadetes seda e-posti aadressi.",
+    "Start chatting": "Alusta vestlust",
+    "Do you want to join %(roomName)s?": "Kas sa soovid liitud jututoaga %(roomName)s?",
+    "<userName/> invited you": "<userName/> kutsus sind",
+    "Reject": "Hülga",
+    "You're previewing %(roomName)s. Want to join it?": "Sa vaatad jututoa %(roomName)s eelvaadet. Kas soovid sellega liituda?",
+    "%(roomName)s can't be previewed. Do you want to join it?": "Jututoal %(roomName)s puudub eelvaate võimalus. Kas sa soovid sellega liituda?",
+    "%(roomName)s does not exist.": "Jututuba %(roomName)s ei ole olemas.",
+    "This room doesn't exist. Are you sure you're at the right place?": "Seda jututuba ei ole olemas. Kas sa oled kindlasti õiges kohas?",
+    "%(roomName)s is not accessible at this time.": "Jututuba %(roomName)s ei ole parasjagu kättesaadav.",
+    "Try again later, or ask a room admin to check if you have access.": "Proovi hiljem uuesti või küsi jututoa haldurilt, kas sul on ligipääs olemas.",
+    "%(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>.": "Astumisel jututuppa tekkis viga %(errcode)s. Kui sa arvad, et sellise põhjusega viga ei tohiks tekkida, siis palun <issueLink>koosta veateade</issueLink>.",
+    "Never lose encrypted messages": "Ära kunagi kaota krüptitud sõnumeid",
+    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Sõnumid siin jututoas kasutavad läbivat krüptimist. Ainult sinul ja saaja(te)l on võtmed selliste sõnumite lugemiseks.",
+    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Vältimaks nende kaotamist, varunda turvaliselt oma võtmed. <a>Loe lisateavet.</a>",
+    "Not now": "Mitte praegu",
+    "Don't ask me again": "Ära küsi minult uuesti",
+    "%(count)s unread messages including mentions.|other": "%(count)s lugemata sõnumit kaasa arvatud mainimised.",
+    "%(count)s unread messages.|other": "%(count)s lugemata teadet.",
+    "%(count)s unread messages.|one": "1 lugemata teade.",
+    "Unread mentions.": "Lugemata mainimised.",
+    "Unread messages.": "Lugemata sõnumid.",
+    "Add a topic": "Lisa teema",
+    "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Selle jututoa versiooni uuendamine sulgeb tema praeguse instantsi ja loob sama nimega uuendatud jututoa.",
+    "This room has already been upgraded.": "See jututuba on juba uuendatud.",
+    "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Selle jututoa versioon on <roomVersion /> ning see koduserver on tema märkinud <i>ebastabiilseks</i>.",
+    "Only room administrators will see this warning": "Vaid administraatorid näevad seda hoiatust",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Kirjutades <code>/help</code> saad vaadata käskude loendit. Või soovisid seda saata sõnumina?",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "Vihje: kui soovid alustada sõnumit kaldkriipsuga, siis kirjuta <code>//</code>.",
+    "Only people who have been invited": "Vaid kutsutud kasutajad",
+    "Anyone who knows the room's link, apart from guests": "Kõik, kes teavad jututoa viidet, välja arvatud külalised",
+    "Anyone who knows the room's link, including guests": "Kõik, kes teavad jututoa viidet, kaasa arvatud külalised",
+    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Kui muudad seda, kes saavad selle jututoa ajalugu lugeda, siis kehtib see vaid tulevaste sõnumite kohta. Senise ajaloo nähtavus sellega ei muutu.",
+    "Unable to revoke sharing for email address": "Ei õnnestu tagasi võtta otsust e-posti aadressi jagamise kohta",
+    "Unable to share email address": "Ei õnnestu jagada e-posti aadressi",
+    "Your email address hasn't been verified yet": "Sinu e-posti aadress pole veel verifitseeritud",
+    "Click the link in the email you received to verify and then click continue again.": "Klõpsi saabunud e-kirjas olevat verifitseerimisviidet ning seejärel klõpsi siin uuesti nuppu „Jätka“.",
+    "Unable to verify email address.": "E-posti aadressi verifitseerimine ei õnnestunud.",
+    "Verify the link in your inbox": "Verifitseeri klõpsides viidet saabunud e-kirjas",
+    "Complete": "Valmis",
+    "Revoke": "Tühista",
+    "Share": "Jaga",
+    "Session already verified!": "Sessioon on juba verifitseeritud!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "HOIATUS: Sessioon on juba verifitseeritud, aga võtmed ei klapi!",
+    "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!": "HOIATUS: VÕTMETE VERIFITSEERIMINE EI ÕNNESTUNUD! Kasutaja %(userId)s ja sessiooni %(deviceId)s allkirjastamise võti on „%(fprint)s“, aga see ei vasta antud sõrmejäljele „%(fingerprint)s“. See võib tähendada, et sinu kasutatavad ühendused võivad olla kolmanda osapoole poolt vahelt lõigatud!",
+    "Verified key": "Verifitseeritud võti",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Sinu antud allkirjavõti vastab allkirjavõtmele, mille sa said kasutaja %(userId)s sessioonist %(deviceId)s. Sessioon on märgitud verifitseerituks.",
+    "Sends the given message coloured as a rainbow": "Saadab selle sõnumi vikerkaarevärvilisena",
+    "Sends the given emote coloured as a rainbow": "Saadab antud emote vikerkaarevärvides",
+    "Displays list of commands with usages and descriptions": "Näitab käskude loendit koos kirjeldustega",
+    "Logs sent": "Logikirjed saadetud",
+    "Thank you!": "Suur tänu!",
+    "Opens chat with the given user": "Avab vestluse näidatud kasutajaga",
+    "Sends a message to the given user": "Saadab sõnumi näidatud kasutajale",
+    "Short keyboard patterns are easy to guess": "Lühikesi klahvijärjestusi on lihtne ära arvata",
+    "Keyboard Shortcuts": "Kiirklahvid",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "See jututuba kasutab sõnumisildasid liidestamiseks järgmiste süsteemidega. <a>Lisateave.</a>",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "See jututuba ei kasuta sõnumisildasid liidestamiseks muude süsteemidega. <a>Lisateave.</a>",
+    "Bridges": "Sõnumisillad",
+    "Room Addresses": "Jututubade aadressid",
+    "Browse": "Sirvi",
+    "Change room avatar": "Muuda jututoa profiilipilti ehk avatari",
+    "Change main address for the room": "Muuda jututoa põhiaadressi",
+    "Change history visibility": "Muuda vestlusajaloo nähtavust",
+    "Change permissions": "Muuda õigusi",
+    "Change topic": "Muuda teemat",
+    "Upgrade the room": "Uuenda jututuba uue versioonini",
+    "Enable room encryption": "Võta jututoas kasutusele krüptimine",
+    "Modify widgets": "Muuda vidinaid",
+    "Default role": "Vaikimisi roll",
+    "Send messages": "Saada sõnumeid",
+    "Invite users": "Kutsu kasutajaid",
+    "Change settings": "Muuda seadistusi",
+    "Kick users": "Müksa kasutajaid välja",
+    "Ban users": "Määra kasutajatele suhtluskeeld",
+    "Notify everyone": "Teavita kõiki",
+    "No users have specific privileges in this room": "Mitte ühelgi kasutajal pole siin jututoas eelisõigusi",
+    "Privileged Users": "Eelisõigustega kasutajad",
+    "Banned users": "Suhtluskeelu saanud kasutajad",
+    "Send %(eventType)s events": "Saada %(eventType)s-sündmusi",
+    "Unable to revoke sharing for phone number": "Telefoninumbri jagamist ei õnnestunud tühistada",
+    "Unable to share phone number": "Telefoninumbri jagamine ei õnnestunud",
+    "Unable to verify phone number.": "Telefoninumbri verifitseerimine ei õnnestunud.",
+    "Incorrect verification code": "Vigane verifikatsioonikood",
+    "Please enter verification code sent via text.": "Palun sisesta verifikatsioonikood, mille said telefoni tekstisõnumina.",
+    "Verification code": "Verifikatsioonikood",
+    "Invalid Email Address": "Vigane e-posti aadress",
+    "This doesn't appear to be a valid email address": "See ei tundu olema e-posti aadressi moodi",
+    "Preparing to send logs": "Valmistun logikirjete saatmiseks",
+    "Failed to send logs: ": "Logikirjete saatmine ei õnnestunud: ",
+    "Verify session": "Verifitseeri sessioon",
+    "Skip": "Jäta vahele",
+    "Token incorrect": "Vigane tunnusluba",
+    "%(oneUser)schanged their name %(count)s times|one": "Kasutaja %(oneUser)s muutis oma nime",
+    "Are you sure you want to deactivate your account? This is irreversible.": "Kas sa oled kindel, et soovid oma konto sulgeda? Seda tegevust ei saa hiljem tagasi pöörata.",
+    "Confirm account deactivation": "Kinnita konto sulgemine",
+    "There was a problem communicating with the server. Please try again.": "Serveriühenduses tekkis viga. Palun proovi uuesti.",
+    "Server did not return valid authentication information.": "Serveri saadetud vastuses ei olnud kehtivat autentimisteavet.",
+    "Please fill why you're reporting.": "Palun kirjelda veateate põhjust.",
+    "Something went wrong trying to invite the users.": "Kasutajatele kutse saatmisel läks midagi viltu.",
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "Meil ei õnnestunud neile kasutajatele kutset saata. Palun kontrolli, keda soovid kutsuda ning proovi uuesti.",
+    "Failed to find the following users": "Järgnevaid kasutajaid ei õnnestunud leida",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Järgmisi kasutajanimesid pole olemas või on vigaselt kirjas ning seega ei saa neile kutset saata: %(csvNames)s",
+    "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!",
+    "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",
+    "Cancel All": "Tühista kõik",
+    "Upload Error": "Üleslaadimise viga",
+    "Verify other session": "Verifitseeri teine sessioon",
+    "Verification Request": "Verifitseerimispäring",
+    "A widget would like to verify your identity": "Vidin soovib verifitseerida sinu isikut",
+    "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.": "Vidin %(widgetUrl)s saidist soovib verifitseerida sinu isikut. Kui sa seda lubad, siis vidin verifitseerib vaid sinu kasutajatunnuse, kuid ei saa teha toiminguid sinuna.",
+    "Remember my selection for this widget": "Jäta meelde minu valik selle vidina kohta",
+    "Allow": "Luba",
+    "Deny": "Keela",
+    "Unable to restore backup": "Varukoopiast taastamine ei õnnestu",
+    "No backup found!": "Varukoopiat ei leidunud!",
+    "Keys restored": "Krüptimise võtmed on taastatud",
+    "Failed to decrypt %(failedCount)s sessions!": "%(failedCount)s sessiooni dekrüptimine ei õnnestunud!",
+    "Successfully restored %(sessionCount)s keys": "%(sessionCount)s sessiooni võtme taastamine õnnestus",
+    "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Hoiatus</b>: sa peaksid võtmete varunduse seadistama vaid usaldusväärsest arvutist.",
+    "eg: @bot:* or example.org": "näiteks: @bot:* või example.org",
+    "Subscribed lists": "Tellitud loendid",
+    "Subscribe": "Telli",
+    "Start automatically after system login": "Käivita automaatselt peale arvutisse sisselogimist",
+    "Always show the window menu bar": "Näita alati aknas menüüriba",
+    "Preferences": "Eelistused",
+    "Room list": "Jututubade loend",
+    "Timeline": "Ajajoon",
+    "Autocomplete delay (ms)": "Viivitus automaatsel sõnalõpetusel (ms)",
+    "Server Name": "Serveri nimi",
+    "Enter password": "Sisesta salasõna",
+    "Nice, strong password!": "Vahva, see on korralik salasõna!",
+    "Password is allowed, but unsafe": "Selline salasõna on küll lubatud, kuid üsna ebaturvaline",
+    "Keep going...": "Jätka...",
+    "The email field must not be blank.": "E-posti aadressi väli ei tohi olla tühi.",
+    "The username field must not be blank.": "Kasutajanime väli ei tohi olla tühi.",
+    "The phone number field must not be blank.": "Telefoninumbri väli ei tohi olla tühi.",
+    "The password field must not be blank.": "Salasõna väli ei tohi olla tühi.",
+    "Email": "E-posti aadress",
+    "Username": "Kasutajanimi",
+    "Phone": "Telefon",
+    "Not sure of your password? <a>Set a new one</a>": "Sa ei ole kindel oma salasõnas? <a>Tee uus salasõna</a>",
+    "Sign in with": "Logi sisse oma kasutajaga",
+    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Ühtegi isikutuvastusserverit pole seadistatud ning sul ei ole võimalik lisada oma e-posti aadressi hilisemaks võimalikuks salasõna muutmiseks.",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Kui sa ei sisesta oma e-posti aadressi, siis sa ei saa hiljem oma salasõnamuuta. Kas sa kindlasti soovid seda?",
+    "Use an email address to recover your account": "Kasuta e-posti aadressi ligipääsu taastamiseks oma kontole",
+    "Enter email address (required on this homeserver)": "Sisesta e-posti aadress (nõutav selles koduserveris)",
+    "Doesn't look like a valid email address": "Ei tundu olema korralik e-posti aadress",
+    "Passwords don't match": "Salasõnad ei klapi",
+    "Enter phone number (required on this homeserver)": "Sisesta telefoninumber (nõutav selles koduserveris)",
+    "Doesn't look like a valid phone number": "Ei tundu olema korralik telefoninumber",
+    "Use lowercase letters, numbers, dashes and underscores only": "Palun kasuta vaid väiketähti, numbreid, sidekriipsu ja alakriipsu",
+    "Enter username": "Sisesta kasutajanimi",
+    "Email (optional)": "E-posti aadress (kui soovid)",
+    "Phone (optional)": "Telefoninumber (kui soovid)",
+    "Create your Matrix account on %(serverName)s": "Loo oma Matrixi konto %(serverName)s serveris",
+    "Create your Matrix account on <underlinedServerName />": "Loo oma Matrixi konto <underlinedServerName /> serveris",
+    "Register": "Registreeru",
+    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Seadista e-posti aadress, mis võimaldaks sul vajadusel taastada ligipääsu oma kontole. Lisaks võid kasutada e-posti aadressi või telefoninumbrit, et need inimesed, kes sind tunnevad, saaks sind leida.",
+    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Seadista e-posti aadress, mis võimaldaks sul vajadusel taastada ligipääsu oma kontole. Lisaks võid kasutada e-posti aadressi, et need inimesed, kes sind tunnevad, saaks sind leida.",
+    "Enter your custom homeserver URL <a>What does this mean?</a>": "Sisesta oma koduserveri aadress <a>Mida see tähendab?</a>",
+    "Homeserver URL": "Koduserveri aadress",
+    "Enter your custom identity server URL <a>What does this mean?</a>": "Sisesta kohandatud isikutuvastusserver aadress <a>Mida see tähendab?</a>",
+    "Identity Server URL": "Isikutuvastusserveri aadress",
+    "Other servers": "Muud serverid",
+    "Free": "Tasuta teenus",
+    "Join millions for free on the largest public server": "Liitu tasuta nende miljonitega, kas kasutavad suurimat avalikku Matrix'i serverit",
+    "Premium": "Tasuline eriteenus",
+    "Premium hosting for organisations <a>Learn more</a>": "Tasuline Matrix'i majutusteenus organisatsioonidele <a>Loe lisateavet</a>",
+    "Find other public servers or use a custom server": "Otsi muid avalikke Matrix'i servereid või kasuta enda määratud serverit",
+    "Sign in to your Matrix account on %(serverName)s": "Logi sisse on Matrix'i kontole %(serverName)s serveris",
+    "Sign in to your Matrix account on <underlinedServerName />": "Logi sisse on Matrix'i kontole <underlinedServerName /> serveris",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Vabandust, aga %(brand)s <b>ei toimi</b> sinu brauseris.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s kasutab mitmeid uusi brauseri-põhiseid tehnoloogiaid ning mitmed neist kas pole veel olemas või on lahendatud sinu brauseris katselisena.",
+    "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!": "Sinu praeguse brauseriga meie rakenduse välimus ja toimivus võivad olla täitsa valed ning mõni funktsionaalsus ei pruugi toimida üldse. Kui soovid katsetada, siis loomulikult võid jätkata, kuid erinevate tekkivate vigadega pead ise hakkama saama!",
+    "Fetching third party location failed": "Kolmanda osapoole asukoha tuvastamine ei õnnestunud",
+    "Unable to look up room ID from server": "Jututoa tunnuse otsimine serverist ei õnnestunud",
+    "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.": "Sinu sõnumit ei saadetud, kuna see koduserver on ületanud on ületanud ressursipiirangu. Teenuse kasutamiseks palun <a>võta ühendust serveri haldajaga</a>.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Saada kõik uuesti</resendText> või <cancelText>tühista kõigi saatmine</cancelText>. Samuti võid sa valida saatmiseks või saatmise tühistamiseks üksikuid sõnumeid.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Saada sõnum uuesti</resendText> või <cancelText>tühista sõnumi saatmine</cancelText>.",
+    "Connectivity to the server has been lost.": "Ühendus sinu serveriga on katkenud.",
+    "Sent messages will be stored until your connection has returned.": "Saadetud sõnumid salvestatakse seniks, kuni võrguühendus on taastunud.",
+    "Active call": "Käsilolev kõne",
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Siin ei leidu kedagi teist! Kas sa tahaksid <inviteText>kutsuda kedagi jututuppa</inviteText> või <nowarnText>lõpetada selle tühja jututoa hoiatuse kuvamise</nowarnText>?",
+    "You have %(count)s unread notifications in a prior version of this room.|other": "Sinul on selle jututoa varasemas versioonis %(count)s lugemata teavitust.",
+    "You have %(count)s unread notifications in a prior version of this room.|one": "Sinul on selle jututoa varasemas versioonis %(count)s lugemata teavitus.",
+    "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.",
+    "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",
+    "Read Marker lifetime (ms)": "Lugemise markeri iga (ms)",
+    "Unignore": "Lõpeta eiramine",
+    "<not supported>": "<ei ole toetatud>",
+    "Import E2E room keys": "Impordi E2E läbiva krüptimise võtmed jututubade jaoks",
+    "Cryptography": "Krüptimine",
+    "Session ID:": "Sessiooni tunnus:",
+    "Session key:": "Sessiooni võti:",
+    "Bulk options": "Masstoimingute seadistused",
+    "Accept all %(invitedRooms)s invites": "Võta vastu kõik %(invitedRooms)s kutsed",
+    "Reject all %(invitedRooms)s invites": "Lükka tagasi kõik %(invitedRooms)s kutsed",
+    "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",
+    "Sounds": "Helid",
+    "Notification sound": "Teavitusheli",
+    "Reset": "Taasta algolek",
+    "Set a new custom sound": "Seadista uus kohandatud heli",
+    "Jump to message": "Mine sõnumi juurde",
+    "were invited %(count)s times|other": "said kutse %(count)s korda",
+    "were invited %(count)s times|one": "said kutse",
+    "was invited %(count)s times|other": "sai kutse %(count)s korda",
+    "was invited %(count)s times|one": "sai kutse",
+    "%(severalUsers)schanged their name %(count)s times|other": "Mitu kasutajat %(severalUsers)s muutsid oma nime %(count)s korda",
+    "%(severalUsers)schanged their name %(count)s times|one": "Mitu kasutajat %(severalUsers)s muutsid oma nime",
+    "%(oneUser)schanged their name %(count)s times|other": "Kasutaja %(oneUser)s muutis oma nime %(count)s korda",
+    "You cannot place VoIP calls in this browser.": "Selle brauseriga ei saa VoIP kõnet teha.",
+    "You cannot place a call with yourself.": "Sa ei saa iseendale helistada.",
+    "You do not have permission to start a conference call in this room": "Sul ei ole piisavalt õigusi, et selles jututoas alustada konverentsikõnet",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "Mitu kasutajat %(severalUsers)s muutsid oma tunnuspilti %(count)s korda",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "Mitu kasutajat %(severalUsers)s muutsid oma tunnuspilti",
+    "%(oneUser)schanged their avatar %(count)s times|other": "Kasutaja %(oneUser)s muutis oma tunnuspilti %(count)s korda",
+    "%(oneUser)schanged their avatar %(count)s times|one": "Kasutaja %(oneUser)s muutis oma tunnuspilti",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Palu oma koduserveri haldajat (<code>%(homeserverDomain)s</code>), et ta seadistaks kõnede kindlamaks toimimiseks TURN serveri.",
+    "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.": "Alternatiivina võid sa kasutada avalikku serverit <code>turn.matrix.org</code>, kuid see ei pruugi olla piisavalt töökindel ning sa jagad ka oma IP-aadressi selle serveriga. Täpsemalt saad seda määrata seadistustes.",
+    "Try using turn.matrix.org": "Proovi kasutada turn.matrix.org serverit",
+    "OK": "Sobib",
+    "Unable to capture screen": "Ekraanipildi hõive ei õnnestunud",
+    "Existing Call": "Käimasolev kõne",
+    "You are already in a call.": "Sinul on juba kõne pooleli.",
+    "VoIP is unsupported": "VoIP ei ole toetatud",
+    "Call in Progress": "Kõne on pooleli",
+    "A call is currently being placed!": "Kõne algatamine on just käimas!",
+    "A call is already in progress!": "Kõne on juba pooleli!",
+    "Permission Required": "Vaja on täiendavaid õigusi",
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Hetkel ei ole võimalik vastata failiga. Kas sa sooviksid seda faili lihtsalt üles laadida?",
+    "Continue": "Jätka",
+    "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.",
+    "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.",
+    "If you cancel now, you won't complete verifying your other session.": "Kui sa katkestad nüüd, siis sul jääb oma muu sessiooni verifitseerimine lõpetamata.",
+    "If you cancel now, you won't complete your operation.": "Kui sa katkestad nüüd, siis sul jääb pooleliolev tegevus lõpetamata.",
+    "Cancel entering passphrase?": "Kas katkestame paroolifraasi sisestamise?",
+    "Enter passphrase": "Sisesta paroolifraas",
+    "Setting up keys": "Võtamevõtmed kasutusele",
+    "Room name or address": "Jututoa nimi või aadress",
+    "Unable to enable Notifications": "Teavituste kasutusele võtmine ei õnnestunud",
+    "This email address was not found": "Seda e-posti aadressi ei leidunud",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Sinu e-posti aadress ei tundu olema selles koduserveris seotud Matrixi kasutajatunnusega.",
+    "Add User": "Lisa kasutaja",
+    "Enter a server name": "Sisesta serveri nimi",
+    "Looks good": "Tundub õige",
+    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "E-posti teel kutse saatmiseks kasuta isikutuvastusserverit. Võid kasutada <default>vaikimisi serverit (%(defaultIdentityServerName)s)</default> või määrata muud serverid <settings>seadistustes</settings>.",
+    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Kasutajatele e-posti teel kutse saatmiseks pruugi isikutuvastusserverit. Täpsemalt saad seda <settings>hallata seadistustes</settings>.",
+    "The following users may not exist": "Järgnevaid kasutajaid ei pruugi olla olemas",
+    "Invite anyway and never warn me again": "Kutsu siiski ja ära hoiata mind enam",
+    "Invite anyway": "Kutsu siiski",
+    "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Palun kirjelda seda, mis läks valesti ja loo GitHub'is veateade.",
+    "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.": "Vigadega seotud logid sisaldavad rakenduse teavet, sealhulgas sinu kasutajanime, külastatud jututubade kasutajatunnuseid või aliasi ning teiste kasutajate kasutajanimesid. Logides ei ole saadetud sõnumite sisu.",
+    "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Enne logide saatmist sa peaksid <a>GitHub'is looma veateate</a> ja kirjeldama seal tekkinud probleemi.",
+    "GitHub issue": "Veateade GitHub'is",
+    "Notes": "Märkused",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s muutis uueks teemaks „%(topic)s“.",
+    "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s uuendas seda jututuba.",
+    "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s muutis selle jututoa avalikuks kõigile, kes teavad tema aadressi.",
+    "Light": "Hele",
+    "Dark": "Tume",
+    "You signed in to a new session without verifying it:": "Sa logisid sisse uude sessiooni ilma seda verifitseerimata:",
+    "Verify your other session using one of the options below.": "Verifitseeri oma teine sessioon kasutades üht alljärgnevatest võimalustest.",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) logis sisse uude sessiooni ilma seda verifitseerimata:",
+    "Not Trusted": "Ei ole usaldusväärne",
+    "Done": "Valmis",
+    "%(displayName)s is typing …": "%(displayName)s kirjutab midagi…",
+    "%(names)s and %(count)s others are typing …|other": "%(names)s ja %(count)s muud kasutajat kirjutavad midagi…",
+    "%(names)s and %(count)s others are typing …|one": "%(names)s ja üks teine kasutaja kirjutavad midagi…",
+    "%(names)s and %(lastPerson)s are typing …": "%(names)s ja %(lastPerson)s kirjutavad midagi…",
+    "Cannot reach homeserver": "Koduserver ei ole hetkel leitav",
+    "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",
+    "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",
+    "Use Recovery Key": "Kasuta taastevõtit",
+    "or another cross-signing capable Matrix client": "või mõnda teist Matrix'i klienti, mis oskab risttunnustamist",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Sinu uus sessioon on nüüd verifitseeritud. Selles sessioonis saad lugeda oma krüptitud sõnumeid ja teiste kasutajate jaoks on ta usaldusväärne.",
+    "Your new session is now verified. Other users will see it as trusted.": "Sinu uus sessioon on nüüd verifitseeritud. Teiste kasutajate jaoks on ta usaldusväärne.",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "Kui sa pole selle sessiooni turvaprotseduure lõpetanud, siis sul puudub ligipääs oma krüptitud sõnumitele.",
+    "Go Back": "Mine tagasi",
+    "Failed to re-authenticate due to a homeserver problem": "Uuesti autentimine ei õnnestunud koduserveri vea tõttu",
+    "Incorrect password": "Vale salasõna",
+    "Failed to re-authenticate": "Uuesti autentimine ei õnnestunud",
+    "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.": "Taasta ligipääs oma kontole ning selles sessioonis salvestatud krüptivõtmetele. Ilma nende võtmeteta sa ei saa lugeda krüptitud sõnumeid mitte üheski oma sessioonis.",
+    "Command Autocomplete": "Käskude automaatne lõpetamine",
+    "Community Autocomplete": "Kogukondade nimede automaatne lõpetamine",
+    "Emoji Autocomplete": "Emoji'de automaatne lõpetamine",
+    "Notification Autocomplete": "Teavituste automaatne lõpetamine",
+    "Room Autocomplete": "Jututubade nimede automaatne lõpetamine",
+    "User Autocomplete": "Kasutajanimede automaatne lõpetamine",
+    "Enter recovery key": "Sisesta taastevõti",
+    "This looks like a valid recovery key!": "See tundub olema õige taastevõti!",
+    "Not a valid recovery key": "Ei ole sobilik taastevõti",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Palu, et sinu %(brand)s'u haldur kontrolliks <a>sinu seadistusi</a> võimalike vigaste või topeltkirjete osas.",
+    "Cannot reach identity server": "Isikutuvastusserverit ei õnnestu leida",
+    "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.": "Sa võid registreeruda, kuid mõned funktsionaalsused pole kasutatavad seni, kuni isikutuvastusserver pole uuesti võrgus. Kui see teade tekib järjepanu, siis palun kontrolli oma seadistusi või võta ühendust serveri haldajaga.",
+    "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.": "Sa võid salasõna lähtestada, kuid mõned funktsionaalsused pole kasutatavad seni, kuni isikutuvastusserver pole uuesti võrgus. Kui see teade tekib järjepanu, siis palun kontrolli oma seadistusi või võta ühendust serveri haldajaga.",
+    "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.": "Sa võid sisse logida, kuid mõned funktsionaalsused pole kasutatavad seni, kuni isikutuvastusserver pole uuesti võrgus. Kui see teade tekib järjepanu, siis palun kontrolli oma seadistusi või võta ühendust serveri haldajaga.",
+    "No homeserver URL provided": "Koduserveri aadress on puudu",
+    "Unexpected error resolving homeserver configuration": "Koduserveri seadistustest selguse saamisel tekkis ootamatu viga",
+    "Unexpected error resolving identity server configuration": "Isikutuvastusserveri seadistustest selguse saamisel tekkis ootamatu viga",
+    "The message you are trying to send is too large.": "Sõnum, mida sa proovid saata, on liiga suur.",
+    "This homeserver has exceeded one of its resource limits.": "See koduserver ületanud ühe oma ressursipiirangutest.",
+    "Please <a>contact your service administrator</a> to continue using the service.": "Jätkamaks selle teenuse kasutamist, palun <a>võta ühendust oma serveri haldajaga</a>.",
+    "Unable to connect to Homeserver. Retrying...": "Ei saa ühendust koduserveriga. Proovin uuesti...",
+    "%(items)s and %(count)s others|other": "%(items)s ja %(count)s muud",
+    "%(items)s and %(count)s others|one": "%(items)s ja üks muu",
+    "%(items)s and %(lastItem)s": "%(items)s ja %(lastItem)s",
+    "a few seconds ago": "mõni sekund tagasi",
+    "%(num)s minutes ago": "%(num)s minutit tagasi",
+    "a few seconds from now": "mõne sekundi pärast",
+    "%(num)s minutes from now": "%(num)s minuti pärast",
+    "Use a few words, avoid common phrases": "Kasuta paari sõna, kuid väldi levinud fraase",
+    "No need for symbols, digits, or uppercase letters": "Sa ei pea sisestama erilisi tähemärke, numbreid ega suurtähti",
+    "Use a longer keyboard pattern with more turns": "Kasuta pikemaid klahvikombinatsioone, kus vajutatud klahvid pole kõrvuti ega kohakuti",
+    "Avoid repeated words and characters": "Väldi korduvaid sõnu ja tähemärke",
+    "Avoid sequences": "Väldi korduvaid klahviseeriaid",
+    "Avoid recent years": "Väldi hiljutisi aastaid",
+    "Avoid years that are associated with you": "Väldi aastaid, mida saaks sinuga seostada",
+    "Avoid dates and years that are associated with you": "Väldi kuupäevi ja aastaid, mida saaks sinuga seostada",
+    "Capitalization doesn't help very much": "Suurtähtede kasutamisest pole suurt kasu",
+    "All-uppercase is almost as easy to guess as all-lowercase": "Läbiva suurtähega kirjutatud teksti on sisuliselt sama lihte ära arvata, kui läbiva väiketähega kirjutatud teksti",
+    "Reversed words aren't much harder to guess": "Tagurpidi kirjutatud sõnu pole eriti keeruline ära arvata",
+    "Predictable substitutions like '@' instead of 'a' don't help very much": "Ennustatavatest asendustest nagu '@' 'a' asemel pole eriti kasu",
+    "Add another word or two. Uncommon words are better.": "Lisa veel mõni sõna. Ebatavaliste sõnade kasutamine on hea mõte.",
+    "Repeats like \"aaa\" are easy to guess": "Kordusi, nagu „aaa“ on lihtne ära arvata",
+    "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Kordusi, nagu „abcabcabc“ on vaid natuke raskem ära arvata kui „abc“",
+    "Sequences like abc or 6543 are easy to guess": "Jadasid nagu „abc“ või „6543“ on lihtne ära arvata",
+    "Recent years are easy to guess": "Hiljutisi aastaid on lihtne ära arvata",
+    "Dates are often easy to guess": "Kuupäevi on sageli lihtne ära arvata",
+    "A word by itself is easy to guess": "Üksikut sõna on lihtne ära arvata",
+    "Names and surnames by themselves are easy to guess": "Nimesid ja perenimesid on lihtne ära arvata",
+    "Common names and surnames are easy to guess": "Üldisi nimesid ja perenimesid on lihtne ära arvata",
+    "Straight rows of keys are easy to guess": "Klaviatuuril järjest paiknevaid klahvikombinatsioone on lihtne ära arvata",
+    "Help us improve %(brand)s": "Aidake meil täiustada %(brand)s'it",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Saada meile <UsageDataLink>anonüümset kasutusteavet</UsageDataLink>, mis võimaldab meil %(brand)s'it täiustada. Selline teave põhineb <PolicyLink>küpsiste kasutamisel</PolicyLink>.",
+    "I want to help": "Ma soovin aidata",
+    "No": "Ei",
+    "Restart": "Käivita uuesti",
+    "Upgrade your %(brand)s": "Uuenda oma %(brand)s'it",
+    "A new version of %(brand)s is available!": "Uus %(brand)s'i versioon on saadaval!",
+    "There was an error joining the room": "Jututoaga liitumisel tekkis viga",
+    "Sorry, your homeserver is too old to participate in this room.": "Vabandust, sinu koduserver on siin jututoas osalemiseks liiga vana.",
+    "Please contact your homeserver administrator.": "Palun võta ühendust koduserveri haldajaga.",
+    "Failed to join room": "Jututoaga liitumine ei õnnestunud",
+    "Font scaling": "Fontide skaleerimine",
+    "Custom user status messages": "Kasutajate kohandatud olekuteated",
+    "Font size": "Fontide suurus",
+    "Enable automatic language detection for syntax highlighting": "Kasuta süntaksi esiletõstmisel automaatset keeletuvastust",
+    "Cross-signing private keys:": "Privaatvõtmed risttunnustamise jaoks:",
+    "Identity Server URL must be HTTPS": "Isikutuvastusserveri URL peab kasutama HTTPS-protokolli",
+    "Not a valid Identity Server (status code %(code)s)": "See ei ole sobilik isikutuvastusserver (staatuskood %(code)s)",
+    "Could not connect to Identity Server": "Ei saanud ühendust isikutuvastusserveriga",
+    "Checking server": "Kontrollin serverit",
+    "Change identity server": "Muuda isikutuvastusserverit",
+    "Disconnect from the identity server <current /> and connect to <new /> instead?": "Kas katkestame ühenduse <current /> isikutuvastusserveriga ning selle asemel loome uue ühenduse serveriga <new />?",
+    "Terms of service not accepted or the identity server is invalid.": "Kas puudub nõustumine kasutustingimustega või on isikutuvastusserver vale.",
+    "The identity server you have chosen does not have any terms of service.": "Sinu valitud isikutuvastusserveril pole kasutustingimusi.",
+    "Disconnect identity server": "Katkesta ühendus isikutuvastusserveriga",
+    "Disconnect from the identity server <idserver />?": "Kas katkestame ühenduse isikutuvastusserveriga <idserver />?",
+    "Disconnect": "Katkesta ühendus",
+    "You should:": "Sa peaksid:",
+    "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "kontrollima kas mõni brauseriplugin takistab ühendust isikutuvastusserveriga (nagu näiteks Privacy Badger)",
+    "contact the administrators of identity server <idserver />": "võtma ühendust isikutuvastusserveri <idserver /> haldajaga",
+    "wait and try again later": "ootama ja proovima hiljem uuesti",
+    "Disconnect anyway": "Ikkagi katkesta ühendus",
+    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Sa jätkuvalt <b>jagad oma isikuandmeid</b> isikutuvastusserveriga <idserver />.",
+    "Go back": "Mine tagasi",
+    "Identity Server (%(server)s)": "Isikutuvastusserver %(server)s",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Sinu serveri haldur on lülitanud läbiva krüptimise omavahelistes jututubades ja otsesõnumites välja.",
+    "This room has been replaced and is no longer active.": "See jututuba on asendatud teise jututoaga ning ei ole enam kasutusel.",
+    "You do not have permission to post to this room": "Sul ei ole õigusi siia jututuppa kirjutamiseks",
+    "Bold": "Paks kiri",
+    "Italics": "Kaldkiri",
+    "Strikethrough": "Läbikriipsutus",
+    "Code block": "Koodiplokk",
+    "Show": "Näita",
+    "Message preview": "Sõnumi eelvaade",
+    "List options": "Loendi valikud",
+    "Show %(count)s more|other": "Näita veel %(count)s sõnumit",
+    "Show %(count)s more|one": "Näita veel %(count)s sõnumit",
+    "This room is private, and can only be joined by invitation.": "See jututuba on vaid omavaheliseks kasutuseks ning liitumine toimub kutse alusel.",
+    "Upgrade this room to version %(version)s": "Uuenda jututuba versioonini %(version)s",
+    "Upgrade Room Version": "Uuenda jututoa versioon",
+    "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:": "Selle jututoa uuendamine eeldab tema praeguse ilmingu tegevuse lõpetamist ja uue jututoa loomist selle asemele. Selleks, et kõik kulgeks jututoas osalejate jaoks ladusalt, toimime nüüd nii:",
+    "Create a new room with the same name, description and avatar": "loome uue samanimelise jututoa, millel on sama kirjeldus ja tunnuspilt",
+    "Update any local room aliases to point to the new room": "uuendame kõik jututoa aliased nii, et nad viitaks uuele jututoale",
+    "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "ei võimalda kasutajatel enam vanas jututoas suhelda ning avaldame seal teate, mis soovitab kõigil kolida uude jututuppa",
+    "Put a link back to the old room at the start of the new room so people can see old messages": "selleks et saaks vanu sõnumeid lugeda, paneme uue jututoa algusesse viite vanale jututoale",
+    "Automatically invite users": "Kutsu kasutajad automaatselt",
+    "Upgrade private room": "Uuenda omavaheline jututuba",
+    "Upgrade public room": "Uuenda avalik jututuba",
+    "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Jututoa uuendamine on keerukas toiming ning tavaliselt soovitatakse seda teha vaid siis, kui jututuba on vigade tõttu halvasti kasutatav, sealt on puudu vajalikke funktsionaalsusi või seal ilmneb turvavigu.",
+    "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>.": "Selline tegevus mõjutab tavaliselt vaid viisi, kuidas jututoa andmeid töödeldakse serveris. Kui sinu kasutatavas %(brand)s'is tekib vigu, siis palun saada meile <a>veateade</a>.",
+    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Sa uuendad jututoa versioonist <oldVersion /> versioonini <newVersion />.",
+    "Clear Storage and Sign Out": "Tühjenda andmeruum ja logi välja",
+    "Send Logs": "Saada logikirjed",
+    "Refresh": "Värskenda",
+    "Unable to restore session": "Sessiooni taastamine ei õnnestunud",
+    "We encountered an error trying to restore your previous session.": "Meil tekkis eelmise sessiooni taastamisel viga.",
+    "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.": "Kui sa varem oled kasutanud uuemat %(brand)s'i versiooni, siis sinu pragune sessioon ei pruugi olla sellega ühilduv. Sulge see aken ja jätka selle uuema versiooni kasutamist.",
+    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Brauseri andmeruumi tühjendamine võib selle vea lahendada, kui samas logid sa ka välja ning kogu krüptitud vestlusajalugu muutub loetamatuks.",
+    "Verification Pending": "Verifikatsioon on ootel",
+    "Back": "Tagasi",
+    "Send Custom Event": "Saada kohandatud sündmus",
+    "You must specify an event type!": "Sa pead määratlema sündmuse tüübi!",
+    "Event sent!": "Sündmus on saadetud!",
+    "Failed to send custom event.": "Kohandatud sündmuse saatmine ei õnnestunud.",
+    "Event Type": "Sündmuse tüüp",
+    "State Key": "Oleku võti",
+    "Event Content": "Sündmuse sisu",
+    "Send Account Data": "Saada kasutajakonto andmed",
+    "View Servers in Room": "Näita jututoas kasutatavaid servereid",
+    "Verification Requests": "Verifitseerimistaotlused",
+    "Toolbox": "Töövahendid",
+    "Developer Tools": "Arendusvahendid",
+    "An error has occurred.": "Tekkis viga.",
+    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Selle kasutaja usaldamiseks peaksid ta verifitseerima. Kui sa pruugid läbivalt krüptitud sõnumeid, siis kasutajate verifitseerimine tagab sulle täiendava meelerahu.",
+    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Selle kasutaja verifitseerimisel märgitakse tema sessioon usaldusväärseks ning samuti märgitakse sinu sessioon tema jaoks usaldusväärseks.",
+    "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.": "Selle seadme usaldamiseks peaksid ta verifitseerima. Kui sa pruugid läbivalt krüptitud sõnumeid, siis selle seadme usaldamine tagab sulle ja teistele kasutajatele täiendava meelerahu.",
+    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Selle seadme verifitseerimisel märgitakse ta usaldusväärseks ning kõik kasutajad, kes sinuga on verifitseerimise läbi teinud, loevad ka selle seadme usaldusväärseks.",
+    "Waiting for partner to confirm...": "Ootan teise osapoole kinnitust...",
+    "Incoming Verification Request": "Saabuv verifitseerimispalve",
+    "Integrations are disabled": "Lõimingud ei ole kasutusel",
+    "Enable 'Manage Integrations' in Settings to do this.": "Selle tegevuse kasutuselevõetuks lülita seadetes sisse „Halda lõiminguid“ valik.",
+    "Integrations not allowed": "Lõimingute kasutamine ei ole lubatud",
+    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Sinu %(brand)s ei võimalda selle tegevuse jaoks kasutada Lõimingute haldurit. Palun küsi lisateavet administraatorilt.",
+    "Failed to invite the following users to chat: %(csvUsers)s": "Järgnevate kasutajate vestlema kutsumine ei õnnestunud: %(csvUsers)s",
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "Otsevestluse loomine ei õnnestunud. Palun kontrolli, et kasutajanimed oleks õiged ja proovi uuesti.",
+    "a new master key signature": "uus üldvõtme allkiri",
+    "a new cross-signing key signature": "uus risttunnustamise võtme allkiri",
+    "a device cross-signing signature": "seadme risttunnustamise allkiri",
+    "a key signature": "võtme allkiri",
+    "%(brand)s encountered an error during upload of:": "%(brand)s'is tekkis viga järgneva üleslaadimisel:",
+    "Cancelled signature upload": "Allkirja üleslaadimine on tühistatud",
+    "Unable to upload": "Üleslaadimine ei õnnestu",
+    "Signature upload success": "Allkirja üleslaadimine õnnestus",
+    "Signature upload failed": "Allkirja üleslaadimine ei õnnestunud",
+    "Address (optional)": "Aadress (valikuline)",
+    "Reject invitation": "Lükka kutse tagasi",
+    "Are you sure you want to reject the invitation?": "Kas sa oled kindel, et soovid lükata kutse tagasi?",
+    "Failed to set Direct Message status of room": "Jututoa otsevestluse oleku seadmine ei õnnestunud",
+    "Failed to forget room %(errCode)s": "Jututoa unustamine ei õnnestunud %(errCode)s",
+    "This homeserver would like to make sure you are not a robot.": "See server soovib kindlaks teha, et sa ei ole robot.",
+    "Country Dropdown": "Riikide valik",
+    "Confirm your identity by entering your account password below.": "Tuvasta oma isik sisestades salasõna alljärgnevalt.",
+    "Please review and accept all of the homeserver's policies": "Palun vaata üle kõik koduserveri kasutustingimused ja nõustu nendega",
+    "Please review and accept the policies of this homeserver:": "Palun vaata üle selle koduserveri kasutustingimused ja nõustu nendega:",
+    "An email has been sent to %(emailAddress)s": "Saatsime e-kirja %(emailAddress)s aadressile",
+    "Please check your email to continue registration.": "Registreerimise jätkamiseks, palun vaata oma e-kirjad.",
+    "A text message has been sent to %(msisdn)s": "Saatsime tekstisõnumi telefoninumbrile %(msisdn)s",
+    "Please enter the code it contains:": "Palun sisesta seal kuvatud kood:",
+    "Code": "Kood",
+    "Submit": "Saada",
+    "Start authentication": "Alusta autentimist",
+    "Unable to validate homeserver/identity server": "Ei õnnestu valideerida koduserverit/isikutuvastusserverit",
+    "Your Modular server": "Sinu 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>.": "Sisesta oma Modular'i koduserveri aadress. See võib kasutada nii sinu oma domeeni, kui olla <a>modular.im</a> alamdomeen.",
+    "Sign in with SSO": "Logi sisse kasutades SSO'd ehk ühekordset autentimist",
+    "Failed to reject invitation": "Kutse tagasi lükkamine ei õnnestunud",
+    "This room is not public. You will not be able to rejoin without an invite.": "See ei ole avalik jututuba. Ilma kutseta sa ei saa uuesti liituda.",
+    "Failed to leave room": "Jututoast lahkumine ei õnnestunud",
+    "Can't leave Server Notices room": "Serveriteadete jututoast ei saa lahkuda",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Seda jututuba kasutatakse sinu koduserveri oluliste teadete jaoks ja seega sa ei saa sealt lahkuda.",
+    "Signed Out": "Välja logitud",
+    "A username can only contain lower case letters, numbers and '=_-./'": "Kasutajanimes võivad olla vaid väiketähed, numbrid ja need viis tähemärki =_-./",
+    "Username not available": "Selline kasutajanimi ei ole saadaval",
+    "Username invalid: %(errMessage)s": "Vigane kasutajanimi: %(errMessage)s",
+    "An error occurred: %(error_string)s": "Tekkis viga: %(error_string)s",
+    "Checking...": "Kontrollin...",
+    "Username available": "Kasutajanimi on saadaval",
+    "To get started, please pick a username!": "Alustamiseks palun vali kasutajanimi!",
+    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "See saab olema sinu kasutajanimi <span></span> koduserveris, aga sa võid valida ka <a>mõne teise serveri</a>.",
+    "If you already have a Matrix account you can <a>log in</a> instead.": "Kui sul juba on olemas Matrix'i konto, siis võid lihtsalt <a>sisse logida</a>.",
+    "You have successfully set a password!": "Salasõna loomine õnnestus!",
+    "You have successfully set a password and an email address!": "Salasõna loomine ja e-posti aadressi salvestamine õnnestus!",
+    "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, võrgusildu, 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.",
+    "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.",
+    "Review terms and conditions": "Vaata üle kasutustingimused",
+    "Old cryptography data detected": "Tuvastasin andmed, mille puhul on kasutatud vanemat tüüpi krüptimist",
+    "Self-verification request": "Päring enda verifitseerimiseks",
+    "Switch to light mode": "Kasuta heledat teemat",
+    "Switch to dark mode": "Kasuta tumedat teemat",
+    "Switch theme": "Vaheta teemat",
+    "Security & privacy": "Turvalisus ja privaatsus",
+    "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.",
+    "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 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",
+    "Default": "Tavakasutaja",
+    "Restricted": "Piiratud õigustega kasutaja",
+    "Moderator": "Moderaator",
+    "Admin": "Peakasutaja",
+    "Custom (%(level)s)": "Kohandatud õigused (%(level)s)",
+    "Failed to invite": "Kutse saatmine ei õnnestunud",
+    "Operation failed": "Toiming ei õnnestunud",
+    "Failed to invite users to the room:": "Kasutajate kutsumine jututuppa ei õnnestunud:",
+    "Failed to invite the following users to the %(roomName)s room:": "Järgnevate kasutajate kutsumine %(roomName)s jututuppa ei õnnestunud:",
+    "You need to be logged in.": "Sa peaksid olema sisse loginud.",
+    "You need to be able to invite users to do that.": "Selle tegevuse jaoks peaks sul olema õigus teistele kasutajatele kutse saatmiseks.",
+    "Unable to create widget.": "Vidina loomine ei õnnestunud.",
+    "Missing roomId.": "Jututoa tunnus ehk roomId on puudu.",
+    "Failed to send request.": "Päringu saatmine ei õnnestunud.",
+    "This room is not recognised.": "Seda jututuba ei õnnestu ära tunda.",
+    "Power level must be positive integer.": "Õiguste tase peab olema positiivne täisarv.",
+    "You are not in this room.": "Sa ei asu selles jututoas.",
+    "You do not have permission to do that in this room.": "Sinul pole selle toimingu jaoks selles jututoas õigusi.",
+    "Missing room_id in request": "Päringus puudub jututoa tunnus ehk room_id",
+    "Room %(roomId)s not visible": "Jututuba %(roomId)s ei ole nähtav",
+    "Missing user_id in request": "Päringus puudub kasutaja tunnus ehk user_id",
+    "Messages": "Sõnumid",
+    "Actions": "Tegevused",
+    "Other": "Muud",
+    "Usage": "Kasutus",
+    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Lisa ¯\\_(ツ)_/¯ smaili vormindamata teksti algusesse",
+    "Sends a message as plain text, without interpreting it as markdown": "Saadab sõnumi vormindamata tekstina ega tõlgenda seda markdown-vormindusena",
+    "Sends a message as html, without interpreting it as markdown": "Saadab sõnumi html'ina ega tõlgenda seda markdown-vormindusena",
+    "/ddg is not a command": "/ddg ei ole käsk",
+    "You joined the call": "Sina liitusid kõnega",
+    "%(senderName)s joined the call": "%(senderName)s liitus kõnega",
+    "Call in progress": "Kõne on pooleli",
+    "You left the call": "Sa lahkusid kõnest",
+    "%(senderName)s left the call": "%(senderName)s lahkus kõnest",
+    "Call ended": "Kõne lõppes",
+    "You started a call": "Sa alustasid kõnet",
+    "%(senderName)s started a call": "%(senderName)s alustas kõnet",
+    "Waiting for answer": "Ootan kõnele vastamist",
+    "%(senderName)s is calling": "%(senderName)s helistab",
+    "You created the room": "Sa lõid jututoa",
+    "%(senderName)s created the room": "%(senderName)s lõi jututoa",
+    "You made the chat encrypted": "Sina võtsid vestlusel kasutuse krüptimise",
+    "%(senderName)s made the chat encrypted": "%(senderName)s võttis vestlusel kasutuse krüptimise",
+    "You made history visible to new members": "Sina tegid jututoa ajaloo loetavaks uuetele liikmetele",
+    "%(senderName)s made history visible to new members": "%(senderName)s tegi jututoa ajaloo loetavaks uuetele liikmetele",
+    "You made history visible to anyone": "Sina tegi jututoa ajaloo loetavaks kõikidele",
+    "%(senderName)s made history visible to anyone": "%(senderName)s tegi jututoa ajaloo loetavaks kõikidele",
+    "You made history visible to future members": "Sina tegid jututoa ajaloo loetavaks tulevastele liikmetele",
+    "%(senderName)s made history visible to future members": "%(senderName)s tegi jututoa ajaloo loetavaks tulevastele liikmetele",
+    "You were invited": "Sina said kutse",
+    "%(targetName)s was invited": "%(targetName)s sai kutse",
+    "You left": "Sina lahkusid",
+    "%(targetName)s left": "%(targetName)s lahkus",
+    "You were kicked (%(reason)s)": "Sind müksati jututoast välja (%(reason)s)",
+    "%(targetName)s was kicked (%(reason)s)": "%(targetName)s müksati jututoast välja (%(reason)s)",
+    "You were kicked": "Sind müksati jututoast välja",
+    "%(targetName)s was kicked": "%(targetName)s müksati jututoast välja",
+    "You rejected the invite": "Sa lükkasid kutse tagasi",
+    "%(targetName)s rejected the invite": "%(targetName)s lükkas kutse tagasi",
+    "You were uninvited": "Sinult võeti kutse tagasi",
+    "%(targetName)s was uninvited": "%(targetName)s'lt võeti kutse tagasi",
+    "You joined": "Sina liitusid",
+    "%(targetName)s joined": "%(targetName)s liitus",
+    "You changed your name": "Sa muutsid oma nime",
+    "%(targetName)s changed their name": "%(targetName)s muutis oma nime",
+    "You changed your avatar": "Sa muutsid oma tunnuspilti",
+    "%(targetName)s changed their avatar": "%(targetName)s muutis oma tunnuspilti",
+    "%(senderName)s %(emote)s": "%(senderName)s %(emote)s",
+    "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
+    "You changed the room name": "Sina muutsid jututoa nime",
+    "%(senderName)s changed the room name": "%(senderName)s muutis jututoa nime",
+    "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
+    "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
+    "You uninvited %(targetName)s": "Sina võtsid tagasi kutse kasutajalt %(targetName)s",
+    "%(senderName)s uninvited %(targetName)s": "%(senderName)s võttis kutse tagasi kasutajalt %(targetName)s",
+    "You invited %(targetName)s": "Sina kutsusid kasutajat %(targetName)s",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s kutsus kasutajat %(targetName)s",
+    "You changed the room topic": "Sina muutsid jututoa teemat",
+    "%(senderName)s changed the room topic": "%(senderName)s muutis jututoa teemat",
+    "Use the improved room list (will refresh to apply changes)": "Kasuta parandaatud jututubade loendit (muudatuse jõustamine eeldab andmete uuesti laadimist)",
+    "Use custom size": "Kasuta kohandatud suurust",
+    "Use a more compact ‘Modern’ layout": "Kasuta veel kompaktsemat „moodsat“ paigutust",
+    "Cross-signing public keys:": "Avalikud võtmed risttunnustamise jaoks:",
+    "in memory": "on mälus",
+    "not found": "pole leitavad",
+    "Delete %(count)s sessions|other": "Kustuta %(count)s sessiooni",
+    "Delete %(count)s sessions|one": "Kustuta %(count)s sessioon",
+    "ID": "Kasutaja ID",
+    "Public Name": "Avalik nimi",
+    "Last seen": "Viimati nähtud",
+    "Manage": "Halda",
+    "Enable": "Võta kasutusele",
+    "Error saving email notification preferences": "E-posti teel saadetavate teavituste eelistuste salvestamisel tekkis viga",
+    "An error occurred whilst saving your email notification preferences.": "E-posti teel saadetavate teavituste eelistuste salvestamisel tekkis viga.",
+    "Keywords": "Märksõnad",
+    "Enter keywords separated by a comma:": "Sisesta märksõnad ja kasuta eraldajaks koma:",
+    "Failed to change settings": "Seadistuste muutmine ei õnnestunud",
+    "Can't update user notification settings": "Kasutaja teavistuste eelistusi ei õnnestunud uuendada",
+    "Failed to update keywords": "Märksõnade uuendamine ei õnnestunud",
+    "Messages containing <span>keywords</span>": "Sõnumid, mis sisaldavad <span>märksõnu</span>",
+    "Notify me for anything else": "Teavita mind kõigest muust",
+    "Enable notifications for this account": "Võta sellel kasutajakontol kasutusele teavitused",
+    "Clear notifications": "Eemalda kõik teavitused",
+    "All notifications are currently disabled for all targets.": "Kõik teavituste liigid on välja lülitatud.",
+    "Add an email address to configure email notifications": "E-posti teel saadetavate teavituste seadistamiseks lisa e-posti aadress",
+    "Enable email notifications": "Võta kasutusele e-posti teel saadetavad teavitused",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Alljärgnevate märksõnadega seotud teavitused järgivad reegleid, misa siin ei saa kuvada:",
+    "Disinvite this user from community?": "Kas võtame sellelt kasutajalt tagasi kutse kogukonnaga liitumiseks?",
+    "Failed to withdraw invitation": "Kutse tühistamine ei õnnestunud",
+    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> jututoas %(roomName)s",
+    "Failed to change power level": "Õiguste muutmine ei õnnestunud",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Sa ei saa seda muudatust hiljem tagasi pöörata, sest annad teisele kasutajale samad õigused, mis sinul on.",
+    "Deactivate user?": "Kas deaktiveerime kasutajakonto?",
+    "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?": "Kasutaja deaktiveerimisel logitakse ta automaatselt välja ning ei lubata enam sisse logida. Lisaks lahkub ta kõikidest jututubadest, mille liige ta parasjagu on. Seda tegevust ei saa tagasi pöörata. Kas sa oled ikka kindel, et soovid selle kasutaja kõijkalt eemaldada?",
+    "Deactivate user": "Deaktiveeri kasutaja",
+    "Failed to deactivate user": "Kasutaja deaktiveerimine ei õnnestunud",
+    "This client does not support end-to-end encryption.": "See klient ei toeta läbivat krüptimist.",
+    "Security": "Turvalisus",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Selle vidina kasutamisel võidakse jagada andmeid <helpIcon /> saitidega %(widgetDomain)s ning sinu vidinahalduriga.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Selle vidina kasutamisel võidakse jagada andmeid <helpIcon /> saitidega %(widgetDomain)s.",
+    "Widgets do not use message encryption.": "Erinevalt sõnumitest vidinad ei kasuta krüptimist.",
+    "Widget added by": "Vidina lisaja",
+    "This widget may use cookies.": "See vidin võib kasutada küpsiseid.",
+    "Delete Widget": "Kustuta vidin",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Vidina kustutamisel eemaldatakse ta kõikide selle jututoa kasutajate jaoks. Kas sa kindlasti soovid seda vidinat eemaldada?",
+    "Delete widget": "Kustuta vidin",
+    "Minimize apps": "Vähenda rakendused",
+    "Maximize apps": "Suurenda rakendused",
+    "Popout widget": "Ava rakendus eraldi aknas",
+    "More options": "Täiendavad seadistused",
+    "Language Dropdown": "Keelevalik",
+    "Manage Integrations": "Halda lõiminguid",
+    "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s liitusid %(count)s korda",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s liitusid",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s liitus %(count)s korda",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s liitus",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s lahkusid %(count)s korda",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s lahkusid",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s lahkus %(count)s korda",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s lahkus",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s liitusid ja lahkusid %(count)s korda",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s liitusid ja lahkusid",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s liitus ja lahkus %(count)s korda",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s liitus ja lahkus",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s lahkusid ja liitusid uuesti %(count)s korda",
+    "%(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.",
+    "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",
+    "Ignored user": "Eiratud kasutaja",
+    "You are now ignoring %(userId)s": "Sa praegu eirad kasutajat %(userId)s",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s keelas ligipääsu kasutajale %(targetName)s.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s taastas ligipääsu kasutajale %(targetName)s.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s võttis tagasi %(targetName)s kutse.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s müksas kasutajat %(targetName)s.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s muutis selle jututoa klammerdatud sõnumeid.",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s eemaldas kasutajate ligipääsukeelu reegli, mis vastas tingimusele %(glob)s",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s eemaldas jututubade ligipääsukeelu reegli, mis vastas tingimusele %(glob)s",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s eemaldas serverite ligipääsukeelu reegli, mis vastas tingimusele %(glob)s",
+    "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s eemaldas ligipääsukeelu reegli, mis vastas tingimusele %(glob)s",
+    "%(senderName)s updated an invalid ban rule": "%(senderName)s uuendas vigast ligipääsukeelu reeglit",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s uuendas %(reason)s põhjusel kasutajate ligipääsukeelu reeglit, mis vastas tingimusele %(glob)s",
+    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s uuendas %(reason)s põhjusel jututubade ligipääsukeelu reeglit, mis vastas tingimusele %(glob)s",
+    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s uuendas %(reason)s põhjusel serverite ligipääsukeelu reeglit, mis vastas tingimusele %(glob)s",
+    "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s uuendas %(reason)s põhjusel ligipääsukeelu reeglit, mis vastas tingimusele %(glob)s",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s määras %(reason)s tõttu kasutajate ligipääsukeelu reegli, mis vastas tingimusele %(glob)s",
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s määras %(reason)s tõttu jututubade ligipääsukeelu reegli, mis vastas tingimusele %(glob)s",
+    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s määras %(reason)s tõttu serverite ligipääsukeelu reegli, mis vastas tingimusele %(glob)s",
+    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s määras %(reason)s tõttu ligipääsukeelu reegli, mis vastas tingimusele %(glob)s",
+    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s muutis %(reason)s tõttu kasutajate ligipääsukeelu reegli algset tingimust %(oldGlob)s uueks tingimuseks %(newGlob)s",
+    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s muutis %(reason)s tõttu jututubade ligipääsukeelu reegli algset tingimust %(oldGlob)s uueks tingimuseks %(newGlob)s",
+    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s muutis %(reason)s tõttu serverite ligipääsukeelu reegli algset tingimust %(oldGlob)s uueks tingimuseks %(newGlob)s",
+    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s muutis %(reason)s tõttu ligipääsukeelu reegli algset tingimust %(oldGlob)s uueks tingimuseks %(newGlob)s",
+    "The user must be unbanned before they can be invited.": "Enne kutse saatmist peab kasutajalt olema eemaldatud ligipääsukeeld.",
+    "Your homeserver has exceeded its user limit.": "Sinu koduserver on ületanud kasutajate arvu ülempiiri.",
+    "Your homeserver has exceeded one of its resource limits.": "Sinu koduserver on ületanud ühe oma ressursipiirangutest.",
+    "Contact your <a>server admin</a>.": "Võta ühendust <a>oma serveri haldajaga</a>.",
+    "Warning": "Hoiatus",
+    "Ok": "Sobib",
+    "Set password": "Määra salasõna",
+    "To return to your account in future you need to set a password": "Selleks, et sa saaksid tulevikus oma konto juurde tagasi pöörduda, peaksid määrama salasõna",
+    "You were banned (%(reason)s)": "Sinule on seatud ligipääsukeeld %(reason)s",
+    "%(targetName)s was banned (%(reason)s)": "%(targetName)s seati ligipääsukeeld %(reason)s",
+    "You were banned": "Sinule seati ligipääsukeeld",
+    "%(targetName)s was banned": "%(targetName)s'le seati ligipääsukeeld",
+    "New spinner design": "Uus vurri-moodi paigutus",
+    "Message Pinning": "Sõnumite klammerdamine",
+    "IRC display name width": "IRC kuvatava nime laius",
+    "Enable experimental, compact IRC style layout": "Võta kasutusele katseline, IRC-stiilis kompaktne sõnumite paigutus",
+    "My Ban List": "Minu poolt seatud ligipääsukeeldude loend",
+    "Active call (%(roomName)s)": "Käsilolev kõne (%(roomName)s)",
+    "Unknown caller": "Tundmatu helistaja",
+    "Incoming voice call": "Saabuv häälkõne",
+    "Incoming video call": "Saabuv videokõne",
+    "Incoming call": "Saabuv kõne",
+    "Waiting for your other session to verify…": "Ootan, et sinu teine sessioon alustaks verifitseerimist…",
+    "This bridge was provisioned by <user />.": "Selle võrgusilla võttis kasutusele <user />.",
+    "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:",
+    "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.",
+    "Connecting to integration manager...": "Ühendan lõiminguhalduriga...",
+    "Cannot connect to integration manager": "Ei saa ühendust lõiminguhalduriga",
+    "The integration manager is offline or it cannot reach your homeserver.": "Lõiminguhaldur kas ei tööta või ei õnnestu tal teha päringuid sinu koduserveri suunas.",
+    "Delete Backup": "Kustuta varukoopia",
+    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Kas sa oled kindel? Kui sul muud varundust pole, siis kaotad ligipääsu oma krüptitud sõnumitele.",
+    "Your keys are <b>not being backed up from this session</b>.": "Sinu selle sessiooni krüptovõtmeid <b>ei varundata</b>.",
+    "Back up your keys before signing out to avoid losing them.": "Vältimaks nende kaotamist, varunda krüptovõtmed enne väljalogimist.",
+    "Advanced notification settings": "Teavituste lisaseadistused",
+    "Enable desktop notifications for this session": "Võta selleks sessiooniks kasutusele töölauakeskkonnale omased teavitused",
+    "Show message in desktop notification": "Näita sõnumit töölauakeskkonnale omases teavituses",
+    "Enable audible notifications for this session": "Võta selleks sessiooniks kasutusele kuuldavad teavitused",
+    "Off": "Välja lülitatud",
+    "On": "Kasutusel",
+    "Noisy": "Jutukas",
+    "<a>Upgrade</a> to your own domain": "<a>Võta kasutusele</a> oma domeen",
+    "Error encountered (%(errorDetail)s).": "Tekkis viga (%(errorDetail)s).",
+    "Checking for an update...": "Kontrollin uuenduste olemasolu...",
+    "No update available.": "Uuendusi pole saadaval.",
+    "New version available. <a>Update now.</a>": "Saadaval on uus versioon. <a>Uuenda nüüd.</a>",
+    "Check for update": "Kontrolli uuendusi",
+    "Hey you. You're the best!": "Hei sina. Sa oled parim!",
+    "Size must be a number": "Suurus peab olema number",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "Kohandatud fondisuurus peab olema vahemikus %(min)s pt ja %(max)s pt",
+    "Use between %(min)s pt and %(max)s pt": "Kasuta suurust vahemikus %(min)s pt ja %(max)s pt",
+    "Message layout": "Sõnumite paigutus",
+    "Compact": "Kompaktne",
+    "Modern": "Moodne",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Vali sinu seadmes leiduv fondi nimi ning %(brand)s proovib seda kasutada.",
+    "Customise your appearance": "Kohenda välimust",
+    "Appearance Settings only affect this %(brand)s session.": "Välimuse kohendused kehtivad vaid selles %(brand)s'i sessioonis.",
+    "Legal": "Juriidiline teave",
+    "Credits": "Tänuavaldused",
+    "Bug reporting": "Vigadest teatamine",
+    "Clear cache and reload": "Tühjenda puhver ja lae uuesti",
+    "FAQ": "Korduma kippuvad küsimused",
+    "Versions": "Versioonid",
+    "%(brand)s version:": "%(brand)s'i versioon:",
+    "olm version:": "olm'i versioon:",
+    "Homeserver is": "Koduserver on",
+    "Identity Server is": "Isikutuvastusserver on",
+    "Access Token:": "Pääsuluba:",
+    "click to reveal": "kuvamiseks klõpsi siin",
+    "Labs": "Katsed",
+    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Sa võid täiendada oma kasutuskogemust katseliste funktsionaalsusetega. <a>Vaata lisateavet</a>.",
+    "Ignored/Blocked": "Eiratud või ligipääs blokeeritud",
+    "Error adding ignored user/server": "Viga eiratud kasutaja või serveri lisamisel",
+    "Something went wrong. Please try again or view your console for hints.": "Midagi läks valesti. Proovi uuesti või otsi lisavihjeid konsoolilt.",
+    "Error subscribing to list": "Viga loendiga liitumisel",
+    "Please verify the room ID or address and try again.": "Palun kontrolli, kas jututoa tunnus või aadress on õiged ja proovi uuesti.",
+    "Error removing ignored user/server": "Viga eiratud kasutaja või serveri eemaldamisel",
+    "Error unsubscribing from list": "Viga loendist lahkumisel",
+    "Please try again or view your console for hints.": "Palun proovi uuesti või otsi lisavihjeid konsoolilt.",
+    "None": "Ei ühelgi juhul",
+    "Ban list rules - %(roomName)s": "Ligipääsukeelu reeglid - %(roomName)s",
+    "Server rules": "Serveri kasutustingimused",
+    "User rules": "Kasutajaga seotud tingimused",
+    "You have not ignored anyone.": "Sa ei ole veel kedagi eiranud.",
+    "You are currently ignoring:": "Hetkel eiratavate kasutajate loend:",
+    "You are not subscribed to any lists": "Sa ei ole liitunud ühegi loendiga",
+    "Unsubscribe": "Lõpeta liitumine",
+    "View rules": "Näita reegleid",
+    "You are currently subscribed to:": "Sa oled hetkel liitunud:",
+    "Ignored users": "Eiratud kasutajad",
+    "⚠ 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.",
+    "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",
+    "Read Marker off-screen lifetime (ms)": "Lugemise markeri iga, kui Element pole fookuses (ms)",
+    "Make this room low priority": "Muuda see jututuba vähetähtsaks",
+    "Low priority rooms show up at the bottom of your room list in a dedicated section at the bottom of your room list": "Vähetähtsad jututoad kuvatakse jututubade loendi lõpus omaette grupina",
+    "Failed to unban": "Ligipääsu taastamine ei õnnestunud",
+    "Unban": "Taasta ligipääs",
+    "Banned by %(displayName)s": "Ligipääs on keelatud %(displayName)s poolt",
+    "Error changing power level requirement": "Viga õiguste taseme nõuete muutmisel",
+    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Jututoa õiguste taseme nõuete muutmisel tekkis viga. Kontrolli, et sul on selleks piisavalt õigusi ja proovi uuesti.",
+    "Error changing power level": "Viga õiguste muutmisel",
+    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Kasutaja õiguste muutmisel tekkis viga. Kontrolli, et sul on selleks piisavalt õigusi ja proovi uuesti.",
+    "To link to this room, please add an address.": "Sellele jututoale viitamiseks palun lisa talle aadress.",
+    "Discovery options will appear once you have added an email above.": "Otsinguvõimaluste loend kuvatakse, kui oled ülale sisestanud e-posti aadressi.",
+    "Discovery options will appear once you have added a phone number above.": "Otsinguvõimaluste loend kuvatakse, kui oled ülale sisestanud telefoninumbri.",
+    "Mod": "Moderaator",
+    "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.": "Võtmete jagamise päringud saadetakse sinu teistele sessioonidele automaatselt. Kui sa oled mõnes muus sessioonis võtmete jagamise päringud tagasi lükanud või tühistanud, siis klõpsi siia võtmete uuesti pärimiseks selle sessiooni jaoks.",
+    "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Kui sinu muudel sesioonidel pole selle sõnumi jaoks võtmeid, siis nad ei suuda ka sõnumit dekrüptida.",
+    "Key request sent.": "Võtmete jagamise päring on saadetud.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "Küsi oma muudest sessioonidest <requestLink>krüptimisvõtmed uuesti</requestLink>.",
+    "The authenticity of this encrypted message can't be guaranteed on this device.": "Selle krüptitud sõnumi autentsus pole selles seadmes tagatud.",
+    "and %(count)s others...|other": "ja %(count)s muud...",
+    "and %(count)s others...|one": "ja üks muu...",
+    "Invited": "Kutsutud",
+    "%(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...",
+    "Pinned Messages": "Klammerdatud sõnumid",
+    "Unpin Message": "Eemalda sõnumi klammerdus",
+    "No recently visited rooms": "Hiljuti külastatud jututubasid ei leidu",
+    "Create room": "Loo jututuba",
+    "People": "Inimesed",
+    "Unread rooms": "Lugemata jututoad",
+    "Always show first": "Näita alati esimisena",
+    "Error creating address": "Viga aadressi loomisel",
+    "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "Aadressi loomisel tekkis viga. See kas on serveri poolt keelatud või tekkis ajutine tõrge.",
+    "You don't have permission to delete the address.": "Sinul pole õigusi selle aadressi kustutamiseks.",
+    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Selle aadressi kustutamisel tekkis viga. See kas juba on kustutatud või tekkis ajutine tõrge.",
+    "Error removing address": "Viga aadresi kustutamisel",
+    "This room has no local addresses": "Sellel jututoal puuduvad kohalikud aadressid",
+    "Local address": "Kohalik aadress",
+    "Published Addresses": "Avaldatud aadressid",
+    "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.": "Avaldatud aadresse saab mis iganes serveri kasutaja pruukida sinu jututoaga liitumiseks. Aadressi avaldamiseks peab ta alustuseks olema määratud kohaliku aadressina.",
+    "Other published addresses:": "Muud avaldatud aadressid:",
+    "No other published addresses yet, add one below": "Ühtegi muud aadressi pole veel avaldatud, lisa üks alljärgnevalt",
+    "Local Addresses": "Kohalikud aadressid",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Et muud kasutajad saaks seda jututuba leida sinu koduserveri (%(localDomain)s) kaudu, lisa sellele jututoale aadresse",
+    "Invalid community ID": "Vigane kogukonna tunnus",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' ei ole korrektne kogukonna tunnus",
+    "Direct message": "Otsevestlus",
+    "Demote yourself?": "Kas vähendad enda õigusi?",
+    "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.": "Kuna sa vähendad enda õigusi, siis sul ei pruugi enam olla võimalik seda muutust tagasi pöörata. Kui sa juhtumisi oled viimane haldusõigustega kasutaja jututoas, siis hiljem on võimatu samu õigusi tagasi saada.",
+    "Demote": "Vähenda enda õigusi",
+    "Ban": "Keela ligipääs",
+    "Unban this user?": "Kas taastame selle kasutaja ligipääsu?",
+    "Ban this user?": "Kas keelame selle kasutaja ligipääsu?",
+    "Failed to ban user": "Kasutaja ligipääsu keelamine ei õnnestunud",
+    "Almost there! Is your other session showing the same shield?": "Peaaegu valmis! Kas sinu teises sessioonis kuvatakse sama kilpi?",
+    "Almost there! Is %(displayName)s showing the same shield?": "Peaaegu valmis! Kas %(displayName)s kuvab sama kilpi?",
+    "Yes": "Jah",
+    "Verify all users in a room to ensure it's secure.": "Tagamaks, et jututuba on turvaline, verifitseeri kõik selle kasutajad.",
+    "You've successfully verified your device!": "Sinu seadme verifitseerimine oli edukas!",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Sa oled edukalt verifitseerinud seadme %(deviceName)s (%(deviceId)s)!",
+    "You've successfully verified %(displayName)s!": "Sa oled edukalt verifitseerinud kasutaja %(displayName)s!",
+    "Verified": "Verifitseeritud",
+    "Got it": "Selge lugu",
+    "Start verification again from the notification.": "Alusta verifitseerimist uuesti teavitusest.",
+    "Message deleted": "Sõnum on kustutatud",
+    "Message deleted by %(name)s": "%(name)s kustutas sõnumi",
+    "Message deleted on %(date)s": "Sõnum on kustutatud %(date)s",
+    "Add an Integration": "Lisa lõiming",
+    "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?": "Sind juhatatakse kolmanda osapoole veebisaiti, kus sa saad autentida oma kontoga %(integrationsUrl)s kasutamiseks. Kas sa soovid jätkata?",
+    "Categories": "Kategooriad",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s lükkasid tagasi oma kutse %(count)s korda",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s lükkasid tagasi oma kutse",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s lükkas tagasi oma kutse %(count)s korda",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s lükkas taagasi oma kutse",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s kutse võeti tagasi %(count)s korda",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "Kasutajate %(severalUsers)s kutse võeti tagasi",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s kutse võeti tagasi %(count)s korda",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "Kasutaja %(oneUser)s kutse võeti tagasi",
+    "were banned %(count)s times|other": "said ligipääsukeelu %(count)s korda",
+    "were banned %(count)s times|one": "said ligipääsukeelu",
+    "was banned %(count)s times|other": "sai ligipääsukeelu %(count)s korda",
+    "was banned %(count)s times|one": "sai ligipääsukeelu",
+    "were unbanned %(count)s times|other": "taastati ligipääs %(count)s korda",
+    "were unbanned %(count)s times|one": "taastati ligipääs",
+    "was unbanned %(count)s times|other": "taastati ligipääs %(count)s korda",
+    "was unbanned %(count)s times|one": "taastati ligipääs",
+    "were kicked %(count)s times|other": "müksati välja %(count)s korda",
+    "were kicked %(count)s times|one": "müksati välja",
+    "was kicked %(count)s times|other": "müksati välja %(count)s korda",
+    "was kicked %(count)s times|one": "müksati välja",
+    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s ei teinud muudatusi %(count)s korda",
+    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s ei teinud muudatusi",
+    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s ei teinud muutusi %(count)s korda",
+    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s ei teinud muudatusi",
+    "Power level": "Õiguste tase",
+    "Custom level": "Kohandatud õigused",
+    "QR Code": "QR kood",
+    "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Ei ole võimalik laadida seda sündmust, millele vastus on tehtud - teda kas pole olemas või sul pole õigusi seda näha.",
+    "Room address": "Jututoa aadress",
+    "Some characters not allowed": "Mõned tähemärgid ei ole siin lubatud",
+    "Please provide a room address": "Palun kirjuta jututoa aadress",
+    "This address is available to use": "See aadress on kasutatav",
+    "This address is already in use": "See aadress on juba kasutusel",
+    "Room directory": "Jututubade loend",
+    "Sign in with single sign-on": "Logi sisse ühekordse sisselogimise abil",
+    "And %(count)s more...|other": "Ja %(count)s muud...",
+    "ex. @bob:example.com": "näiteks @kati:mingidomeen.com",
+    "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.": "Kui sul leidub lisateavet, mis võis selle vea analüüsimisel abiks olla, siis palun lisa need ka siia - näiteks mida sa vea tekkimise hetkel tegid, jututoa tunnus, kasutajate tunnused, jne.",
+    "Send logs": "Saada logikirjed",
+    "Unable to load commit detail: %(msg)s": "Ei õnnestu laadida sõnumi lisateavet: %(msg)s",
+    "Unavailable": "Ei ole saadaval",
+    "Changelog": "Versioonimuudatuste loend",
+    "You cannot delete this message. (%(code)s)": "Sa ei saa seda sõnumit kustutada. (%(code)s)",
+    "Navigate recent messages to edit": "Muutmiseks liigu viimaste sõnumite juurde",
+    "Move autocomplete selection up/down": "Liiguta automaatse sõnalõpetuse valikut üles või alla",
+    "Cancel autocomplete": "Lülita automaatne sõnalõpetus välja",
+    "Removing…": "Eemaldan…",
+    "Destroy cross-signing keys?": "Kas hävitame risttunnustamise võtmed?",
+    "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.": "Risttunnustamise võtmete kustutamine on tegevus, mida ei saa tagasi pöörata. Kõik sinu verifitseeritud vestluskaaslased näevad seejärel turvateateid. Kui sa just pole kaotanud ligipääsu kõikidele oma seadmetele, kust sa risttunnustamist oled teinud, siis sa ilmselgelt ei peaks kustutamist ette võtma.",
+    "Clear cross-signing keys": "Eemalda risttunnustamise võtmed",
+    "Confirm Removal": "Kinnita eemaldamine",
+    "Clear all data in this session?": "Kas eemaldame kõik selle sessiooni andmed?",
+    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Sessiooni kõikide andmete kustutamine on tegevus, mida ei saa tagasi pöörata. Kui sa pole varundanud krüptovõtmeid, siis sa kaotad ligipääsu krüptitud sõnumitele.",
+    "Clear all data": "Eemalda kõik andmed",
+    "Community IDs cannot be empty.": "Kogukonna tunnus ei või olla puudu.",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Kogukonna tunnuses võivad olla vaid järgnevad tähemärgid: a-z, 0-9, or '=_-./'",
+    "Something went wrong whilst creating your community": "Kogukonna loomisel läks midagi viltu",
+    "Create Community": "Loo kogukond",
+    "Community Name": "Kogukonna nimi",
+    "Example": "Näiteks",
+    "Community ID": "Kogukonna tunnus",
+    "example": "näiteks",
+    "Create": "Loo",
+    "Please enter a name for the room": "Palun sisesta jututoa nimi",
+    "Set a room address to easily share your room with other people.": "Jagamaks jututuba teiste kasutajatega, sisesta jututoa aadress.",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "Seda funktsionaalsust sa ei saa hiljem kinni keerata. Sõnumisillad ja enamus roboteid veel ei oska seda kasutada.",
+    "Enable end-to-end encryption": "Võta läbiv krüptimine kasutusele",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "Kinnitamaks seda, et soovid oma konto kasutusest eemaldada, kasuta oma isiku tuvastamiseks ühekordset sisselogimist.",
+    "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>": "See muudab sinu konto jäädavalt mittekasutatavaks. Sina ei saa enam sisse logida ja keegi teine ei saa seda kasutajatunnust uuesti pruukida. Samuti logitakse sind välja kõikidest jututubadest, kus sa osaled ning eemaldatakse kõik sinu andmed sinu isikutuvastusserverist. <b>Seda tegevust ei saa tagasi pöörata.</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.": "Sinu konto kustutamine <b>vaikimisi ei tähenda, et unustatakse ka sinu saadetud sõnumid.</b> Kui sa siiski soovid seda, siis palun tee märge alljärgnevasse kasti.",
+    "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'i sõnumite nähtavus on sarnane e-posti kirjadega. Sõnumite unustamine tegelikult tähendab seda, et sinu varemsaadetud sõnumeid ei jagata uute või veel registreerumata kasutajatega, kuid registeerunud kasutajad, kes juba on need sõnumid saanud, võivad neid ka jätkuvalt lugeda.",
+    "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)": "Minu konto kustutamisel palun unusta minu saadetud sõnumid (<b>Hoiatus:</b> seetõttu näevad tulevased kasutajad poolikuid vestlusi)",
+    "To continue, use Single Sign On to prove your identity.": "Jätkamaks tuvasta oma isik kasutades ühekordset sisselogimist.",
+    "Confirm to continue": "Soovin jätkata",
+    "Click the button below to confirm your identity.": "Oma isiku tuvastamiseks klõpsi alljärgnevat nuppu.",
+    "Incompatible local cache": "Kohalikud andmepuhvrid ei ühildu",
+    "Clear cache and resync": "Tühjenda puhver ja sünkroniseeri andmed uuesti",
+    "Confirm by comparing the following with the User Settings in your other session:": "Kinnita seda võrreldes järgnevaid andmeid oma teise sessiooni kasutajaseadetes:",
+    "Confirm this user's session by comparing the following with their User Settings:": "Kinnita selle kasutaja sessioon võrreldes järgnevaid andmeid tema kasutajaseadetes:",
+    "Session name": "Sessiooni nimi",
+    "Session ID": "Sessiooni tunnus",
+    "Session key": "Sessiooni võti",
+    "If they don't match, the security of your communication may be compromised.": "Kui nad omavahel ei klapi, siis teie suhtluse turvalisus võib olla ohus.",
+    "Your homeserver doesn't seem to support this feature.": "Tundub, et sinu koduserver ei toeta sellist funktsionaalsust.",
+    "Message edits": "Sõnumite muutmised",
+    "Your account is not secure": "Sinu kasutajakonto ei ole turvaline",
+    "This session, or the other session": "See või teine sessioon",
+    "The internet connection either session is using": "Internetiühendus, mida emb-kumb sessioon kasutab",
+    "New session": "Uus sessioon",
+    "Use this session to verify your new one, granting it access to encrypted messages:": "Kasuta seda sessiooni uute sessioonide verifitseerimiseks, andes sellega ligipääsu krüptitud sõnumitele:",
+    "If you didn’t sign in to this session, your account may be compromised.": "Kui sa pole sellesse sessiooni sisse loginud, siis sinu kasutajakonto andmed võivad olla sattunud valedesse kätesse.",
+    "This wasn't me": "See ei olnud mina",
+    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Kui sa leiad vigu või soovid jagada muud tagasisidet, siis teata sellest GitHub'i vahendusel.",
+    "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.": "Topelt veateadete vältimiseks palun <existingIssuesLink>vaata esmalt olemasolevaid</existingIssuesLink> (ning lisa a + 1), aga kui sa samal teemal viga ei leia, siis <newIssueLink>koosta uus veateade</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.": "Sellest sõnumist teatamine saadab tema unikaalse sõnumi tunnuse sinu koduserveri haldurile. Kui selle jututoa sõnumid on krüptitud, siis sinu koduserveri haldur ei saa lugeda selle sõnumi teksti ega vaadata seal leiduvaid faile ja pilte.",
+    "Failed to upgrade room": "Jututoa versiooni uuendamine ei õnnestunud",
+    "The room upgrade could not be completed": "Jututoa uuendust ei õnnestunud teha",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Palun vaata oma e-kirju ning klõpsi meie saadetud kirjas leiduvat linki. Kui see on tehtud, siis vajuta Jätka-nuppu.",
+    "Email address": "E-posti aadress",
+    "This will allow you to reset your password and receive notifications.": "See võimaldab sul luua uue salasõna ning saada teavitusi.",
+    "Wrong file type": "Vale failitüüp",
+    "Wrong Recovery Key": "Vale taastevõti",
+    "Invalid Recovery Key": "Vigane taastevõti",
+    "Security Phrase": "Turvafraas",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Ei õnnestu saada ligipääsu turvahoidlale. Palun kontrolli, et sa oleksid sisestanud õige taastamiseks mõeldud paroolifraasi.",
+    "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Jätkamiseks sisesta oma turvafraas või kasuta <button>turvavõtit</button>.",
+    "Security Key": "Turvavõti",
+    "Use your Security Key to continue.": "Jätkamiseks kasuta turvavõtit.",
+    "Restoring keys from backup": "Taastan võtmed varundusest",
+    "Fetching keys from server...": "Laen võtmed serverist...",
+    "%(completed)s of %(total)s keys restored": "%(completed)s / %(total)s võtit taastatud",
+    "Unable to load backup status": "Varunduse oleku laadimine ei õnnestunud",
+    "Recovery key mismatch": "Taastevõtmed ei klapi",
+    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Selle taastevõtmega ei õnnestunud varundust dekrüptida: palun kontrolli, kas sa kasutad õiget taastevõtit.",
+    "Incorrect recovery passphrase": "Vigane taastamiseks mõeldud paroolifraas",
+    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Selle paroolifraasiga ei õnnestunud varundust dekrüptida: palun kontrolli, kas sa kasutad õiget taastamiseks mõeldud paroolifraasi.",
+    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Sisestades taastamiseks mõeldud paroolifraasi, saad ligipääsu oma turvatud sõnumitele ning sätid üles krüptitud sõnumivahetuse.",
+    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Kui sa oled unudtanud taastamiseks mõeldud paroolifraasi, siis sa saad <button1>kasutada oma taastevõtit</button1> või <button2>seadistada uued taastamise võimalused</button2>",
+    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Hoiatus</b>: Sa peaksid võtmete varundust seadistama vaid arvutist, mida sa usaldad.",
+    "We’re excited to announce Riot is now Element": "Meil on hea meel teatada, et Riot'i uus nimi on nüüd Element",
+    "Riot is now Element!": "Riot'i uus nimi on Element!",
+    "Secret storage public key:": "Turvahoidla avalik võti:",
+    "Verify User": "Verifitseeri kasutaja",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "Lisaturvalisus mõttes verifitseeri see kasutaja võrreldes selleks üheks korraks loodud koodi mõlemas seadmes.",
+    "Your messages are not secure": "Sinu sõnumid ei ole turvatud",
+    "Use your account to sign in to the latest version of the app at <a />": "Kasuta oma kontot logimaks sisse rakenduse viimasesse versiooni <a /> serveris",
+    "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>.": "Sa oled juba sisse loginud ja võid rahumeeli jätkata, kuid alati on hea mõte, kui kasutad viimast rakenduse versiooni, mille erinevate süsteemide jaoks leiad <a>element.io/get-started</a> lehelt.",
+    "Go to Element": "Võta Element kasutusele",
+    "We’re excited to announce Riot is now Element!": "Meil on hea meel teatada, et Riot'i uus nimi on nüüd Element!",
+    "Learn more at <a>element.io/previously-riot</a>": "Lisateavet leiad <a>element.io/previously-riot</a> lehelt",
+    "Access your secure message history and set up secure messaging by entering your recovery key.": "Pääse ligi oma turvatud sõnumitele ning säti üles krüptitud sõnumivahetus.",
+    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Kui sa oled unustanud oma taastevõtme, siis sa võid <button>seada üles uued taastamise võimalused</button>",
+    "Custom": "Kohandatud",
+    "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>.": "Sisesta Element Matrix Services kodiserveri aadress. See võib kasutada nii sinu oma domeeni, kui olla <a>element.io</a> alamdomeen.",
+    "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.": "Tõhusamaks kasutuseks seadista filter sikutades kogukonna tunnuspilti filtriribale ekraani vasakus ääres. Sa saad sobival ajal klõpsata filtriribal asuvat tunnuspilti ning näha vaid kasutajaid ja jututubasid, kes on seotud selle kogukonnaga.",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "Kas kustutame jututoa aadressi %(alias)s ja eemaldame %(name)s kataloogist?",
+    "delete the address.": "kustuta aadress.",
+    "The server may be unavailable or overloaded": "Server kas pole kättesaadav või on ülekoormatud",
+    "Unable to join network": "Võrguga liitumine ei õnnestu",
+    "Search rooms": "Otsi jututube",
+    "User menu": "Kasutajamenüü",
+    "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.": "Sa oled kõikidest sessioonidest välja logitud ning enam ei saa tõuketeavitusi. Nende taaskuvamiseks logi sisse kõikides oma seadmetes.",
+    "Return to login screen": "Mine tagasi sisselogimisvaatele",
+    "Set a new password": "Seadista uus salasõna",
+    "Invalid homeserver discovery response": "Vigane vastus koduserveri tuvastamise päringule",
+    "Failed to get autodiscovery configuration from server": "Serveri automaattuvastuse seadistuste laadimine ei õnnestunud",
+    "Invalid base_url for m.homeserver": "m.homeserver'i kehtetu base_url",
+    "Homeserver URL does not appear to be a valid Matrix homeserver": "Koduserveri URL ei tundu viitama korrektsele Matrix'i koduserverile",
+    "Invalid identity server discovery response": "Vigane vastus isikutuvastusserveri tuvastamise päringule",
+    "Invalid base_url for m.identity_server": "m.identity_server'i kehtetu base_url",
+    "Passphrases must match": "Paroolifraasid ei klapi omavahel",
+    "Passphrase must not be empty": "Paroolifraas ei tohi olla tühi",
+    "Export room keys": "Ekspordi jututoa võtmed",
+    "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.": "Selle toiminguga on sul võimalik saabunud krüptitud sõnumite võtmed eksportida sinu kontrollitavasse kohalikku faili. Seetõttu on sul tulevikus võimalik importida need võtmed mõnda teise Matrix'i klienti ning seeläbi muuta saabunud krüptitud sõnumid ka seal loetavaks.",
+    "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.": "Kes iganes saab kätte selle ekspordifaili, saab ka lugeda sinu krüptitud sõnumeid, seega ole hoolikas selle faili talletamisel. Andmaks lisakihi turvalisust, peaksid sa alljärgnevalt sisestama paroolifraasi, millega krüptitakse eksporditavad andmed. Faili hilisem importimine õnnestub vaid sama paroolifraasi sisestamisel.",
+    "Confirm passphrase": "Sisesta paroolifraas veel üks kord",
+    "Export": "Ekspordi",
+    "Import room keys": "Impordi jututoa võtmed",
+    "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.": "Selle toiminguga saad importida krüptimisvõtmed, mis sa viimati olid teisest Matrix'i kliendist eksportinud. Seejärel on võimalik dekrüptida ka siin kõik need samad sõnumid, mida see teine klient suutis dekrüptida.",
+    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Ekspordifail on turvatud paroolifraasiga ning alljärgnevalt peaksid dekrüptimiseks sisestama selle paroolifraasi.",
+    "File to import": "Imporditav fail",
+    "Import": "Impordi",
+    "Confirm encryption setup": "Krüptimise seadistuse kinnitamine",
+    "Click the button below to confirm setting up encryption.": "Kinnitamaks, et soovid krüptimist seadistada, klõpsi järgnevat nuppu.",
+    "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Tagamaks, et sa ei kaota ligipääsu krüptitud sõnumitele ja andmetele, varunda krüptimisvõtmed oma serveris.",
+    "Generate a Security Key": "Loo turvavõti",
+    "We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "Me loome turvavõtme, mida sa peaksid hoidma turvalises kohas, nagu näiteks arvutis salasõnade halduris või vana kooli seifis.",
+    "Enter a Security Phrase": "Sisesta turvafraas",
+    "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Sisesta turvafraas, mida vaid sina tead ning lisaks võid salvestada varunduse turvavõtme.",
+    "Enter your account password to confirm the upgrade:": "Kinnitamaks seda muudatust, sisesta oma konto salasõna:",
+    "Restore your key backup to upgrade your encryption": "Krüptimine uuendamiseks taasta oma varundatud võtmed",
+    "Restore": "Taasta",
+    "You'll need to authenticate with the server to confirm the upgrade.": "Uuenduse kinnitamiseks pead end autentima serveris.",
+    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Teiste sessioonide verifitseerimiseks pead uuendama seda sessiooni. Muud verifitseeritud sessioonid saavad sellega ligipääsu krüptitud sõnumitele ning nad märgitakse usaldusväärseteks ka teiste kasutajate jaoks.",
+    "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.": "Andmete kaitsmiseks sisesta turvafraas, mida vaid sina tead. Ole mõistlik ja palun ära kasuta selleks oma tavalist konto salasõna.",
+    "Enter a recovery passphrase": "Sisesta taastamiseks mõeldud paroolifraas",
+    "Great! This recovery passphrase looks strong enough.": "Suurepärane! Taastamiseks mõeldud paroolifraas on piisavalt kange.",
+    "That matches!": "Klapib!",
+    "Use a different passphrase?": "Kas kasutame muud paroolifraasi?",
+    "That doesn't match.": "Ei klapi mitte.",
+    "Go back to set it again.": "Mine tagasi ja sisesta nad uuesti.",
+    "Enter your recovery passphrase a second time to confirm it.": "Kinnitamaks sisesta taastamiseks mõeldud paroolifraas teist korda.",
+    "Confirm your recovery passphrase": "Kinnita oma taastamiseks mõeldud paroolifraas",
+    "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "Kuna seda kasutatakse sinu krüptitud andmete kaitsmiseks, siis hoia oma turvavõtit kaitstud ja turvalises kohas, nagu näiteks arvutis salasõnade halduris või vana kooli seifis.",
+    "Unable to query secret storage status": "Ei õnnestu tuvastada turvahoidla olekut",
+    "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Kui sa tühistad nüüd, siis sa võid peale viimasest seadmest välja logimist kaotada ligipääsu oma krüptitud sõnumitele ja andmetele.",
+    "You can also set up Secure Backup & manage your keys in Settings.": "Samuti võid sa seadetes võtta kasutusse turvalise varunduse ning hallata oma krüptovõtmeid.",
+    "Set up Secure backup": "Võta kasutusele turvaline varundus",
+    "Set a Security Phrase": "Määra turvafraas",
+    "Confirm Security Phrase": "Kinnita turvafraas",
+    "Save your Security Key": "Salvesta turvavõti",
+    "Unable to set up secret storage": "Turvahoidla kasutuselevõtmine ei õnnestu",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Me salvestame krüptitud koopia sinu krüptovõtmetest oma serveris. Seades taastamiseks mõeldud paroolifraasi, saad turvata oma varundust.",
+    "For maximum security, this should be different from your account password.": "Parima turvalisuse jaoks peaks paroolifraas olema erinev sinu konto salasõnast.",
+    "Set up with a recovery key": "Võta kasutusele taastevõti",
+    "Please enter your recovery passphrase a second time to confirm.": "Kinnitamiseks palun sisesta taastamiseks mõeldud paroolifraas teist korda.",
+    "Repeat your recovery passphrase...": "Korda oma taastamiseks mõeldud paroolifraasi...",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Sinu taastevõti toimib turvavõrguna - juhul, kui sa unustad taastamiseks mõeldud paroolifraasi, siis sa saad seda kasutada taastamaks ligipääsu krüptitud sõnumitele.",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Hoia seda turvalises kohas, nagu näiteks salasõnahalduris või vana kooli seifis.",
+    "Your keys are being backed up (the first backup could take a few minutes).": "Sinu krüptovõtmeid varundatakse (esimese varukoopia tegemine võib võtta paar minutit).",
+    "Autocomplete": "Automaatne sõnalõpetus",
+    "Favourited": "Märgitud lemmikuks",
+    "Leave Room": "Lahku jututoast",
+    "Forget Room": "Unusta jututuba ära",
+    "Which officially provided instance you are using, if any": "Mis iganes ametlikku klienti sa kasutad, kui üldse kasutad",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Kui kasutad %(brand)s seadmes, kus puuteekraan on põhiline sisestusviis",
+    "Use your account to sign in to the latest version": "Kasuta oma kontot selleks, et sisse logida rakenduse viimasesse versiooni",
+    "Learn More": "Lisateave",
+    "Upgrades a room to a new version": "Uuendab jututoa uue versioonini",
+    "You do not have the required permissions to use this command.": "Sul ei ole piisavalt õigusi selle käsu käivitamiseks.",
+    "Error upgrading room": "Viga jututoa uuendamisel",
+    "Double check that your server supports the room version chosen and try again.": "Kontrolli veel kord, kas sinu koduserver toetab seda jututoa versiooni ning proovi uuesti.",
+    "Changes your display nickname": "Muudab sinu kuvatavat nime",
+    "Changes your display nickname in the current room only": "Muudab sinu kuvatavat nime vaid selles jututoas",
+    "Changes the avatar of the current room": "Muudab selle jututoa tunnuspilti",
+    "Changes your avatar in this current room only": "Muudab sinu tunnuspilti vaid selles jututoas",
+    "Failed to set topic": "Teema määramine ei õnnestunud",
+    "This room has no topic.": "Sellel jututoal puudub teema.",
+    "Invites user with given id to current room": "Kutsub nimetatud kasutajatunnusega kasutaja sellesse jututuppa",
+    "Use an identity server": "Kasuta isikutuvastusserverit",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s võttis vastu kutse %(displayName)s nimel.",
+    "%(targetName)s accepted an invitation.": "%(targetName)s võttis kutse vastu.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s soovib alustada VoIP rühmakõnet.",
+    "%(senderName)s made no change.": "%(senderName)s ei teinud muutusi.",
+    "VoIP conference started.": "VoIP rühmakõne algas.",
+    "VoIP conference finished.": "VoIP rühmakõne lõppes.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s lükkas kutse tagasi.",
+    "%(targetName)s left the room.": "%(targetName)s lahkus jututoast.",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s õigused muutusid: %(fromPowerLevel)s -> %(toPowerLevel)s",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s muutis %(powerLevelDiffText)s õigusi.",
+    "Render simple counters in room header": "Näita jututoa päises lihtsaid loendure",
+    "Multiple integration managers": "Mitmed lõiminguhaldurid",
+    "Enable advanced debugging for the room list": "Lülita jututubade loendi jaoks sisse detailne silumine",
+    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Näita krüptitud jututubades meeldetuletust krüptitud sõnumite taastamisvõimaluste kohta",
+    "Use a system font": "Kasuta süsteemset fonti",
+    "System font name": "Süsteemse fondi nimi",
+    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Kui sinu koduserveris on seadistamata kõnehõlbustusserver, siis luba alternatiivina kasutada avalikku serverit turn.matrix.org (kõne ajal jagatakse nii sinu avalikku, kui privaatvõrgu IP-aadressi)",
+    "Send read receipts for messages (requires compatible homeserver to disable)": "Saada sõnumite lugemiskinnitusi (selle võimaluse keelamine eeldab, et koduserver sellist funktsionaalsust toetab)",
+    "This is your list of users/servers you have blocked - don't leave the room!": "See on sinu serverite ja kasutajate ligipääsukeeldude loend. Palun ära lahku sellest jututoast!",
+    "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.": "Kui sa just enne ekspordi selle jututoa võtmed ja impordi need hiljem, siis salasõna muutmine tühistab kõik läbiva krüptimise võtmed sinu kõikides sessioonides ning seega muutub kogu sinu krüptitud vestluste ajalugu loetamatuks. Tulevaste arenduste käigus tehakse see funktsionaalsus paremaks.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Sinu kontol on turvahoidlas olemas risttunnustamise identiteet, kuid seda veel ei loeta antud sessioonis usaldusväärseks.",
+    "Cross-signing and secret storage are not yet set up.": "Risttunnustamine ja turvahoidla pole veel seadistatud.",
+    "Reset cross-signing and secret storage": "Tühista risttunnustamise tulemused ja turvahoidla sisu",
+    "Bootstrap cross-signing and secret storage": "Võta risttunnustamine ja turvahoidla kasutusele",
+    "well formed": "korrektses vormingus",
+    "unexpected type": "tundmatut tüüpi",
+    "in secret storage": "turvahoidlas",
+    "Self signing private key:": "Sinu privaatvõtmed:",
+    "cached locally": "on puhverdatud kohalikus seadmes",
+    "not found locally": "ei leidu kohalikus seadmes",
+    "User signing private key:": "Kasutaja privaatvõti:",
+    "Session backup key:": "Sessiooni varundusvõti:",
+    "in account data": "kasutajakonto andmete hulgas",
+    "Homeserver feature support:": "Koduserver on tugi sellele funktsionaalusele:",
+    "exists": "olemas",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Kinnitamaks seda, et soovid neid sessioone kustutada, kasuta oma isiku tuvastamiseks ühekordset sisselogimist.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Kinnitamaks seda, et soovid seda sessiooni kustutada, kasuta oma isiku tuvastamiseks ühekordset sisselogimist.",
+    "Confirm deleting these sessions": "Kinnita nende sessioonide kustutamine",
+    "Click the button below to confirm deleting these sessions.|other": "Nende sessioonide kustutamiseks klõpsi järgnevat nuppu.",
+    "Click the button below to confirm deleting these sessions.|one": "Selle sessiooni kustutamiseks klõpsi järgnevat nuppu.",
+    "Delete sessions|other": "Kustuta sessioonid",
+    "Delete sessions|one": "Kustuta sessioon",
+    "Authentication": "Autentimine",
+    "%(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 ei võimalda veebibrauseris töötades krüptitud sõnumeid turvaliselt puhverdada. Selleks, et krüptitud sõnumeid saaks otsida, kasuta <desktopLink>%(brand)s Desktop</desktopLink> rakendust Matrix'i kliendina.",
+    "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Krüptitud sõnumid kasutavad läbivat krüptimist. Ainult sinul ja saaja(te)l on võtmed selliste sõnumite lugemiseks.",
+    "Unable to load key backup status": "Võtmete varunduse oleku laadimine ei õnnestunud",
+    "Restore from Backup": "Taasta varundusest",
+    "This session is backing up your keys. ": "See sessioon varundab sinu krüptovõtmeid. ",
+    "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.": "See sessioon <b>ei varunda sinu krüptovõtmeid</b>, aga sul on olemas varundus, millest saad taastada ning millele saad võtmeid lisada.",
+    "Success": "Õnnestus",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Sinu salasõna sai edukalt muudetud. Sa ei saa oma teistes sessioonides tõuketeateid seni, kuni sa pole neist välja ja tagasi loginud",
+    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Selleks, et sind võiks leida e-posti aadressi või telefoninumbri alusel, nõustu isikutuvastusserveri (%(serverName)s) kasutustingimustega.",
+    "Account management": "Kontohaldus",
+    "Deactivating your account is a permanent action - be careful!": "Kuna kasutajakonto dektiveerimist ei saa tagasi pöörata, siis palun ole ettevaatlik!",
+    "Deactivate Account": "Deaktiveeri konto",
+    "Discovery": "Leia kasutajaid",
+    "Deactivate account": "Deaktiveeri kasutajakonto",
+    "For help with using %(brand)s, click <a>here</a>.": "Kui otsid lisateavet %(brand)s kasutamise kohta, palun vaata <a>siia</a>.",
+    "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.": "Lisa siia kasutajad ja serverid, mida sa soovid eirata. Kui soovid, et %(brand)s kasutaks üldist asendamist, siis kasuta tärni. Näiteks <code>@bot:*</code> eirab kõikide serverite kasutajat 'bot'.",
+    "Use default": "Kasuta vaikimisi väärtusi",
+    "Mentions & Keywords": "Mainimised ja võtmesõnad",
+    "Notification options": "Teavituste eelistused",
+    "Room options": "Jututoa eelistused",
+    "This room is public": "See jututuba on avalik",
+    "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.",
+    "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 …",
+    "Start Verification": "Alusta verifitseerimist",
+    "Messages in this room are end-to-end encrypted.": "See jututuba on läbivalt krüptitud.",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Sinu sõnumid on turvatud ning ainult sinul ja saaja(te)l on unikaalsed võtmed selliste sõnumite lugemiseks.",
+    "Messages in this room are not end-to-end encrypted.": "See jututuba ei ole läbivalt krüptitud.",
+    "One of the following may be compromised:": "Üks järgnevatest võib olla sattunud valedesse kätesse:",
+    "Your homeserver": "Sinu koduserver",
+    "The homeserver the user you’re verifying is connected to": "Sinu poolt verifitseeritava kasutaja koduserver",
+    "Yours, or the other users’ internet connection": "Sinu või teise kasutaja internetiühendus",
+    "Yours, or the other users’ session": "Sinu või teise kasutaja sessioon",
+    "Trusted": "Usaldusväärsed",
+    "Not trusted": "Ei ole usaldusväärsed",
+    "%(count)s verified sessions|other": "%(count)s verifitseeritud sessiooni",
+    "%(count)s verified sessions|one": "1 verifitseeritud sessioon",
+    "Hide verified sessions": "Peida verifitseeritud sessioonid",
+    "%(count)s sessions|other": "%(count)s sessiooni",
+    "%(count)s sessions|one": "%(count)s sessioon",
+    "Hide sessions": "Peida sessioonid",
+    "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.": "See sessioon, mida sa tahad verifitseerida ei toeta QR koodi ega emoji-põhist verifitseerimist, aga just neid %(brand)s oskab kasutada. Proovi mõne muu Matrix'i kliendiga.",
+    "Verify by scanning": "Verifitseeri skaneerides",
+    "Ask %(displayName)s to scan your code:": "Palu, et %(displayName)s skaneeriks sinu koodi:",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Kui sa ei saa skaneerida eespool kuvatud koodi, siis verifitseeri unikaalsete emoji'de võrdlemise teel.",
+    "Verify by comparing unique emoji.": "Verifitseeri unikaalsete emoji'de võrdlemise teel.",
+    "Verify by emoji": "Verifitseeri emoji'de abil",
+    "Edited at %(date)s": "Muutmise kuupäev %(date)s",
+    "Click to view edits": "Muudatuste nägemiseks klõpsi",
+    "<a>In reply to</a> <pill>": "<a>Vastuseks kasutajale</a> <pill>",
+    "There are advanced notifications which are not shown here.": "On olemad detailseid teavitusi, mida siin ei kuvata.",
+    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Sa võib-olla oled seadistanud nad %(brand)s'ist erinevas kliendis. Sa küll ei saa neid %(brand)s'is muuta, kuid nad kehtivad siiski.",
+    "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "Sa hetkel kasutad <server></server> serverit, et olla leitav ja ise leida sinule teadaolevaid inimesi. Alljärgnevalt saad sa muuta oma isikutuvastusserverit.",
+    "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Kui sa ei soovi kasutada <server /> serverit, et olla leitav ja ise leida sinule teadaolevaid inimesi, siis sisesta alljärgnevalt mõni teine isikutuvastusserver.",
+    "Identity Server": "Isikutuvastusserver",
+    "Do not use an identity server": "Ära kasuta isikutuvastusserverit",
+    "Enter a new identity server": "Sisesta uue isikutuvastusserveri nimi",
+    "Change": "Muuda",
+    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Robotite, vidinate ja kleepsupakkide jaoks kasuta lõiminguhaldurit <b>(%(serverName)s)</b>.",
+    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Robotite, vidinate ja kleepsupakkide seadistamiseks kasuta lõiminguhaldurit.",
+    "Manage integrations": "Halda lõiminguid",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Lõiminguhalduritel on laiad volitused - nad võivad sinu nimel lugeda seadistusi, kohandada vidinaid, saata jututubade kutseid ning määrata õigusi.",
+    "Define the power level of a user": "Määra kasutaja õigused",
+    "Command failed": "Käsk ei toiminud",
+    "Opens the Developer Tools dialog": "Avab arendusvahendite akna",
+    "Adds a custom widget by URL to the room": "Lisab jututuppa URL-ist valitud kohandatud vidina",
+    "Backing up %(sessionsRemaining)s keys...": "Varundan %(sessionsRemaining)s krüptovõtmeid...",
+    "All keys backed up": "Kõik krüptovõtmed on varundatud",
+    "Backup has a <validity>valid</validity> signature from this user": "Varukoopial on selle kasutaja <validity>kehtiv</validity> allkiri",
+    "Backup has a <validity>invalid</validity> signature from this user": "Varukoopial on selle kasutaja <validity>vigane</validity> allkiri",
+    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "Varukoopial <verify>tundmatu</verify> kasutaja allkiri seadme tunnusega %(deviceId)s",
+    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Varukoopial <verify>tundmatu</verify> sessiooni allkiri seadme tunnusega %(deviceId)s",
+    "Backup has a <validity>valid</validity> signature from this session": "Varukoopial on selle sessiooni <validity>kehtiv</validity> allkiri",
+    "Backup has an <validity>invalid</validity> signature from this session": "Varukoopial on selle sessiooni <validity>vigane</validity> allkiri",
+    "Backup is not signed by any of your sessions": "Varunduse andmetel pole mitte ühegi sinu sessiooni allkirja",
+    "This backup is trusted because it has been restored on this session": "See varukoopia on usaldusväärne, sest ta on taastatud sellest sessioonist",
+    "Backup version: ": "Varukoopia versioon: ",
+    "Algorithm: ": "Algoritm: ",
+    "Backup key stored: ": "Varukoopia võti on salvestatud: ",
+    "Start using Key Backup": "Võta kasutusele krüptovõtmete varundamine",
+    "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Sa hetkel ei kasuta isikutuvastusserverit. Et olla leitav ja ise leida sinule teadaolevaid inimesi seadista ta alljärgnevalt.",
+    "Show rooms with unread messages first": "Näita lugemata sõnumitega jututubasid esimesena",
+    "Show previews of messages": "Näita sõnumite eelvaateid",
+    "Sort by": "Järjestamisviis",
+    "Activity": "Aktiivsuse alusel",
+    "A-Z": "Tähestiku järjekorras",
+    "Jump to first unread room.": "Siirdu esimesse lugemata jututuppa.",
+    "Jump to first invite.": "Siirdu esimese kutse juurde.",
+    "Recovery Method Removed": "Taastemeetod on eemaldatud",
+    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Oleme tuvastanud, et selles sessioonis ei leidu taastamiseks mõeldud paroolifraas ega krüptitud sõnumite taastevõtit.",
+    "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.": "Kui sa tegid seda juhuslikult, siis sa võid selles sessioonis uuesti seadistada sõnumite krüptimise, mille tulemusel krüptime uuesti kõik sõnumid ja loome uue taastamise meetodi.",
+    "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.": "Kui sa ei ole ise taastamise meetodeid eemaldanud, siis võib olla tegemist ründega sinu konto vastu. Palun vaheta koheselt oma kasutajakonto salasõna ning määra seadistustes uus taastemeetod.",
+    "Are you sure you want to cancel entering passphrase?": "Kas oled kindel et sa soovid katkestada paroolifraasi sisestamise?",
+    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "E-posti teel kutse saatmiseks kasuta isikutuvastusserverit. Võid kasutada vaikimisi serverit (%(defaultIdentityServerName)s) või määrata muu serveri seadistustes.",
+    "Use an identity server to invite by email. Manage in Settings.": "Kasutajatele e-posti teel kutse saatmiseks pruugi isikutuvastusserverit. Täpsemalt saad seda hallata seadistustes.",
+    "Joins room with given address": "Liitu antud aadressiga jututoaga",
+    "Leave room": "Lahku jututoast",
+    "Unrecognised room address:": "Tundmatu jututoa aadress:",
+    "Kicks user with given id": "Müksa selle tunnusega kasutaja jututoast välja",
+    "Stops ignoring a user, showing their messages going forward": "Lõpeta kasutaja eiramine ja näita edaspidi tema sõnumeid",
+    "Unignored user": "Kasutaja, kelle eiramine on lõppenud",
+    "You are no longer ignoring %(userId)s": "Sa edaspidi ei eira kasutajat %(userId)s",
+    "Deops user with given id": "Eemalda antud tunnusega kasutajalt haldusõigused selles jututoas",
+    "Please supply a widget URL or embed code": "Palun lisa antud vidina aadress või lisatav kood",
+    "Please supply a https:// or http:// widget URL": "Vidina aadressi alguses peab olema kas https:// või http://",
+    "You cannot modify widgets in this room.": "Sul pole õigusi vidinate muutmiseks selles jututoas.",
+    "Verifies a user, session, and pubkey tuple": "Verifitseerib kasutaja, sessiooni ja avalikud võtmed",
+    "Unknown (user, session) pair:": "Tundmatu kasutaja-sessioon paar:",
+    "Displays action": "Näitab tegevusi",
+    "Reason": "Põhjus",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Ära usalda risttunnustamist ning verifitseeri kasutaja iga sessioon eraldi.",
+    "Connect this session to Key Backup": "Seo see sessioon krüptovõtmete varundusega",
+    "not stored": "ei ole salvestatud",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "Varukoopial on <validity>kehtiv</validity> allkiri <verify>verifitseeritud</verify> sessioonist <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "Varukoopial on <validity>kehtiv</validity> allkiri <verify>verifitseerimata</verify> sessioonist <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "Varukoopial on <validity>vigane</validity> allkiri <verify>verifitseeritud</verify> sessioonist <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Varukoopial on <validity>vigane</validity> allkiri <verify>verifitseerimata</verify> sessioonist <device></device>",
+    "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.": "Isikutuvastusserveri kasutamine ei ole kohustuslik. Kui sa seda ei tee, siis sa ei ole leitav teiste kasutajate poolt ega sulle ei saa telefoninumbri või e-posti aadressi alusel kutset saata. Küll aga saab kutset saata Matrix'i kasutajatunnuse alusel.",
+    "Help & About": "Abiteave ning info meie kohta",
+    "Submit debug logs": "Saada silumise logid",
+    "Custom Tag": "Kohandatud silt",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s ei tea kuidas selles võrgus jututoaga liituda",
+    "%(brand)s Web": "%(brand)s Web",
+    "%(brand)s Desktop": "%(brand)s Desktop",
+    "%(brand)s iOS": "%(brand)s iOS",
+    "%(brand)s X for Android": "%(brand)s X Androidi jaoks",
+    "Starting backup...": "Alusta varundamist...",
+    "Success!": "Õnnestus!",
+    "Create key backup": "Tee võtmetest varukoopia",
+    "Unable to create key backup": "Ei õnnestu teha võtmetest varukoopiat",
+    "Don't ask again": "Ära küsi uuesti",
+    "New Recovery Method": "Uus taastamise meetod",
+    "A new recovery passphrase and key for Secure Messages have been detected.": "Tuvastasin krüptitud sõnumite taastamiseks mõeldud uue paroolifraasi ja võtmed.",
+    "This session is encrypting history using the new recovery method.": "See sessioon krüptib ajalugu kasutades uut taastamise meetodit.",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Kas sa kasutad või mitte tekstitoimetis kujundatud teksti režiimi",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Kas sa kasutad või mitte leivapuru-funktsionaalsust (tunnuspildid jututubade loendi kohal)",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Kas sa kasutad %(brand)s'i PWA-na (Progressive Web App)",
+    "Every page you use in the app": "Iga lehekülg, mida sa rakenduses kasutad",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Kui antud lehel leidub isikustatavaid andmeid, nagu jututoa, kasutaja või kogukonna tunnus, siis need andmed eemaldatakse enne serveri poole saatmist.",
+    "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
+    " to store messages from ": " salvestamaks sõnumeid ",
+    "Unable to fetch notification target list": "Ei õnnestu laadida teavituste eesmärkide loendit",
+    "Notification targets": "Teavituste eesmärgid",
+    "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.": "Isikutuvastusserveri kasutamise lõpetamine tähendab, et sa ei ole leitav teiste kasutajate poolt ega sulle ei saa telefoninumbri või e-posti aadressi alusel kutset saata. Küll aga saab kutset saata Matrix'i kasutajatunnuse alusel.",
+    "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.": "Kui sa oled teatanud meile GitHub'i vahendusel veast, siis silumislogid aitavad meil seda viga kergemini parandada. Vigadega seotud logid sisaldavad rakenduse teavet, sealhulgas sinu kasutajanime, külastatud jututubade kasutajatunnuseid või aliasi ning teiste kasutajate kasutajanimesid. Logides ei ole saadetud sõnumite sisu.",
+    "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": "Selleks, et sa ei kaotaks oma vestluste ajalugu, pead sa eksportima jututoa krüptovõtmed enne välja logimist. Küll, aga pead sa selleks kasutama %(brand)s uuemat versiooni",
+    "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.": "Sa oled selle sessiooni jaoks varem kasutanud %(brand)s'i uuemat versiooni. Selle versiooni kasutamiseks läbiva krüptimisega, pead sa esmalt logima välja ja siis uuesti logima tagasi sisse.",
+    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Kui sa pole seadistanud krüptitud sõnumite taastamise meetodeid, siis väljalogimisel sa kaotad võimaluse neid krüptitud sõnumeid lugeda.",
+    "If you don't want to set this up now, you can later in Settings.": "Kui sa ei soovi seda teha kohe, siis vastava võimaluse leiad hiljem rakenduse seadistustest.",
+    "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.": "Kui sa ei ole ise uusi taastamise meetodeid lisanud, siis võib olla tegemist ründega sinu konto vastu. Palun vaheta koheselt oma kasutajakonto salasõna ning määra seadistustes uus taastemeetod.",
+    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s võttis selles jututoas kasutusele %(groups)s kogukonna rinnamärgi.",
+    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s eemaldas selles jututoas kasutuselt %(groups)s kogukonna rinnamärgi.",
+    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s võttis selles jututoas kasutusele %(newGroups)s kogukonna rinnamärgi ning eemaldas rinnamärgi %(oldGroups)s kogukonnalt.",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Enne väljalogimist seo see sessioon krüptovõtmete varundusega. Kui sa seda ei tee, siis võid kaotada võtmed, mida kasutatakse vaid siin sessioonis.",
+    "Flair": "Kogukonna rinnasilt",
+    "Error updating flair": "Viga kogukonna rinnasildi uuendamisel",
+    "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Kogukonna rinnasildi uuendamisel tekkis viga. See kas on serveri poolt keelatud või tekkis mingi ajutine viga.",
+    "Showing flair for these communities:": "Näidatakse nende kogukondade rinnasilte:",
+    "This room is not showing flair for any communities": "Sellele jututoale ei ole jagatud ühtegi kogukonna rinnasilti",
+    "Display your community flair in rooms configured to show it.": "Näita oma kogukonna rinnasilti nendes jututubades, kus selle kuvamine on seadistatud.",
+    "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.": "Kohandatud serveriseadistusi saad kasutada selleks, et logida sisse sinu valitud koduserverisse. See võimaldab sinul kasutada %(brand)s'i mõnes teises koduserveri hallatava kasutajakontoga.",
+    "Did you know: you can use communities to filter your %(brand)s experience!": "Kas sa teadsid, et sa võid %(brand)s'i parema kasutuskogemuse nimel pruukida kogukondi!",
+    "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.": "Kui sa pole seadistanud krüptitud sõnumite taastamise meetodeid, siis väljalogimisel või muu sessiooni kasutamisel sa kaotad võimaluse oma krüptitud sõnumeid lugeda.",
+    "Set up Secure Message Recovery": "Võta kasutusele turvaline sõnumivõtmete varundus",
+    "Secure your backup with a recovery passphrase": "Krüpti oma varukoopia taastamiseks mõeldud paroolifraasiga",
+    "The person who invited you already left the room.": "See, kes sind jututoa liikmeks kutsus, on juba jututoast lahkunud.",
+    "The person who invited you already left the room, or their server is offline.": "See, kes sind jututoa liikmeks kutsus, kas juba on jututoast lahkunud või tema koduserver on võrgust väljas.",
+    "Change notification settings": "Muuda teavituste seadistusi",
+    "Your server isn't responding to some <a>requests</a>.": "Sinu koduserver ei vasta mõnedele <a>päringutele</a>.",
+    "Server isn't responding": "Server ei vasta päringutele",
+    "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "Sinu koduserver ei vasta mõnedele sinu päringutele. Alljärgnevalt on mõned võimalikud põhjused.",
+    "The server (%(serverName)s) took too long to respond.": "Vastuseks serverist %(serverName)s kulus liiga palju aega.",
+    "Your firewall or anti-virus is blocking the request.": "Sinu tulemüür või viirusetõrjetarkvara blokeerib päringuid.",
+    "A browser extension is preventing the request.": "Brauserilaiendus takistab päringuid.",
+    "The server is offline.": "Serveril puudub võrguühendus või ta on lülitatud välja.",
+    "The server has denied your request.": "Server blokeerib sinu päringuid.",
+    "Your area is experiencing difficulties connecting to the internet.": "Sinu piirkonnas on tõrkeid internetiühenduses.",
+    "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.",
+    "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",
+    "%(brand)s Android": "%(brand)s Android"
 }
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 6548ea33d1..2740ea2079 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -20,7 +20,7 @@
     "Start chat": "Hasi txata",
     "Custom Server Options": "Zerbitzari pertsonalizatuaren aukerak",
     "Dismiss": "Baztertu",
-    "powered by Matrix": "Matrix mamian",
+    "powered by Matrix": "Matrix-ekin egina",
     "Room": "Gela",
     "Historical": "Historiala",
     "Save": "Gorde",
@@ -68,7 +68,6 @@
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Irakurri zure e-maila eta egin klik dakarren estekan. Behin eginda, egin klik Jarraitu botoian.",
     "This email address is already in use": "E-mail helbide hau erabilita dago",
     "This phone number is already in use": "Telefono zenbaki hau erabilita dago",
-    "none": "bat ere ez",
     "Who can read history?": "Nork irakurri dezake historiala?",
     "Who can access this room?": "Nor sartu daiteke gelara?",
     "Anyone": "Edonork",
@@ -78,16 +77,7 @@
     "Banned users": "Debekatutako erabiltzaileak",
     "Labs": "Laborategia",
     "This room has no local addresses": "Gela honek ez du tokiko helbiderik",
-    "End-to-end encryption information": "Muturretik muturrerako zifratzearen informazioa",
-    "Event information": "Gertaeraren informazioa",
-    "Curve25519 identity key": "Curve25519 identitate gakoa",
-    "Claimed Ed25519 fingerprint key": "Aldarrikatutako Ed25519 hatz-marka gakoa",
-    "Algorithm": "Algoritmoa",
     "Session ID": "Saioaren IDa",
-    "Decryption error": "Deszifratze errorea",
-    "Device ID": "Gailuaren IDa",
-    "Verification": "Egiaztaketa",
-    "Ed25519 fingerprint": "Ed25519 hatz-marka",
     "Export E2E room keys": "Esportatu E2E geletako gakoak",
     "Export room keys": "Esportatu gelako gakoak",
     "Export": "Esportatu",
@@ -96,14 +86,7 @@
     "Import E2E room keys": "Inportatu E2E geletako gakoak",
     "Import room keys": "Inportatu gelako gakoak",
     "Import": "Inportatu",
-    "Blacklisted": "Blokeatuta",
-    "unknown device": "gailu ezezaguna",
-    "Unverify": "Kendu egiaztaketa",
-    "Blacklist": "Blokeatu",
-    "Unblacklist": "Desblokeatu",
-    "I verify that the keys match": "Gakoak bat datozela egiaztatu dut",
     "Someone": "Norbait",
-    "Start a chat": "Hasi txat bat",
     "Start authentication": "Hasi autentifikazioa",
     "Success": "Arrakasta",
     "For security, this session has been signed out. Please sign in again.": "Segurtasunagatik saio hau amaitu da. Hasi saioa berriro.",
@@ -122,11 +105,10 @@
     "No Microphones detected": "Ez da mikrofonorik atzeman",
     "No Webcams detected": "Ez da kamerarik atzeman",
     "No media permissions": "Media baimenik ez",
-    "You may need to manually permit Riot to access your microphone/webcam": "Agian eskuz baimendu behar duzu Riotek mikrofonoa edo kamera atzitzea",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "Agian eskuz baimendu behar duzu %(brand)sek mikrofonoa edo kamera atzitzea",
     "Default Device": "Lehenetsitako gailua",
     "Microphone": "Mikrofonoa",
     "Camera": "Kamera",
-    "Alias (optional)": "Ezizena (aukerakoa)",
     "An error has occurred.": "Errore bat gertatu da.",
     "Are you sure?": "Ziur zaude?",
     "Are you sure you want to leave the room '%(roomName)s'?": "Ziur '%(roomName)s' gelatik atera nahi duzula?",
@@ -147,7 +129,6 @@
     "Command error": "Aginduaren errorea",
     "Commands": "Aginduak",
     "Confirm password": "Berretsi pasahitza",
-    "Could not connect to the integration server": "Ezin izan da integrazio zerbitzarira konektatu",
     "Create Room": "Sortu gela",
     "Current password": "Oraingo pasahitza",
     "Custom": "Pertsonalizatua",
@@ -157,9 +138,6 @@
     "Decline": "Ukatu",
     "Decrypt %(text)s": "Deszifratu %(text)s",
     "Default": "Lehenetsia",
-    "device id: ": "gailuaren id-a: ",
-    "Direct chats": "Txat zuzenak",
-    "Disable Notifications": "Desgaitu jakinarazpenak",
     "Displays action": "Ekintza bistaratzen du",
     "Drop File Here": "Jaregin fitxategia hona",
     "%(items)s and %(lastItem)s": "%(items)s eta %(lastItem)s",
@@ -169,7 +147,6 @@
     "Disinvite": "Kendu gonbidapena",
     "Download %(text)s": "Deskargatu %(text)s",
     "Emoji": "Emoji",
-    "Enable Notifications": "Gaitu jakinarazpenak",
     "%(senderName)s ended the call.": "%(senderName)s erabiltzaileak deia amaitu du.",
     "Error decrypting attachment": "Errorea eranskina deszifratzean",
     "Error: Problem communicating with the given homeserver.": "Errorea: Arazoa emandako hasiera zerbitzariarekin komunikatzeko.",
@@ -187,7 +164,6 @@
     "Failed to send email": "Huts egin du e-maila bidaltzean",
     "Failed to send request.": "Huts egin du eskaera bidaltzean.",
     "Failed to set display name": "Huts egin du pantaila-izena ezartzean",
-    "Failed to toggle moderator status": "Huts egin du moderatzaile rola aldatzean",
     "Failed to unban": "Huts egin du debekua kentzean",
     "Failed to upload profile picture!": "Huts egin du profileko argazkia igotzean!",
     "Failure to create room": "Huts egin du gela sortzean",
@@ -213,12 +189,10 @@
     "Sign in with": "Hasi saioa hau erabilita:",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Elkartu <voiceText>ahotsa</voiceText> edo <videoText>bideoa</videoText> erabiliz.",
     "%(targetName)s joined the room.": "%(targetName)s erabiltzailea gelara elkartu da.",
-    "Joins room with given alias": "Gelara emandako ezizenarekin elkartu da",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s erabiltzaileak %(targetName)s kanporatu du.",
     "Kick": "Kanporatu",
     "Kicks user with given id": "Kanporatu emandako ID-a duen erabiltzailea",
     "%(targetName)s left the room.": "%(targetName)s erabiltzailea gelatik atera da.",
-    "Local addresses for this room:": "Gela honen tokiko helbideak:",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat, gonbidapena egiten zaienetik.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat, elkartzen direnetik.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat.",
@@ -227,13 +201,11 @@
     "Manage Integrations": "Kudeatu integrazioak",
     "Missing room_id in request": "Gelaren ID-a falta da eskaeran",
     "Missing user_id in request": "Erabiltzailearen ID-a falta da eskaeran",
-    "New address (e.g. #foo:%(localDomain)s)": "Helbide berria (adib. #foo:%(localDomain)s)",
     "New passwords don't match": "Pasahitz berriak ez datoz bat",
     "New passwords must match each other.": "Pasahitz berriak berdinak izan behar dira.",
     "not specified": "zehaztu gabe",
     "(not supported by this browser)": "(nabigatzaile honek ez du euskarririk)",
     "<not supported>": "<euskarririk gabe>",
-    "NOT verified": "EZ egiaztatuta",
     "No display name": "Pantaila izenik ez",
     "No more results": "Emaitza gehiagorik ez",
     "No users have specific privileges in this room": "Ez dago gela honetan baimen zehatzik duen erabiltzailerik",
@@ -247,27 +219,23 @@
     "Profile": "Profila",
     "Public Chat": "Txat publikoa",
     "Reason": "Arrazoia",
-    "Revoke Moderator": "Kendu moderatzaile baimena",
     "%(targetName)s rejected the invitation.": "%(targetName)s erabiltzaileak gonbidapena baztertu du.",
     "Reject invitation": "Baztertu gonbidapena",
     "Reject all %(invitedRooms)s invites": "Baztertu %(invitedRooms)s gelarako gonbidapen guztiak",
-    "Remote addresses for this room:": "Gela honen urruneko helbideak:",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s erabiltzaileak bere pantaila-izena kendu du (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s erabiltzaileak bere profileko argazkia kendu du.",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s erabiltzaileak VoIP konferentzia bat eskatu du.",
     "Results from DuckDuckGo": "DuckDuckGo bilatzaileko emaitzak",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riotek ez du zuri jakinarazpenak bidaltzeko baimenik,  egiaztatu nabigatzailearen ezarpenak",
-    "Riot was not given permission to send notifications - please try again": "Ez zaio jakinarazpenak bidaltzeko baimena eman Rioti, saiatu berriro",
-    "riot-web version:": "riot-web bertsioa:",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)sek ez du zuri jakinarazpenak bidaltzeko baimenik,  egiaztatu nabigatzailearen ezarpenak",
+    "%(brand)s was not given permission to send notifications - please try again": "Ez zaio jakinarazpenak bidaltzeko baimena eman %(brand)si, saiatu berriro",
+    "%(brand)s version:": "%(brand)s bertsioa:",
     "Room %(roomId)s not visible": "%(roomId)s gela ez dago ikusgai",
     "Room Colour": "Gelaren kolorea",
     "%(roomName)s does not exist.": "Ez dago %(roomName)s izeneko gela.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s ez dago eskuragarri orain.",
-    "Scroll to bottom of page": "Korritu orria behera arte",
     "Search failed": "Bilaketak huts egin du",
     "Searches DuckDuckGo for results": "DuckDuckGo-n bilatzen ditu emaitzak",
     "Seen by %(userName)s at %(dateTime)s": "%(userName)s erabiltzaileak ikusia %(dateTime)s(e)an",
-    "Send anyway": "Bidali hala ere",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s erabiltzaileak irudi bat bidali du.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s erabiltzaileak gelara elkartzeko gonbidapen bat bidali dio %(targetDisplayName)s erbiltzaileari.",
     "Server error": "Zerbitzari-errorea",
@@ -295,12 +263,9 @@
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s erabiltzaileak debekua kendu dio %(targetName)s erabiltzaileari.",
     "Unable to capture screen": "Ezin izan da pantaila-argazkia atera",
     "Unable to enable Notifications": "Ezin izan dira jakinarazpenak gaitu",
-    "unencrypted": "zifratu gabe",
     "unknown caller": "deitzaile ezezaguna",
-    "Unknown room %(roomId)s": "%(roomId)s gela ezezaguna da",
     "Unmute": "Audioa aktibatu",
     "Unnamed Room": "Izen gabeko gela",
-    "Unrecognised room alias:": "Gelaren ezizen ezezaguna:",
     "Uploading %(filename)s and %(count)s others|zero": "%(filename)s igotzen",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s eta beste %(count)s igotzen",
     "Uploading %(filename)s and %(count)s others|other": "%(filename)s eta beste %(count)s igotzen",
@@ -309,12 +274,9 @@
     "Upload file": "Igo fitxategia",
     "Upload new:": "Igo berria:",
     "Usage": "Erabilera",
-    "Use compact timeline layout": "Erabili denbora-lerro diseinu konpaktua",
-    "User ID": "Erabiltzaile ID-a",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
     "Username invalid: %(errMessage)s": "Erabiltzaile-izen baliogabea: %(errMessage)s",
     "Users": "Erabiltzaileak",
-    "verified": "egiaztatuta",
     "Verified key": "Egiaztatutako gakoa",
     "Video call": "Bideo-deia",
     "Voice call": "Ahots-deia",
@@ -364,8 +326,7 @@
     "Upload an avatar:": "Igo abatarra:",
     "This server does not support authentication with a phone number.": "Zerbitzari honek ez du telefono zenbakia erabiliz autentifikatzea onartzen.",
     "An error occurred: %(error_string)s": "Errore bat gertatu da: %(error_string)s",
-    "Make Moderator": "Bihurtu moderatzaile",
-    "There are no visible files in this room": "Ez dago fitxategi ikusgairik gela honetan",
+    "There are no visible files in this room": "Ez dago fitxategirik ikusgai gela honetan",
     "Sent messages will be stored until your connection has returned.": "Bidalitako mezuak zure konexioa berreskuratu arte gordeko dira.",
     "(~%(count)s results)|one": "(~%(count)s emaitza)",
     "(~%(count)s results)|other": "(~%(count)s emaitza)",
@@ -374,7 +335,7 @@
     "Start automatically after system login": "Hasi automatikoki sisteman saioa hasi eta gero",
     "Analytics": "Estatistikak",
     "Options": "Aukerak",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riotek estatistika anonimoak jasotzen ditu aplikazioa hobetzeko.",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)sek estatistika anonimoak jasotzen ditu aplikazioa hobetzeko.",
     "Passphrases must match": "Pasaesaldiak bat etorri behar dira",
     "Passphrase must not be empty": "Pasaesaldia ezin da hutsik egon",
     "File to import": "Inportatu beharreko fitxategia",
@@ -389,11 +350,9 @@
     "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.": "Ziur gertaera hau kendu (ezabatu) nahi duzula? Jakin gelaren izenaren edo mintzagaiaren aldaketa ezabatzen baduzu, aldaketa desegin daitekeela.",
     "Unknown error": "Errore ezezaguna",
     "Incorrect password": "Pasahitz okerra",
-    "To continue, please enter your password.": "Jarraitzeko sartu zure pasahitza.",
     "Unable to restore session": "Ezin izan da saioa berreskuratu",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Aurretik Riot bertsio berriago bat erabili baduzu, zure saioa bertsio honekin bateraezina izan daiteke. Itxi leiho hau eta itzuli bertsio berriagora.",
+    "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.": "Aurretik %(brand)s bertsio berriago bat erabili baduzu, zure saioa bertsio honekin bateraezina izan daiteke. Itxi leiho hau eta itzuli bertsio berriagora.",
     "Unknown Address": "Helbide ezezaguna",
-    "Verify...": "Egiaztatu…",
     "ex. @bob:example.com": "adib. @urko:adibidea.eus",
     "Add User": "Gehitu erabiltzailea",
     "Please check your email to continue registration.": "Egiaztatu zure e-maila erregistroarekin jarraitzeko.",
@@ -404,7 +363,6 @@
     "Error decrypting image": "Errorea audioa deszifratzean",
     "Error decrypting video": "Errorea bideoa deszifratzean",
     "Add an Integration": "Gehitu integrazioa",
-    "Removed or unknown message type": "Kenduta edo mezu mota ezezaguna",
     "URL Previews": "URL-en aurrebistak",
     "Drop file here to upload": "Jaregin fitxategia hona igotzeko",
     " (unsupported)": " (euskarririk gabe)",
@@ -420,14 +378,10 @@
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Hau izango da zure izena <span></span> hasiera zerbitzarian, edo <a>hautatu beste zerbitzari bat</a>.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Jada Matrix kontua baduzu <a>saioa hasi</a> dezakezu zuzenean.",
     "Your browser does not support the required cryptography extensions": "Zure nabigatzaileak ez ditu onartzen beharrezkoak diren kriptografia gehigarriak",
-    "Not a valid Riot keyfile": "Ez da baliozko Riot gako-fitxategia",
+    "Not a valid %(brand)s keyfile": "Ez da baliozko %(brand)s gako-fitxategia",
     "Authentication check failed: incorrect password?": "Autentifikazio errorea: pasahitz okerra?",
     "Do you want to set an email address?": "E-mail helbidea ezarri nahi duzu?",
     "This will allow you to reset your password and receive notifications.": "Honek zure pasahitza berrezarri eta jakinarazpenak jasotzea ahalbidetuko dizu.",
-    "Start verification": "Hasi egiaztaketa",
-    "Share without verifying": "Partekatu egiaztatu gabe",
-    "Ignore request": "Ezikusi eskaera",
-    "Encryption key request": "Zifratze-gakoa eskatuta",
     "Deops user with given id": "Emandako ID-a duen erabiltzailea mailaz jaisten du",
     "Add a widget": "Gehitu trepeta bat",
     "Allow": "Baimendu",
@@ -460,7 +414,6 @@
     "Cancel": "Utzi",
     "Ignore": "Ezikusi",
     "Unignore": "Ez ezikusi",
-    "User Options": "Erabiltzaile-aukerak",
     "You are now ignoring %(userId)s": "%(userId)s ezikusten ari zara",
     "You are no longer ignoring %(userId)s": "Ez zaude jada %(userId)s ezikusten",
     "Unignored user": "Ez ezikusitako erabiltzailea",
@@ -468,15 +421,9 @@
     "Stops ignoring a user, showing their messages going forward": "Utzi erabiltzailea ezikusteari, erakutsi bere mezuak",
     "Ignores a user, hiding their messages from you": "Ezikusi erabiltzailea, ezkutatu bere mezuak zuretzat",
     "Banned by %(displayName)s": "%(displayName)s erabiltzaileak debekatuta",
-    "Message removed by %(userId)s": "%(userId)s erabiltzaileak kendu du mezua",
     "Unpin Message": "Desfinkatu mezua",
     "Add rooms to this community": "Gehitu gelak komunitate honetara",
     "Call Failed": "Deiak huts egin du",
-    "Review Devices": "Berrikusi gailuak",
-    "Call Anyway": "Deitu hala ere",
-    "Answer Anyway": "Erantzun hala ere",
-    "Call": "Deitu",
-    "Answer": "Erantzun",
     "Who would you like to add to this community?": "Nor gehitu nahi duzu komunitate honetara?",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Abisua: komunitate batera gehitzen duzun edozein pertsona publikoki ikusgai egongo da komunitatearen ID-a dakien edonorentzat",
     "Invite new community members": "Gonbidatu kide berriak komunitatera",
@@ -484,7 +431,6 @@
     "Which rooms would you like to add to this community?": "Zeintzuk gela gehitu nahi dituzu komunitate honetara?",
     "Show these rooms to non-members on the community page and room list?": "Erakutsi gela hauek kide ez direnei komunitatearen orrian eta gelen zerrendan?",
     "Add rooms to the community": "Gehitu gelak komunitatera",
-    "Room name or alias": "Gelaren izena edo ezizena",
     "Add to community": "Gehitu komunitatera",
     "Failed to invite the following users to %(groupId)s:": "Huts egin du honako erabiltzaile hauek %(groupId)s komunitatera gonbidatzean:",
     "Failed to invite users to community": "Huts egin du erabiltzaileak komunitatera gonbidatzean",
@@ -563,7 +509,6 @@
     "New community ID (e.g. +foo:%(localDomain)s)": "Komunitatearen ID berria (adib +izena:%(localDomain)s)",
     "URL previews are enabled by default for participants in this room.": "URLen aurrebistak gaituta daude gela honetako partaideentzat.",
     "URL previews are disabled by default for participants in this room.": "URLen aurrebistak desgaituta daude gela honetako partaideentzat.",
-    "Message removed": "Mezua kendu da",
     "An email has been sent to %(emailAddress)s": "e-maila bidali da hona: %(emailAddress)s",
     "A text message has been sent to %(msisdn)s": "Testu mezu bat bidali da hona: %(msisdn)s",
     "Remove from community": "Kendu komunitatetik",
@@ -664,11 +609,9 @@
     "%(items)s and %(count)s others|one": "%(items)s eta beste bat",
     "Try using one of the following valid address types: %(validTypesList)s.": "Saiatu baliozko helbide mota hauetako bat erabiltzen: %(validTypesList)s.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Komunitate IDak a-z, 0-9, edo '=_-./' karaktereak besterik ez ditu onartzen",
-    "Data from an older version of Riot 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.": "Riot bertsio zahar batek datuak antzeman dira. Honek bertsio zaharrean  muturretik muturrerako zifratzea ez funtzionatzea eragingo du. Azkenaldian bertsio zaharrean bidali edo jasotako zifratutako mezuak agian ezin izango dira deszifratu bertsio honetan. Honek ere Bertsio honekin egindako mezu trukeak huts egitea ekar dezake. Arazoak badituzu, amaitu saioa eta hasi berriro saioa. Mezuen historiala gordetzeko, esportatu eta berriro inportatu zure gakoak.",
+    "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 bertsio zahar batek datuak antzeman dira. Honek bertsio zaharrean  muturretik muturrerako zifratzea ez funtzionatzea eragingo du. Azkenaldian bertsio zaharrean bidali edo jasotako zifratutako mezuak agian ezin izango dira deszifratu bertsio honetan. Honek ere Bertsio honekin egindako mezu trukeak huts egitea ekar dezake. Arazoak badituzu, amaitu saioa eta hasi berriro saioa. Mezuen historiala gordetzeko, esportatu eta berriro inportatu zure gakoak.",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Sortu komunitate bat erabiltzaileak eta gelak biltzeko! Sortu zure hasiera orria eta markatu zure espazioa Matrix unibertsoan.",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Ez dago beste inor hemen! <inviteText>Beste batzuk gonbidatu</inviteText> nahi dituzu edo <nowarnText>gela hutsik dagoela abisatzeari utzi</nowarnText>?",
-    "Light theme": "Azal argia",
-    "Dark theme": "Azal iluna",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "%(emailAddress)s helbidera e-mail bat bidali da. Behin dakarren esteka jarraituta, egin klik behean.",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Hasiera zerbitzari honek ez du bezero honek onartzen duen fluxurik eskaintzen.",
     "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.": "Ezin izango duzu hau aldatu zure burua mailaz jaisten ari zarelako, zu bazara gelan baimenak dituen azken erabiltzailea ezin izango dira baimenak berreskuratu.",
@@ -676,22 +619,19 @@
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Birbidali guztiak</resendText> edo <cancelText>baztertu guztiak</cancelText> orain. Mezuak banaka birbidali edo baztertu ditzakezu ere.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Birbidali mezua</resendText> edo <cancelText>baztertu mezua</cancelText> orain.",
     "Send an encrypted reply…": "Bidali zifratutako erantzun bat…",
-    "Send a reply (unencrypted)…": "Bidali erantzun bat (zifratu gabea)…",
     "Send an encrypted message…": "Bidali zifratutako mezu bat…",
-    "Send a message (unencrypted)…": "Bidali mezu bat (zifratu gabea)…",
     "Replying": "Erantzuten",
     "Minimize apps": "Minimizatu aplikazioak",
     "The platform you're on": "Zauden plataforma",
-    "The version of Riot.im": "Riot.im bertsioa",
+    "The version of %(brand)s": "%(brand)s bertsioa",
     "Your language of choice": "Zure aukerako hizkuntza",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Pribatutasuna garrantzitsua da guretzat, beraz ez dugu datu pertsonalik edo identifikagarririk jasotzen gure estatistiketan.",
     "Learn more about how we use analytics.": "Ikasi gehiago estatistikei ematen diegun erabileraz.",
-    "The information being sent to us to help make Riot.im better includes:": "Riot.im hobetzeko bidaltzen zaigun informazioan hau dago:",
+    "The information being sent to us to help make %(brand)s better includes:": "%(brand)s hobetzeko bidaltzen zaigun informazioa honakoa da, besteren artean:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Orri honek informazio identifikagarria badu ere, esaterako gela, erabiltzailea edo talde ID-a, datu hauek ezabatu egiten dira zerbitzarira bidali aurretik.",
     "Which officially provided instance you are using, if any": "Erabiltzen ari zaren instantzia ofiziala, balego",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Testu editorean testu aberatsa modua erabiltzen duzun",
     "Your homeserver's URL": "Zure hasiera zerbitzariaren URL-a",
-    "Your identity server's URL": "Zure identitate zerbitzariaren URL-a",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(fullYear)s(e)ko %(monthName)sk %(day)sa",
     "This room is not public. You will not be able to rejoin without an invite.": "Gela hau ez da publikoa. Ezin izango zara berriro elkartu gonbidapenik gabe.",
     "Community IDs cannot be empty.": "Komunitate ID-ak ezin dira hutsik egon.",
@@ -701,7 +641,7 @@
     "Failed to remove tag %(tagName)s from room": "Huts egin du %(tagName)s etiketa gelatik kentzean",
     "Failed to add tag %(tagName)s to room": "Huts egin du %(tagName)s etiketa gelara gehitzean",
     "Clear filter": "Garbitu iragazkia",
-    "Did you know: you can use communities to filter your Riot.im experience!": "Ba al zenekien? Komunitateak erabili ditzakezu zure Riot.im esperientzia iragazteko!",
+    "Did you know: you can use communities to filter your %(brand)s experience!": "Ba al zenekien? Komunitateak erabili ditzakezu zure %(brand)s esperientzia iragazteko!",
     "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.": "Iragazki bat ezartzeko, arrastatu komunitate baten abatarra pantailaren ezkerrean dagoen  iragazki-panelera. Iragazki-paneleko abatar batean klik egin dezakezu komunitate horri lotutako gelak eta pertsonak besterik ez ikusteko.",
     "Key request sent.": "Gako eskaria bidalita.",
     "Code": "Kodea",
@@ -721,7 +661,6 @@
     "Who can join this community?": "Nor elkartu daiteke komunitate honetara?",
     "Everyone": "Edonor",
     "Fetching third party location failed": "Huts egin du hirugarrengoen kokalekua eskuratzean",
-    "A new version of Riot is available.": "Riot bertsio berri bat dago eskuragarri.",
     "Send Account Data": "Bidali kontuaren datuak",
     "All notifications are currently disabled for all targets.": "Une honetan jakinarazpen guztiak helburu guztietarako desgaituta daude.",
     "Uploading report": "Txostena igotzen",
@@ -738,8 +677,6 @@
     "Send Custom Event": "Bidali gertaera pertsonalizatua",
     "Advanced notification settings": "Jakinarazpen aurreratuen ezarpenak",
     "Failed to send logs: ": "Huts egin du egunkariak bidaltzean: ",
-    "delete the alias.": "ezabatu ezizena.",
-    "To return to your account in future you need to <u>set a password</u>": "Etorkizunean kontura itzuli ahal izateko <u>pasahitz bat ezarri</u> behar duzu",
     "Forget": "Ahaztu",
     "You cannot delete this image. (%(code)s)": "Ezin duzu irudi hau ezabatu. (%(code)s)",
     "Cancel Sending": "Utzi bidaltzeari",
@@ -765,7 +702,6 @@
     "Resend": "Birbidali",
     "Files": "Fitxategiak",
     "Collecting app version information": "Aplikazioaren bertsio-informazioa biltzen",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Ezabatu gelaren %(alias)s  ezizena eta kendu %(name)s direktoriotik?",
     "Keywords": "Hitz gakoak",
     "Enable notifications for this account": "Gaitu jakinarazpenak kontu honetarako",
     "Invite to this community": "Gonbidatu komunitate honetara",
@@ -776,14 +712,14 @@
     "Forward Message": "Birbidali mezua",
     "You have successfully set a password and an email address!": "Ondo ezarri dituzu pasahitza eta e-mail helbidea!",
     "Remove %(name)s from the directory?": "Kendu %(name)s direktoriotik?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riotek nabigatzaileen ezaugarri aurreratu ugari erabiltzen ditu, hauetako batzuk ez daude erabilgarri edo esperimentalak dira zure oraingo nabigatzailean.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)sek nabigatzaileen ezaugarri aurreratu ugari erabiltzen ditu, hauetako batzuk ez daude erabilgarri edo esperimentalak dira zure oraingo nabigatzailean.",
     "Event sent!": "Gertaera bidalita!",
     "Preparing to send logs": "Egunkariak bidaltzeko prestatzen",
     "Remember, you can always set an email address in user settings if you change your mind.": "Gogoratu, e-mail helbide bat ezarri dezakezu erabiltzaile-ezarpenetan iritzia aldatzen baduzu.",
     "Explore Account Data": "Miatu kontuaren datuak",
     "All messages (noisy)": "Mezu guztiak (ozen)",
     "Saturday": "Larunbata",
-    "I understand the risks and wish to continue": "Arriskua ulertzen dut eta jarraitu nahi dut",
+    "I understand the risks and wish to continue": "Arriskuak ulertzen ditut eta jarraitu nahi dut",
     "Direct Chat": "Txat zuzena",
     "The server may be unavailable or overloaded": "Zerbitzaria eskuraezin edo gainezka egon daiteke",
     "Reject": "Baztertu",
@@ -798,7 +734,7 @@
     "All Rooms": "Gela guztiak",
     "Wednesday": "Asteazkena",
     "You cannot delete this message. (%(code)s)": "Ezin duzu mezu hau ezabatu. (%(code)s)",
-    "Quote": "Aipua",
+    "Quote": "Aipatu",
     "Send logs": "Bidali egunkariak",
     "All messages": "Mezu guztiak",
     "Call invitation": "Dei gonbidapena",
@@ -822,8 +758,7 @@
     "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.": "Arazte-egunkariek aplikazioak darabilen datuak dauzkate, zure erabiltzaile izena barne, bisitatu dituzun gelen ID-ak edo ezizenak eta beste erabiltzaileen izenak. Ez dute mezurik.",
     "Unhide Preview": "Ez ezkutatu aurrebista",
     "Unable to join network": "Ezin izan da sarera elkartu",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Agian Riot ez beste bezero batean konfiguratu dituzu. Ezin dituzu Riot bidez doitu, baina aplikagarriak dira",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Zure nabigatzaileak <b>ez</b> du Riot erabiltzeko gaitasunik.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Zure nabigatzaileak <b>ez</b> du %(brand)s erabiltzeko gaitasunik.",
     "Uploaded on %(date)s by %(user)s": "%(user)s erabiltzaileak %(date)s (e)an igota",
     "Messages in group chats": "Talde txatetako mezuak",
     "Yesterday": "Atzo",
@@ -832,7 +767,7 @@
     "Unable to fetch notification target list": "Ezin izan da jakinarazpen helburuen zerrenda eskuratu",
     "Set Password": "Ezarri pasahitza",
     "Off": "Ez",
-    "Riot does not know how to join a room on this network": "Riotek ez daki nola elkartu gela batetara sare honetan",
+    "%(brand)s does not know how to join a room on this network": "%(brand)sek ez daki nola elkartu gela batetara sare honetan",
     "Mentions only": "Aipamenak besterik ez",
     "You can now return to your account after signing out, and sign in on other devices.": "Zure kontura itzuli zaitezke beste gailuetan saioa amaitu eta berriro hastean.",
     "Enable email notifications": "Gaitu e-mail bidezko jakinarazpenak",
@@ -847,11 +782,9 @@
     "Thank you!": "Eskerrik asko!",
     "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!": "Zure oraingo nabigatzailearekin aplikazioaren itxura eta portaera guztiz okerra izan daiteke, eta funtzio batzuk ez dira ibiliko. Hala ere aurrera jarraitu dezakezu saiatu nahi baduzu, baina zure erantzukizunaren menpe geratzen dira aurkitu ditzakezun arazoak!",
     "Checking for an update...": "Eguneraketarik dagoen egiaztatzen…",
-    "There are advanced notifications which are not shown here": "Hemen erakusten ez diren jakinarazpen aurreratuak daude",
     "Missing roomId.": "Gelaren ID-a falta da.",
     "Every page you use in the app": "Aplikazioan erabilitako orri oro",
     "e.g. <CurrentPageURL>": "adib. <CurrentPageURL>",
-    "Your User Agent": "Zure erabiltzaile-agentea",
     "Your device resolution": "Zure gailuaren bereizmena",
     "Always show encryption icons": "Erakutsi beti zifratze ikonoak",
     "Popout widget": "Laster-leiho trepeta",
@@ -870,9 +803,6 @@
     "Review terms and conditions": "Irakurri termino eta baldintzak",
     "To continue, please enter your password:": "Jarraitzeko, sartu zure pasahitza:",
     "e.g. %(exampleValue)s": "adib. %(exampleValue)s",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Hobetu Riot.im <UsageDataLink>erabilera-datu anonimoak</UsageDataLink> bidaliz. Honek coockie bat erabiliko du (Ikusi gure <PolicyLink>Cookie politika</PolicyLink>).",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Hobetu Riot.im <UsageDataLink>erabilera-datu anonimoak</UsageDataLink> bidaliz. Honek cookie bat erabiliko du.",
-    "Yes, I want to help!": "Bai, lagundu nahi dut!",
     "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>": "Honek kontua behin betirako erabilgaitza bihurtuko du. Ezin izango duzu saioa hasi, eta ezin izango du beste inork ID hori erabili. Kontua dagoen gela guztietatik aterako da, eta kontuaren xehetasunak identitate-zerbitzaritik ezabatuko dira. <b>Ekintza hau ezin da desegin.</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.": "Kontua desaktibatzean <b>ez dira zuk bidalitako mezuak ahaztuko.</b> Mezuak ahaztea nahi baduzu markatu beheko kutxa.",
     "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-eko mezuen ikusgaitasuna e-mail sistemaren antekoa da. Guk zure mezuak ahaztean ez dizkiogu erabiltzaile berriei edo izena eman ez dutenei erakutsiko, baina jada zure mezuak jaso dituzten erregistratutako erabiltzaileen bere kopia izaten jarraituko dute.",
@@ -918,9 +848,6 @@
     "Please <a>contact your service administrator</a> to continue using the service.": "<a>Jarri kontaktuan zerbitzuaren administratzailearekin</a> zerbitzu hau erabiltzen jarraitzeko.",
     "This homeserver has hit its Monthly Active User limit.": "Hasiera zerbitzari honek bere hilabeteko erabiltzaile aktiboen muga gainditu du.",
     "This homeserver has exceeded one of its resource limits.": "Hasiera zerbitzari honek bere baliabide mugetako bat gainditu du.",
-    "Please <a>contact your service administrator</a> to get this limit increased.": "<a>Jarri kontaktuan zerbitzuaren administratzailearekin</a> muga hau areagotzeko.",
-    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "Hasiera zerbitzari honek hilabeteko erabiltzaile aktiboen muga jo du <b>erabiltzaile batzuk ezin izango dute saioa hasi</b>.",
-    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Hasiera zerbitzari honek bere baliabide mugetako bat jo du <b>erabiltzaile batzuk ezin izango dute saioa hasi</b>.",
     "Failed to upgrade room": "Huts egin du gela eguneratzea",
     "The room upgrade could not be completed": "Ezin izan da gelaren eguneraketa osatu",
     "Upgrade this room to version %(version)s": "Eguneratu gela hau %(version)s bertsiora",
@@ -934,22 +861,14 @@
     "Legal": "Legala",
     "Please <a>contact your service administrator</a> to continue using this service.": "<a>Jarri kontaktuan zerbitzuaren administratzailearekin</a> zerbitzu hau erabiltzen jarraitzeko.",
     "Forces the current outbound group session in an encrypted room to be discarded": "Uneko irteerako talde saioa zifratutako gela batean baztertzera behartzen du",
-    "Registration Required": "Erregistratzea ezinbestekoa da",
-    "You need to register to do this. Would you like to register now?": "Hau egiteko erregistratu egin behar zara. Orain erregistratu nahi duzu?",
     "Unable to connect to Homeserver. Retrying...": "Ezin izan da hasiera zerbitzarira konektatu. Berriro saiatzen…",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s erabiltzaileak %(addedAddresses)s gehitu du gelako helbide gisa.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s erabiltzaileak %(addedAddresses)s helbideak gehitu dizkio gela honi.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s erabiltzileak %(removedAddresses)s helbideak kendu ditu gela honetatik.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s erabiltzaileak %(removedAddresses)s helbideak kendu ditu gela honetatik.",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s erabiltzaileak %(addedAddresses)s helbideak gehitu eta %(removedAddresses)s helbideak kendu ditu gela honetatik.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s erabiltzileak %(address)s ezarri du gela honetako helbide nagusi gisa.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s erabiltzaileak gela honen helbide nagusia kendu du.",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Egunkariak bidali aurretik, <a>GitHub arazo bat sortu</a> behar duzu gertatzen zaizuna azaltzeko.",
-    "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Riot-ek orain 3-5 aldiz memoria gutxiago darabil, beste erabiltzaileen informazioa behar denean besterik ez kargatzen. Itxaron zerbitzariarekin sinkronizatzen garen bitartean!",
-    "Updating Riot": "Riot eguneratzen",
+    "%(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-ek orain 3-5 aldiz memoria gutxiago darabil, beste erabiltzaileen informazioa behar denean besterik ez kargatzen. Itxaron zerbitzariarekin sinkronizatzen garen bitartean!",
+    "Updating %(brand)s": "%(brand)s eguneratzen",
     "Please review and accept the policies of this homeserver:": "Irakurri eta onartu hasiera zerbitzari honen politikak:",
-    "You've previously used Riot 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, Riot needs to resync your account.": "Aurretik Riot erabili duzu %(host)s zerbitzarian kideen karga alferra gaituta zenuela. Bertsio honetan karga alferra desgaituta dago. Katxe lokala bi ezarpen hauen artean bateragarria ez denez, Riotek zure kontua berriro sinkronizatu behar du.",
-    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Rioten beste bertsioa oraindik beste fitxat batean irekita badago, itxi ezazu zerbitzari bera aldi berean karga alferra gaituta eta desgaituta erabiltzeak arazoak sor ditzakeelako.",
+    "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.": "Aurretik %(brand)s erabili duzu %(host)s zerbitzarian kideen karga alferra gaituta zenuela. Bertsio honetan karga alferra desgaituta dago. Katxe lokala bi ezarpen hauen artean bateragarria ez denez, %(brand)sek zure kontua berriro sinkronizatu behar du.",
     "Incompatible local cache": "Katxe lokal bateraezina",
     "Clear cache and resync": "Garbitu katxea eta sinkronizatu berriro",
     "Add some now": "Gehitu batzuk orain",
@@ -962,38 +881,26 @@
     "Backup version: ": "Babes-kopiaren bertsioa: ",
     "Algorithm: ": "Algoritmoa: ",
     "Please review and accept all of the homeserver's policies": "Berrikusi eta onartu hasiera-zerbitzariaren politika guztiak",
-    "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 Riot to do this": "Zure txaten historiala ez galtzeko, zure gelako gakoak esportatu behar dituzu saioa amaitu aurretik. Riot-en bertsio berriagora bueltatu behar zara hau egiteko",
-    "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ": "Riot-en bertsio berriago bat erabili duzu %(host)s zerbitzarian. Bertsio hau berriro erabiltzeko muturretik muturrerako zifratzearekin, saioa amaitu eta berriro hasi beharko duzu. ",
+    "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": "Zure txaten historiala ez galtzeko, zure gelako gakoak esportatu behar dituzu saioa amaitu aurretik. %(brand)s-en bertsio berriagora bueltatu behar zara hau egiteko",
     "Incompatible Database": "Datu-base bateraezina",
     "Continue With Encryption Disabled": "Jarraitu zifratzerik gabe",
-    "Enter a passphrase...": "Sartu pasa-esaldi bat...",
     "Next": "Hurrengoa",
     "That matches!": "Bat dator!",
     "That doesn't match.": "Ez dator bat.",
     "Go back to set it again.": "Joan atzera eta berriro ezarri.",
-    "Repeat your passphrase...": "Errepikatu zure pasa-esaldia...",
-    "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Aukeran, berreskuratze pasa-esaldia ahazten baduzu, zure zifratutako mezuen historiala berreskuratzeko erabili dezakezu.",
-    "Your Recovery Key": "Zure berreskuratze gakoa",
-    "Copy to clipboard": "Kopiatu arbelera",
     "Download": "Deskargatu",
     "<b>Print it</b> and store it somewhere safe": "<b>Inprimatu ezazu</b> eta gorde toki seguruan",
     "<b>Save it</b> on a USB key or backup drive": "<b>Gorde ezazu</b> USB giltza batean edo babes-kopien diskoan",
     "<b>Copy it</b> to your personal cloud storage": "<b>Kopiatu ezazu</b> zure hodeiko biltegi pertsonalean",
     "Set up Secure Message Recovery": "Ezarri mezu seguruen berreskuratzea",
-    "Keep it safe": "Gorde toki seguruan",
-    "Create Key Backup": "Sortu gakoaren babes-kopia",
     "Unable to create key backup": "Ezin izan da gakoaren babes-kopia sortu",
     "Retry": "Berriro saiatu",
     "Unable to load backup status": "Ezin izan da babes-kopiaren egoera kargatu",
     "Unable to restore backup": "Ezin izan da babes-kopia berrezarri",
     "No backup found!": "Ez da babes-kopiarik aurkitu!",
-    "Backup Restored": "Babes-kopia berrezarrita",
     "Failed to decrypt %(failedCount)s sessions!": "Ezin izan dira %(failedCount)s saio deszifratu!",
-    "Restored %(sessionCount)s session keys": "%(sessionCount)s saio gako berrezarrita",
-    "Enter Recovery Passphrase": "Sartu berreskuratze pasa-esaldia",
     "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Atzitu zure mezu seguruen historiala eta ezarri mezularitza segurua zure berreskuratze pasa-esaldia sartuz.",
     "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Zure berreskuratze pasa-esaldia ahaztu baduzu <button1>berreskuratze gakoa erabili</button1> dezakezu edo <button2>berreskuratze aukera berriak ezarri</button2> ditzakezu",
-    "Enter Recovery Key": "Sartu berreskuratze gakoa",
     "This looks like a valid recovery key!": "Hau baliozko berreskuratze gako bat dirudi!",
     "Not a valid recovery key": "Ez da baliozko berreskuratze gako bat",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Atzitu zure mezu seguruen historiala eta ezarri mezularitza segurua zure berreskuratze gakoa sartuz.",
@@ -1031,8 +938,6 @@
     "User %(user_id)s does not exist": "Ez dago %(user_id)s erabiltzailerik",
     "Unknown server error": "Zerbitzari errore ezezaguna",
     "Failed to load group members": "Huts egin du taldeko kideak kargatzean",
-    "Great! This passphrase looks strong enough.": "Ongi! Pasaesaldi hau nahiko gogorra ematen du.",
-    "As a safety net, you can use it to restore your encrypted message history.": "Badaezpada, zure zifratutako mezuen historiala berreskuratzeko erabili dezakezu.",
     "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Erakutsi mezu seguruen berreskuratzea gaitzeko oroigarri bat zifratutako geletan",
     "Don't ask again": "Ez galdetu berriro",
     "Set up": "Ezarri",
@@ -1055,7 +960,6 @@
     "Unable to load commit detail: %(msg)s": "Ezin izan dira xehetasunak kargatu: %(msg)s",
     "Invalid identity server discovery response": "Baliogabeko erantzuna identitate zerbitzariaren bilaketan",
     "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.": "Ez baduzu berreskuratze sistema berria ezarri, erasotzaile bat zure kontua atzitzen saiatzen egon daiteke. Aldatu zure kontuaren pasahitza eta ezarri berreskuratze metodo berria berehala ezarpenetan.",
-    "Waiting for %(userId)s to confirm...": "%(userId)s erabiltzaileak berretsi dezan itxaroten…",
     "User %(user_id)s may or may not exist": "%(user_id)s erabiltzailea existitu daiteke edo ez",
     "Unrecognised address": "Helbide ezezaguna",
     "Prompt before sending invites to potentially invalid matrix IDs": "Galdetu baliogabeak izan daitezkeen matrix ID-eetara gonbidapenak bidali aurretik",
@@ -1140,11 +1044,8 @@
     "Room avatar": "Gelaren abatarra",
     "Room Name": "Gelaren izena",
     "Room Topic": "Gelaren mintzagaia",
-    "Verify by comparing a short text string.": "Egiaztatu testu-kate labur bat konparatuz.",
-    "Begin Verifying": "Hasi egiaztaketa",
     "Report bugs & give feedback": "Eman akatsen berri eta egin iruzkinak",
     "Go back": "Joan atzera",
-    "Recovery Key Mismatch": "Berreskuratze gakoak ez datoz bat",
     "Update status": "Eguneratu egoera",
     "Set status": "Ezarri egoera",
     "This homeserver would like to make sure you are not a robot.": "Hasiera-zerbitzari honek robota ez zarela egiaztatu nahi du.",
@@ -1177,9 +1078,9 @@
     "Theme": "Azala",
     "Account management": "Kontuen kudeaketa",
     "Deactivating your account is a permanent action - be careful!": "Kontua desgaitzea behin betiko ekintza bat da, kontuz ibili!",
-    "For help with using Riot, click <a>here</a>.": "Riot erabiltzeko laguntza behar baduzu, egin klik <a>hemen</a>.",
-    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "Riot erabiltzeko laguntza behar baduzu, egin klik <a>hemen</a> edo hasi txat bat gure botarekin beheko botoia sakatuz.",
-    "Chat with Riot Bot": "Txateatu Riot botarekin",
+    "For help with using %(brand)s, click <a>here</a>.": "%(brand)s erabiltzeko laguntza behar baduzu, egin klik <a>hemen</a>.",
+    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "%(brand)s erabiltzeko laguntza behar baduzu, egin klik <a>hemen</a> edo hasi txat bat gure botarekin beheko botoia sakatuz.",
+    "Chat with %(brand)s Bot": "Txateatu %(brand)s botarekin",
     "Help & About": "Laguntza eta honi buruz",
     "Bug reporting": "Akatsen berri ematea",
     "FAQ": "FAQ",
@@ -1189,7 +1090,6 @@
     "Timeline": "Denbora-lerroa",
     "Autocomplete delay (ms)": "Automatikoki osatzeko atzerapena (ms)",
     "Roles & Permissions": "Rolak eta baimenak",
-    "To link to this room, please add an alias.": "Gela honetara estekatzeko, gehitu ezizen bat.",
     "Security & Privacy": "Segurtasuna eta pribatutasuna",
     "Encryption": "Zifratzea",
     "Once enabled, encryption cannot be disabled.": "Behin gaituta, zifratzea ezin da desgaitu.",
@@ -1199,7 +1099,6 @@
     "Voice & Video": "Ahotsa eta bideoa",
     "Main address": "Helbide nagusia",
     "Join": "Elkartu",
-    "Incorrect Recovery Passphrase": "Berreskuratze pasaesaldi okerra",
     "Premium": "Ordainpekoa",
     "Premium hosting for organisations <a>Learn more</a>": "Elkarteentzako ordainpeko ostatua  <a>ikasi gehiago</a>",
     "Sign in instead": "Hasi saioa horren ordez",
@@ -1263,18 +1162,11 @@
     "Never lose encrypted messages": "Ez galdu inoiz zifratutako mezuak",
     "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Gela honetako mezuak muturretik muturrerako zifratzeaz babestuak daude. Zuek eta hartzaileek besterik ez daukazue mezu horiek irakurtzeko giltza.",
     "Composer": "Idazlekua",
-    "Secure your backup with a passphrase": "Babestu zure babes-kopia pasaesaldi batekin",
-    "Confirm your passphrase": "Berretsi pasaesaldia",
-    "Recovery key": "Berreskuratze gakoa",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Historiala nork irakurri dezakeen aldatzea gelak honetara aurrerantzean bidalitako mezuei besterik ez zaie aplikatuko. Badagoen historialaren ikusgaitasuna ez da aldatuko.",
     "Bulk options": "Aukera masiboak",
     "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Egin zure gakoen babes-kopia segurua hauek ez galtzeko. <a>Ikasi gehiago.</a>",
     "Not now": "Orain ez",
     "Don't ask me again": "Ez galdetu berriro",
-    "Use Legacy Verification (for older clients)": "Erabili egiaztaketa zaharra (bezero zaharrentzat)",
-    "Waiting for partner to accept...": "Kideak onartu bitartean zain…",
-    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Ez da ezer agertzen? Bezero guztiek ez dute egiaztaketa interaktiborako euskarria. <button>Erabili egiaztaketa zaharra</button>.",
-    "Use two-way text verification": "Erabili bi zentzutako testu egiaztaketa",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Egiaztatu erabiltzaile hau fidagarritzat markatzeko. Honek bakea ematen dizu muturretik muturrerako zifratutako mezuak erabiltzean.",
     "Waiting for partner to confirm...": "Kideak baieztatzearen zain…",
     "Incoming Verification Request": "Jasotako egiaztaketa eskaria",
@@ -1284,8 +1176,6 @@
     "Are you sure you want to sign out?": "Ziur saioa amaitu nahi duzula?",
     "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Akatsen bat aurkitzen baduzu edo iruzkinen bat baduzu, emaguzu berri GitHub bidez.",
     "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.": "Bikoiztutako txostenak ekiditeko,  <existingIssuesLink>dauden txostenak</existingIssuesLink> aurretik (eta gehitu +1) edo <newIssueLink>sortu txosten berria</newIssueLink> aurkitzen ez baduzu.",
-    "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "Ezin izn da babes-kopia deszifratu gako honekin: egiaztatu berreskuratze gako egokia sartu duzula.",
-    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "Ezin izan da babes-kopia deszifratu pasaesaldi honekin: egiaztatu berreskuratze pasaesaldia ondo idatzi duzula.",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Abisua:</b>: Gakoen babeskopia fidagarria den gailu batetik egin beharko zenuke beti.",
     "Hide": "Ezkutatu",
     "This homeserver does not support communities": "Hasiera-zerbitzari honek ez du komunitateetarako euskarria",
@@ -1293,16 +1183,11 @@
     "This homeserver does not support login using email address.": "Hasiera-zerbitzari honek ez du e-mail helbidea erabiliz saioa hastea onartzen.",
     "Registration has been disabled on this homeserver.": "Izen ematea desaktibatuta dago hasiera-zerbitzari honetan.",
     "Unable to query for supported registration methods.": "Ezin izan da onartutako izen emate metodoei buruz galdetu.",
-    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "Zure gakoen kopia zifratu bat gordeko dugu gure zerbitzarietan. Babestu zure babes-kopia pasaesaldi batekin.",
     "For maximum security, this should be different from your account password.": "Segurtasun hobe baterako, hau eta zure ohiko pasahitza desberdinak izan beharko lirateke.",
-    "Set up with a Recovery Key": "Ezarri berreskuratze gakoarekin",
-    "Please enter your passphrase a second time to confirm.": "Sartu zure pasaesaldia berriro baieztatzeko.",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Berreskuratze gakoa badaezpadako bat da, zure zifratutako mezuetara sarbidea berreskuratzeko erabili dezakezu pasaesaldia ahaztuz gero.",
     "Your keys are being backed up (the first backup could take a few minutes).": "Zure gakoen babes-kopia egiten ari da (lehen babes-kopiak minutu batzuk behar ditzake).",
     "Success!": "Ongi!",
     "A new recovery passphrase and key for Secure Messages have been detected.": "Berreskuratze pasaesaldi eta mezu seguruen gako berriak antzeman dira.",
     "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.": "Ez baduzu berreskuratze metodoa kendu, agian erasotzaile bat zure mezuen historialera sarbidea lortu nahi du. Aldatu kontuaren pasahitza eta ezarri berreskuratze metodo berri bat berehala ezarpenetan.",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "Zerbitzari pertsonalizatuaren aukera erabili dezakezu beste Matrix zerbitzarietan saioa hasteko beste hasiera-zerbitzari batek URLa adieraziz. Honek aplikazio hau beste Matrix zerbitzari batean duzun Matrix kontua erabiltzea baimentzen dizu.",
     "Changes your display nickname in the current room only": "Zure pantailako izena aldatzen du gela honetan bakarrik",
     "Your Matrix account on %(serverName)s": "Zure %(serverName)s zerbitzariko Matrix kontua",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "¯\\_(ツ)_/¯ jartzen du testu soileko mezu baten aurrean",
@@ -1312,7 +1197,6 @@
     "User %(userId)s is already in the room": "%(userId)s erabiltzailea gelan dago jada",
     "The user must be unbanned before they can be invited.": "Erabiltzaileari debekua kendu behar zaio gonbidatu aurretik.",
     "Show read receipts sent by other users": "Erakutsi beste erabiltzaileek bidalitako irakurragiriak",
-    "Order rooms in the room list by most important first instead of most recent": "Ordenatu gelak gelen zerrendan garrantzitsuenak hasieran jarriz, eta ez eguneratutako azkenak",
     "Scissors": "Artaziak",
     "<a>Upgrade</a> to your own domain": "<a>Eguneratu</a> zure domeinu propiora",
     "Accept all %(invitedRooms)s invites": "Onartu %(invitedRooms)s gelako gonbidapen guztiak",
@@ -1337,10 +1221,6 @@
     "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>": "Behin aktibatuta, ezin zaio gelari zifratzea kendu. Zerbitzariak ezin ditu zifratutako gela batetara bidalitako mezuak ikusi, gelako partaideek besterik ezin dituzte ikusi. Zifratzea aktibatzeak bot eta zubi batzuk ongi ez funtzionatzea ekarri dezake. <a>Ikasi gehiago zifratzeari buruz.</a>",
     "Error updating main address": "Errorea helbide nagusia eguneratzean",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Errore bat gertatu da gelaren helbide nagusia eguneratzean. Agian zerbitzariak ez du hau baimentzen, edo une bateko hutsegitea izan da.",
-    "Error creating alias": "Errorea aliasa sortzean",
-    "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "Errore bat gertatu da alias hori sortzean. Agian zerbitzariak ez du onartzen, edo une bateko hutsegitea izan da.",
-    "Error removing alias": "Errorea aliasa kentzean",
-    "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "Errore bat gertatu da alias hori kentzean. Agien ez da jada existitzen edo une bateko hutsegitea izan da.",
     "Error updating flair": "Errorea ikurra eguneratzean",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Errorea gertatu da gela honen ikurra eguneratzean. Agian zerbitzariak ez du baimentzen, edo une bateko hutsegitea izan da.",
     "Power level": "Botere maila",
@@ -1362,13 +1242,12 @@
     "A widget would like to verify your identity": "Trepeta batek zure identitatea egiaztatu nahi du",
     "Remember my selection for this widget": "Gogoratu nire hautua trepeta honentzat",
     "Deny": "Ukatu",
-    "Riot failed to get the public room list.": "Riot-ek ezin izan du du gelen zerrenda publikoa eskuratu.",
+    "%(brand)s failed to get the public room list.": "%(brand)s-ek ezin izan du du gelen zerrenda publikoa eskuratu.",
     "The homeserver may be unavailable or overloaded.": "Hasiera-zerbitzaria eskuraezin edo kargatuegia egon daiteke.",
     "You have %(count)s unread notifications in a prior version of this room.|other": "Irakurri gabeko %(count)s jakinarazpen dituzu gela honen aurreko bertsio batean.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Irakurri gabeko %(count)s jakinarazpen duzu gela honen aurreko bertsio batean.",
     "Replying With Files": "Fitxategiekin erantzutea",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "'Ogi puskak' ezaugarria erabiltzen duzun ala ez (gelen zerrenda gaineko abatarrak)",
-    "A conference call could not be started because the integrations server is not available": "Ezin izan da konferentzia dei bat hasi integrazio zerbitzaria ez dagoelako eskuragarri",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Une honetan ezin da fitxategi batekin erantzun. Fitxategia igo nahi duzu erantzun gabe?",
     "The file '%(fileName)s' failed to upload.": "Huts egin du '%(fileName)s' fitxategia igotzean.",
     "The server does not support the room version specified.": "Zerbitzariak ez du emandako gela-bertsioa onartzen.",
@@ -1382,13 +1261,11 @@
     "Sends the given emote coloured as a rainbow": "Emandako emote-a ortzadarraren koloreekin bidaltzen du",
     "Cannot reach homeserver": "Ezin izan da hasiera-zerbitzaria atzitu",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Baieztatu Internet konexio egonkor bat duzula, edo jarri kontaktuan zerbitzariaren administratzailearekin",
-    "Your Riot is misconfigured": "Zure Riot gaizki konfiguratuta dago",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Eskatu zure administratzaileari <a>zure konfigurazioa</a> egiaztatu dezan ea okerrak diren edo bikoiztuta dauden sarrerak dauden.",
+    "Your %(brand)s is misconfigured": "Zure %(brand)s gaizki konfiguratuta dago",
     "No homeserver URL provided": "Ez da hasiera-zerbitzariaren URL-a eman",
     "Unexpected error resolving homeserver configuration": "Ustekabeko errorea hasiera-zerbitzariaren konfigurazioa ebaztean",
     "Unexpected error resolving identity server configuration": "Ustekabeko errorea identitate-zerbitzariaren konfigurazioa ebaztean",
     "The user's homeserver does not support the version of the room.": "Erabiltzailearen hasiera-zerbitzariak ez du gelaren bertsioa onartzen.",
-    "Show recently visited rooms above the room list": "Erakutsi bisitatutako azken gelak gelen zerrendaren goialdean",
     "Show hidden events in timeline": "Erakutsi gertaera ezkutuak denbora-lerroan",
     "Low bandwidth mode": "Banda-zabalera gutxiko modua",
     "When rooms are upgraded": "Gelak eguneratzean",
@@ -1480,7 +1357,7 @@
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Fitxategi hauek <b>handiegiak dira</b> igotzeko. Fitxategien tamaina-muga %(limit)s da.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Fitxategi batzuk <b>handiegiak dira</b> igotzeko. Fitxategien tamaina-muga %(limit)s da.",
     "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 helbidean kokatutako trepeta batek zure identitatea egiaztatu nahi du. Hau baimentzen baduzu, trepetak zure erabiltzaile ID-a egiaztatu ahal izango du, baina ez zure izenean ekintzarik egin.",
-    "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot-ek huts egin du zure hasiera-zerbitzariaren protokoloen zerrenda eskuratzean. Agian hasiera-zerbitzaria zaharregia da hirugarrengoen sareak onartzeko.",
+    "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s-ek huts egin du zure hasiera-zerbitzariaren protokoloen zerrenda eskuratzean. Agian hasiera-zerbitzaria zaharregia da hirugarrengoen sareak onartzeko.",
     "Failed to get autodiscovery configuration from server": "Huts egin du aurkikuntza automatikoaren konfigurazioa zerbitzaritik eskuratzean",
     "Invalid base_url for m.homeserver": "Baliogabeko base_url  m.homeserver zerbitzariarentzat",
     "Invalid base_url for m.identity_server": "Baliogabeko base_url m.identity_server zerbitzariarentzat",
@@ -1575,7 +1452,7 @@
     "Remove %(phone)s?": "Kendu %(phone)s?",
     "Deactivate user?": "Desaktibatu erabiltzailea?",
     "Deactivate user": "Desaktibatu erabiltzailea",
-    "Link this email with your account in Settings to receive invites directly in Riot.": "Lotu e-mail hau zure kontuarekin gonbidapenak zuzenean Riot-en jasotzeko.",
+    "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Lotu e-mail hau zure kontuarekin gonbidapenak zuzenean %(brand)s-en jasotzeko.",
     "This invite to %(roomName)s was sent to %(email)s": "%(roomName)s gelara gonbidapen hau %(email)s helbidera bidali da",
     "Add Email Address": "Gehitu e-mail helbidea",
     "Add Phone Number": "Gehitu telefono zenbakia",
@@ -1622,23 +1499,18 @@
     "Code block": "Kode blokea",
     "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Errore bat jaso da (%(errcode)s) zure gonbidapena balioztatzen saiatzean. Informazio hau gelaren administratzaile bati pasatzen saiatu zaitezke.",
     "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "%(roomName)s gelarako gonbidapena zure kontuarekin lotuta ez dagoen %(email)s helbidera bidali da",
-    "Use an identity server in Settings to receive invites directly in Riot.": "Erabili identitate zerbitzari bat ezarpenetan gonbidapenak zuzenean Riot-en jasotzeko.",
-    "Share this email in Settings to receive invites directly in Riot.": "Partekatu e-mail hau ezarpenetan gonbidapenak zuzenean Riot-en jasotzeko.",
+    "Use an identity server in Settings to receive invites directly in %(brand)s.": "Erabili identitate zerbitzari bat ezarpenetan gonbidapenak zuzenean %(brand)s-en jasotzeko.",
+    "Share this email in Settings to receive invites directly in %(brand)s.": "Partekatu e-mail hau ezarpenetan gonbidapenak zuzenean %(brand)s-en jasotzeko.",
     "%(count)s unread messages including mentions.|other": "irakurri gabeko %(count)s mezu aipamenak barne.",
     "%(count)s unread messages.|other": "irakurri gabeko %(count)s mezu.",
     "Unread mentions.": "Irakurri gabeko aipamenak.",
     "Show image": "Erakutsi irudia",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "<newIssueLink>Sortu txosten berri bat</newIssueLink> GitHub zerbitzarian arazo hau ikertu dezagun.",
-    "Room alias": "Gelaren ezizena",
     "e.g. my-room": "adib. nire-gela",
-    "Please provide a room alias": "Sartu gelaren ezizena",
-    "This alias is available to use": "Ezizen hau eskuragarri dago",
-    "This alias is already in use": "Ezizen hau jada hartuta dago",
     "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Erabili identitate-zerbitzari bat e-mail bidez gonbidatzeko. <default>Erabili lehenetsitakoa (%(defaultIdentityServerName)s)</default> edo gehitu bat <settings>Ezarpenak</settings> atalean.",
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Erabili identitate-zerbitzari bat e-mail bidez gonbidatzeko. Kudeatu <settings>Ezarpenak</settings> atalean.",
     "Close dialog": "Itxi elkarrizketa-koadroa",
     "Please enter a name for the room": "Sartu gelaren izena",
-    "Set a room alias to easily share your room with other people.": "Ezarri ezizen bat gelarentzat besteekin erraz partekatzeko.",
     "This room is private, and can only be joined by invitation.": "Gela hau pribatua da, eta gonbidapena behar da elkartzeko.",
     "Create a public room": "Sortu gela publikoa",
     "Create a private room": "Sortu gela pribatua",
@@ -1667,7 +1539,7 @@
     "View": "Ikusi",
     "Find a room…": "Bilatu gela bat…",
     "Find a room… (e.g. %(exampleRoom)s)": "Bilatu gela bat… (adib. %(exampleRoom)s)",
-    "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Ezin baduzu bila ari zaren gela aurkitu, eskatu gonbidapen bat edo <a>Sortu gela berri bat</a>.",
+    "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Ez baduzu bilatzen duzuna aurkitzen, eskatu gonbidapen bat edo <a>Sortu gela berri bat</a>.",
     "Explore rooms": "Arakatu gelak",
     "Community Autocomplete": "Komunitate osatze automatikoa",
     "Emoji Autocomplete": "Emoji osatze automatikoa",
@@ -1724,7 +1596,6 @@
     "%(senderName)s placed a video call.": "%(senderName)s erabiltzaileak bideo-dei bat abiatu du.",
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s erabiltzaileak bideo-dei bat abiatu du. (Nabigatzaile honek ez du onartzen)",
     "Try out new ways to ignore people (experimental)": "Probatu jendea ez entzuteko modu berriak (esperimentala)",
-    "Enable local event indexing and E2EE search (requires restart)": "Gaitu gertaera lokalen indexazioa eta E2EE bilaketa (berrabiarazi behar da)",
     "Match system theme": "Bat egin sistemako azalarekin",
     "My Ban List": "Nire debeku-zerrenda",
     "This is your list of users/servers you have blocked - don't leave the room!": "Hau blokeatu dituzun erabiltzaile edo zerbitzarien zerrenda da, ez atera gelatik!",
@@ -1742,7 +1613,6 @@
     "Error adding ignored user/server": "Errorea ezikusitako erabiltzaile edo zerbitzaria gehitzean",
     "Something went wrong. Please try again or view your console for hints.": "Okerren bat egon da. Saiatu berriro edo bilatu aztarnak kontsolan.",
     "Error subscribing to list": "Errorea zerrendara harpidetzean",
-    "Please verify the room ID or alias and try again.": "Egiaztatu gelaren ID-a edo ezizena eta saiatu berriro.",
     "Error removing ignored user/server": "Errorea ezikusitako erabiltzaile edo zerbitzaria kentzean",
     "Error unsubscribing from list": "Errorea zerrendatik harpidetza kentzean",
     "Please try again or view your console for hints.": "Saiatu berriro edo bilatu aztarnak kontsolan.",
@@ -1757,7 +1627,6 @@
     "View rules": "Ikusi arauak",
     "You are currently subscribed to:": "Orain hauetara harpidetuta zaude:",
     "⚠ These settings are meant for advanced users.": "⚠ Ezarpen hauek erabiltzaile aurreratuei zuzenduta daude.",
-    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Gehitu ezikusi nahi dituzun erabiltzaileak eta zerbitzariak hona. Erabili asteriskoak edozein karaktereek bat egin dezaten. Adibidez, <code>@bot:*</code> edozein zerbitzaritan 'bot' izena duten erabiltzaileak ezikusiko ditu.",
     "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.": "Jendea ezikusteko debekuen zerrendak erabiltzen dira, hauek nor debekatzeko arauak dituzte. Debeku zerrenda batera harpidetzean zerrenda horrek debekatzen dituen erabiltzaile eta zerbitzariak ezkutatuko zaizkizu.",
     "Personal ban list": "Debeku-zerrenda pertsonala",
     "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.": "Zure debeku-zerrenda pertsonalak zuk pertsonalki ikusi nahi ez dituzun erabiltzaile eta zerbitzariak ditu. Behi erabiltzaile edo zerbitzari bat ezikusita, gela berri bat agertuko da 'Nire debeku-zerrenda' izenarekin, debeku-zerrenda indarrean mantentzeko ez atera gela honetatik.",
@@ -1766,14 +1635,13 @@
     "Subscribed lists": "Harpidetutako zerrendak",
     "Subscribing to a ban list will cause you to join it!": "Debeku-zerrenda batera harpidetzeak zu elkartzea ekarriko du!",
     "If this isn't what you want, please use a different tool to ignore users.": "Hau ez bada zuk nahi duzuna, erabili beste tresnaren bat erabiltzaileak ezikusteko.",
-    "Room ID or alias of ban list": "Debeku-zerrendaren gela ID-a edo ezizena",
     "Subscribe": "Harpidetu",
     "Failed to connect to integration manager": "Huts egin du integrazio kudeatzailera konektatzean",
     "Trusted": "Konfiantzazkoa",
     "Not trusted": "Ez konfiantzazkoa",
     "Direct message": "Mezu zuzena",
     "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> %(roomName)s gelan",
-    "Messages in this room are end-to-end encrypted.": "Gela honetako mezuak ez daude muturretik muturrera zifratuta.",
+    "Messages in this room are end-to-end encrypted.": "Gela honetako mezuak muturretik muturrera zifratuta daude.",
     "Security": "Segurtasuna",
     "Verify": "Egiaztatu",
     "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Erabiltzaile hau ezikusi duzu, beraz bere mezua ezkutatuta dago. <a>Erakutsi hala ere.</a>",
@@ -1782,7 +1650,7 @@
     "Your avatar URL": "Zure abatarraren URL-a",
     "Your user ID": "Zure erabiltzaile ID-a",
     "Your theme": "Zure azala",
-    "Riot URL": "Riot URL-a",
+    "%(brand)s URL": "%(brand)s URL-a",
     "Room ID": "Gelaren ID-a",
     "Widget ID": "Trepetaren ID-a",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Trepeta hau erabiltzean <helpIcon />  %(widgetDomain)s domeinuarekin eta zure integrazio kudeatzailearekin datuak partekatu daitezke.",
@@ -1794,14 +1662,12 @@
     "Integrations are disabled": "Integrazioak desgaituta daude",
     "Enable 'Manage Integrations' in Settings to do this.": "Gaitu 'Kudeatu integrazioak' ezarpenetan hau egiteko.",
     "Integrations not allowed": "Integrazioak ez daude baimenduta",
-    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Zure Riot aplikazioak ez dizu hau egiteko integrazio kudeatzaile bat erabiltzen uzten. Kontaktatu administratzaileren batekin.",
+    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Zure %(brand)s aplikazioak ez dizu hau egiteko integrazio kudeatzaile bat erabiltzen uzten. Kontaktatu administratzaileren batekin.",
     "Reload": "Birkargatu",
     "Take picture": "Atera argazkia",
     "Remove for everyone": "Kendu denentzat",
     "Remove for me": "Kendu niretzat",
     "Verification Request": "Egiaztaketa eskaria",
-    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
-    "Send cross-signing keys to homeserver": "Bidali zeharkako sinaduraren gakoak hasiera-zerbitzarira",
     "Error upgrading room": "Errorea gela eguneratzean",
     "Double check that your server supports the room version chosen and try again.": "Egiaztatu zure zerbitzariak aukeratutako gela bertsioa onartzen duela eta saiatu berriro.",
     "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s erabiltzaileak %(glob)s adierazpenarekin bat datozen erabiltzaileak debekatzen zituen araua kendu du",
@@ -1850,27 +1716,15 @@
     "Upgrade private room": "Eguneratu gela pribatua",
     "Upgrade public room": "Eguneratu gela publikoa",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Gela eguneratzea ekintza aurreratu bat da eta akatsen, falta diren ezaugarrien, edo segurtasun arazoen erruz gela ezegonkorra denean aholkatzen da.",
-    "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Orokorrean honek zerbitzariak gela nola prozesatzen duen da duen eragin bakarra. RIot-ekin arazoak badituzu, <a>eman akats baten berri</a>.",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Gela hau <oldVersion /> bertsiotik <newVersion /> bertsiora eguneratuko duzu.",
     "Upgrade": "Eguneratu",
-    "Enter secret storage passphrase": "Sartu biltegi sekretuko pasaesaldia",
-    "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Ezin izan da biltegi sekretura sartu. Egiaztatu pasaesaldi zuzena idatzi duzula.",
-    "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Abisua</b>: Biltegi sekretura ordenagailu fidagarri batetik konektatu beharko zinateke beti.",
-    "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Zure pasa-esaldia ahaztu baduzu <button1>berreskuratze gakoa erabili</button1> dezakezu edo <button2>berreskuratze aukera berriak ezarri</button2> ditzakezu.",
-    "Enter secret storage recovery key": "Sartu biltegi sekretuko berreskuratze-gakoa",
-    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Ezin izan da biltegi sekretura sartu. Egiaztatu berreskuratze-gako zuzena sartu duzula.",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "Zure berreskuratze-gakoa ahaztu baduzu <button>berreskuratze aukera berriak ezarri</button> ditzakezu.",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Abisua:</b>: Gakoen babes-kopia fidagarria den gailu batetik egin beharko zenuke beti.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Zure berreskuratze-gakoa ahaztu baduzu <button>berreskuratze aukera berriak ezarri</button> ditzakezu",
     "Notification settings": "Jakinarazpenen ezarpenak",
     "User Status": "Erabiltzaile-egoera",
     "Set up with a recovery key": "Ezarri berreskuratze gakoarekin",
-    "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "Aukeran, berreskuratze pasa-esaldia ahazten baduzu, zure zifratutako mezuak berreskuratzeko erabili dezakezu.",
-    "As a safety net, you can use it to restore your access to encrypted messages.": "Badaezpada, zure zifratutako mezuen historiala berreskuratzeko erabili dezakezu.",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "Gorde zure berreskuratze gakoa toki oso seguruan, esaterako pasahitz kudeatzaile batean (edo gordailu kutxan).",
     "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Zure berreskuratze gakoa <b>arbelera kopiatu da</b>, itsatsi hemen:",
     "Your recovery key is in your <b>Downloads</b> folder.": "Zure berreskuratze gakoa zure <b>Deskargak</b> karpetan dago.",
-    "Storing secrets...": "Sekretuak gordetzen...",
     "Unable to set up secret storage": "Ezin izan da biltegi sekretua ezarri",
     "The message you are trying to send is too large.": "Bidali nahi duzun mezua handiegia da.",
     "Language Dropdown": "Hizkuntza menua",
@@ -1885,7 +1739,6 @@
     "Suggestions": "Proposamenak",
     "Failed to find the following users": "Ezin izan dira honako erabiltzaile hauek aurkitu",
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Honako erabiltzaile hauek agian ez dira existitzen edo baliogabeak dira, eta ezin dira gonbidatu: %(csvNames)s",
-    "Show a presence dot next to DMs in the room list": "Erakutsi presentzia puntua mezu zuzenen ondoan gelen zerrendan",
     "Lock": "Blokeatu",
     "Restore": "Berrezarri",
     "a few seconds ago": "duela segundo batzuk",
@@ -1909,19 +1762,11 @@
     "Something went wrong trying to invite the users.": "Okerren bat egon da erabiltzaileak gonbidatzen saiatzean.",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "Ezin izan ditugu erabiltzaile horiek gonbidatu. Egiaztatu gonbidatu nahi dituzun erabiltzaileak eta saiatu berriro.",
     "Recently Direct Messaged": "Berriki mezu zuzena bidalita",
-    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Ez baduzu baten bat aurkitzen, eskatu bere erabiltzaile-izena (adib. @erabiltzailea:zerbitzaria.eus) edo <a>partekatu gela hau</a>.",
-    "Complete security": "Segurtasun osoa",
-    "Verify this session to grant it access to encrypted messages.": "Egiaztatu saio hau zifratutako mezuetara sarbidea emateko.",
     "Start": "Hasi",
     "Session verified": "Saioa egiaztatuta",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Zure saio berria orain egiaztatuta dago. Zure zifratutako mezuetara sarbidea du, eta beste erabiltzaileek fidagarri gisa ikusiko zaituzte.",
     "Done": "Egina",
     "Go Back": "Joan atzera",
-    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s erabiltzaileak %(addedAddresses)s helbideak eta beste %(count)s gehitu dizkio gela honi",
-    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s erabiltzaileak %(removedAddresses)s helbideak eta beste %(count)s kendu dizkio gela honi",
-    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s erabiltzaileak %(countRemoved)s helbide kendu eta %(countAdded)s gehitu dizkio gela honi",
-    "%(senderName)s turned on end-to-end encryption.": "%(senderName)s erabiltzaileak muturretik muturrera zifratzea aktibatu du.",
-    "%(senderName)s turned on end-to-end encryption (unrecognised algorithm %(algorithm)s).": "%(senderName)s erabiltzaileak muturretik muturrera zifratzea gaitu du (%(algorithm)s algoritmo ezezaguna).",
     "This room is end-to-end encrypted": "Gela hau muturretik muturrera zifratuta dago",
     "Everyone in this room is verified": "Gelako guztiak egiaztatuta daude",
     "Invite only": "Gonbidapenez besterik ez",
@@ -1936,37 +1781,23 @@
     "Verify User": "Egiaztatu erabiltzailea",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "Segurtasun gehiagorako, egiaztatu erabiltzaile hau aldi-bakarrerako kode bat bi gailuetan egiaztatuz.",
     "Start Verification": "Hasi egiaztaketa",
-    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Ez baduzu baten bat aurkitzen, eskatu bere erabiltzaile-izena, partekatu zurea (%(userId)s) edo partekatu <a>profilaren esteka</a>.",
     "Enter your account password to confirm the upgrade:": "Sartu zure kontuaren pasa-hitza eguneraketa baieztatzeko:",
     "You'll need to authenticate with the server to confirm the upgrade.": "Zerbitzariarekin autentifikatu beharko duzu eguneraketa baieztatzeko.",
-    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Babestu zure zifratze gakoak pasa-esaldi batekin. Segurtasun gorenerako hau eta zure kontuaren pasahitza desberdinak izan beharko lukete:",
-    "Enter a passphrase": "Sartu pasa-esaldia",
-    "Enter your passphrase a second time to confirm it.": "Sartu zure pasa-esaldia berriro hau baieztatzeko.",
-    "Verify other users in their profile.": "Egiaztatu beste erabiltzaileak bere profiletan.",
     "Upgrade your encryption": "Eguneratu zure zifratzea",
     "Set up encryption": "Ezarri zifratzea",
-    "Encryption upgraded": "Zifratzea eguneratuta",
-    "Encryption setup complete": "Zifratzearen ezarpena egina",
-    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Saio ezezagunak daude gela honetan: egiaztatu gabe aurrera jarraitzen baduzu, baten batek zure deian kuxkuxeatu lezake.",
     "Setting up keys": "Gakoak ezartzen",
     "Verify this session": "Egiaztatu saio hau",
     "Encryption upgrade available": "Zifratze eguneratzea eskuragarri",
-    "Unverified session": "Egiaztatu gabeko saioa",
     "Verifies a user, session, and pubkey tuple": "Erabiltzaile, saio eta gako-publiko tupla egiaztatzen du",
     "Unknown (user, session) pair:": "(Erabiltzaile, saio) bikote ezezaguna:",
     "Session already verified!": "Saioa jada egiaztatu da!",
     "WARNING: Session already verified, but keys do NOT MATCH!": "ABISUA: Saioa jada egiaztatu da, baina gakoak EZ DATOZ BAT!",
     "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!": "ABISUA: GAKO EGIAZTAKETAK HUTS EGIN DU! %(userId)s eta %(deviceId)s saioaren sinatze gakoa %(fprint)s da, eta ez dator bat emandako %(fingerprint)s gakoarekin. Honek esan nahi lezake norbaitek zure komunikazioan esku sartzen ari dela!",
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Eman duzun sinatze gakoa bat dator %(userId)s eta %(deviceId)s saioarentzat jaso duzun sinatze-gakoarekin. Saioa egiaztatu gisa markatu da.",
-    "Enable cross-signing to verify per-user instead of per-session (in development)": "Gaitu zeharkako sinatzea erabiltzaileko egiaztatzeko eta ez saioko (garapenean)",
-    "Show padlocks on invite only rooms": "Erakutsi giltzarrapoak soilik gonbidapenarekin diren geletan",
     "Never send encrypted messages to unverified sessions from this session": "Ez bidali inoiz zifratutako mezuak egiaztatu gabeko saioetara saio honetatik",
     "Never send encrypted messages to unverified sessions in this room from this session": "Ez bidali inoiz zifratutako mezuak egiaztatu gabeko saioetara gela honetan saio honetatik",
     "Enable message search in encrypted rooms": "Gaitu mezuen bilaketa gela zifratuetan",
-    "Keep secret storage passphrase in memory for this session": "Mantendu biltegi sekretuko pasa-esaldia memorian saio honetan",
     "How fast should messages be downloaded.": "Zeinen azkar deskargatu behar diren mezuak.",
-    "Confirm the emoji below are displayed on both devices, in the same order:": "Baieztatu azpiko emojiak bi gailuetan ikusten direla, ordena berean:",
-    "Verify this device by confirming the following number appears on its screen.": "Egiaztatu gailu hau honako zenbakia bere pantailan agertzen dela baieztatuz.",
     "Waiting for %(displayName)s to verify…": "%(displayName)s egiaztatu bitartean zain…",
     "They match": "Bat datoz",
     "They don't match": "Ez datoz bat",
@@ -2006,7 +1837,6 @@
     "Session ID:": "Saioaren ID-a:",
     "Session key:": "Saioaren gakoa:",
     "Message search": "Mezuen bilaketa",
-    "Sessions": "Saioak",
     "A session's public name is visible to people you communicate with": "Saio baten izen publikoa zurekin komunikatzen den jendeak ikusi dezake",
     "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Gela honek honako plataformetara kopiatzen ditu mezuak. <a>Argibide gehiago.</a>",
     "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Gela honek ez ditu mezuak beste plataformatara kopiatzen. <a>Argibide gehiago.</a>",
@@ -2014,10 +1844,6 @@
     "This user has not verified all of their sessions.": "Erabiltzaile honek ez ditu bere saio guztiak egiaztatu.",
     "You have not verified this user.": "Ez duzu erabiltzaile hau egiaztatu.",
     "Someone is using an unknown session": "Baten batek saio ezezagun bat erabiltzen du",
-    "Some sessions for this user are not trusted": "Erabiltzaile honen saio batzuk ez dira fidagarritzat jotzen",
-    "All sessions for this user are trusted": "Erabiltzaile honen saio guztiak fidagarritzat jotzen dira",
-    "Some sessions in this encrypted room are not trusted": "Zifratutako gela honetako saio batzuk ez dira fidagarritzat jotzen",
-    "All sessions in this encrypted room are trusted": "Zifratutako gela honetako saio guztiak fidagarritzat jotzen dira",
     "Encrypted by an unverified session": "Egiaztatu gabeko saio batek zifratua",
     "Encrypted by a deleted session": "Ezabatutako saio batek zifratua",
     "Your messages are not secure": "Zure mezuak ez daude babestuta",
@@ -2034,9 +1860,6 @@
     "If you can't scan the code above, verify by comparing unique emoji.": "Ezin baduzu goiko kodea eskaneatu, egiaztatu emoji bakanak konparatuz.",
     "You've successfully verified %(displayName)s!": "Ongi egiaztatu duzu %(displayName)s!",
     "Got it": "Ulertuta",
-    "Verification timed out. Start verification again from their profile.": "Egiaztaketarako denbora-muga agortu da. Hasi egiaztaketa berriro bere profiletik.",
-    "%(displayName)s cancelled verification. Start verification again from their profile.": "%(displayName)s erabiltzaileak egiaztaketa ezeztatu du. Hasi egiaztaketa berriro bere profiletik.",
-    "You cancelled verification. Start verification again from their profile.": "Egiaztaketa ezeztatu duzu. Hasi egiaztaketa berriro bere profiletik.",
     "Encryption enabled": "Zifratzea gaituta",
     "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Gela honetako mezuak muturretik muturrera zifratuta daude. Ikasi gehiago eta egiaztatu erabiltzaile hau bere erabiltzaile profilean.",
     "Encryption not enabled": "Zifratzea gaitu gabe",
@@ -2044,41 +1867,27 @@
     "Clear all data in this session?": "Garbitu saio honetako datu guztiak?",
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Saio honetako datuak garbitzea behin betirako da. Zifratutako mezuak galdu egingo dira gakoen babes-kopia egin ez bada.",
     "Verify session": "Egiaztatu saioa",
-    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Saio hau fidagarritzat jo daitekeela egiaztatzeko, egiaztatu gailu horretako erabiltzaile ezarpenetan ikusten duzun gakoa beheko honekin bat datorrela:",
     "Session name": "Saioaren izena",
     "Session key": "Saioaren gakoa",
-    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "Bat badator, sakatu beheko egiaztatu botoia. Ez badator bat, beste inor saioa antzematen ari da eta zerrenda beltzean sartu beharko zenuke.",
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Erabiltzaile hau egiaztatzean bere saioa fidagarritzat joko da, eta zure saioak beretzat fidagarritzat ere.",
-    "Loading session info...": "Saioaren informazioa kargatzen…",
     "New session": "Saio berria",
     "Use this session to verify your new one, granting it access to encrypted messages:": "Erabili saio hau berria egiaztatzeko, honela mezu zifratuetara sarbidea emanez:",
     "If you didn’t sign in to this session, your account may be compromised.": "Ez baduzu saio hau zuk hasi, agian baten bat zure kontuan sartu da.",
     "This wasn't me": "Ez naiz ni izan",
     "This will allow you to return to your account after signing out, and sign in on other sessions.": "Honekin zure kontura itzuli ahalko zara beste saioak amaitu eta berriro hasita.",
-    "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "Egiaztatu gabeko saioak zerrenda beltzean sartzen ari zara, saio hauetara mezuak bidaltzeko egiaztatu behar dituzu.",
-    "Room contains unknown sessions": "Gelak saio ezezagunak ditu",
-    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "%(RoomName)s gelan aurretik ikusi ez dituzun saioak daude.",
-    "Unknown sessions": "Saio ezezagunak",
     "Recovery key mismatch": "Berreskuratze gakoak ez datoz bat",
     "Incorrect recovery passphrase": "Berreskuratze pasa-esaldi okerra",
-    "Backup restored": "Babes-kopia berreskuratuta",
     "Enter recovery passphrase": "Sartu berreskuratze pasa-esaldia",
     "Enter recovery key": "Sartu berreskuratze gakoa",
     "Confirm your identity by entering your account password below.": "Baieztatu zure identitatea zure kontuaren pasahitza azpian idatziz.",
-    "Message not sent due to unknown sessions being present": "Ez da mezua bidali saio ezezagunak daudelako",
     "Your new session is now verified. Other users will see it as trusted.": "Zure saioa egiaztatuta dago orain. Beste erabiltzaileek fidagarri gisa ikusiko dute.",
     "Without completing security on this session, it won’t have access to encrypted messages.": "Saio honetan segurtasuna ezarri ezean, ez du zifratutako mezuetara sarbiderik izango.",
-    "Sender session information": "Igorlearen saioaren informazioa",
-    "Back up my encryption keys, securing them with the same passphrase": "Egin nire zifratze gakoen babes-kopia, babestu pasa-esaldi berberarekin",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Gorde kopia bat toki seguruan, esaterako pasahitz kudeatzaile batean edo gordailu kutxan.",
     "Your recovery key": "Zure berreskuratze gakoa",
     "Copy": "Kopiatu",
-    "You can now verify your other devices, and other users to keep your chats safe.": "Orain zure beste gailuak eta beste erabiltzaileak egiaztatu ditzakezu txatak seguru mantentzeko.",
     "Make a copy of your recovery key": "Egin zure berreskuratze gakoaren kopia",
-    "You're done!": "Bukatu duzu!",
     "If you cancel now, you won't complete verifying the other user.": "Orain ezeztatzen baduzu, ez duzu beste erabiltzailearen egiaztaketa burutuko.",
     "If you cancel now, you won't complete verifying your other session.": "Orain ezeztatzen baduzu, ez duzu beste zure beste saioaren egiaztaketa burutuko.",
-    "If you cancel now, you won't complete your secret storage operation.": "Orain ezeztatzen baduzu, ez duzu zure biltegi sekretuko eragiketa burutuko.",
     "Cancel entering passphrase?": "Ezeztatu pasa-esaldiaren sarrera?",
     "Securely cache encrypted messages locally for them to appear in search results.": "Gorde zifratutako mezuak cachean modu seguruan bilaketen emaitzetan agertu daitezen.",
     "You have verified this user. This user has verified all of their sessions.": "Erabiltzaile hau egiaztatu duzu. Erabiltzaile honek bere saio guztiak egiaztatu ditu.",
@@ -2087,23 +1896,14 @@
     "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.": "Automatikoki bidaltzen dira gako partekatze eskaerak zure beste saioetara. Beste saioetan gako partekatze eskaera ukatu edo baztertu baduzu, sakatu hemen saio honentzat gakoak berriro eskatzeko.",
     "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Zure beste saioek ez badute mezu honen gakoa ezin izango duzu deszifratu.",
     "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Eskatu berriro zifratze gakoak</requestLink> zure beste saioei.",
-    "No sessions with registered encryption keys": "Ez dago zifratze gako hori duen saiorik",
     "Waiting for %(displayName)s to accept…": "%(displayName)s(e)k onartu bitartean zain…",
-    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Zuon mezuak babestuta daude eta soilik zuk eta hartzaileak dituzue hauek irekitzeko giltza.",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Zuen mezuak babestuta daude eta soilik zuk eta hartzaileak dituzue hauek desblokeatzeko gakoak.",
     "One of the following may be compromised:": "Hauetakoren bat konprometituta egon daiteke:",
     "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.": "Egiztatu gailu hau fidagarri gisa markatzeko. Gailu hau fidagarritzat jotzeak lasaitasuna ematen du muturretik-muturrera zifratutako mezuak erabiltzean.",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Gailu hau egiaztatzean fidagarri gisa markatuko da, eta egiaztatu zaituzten erabiltzaileek fidagarri gisa ikusiko dute.",
-    "You added a new session '%(displayName)s', which is requesting encryption keys.": "'%(displayName)s' saio berria gehitu duzu, eta zifratze gakoak eskatzen ari da.",
-    "Your unverified session '%(displayName)s' is requesting encryption keys.": "Zure egiaztatu gabeko '%(displayName)s' saioa zifratze gakoak eskatzen ari da.",
-    "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Egiaztaketa prozesua saio bakoitzeko egitea aholkatzen dizugu, benetan jabearenak direla baieztatzeko, baina egiaztaketa egin gabe mezua bidali dezakezu ere.",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "Atzitu zure mezu seguruen historiala eta zeharkako sinatzerako identitatea beste saioak egiaztatzeko zure pasa-esaldia sartuz.",
-    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Erakutsi saioak</showSessionsText>, <sendAnywayText>bidali edonola ere</sendAnywayText> edo <cancelText>ezeztatu</cancelText>.",
-    "The information being sent to us to help make Riot better includes:": "Riot hobetzeko bidaltzen zaigun informazioa honakoa da, besteren artean:",
     "Verify this session by completing one of the following:": "Egiaztatu saio hau hauetako bat osatuz:",
     "or": "ala",
-    "The version of Riot": "Riot bertsioa",
-    "Whether you're using Riot on a device where touch is the primary input mechanism": "Sarrera mekanismo nagusia ukimena den gailu bat erabiltzen duzun",
-    "Whether you're using Riot as an installed Progressive Web App": "Riot instalatutako aplikazio progresibo gisa erabiltzen duzun",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "%(brand)s instalatutako aplikazio progresibo gisa erabiltzen duzun",
     "Your user agent": "Zure erabiltzaile-agentea",
     "Show typing notifications": "Erakutsi idazketa jakinarazpenak",
     "Scan this unique code": "Eskaneatu kode bakan hau",
@@ -2122,16 +1922,13 @@
     "exists": "badago",
     "Securely cache encrypted messages locally for them to appear in search results, using ": "Gorde zifratutako mezuak cachean modu seguruan bilaketen emaitzetan agertu daitezen, hau erabiliz ",
     " to store messages from ": " hemengo mezuak gordetzeko ",
-    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Riot-ek zifratutako mezuak cache lokalean modu seguruan gordetzeko elementu batzuk faltan ditu. Ezaugarri honekin esperimentatu nahi baduzu, konpilatu pertsonalizatutako Riot Desktop <nativeLink> bilaketa osagaiekin</nativeLink>.",
-    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot-ek ezin ditu zifratutako mezuak cache lokalean gorde web nabigatzaile batetik badabil. Erabili <riotLink>Riot Desktop</riotLink> zifratutako mezuak bilaketen emaitzetan agertzeko.",
+    "%(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-ek zifratutako mezuak cache lokalean modu seguruan gordetzeko elementu batzuk faltan ditu. Ezaugarri honekin esperimentatu nahi baduzu, konpilatu pertsonalizatutako %(brand)s Desktop <nativeLink> bilaketa osagaiekin</nativeLink>.",
     "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Babes-kopiak %(deviceId)s ID-a duen erabiltzaile <verify>ezezagun</verify> baten sinadura du",
-    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Babes-kopiaren gakoa biltegi sekretuan gorde da, baina ezaugarri hau ez dago saio honetan aktibatuta. Gaitu zeharkako sinatzea Laborategia atalean gakoen babes-kopiaren egoera aldatzeko.",
     "Accepting…": "Onartzen…",
     "Not Trusted": "Ez konfiantzazkoa",
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) erabiltzaileak saio berria hasi du hau egiaztatu gabe:",
     "Ask this user to verify their session, or manually verify it below.": "Eskatu erabiltzaile honi saioa egiaztatu dezala, edo egiaztatu eskuz azpian.",
-    "Manually Verify": "Eskuzko egiaztaketa",
-    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "Egiaztatu nahi duzun saioak ez du QR kodea eskaneatzea onartzen, ezta emoji egiaztaketa, eta hau da Riot-ek onartzen duena. Saiatu beste bezero batekin.",
+    "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.": "Egiaztatu nahi duzun saioak ez du QR kodea eskaneatzea onartzen, ezta emoji egiaztaketa, eta hau da %(brand)s-ek onartzen duena. Saiatu beste bezero batekin.",
     "Verify by scanning": "Egiaztatu eskaneatuz",
     "You declined": "Ukatu egin duzu",
     "%(name)s declined": "%(name)s erabiltzaileak ukatu du",
@@ -2140,21 +1937,18 @@
     "Destroy cross-signing keys?": "Suntsitu zeharkako sinatzerako gakoak?",
     "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.": "Zeharkako sinatzerako gakoak ezabatzea behin betiko da. Egiaztatu dituzunak segurtasun abisu bat jasoko dute.  Ziur aski ez duzu hau egin nahi, zeharkako sinatzea ahalbidetzen dizun gailu oro galdu ez baduzu.",
     "Clear cross-signing keys": "Garbitu zeharkako sinatzerako gakoak",
-    "To verify that this session can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this session matches the key below:": "Saio hau fidagarritzat jo daitekeela egiaztatzeko, jarri jabearekin kontaktuan beste bide batetik (adib. aurrez aurre edo telefonoz deituz) eta galdetu saio honentzat erabiltzaile ezarpenetan ikusten duten gakoa beheko honekin bat datorren:",
     "Verification Requests": "Egiaztatze eskaerak",
     "Your account is not secure": "Zure kontua ez da segurua",
     "Your password": "Zure pasahitza",
     "This session, or the other session": "Saio hau, edo beste saioa",
     "The internet connection either session is using": "Saioetako batek darabilen internet konexioa",
     "We recommend you change your password and recovery key in Settings immediately": "Pasahitza eta ezarpenetako berreskuratze gakoa berehala aldatzea aholkatzen dizugu",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Atzitu zure mezu seguruen historiala eta zeharkako sinatzerako identitatea beste saioak egiaztatzeko zure berreskuratze gakoa sartuz.",
     "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.": "Zure pasahitza aldatzeak zure saio guztietako muturretik-muturrerako zifratzerako gakoak berrezarriko ditu, eta aurretik zifratutako mezuen historiala ezin izango da irakurri. Ezarri gakoen babes-kopia edo esportatu zure geletako gakoak beste saio batetik pasahitza aldatu aurretik.",
     "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.": "Saio guztiak amaitu dituzu eta ez duzu push jakinarazpenik jasoko. Jakinarazpenak berriro aktibatzeko, hasi saioa gailuetan.",
     "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.": "Berreskuratu zure kontura sarbidea eta saio honetan gordetako zifratze gakoak. Horiek gabe, ezin izango dituzu zure mezu seguruak beste saioetan irakurri.",
     "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.": "Abisua: Zure datu pertsonalak (zure zifratze gakoak barne) saio honetan daude oraindik. Garbitu ezazu saio hau erabiltzen bukatu duzunean, edo beste kontu batekin saioa hasi nahi duzunean.",
     "Restore your key backup to upgrade your encryption": "Berreskuratu zure gakoen babes-kopia zure zifratzea eguneratzeko",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Eguneratu saio hau beste saioak egiaztatu ahal ditzan, zifratutako mezuetara sarbidea emanez eta beste erabiltzaileei fidagarri gisa agertu daitezen.",
-    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Ezarri zifratzea saio honetan beste saioak egiaztatu ahal ditzan, zifratutako mezuetara sarbidea emanez eta beste erabiltzaileei fidagarri gisa agertu daitezen.",
     "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.": "Mezuen berreskuratze segurua ezartzen ez baduzu, ezin izango duzu zifratutako mezuen historiala berreskuratu saioa amaitzen baduzu edo beste saio bat erabiltzen baduzu.",
     "Create key backup": "Sortu gakoen babes-kopia",
     "This session is encrypting history using the new recovery method.": "Saio honek historiala zifratzen du berreskuratze metodo berria erabiliz.",
@@ -2162,21 +1956,16 @@
     "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.": "Nahi gabe egin baduzu hau, Mezu seguruak ezarri ditzakezu saio honetan eta saioaren mezuen historiala berriro zifratuko da berreskuratze metodo berriarekin.",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Desgaituz gero, zifratutako geletako mezuak ez dira bilaketen emaitzetan agertuko.",
     "Disable": "Desgaitu",
-    "Not currently downloading messages for any room.": "Orain ez da inolako gelatik mezurik deskargatzen ari.",
-    "Downloading mesages for %(currentRoom)s.": "%(currentRoom)s gelako mezuak deskargatzen.",
-    "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot-ek zifratutako mezuak cache lokalean gordetzen ditu modu seguruan bilaketen emaitzen ager daitezen:",
+    "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s-ek zifratutako mezuak cache lokalean gordetzen ditu modu seguruan bilaketen emaitzen ager daitezen:",
     "Space used:": "Erabilitako espazioa:",
     "Indexed messages:": "Indexatutako mezuak:",
     "Indexed rooms:": "Indexatutako gelak:",
-    "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s / %(totalRooms)s",
     "Message downloading sleep time(ms)": "Mezuen deskargaren itxarote tartea (ms)",
     "Displays information about a user": "Erabiltzaileari buruzko informazioa erakusten du",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Matrix-ekin lotutako segurtasun arazo baten berri emateko, irakurri <a>Segurtasun ezagutarazte gidalerroak</a>.",
     "Mark all as read": "Markatu denak irakurrita gisa",
     "Not currently indexing messages for any room.": "Orain ez da inolako gelako mezurik indexatzen.",
-    "Currently indexing: %(currentRoom)s.": "Orain indexatzen: %(currentRoom)s.",
     "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s / %(totalRooms)s",
-    "Review Sessions": "Berrikusi saioak",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s erabiltzaileak gelaren izena aldatu du%(oldRoomName)s izatetik %(newRoomName)s izatera.",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s erabiltzaileak %(addresses)s ordezko helbideak gehitu dizkio gela honi.",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s erabiltzaileak %(addresses)s helbideak gehitu dizkio gela honi.",
@@ -2193,7 +1982,6 @@
     "Add theme": "Gehitu azala",
     "Scroll to most recent messages": "Korritu azken mezuetara",
     "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Errore bat gertatu da gelaren ordezko helbideak eguneratzean. Agian zerbitzariak ez du onartzen edo une bateko akatsa izan da.",
-    "You don't have permission to delete the alias.": "Ez duzu ezizena ezabatzeko baimenik.",
     "Local address": "Helbide lokala",
     "Published Addresses": "Argitaratutako helbideak",
     "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.": "Argitaratutako helbideak edonork erabili ditzake edozein zerbitzaritik zure gelara elkartzeko. Helbide bat argitaratzeko aurretik helbide lokal gisa ezarri behar da.",
@@ -2216,9 +2004,6 @@
     "Add a new server...": "Gehitu zerbitzari berria...",
     "%(networkName)s rooms": "%(networkName)s(e)ko gelak",
     "Matrix rooms": "Matrix gelak",
-    "Open an existing session & use it to verify this one, granting it access to encrypted messages.": "Ireki badagoen saio bat eta erabili hura hau egiaztatzeko, mezu zifratuetara sarbidea emanez.",
-    "Waiting…": "Itxaroten…",
-    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "Ezin baduzu bat atzitu, <button>erabili berreskuratze gakoa edo pasahitza.</button>",
     "Manually Verify by Text": "Egiaztatu eskuz testu bidez",
     "Interactively verify by Emoji": "Egiaztatu interaktiboki Emoji bidez",
     "Keyboard Shortcuts": "Teklatu lasterbideak",
@@ -2227,10 +2012,9 @@
     "a new cross-signing key signature": "zeharkako sinatze gako sinadura berria",
     "a device cross-signing signature": "gailuz zeharkako sinadura berria",
     "a key signature": "gako sinadura",
-    "Riot encountered an error during upload of:": "Riotek errorea aurkitu du hau igotzean:",
+    "%(brand)s encountered an error during upload of:": "%(brand)sek errorea aurkitu du hau igotzean:",
     "Upload completed": "Igoera burututa",
     "Cancelled signature upload": "Sinadura igoera ezeztatuta",
-    "Unabled to upload": "Ezin izan da igo",
     "Signature upload success": "Sinaduren igoera ongi burutu da",
     "Signature upload failed": "Sinaduren igoerak huts egin du",
     "Confirm by comparing the following with the User Settings in your other session:": "Berretsi honako hau zure beste saioaren erabiltzaile-ezarpenetan agertzen denarekin alderatuz:",
@@ -2277,14 +2061,10 @@
     "Space": "Zuriune-barra",
     "End": "Amaiera",
     "Manually verify all remote sessions": "Egiaztatu eskuz urruneko saio guztiak",
-    "Update your secure storage": "Eguneratu zure biltegi segurua",
     "Self signing private key:": "Norberak sinatutako gako pribatua:",
     "cached locally": "cache lokalean",
     "not found locally": "ez da lokalean aurkitu",
     "User signing private key:": "Erabiltzaileak sinatzeko gako pribatua:",
-    "Secret Storage key format:": "Biltegi sekretuaren gakoaren formatua:",
-    "outdated": "zaharkitua",
-    "up to date": "egunean",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Egiaztatu erabiltzaile baten saio bakoitza hau fidagarri gisa markatzeko, ez dira zeharka sinatutako gailuak fidagarritzat jotzen.",
     "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "Gela zifratuetan, zuon mezuak babestuta daude, zuk zeuk eta hartzaileak bakarrik duzue hauek deszifratzeko gako bakanak.",
     "Verify all users in a room to ensure it's secure.": "Egiaztatu gela bateko erabiltzaile guztiak segurua dela baieztatzeko.",
@@ -2292,7 +2072,6 @@
     "Verified": "Egiaztatuta",
     "Verification cancelled": "Egiaztaketa ezeztatuta",
     "Compare emoji": "Konparatu emojiak",
-    "Unverified login. Was this you?": "Egiaztatu gabeko saioa. Zu izan zara?",
     "Session backup key:": "Saioaren babes-kopia gakoa:",
     "Sends a message as html, without interpreting it as markdown": "Bidali mezua html gisa, markdown balitz aztertu gabe",
     "Sign in with SSO": "Hasi saioa SSO-rekin",
@@ -2350,17 +2129,12 @@
     "Could not find user in room": "Ezin izan da erabiltzailea gelan aurkitu",
     "Please supply a widget URL or embed code": "Eman trepetaren URLa edo txertatu kodea",
     "Send a bug report with logs": "Bidali akats txostena egunkariekin",
-    "Enable cross-signing to verify per-user instead of per-session": "Gaitu zeharkako sinadura erabiltzaileko edo saioko egiaztatzeko",
-    "Keep recovery passphrase in memory for this session": "Mantendu berreskuratze pasa-esaldia memorian saio honentzat",
     "Can't load this message": "Ezin izan da mezu hau kargatu",
     "Submit logs": "Bidali egunkariak",
     "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Oroigarria: Ez dugu zure nabigatzailearentzako euskarririk, ezin da zure esperientzia nolakoa izango den aurreikusi.",
     "Unable to upload": "Ezin izan da igo",
     "Verify other session": "Egiaztatu beste saioa",
     "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Ezin izan da biltegi sekretura sartu. Egiaztatu berreskuratze pasa-esaldi zuzena sartu duzula.",
-    "<b>Warning</b>: You should only do this on a trusted computer.": "<b>Abisua:</b>: Hau fidagarritzat jotzen duzun ordenagailu batetik egin beharko zenuke beti.",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Atzitu zure mezu seguruen historiala eta zeharkako sinatzerako identitatea beste saioak egiaztatzeko zure berreskuratze pasa-esaldia sartuz.",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Zure berreskuratze pasa-esaldia ahaztu baduzu <button1>berreskuratze-gakoa erabili</button1> dezakezu edo <button2>berreskuratze aukera berriak ezarri</button2> ditzakezu.",
     "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Ezin izan da babes-kopia deszifratu berreskuratze-gako honekin: egiaztatu berreskuratze-gako egokia sartu duzula.",
     "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Ezin izan da babes-kopia deszifratu berreskuratze pasa-esaldi honekin: egiaztatu berreskuratze berreskuratze pasa-esaldia ondo idatzi duzula.",
     "Verify this login": "Egiaztatu saio hau",
@@ -2368,22 +2142,156 @@
     "Signing In...": "Saioa hasten...",
     "If you've joined lots of rooms, this might take a while": "Gela askotara elkartu bazara, honek denbora behar lezake",
     "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Baieztatu zure identitatea saio hau zure beste saio batetik egiaztatuz, mezu zifratuetara sarbidea emanez.",
-    "This requires the latest Riot on your other devices:": "Honek zure beste gailuetan azken Riot bertsioa eskatzen du:",
+    "This requires the latest %(brand)s on your other devices:": "Honek zure beste gailuetan azken %(brand)s bertsioa eskatzen du:",
     "or another cross-signing capable Matrix client": "edo zeharkako sinadurarako gai den beste Matrix bezero bat",
-    "Use Recovery Passphrase or Key": "Erabili berreskuratze pasa-esaldia edo gakoa",
     "Great! This recovery passphrase looks strong enough.": "Bikain! Berreskuratze pasa-esaldi hau sendoa dirudi.",
-    "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:": "Ezarri berreskuratze pasa-esaldia zifratutako informazioa babesteko eta, saioa amaitzekotan, berreskuratzeko. Hau ez luke zure kontuaren pasahitzaren berdina izan behar:",
     "Enter a recovery passphrase": "Sartu berreskuratze pasa-esaldia",
-    "Back up encrypted message keys": "Egin zifratutako mezuen gakoen babes-kopia",
     "Enter your recovery passphrase a second time to confirm it.": "Sartu zure berreskuratze pasa-esaldia berriro baieztatzeko.",
     "Confirm your recovery passphrase": "Berretsi berreskuratze pasa-esaldia",
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Zure berreskuratze-gakoa badaezpadakoa da, pasa-esaldia ahazten baduzu zure zifratutako mezuak berreskuratzeko erabili dezakezu.",
     "Unable to query secret storage status": "Ezin izan da biltegi sekretuaren egoera kontsultatu",
-    "Confirm recovery passphrase": "Berretsi berreskuratze pasa-esaldia",
     "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Zure gakoen kopia zifratu bat gordeko dugu gure zerbitzarian. Babestu zure babes-kopia berreskuratze pasa-esaldi batekin.",
-    "Enter a recovery passphrase...": "Sartu berreskuratze pasa-esaldia...",
     "Please enter your recovery passphrase a second time to confirm.": "Sartu zure berreskuratze pasa-esaldia berriro baieztatzeko.",
     "Repeat your recovery passphrase...": "Errepikatu zure berreskuratze pasa-esaldia...",
     "Secure your backup with a recovery passphrase": "Babestu zure babeskopia berreskuratze pasa-esaldi batekin",
-    "Currently indexing: %(currentRoom)s": "Orain indexatzen: %(currentRoom)s"
+    "Currently indexing: %(currentRoom)s": "Orain indexatzen: %(currentRoom)s",
+    "Review where you’re logged in": "Berrikusi non hasi duzun saioa",
+    "New login. Was this you?": "Saio berria. Zu izan zara?",
+    "Opens chat with the given user": "Erabiltzailearekin txata irekitzen du",
+    "Sends a message to the given user": "Erabiltzaileari mezua bidaltzen dio",
+    "You signed in to a new session without verifying it:": "Saio berria hasi duzu hau egiaztatu gabe:",
+    "Verify your other session using one of the options below.": "Egiaztatu zure beste saioa beheko aukeretako batekin.",
+    "Font scaling": "Letren eskalatzea",
+    "Font size": "Letra-tamaina",
+    "IRC display name width": "IRC-ko pantaila izenaren zabalera",
+    "Waiting for your other session to verify…": "Zure beste saioak egiaztatu bitartean zain…",
+    "Verify all your sessions to ensure your account & messages are safe": "Egiaztatu zure saio guztiak kontua eta mezuak seguru daudela bermatzeko",
+    "Verify the new login accessing your account: %(name)s": "Egiaztatu zure kontuan hasitako saio berria: %(name)s",
+    "Size must be a number": "Tamaina zenbaki bat izan behar da",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "Letra tamaina pertsonalizatua %(min)s pt eta %(max)s pt bitartean egon behar du",
+    "Use between %(min)s pt and %(max)s pt": "Erabili %(min)s pt eta %(max)s pt bitarteko  balioa",
+    "Appearance": "Itxura",
+    "Where you’re logged in": "Non hasi duzun saioa",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Kudeatu azpiko saioen izenak eta hauek amaitu edo <a>egiaztatu zure erabiltzaile-profilean</a>.",
+    "Create room": "Sortu gela",
+    "You've successfully verified your device!": "Ongi egiaztatu duzu zure gailua!",
+    "Message deleted": "Mezu ezabatuta",
+    "Message deleted by %(name)s": "Mezua ezabatu du %(name)s erabiltzaileak",
+    "QR Code": "QR kodea",
+    "To continue, use Single Sign On to prove your identity.": "Jarraitzeko, erabili Single Sign On zure identitatea frogatzeko.",
+    "Confirm to continue": "Berretsi jarraitzeko",
+    "Click the button below to confirm your identity.": "Sakatu azpiko botoia zure identitatea frogatzeko.",
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Gonbidatu norbait bere izena, erabiltzaile izena (esaterako <userId/>), e-mail helbidea erabiliz, edo <a>partekatu gela hau</a>.",
+    "Restoring keys from backup": "Gakoak babes-kopiatik berrezartzen",
+    "Fetching keys from server...": "Gakoak zerbitzaritik eskuratzen...",
+    "%(completed)s of %(total)s keys restored": "%(completed)s/%(total)s gako berreskuratuta",
+    "Keys restored": "Gakoak berreskuratuta",
+    "Successfully restored %(sessionCount)s keys": "%(sessionCount)s gako ongi berreskuratuta",
+    "Confirm encryption setup": "Berretsi zifratze ezarpena",
+    "Click the button below to confirm setting up encryption.": "Sakatu azpiko botoia zifratze-ezarpena berresteko.",
+    "Dismiss read marker and jump to bottom": "Baztertu irakurtze-marka eta jauzi beheraino",
+    "Jump to oldest unread message": "Jauzi irakurri gabeko mezu zaharrenera",
+    "Upload a file": "Igo fitxategia",
+    "Room name or address": "Gelaren izena edo helbidea",
+    "Joins room with given address": "Emandako helbidea duen gelara elkartzen da",
+    "Unrecognised room address:": "Gela helbide ezezaguna:",
+    "Help us improve %(brand)s": "Lagundu gaitzazu %(brand)s hobetzen",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Bidali <UsageDataLink>erabilera datu anonimoak</UsageDataLink> %(brand)s hobetzen laguntzeko. Honek <PolicyLink>cookie</PolicyLink> bat darabil.",
+    "I want to help": "Lagundu nahi dut",
+    "Your homeserver has exceeded its user limit.": "Zure hasiera-zerbitzariak erabiltzaile muga gainditu du.",
+    "Your homeserver has exceeded one of its resource limits.": "Zure hasiera-zerbitzariak bere baliabide mugetako bat gainditu du.",
+    "Contact your <a>server admin</a>.": "Jarri kontaktuan <a>zerbitzariaren administratzailearekin</a>.",
+    "Ok": "Ados",
+    "Set password": "Ezarri pasahitza",
+    "To return to your account in future you need to set a password": "Zure kontura etorkizunean itzultzeko pasahitza ezarri behar duzu",
+    "Restart": "Berrasi",
+    "Upgrade your %(brand)s": "Eguneratu zure %(brand)s",
+    "A new version of %(brand)s is available!": "%(brand)s bertsio berria eskuragarri dago!",
+    "New version available. <a>Update now.</a>": "Bertsio berri eskuragarri. <a>Eguneratu orain.</a>",
+    "Please verify the room ID or address and try again.": "Egiaztatu gelaren ID-a edo helbidea eta saiatu berriro.",
+    "Room ID or address of ban list": "Debeku zerrendaren gelaren IDa edo helbidea",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Zure zerbitzariko administratzaileak muturretik muturrerako zifratzea desgaitu du lehenetsita gela probatuetan eta mezu zuzenetan.",
+    "To link to this room, please add an address.": "Gela hau estekatzeko, gehitu helbide bat.",
+    "Emoji picker": "Emoji hautatzailea",
+    "No recently visited rooms": "Ez dago azkenaldian bisitatutako gelarik",
+    "People": "Jendea",
+    "Sort by": "Ordenatu honela",
+    "Activity": "Jarduera",
+    "A-Z": "A-Z",
+    "Unread rooms": "Irakurri gabeko gelak",
+    "Always show first": "Erakutsi lehenbizi",
+    "Show": "Erakutsi",
+    "Message preview": "Mezu-aurrebista",
+    "List options": "Zerrenda-aukerak",
+    "Show %(count)s more|other": "Erakutsi %(count)s gehiago",
+    "Show %(count)s more|one": "Erakutsi %(count)s gehiago",
+    "Leave Room": "Atera gelatik",
+    "Room options": "Gelaren aukerak",
+    "Error creating address": "Errorea helbidea sortzean",
+    "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "Errorea gertatu da helbidea sortzean. Agian ez du zerbitzariak onartzen edo behin behineko arazo bat egon da.",
+    "You don't have permission to delete the address.": "Ez duzu helbidea ezabatzeko baimenik.",
+    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Errorea gertatu da helbidea kentzean. Agian ez dago jada edo behin behineko arazo bat egon da.",
+    "Error removing address": "Errorea helbidea kentzean",
+    "Categories": "Kategoriak",
+    "Room address": "Gelaren helbidea",
+    "Please provide a room address": "Eman gelaren helbidea",
+    "This address is available to use": "Gelaren helbide hau erabilgarri dago",
+    "This address is already in use": "Gelaren helbide hau erabilita dago",
+    "Set a room address to easily share your room with other people.": "Ezarri gelaren helbide bat zure gela besteekin erraz partekatzeko.",
+    "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 bertsio berriago bat erabili duzu saio honekin. Berriro bertsio hau muturretik muturrerako zifratzearekin erabiltzeko, saioa amaitu eta berriro hasi beharko duzu.",
+    "Address (optional)": "Helbidea (aukerakoa)",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "Ezabatu %(alias)s gelaren helbidea eta kendu %(name)s direktoriotik?",
+    "delete the address.": "ezabatu helbidea.",
+    "Switch to light mode": "Aldatu modu argira",
+    "Switch to dark mode": "Aldatu modu ilunera",
+    "Switch theme": "Aldatu azala",
+    "Security & privacy": "Segurtasuna eta pribatutasuna",
+    "All settings": "Ezarpen guztiak",
+    "Feedback": "Iruzkinak",
+    "Use a different passphrase?": "Erabili pasa-esaldi desberdin bat?",
+    "We’re excited to announce Riot is now Element": "Pozik jakinarazten dizugu: Riot orain Element deitzen da",
+    "Riot is now Element!": "Riot orain Element da!",
+    "Learn More": "Ikasi gehiago",
+    "Light": "Argia",
+    "The person who invited you already left the room.": "Gonbidatu zaituen pertsonak dagoeneko gela utzi du.",
+    "The person who invited you already left the room, or their server is offline.": "Gonbidatu zaituen pertsonak dagoeneko gela utzi du edo bere zerbitzaria lineaz kanpo dago.",
+    "You joined the call": "Deira batu zara",
+    "%(senderName)s joined the call": "%(senderName)s deira batu da",
+    "You left the call": "Deitik atera zara",
+    "%(senderName)s left the call": "%(senderName)s(e) deitik atera da",
+    "Call ended": "Deia amaitu da",
+    "You started a call": "Dei bat hasi duzu",
+    "%(senderName)s started a call": "%(senderName)s(e)k dei bat hasi du",
+    "%(senderName)s is calling": "%(senderName)s deitzen ari da",
+    "%(brand)s Web": "%(brand)s web",
+    "%(brand)s Desktop": "%(brand)s Desktop",
+    "%(brand)s iOS": "%(brand)s iOS",
+    "%(brand)s X for Android": "%(brand)s X for Android",
+    "Change notification settings": "Aldatu jakinarazpenen ezarpenak",
+    "Use custom size": "Erabili tamaina pertsonalizatua",
+    "Use a more compact ‘Modern’ layout": "Erabili mezuen antolaketa 'Modernoa', konpaktuagoa da",
+    "Use a system font": "Erabili sistemako letra-tipoa",
+    "System font name": "Sistemaren letra-tipoaren izena",
+    "Unknown caller": "Dei-egile ezezaguna",
+    "Incoming voice call": "Sarrerako ahots-deia",
+    "Incoming video call": "Sarrerako bideo-deia",
+    "Incoming call": "Sarrerako deia",
+    "Hey you. You're the best!": "Aupa txo. Onena zara!",
+    "Message layout": "Mezuen antolaketa",
+    "Compact": "Konpaktua",
+    "Modern": "Modernoa",
+    "Use default": "Erabili lehenetsia",
+    "Notification options": "Jakinarazpen ezarpenak",
+    "Forget Room": "Ahaztu gela",
+    "This room is public": "Gela hau publikoa da",
+    "Away": "Kanpoan",
+    "Click to view edits": "Klik egin edizioak ikusteko",
+    "Go to Element": "Joan Elementera",
+    "Learn more at <a>element.io/previously-riot</a>": "Ikasi gehiago <a>element.io/previously-riot</a> orrian",
+    "The server is offline.": "Zerbitzaria lineaz kanpo dago.",
+    "The server has denied your request.": "Zerbitzariak zure eskariari uko egin dio.",
+    "Wrong file type": "Okerreko fitxategi-mota",
+    "Looks good!": "Itxura ona du!",
+    "Search rooms": "Bilatu gelak",
+    "User menu": "Erabiltzailea-menua"
 }
diff --git a/src/i18n/strings/fa.json b/src/i18n/strings/fa.json
index badb785132..6dd523cec6 100644
--- a/src/i18n/strings/fa.json
+++ b/src/i18n/strings/fa.json
@@ -1,7 +1,6 @@
 {
     "Fetching third party location failed": "تطبیق اطلاعات از منابع‌ دسته سوم با شکست مواجه شد",
     "Messages in one-to-one chats": "پیام‌های درون چت‌های یک‌به‌یک",
-    "A new version of Riot is available.": "نسخه‌ی جدید از رایوت موجود است.",
     "Advanced notification settings": "تنظیمات پیشرفته برای آگاه‌سازی‌ها",
     "Uploading report": "در حال بارگذاری گزارش",
     "Sunday": "یکشنبه",
@@ -11,11 +10,11 @@
     "Failed to set direct chat tag": "تنظیم تگ برای چت مستقیم موفقیت‌آمیز نبود",
     "Today": "امروز",
     "Files": "فایل‌ها",
-    "You are not receiving desktop notifications": "شما آگاه‌سازی‌های دسکتاپ را دریافت نمی‌کنید",
+    "You are not receiving desktop notifications": "آگاهی‌های میزکار را دریافت نمی‌کنید",
     "Friday": "آدینه",
-    "Update": "به‌روزرسانی",
-    "Notifications": "آگاه‌سازی‌ها",
-    "What's New": "تازه‌ها",
+    "Update": "به‌روز رسانی",
+    "Notifications": "آگاهی‌ها",
+    "What's New": "چه خبر",
     "On": "روشن",
     "Changelog": "تغییراتِ به‌وجودآمده",
     "Waiting for response from server": "در انتظار پاسخی از سمت سرور",
@@ -23,8 +22,6 @@
     "OK": "باشه",
     "All notifications are currently disabled for all targets.": "همه‌ی آگاه‌سازی‌ها برای تمام هدف‌ها غیرفعال‌اند.",
     "Operation failed": "عملیات شکست خورد",
-    "delete the alias.": "نام مستعار را پاک کن.",
-    "To return to your account in future you need to <u>set a password</u>": "برای بازگشتِ دوباره به اکانتان در آینده نیاز به <u> ثبت یک پسورد </u> دارید",
     "Forget": "فراموش کن",
     "World readable": "خواندن جهانی",
     "Mute": "سکوت",
@@ -51,7 +48,6 @@
     "No update available.": "هیچ به روزرسانی جدیدی موجود نیست.",
     "Noisy": "پرسروصدا",
     "Collecting app version information": "درحال جمع‌آوری اطلاعات نسخه‌ی برنامه",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "آیا مطمئنید که می‌خواهید نام مستعار گپ %(alias)s را پاک و  %(name)s را از فهرست حذف کنید؟",
     "Cancel": "لغو",
     "Enable notifications for this account": "آگاه سازی با رایانامه را برای این اکانت فعال کن",
     "Messages containing <span>keywords</span>": "پیا‌م‌های دارای <span> این کلیدواژه‌ها </span>",
@@ -60,7 +56,6 @@
     "Enter keywords separated by a comma:": "کلیدواژه‌ها را وارد کنید؛ از کاما(,) برای جدا کردن آنها از یکدیگر استفاده کنید:",
     "Forward Message": "هدایت پیام",
     "Remove %(name)s from the directory?": "آیا مطمئنید می‌خواهید %(name)s را از فهرست گپ‌ها حذف کنید؟",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "رایوت از بسیاری از ویژگی‌های پیشرفته در مروگرها استفاده می‌کند، برخی از این ویژگی‌ها در مرورگر کنونی شما موجود نیستند و یا در حالت آزمایشی قرار دارند.",
     "Unnamed room": "گپ نام‌گذاری نشده",
     "Dismiss": "نادیده بگیر",
     "Remove from Directory": "از فهرستِ گپ‌ها حذف کن",
@@ -72,7 +67,7 @@
     "Failed to set Direct Message status of room": "تنظیم حالت پیام مستقیم برای گپ موفقیت‌آمیز نبود",
     "Monday": "دوشنبه",
     "All messages (noisy)": "همه‌ی پیام‌ها(بلند)",
-    "Enable them now": "همین حالا فعالشان کن",
+    "Enable them now": "اکنون به کار بیفتند",
     "Collecting logs": "درحال جمع‌آوری گزارش‌ها",
     "Search": "جستجو",
     "(HTTP status %(httpStatus)s)": "(HTTP وضعیت %(httpStatus)s)",
@@ -87,7 +82,7 @@
     "Call invitation": "دعوت به تماس",
     "Messages containing my display name": "پیام‌های حاوی نمای‌نامِ من",
     "You have successfully set a password and an email address!": "تخصیص ایمیل و پسوردتان با موفقیت انجام شد!",
-    "What's new?": "تازه‌ها",
+    "What's new?": "چه خبر؟",
     "Notify me for anything else": "مرا برای هرچیز دیگری باخبر کن",
     "When I'm invited to a room": "وقتی من به گپی دعوت میشوم",
     "Close": "بستن",
@@ -100,8 +95,6 @@
     "Search…": "جستجو…",
     "Unhide Preview": "پیش‌نمایش را نمایان کن",
     "Unable to join network": "خطا در ورود به شبکه",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "ممکن است شما این تنظیمات را در کارخواهی به جز رایوت اعمال کرده باشید. شما نمی‌توانید انها را تغییر دهید اما آنها همچنان تاثیر خود را دارند",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "متاسفانه مرورگر شما <b>نمی‌تواند</b> رایوت را اجرا کند.",
     "Uploaded on %(date)s by %(user)s": "آپلود شده در تاریخ %(date)s توسط %(user)s",
     "Messages in group chats": "پیام‌های درون چت‌های گروهی",
     "Yesterday": "دیروز",
@@ -109,10 +102,9 @@
     "Keywords": "کلیدواژه‌ها",
     "Low Priority": "کم اهمیت",
     "Unable to fetch notification target list": "ناتوانی در تطبیق لیست آگاه‌سازی‌های هدف",
-    "Set Password": "پسوردتان را انتخاب کنید",
+    "Set Password": "تنظیم گذرواژه",
     "An error occurred whilst saving your email notification preferences.": "خطایی در حین ذخیره‌ی ترجیجات شما درباره‌ی رایانامه رخ داد.",
     "Off": "خاموش",
-    "Riot does not know how to join a room on this network": "رایوت از چگونگی ورود به یک گپ در این شبکه اطلاعی ندارد",
     "Mentions only": "فقط نام‌بردن‌ها",
     "Failed to remove tag %(tagName)s from room": "خطا در حذف کلیدواژه‌ی %(tagName)s از گپ",
     "Remove": "حذف کن",
@@ -127,7 +119,35 @@
     "Custom Server Options": "تنظیمات سفارشی برای سرور",
     "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...": "درحال بررسی به‌روزرسانی‌ها...",
-    "There are advanced notifications which are not shown here": "آگاه‌سازی‌های پیشرفته‌ای هستند که در اینجا نشان داده نشده‌اند",
     "This email address is already in use": "این آدرس ایمیل در حال حاضر در حال استفاده است",
-    "This phone number is already in use": "این شماره تلفن در حال استفاده است"
+    "This phone number is already in use": "این شماره تلفن در حال استفاده است",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "لطفا برای تجربه بهتر <chromeLink>کروم</chromeLink>، <firefoxLink>فایرفاکس</firefoxLink>، یا <safariLink>سافاری</safariLink> را نصب کنید.",
+    "Use Single Sign On to continue": "برای ادامه، از ورود یکپارچه استفاده کنید",
+    "Single Sign On": "ورود یکپارچه",
+    "Confirm adding email": "تأیید افزودن رایانامه",
+    "Confirm": "تأیید",
+    "Add Email Address": "افزودن نشانی رایانامه",
+    "Confirm adding phone number": "تأیید افزودن شماره تلفن",
+    "Add Phone Number": "افزودن شماره تلفن",
+    "The platform you're on": "بن‌سازه‌ای که رویش هستید",
+    "The version of %(brand)s": "نگارش %(brand)s",
+    "Your language of choice": "زبان انتخابیتان",
+    "I want to help": "می‌خواهم کمک کنم",
+    "No": "خیر",
+    "Review": "بازبینی",
+    "Later": "بعداً",
+    "Contact your <a>server admin</a>.": "تماس با <a>مدیر کارسازتان</a>.",
+    "Ok": "تأیید",
+    "Set password": "تنظیم گذرواژه",
+    "To return to your account in future you need to set a password": "برای بازگشت به حسابتان در آینده، نیاز به تنظیم یک گذرواژه دارید",
+    "Set up encryption": "برپایی رمزنگاری",
+    "Encryption upgrade available": "ارتقای رمزنگاری ممکن است",
+    "Verify this session": "تأیید این نشست",
+    "Set up": "برپایی",
+    "Upgrade": "ارتقا",
+    "Verify": "تأیید",
+    "Restart": "شروع دوباره",
+    "Upgrade your %(brand)s": "ارتقای %(brand)s تان",
+    "A new version of %(brand)s is available!": "نگارشی جدید از %(brand)s موجود است!",
+    "Guest": "مهمان"
 }
diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index c17a2e8c35..c6abfc0de7 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -28,15 +28,13 @@
     "No Microphones detected": "Mikrofonia ei löytynyt",
     "No Webcams detected": "Webkameraa ei löytynyt",
     "No media permissions": "Ei mediaoikeuksia",
-    "You may need to manually permit Riot to access your microphone/webcam": "Voit joutua antamaan Riotille 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/webkameran käyttöön",
     "Default Device": "Oletuslaite",
     "Microphone": "Mikrofoni",
     "Camera": "Kamera",
     "Advanced": "Edistynyt",
-    "Algorithm": "Algoritmi",
     "Always show message timestamps": "Näytä aina viestien aikaleimat",
     "Authentication": "Autentikointi",
-    "Alias (optional)": "Alias (valinnainen)",
     "%(items)s and %(lastItem)s": "%(items)s ja %(lastItem)s",
     "A new password must be entered.": "Sinun täytyy syöttää uusi salasana.",
     "%(senderName)s answered the call.": "%(senderName)s vastasi puheluun.",
@@ -72,7 +70,6 @@
     "Command error": "Komentovirhe",
     "Commands": "Komennot",
     "Confirm password": "Varmista salasana",
-    "Could not connect to the integration server": "Integraatiopalvelimeen yhdistäminen epäonnistui",
     "Create Room": "Luo huone",
     "Cryptography": "Salaus",
     "Current password": "Nykyinen salasana",
@@ -81,25 +78,16 @@
     "/ddg is not a command": "/ddg ei ole komento",
     "Deactivate Account": "Deaktivoi tili",
     "Decline": "Hylkää",
-    "Decryption error": "Virhe salauksen purkamisessa",
     "Default": "Oletus",
-    "Device ID": "Laitetunniste",
-    "device id: ": "laitetunniste: ",
-    "Direct chats": "Suorat keskustelut",
-    "Disable Notifications": "Ota ilmoitukset pois käytöstä",
     "Disinvite": "Peru kutsu",
     "Download %(text)s": "Lataa %(text)s",
     "Drop File Here": "Pudota tiedosto tähän",
-    "Ed25519 fingerprint": "Ed25519-sormenjälki",
     "Edit": "Muokkaa",
     "Email": "Sähköposti",
     "Email address": "Sähköpostiosoite",
     "Emoji": "Emoji",
-    "Enable Notifications": "Ota ilmoitukset käyttöön",
-    "End-to-end encryption information": "Osapuolten välisen salauksen tiedot",
     "Enter passphrase": "Syötä salalause",
     "Error decrypting attachment": "Virhe purettaessa liitteen salausta",
-    "Event information": "Tapahtumatiedot",
     "Export": "Vie",
     "Export E2E room keys": "Tallenna osapuolten välisen salauksen huoneavaimet",
     "Failed to ban user": "Porttikiellon antaminen epäonnistui",
@@ -114,7 +102,6 @@
     "Failed to send email": "Sähköpostin lähettäminen epäonnistui",
     "Failed to send request.": "Pyynnön lähettäminen epäonnistui.",
     "Failed to set display name": "Näyttönimen asettaminen epäonnistui",
-    "Failed to toggle moderator status": "Moderaattoriasetuksen muuttaminen epäonnistui",
     "Failed to unban": "Porttikiellon poistaminen epäonnistui",
     "Failed to upload profile picture!": "Profiilikuvan lataaminen 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ä",
@@ -140,16 +127,14 @@
     "Invites user with given id to current room": "Kutsuu tunnuksen mukaisen käyttäjän huoneeseen",
     "Sign in with": "Tunnistus",
     "Join Room": "Liity huoneeseen",
-    "Joins room with given alias": "Liittyy aliaksen mukaiseen huoneeseen",
     "Jump to first unread message.": "Hyppää ensimmäiseen lukemattomaan viestiin.",
     "Kick": "Poista huoneesta",
     "Kicks user with given id": "Poistaa tunnuksen mukaisen käyttäjän huoneesta",
     "Labs": "Laboratorio",
     "Last seen": "Viimeksi nähty",
     "Leave room": "Poistu huoneesta",
-    "Local addresses for this room:": "Tämän huoneen paikalliset osoitteet:",
     "Logout": "Kirjaudu ulos",
-    "Low priority": "Alhainen prioriteetti",
+    "Low priority": "Matala prioriteetti",
     "Manage Integrations": "Hallinnoi integraatioita",
     "Moderator": "Moderaattori",
     "Name": "Nimi",
@@ -160,7 +145,6 @@
     "<not supported>": "<ei tuettu>",
     "AM": "ap.",
     "PM": "ip.",
-    "NOT verified": "EI varmennettu",
     "No display name": "Ei näyttönimeä",
     "No more results": "Ei enempää tuloksia",
     "No results": "Ei tuloksia",
@@ -179,21 +163,18 @@
     "Reject invitation": "Hylkää kutsu",
     "Results from DuckDuckGo": "DuckDuckGo:n tulokset",
     "Return to login screen": "Palaa kirjautumissivulle",
-    "riot-web version:": "Riot-webin versio:",
+    "%(brand)s version:": "%(brand)s-webin versio:",
     "Room Colour": "Huoneen väri",
     "Rooms": "Huoneet",
     "Save": "Tallenna",
-    "Scroll to bottom of page": "Vieritä sivun loppuun",
     "Search failed": "Haku epäonnistui",
     "Searches DuckDuckGo for results": "Hakee DuckDuckGo:n avulla",
-    "Send anyway": "Lähetä silti",
     "Server error": "Palvelinvirhe",
     "Session ID": "Istuntotunniste",
     "Sign in": "Kirjaudu sisään",
     "Sign out": "Kirjaudu ulos",
     "%(count)s of your messages have not been sent.|other": "Osaa viesteistäsi ei ole lähetetty.",
     "Someone": "Joku",
-    "Start a chat": "Aloita keskustelu",
     "Submit": "Lähetä",
     "This email address is already in use": "Tämä sähköpostiosoite on jo käytössä",
     "This email address was not found": "Sähköpostiosoitetta ei löytynyt",
@@ -202,16 +183,11 @@
     "This room": "Tämä huone",
     "This room is not accessible by remote Matrix servers": "Tähän huoneeseen ei pääse ulkopuolisilta Matrix-palvelimilta",
     "Unban": "Poista porttikielto",
-    "unencrypted": "salaamaton",
     "unknown caller": "tuntematon soittaja",
-    "unknown device": "tuntematon laite",
-    "Unknown room %(roomId)s": "Tuntematon huone %(roomId)s",
     "Unmute": "Poista mykistys",
     "Unnamed Room": "Nimeämätön huone",
-    "Unrecognised room alias:": "Tuntematon huonealias:",
     "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",
-    "Blacklisted": "Estetyt",
     "%(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.",
@@ -221,7 +197,6 @@
     "Home": "Etusivu",
     "Invalid file%(extra)s": "Virheellinen tiedosto%(extra)s",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s kutsui käyttäjän %(targetName)s.",
-    "none": "Ei mikään",
     "No users have specific privileges in this room": "Kellään käyttäjällä ei ole erityisiä oikeuksia",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s pyysi VoIP-konferenssia.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s asetti näyttönimekseen %(displayName)s.",
@@ -230,8 +205,6 @@
     "This phone number is already in use": "Puhelinnumero on jo käytössä",
     "Username invalid: %(errMessage)s": "Käyttäjätunnus ei kelpaa: %(errMessage)s",
     "Users": "Käyttäjät",
-    "Verification": "Varmennus",
-    "verified": "varmennettu",
     "Verified key": "Varmennettu avain",
     "Video call": "Videopuhelu",
     "Voice call": "Äänipuhelu",
@@ -280,7 +253,7 @@
     "Start automatically after system login": "Käynnistä automaattisesti käyttöjärjestelmään kirjautumisen jälkeen",
     "Analytics": "Analytiikka",
     "Options": "Valinnat",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot kerää anonyymisti tilastoja jotta voimme parantaa ohjelmistoa.",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s kerää anonyymisti tilastoja jotta voimme parantaa ohjelmistoa.",
     "Passphrases must match": "Salasanojen on täsmättävä",
     "Passphrase must not be empty": "Salasana ei saa olla tyhjä",
     "Export room keys": "Vie huoneen avaimet",
@@ -294,10 +267,8 @@
     "Confirm Removal": "Varmista poistaminen",
     "Unknown error": "Tuntematon virhe",
     "Incorrect password": "Virheellinen salasana",
-    "I verify that the keys match": "Varmistin, että avaimet vastaavat toisiaan",
     "Unable to restore session": "Istunnon palautus epäonnistui",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s poisti huoneen nimen.",
-    "Curve25519 identity key": "Curve25519 tunnistusavain",
     "Decrypt %(text)s": "Pura %(text)s",
     "Displays action": "Näyttää toiminnan",
     "Error: Problem communicating with the given homeserver.": "Virhe: Ongelma yhteydenpidossa kotipalvelimeen.",
@@ -309,13 +280,10 @@
     "Publish this room to the public in %(domain)s's room directory?": "Julkaise tämä huone verkkotunnuksen %(domain)s huoneluettelossa?",
     "Missing room_id in request": "room_id puuttuu kyselystä",
     "Missing user_id in request": "user_id puuttuu kyselystä",
-    "New address (e.g. #foo:%(localDomain)s)": "Uusi osoite (esim. #foo:%(localDomain)s)",
-    "Revoke Moderator": "Poista moderaattorioikeudet",
     "%(targetName)s rejected the invitation.": "%(targetName)s hylkäsi kutsun.",
-    "Remote addresses for this room:": "Tämän huoneen etäosoitteet:",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s poisti näyttönimensä (%(oldDisplayName)s).",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riotilla ei ole oikeuksia lähettää sinulle ilmoituksia. Ole hyvä ja tarkista selaimen asetukset",
-    "Riot was not given permission to send notifications - please try again": "Riot ei saanut lupaa lähettää ilmoituksia - yritä uudelleen",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)silla ei ole oikeuksia lähettää sinulle ilmoituksia. Ole hyvä ja tarkista selaimen asetukset",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s ei saanut lupaa lähettää ilmoituksia - yritä uudelleen",
     "Room %(roomId)s not visible": "Huone %(roomId)s ei ole näkyvissä",
     "%(roomName)s does not exist.": "Huonetta %(roomName)s ei ole olemassa.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s ei ole saatavilla tällä hetkellä.",
@@ -339,8 +307,6 @@
     "Upload file": "Lataa tiedosto",
     "Upload new:": "Lataa uusi:",
     "Usage": "Käyttö",
-    "Use compact timeline layout": "Käytä tiivistä aikajanaa",
-    "User ID": "Käyttäjätunnus",
     "%(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",
     "Failed to change power level": "Oikeustason muuttaminen epäonnistui",
@@ -372,10 +338,7 @@
     "Oct": "loka",
     "Nov": "marras",
     "Dec": "joulu",
-    "To continue, please enter your password.": "Ole hyvä ja syötä salasanasi jatkaaksesi.",
     "Unknown Address": "Tuntematon osoite",
-    "Unverify": "Kumoa varmennus",
-    "Verify...": "Varmenna...",
     "ex. @bob:example.com": "esim. @erkki:esimerkki.com",
     "Add User": "Lisää käyttäjä",
     "Please enter the code it contains:": "Ole hyvä ja syötä sen sisältämä koodi:",
@@ -384,7 +347,6 @@
     "Error decrypting image": "Virhe purettaessa kuvan salausta",
     "Error decrypting video": "Virhe purettaessa videon salausta",
     "Add an Integration": "Lisää integraatio",
-    "Removed or unknown message type": "Poistettu tai tuntematon viestityyppi",
     "URL Previews": "URL-esikatselut",
     "Drop file here to upload": "Pudota tiedosto tähän ladataksesi sen palvelimelle",
     " (unsupported)": " (ei tuettu)",
@@ -395,15 +357,11 @@
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Tästä tulee tilisi nimi <span></span>-kotipalvelimella, tai voit valita <a>toisen palvelimen</a>.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Jos sinulla on jo Matrix-tili, voit <a>kirjautua</a>.",
     "Your browser does not support the required cryptography extensions": "Selaimesi ei tue vaadittuja kryptografisia laajennuksia",
-    "Not a valid Riot keyfile": "Ei kelvollinen Riot-avaintiedosto",
+    "Not a valid %(brand)s keyfile": "Ei kelvollinen %(brand)s-avaintiedosto",
     "Authentication check failed: incorrect password?": "Autentikointi epäonnistui: virheellinen salasana?",
     "Do you want to set an email address?": "Haluatko asettaa sähköpostiosoitteen?",
     "This will allow you to reset your password and receive notifications.": "Tämä sallii sinun uudelleenalustaa salasanasi ja vastaanottaa ilmoituksia.",
     "Skip": "Ohita",
-    "Start verification": "Aloita varmennus",
-    "Share without verifying": "Jaa ilman varmennusta",
-    "Ignore request": "Jätä pyyntö huomioimatta",
-    "Encryption key request": "Salausavainpyyntö",
     "Example": "Esimerkki",
     "Create": "Luo",
     "Failed to upload image": "Kuvan lataaminen epäonnistui",
@@ -421,9 +379,8 @@
     "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?",
-    "Show these rooms to non-members on the community page and room list?": "Näytetäänkö nämä huoneet ei-jäsenille yhteisön sivulla ja huonelistassa?",
+    "Show these rooms to non-members on the community page and room list?": "Näytetäänkö nämä huoneet ei-jäsenille yhteisön sivulla ja huoneluettelossa?",
     "Add rooms to the community": "Lisää huoneita tähän yhteisöön",
-    "Room name or alias": "Huoneen nimi tai alias",
     "Add to community": "Lisää yhteisöön",
     "Failed to invite the following users to %(groupId)s:": "Seuraavien käyttäjien kutsuminen ryhmään %(groupId)s epäonnistui:",
     "Failed to invite users to community": "Käyttäjien kutsuminen yhteisöön epäonnistui",
@@ -458,8 +415,6 @@
     "Jump to read receipt": "Hyppää lukukuittaukseen",
     "Mention": "Mainitse",
     "Invite": "Kutsu",
-    "User Options": "Käyttäjä-asetukset",
-    "Make Moderator": "Anna moderaattorioikeudet",
     "Admin Tools": "Ylläpitotyökalut",
     "Unpin Message": "Poista viestin kiinnitys",
     "Jump to message": "Hyppää viestiin",
@@ -484,8 +439,6 @@
     "%(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/>",
     "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?": "Sinut ohjataan kolmannen osapuolen sivustolle, jotta voit autentikoida tilisi käyttääksesi palvelua %(integrationsUrl)s. Haluatko jatkaa?",
-    "Message removed by %(userId)s": "Käyttäjän %(userId)s poistama viesti",
-    "Message removed": "Viesti poistettu",
     "An email has been sent to %(emailAddress)s": "Sähköpostia lähetetty osoitteeseen %(emailAddress)s",
     "Please check your email to continue registration.": "Ole hyvä ja tarkista sähköpostisi jatkaaksesi.",
     "A text message has been sent to %(msisdn)s": "Tekstiviesti lähetetty numeroon %(msisdn)s",
@@ -555,8 +508,6 @@
     "You're not currently a member of any communities.": "Et ole minkään yhteisön jäsen tällä hetkellä.",
     "Error whilst fetching joined communities": "Virhe ladatessa listaa yhteisöistä joihin olet liittynyt",
     "Create a new community": "Luo uusi yhteisö",
-    "Light theme": "Vaalea teema",
-    "Dark theme": "Tumma teema",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Viesti on lähetetty osoitteeseen %(emailAddress)s. Klikkaa alla sen jälkeen kun olet seurannut viestin sisältämää linkkiä.",
     "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:",
@@ -566,11 +517,6 @@
     "Notify the whole room": "Ilmoita koko huoneelle",
     "Room Notification": "Huoneilmoitus",
     "Call Failed": "Puhelu epäonnistui",
-    "Review Devices": "Näytä laitteet",
-    "Call Anyway": "Soita silti",
-    "Answer Anyway": "Vastaa silti",
-    "Call": "Soita",
-    "Answer": "Vastaa",
     "Call Timeout": "Puhelun aikakatkaisu",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s %(day)s. %(monthName)s %(time)s",
@@ -604,8 +550,6 @@
     "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",
-    "Unblacklist": "Poista estolistalta",
-    "Blacklist": "Estolista",
     "%(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",
@@ -663,7 +607,6 @@
     "Warning": "Varoitus",
     "Access Token:": "Pääsykoodi:",
     "Fetching third party location failed": "Kolmannen osapuolen paikan haku epäonnistui",
-    "A new version of Riot is available.": "Uusi Riot-versio on saatavilla.",
     "Send Account Data": "Lähetä tilin tiedot",
     "All notifications are currently disabled for all targets.": "Tällä hetkellä kaikki ilmoitukset on kytketty pois kaikilta kohteilta.",
     "Uploading report": "Ladataan raporttia",
@@ -682,8 +625,6 @@
     "Waiting for response from server": "Odotetaan vastausta palvelimelta",
     "Send Custom Event": "Lähetä mukautettu tapahtuma",
     "Advanced notification settings": "Lisäasetukset ilmoituksille",
-    "delete the alias.": "poista alias.",
-    "To return to your account in future you need to <u>set a password</u>": "Jotta voit jatkossa palata tilillesi, sinun pitää <u>asettaa salasana</u>",
     "Forget": "Unohda",
     "You cannot delete this image. (%(code)s)": "Et voi poistaa tätä kuvaa.  (%(code)s)",
     "Cancel Sending": "Peruuta lähetys",
@@ -707,7 +648,6 @@
     "No update available.": "Ei päivityksiä saatavilla.",
     "Resend": "Lähetä uudelleen",
     "Collecting app version information": "Haetaan sovelluksen versiotietoja",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Poista huonealias  %(alias)s ja poista %(name)s luettelosta?",
     "Keywords": "Avainsanat",
     "Enable notifications for this account": "Ota käyttöön ilmoitukset tälle tilille",
     "Invite to this community": "Kutsu tähän yhteisöön",
@@ -718,7 +658,7 @@
     "Search…": "Haku…",
     "You have successfully set a password and an email address!": "Olet asettanut salasanan ja sähköpostiosoitteen!",
     "Remove %(name)s from the directory?": "Poista %(name)s luettelosta?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot käyttää monia edistyneitä ominaisuuksia, joista osaa selaimesi ei tue tai ne ovat kokeellisia.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s käyttää monia edistyneitä ominaisuuksia, joista osaa selaimesi ei tue tai ne ovat kokeellisia.",
     "Developer Tools": "Kehittäjätyökalut",
     "Explore Account Data": "Tilitiedot",
     "All messages (noisy)": "Kaikki viestit (meluisa)",
@@ -760,8 +700,7 @@
     "Show message in desktop notification": "Näytä viestit ilmoituskeskuksessa",
     "Unhide Preview": "Näytä esikatselu",
     "Unable to join network": "Verkkoon liittyminen epäonnistui",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Olet saattanut muuttaa niitä muussa asiakasohjelmassa kuin Riotissa. Et voi muuttaa niitä Riotissa mutta ne pätevät silti",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Valitettavasti Riot <b>ei</b> toimi selaimessasi.",
+    "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",
     "Yesterday": "Eilen",
@@ -771,8 +710,8 @@
     "Set Password": "Aseta salasana",
     "An error occurred whilst saving your email notification preferences.": "Sähköposti-ilmoitusasetuksia tallettaessa tapahtui virhe.",
     "remove %(name)s from the directory.": "poista %(name)s luettelosta.",
-    "Off": "Pois päältä",
-    "Riot does not know how to join a room on this network": "Riot ei tiedä miten liittyä huoneeseen tässä verkossa",
+    "Off": "Ei päällä",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s ei tiedä miten liittyä huoneeseen tässä verkossa",
     "Mentions only": "Vain maininnat",
     "Failed to remove tag %(tagName)s from room": "Tagin %(tagName)s poistaminen huoneesta epäonnistui",
     "Wednesday": "Keskiviikko",
@@ -788,22 +727,18 @@
     "Thank you!": "Kiitos!",
     "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!": "Nykyisellä selaimellasi ohjelman ulkonäkö voi olla täysin virheellinen, ja jotkut tai kaikki ominaisuudet eivät vättämättä toimi. Voit jatkaa jos haluat kokeilla, mutta et voi odottaa saavasi apua mahdollisesti ilmeneviin ongelmiin!",
     "Checking for an update...": "Tarkistetaan päivityksen saatavuutta...",
-    "There are advanced notifications which are not shown here": "Tässä ei näytetä edistyneitä ilmoituksia",
     "Your language of choice": "Kielivalintasi",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Yksityisyydensuoja on meille tärkeää, joten emme kerää mitään henkilökohtaista tai yksilöivää tietoa analytiikkaamme varten.",
     "Send an encrypted reply…": "Lähetä salattu vastaus…",
-    "Send a reply (unencrypted)…": "Lähetä vastaus (salaamaton)…",
     "Send an encrypted message…": "Lähetä salattu viesti…",
-    "Send a message (unencrypted)…": "Lähetä viesti (salaamaton)…",
     "<a>In reply to</a> <pill>": "<a>Vastauksena käyttäjälle</a> <pill>",
     "This room is not public. You will not be able to rejoin without an invite.": "Tämä huone ei ole julkinen. Tarvitset kutsun liittyäksesi huoneeseen.",
     "%(count)s of your messages have not been sent.|one": "Viestiäsi ei lähetetty.",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s vaihtoi näyttönimekseen %(displayName)s.",
     "Learn more about how we use analytics.": "Lue lisää analytiikkakäytännöistämme.",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Täällä ei ole muita! Haluaisitko <inviteText>kutsua muita</inviteText> tai <nowarnText>poistaa varoituksen tyhjästä huoneesta</nowarnText>?",
-    "The version of Riot.im": "Riot.im:n versio",
+    "The version of %(brand)s": "%(brand)sin versio",
     "Your homeserver's URL": "Kotipalvelimesi osoite",
-    "Your identity server's URL": "Identiteettipalvelimesi osoite",
     "e.g. %(exampleValue)s": "esim. %(exampleValue)s",
     "Every page you use in the app": "Jokainen sivu, jota käytät sovelluksessa",
     "e.g. <CurrentPageURL>": "esim. <CurrentPageURL>",
@@ -817,10 +752,6 @@
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s päivitti tämän huoneen.",
     "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s salli vieraiden liittyvän huoneeseen.",
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s on estänyt vieraiden liittymisen huoneeseen.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s lisäsi osoitteet %(addedAddresses)s tähän huoneeseen.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s lisäsi osoitteen %(addedAddresses)s tälle huoneelle.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s poisti osoitteen %(removedAddresses)s tältä huoneelta.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s poisti osoitteet %(removedAddresses)s tältä huoneelta.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s asetti tälle huoneelle pääosoitteen %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s poisti tämän huoneen pääosoitteen.",
     "Please <a>contact your service administrator</a> to continue using the service.": "Ota yhteyttä <a>palvelun ylläpitäjään</a> jatkaaksesi palvelun käyttöä.",
@@ -830,7 +761,7 @@
     "Repeats like \"aaa\" are easy to guess": "Toistot, kuten ”aaa”, ovat helppoja arvata",
     "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Toistot, kuten ”abcabcabe” ovat vain hieman hankalampia arvata kuin ”abc”",
     "A word by itself is easy to guess": "Yksittäinen sana on helppo arvata",
-    "Please contact your homeserver administrator.": "Otathan yhteyttä kotipalvelimesi ylläpitäjään.",
+    "Please contact your homeserver administrator.": "Ota yhteyttä kotipalvelimesi ylläpitäjään.",
     "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",
@@ -903,8 +834,8 @@
     "Pin": "Nuppineula",
     "Call in Progress": "Puhelu meneillään",
     "General": "Yleiset",
-    "Security & Privacy": "Turvallisuus ja yksityisyys",
-    "Roles & Permissions": "Roolit ja käyttöoikeudet",
+    "Security & Privacy": "Tietoturva ja -suoja",
+    "Roles & Permissions": "Roolit ja oikeudet",
     "Room Name": "Huoneen nimi",
     "Room Topic": "Huoneen aihe",
     "Developer options": "Kehittäjävalinnat",
@@ -961,9 +892,6 @@
     "Retry": "Yritä uudelleen",
     "Success!": "Onnistui!",
     "Starting backup...": "Aloitetaan varmuuskopiointia...",
-    "Recovery key": "Palautusavain",
-    "Keep it safe": "Pidä se turvassa",
-    "Copy to clipboard": "Kopioi leikepöydälle",
     "Download": "Lataa",
     "Create account": "Luo tili",
     "Sign in with single sign-on": "Kirjaudu sisään käyttäen kertakirjautumista",
@@ -992,9 +920,7 @@
     "Share Message": "Jaa viesti",
     "Not a valid recovery key": "Ei kelvollinen palautusavain",
     "This looks like a valid recovery key!": "Tämä vaikuttaa kelvolliselta palautusavaimelta!",
-    "Enter Recovery Key": "Kirjoita palautusavain",
     "Next": "Seuraava",
-    "Backup Restored": "Varmuuskopio palautettu",
     "No backup found!": "Varmuuskopiota ei löytynyt!",
     "Unable to restore backup": "Varmuuskopion palauttaminen ei onnistu",
     "Link to selected message": "Linkitä valittuun viestiin",
@@ -1006,7 +932,7 @@
     "The room upgrade could not be completed": "Huoneen päivitystä ei voitu suorittaa",
     "Failed to upgrade room": "Huoneen päivittäminen epäonnistui",
     "Are you sure you want to sign out?": "Haluatko varmasti kirjautua ulos?",
-    "Updating Riot": "Päivitetään Riot",
+    "Updating %(brand)s": "Päivitetään %(brand)s",
     "To continue, please enter your password:": "Kirjoita salasanasi jatkaaksesi:",
     "Incompatible Database": "Yhteensopimaton tietokanta",
     "Failed to send logs: ": "Lokien lähettäminen epäonnistui: ",
@@ -1016,8 +942,6 @@
     "Invite anyway and never warn me again": "Kutsu silti, äläkä varoita minua enää uudelleen",
     "That doesn't look like a valid email address": "Tämä ei vaikuta kelvolliselta sähköpostiosoitteelta",
     "Join": "Liity",
-    "Yes, I want to help!": "Kyllä, haluan auttaa!",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Auta parantamaan Riot.im:ää lähettämällä <UsageDataLink>käyttötietoja anonyymisti</UsageDataLink>. Tässä hyödynnetään evästettä.",
     "Failed to load group members": "Ryhmän jäsenten lataaminen epäonnistui",
     "Click here to see older messages.": "Napsauta tästä nähdäksesi vanhemmat viestit.",
     "This room is a continuation of another conversation.": "Tämä huone on jatkumo toisesta keskustelusta.",
@@ -1035,36 +959,31 @@
     "Email Address": "Sähköpostiosoite",
     "Yes": "Kyllä",
     "No": "Ei",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Auta parantamaan Riot.im:ää lähettämällä <UsageDataLink>käyttötietoja anonyymisti</UsageDataLink>. Tämä vaatii toimiakseen evästeen (lue <PolicyLink>evästekäytäntö</PolicyLink>).",
     "Elephant": "Norsu",
     "Add an email address to configure email notifications": "Lisää sähköpostiosoite määrittääksesi sähköposti-ilmoitukset",
-    "Chat with Riot Bot": "Keskustele Riot-botin kanssa",
+    "Chat with %(brand)s Bot": "Keskustele %(brand)s-botin kanssa",
     "You'll lose access to your encrypted messages": "Menetät pääsyn salattuihin viesteihisi",
     "Create a new room with the same name, description and avatar": "luomme uuden huoneen samalla nimellä, kuvauksella ja kuvalla",
     "Update any local room aliases to point to the new room": "päivitämme kaikki huoneen aliakset osoittamaan uuteen huoneeseen",
     "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "estämme käyttäjiä puhumasta vanhassa huoneessa ja lähetämme viestin, joka ohjeistaa käyttäjiä siirtymään uuteen huoneeseen",
     "Put a link back to the old room at the start of the new room so people can see old messages": "pistämme linkin vanhaan huoneeseen uuden huoneen alkuun, jotta ihmiset voivat nähdä vanhat viestit",
     "We encountered an error trying to restore your previous session.": "Törmäsimme ongelmaan yrittäessämme palauttaa edellistä istuntoasi.",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Jos olet aikaisemmin käyttänyt uudempaa versiota Riotista, istuntosi voi olla epäyhteensopiva tämän version kanssa. Sulje tämä ikkuna ja yritä uudemman version kanssa.",
+    "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.": "Jos olet aikaisemmin käyttänyt uudempaa versiota %(brand)sista, istuntosi voi olla epäyhteensopiva tämän version kanssa. Sulje tämä ikkuna ja yritä uudemman version kanssa.",
     "The platform you're on": "Alusta, jolla olet",
     "Whether or not you're logged in (we don't record your username)": "Oletko kirjautunut vai et (emme tallenna käyttäjätunnustasi)",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Käytätkö muotoillun tekstin tilaa muotoilueditorissa vai et",
-    "Your User Agent": "Selaintunnisteesi",
-    "The information being sent to us to help make Riot.im better includes:": "Tietoihin, jotka lähetetään Riot.im:ään palvelun parantamiseksi, sisältyy:",
+    "The information being sent to us to help make %(brand)s better includes:": "Tietoihin, joita lähetetään %(brand)sin kehittäjille sovelluksen kehittämiseksi sisältyy:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Kohdissa, joissa tämä sivu sisältää yksilöivää tietoa, kuten huoneen, käyttäjän tai ryhmän tunnuksen, kyseinen tieto poistetaan ennen palvelimelle lähettämistä.",
     "A call is currently being placed!": "Puhelua ollaan aloittamassa!",
     "A call is already in progress!": "Puhelu on jo meneillään!",
     "Permission Required": "Lisäoikeuksia tarvitaan",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Tiedoston '%(fileName)s' koko ylittää tämän kotipalvelimen lähetettyjen tiedostojen ylärajan",
     "Unable to load! Check your network connectivity and try again.": "Lataaminen epäonnistui! Tarkista verkkoyhteytesi ja yritä uudelleen.",
-    "Registration Required": "Rekisteröityminen vaaditaan",
-    "You need to register to do this. Would you like to register now?": "Tämä toiminto edellyttää rekisteröitymistä. Haluaisitko rekisteröityä?",
     "Failed to invite users to the room:": "Käyttäjien kutsuminen huoneeseen epäonnistui:",
     "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s teki tästä huoneesta julkisesti luettavan linkin kautta.",
     "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s muutti huoneeseen pääsyn vaatimaan kutsun.",
     "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s vaihtoi liittymisen ehdoksi säännön %(rule)s",
     "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s vaihtoi vieraiden pääsyn tilaan %(rule)s",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s lisäsi osoitteet %(addedAddresses)s ja poisti osoitteet %(removedAddresses)s tältä huoneelta.",
     "%(displayName)s is typing …": "%(displayName)s kirjoittaa…",
     "%(names)s and %(count)s others are typing …|other": "%(names)s ja %(count)s muuta kirjoittavat…",
     "%(names)s and %(count)s others are typing …|one": "%(names)s ja yksi muu kirjoittavat…",
@@ -1123,12 +1042,11 @@
     "Verification code": "Varmennuskoodi",
     "Internal room ID:": "Sisäinen huoneen ID:",
     "Credits": "Maininnat",
-    "For help with using Riot, click <a>here</a>.": "Saadaksesi apua Riotin käyttämisessä, klikkaa <a>tästä</a>.",
-    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "Saadaksesi apua Riotin käytössä, klikkaa <a>tästä</a> tai aloita keskustelu bottimme kanssa alla olevasta painikkeesta.",
+    "For help with using %(brand)s, click <a>here</a>.": "Saadaksesi apua %(brand)sin käyttämisessä, klikkaa <a>tästä</a>.",
+    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "Saadaksesi apua %(brand)sin käytössä, klikkaa <a>tästä</a> tai aloita keskustelu bottimme kanssa alla olevasta painikkeesta.",
     "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)",
-    "To link to this room, please add an alias.": "Lisää alias linkittääksesi tähän huoneeseen.",
     "Ignored users": "Hiljennetyt käyttäjät",
     "Bulk options": "Massatoimintoasetukset",
     "Key backup": "Avainvarmuuskopio",
@@ -1147,7 +1065,6 @@
     "Show read receipts sent by other users": "Näytä muiden käyttäjien lukukuittaukset",
     "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Näytä muistutus suojatun viestien palautuksen käyttöönotosta salatuissa huoneissa",
     "Show avatars in user and room mentions": "Näytä profiilikuvat käyttäjä- ja huonemaininnoissa",
-    "Order rooms in the room list by most important first instead of most recent": "Järjestä huonelista tärkein ensin viimeisimmän sijasta",
     "Got It": "Ymmärretty",
     "Scissors": "Sakset",
     "Which officially provided instance you are using, if any": "Mitä virallisesti saatavilla olevaa instanssia käytät, jos mitään",
@@ -1175,16 +1092,9 @@
     "Add some now": "Lisää muutamia",
     "Error updating main address": "Pääosoitteen päivityksessä tapahtui virhe",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Huoneen pääosoitteen päivityksessä tapahtui virhe. Se ei välttämättä ole sallittua tällä palvelimella tai kyseessä on väliaikainen virhe.",
-    "Error creating alias": "Aliaksen luonnissa tapahtui virhe",
-    "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "Aliaksen luonnissa tapahtui virhe. Se ei välttämättä ole sallittua tällä palvelimella tai kyseessä on väliaikainen virhe.",
-    "Error removing alias": "Aliaksen poistossa tapahtui virhe",
-    "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "Aliaksen poistossa tapahtui virhe. Se ei välttämättä ole enää olemassa tai kyseessä on väliaikainen virhe.",
     "Error updating flair": "Tyylin päivittämisessä tapahtui virhe",
     "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.",
-    "Please <a>contact your service administrator</a> to get this limit increased.": "<a>Ota yhteyttä ylläpitäjääsi</a> tämän rajan kasvattamiseksi.",
-    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "Tämä kotipalvelin on saavuttanut kuukausittaisten aktiivisten käyttäjien rajansa, joten <b>osa käyttäjistä ei pysty kirjautumaan sisään</b>.",
-    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Tämä kotipalvelin on ylittänyt yhden resurssirajoistaan, joten <b>osa käyttäjistä ei pysty kirjautumaan sisään</b>.",
     "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",
     "Minimize apps": "Pienennä sovellukset",
@@ -1221,27 +1131,19 @@
     "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ä.",
-    "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 Riot to do this": "Jotta et menetä keskusteluhistoriaasi, sinun täytyy tallentaa huoneen avaimet ennen kuin kirjaudut ulos. Joudut käyttämään uudempaa Riotin versiota tätä varten",
-    "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ": "Olet aikaisemmin käyttänyt uudempaa Riotin versiota koneella %(host)s. Jotta voit käyttää tätä versiota osapuolten välisellä salauksella, sinun täytyy kirjautua ulos ja kirjautua takaisin sisää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)",
-    "Use Legacy Verification (for older clients)": "Käytä vanhentunutta varmennustapaa (vanhemmille asiakasohjelmille)",
-    "Verify by comparing a short text string.": "Varmenna vertaamalla lyhyttä merkkijonoa.",
-    "Begin Verifying": "Aloita varmentaminen",
-    "Waiting for partner to accept...": "Odotetaan, että toinen osapuoli hyväksyy...",
-    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Näytölle ei ilmesty mitään? Kaikki asiakasohjelmat eivät vielä tue interaktiivista varmentamista. <button>Käytä vanhentunutta varmennusta</button>.",
-    "Waiting for %(userId)s to confirm...": "Odotetaan, että %(userId)s hyväksyy...",
-    "Use two-way text verification": "Käytä kahdensuuntaista tekstivarmennusta",
     "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.",
     "Waiting for partner to confirm...": "Odotetaan, että toinen osapuoli varmistaa...",
     "Incoming Verification Request": "Saapuva varmennuspyyntö",
-    "You've previously used Riot 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, Riot needs to resync your account.": "Olet aikaisemmin käytttänyt Riotia 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ä, Riotin täytyy synkronoida tilisi tiedot uudelleen.",
-    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Jos sinulla on toinen Riotin versio edelleen auki toisessa välilehdessä, suljethan sen, koska Riotin käyttäminen samalla laitteella niin, että laiska lataus on toisessa välilehdessä käytössä ja toisessa ei, aiheuttaa ongelmia.",
+    "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.",
+    "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.": "Jos sinulla on toinen %(brand)sin versio edelleen auki toisessa välilehdessä, suljethan sen, koska %(brand)sin käyttäminen samalla laitteella niin, että laiska lataus on toisessa välilehdessä käytössä ja toisessa ei, aiheuttaa ongelmia.",
     "Incompatible local cache": "Yhteensopimaton paikallinen välimuisti",
     "Clear cache and resync": "Tyhjennä välimuisti ja hae tiedot uudelleen",
-    "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Riot käyttää nyt 3-5 kertaa vähemmän muistia, koska se lataa tietoa muista käyttäjistä vain tarvittaessa. Odotathan, kun haemme tarvittavat tiedot palvelimelta!",
+    "%(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 käyttää nyt 3-5 kertaa vähemmän muistia, koska se lataa tietoa muista käyttäjistä vain tarvittaessa. Odotathan, kun haemme tarvittavat tiedot palvelimelta!",
     "I don't want my encrypted messages": "En halua salattuja viestejäni",
     "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.": "Välttääksesi saman ongelman ilmoittamista kahdesti, <existingIssuesLink>katso ensin olemassaolevat issuet</existingIssuesLink> (ja lisää +1, mikäli löydät issuen joka koskee sinuakin) tai <newIssueLink>luo uusi issue</newIssueLink> mikäli et löydä ongelmaasi.",
     "Room Settings - %(roomName)s": "Huoneen asetukset — %(roomName)s",
@@ -1250,20 +1152,13 @@
     "A username can only contain lower case letters, numbers and '=_-./'": "Käyttäjätunnus voi sisältää vain pieniä kirjaimia, numeroita ja merkkejä ”=_-./”",
     "COPY": "Kopioi",
     "Unable to load backup status": "Varmuuskopioinnin tilan lataaminen epäonnistui",
-    "Recovery Key Mismatch": "Palautusavaimet eivät täsmää",
-    "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "Varmuuskopiota ei voitu purkaa tällä avaimella. Tarkastathan, että syötit oikean palautusavaimen.",
-    "Incorrect Recovery Passphrase": "Väärä palautuksen salalause",
-    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "Varmuuskopiota ei voitu purkaa tällä salalauseella. Tarkastathan, että syötit oikean palautuksen salalauseen.",
     "Failed to decrypt %(failedCount)s sessions!": "%(failedCount)s istunnon purkaminen epäonnistui!",
-    "Restored %(sessionCount)s session keys": "%(sessionCount)s istunnon avainta palautettu",
-    "Enter Recovery Passphrase": "Syötä palautuksen salalause",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Varoitus</b>: sinun pitäisi ottaa avainvarmuuskopio käyttöön vain luotetulla tietokoneella.",
     "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Pääse turvattuun viestihistoriaasi ja ota käyttöön turvallinen viestintä syöttämällä palautuksen salalauseesi.",
     "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Jos olet unohtanut palautuksen salalauseesi, voit <button1>käyttää palautusavaintasi</button1> tai <button2>ottaa käyttöön uuden palautustavan</button2>",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Pääse turvattuun viestihistoriaasi ja ota käyttöön turvallinen viestintä syöttämällä palautusavaimesi.",
     "Share Permalink": "Jaa ikilinkki",
     "Collapse Reply Thread": "Supista vastaussäie",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "Voit käyttää mukautettuja palvelinasetuksia kirjautuaksesi toiselle Matrix-palvelimelle. Tämä sallii tämän sovelluksen käytön toisella kotipalvelimella olevalla Matrix-tilillä.",
     "Please review and accept all of the homeserver's policies": "Tarkistathan tämän kotipalvelimen käytännöt",
     "Please review and accept the policies of this homeserver:": "Tarkistathan tämän kotipalvelimen käytännöt:",
     "Code": "Koodi",
@@ -1282,7 +1177,7 @@
     "Premium hosting for organisations <a>Learn more</a>": "Premium-ylläpitoa organisaatioille. <a>Lue lisää</a>",
     "Other": "Muut",
     "Find other public servers or use a custom server": "Etsi muita julkisia palvelimia tai käytä mukautettua palvelinta",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Parhaan käyttökokemuksen saa <chromeLink>Chromella</chromeLink>, <firefoxLink>Firefoxilla</firefoxLink> tai <safariLink>Safarilla</safariLink>.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Asenna <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> tai <safariLink>Safari</safariLink>, jotta kaikki toimii parhaiten.",
     "<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-kuvaus yhteisösi etusivulle</h1>\n<p>\n    Käytä pitkää kuvausta esitelläksesi yhteisöäsi uusille jäsenille tai jakaaksesi tärkeitä\n    <a href=\"foo\">linkkejä</a>\n</p>\n<p>\n    Voit jopa käyttää 'img'-tageja\n</p>\n",
     "Unable to join community": "Yhteisöön liittyminen epäonnistui",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Olet tämän yhteisön ylläpitäjä. Et voi liittyä uudelleen ilman kutsua toiselta ylläpitäjältä.",
@@ -1294,7 +1189,7 @@
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Tämä huone on kotipalvelimen tärkeille viesteille, joten ei voi poistua siitä.",
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Jatkaaksesi kotipalvelimen %(homeserverDomain)s käyttöä, sinun täytyy lukea ja hyväksyä käyttöehtomme.",
     "Review terms and conditions": "Lue käyttöehdot",
-    "Did you know: you can use communities to filter your Riot.im experience!": "Tiesitkö: voit käyttää yhteisöjä suodattaaksesi Riot.im-kokemustasi!",
+    "Did you know: you can use communities to filter your %(brand)s experience!": "Tiesitkö: voit käyttää yhteisöjä suodattaaksesi %(brand)s-kokemustasi!",
     "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.": "Asettaaksesi suodattimen, vedä yhteisön kuva vasemmalla olevan suodatinpaneelin päälle. Voit klikata suodatinpaneelissa olevaa yhteisön kuvaa, jotta näet vain huoneet ja henkilöt, jotka liittyvät kyseiseen yhteisöön.",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Et voi lähettää viestejä ennen kuin luet ja hyväksyt <consentLink>käyttöehtomme</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.": "Viestiäsi ei lähetetty, koska tämä kotipalvelin on saavuttanut kuukausittaisten aktiivisten käyttäjien rajan. <a>Ota yhteyttä palvelun ylläpitäjään</a> jatkaaksesi palvelun käyttämistä.",
@@ -1309,15 +1204,11 @@
     "Registration has been disabled on this homeserver.": "Rekisteröityminen on poistettu käytöstä tällä kotipalvelimella.",
     "Unable to query for supported registration methods.": "Tuettuja rekisteröitymistapoja ei voitu kysellä.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Viety tiedosto suojataan salasanalla. Syötä salasana tähän purkaaksesi tiedoston salauksen.",
-    "Great! This passphrase looks strong enough.": "Mahtavaa! Salasana näyttää tarpeeksi vahvalta.",
     "Keep going...": "Jatka...",
-    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "Tallennamme salatun kopion avaimistasi palvelimellemme. Suojaa varmuuskopio salasanalla.",
     "For maximum security, this should be different from your account password.": "Parhaan turvallisuuden takaamiseksi tämän tulisi olla eri kuin tilisi salasana.",
-    "Enter a passphrase...": "Syötä salasana...",
     "That matches!": "Täsmää!",
     "That doesn't match.": "Ei täsmää.",
     "Go back to set it again.": "Palaa asettamaan se uudelleen.",
-    "Repeat your passphrase...": "Toista salasana...",
     "<b>Print it</b> and store it somewhere safe": "<b>Tulosta se</b> ja säilytä sitä turvallisessa paikassa",
     "<b>Save it</b> on a USB key or backup drive": "<b>Tallenna se</b> muistitikulle tai varmuuskopiolevylle",
     "<b>Copy it</b> to your personal cloud storage": "<b>Kopioi se</b> henkilökohtaiseen pilvitallennustilaasi",
@@ -1341,9 +1232,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.": "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 Riot 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 Riotin 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.",
-    "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot epäonnistui protokollalistan hakemisessa kotipalvelimelta. Kotipalvelin saattaa olla liian vanha tukeakseen kolmannen osapuolen verkkoja.",
-    "Riot failed to get the public room list.": "Riot epäonnistui julkisen huonelistan haussa.",
+    "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.",
+    "%(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.",
     "You have %(count)s unread notifications in a prior version of this room.|other": "Sinulla on %(count)s lukematonta ilmoitusta huoneen edellisessä versiossa.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Sinulla on %(count)s lukematon ilmoitus huoneen edellisessä versiossa.",
@@ -1354,17 +1245,7 @@
     "Invalid identity server discovery response": "Epäkelpo identiteettipalvelimen etsinnän vastaus",
     "Failed to perform homeserver discovery": "Kotipalvelimen etsinnän suoritus epäonnistui",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Tämä kotipalvelin ei tarjoa yhtään kirjautumistapaa, jota tämä asiakasohjelma tukisi.",
-    "Claimed Ed25519 fingerprint key": "Väitetty Ed25519-avaimen sormenjälki",
-    "Set up with a Recovery Key": "Ota palautusavain käyttöön",
-    "Please enter your passphrase a second time to confirm.": "Syötä salalauseesi toisen kerran varmistukseksi.",
-    "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Voit käyttää sitä turvaverkkona palauttaaksesi salatun keskusteluhistoriasi, mikäli unohdat palautuksen salalauseesi.",
-    "As a safety net, you can use it to restore your encrypted message history.": "Voit käyttää sitä turvaverkkona palauttaaksesi salatun keskusteluhistoriasi.",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Palautusavaimesi on turvaverkko – voit käyttää sitä palauttaaksesi pääsyn salattuihin viesteihisi, mikäli unohdat salalauseesi.",
-    "Your Recovery Key": "Palautusavaimesi",
     "Set up Secure Message Recovery": "Ota käyttöön salattujen viestien palautus",
-    "Secure your backup with a passphrase": "Turvaa varmuuskopiosi salalauseella",
-    "Confirm your passphrase": "Varmista salalauseesi",
-    "Create Key Backup": "Luo avainvarmuuskopio",
     "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Mikäli et ota käyttöön salattujen viestien palautusta, menetät salatun viestihistoriasi, kun kirjaudut ulos.",
     "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",
@@ -1374,7 +1255,7 @@
     "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 huonelistan yläpuolella) vai et",
+    "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.",
@@ -1437,7 +1318,6 @@
     "Some characters not allowed": "Osaa merkeistä ei sallita",
     "Homeserver URL does not appear to be a valid Matrix homeserver": "Kotipalvelimen osoite ei näytä olevan kelvollinen Matrix-kotipalvelin",
     "Identity server URL does not appear to be a valid identity server": "Identiteettipalvelimen osoite ei näytä olevan kelvollinen identiteettipalvelin",
-    "A conference call could not be started because the integrations server is not available": "Konferenssipuhelua ei voitu aloittaa, koska integraatiopalvelin ei ole käytettävissä",
     "When rooms are upgraded": "Kun huoneet päivitetään",
     "Rejecting invite …": "Hylätään kutsua …",
     "You were kicked from %(roomName)s by %(memberName)s": "%(memberName)s poisti sinut huoneesta %(roomName)s",
@@ -1460,15 +1340,14 @@
     "Your profile": "Oma profiilisi",
     "Your Matrix account on <underlinedServerName />": "Matrix-tilisi palvelimella <underlinedServerName />",
     "Cannot reach homeserver": "Kotipalvelinta ei voida tavoittaa",
-    "Your Riot is misconfigured": "Riotin asetukset ovat pielessä",
+    "Your %(brand)s is misconfigured": "%(brand)sin asetukset ovat pielessä",
     "Cannot reach identity server": "Identiteettipalvelinta ei voida tavoittaa",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Varmista, että internet-yhteytesi on vakaa, tai ota yhteyttä palvelimen ylläpitäjään",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Pyydä Riot-ylläpitäjääsi tarkistamaan, onko <a>asetuksissasi</a>virheellisiä tai toistettuja merkintöjä.",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Pyydä %(brand)s-ylläpitäjääsi tarkistamaan, onko <a>asetuksissasi</a>virheellisiä tai toistettuja merkintöjä.",
     "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.": "Voit rekisteröityä, 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.",
     "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.": "Voit palauttaa salasanasi, 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.",
     "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",
-    "Show recently visited rooms above the room list": "Näytä hiljattain vieraillut huoneet huonelistan yläpuolella",
     "Low bandwidth mode": "Matalan kaistanleveyden tila",
     "Uploaded sound": "Ladattu ääni",
     "Sounds": "Äänet",
@@ -1489,7 +1368,7 @@
     "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": "Lataa palvelimelle",
+    "Upload": "Lähetä",
     "Changes your avatar in all rooms": "Vaihtaa kuvasi kaikissa huoneissa",
     "%(senderName)s made no change.": "%(senderName)s ei tehnyt muutoksia.",
     "Show all": "Näytä kaikki",
@@ -1597,8 +1476,8 @@
     "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Käyttäjän oikeustasoa muutettaessa tapahtui virhe. Varmista, että sinulla on riittävät oikeudet ja yritä uudelleen.",
     "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Suuren viestimäärän tapauksessa toiminto voi kestää jonkin aikaa. Älä lataa asiakasohjelmaasi uudelleen sillä aikaa.",
     "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Kutsusi validoinnin yrittäminen palautti virheen (%(errcode)s). Voit koettaa välittää tämän tiedon huoneen ylläpitäjälle.",
-    "Use an identity server in Settings to receive invites directly in Riot.": "Aseta identiteettipalvelin asetuksissa saadaksesi kutsuja suoraan Riotissa.",
-    "Share this email in Settings to receive invites directly in Riot.": "Jaa tämä sähköposti asetuksissa saadaksesi kutsuja suoraan Riotissa.",
+    "Use an identity server in Settings to receive invites directly in %(brand)s.": "Aseta identiteettipalvelin asetuksissa saadaksesi kutsuja suoraan %(brand)sissa.",
+    "Share this email in Settings to receive invites directly in %(brand)s.": "Jaa tämä sähköposti asetuksissa saadaksesi kutsuja suoraan %(brand)sissa.",
     "Please fill why you're reporting.": "Kerro miksi teet ilmoitusta.",
     "Report Content to Your Homeserver Administrator": "Ilmoita sisällöstä kotipalvelimesi ylläpitäjälle",
     "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.": "Tämän viestin ilmoittaminen lähettää sen yksilöllisen tapahtumatunnuksen (event ID) kotipalvelimesi ylläpitäjälle. Jos tämän huoneen viestit on salattu, kotipalvelimesi ylläpitäjä ei voi lukea viestin tekstiä tai nähdä tiedostoja tai kuvia.",
@@ -1616,14 +1495,9 @@
     "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ä",
-    "Link this email with your account in Settings to receive invites directly in Riot.": "Linkitä tämä sähköposti tilisi kanssa asetuksissa, jotta voit saada kutsuja suoraan Riotissa.",
-    "Room alias": "Huoneen alias",
+    "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 provide a room alias": "Anna huoneen alias",
-    "This alias is available to use": "Alias on käytettävissä",
-    "This alias is already in use": "Alias on jo käytössä",
     "Please enter a name for the room": "Syötä huoneelle nimi",
-    "Set a room alias to easily share your room with other people.": "Aseta huoneelle alias, jotta voit helposti jakaa huoneesi muiden kanssa.",
     "This room is private, and can only be joined by invitation.": "Tämä huone on yksityinen ja siihen voi liittyä vain kutsulla.",
     "Create a public room": "Luo julkinen huone",
     "Create a private room": "Luo yksityinen huone",
@@ -1684,7 +1558,6 @@
     "My Ban List": "Tekemäni estot",
     "This is your list of users/servers you have blocked - don't leave the room!": "Tämä on luettelo käyttäjistä ja palvelimista, jotka olet estänyt - älä poistu huoneesta!",
     "Something went wrong. Please try again or view your console for hints.": "Jotain meni vikaan. Yritä uudelleen tai katso vihjeitä konsolista.",
-    "Please verify the room ID or alias and try again.": "Varmista huoneen tunnus tai alias ja yritä uudelleen.",
     "Please try again or view your console for hints.": "Yritä uudelleen tai katso vihjeitä konsolista.",
     "⚠ These settings are meant for advanced users.": "⚠ Nämä asetukset on tarkoitettu edistyneille käyttäjille.",
     "eg: @bot:* or example.org": "esim. @bot:* tai esimerkki.org",
@@ -1708,7 +1581,7 @@
     "Your avatar URL": "Profiilikuvasi URL-osoite",
     "Your user ID": "Käyttäjätunnuksesi",
     "Your theme": "Teemasi",
-    "Riot URL": "Riotin URL-osoite",
+    "%(brand)s URL": "%(brand)sin URL-osoite",
     "Room ID": "Huoneen tunnus",
     "Widget ID": "Sovelman tunnus",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Tämän sovelman käyttäminen voi jakaa tietoja <helpIcon /> verkkotunnukselle %(widgetDomain)s.",
@@ -1719,7 +1592,6 @@
     "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)",
-    "Enable local event indexing and E2EE search (requires restart)": "Ota käyttöön paikallinen tapahtumaindeksointi ja paikallinen haku salatuista viesteistä (vaatii uudelleenlatauksen)",
     "Match system theme": "Käytä järjestelmän teemaa",
     "Decline (%(counter)s)": "Hylkää (%(counter)s)",
     "Connecting to integration manager...": "Yhdistetään integraatioiden lähteeseen...",
@@ -1742,7 +1614,6 @@
     "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:",
-    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Lisää käyttäjät ja palvelimet, jotka haluat jättää huomiotta. Voit käyttää asteriskia(*) täsmätäksesi mihin tahansa merkkeihin. Esimerkiksi, <code>@bot:*</code> jättäisi huomiotta kaikki käyttäjät, joiden nimi alkaa kirjaimilla ”bot”.",
     "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.",
@@ -1750,10 +1621,8 @@
     "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.",
-    "Room ID or alias of ban list": "Huoneen tunnus tai estolistan alias",
     "Integration Manager": "Integraatioiden lähde",
     "Read Marker lifetime (ms)": "Viestin luetuksi merkkaamisen kesto (ms)",
-    "Read Marker off-screen lifetime (ms)": "Viestin luetuksi merkkaamisen kesto, kun Riot ei ole näkyvissä (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”.",
     "Complete": "Valmis",
     "Revoke": "Kumoa",
@@ -1785,13 +1654,12 @@
     "Integrations are disabled": "Integraatiot ovat pois käytöstä",
     "Enable 'Manage Integrations' in Settings to do this.": "Ota integraatiot käyttöön asetuksista kohdasta ”Hallitse integraatioita”.",
     "Integrations not allowed": "Integraatioiden käyttö on kielletty",
-    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Riot-instanssisi ei salli sinun käyttävän integraatioiden lähdettä tämän tekemiseen. Ota yhteys ylläpitäjääsi.",
+    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "%(brand)s-instanssisi ei salli sinun käyttävän integraatioiden lähdettä tämän tekemiseen. Ota yhteys ylläpitäjääsi.",
     "Reload": "Lataa uudelleen",
     "Take picture": "Ota kuva",
     "Remove for everyone": "Poista kaikilta",
     "Remove for me": "Poista minulta",
     "Verification Request": "Varmennuspyyntö",
-    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
     "Failed to get autodiscovery configuration from server": "Automaattisen etsinnän asetusten hakeminen palvelimelta epäonnistui",
     "Invalid base_url for m.homeserver": "Epäkelpo base_url palvelimelle m.homeserver",
     "Invalid base_url for m.identity_server": "Epäkelpo base_url palvelimelle m.identity_server",
@@ -1803,7 +1671,6 @@
     "Customise your experience with experimental labs features. <a>Learn more</a>.": "Muokkaa kokemustasi kokeellisilla laboratio-ominaisuuksia. <a>Tutki vaihtoehtoja</a>.",
     "Error upgrading room": "Virhe päivitettäessä huonetta",
     "Double check that your server supports the room version chosen and try again.": "Tarkista, että palvelimesi tukee valittua huoneversiota ja yritä uudelleen.",
-    "Send cross-signing keys to homeserver": "Lähetä ristivarmennuksen tarvitsemat avaimet kotipalvelimelle",
     "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s poisti porttikiellon käyttäjiltä, jotka täsmäsivät sääntöön %(glob)s",
     "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s poisti huoneita estävän säännön %(glob)s",
     "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s poisti palvelimia estävän säännön %(glob)s",
@@ -1852,16 +1719,9 @@
     "Upgrade private room": "Päivitä yksityinen huone",
     "Upgrade public room": "Päivitä julkinen huone",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Huoneen päivittäminen on monimutkainen toimenpide ja yleensä sitä suositellaan, kun huone on epävakaa bugien, puuttuvien ominaisuuksien tai tietoturvaongelmien takia.",
-    "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Tämä yleensä vaikuttaa siihen, miten huonetta käsitellään palvelimella. Jos sinulla on ongelmia Riottisi kanssa, <a>ilmoita virheestä</a>.",
+    "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>.": "Tämä yleensä vaikuttaa siihen, miten huonetta käsitellään palvelimella. Jos sinulla on ongelmia %(brand)stisi kanssa, <a>ilmoita virheestä</a>.",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Olat päivittämässä tätä huonetta versiosta <oldVersion/> versioon <newVersion/>.",
     "Upgrade": "Päivitä",
-    "Enter secret storage passphrase": "Syötä salavaraston salalause",
-    "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Salavavaraston avaaminen epäonnistui. Varmista, että syötit oikean salalauseen.",
-    "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Varoitus</b>: sinun pitäisi käyttää salavarastoa vain luotetulta tietokoneelta.",
-    "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Jos olet unohtanut salalauseesi, voit <button1>käyttää palautusavaintasi</button1> tai <button2>asettaa uusia palautusvaihtoehtoja</button2>.",
-    "Enter secret storage recovery key": "Syötä salavaraston palautusavain",
-    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Salavaraston käyttö epäonnistui. Varmista, että syötit oikean palautusavaimen.",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "Jos olet unohtanut palautusavaimesi, voit <button>ottaa käyttöön uusia palautusvaihtoehtoja</button>.",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Varoitus</b>: sinun pitäisi ottaa avainten varmuuskopiointi käyttöön vain luotetulla tietokoneella.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Jos olet unohtanut palautusavaimesi, voit <button>ottaa käyttöön uusia palautusvaihtoehtoja</button>",
     "Notification settings": "Ilmoitusasetukset",
@@ -1869,27 +1729,18 @@
     "User Status": "Käyttäjän tila",
     "Country Dropdown": "Maapudotusvalikko",
     "Set up with a recovery key": "Ota käyttöön palautusavaimella",
-    "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "Turvaverkkona, voit käyttää sitä palauttamaan pääsysi salattuihin viesteihin, jos unohdat salalauseesi.",
-    "As a safety net, you can use it to restore your access to encrypted messages.": "Turvaverkkona, voit käyttää sitä palauttamaan pääsysi salattuihin viesteihisi.",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "Pidä palautusavaimesi jossain hyvin turvallisessa paikassa, kuten salasananhallintasovelluksessa (tai kassakaapissa).",
     "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Palautusavaimesi on <b>kopioitu leikepöydällesi</b>. Liitä se:",
     "Your recovery key is in your <b>Downloads</b> folder.": "Palautusavaimesi on <b>Lataukset</b>-kansiossasi.",
-    "Storing secrets...": "Tallennetaan salaisuuksia...",
     "Unable to set up secret storage": "Salavaraston käyttöönotto epäonnistui",
     "Show more": "Näytä lisää",
     "Recent Conversations": "Viimeaikaiset keskustelut",
     "Direct Messages": "Yksityisviestit",
     "Go": "Mene",
     "Lock": "Lukko",
-    "The version of Riot": "Riotin versio",
-    "Whether you're using Riot on a device where touch is the primary input mechanism": "Käytätkö Riotia laitteella, jossa kosketus on ensisijainen syöttömekanismi",
-    "Whether you're using Riot as an installed Progressive Web App": "Käytätkö Riotia asennettuna PWA:na (Progressive Web App)",
-    "The information being sent to us to help make Riot better includes:": "Tietoihin, joita lähetetään Riotin kehittäjille sovelluksen kehittämiseksi sisältyy:",
+    "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?",
     "Encryption upgrade available": "Salauksen päivitys saatavilla",
-    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s lisäsi osoitteet %(addedAddresses)s ja %(count)s muuta osoitetta tähän huoneeseen",
-    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s poisti osoitteet %(removedAddresses)s ja %(count)s muuta osoitetta tästä huoneesta",
-    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s poisti %(countRemoved)s ja lisäsi %(countAdded)s osoitetta tähän huoneeseen",
     "a few seconds ago": "muutama sekunti sitten",
     "about a minute ago": "noin minuutti sitten",
     "%(num)s minutes ago": "%(num)s minuuttia sitten",
@@ -1901,7 +1752,6 @@
     "Show typing notifications": "Näytä kirjoitusilmoitukset",
     "or": "tai",
     "Start": "Aloita",
-    "Confirm the emoji below are displayed on both devices, in the same order:": "Varmista, että alla olevat emojit näkyvät molemmilla laitteilla, samassa järjestyksessä:",
     "To be secure, do this in person or use a trusted way to communicate.": "Turvallisuuden varmistamiseksi tee tämä kasvokkain tai käytä luotettua viestintätapaa.",
     "Later": "Myöhemmin",
     "Show less": "Näytä vähemmän",
@@ -1917,7 +1767,6 @@
     "Done": "Valmis",
     "Got it": "Asia selvä",
     "Failed to find the following users": "Seuraavia käyttäjiä ei löytynyt",
-    "Backup restored": "Varmuuskopio palautettu",
     "Go Back": "Takaisin",
     "Copy": "Kopioi",
     "Upgrade your encryption": "Päivitä salauksesi",
@@ -1937,17 +1786,12 @@
     "Clear all data in this session?": "Poista kaikki tämän istunnon tiedot?",
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Kaikkien tämän istunnon tietojen poistaminen on pysyvää. Salatut viestit menetetään, ellei niiden avaimia ole varmuuskopioitu.",
     "Session name": "Istunnon nimi",
-    "You added a new session '%(displayName)s', which is requesting encryption keys.": "Lisäsit uuden istunnon '%(displayName)s', joka pyytää salausavaimia.",
-    "Loading session info...": "Ladataan istunnon tietoja...",
     "New session": "Uusi istunto",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Raportoidaksesi Matrixiin liittyvän tietoturvaongelman, lue Matrix.orgin <a>tietoturvaongelmien julkaisukäytäntö</a>.",
     "Message search": "Viestihaku",
-    "Sessions": "Istunnot",
     "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Tämä huone siltaa viestejä seuraaville alustoille. <a>Lue lisää.</a>",
     "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Pyydä uudelleen salausavaimia </requestLink> muista istunnoistasi.",
     "Mark all as read": "Merkitse kaikki luetuiksi",
-    "Alternative addresses for this room:": "Tämän huoneen vaihtoehtoiset osoitteet:",
-    "This room has no alternative addresses": "Tällä huoneella ei ole vaihtoehtoisia osoitteita",
     "Accepting…": "Hyväksytään…",
     "One of the following may be compromised:": "Jokin seuraavista saattaa olla vaarantunut:",
     "Your homeserver": "Kotipalvelimesi",
@@ -1964,24 +1808,15 @@
     "Suggestions": "Ehdotukset",
     "Your account is not secure": "Tilisi ei ole turvallinen",
     "Your password": "Salasanasi",
-    "Room contains unknown sessions": "Huoneessa on tuntemattomia istuntoja",
-    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "\"%(RoomName)s\" sisältää istuntoja, joita et ole nähnyt aiemmin.",
     "Incorrect recovery passphrase": "Virheellinen palautuksen salalause",
     "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.",
-    "Message not sent due to unknown sessions being present": "Viestiä ei lähetetty, koska läsnä on tuntemattomia istuntoja",
-    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Näytä istunnot</showSessionsText>, <sendAnywayText>lähetä silti</sendAnywayText> tai <cancelText>peruuta</cancelText>.",
-    "Sender session information": "Tietoa lähettäjän istunnosta",
     "Enter your account password to confirm the upgrade:": "Syötä tilisi salasana vahvistaaksesi päivityksen:",
     "Restore": "Palauta",
-    "Enter a passphrase": "Syötä salalause",
-    "Back up my encryption keys, securing them with the same passphrase": "Varmuuskopioi salausavaimeni, suojaten ne samalla salalauseella",
-    "Enter your passphrase a second time to confirm it.": "Syötä salalauseesi uudestaan vahvistaaksesi sen.",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Säilytä sitä turvallisessa paikassa, kuten salasanojen hallintaohjelmassa tai jopa kassakaapissa.",
     "Your recovery key": "Palautusavaimesi",
     "Make a copy of your recovery key": "Tee kopio palautusavaimestasi",
-    "You're done!": "Valmis!",
     "Not currently indexing messages for any room.": "Minkään huoneen viestejä ei tällä hetkellä indeksoida.",
     "Space used:": "Käytetty tila:",
     "Indexed messages:": "Indeksoidut viestit:",
@@ -1990,7 +1825,6 @@
     "Your user agent": "Käyttäjäagenttisi",
     "Verify this session": "Vahvista tämä istunto",
     "Set up encryption": "Ota salaus käyttöön",
-    "Unverified session": "Vahvistamaton istunto",
     "Sign In or Create Account": "Kirjaudu sisään tai luo tili",
     "Use your account or create a new one to continue.": "Käytä tiliäsi tai luo uusi jatkaaksesi.",
     "Create Account": "Luo tili",
@@ -1998,7 +1832,6 @@
     "WARNING: Session already verified, but keys do NOT MATCH!": "VAROITUS: Istunto on jo vahvistettu, mutta avaimet EIVÄT VASTAA!",
     "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.",
-    "Manually Verify": "Manuaalisesti vahvista",
     "a few seconds from now": "muutama sekunti sitten",
     "about a minute from now": "noin minuutti sitten",
     "%(num)s minutes from now": "%(num)s minuuttia sitten",
@@ -2006,15 +1839,11 @@
     "%(num)s hours from now": "%(num)s tuntia sitten",
     "about a day from now": "noin päivä sitten",
     "%(num)s days from now": "%(num)s päivää sitten",
-    "Show padlocks on invite only rooms": "Näytä lukko vain-kutsu huoneissa",
     "Never send encrypted messages to unverified sessions from this session": "Älä koskaan lähetä salattuja viestejä vahvistamattomiin istuntoihin tästä istunnosta",
     "Never send encrypted messages to unverified sessions in this room from this session": "Älä lähetä salattuja viestejä vahvistamattomiin istuntoihin tässä huoneessa tässä istunnossa",
     "Order rooms by name": "Suodata huoneet nimellä",
-    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Tässä huoneessa on tuntemattomia istuntoja: jos jatkat varmentamatta niitä, saattaa olla, että joku kuuntelee puheluasi.",
-    "Review Sessions": "Tarkasta istunnot",
     "If you cancel now, you won't complete verifying the other user.": "Jo peruutat nyt, toista käyttäjää ei varmenneta.",
     "If you cancel now, you won't complete verifying your other session.": "Jos peruutat nyt, toista istuntoasi ei varmenneta.",
-    "If you cancel now, you won't complete your secret storage operation.": "Jos peruutat nyt, salavarasto-toimintoa ei suoriteta.",
     "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!",
@@ -2029,19 +1858,15 @@
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s muutti tämän huoneen pää- sekä vaihtoehtoisia osoitteita.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s muutti tämän huoneen osoitteita.",
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) kirjautui uudella istunnolla varmentamatta sitä:",
-    "Show a presence dot next to DMs in the room list": "Näytä huonelistassa piste läsnäolon merkiksi yksityisviestien vieressä",
     "Support adding custom themes": "Tue mukaututettujen teemojen lisäämistä",
-    "Enable cross-signing to verify per-user instead of per-session (in development)": "Ota ristivarmennus käyttöön varmentaaksesi käyttäjät istuntojen sijaan (kehitysversio)",
     "Show rooms with unread notifications first": "Näytä ensin huoneet, joissa on lukemattomia viestejä",
-    "Show shortcuts to recently viewed rooms above the room list": "Näytä oikotiet viimeiseksi katsottuihin huoneisiin huonelistan yläpuolella",
+    "Show shortcuts to recently viewed rooms above the room list": "Näytä oikotiet viimeiseksi katsottuihin huoneisiin huoneluettelon yläpuolella",
     "Enable message search in encrypted rooms": "Ota viestihaku salausta käyttävissä huoneissa käyttöön",
-    "Keep secret storage passphrase in memory for this session": "Pidä salavaraston salalause muistissa tämän istunnon ajan",
     "How fast should messages be downloaded.": "Kuinka nopeasti viestit pitäisi ladata.",
     "Verify this session by completing one of the following:": "Varmenna tämä istunto tekemällä yhden seuraavista:",
     "Scan this unique code": "Skannaa tämä uniikki koodi",
     "Compare unique emoji": "Vertaa uniikkia emojia",
     "Compare a unique set of emoji if you don't have a camera on either device": "Vertaa kokoelmaa uniikkeja emojeja, jos kummassakaan laitteessa ei ole kameraa",
-    "Verify this device by confirming the following number appears on its screen.": "Varmenna tämä laite varmistamalla, että seuraava numero ilmestyy sen näytölle.",
     "Waiting for %(displayName)s to verify…": "Odotetaan käyttäjän %(displayName)s varmennusta…",
     "Cancelling…": "Peruutetaan…",
     "They match": "Ne täsmäävät",
@@ -2053,16 +1878,13 @@
     "This bridge is managed by <user />.": "Tätä siltaa hallinnoi käyttäjä <user />.",
     "Workspace: %(networkName)s": "Työtila: %(networkName)s",
     "Channel: %(channelName)s": "Kanava: %(channelName)s",
-    "outdated": "vanhentunut",
-    "up to date": "ajan tasalla",
     "Delete %(count)s sessions|other": "Poista %(count)s istuntoa",
     "Enable": "Ota käyttöön",
     "Backup is not signed by any of your sessions": "Mikään istuntosi ei ole allekirjoittanut varmuuskopiota",
     "Theme added!": "Teema lisätty!",
     "Add theme": "Lisää teema",
     "Scroll to most recent messages": "Vieritä tuoreimpiin viesteihin",
-    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Huoneen vaihtoehtoisten osoitteiden päivittämisessä tapahtui virhe. Palvelin ei ehkä salli sitä tai syynä oli tilapäinen virhe.",
-    "You don't have permission to delete the alias.": "Sinulla ei ole lupaa poistaa aliasta.",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Huoneen vaihtoehtoisten osoitteiden päivittämisessä tapahtui virhe. Palvelin ei ehkä salli sitä tai kyseessä oli tilapäinen virhe.",
     "Local address": "Paikallinen osoite",
     "Local Addresses": "Paikalliset osoitteet",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Aseta osoitteita tälle huoneelle, jotta käyttäjät löytävät tämän huoneen kotipalvelimeltasi (%(localDomain)s)",
@@ -2082,8 +1904,6 @@
     "Add a new server...": "Lisää uusi palvelin...",
     "If you didn’t sign in to this session, your account may be compromised.": "Jos et kirjautunut tähän istuntoon, käyttäjätilisi saattaa olla vaarantunut.",
     "This wasn't me": "Tämä en ollut minä",
-    "Unknown sessions": "Tuntemattomat istunnot",
-    "Waiting…": "Odotetaan…",
     "Disable": "Poista käytöstä",
     "Calls": "Puhelut",
     "Room List": "Huoneluettelo",
@@ -2137,7 +1957,6 @@
     "Send a Direct Message": "Lähetä yksityisviesti",
     "Explore Public Rooms": "Selaa julkisia huoneita",
     "Create a Group Chat": "Luo ryhmäkeskustelu",
-    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Suojaa salausavaimesi salalauseella. Parhaan turvallisuuden takaamiseksi sen tulisi olla eri kuin käyttäjätilisi salasana:",
     "Super": "Super",
     "Cancel replying to a message": "Peruuta viestiin vastaaminen",
     "Jump to room search": "Siirry huonehakuun",
@@ -2153,9 +1972,255 @@
     "Submit logs": "Lähetä lokit",
     "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Muistutus: Selaintasi ei tueta, joten voit kohdata yllätyksiä.",
     "There was a problem communicating with the server. Please try again.": "Palvelinyhteydessä oli ongelma. Yritä uudelleen.",
-    "<b>Warning</b>: You should only do this on a trusted computer.": "<b>Varoitus</b>: Tee tämä ainoastaan luotetulla tietokoneella.",
     "Syncing...": "Synkronoidaan...",
     "Signing In...": "Kirjaudutaan sisään...",
     "If you've joined lots of rooms, this might take a while": "Jos olet liittynyt moniin huoneisiin, tässä voi kestää hetken",
-    "Use your other device to continue…": "Jatka toisella laitteellasi…"
+    "Click the button below to confirm adding this email address.": "Klikkaa alapuolella olevaa painiketta lisätäksesi tämän sähköpostiosoitteen.",
+    "Click the button below to confirm adding this phone number.": "Klikkaa alapuolella olevaa painiketta lisätäksesi tämän puhelinnumeron.",
+    "If you cancel now, you won't complete your operation.": "Jos peruutat, toimintoa ei suoriteta loppuun.",
+    "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",
+    "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.",
+    "Click the button below to confirm deleting these sessions.|other": "Napsauta alla olevaa painiketta vahvistaaksesi näiden istuntojen poistamisen.",
+    "Click the button below to confirm deleting these sessions.|one": "Napsauta alla olevaa painiketta vahvistaaksesi tämän istunnon poistamisen.",
+    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Varmuuskopiossa on allekirjoitus <verify>tuntemattomasta</verify> istunnosta tunnuksella %(deviceId)s",
+    "Error downloading theme information.": "Virhe ladattaessa teematietoa.",
+    "Waiting for you to accept on your other session…": "Odotetaan, että hyväksyt toisen istunnon…",
+    "Almost there! Is your other session showing the same shield?": "Melkein valmista! Näyttääkö toinen istuntosi saman kilven?",
+    "Almost there! Is %(displayName)s showing the same shield?": "Melkein valmista! Näyttääkö %(displayName)s saman kilven?",
+    "Message deleted": "Viesti poistettu",
+    "Message deleted by %(name)s": "%(name)s poisti viestin",
+    "QR Code": "QR-koodi",
+    "To continue, use Single Sign On to prove your identity.": "Todista henkilöllisyytesi kertakirjautumisen avulla jatkaaksesi.",
+    "If they don't match, the security of your communication may be compromised.": "Jos ne eivät täsmää, viestinnän turvallisuus saattaa olla vaarantunut.",
+    "This session, or the other session": "Tämä tai toinen istunto",
+    "We recommend you change your password and recovery key in Settings immediately": "Suosittelemme, että vaihdat salasanasi ja palautusavaimesi asetuksissa välittömästi",
+    "Restoring keys from backup": "Palautetaan avaimia varmuuskopiosta",
+    "Fetching keys from server...": "Noudetaan avaimia palvelimelta...",
+    "%(completed)s of %(total)s keys restored": "%(completed)s / %(total)s avainta palautettu",
+    "Keys restored": "Avaimet palautettu",
+    "Successfully restored %(sessionCount)s keys": "%(sessionCount)s avaimen palautus onnistui",
+    "This requires the latest %(brand)s on your other devices:": "Tämä vaatii uusimman %(brand)sin muilla laitteillasi:",
+    "Currently indexing: %(currentRoom)s": "Indeksoidaan huonetta: %(currentRoom)s",
+    "Jump to oldest unread message": "Siirry vanhimpaan lukemattomaan viestiin",
+    "Opens chat with the given user": "Avaa keskustelun annetun käyttäjän kanssa",
+    "Sends a message to the given user": "Lähettää viestin annetulle käyttäjälle",
+    "Manually Verify by Text": "Varmenna käsin tekstillä",
+    "Interactively verify by Emoji": "Varmenna interaktiivisesti emojilla",
+    "Manually verify all remote sessions": "Varmenna kaikki etäistunnot käsin",
+    "IRC display name width": "IRC-näyttönimen leveys",
+    "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.",
+    "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.",
+    "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. ",
+    "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.": "Tämä istunto <b>ei varmuuskopioi avaimiasi</b>, mutta sillä on olemassaoleva varmuuskopio, jonka voit palauttaa ja lisätä jatkaaksesi.",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Yhdistä tämä istunto avainten varmuuskopiointiin ennen uloskirjautumista, jotta et menetä avaimia, jotka ovat vain tässä istunnossa.",
+    "Connect this session to Key Backup": "Yhdistä tämä istunto avainten varmuuskopiointiin",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "Varmuuskopiossa on <validity>kelvollinen</validity> allekirjoitus <verify>varmennetusta</verify> istunnosta <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "Varmuuskopiossa on <validity>kelvollinen</validity> allekirjoitus <verify>varmentamattomasta</verify> istunnosta <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "Varmuuskopiossa on <validity>epäkelpo</validity> allekirjoitus <verify>varmennetusta</verify> istunnosta <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Varmuuskopiossa on <validity>epäkelpo</validity> allekirjoitus <verify>varmentamattomasta</verify> istunnosta <device></device>",
+    "This backup is trusted because it has been restored on this session": "Tähän varmuuskopioon luotetaan, koska se on palautettu tässä istunnossa",
+    "Your keys are <b>not being backed up from this session</b>.": "Avaimiasi <b>ei varmuuskopioida tästä istunnosta</b>.",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Salasanasi on onnistuneesti vaihdettu. Et saa ilmoituksia muilla laitteillasi ennen kuin kirjaudut niillä takaisin sisään",
+    "Invalid theme schema.": "Epäkelpo teeman skeema.",
+    "Custom theme URL": "Mukautettu teeman osoite",
+    "Keyboard Shortcuts": "Pikanäppäimet",
+    "Session ID:": "Istunnon tunnus:",
+    "Session key:": "Istunnon avain:",
+    "Where you’re logged in": "Missä olet sisäänkirjautuneena",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Muokkaa istuntojesi nimiä ja kirjaudu niistä ulos alapuolella tai <a>varmenna ne käyttäjäprofiilissasi</a>.",
+    "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",
+    "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.",
+    "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Jos muissa laitteissasi ei ole avainta tämän viestin purkamiseen, niillä istunnoilla ei voi lukea tätä viestiä.",
+    "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",
+    "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.",
+    "Verify User": "Varmenna käyttäjä",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "Lisäturvaksi, varmenna tämä käyttäjä tarkistamalla koodin kummankin laitteella.",
+    "The homeserver the user you’re verifying is connected to": "Käyttäjä, jota varmennat, on kotipalvelimella",
+    "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.": "Istunto, jota yrität varmentaa, ei tue QR-koodin skannausta tai emoji-varmennusta, joita %(brand)s tukee. Kokeile eri asiakasohjelmalla.",
+    "Verify by scanning": "Varmenna skannaamalla",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Jos et pysty skannaamaan yläpuolella olevaa koodia, varmenna vertaamalla emojia.",
+    "Verify by comparing unique emoji.": "Varmenna vertaamalla uniikkia emojia.",
+    "Verify by emoji": "Varmenna emojilla",
+    "Verify all users in a room to ensure it's secure.": "Varmenna kaikki huoneen käyttäjät varmistaaksesi, että se on turvallinen.",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "Varmenna kaikki käyttäjät salausta käyttävissä huoneissa, jotta huone on varmasti turvallinen.",
+    "You've successfully verified your device!": "Olet onnistuneesti varmentanut laitteesi!",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Olet onnistuneesti varmentanut laitteen %(deviceName)s (%(deviceId)s)!",
+    "You've successfully verified %(displayName)s!": "Olet varmentanut käyttäjän %(displayName)s!",
+    "Verified": "Varmennettu",
+    "Font size": "Fonttikoko",
+    "Size must be a number": "Koon täytyy olla luku",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "Mukautetun fonttikoon täytyy olla vähintään %(min)s pt ja enintään %(max)s pt",
+    "Use between %(min)s pt and %(max)s pt": "Käytä kokoa väliltä %(min)s pt ja %(max)s pt",
+    "Appearance": "Ulkoasu",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "Et voi poistaa tätä käytöstä jatkossa. Sillat ja useimmat botit eivät vielä toimi.",
+    "Navigate up/down in the room list": "Siirry huoneluettelossa ylöspäin/alaspäin",
+    "Select room from the room list": "Valitse huone huoneluettelosta",
+    "Previous/next unread room or DM": "Edellinen/seuraava lukematon huone tai yksityisviesti",
+    "Previous/next room or DM": "Edellinen/seuraava huone tai yksityisviesti",
+    "Toggle this dialog": "Tämä valintaikkuna päälle/pois",
+    "Start verification again from the notification.": "Aloita varmennus uudelleen ilmoituksesta.",
+    "Start verification again from their profile.": "Aloita varmennus uudelleen hänen profiilista.",
+    "Verification timed out.": "Varmennuksessa kesti liikaa.",
+    "You cancelled verification on your other session.": "Peruutit varmennuksen toisessa istunnossasi.",
+    "%(displayName)s cancelled verification.": "%(displayName)s peruutti varmennuksen.",
+    "You cancelled verification.": "Peruutit varmennuksen.",
+    "Verification cancelled": "Varmennus peruutettu",
+    "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",
+    "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.",
+    "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.",
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "Emme onnistuneet luomaan yksityisviestiä. Tarkista, että kutsumasi henkilöt haluavat kutsusi ja yritä uudelleen.",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Seuraavat käyttäjät eivät välttämättä ole olemassa tai ne ovat epäkelpoja, joten niitä ei voida kutsua: %(csvNames)s",
+    "Recently Direct Messaged": "Viimeaikaiset yksityisviestit",
+    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Aloita keskustelu jonkun kanssa käyttäen hänen nimeä, käyttäjätunnus (kuten <userId/>) tai sähköpostiosoitetta.",
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Kutsu tähän huoneeseen käyttäen nimeä, käyttäjätunnusta (kuten <userId/>), sähköpostiosoitetta tai <a>jaa tämä huone</a>.",
+    "%(brand)s encountered an error during upload of:": "%(brand)s kohtasi virheen lähettäessään:",
+    "Upload completed": "Lähetys valmis",
+    "Cancelled signature upload": "Allekirjoituksen lähetys peruutettu",
+    "Unable to upload": "Lähettäminen ei ole mahdollista",
+    "Signature upload success": "Allekirjoituksen lähettäminen onnistui",
+    "Signature upload failed": "Allekirjoituksen lähettäminen epäonnistui",
+    "Room name or address": "Huoneen nimi tai osoite",
+    "Joins room with given address": "Liittyy annetun osoitteen mukaiseen huoneeseen",
+    "Unrecognised room address:": "Tunnistamaton huoneen osoite:",
+    "Help us improve %(brand)s": "Auta parantamaan %(brand)sia",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Lähetä <UsageDataLink>anonyymiä käyttötietoa</UsageDataLink>, joka auttaa %(brand)sin kehittämisessä. Toiminto käyttää <PolicyLink>evästettä</PolicyLink>.",
+    "I want to help": "Haluan auttaa",
+    "Your homeserver has exceeded its user limit.": "Kotipalvelimesi on ylittänyt käyttäjärajansa.",
+    "Your homeserver has exceeded one of its resource limits.": "Kotipalvelimesi on ylittänyt jonkin resurssirajansa.",
+    "Contact your <a>server admin</a>.": "Ota yhteyttä <a>palvelimesi ylläpitäjään</a>.",
+    "Ok": "OK",
+    "Set password": "Aseta salasana",
+    "To return to your account in future you need to set a password": "Päästäksesi jatkossa takaisin tilillesi sinun täytyy asettaa salasana",
+    "Restart": "Käynnistä uudelleen",
+    "Upgrade your %(brand)s": "Päivitä %(brand)s",
+    "A new version of %(brand)s is available!": "Uusi %(brand)sin versio on saatavilla!",
+    "New version available. <a>Update now.</a>": "Uusi versio saatavilla. <a>Päivitä nyt.</a>",
+    "To link to this room, please add an address.": "Lisää osoite linkittääksesi tähän huoneeseen.",
+    "Error creating address": "Virhe osoitetta luotaessa",
+    "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "Osoitetta luotaessa tapahtui virhe. Voi olla, että palvelin ei salli sitä tai kyseessä oli tilapäinen virhe.",
+    "You don't have permission to delete the address.": "Sinulla ei ole oikeutta poistaa osoitetta.",
+    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Osoitetta poistaessa tapahtui virhe. Osoitetta ei ehkä ole enää olemassa tai kyseessä oli tilapäinen virhe.",
+    "Error removing address": "Virhe osoitetta poistettaessa",
+    "Categories": "Luokat",
+    "This address is available to use": "Tämä osoite on käytettävissä",
+    "This address is already in use": "Tämä osoite on jo käytössä",
+    "Set a room address to easily share your room with other people.": "Aseta huoneelle osoite, jotta voit jakaa huoneen helposti muille.",
+    "Address (optional)": "Osoite (valinnainen)",
+    "Light": "Vaalea",
+    "Dark": "Tumma",
+    "Emoji picker": "Emojivalitsin",
+    "No recently visited rooms": "Ei hiljattain vierailtuja huoneita",
+    "People": "Ihmiset",
+    "Sort by": "Lajittelutapa",
+    "Unread rooms": "Lukemattomat huoneet",
+    "Always show first": "Näytä aina ensin",
+    "Show": "Näytä",
+    "Leave Room": "Poistu huoneesta",
+    "Switch to light mode": "Vaihda vaaleaan teemaan",
+    "Switch to dark mode": "Vaihda tummaan teemaan",
+    "Switch theme": "Vaihda teemaa",
+    "All settings": "Kaikki asetukset",
+    "Feedback": "Palaute",
+    "Looks good!": "Hyvältä näyttää!",
+    "Use Recovery Key or Passphrase": "Käytä palautusavainta tai salalausetta",
+    "Use Recovery Key": "Käytä palautusavainta",
+    "You joined the call": "Liityit puheluun",
+    "%(senderName)s joined the call": "%(senderName)s liittyi puheluun",
+    "Call in progress": "Puhelu käynnissä",
+    "You left the call": "Poistuit puhelusta",
+    "%(senderName)s left the call": "%(senderName)s poistui puhelusta",
+    "Call ended": "Puhelu päättyi",
+    "You started a call": "Aloitit puhelun",
+    "%(senderName)s started a call": "%(senderName)s aloitti puhelun",
+    "Waiting for answer": "Odotetaan vastausta",
+    "%(senderName)s is calling": "%(senderName)s soittaa",
+    "You created the room": "Loit huoneen",
+    "%(senderName)s created the room": "%(senderName)s loi huoneen",
+    "You made the chat encrypted": "Otit salauksen käyttöön keskustelussa",
+    "%(senderName)s made the chat encrypted": "%(senderName)s otti salauksen käyttöön keskustelussa",
+    "You made history visible to new members": "Teit historiasta näkyvän uusille jäsenille",
+    "%(senderName)s made history visible to new members": "%(senderName)s teki historiasta näkyvän uusille jäsenille",
+    "You made history visible to anyone": "Teit historiasta näkyvän kaikille",
+    "%(senderName)s made history visible to anyone": "%(senderName)s teki historiasta näkyvän kaikille",
+    "You made history visible to future members": "Teit historiasta näkyvän tuleville jäsenille",
+    "%(senderName)s made history visible to future members": "%(senderName)s teki historiasta näkyvän tuleville jäsenille",
+    "You were invited": "Sinut kutsuttiin",
+    "%(targetName)s was invited": "%(targetName)s kutsuttiin",
+    "You left": "Poistuit",
+    "%(targetName)s left": "%(targetName)s poistui",
+    "You rejected the invite": "Hylkäsit kutsun",
+    "%(targetName)s rejected the invite": "%(targetName)s hylkäsi kutsun",
+    "You were banned (%(reason)s)": "Sait porttikiellon (%(reason)s)",
+    "%(targetName)s was banned (%(reason)s)": "%(targetName)s sai porttikiellon (%(reason)s)",
+    "You were banned": "Sait porttikiellon",
+    "%(targetName)s was banned": "%(targetName)s sai porttikiellon",
+    "You joined": "Liityit",
+    "%(targetName)s joined": "%(targetName)s liittyi",
+    "You changed your name": "Vaihdoit nimeäsi",
+    "%(targetName)s changed their name": "%(targetName)s vaihtoi nimeään",
+    "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
+    "You changed the room name": "Vaihdoit huoneen nimeä",
+    "%(senderName)s changed the room name": "%(senderName)s vaihtoi huoneen nimeä",
+    "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
+    "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
+    "You invited %(targetName)s": "Kutsuit käyttäjän %(targetName)s",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s kutsui käyttäjän %(targetName)s",
+    "You changed the room topic": "Vaihdoit huoneen aiheen",
+    "%(senderName)s changed the room topic": "%(senderName)s vaihtoi huoneen aiheen",
+    "Use custom size": "Käytä mukautettua kokoa",
+    "Use a more compact ‘Modern’ layout": "Käytä tiiviimpää 'modernia' asettelua",
+    "Use a system font": "Käytä järjestelmän fonttia",
+    "System font name": "Järjestelmän fontin nimi",
+    "Message layout": "Viestiasettelu",
+    "Compact": "Tiivis",
+    "Modern": "Moderni",
+    "We’re excited to announce Riot is now Element": "Meillä on ilo ilmoittaa, että Riot on nyt Element",
+    "Riot is now Element!": "Riot on nyt Element!",
+    "Learn More": "Lue lisää",
+    "Use default": "Käytä oletusta",
+    "Mentions & Keywords": "Maininnat ja avainsanat",
+    "Notification options": "Ilmoitusasetukset",
+    "Room options": "Huoneen asetukset",
+    "This room is public": "Tämä huone on julkinen",
+    "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>.": "Olet jo kirjautuneena eikä sinun tarvitse tehdä mitään, mutta voit myös hakea sovelluksen uusimman version kaikille alustoille osoitteesta <a>element.io/get-started</a>.",
+    "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"
 }
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index a7b09ea8ac..42f9d74502 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1,14 +1,10 @@
 {
-    "Direct chats": "Discussions directes",
     "Disinvite": "Désinviter",
     "Displays action": "Affiche l'action",
     "Download %(text)s": "Télécharger %(text)s",
-    "Ed25519 fingerprint": "Empreinte Ed25519",
     "Emoji": "Émojis",
     "%(senderName)s ended the call.": "%(senderName)s a terminé l’appel.",
-    "End-to-end encryption information": "Informations sur le chiffrement de bout en bout",
     "Error": "Erreur",
-    "Event information": "Informations de l'événement",
     "Existing Call": "Appel en cours",
     "Export E2E room keys": "Exporter les clés de chiffrement de salon",
     "Failed to ban user": "Échec du bannissement de l'utilisateur",
@@ -23,7 +19,6 @@
     "Account": "Compte",
     "Admin": "Administrateur",
     "Advanced": "Avancé",
-    "Algorithm": "Algorithme",
     "%(items)s and %(lastItem)s": "%(items)s et %(lastItem)s",
     "and %(count)s others...|other": "et %(count)s autres...",
     "and %(count)s others...|one": "et un autre...",
@@ -38,8 +33,7 @@
     "Ban": "Bannir",
     "Banned users": "Utilisateurs bannis",
     "Bans user with given id": "Bannit l'utilisateur à partir de son identifiant",
-    "Blacklisted": "Sur liste noire",
-    "Call Timeout": "Délai d’appel expiré",
+    "Call Timeout": "L’appel a dépassé le délai d'attente maximal",
     "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>.": "Impossible de se connecter au serveur d'accueil en HTTP si l'URL dans la barre de votre explorateur est en HTTPS. Utilisez HTTPS ou <a>activez le support des scripts non-vérifiés</a>.",
     "Change Password": "Changer le mot de passe",
     "%(senderName)s changed their profile picture.": "%(senderName)s a changé son image de profil.",
@@ -47,7 +41,6 @@
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s a changé le nom du salon en %(roomName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s a changé le sujet du salon en \"%(topic)s\".",
     "Changes your display nickname": "Change votre nom affiché",
-    "Claimed Ed25519 fingerprint key": "Clé d'empreinte Ed25519 déclarée",
     "Click here to fix": "Cliquer ici pour réparer",
     "Click to mute audio": "Cliquer pour couper le son",
     "Click to mute video": "Cliquer ici pour couper la vidéo",
@@ -58,17 +51,13 @@
     "Commands": "Commandes",
     "Confirm password": "Confirmer le mot de passe",
     "Continue": "Continuer",
-    "Could not connect to the integration server": "Impossible de se connecter au serveur d'intégration",
     "Create Room": "Créer un salon",
     "Cryptography": "Chiffrement",
     "Current password": "Mot de passe actuel",
-    "Curve25519 identity key": "Clé d’identité Curve25519",
     "/ddg is not a command": "/ddg n'est pas une commande",
     "Deactivate Account": "Fermer le compte",
     "Decrypt %(text)s": "Déchiffrer %(text)s",
-    "Decryption error": "Erreur de déchiffrement",
     "Deops user with given id": "Retire le rang d’opérateur d’un utilisateur à partir de son identifiant",
-    "Device ID": "Identifiant de l'appareil",
     "Failed to join room": "Échec de l’inscription au salon",
     "Failed to kick": "Échec de l'expulsion",
     "Failed to leave room": "Échec du départ du salon",
@@ -79,7 +68,6 @@
     "Failed to send email": "Échec de l’envoi de l’e-mail",
     "Failed to send request.": "Échec de l'envoi de la requête.",
     "Failed to set display name": "Échec de l'enregistrement du nom affiché",
-    "Failed to toggle moderator status": "Échec de l’activation du statut de modérateur",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s a accepté l’invitation de %(displayName)s.",
     "Access Token:": "Jeton d’accès :",
     "Always show message timestamps": "Toujours afficher l'heure des messages",
@@ -88,7 +76,7 @@
     "An error has occurred.": "Une erreur est survenue.",
     "Email": "E-mail",
     "Failed to unban": "Échec de la révocation du bannissement",
-    "Failed to verify email address: make sure you clicked the link in the email": "Échec de la vérification de l’adresse e-mail : vérifiez que vous avez bien cliqué sur le lien dans l’e-mail",
+    "Failed to verify email address: make sure you clicked the link in the email": "La vérification de l’adresse e-mail a échoué : vérifiez que vous avez bien cliqué sur le lien dans l’e-mail",
     "Failure to create room": "Échec de la création du salon",
     "Favourites": "Favoris",
     "Fill screen": "Plein écran",
@@ -111,14 +99,12 @@
     "Sign in with": "Se connecter avec",
     "Join Room": "Rejoindre le salon",
     "%(targetName)s joined the room.": "%(targetName)s a rejoint le salon.",
-    "Joins room with given alias": "Rejoint le salon avec l'alias renseigné",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s a expulsé %(targetName)s.",
     "Kick": "Expulser",
     "Kicks user with given id": "Expulse l'utilisateur à partir de son identifiant",
     "Labs": "Labo",
     "Leave room": "Quitter le salon",
     "%(targetName)s left the room.": "%(targetName)s a quitté le salon.",
-    "Local addresses for this room:": "Adresses locales pour ce salon :",
     "Logout": "Se déconnecter",
     "Low priority": "Priorité basse",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s a rendu l'historique visible à tous les membres du salon, depuis le moment où ils ont été invités.",
@@ -131,14 +117,11 @@
     "Missing user_id in request": "Absence du user_id dans la requête",
     "Moderator": "Modérateur",
     "Name": "Nom",
-    "New address (e.g. #foo:%(localDomain)s)": "Nouvelle adresse (par ex. #foo:%(localDomain)s)",
     "New passwords don't match": "Les mots de passe ne correspondent pas",
     "New passwords must match each other.": "Les nouveaux mots de passe doivent être identiques.",
-    "none": "aucun",
     "not specified": "non spécifié",
     "(not supported by this browser)": "(non supporté par ce navigateur)",
     "<not supported>": "<non supporté>",
-    "NOT verified": "NON vérifié",
     "No more results": "Fin des résultats",
     "No results": "Pas de résultat",
     "unknown error code": "code d’erreur inconnu",
@@ -162,20 +145,18 @@
     "Privileged Users": "Utilisateurs privilégiés",
     "Profile": "Profil",
     "Reason": "Raison",
-    "Revoke Moderator": "Révoquer le modérateur",
     "%(targetName)s rejected the invitation.": "%(targetName)s a rejeté l’invitation.",
     "Reject invitation": "Rejeter l'invitation",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s a supprimé son nom affiché (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s a supprimé son image de profil.",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s a demandé une téléconférence audio.",
     "Return to login screen": "Retourner à l’écran de connexion",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot n’a pas la permission de vous envoyer des notifications - merci de vérifier les paramètres de votre navigateur",
-    "Riot was not given permission to send notifications - please try again": "Riot n’a pas reçu la permission de vous envoyer des notifications - veuillez réessayer",
-    "riot-web version:": "Version de riot-web :",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s n’a pas la permission de vous envoyer des notifications - merci de vérifier les paramètres de votre navigateur",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s n’a pas reçu la permission de vous envoyer des notifications - veuillez réessayer",
+    "%(brand)s version:": "Version de %(brand)s :",
     "Room %(roomId)s not visible": "Le salon %(roomId)s n'est pas visible",
     "Room Colour": "Couleur du salon",
     "Rooms": "Salons",
-    "Scroll to bottom of page": "Aller en bas de la page",
     "Search": "Rechercher",
     "Search failed": "Échec de la recherche",
     "Searches DuckDuckGo for results": "Recherche des résultats dans DuckDuckGo",
@@ -195,7 +176,6 @@
     "Sign out": "Se déconnecter",
     "%(count)s of your messages have not been sent.|other": "Certains de vos messages n’ont pas été envoyés.",
     "Someone": "Quelqu'un",
-    "Start a chat": "Commencer une discussion",
     "Submit": "Soumettre",
     "Success": "Succès",
     "This email address is already in use": "Cette adresse e-mail est déjà utilisée",
@@ -215,26 +195,20 @@
     "Unable to verify email address.": "Impossible de vérifier l’adresse e-mail.",
     "Unban": "Révoquer le bannissement",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s a révoqué le bannissement de %(targetName)s.",
-    "Unable to capture screen": "Impossible de capturer l'écran",
+    "Unable to capture screen": "Impossible de faire une capture d'écran",
     "Unable to enable Notifications": "Impossible d'activer les notifications",
-    "unencrypted": "non chiffré",
-    "unknown device": "appareil inconnu",
-    "Unknown room %(roomId)s": "Salon inconnu %(roomId)s",
     "Unmute": "Activer le son",
     "Upload avatar": "Télécharger une photo de profil",
     "Upload Failed": "Échec de l’envoi",
     "Upload file": "Envoyer un fichier",
     "Usage": "Utilisation",
-    "User ID": "Identifiant d'utilisateur",
     "Users": "Utilisateurs",
     "Verification Pending": "Vérification en attente",
-    "Verification": "Vérification",
-    "verified": "vérifié",
     "Video call": "Appel vidéo",
     "Voice call": "Appel vocal",
     "VoIP conference finished.": "Téléconférence VoIP terminée.",
     "VoIP conference started.": "Téléconférence VoIP démarrée.",
-    "VoIP is unsupported": "VoIP (Appels par Internet) n'est pas supportée",
+    "VoIP is unsupported": "Voix sur IP non gérée",
     "Warning!": "Attention !",
     "Who can access this room?": "Qui peut accéder au salon ?",
     "Who can read history?": "Qui peut lire l'historique ?",
@@ -276,7 +250,6 @@
     "Upload an avatar:": "Envoyer un avatar :",
     "This server does not support authentication with a phone number.": "Ce serveur ne prend pas en charge l’authentification avec un numéro de téléphone.",
     "An error occurred: %(error_string)s": "Une erreur est survenue : %(error_string)s",
-    "Make Moderator": "Nommer modérateur",
     "There are no visible files in this room": "Il n'y a pas de fichier visible dans ce salon",
     "Room": "Salon",
     "Connectivity to the server has been lost.": "La connectivité au serveur a été perdue.",
@@ -286,7 +259,7 @@
     "Please select the destination room for this message": "Merci de sélectionner le salon de destination pour ce message",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s a supprimé le nom du salon.",
     "Analytics": "Collecte de données",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot collecte des données anonymes qui nous permettent d’améliorer l’application.",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s collecte des données anonymes qui nous permettent d’améliorer l’application.",
     "Passphrases must match": "Les phrases de passe doivent être identiques",
     "Passphrase must not be empty": "Le mot de passe ne peut pas être vide",
     "Export room keys": "Exporter les clés de salon",
@@ -306,15 +279,9 @@
     "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.": "Voulez-vous vraiment supprimer cet événement ? Notez que si vous supprimez le changement du nom ou du sujet d’un salon, il est possible que ce changement soit annulé.",
     "Unknown error": "Erreur inconnue",
     "Incorrect password": "Mot de passe incorrect",
-    "To continue, please enter your password.": "Pour continuer, veuillez saisir votre mot de passe.",
-    "I verify that the keys match": "J’ai vérifié que les clés correspondaient",
     "Unable to restore session": "Impossible de restaurer la session",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Si vous avez utilisé une version plus récente de Riot précédemment, votre session risque d’être incompatible avec cette version. Fermez cette fenêtre et retournez à la version plus récente.",
+    "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.": "Si vous avez utilisé une version plus récente de %(brand)s précédemment, votre session risque d’être incompatible avec cette version. Fermez cette fenêtre et retournez à la version plus récente.",
     "Unknown Address": "Adresse inconnue",
-    "Unblacklist": "Supprimer de la liste noire",
-    "Blacklist": "Ajouter à la liste noire",
-    "Unverify": "Annuler la vérification",
-    "Verify...": "Vérifier...",
     "ex. @bob:example.com": "ex. @bob:exemple.com",
     "Add User": "Ajouter l'utilisateur",
     "Custom Server Options": "Options de serveur personnalisées",
@@ -339,7 +306,6 @@
     "Jump to first unread message.": "Aller au premier message non lu.",
     "Options": "Options",
     "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?": "Vous êtes sur le point d’accéder à un site tiers afin de pouvoir vous identifier pour utiliser %(integrationsUrl)s. Voulez-vous continuer ?",
-    "Removed or unknown message type": "Type de message inconnu ou supprimé",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s a changé l’avatar du salon en <img/>",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s a supprimé l'avatar du salon.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s a changé l’avatar de %(roomName)s",
@@ -347,13 +313,11 @@
     "Import": "Importer",
     "Incorrect username and/or password.": "Nom d’utilisateur et/ou mot de passe incorrect.",
     "Results from DuckDuckGo": "Résultats de DuckDuckGo",
-    "Unrecognised room alias:": "Alias de salon non reconnu :",
-    "Use compact timeline layout": "Utiliser l'affichage compact de l'historique",
     "Verified key": "Clé vérifiée",
     "No Microphones detected": "Aucun micro détecté",
     "No Webcams detected": "Aucune webcam détectée",
     "No media permissions": "Pas de permission pour les médias",
-    "You may need to manually permit Riot to access your microphone/webcam": "Il est possible que vous deviez manuellement autoriser Riot à accéder à votre micro/webcam",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "Il est possible que vous deviez manuellement autoriser %(brand)s à accéder à votre micro/webcam",
     "Default Device": "Appareil par défaut",
     "Microphone": "Micro",
     "Camera": "Caméra",
@@ -361,9 +325,7 @@
     "Anyone": "N'importe qui",
     "Are you sure you want to leave the room '%(roomName)s'?": "Voulez-vous vraiment quitter le salon \"%(roomName)s\" ?",
     "Custom level": "Rang personnalisé",
-    "device id: ": "identifiant de l'appareil : ",
     "Register": "S'inscrire",
-    "Remote addresses for this room:": "Adresses distantes pour ce salon :",
     "Save": "Enregistrer",
     "You have <a>disabled</a> URL previews by default.": "Vous avez <a>désactivé</a> les aperçus d’URL par défaut.",
     "You have <a>enabled</a> URL previews by default.": "Vous avez <a>activé</a> les aperçus d’URL par défaut.",
@@ -386,14 +348,11 @@
     "If you already have a Matrix account you can <a>log in</a> instead.": "Si vous avez déjà un compte Matrix vous pouvez vous <a>connecter</a> à la place.",
     "Accept": "Accepter",
     "Active call (%(roomName)s)": "Appel en cours (%(roomName)s)",
-    "Alias (optional)": "Alias (facultatif)",
     "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.": "Impossible de se connecter au serveur d’accueil - veuillez vérifier votre connexion, assurez-vous que le <a>certificat SSL de votre serveur d’accueil</a> est un certificat de confiance, et qu’aucune extension du navigateur ne bloque les requêtes.",
     "Close": "Fermer",
     "Custom": "Personnaliser",
     "Decline": "Refuser",
-    "Disable Notifications": "Désactiver les notifications",
     "Drop File Here": "Déposer le fichier Ici",
-    "Enable Notifications": "Activer les notifications",
     "Failed to upload profile picture!": "Échec de l'envoi de l'image de profil !",
     "Incoming call from %(name)s": "Appel entrant de %(name)s",
     "Incoming video call from %(name)s": "Appel vidéo entrant de %(name)s",
@@ -404,7 +363,6 @@
     "%(roomName)s does not exist.": "%(roomName)s n'existe pas.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s n'est pas accessible pour le moment.",
     "Seen by %(userName)s at %(dateTime)s": "Vu par %(userName)s à %(dateTime)s",
-    "Send anyway": "Envoyer quand même",
     "Start authentication": "Commencer une authentification",
     "This room": "Ce salon",
     "unknown caller": "appelant inconnu",
@@ -421,15 +379,11 @@
     "(no answer)": "(pas de réponse)",
     "(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 Riot keyfile": "Fichier de clé Riot non valide",
+    "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 ?",
     "Do you want to set an email address?": "Souhaitez-vous configurer une adresse e-mail ?",
     "This will allow you to reset your password and receive notifications.": "Ceci vous permettra de réinitialiser votre mot de passe et de recevoir des notifications.",
     "Skip": "Passer",
-    "Start verification": "Commencer la vérification",
-    "Share without verifying": "Partager sans vérifier",
-    "Ignore request": "Ignorer la requête",
-    "Encryption key request": "Requête de clé de chiffrement",
     "Check for update": "Rechercher une mise à jour",
     "Add a widget": "Ajouter un widget",
     "Allow": "Autoriser",
@@ -462,7 +416,6 @@
     "Invite new community members": "Inviter de nouveaux membres dans cette communauté",
     "Which rooms would you like to add to this community?": "Quels salons souhaitez-vous ajouter à cette communauté ?",
     "Add rooms to the community": "Ajouter des salons à la communauté",
-    "Room name or alias": "Nom du salon ou alias",
     "Add to community": "Ajouter à la communauté",
     "Failed to invite the following users to %(groupId)s:": "Échec de l'invitation des utilisateurs à %(groupId)s :",
     "Failed to invite users to community": "Échec de l'invitation d'utilisateurs à la communauté",
@@ -479,7 +432,6 @@
     "Unignore": "Ne plus ignorer",
     "Ignore": "Ignorer",
     "Invite": "Inviter",
-    "User Options": "Options d'utilisateur",
     "Admin Tools": "Outils d'administration",
     "Unpin Message": "Dépingler le message",
     "Jump to message": "Aller au message",
@@ -507,8 +459,6 @@
     "Members only (since they were invited)": "Seulement les membres (depuis leur invitation)",
     "Members only (since they joined)": "Seulement les membres (depuis leur arrivée)",
     "New community ID (e.g. +foo:%(localDomain)s)": "Nouvel identifiant de communauté (par ex. +foo:%(localDomain)s)",
-    "Message removed by %(userId)s": "Message supprimé par %(userId)s",
-    "Message removed": "Message supprimé",
     "An email has been sent to %(emailAddress)s": "Un e-mail a été envoyé à %(emailAddress)s",
     "A text message has been sent to %(msisdn)s": "Un message a été envoyé à %(msisdn)s",
     "Remove from community": "Supprimer de la communauté",
@@ -621,8 +571,6 @@
     "Create a new community": "Créer une nouvelle communauté",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Créez une communauté pour grouper des utilisateurs et des salons ! Construisez une page d'accueil personnalisée pour distinguer votre espace dans l'univers Matrix.",
     "Mirror local video feed": "Inverser horizontalement la vidéo locale (effet miroir)",
-    "Light theme": "Thème clair",
-    "Dark theme": "Thème sombre",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Un e-mail a été envoyé à %(emailAddress)s. Après avoir suivi le lien présent dans celui-ci, cliquez ci-dessous.",
     "Ignores a user, hiding their messages from you": "Ignore un utilisateur, en masquant ses messages",
     "Stops ignoring a user, showing their messages going forward": "N'ignore plus un utilisateur, en affichant ses messages à partir de maintenant",
@@ -661,37 +609,29 @@
     "Display your community flair in rooms configured to show it.": "Sélectionnez les badges dans les paramètres de chaque salon pour les afficher.",
     "expand": "développer",
     "collapse": "réduire",
-    "Call Failed": "Échec de l'appel",
-    "Review Devices": "Passer en revue les appareils",
-    "Call Anyway": "Appeler quand même",
-    "Answer Anyway": "Répondre quand même",
-    "Call": "Appel",
-    "Answer": "Répondre",
+    "Call Failed": "L'appel a échoué",
     "Send": "Envoyer",
     "Old cryptography data detected": "Anciennes données de chiffrement détectées",
-    "Data from an older version of Riot 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.": "Nous avons détecté des données d'une ancienne version de Riot. Le chiffrement de bout en bout n'aura pas fonctionné correctement sur l'ancienne version. Les messages chiffrés échangés récemment dans l'ancienne version ne sont peut-être pas déchiffrables dans cette version. Les échanges de message avec cette version peuvent aussi échouer. Si vous rencontrez des problèmes, déconnectez-vous puis reconnectez-vous. Pour conserver l'historique des messages, exportez puis réimportez vos clés de chiffrement.",
+    "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.": "Nous avons détecté des données d'une ancienne version de %(brand)s. Le chiffrement de bout en bout n'aura pas fonctionné correctement sur l'ancienne version. Les messages chiffrés échangés récemment dans l'ancienne version ne sont peut-être pas déchiffrables dans cette version. Les échanges de message avec cette version peuvent aussi échouer. Si vous rencontrez des problèmes, déconnectez-vous puis reconnectez-vous. Pour conserver l'historique des messages, exportez puis réimportez vos clés de chiffrement.",
     "Warning": "Attention",
     "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.": "Vous ne pourrez pas annuler cette modification car vous vous destituez. Si vous êtes le dernier utilisateur privilégié de ce salon, il sera impossible de récupérer les privilèges.",
     "%(count)s of your messages have not been sent.|one": "Votre message n'a pas été envoyé.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Tout renvoyer</resendText> ou <cancelText>tout annuler</cancelText> maintenant. Vous pouvez aussi choisir des messages individuels à renvoyer ou annuler.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Renvoyer le message</resendText> ou <cancelText>annuler le message</cancelText> maintenant.",
     "Send an encrypted reply…": "Envoyer une réponse chiffrée…",
-    "Send a reply (unencrypted)…": "Envoyer une réponse (non chiffrée)…",
     "Send an encrypted message…": "Envoyer un message chiffré…",
-    "Send a message (unencrypted)…": "Envoyer un message (non chiffré)…",
     "Replying": "Répond",
     "Minimize apps": "Minimiser les applications",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Le respect de votre vie privée est important pour nous, donc nous ne collectons aucune donnée personnelle ou permettant de vous identifier pour nos statistiques.",
     "Learn more about how we use analytics.": "En savoir plus sur notre utilisation des statistiques.",
-    "The information being sent to us to help make Riot.im better includes:": "Les informations qui nous sont envoyées pour nous aider à améliorer Riot.im comprennent :",
+    "The information being sent to us to help make %(brand)s better includes:": "Les informations qui nous sont envoyées et qui nous aident à améliorer %(brand)s comportent :",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Si la page contient des informations permettant de vous identifier, comme un salon, un identifiant d'utilisateur ou de groupe, ces données sont enlevées avant qu'elle ne soit envoyée au serveur.",
     "The platform you're on": "La plateforme que vous utilisez",
-    "The version of Riot.im": "La version de Riot.im",
+    "The version of %(brand)s": "La version de %(brand)s",
     "Your language of choice": "La langue que vous avez choisie",
-    "Which officially provided instance you are using, if any": "Quelle instance officielle vous utilisez, si c'est le cas",
-    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Si vous utilisez le mode de texte enrichi de l'éditeur de texte enrichi",
+    "Which officially provided instance you are using, if any": "L'instance officielle que vous utilisez, si vous en utilisez une",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Si vous utilisez le mode « texte enrichi » de l'éditeur de texte enrichi",
     "Your homeserver's URL": "L'URL de votre serveur d'accueil",
-    "Your identity server's URL": "L'URL de votre serveur d'identité",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s %(day)s %(monthName)s %(fullYear)s",
     "This room is not public. You will not be able to rejoin without an invite.": "Ce salon n'est pas public. Vous ne pourrez pas y revenir sans invitation.",
     "Community IDs cannot be empty.": "Les identifiants de communauté ne peuvent pas être vides.",
@@ -701,7 +641,7 @@
     "Failed to remove tag %(tagName)s from room": "Échec de la suppression de l'étiquette %(tagName)s du salon",
     "Failed to add tag %(tagName)s to room": "Échec de l'ajout de l'étiquette %(tagName)s au salon",
     "Clear filter": "Supprimer les filtres",
-    "Did you know: you can use communities to filter your Riot.im experience!": "Le saviez-vous : vous pouvez utiliser les communautés pour filtrer votre expérience Riot.im !",
+    "Did you know: you can use communities to filter your %(brand)s experience!": "Le saviez-vous : vous pouvez utiliser les communautés pour filtrer votre expérience %(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.": "Pour activer un filtre, faites glisser un avatar de communauté sur le panneau des filtres tout à gauche de l'écran. Vous pouvez cliquer sur un avatar dans ce panneau quand vous le souhaitez afin de ne voir que les salons et les personnes associés à cette communauté.",
     "Key request sent.": "Demande de clé envoyée.",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Vu par %(displayName)s (%(userName)s) à %(dateTime)s",
@@ -721,7 +661,6 @@
     "Who can join this community?": "Qui peut rejoindre cette communauté ?",
     "Everyone": "Tout le monde",
     "Fetching third party location failed": "Échec de la récupération de la localisation tierce",
-    "A new version of Riot is available.": "Une nouvelle version de Riot est disponible.",
     "Send Account Data": "Envoyer les données du compte",
     "All notifications are currently disabled for all targets.": "Toutes les notifications sont désactivées pour tous les appareils.",
     "Uploading report": "Envoi du rapport",
@@ -738,8 +677,6 @@
     "Waiting for response from server": "En attente d’une réponse du serveur",
     "Send Custom Event": "Envoyer l'événement personnalisé",
     "Advanced notification settings": "Paramètres de notification avancés",
-    "delete the alias.": "supprimer l'alias.",
-    "To return to your account in future you need to <u>set a password</u>": "Pour pouvoir retrouver votre compte dans le futur, vous devez <u>définir un mot de passe</u>",
     "Forget": "Oublier",
     "You cannot delete this image. (%(code)s)": "Vous ne pouvez pas supprimer cette image. (%(code)s)",
     "Cancel Sending": "Annuler l'envoi",
@@ -764,7 +701,6 @@
     "No update available.": "Aucune mise à jour disponible.",
     "Resend": "Renvoyer",
     "Collecting app version information": "Récupération des informations de version de l’application",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Supprimer l'alias %(alias)s du salon et supprimer %(name)s du répertoire ?",
     "Keywords": "Mots-clés",
     "Enable notifications for this account": "Activer les notifications pour ce compte",
     "Invite to this community": "Inviter à cette communauté",
@@ -775,7 +711,7 @@
     "Search…": "Rechercher…",
     "You have successfully set a password and an email address!": "Vous avez défini un mot de passe et une adresse e-mail avec succès !",
     "Remove %(name)s from the directory?": "Supprimer %(name)s du répertoire ?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot utilise de nombreuses fonctionnalités avancées du navigateur, certaines ne sont pas disponibles ou expérimentales dans votre navigateur actuel.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s utilise de nombreuses fonctionnalités avancées du navigateur, certaines ne sont pas disponibles ou expérimentales dans votre navigateur actuel.",
     "Developer Tools": "Outils de développement",
     "Remember, you can always set an email address in user settings if you change your mind.": "Souvenez-vous que vous pourrez toujours définir une adresse e-mail dans les paramètres de l'utilisateur si vous changez d’avis.",
     "Explore Account Data": "Explorer les données du compte",
@@ -818,8 +754,7 @@
     "Show message in desktop notification": "Afficher le message dans les notifications de bureau",
     "Unhide Preview": "Dévoiler l'aperçu",
     "Unable to join network": "Impossible de rejoindre le réseau",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Vous les avez probablement configurées dans un autre client que Riot. Vous ne pouvez pas les configurer dans Riot mais elles s'appliquent quand même",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Désolé, Riot <b>n'</b>est <b>pas</b> supporté par votre navigateur.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Désolé, %(brand)s n'est <b>pas</b> supporté par votre navigateur.",
     "Uploaded on %(date)s by %(user)s": "Téléchargé le %(date)s par %(user)s",
     "Messages in group chats": "Messages dans les discussions de groupe",
     "Yesterday": "Hier",
@@ -828,7 +763,7 @@
     "Unable to fetch notification target list": "Impossible de récupérer la liste des appareils recevant les notifications",
     "Set Password": "Définir un mot de passe",
     "Off": "Désactivé",
-    "Riot does not know how to join a room on this network": "Riot ne peut pas joindre un salon sur ce réseau",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s ne peut pas joindre un salon sur ce réseau",
     "Mentions only": "Seulement les mentions",
     "You can now return to your account after signing out, and sign in on other devices.": "Vous pouvez maintenant revenir sur votre compte après vous être déconnecté, et vous identifier sur d'autres appareils.",
     "Enable email notifications": "Activer les notifications par e-mail",
@@ -843,7 +778,6 @@
     "Thank you!": "Merci !",
     "When I'm invited to a room": "Quand je suis invité dans un salon",
     "Checking for an update...": "Recherche de mise à jour...",
-    "There are advanced notifications which are not shown here": "Il existe une configuration avancée des notifications qui ne peut être affichée ici",
     "Logs sent": "Journaux envoyés",
     "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.": "Les journaux de débogage contiennent des données d'usage de l'application qui incluent votre nom d'utilisateur, les identifiants ou alias des salons ou groupes auxquels vous avez rendu visite ainsi que les noms des autres utilisateurs. Ils ne contiennent aucun message.",
     "Failed to send logs: ": "Échec lors de l'envoi des journaux : ",
@@ -852,7 +786,6 @@
     "Popout widget": "Détacher le widget",
     "Every page you use in the app": "Toutes les pages que vous utilisez dans l'application",
     "e.g. <CurrentPageURL>": "par ex. <CurrentPageURL>",
-    "Your User Agent": "Votre user agent",
     "Your device resolution": "La résolution de votre appareil",
     "Always show encryption icons": "Toujours afficher les icônes de chiffrement",
     "Send Logs": "Envoyer les journaux",
@@ -874,9 +807,6 @@
     "e.g. %(exampleValue)s": "par ex. %(exampleValue)s",
     "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é des messages dans Matrix est la même que celle des e-mails. Quand nous oublions vos messages, cela signifie que les messages que vous avez envoyés ne seront partagés avec aucun nouvel utilisateur ou avec les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à ces messages en conserveront leur propre copie.",
     "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)": "Veuillez oublier tous les messages que j'ai envoyé quand mon compte sera désactivé (<b>Avertissement :</b> les futurs utilisateurs verront des conversations incomplètes)",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Veuillez aider Riot.im à s'améliorer en envoyant <UsageDataLink>des données d'utilisation anonymes</UsageDataLink>. Cela utilisera un cookie (veuillez voir notre <PolicyLink>politique de cookie</PolicyLink>).",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Veuillez aider Riot.im à s'améliorer en envoyant <UsageDataLink>des données d'utilisation anonymes</UsageDataLink>. Cela utilisera un cookie.",
-    "Yes, I want to help!": "Oui, je veux aider !",
     "Can't leave Server Notices room": "Impossible de quitter le salon des Annonces du serveur",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ce salon est utilisé pour les messages importants du serveur d'accueil, donc vous ne pouvez pas en partir.",
     "No Audio Outputs detected": "Aucune sortie audio détectée",
@@ -912,9 +842,6 @@
     "Please <a>contact your service administrator</a> to continue using the service.": "Veuillez <a>contacter l'administrateur de votre service</a> pour continuer à l'utiliser.",
     "This homeserver has hit its Monthly Active User limit.": "Ce serveur d'accueil a atteint sa limite mensuelle d'utilisateurs actifs.",
     "This homeserver has exceeded one of its resource limits.": "Ce serveur d'accueil a dépassé une de ses limites de ressources.",
-    "Please <a>contact your service administrator</a> to get this limit increased.": "Veuillez <a>contacter l'administrateur de votre service</a> pour augmenter cette limite.",
-    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "Ce serveur d'accueil a atteint sa limite mensuelle d'utilisateurs actifs donc <b>certains utilisateurs ne pourront pas se connecter</b>.",
-    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Ce serveur d'accueil a atteint une de ses limites de ressources donc <b>certains utilisateurs ne pourront pas se connecter</b>.",
     "Upgrade Room Version": "Mettre à niveau la version du salon",
     "Create a new room with the same name, description and avatar": "Créer un salon avec le même nom, la même description et le même avatar",
     "Update any local room aliases to point to the new room": "Mettre à jour tous les alias du salon locaux pour qu'ils dirigent vers le nouveau salon",
@@ -934,21 +861,14 @@
     "The room upgrade could not be completed": "La mise à niveau du salon n'a pas pu être effectuée",
     "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",
-    "Registration Required": "Enregistrement nécessaire",
-    "You need to register to do this. Would you like to register now?": "Vous devez vous enregistrer pour faire cela. Voulez-vous créer un compte maintenant ?",
     "Unable to connect to Homeserver. Retrying...": "Impossible de se connecter au serveur d'accueil. Reconnexion...",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s a ajouté %(addedAddresses)s comme adresse pour ce salon.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s a ajouté %(addedAddresses)s comme adresses pour ce salon.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s a supprimé %(removedAddresses)s comme adresse pour ce salon.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s a supprimé %(removedAddresses)s comme adresses pour ce salon.",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s a ajouté %(addedAddresses)s et supprimé %(removedAddresses)s comme adresses pour ce salon.",
     "%(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 removed the main address for this room.": "%(senderName)s a supprimé l'adresse principale de ce salon.",
-    "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Riot 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 Riot": "Mise à jour de Riot",
+    "%(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",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Avant de soumettre vos journaux, vous devez <a>créer une « issue » sur GitHub</a> pour décrire votre problème.",
-    "You've previously used Riot 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, Riot needs to resync your account.": "Vous avez utilisé auparavant Riot sur %(host)s avec le chargement différé activé. Dans cette version le chargement différé est désactivé. Comme le cache local n'est pas compatible entre ces deux réglages, Riot doit resynchroniser votre compte.",
-    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Si l'autre version de Riot est encore ouverte dans un autre onglet, merci de le fermer car l'utilisation de Riot sur le même hôte avec le chargement différé activé et désactivé à la fois causera des problèmes.",
+    "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.": "Vous avez utilisé auparavant %(brand)s sur %(host)s avec le chargement différé activé. Dans cette version le chargement différé est désactivé. Comme le cache local n'est pas compatible entre ces deux réglages, %(brand)s doit resynchroniser votre compte.",
+    "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 l'autre version de %(brand)s est encore ouverte dans un autre onglet, merci de le fermer car l'utilisation de %(brand)s sur le même hôte avec le chargement différé activé et désactivé à la fois causera des problèmes.",
     "Incompatible local cache": "Cache local incompatible",
     "Clear cache and resync": "Vider le cache et resynchroniser",
     "Please review and accept the policies of this homeserver:": "Veuillez lire et accepter les politiques de ce serveur d'accueil :",
@@ -957,8 +877,7 @@
     "Open Devtools": "Ouvrir les outils développeur",
     "Show developer tools": "Afficher les outils de développeur",
     "Please review and accept all of the homeserver's policies": "Veuillez lire et accepter toutes les politiques du serveur d'accueil",
-    "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 Riot to do this": "Pour éviter de perdre l'historique de vos discussions, vous devez exporter vos clés avant de vous déconnecter. Vous devez revenir à une version plus récente de Riot pour pouvoir le faire",
-    "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ": "Vous avez utilisé une version plus récente de Riot sur %(host)s. Pour utiliser à nouveau cette version avec le chiffrement de bout en bout, vous devez vous déconnecter et vous reconnecter. ",
+    "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": "Pour éviter de perdre l'historique de vos discussions, vous devez exporter vos clés avant de vous déconnecter. Vous devez revenir à une version plus récente de %(brand)s pour pouvoir le faire",
     "Incompatible Database": "Base de données incompatible",
     "Continue With Encryption Disabled": "Continuer avec le chiffrement désactivé",
     "Sign in with single sign-on": "Se connecter avec l'authentification unique",
@@ -967,34 +886,23 @@
     "Unable to load key backup status": "Impossible de charger l'état de sauvegarde des clés",
     "Backup version: ": "Version de la sauvegarde : ",
     "Algorithm: ": "Algorithme : ",
-    "Enter a passphrase...": "Saisissez un mot de passe…",
     "Next": "Suivant",
     "That matches!": "Ça correspond !",
     "That doesn't match.": "Ça ne correspond pas.",
     "Go back to set it again.": "Retournez en arrière pour la redéfinir.",
-    "Repeat your passphrase...": "Répétez votre mot de passe…",
-    "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Par précaution, vous pouvez l'utiliser pour restaurer l'historique de vos messages chiffrés si vous oubliez votre phrase de récupération.",
-    "Your Recovery Key": "Votre clé de récupération",
-    "Copy to clipboard": "Copier dans le presse-papier",
     "Download": "Télécharger",
     "<b>Print it</b> and store it somewhere safe": "<b>Imprimez-la</b> et conservez-la dans un endroit sûr",
     "<b>Save it</b> on a USB key or backup drive": "<b>Sauvegardez-la</b> sur une clé USB ou un disque de sauvegarde",
     "<b>Copy it</b> to your personal cloud storage": "<b>Copiez-la</b> dans votre espace de stockage personnel en ligne",
     "Set up Secure Message Recovery": "Configurer la récupération de messages sécurisée",
-    "Keep it safe": "Conservez-la en lieu sûr",
-    "Create Key Backup": "Créer la sauvegarde des clés",
     "Unable to create key backup": "Impossible de créer la sauvegarde des clés",
     "Retry": "Réessayer",
     "Unable to load backup status": "Impossible de charger l'état de la sauvegarde",
     "Unable to restore backup": "Impossible de restaurer la sauvegarde",
     "No backup found!": "Aucune sauvegarde n'a été trouvée !",
-    "Backup Restored": "Sauvegarde restaurée",
     "Failed to decrypt %(failedCount)s sessions!": "Le déchiffrement de %(failedCount)s sessions a échoué !",
-    "Restored %(sessionCount)s session keys": "%(sessionCount)s clés de session ont été restaurées",
-    "Enter Recovery Passphrase": "Saisissez la phrase secrète de récupération",
     "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Accédez à l'historique sécurisé de vos messages et configurez la messagerie sécurisée en renseignant votre phrase de récupération.",
     "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Si vous avez oublié votre phrase de récupération vous pouvez <button1>utiliser votre clé de récupération</button1> ou <button2>configurer de nouvelles options de récupération</button2>",
-    "Enter Recovery Key": "Saisissez la clé de récupération",
     "This looks like a valid recovery key!": "Cela ressemble à une clé de récupération valide !",
     "Not a valid recovery key": "Ce n'est pas une clé de récupération valide",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Accédez à l'historique sécurisé de vos messages et configurez la messagerie sécurisée en renseignant votre clé de récupération.",
@@ -1025,8 +933,6 @@
     "Names and surnames by themselves are easy to guess": "Les noms et prénoms seuls sont faciles à deviner",
     "Common names and surnames are easy to guess": "Les noms et prénoms répandus sont faciles à deviner",
     "Use a longer keyboard pattern with more turns": "Utilisez un schéma plus long et avec plus de variations",
-    "Great! This passphrase looks strong enough.": "Super ! Ce mot de passe a l'air assez fort.",
-    "As a safety net, you can use it to restore your encrypted message history.": "En cas de problème, vous pouvez l'utiliser pour restaurer l'historique de vos messages chiffrés.",
     "Failed to load group members": "Échec du chargement des membres du groupe",
     "Failed to invite users to the room:": "Échec de l'invitation d'utilisateurs dans le salon :",
     "There was an error joining the room": "Une erreur est survenue en rejoignant le salon",
@@ -1062,7 +968,6 @@
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Impossible de trouver les profils pour les identifiants Matrix listés ci-dessous. Voulez-vous quand même les inviter ?",
     "Invite anyway and never warn me again": "Inviter quand même et ne plus me prévenir",
     "Invite anyway": "Inviter quand même",
-    "Waiting for %(userId)s to confirm...": "Nous attendons que %(userId)s confirme…",
     "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",
@@ -1114,8 +1019,8 @@
     "Theme": "Thème",
     "Account management": "Gestion du compte",
     "Deactivating your account is a permanent action - be careful!": "La désactivation du compte est une action permanente. Soyez prudent !",
-    "For help with using Riot, click <a>here</a>.": "Pour obtenir de l'aide sur l'utilisation de Riot, cliquez <a>ici</a>.",
-    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "Pour obtenir de l'aide sur l'utilisation de Riot, cliquez <a>ici</a> ou commencez une discussion avec notre bot en utilisant le bouton ci-dessous.",
+    "For help with using %(brand)s, click <a>here</a>.": "Pour obtenir de l'aide sur l'utilisation de %(brand)s, cliquez <a>ici</a>.",
+    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "Pour obtenir de l'aide sur l'utilisation de %(brand)s, cliquez <a>ici</a> ou commencez une discussion avec notre bot en utilisant le bouton ci-dessous.",
     "Help & About": "Aide & À propos",
     "Bug reporting": "Signalement d'anomalies",
     "FAQ": "FAQ",
@@ -1125,9 +1030,8 @@
     "Room list": "Liste de salons",
     "Timeline": "Historique",
     "Autocomplete delay (ms)": "Délai pour l'autocomplétion (ms)",
-    "Chat with Riot Bot": "Discuter avec le bot Riot",
+    "Chat with %(brand)s Bot": "Discuter avec le bot %(brand)s",
     "Roles & Permissions": "Rôles & Permissions",
-    "To link to this room, please add an alias.": "Pour partager ce salon, veuillez créer un alias.",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Les modifications concernant l'accès à l'historique ne s'appliqueront qu'aux futurs messages de ce salon. La visibilité de l'historique existant ne sera pas modifiée.",
     "Security & Privacy": "Sécurité & Vie privée",
     "Encryption": "Chiffrement",
@@ -1144,21 +1048,14 @@
     "Room Name": "Nom du salon",
     "Room Topic": "Sujet du salon",
     "Join": "Rejoindre",
-    "Use Legacy Verification (for older clients)": "Utiliser l'ancienne vérification (pour les vieux logiciels)",
-    "Verify by comparing a short text string.": "Vérifier en comparant une chaîne de caractères courte.",
-    "Begin Verifying": "Commencer la vérification",
-    "Waiting for partner to accept...": "Nous attendons que le partenaire accepte…",
-    "Use two-way text verification": "Utiliser la vérification textuelle bidirectionnelle",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Vérifier cet utilisateur pour le marquer comme fiable. Faire confiance aux utilisateurs vous permet d’être serein quand vous utilisez des messages chiffrés de bout en bout.",
     "Waiting for partner to confirm...": "Nous attendons que le partenaire confirme…",
     "Incoming Verification Request": "Demande de vérification entrante",
     "Go back": "Revenir en arrière",
     "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.": "Pour éviter la duplication de problèmes, veuillez <existingIssuesLink>voir les problèmes existants</existingIssuesLink> d'abord (et ajouter un +1) ou <newIssueLink>créer un nouveau problème</newIssueLink> si vous ne le trouvez pas.",
     "Report bugs & give feedback": "Rapporter des anomalies & Donner son avis",
-    "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "La sauvegarde n'a pas pu être déchiffrée avec cette clé : veuillez vérifier que vous avez saisi la bonne clé de récupération.",
     "Update status": "Mettre à jour le statut",
     "Set status": "Définir le statut",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "Vous pouvez utiliser les options de serveur personnalisé pour vous connecter à d'autres serveurs Matrix en renseignant un autre URL de serveur d'accueil. Cela vous permet d'utiliser cette application avec un compte Matrix existant sur un autre serveur d'accueil.",
     "Your Modular server": "Votre serveur Modular",
     "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Saisissez l'emplacement de votre serveur d'accueil Modular. Il peut utiliser votre nom de domaine personnel ou être un sous-domaine de <a>modular.im</a>.",
     "Server Name": "Nom du serveur",
@@ -1261,9 +1158,6 @@
     "Headphones": "Écouteurs",
     "Folder": "Dossier",
     "Pin": "Épingle",
-    "Recovery Key Mismatch": "La clé de récupération ne correspond pas",
-    "Incorrect Recovery Passphrase": "Phrase de passe de récupération incorrecte",
-    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "La sauvegarde n'a pas pu être déchiffrée avec ce mot de passe : vérifiez que vous avez saisi le bon mot de passe de récupération.",
     "This homeserver would like to make sure you are not a robot.": "Ce serveur d'accueil veut s'assurer que vous n'êtes pas un robot.",
     "Change": "Changer",
     "Couldn't load page": "Impossible de charger la page",
@@ -1283,22 +1177,14 @@
     "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Sauvegardez vos clés de façon sécurisée pour éviter de les perdre. <a>En savoir plus.</a>",
     "Not now": "Pas maintenant",
     "Don't ask me again": "Ne plus me demander",
-    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Rien n'apparaît ? Certains clients ne prennent pas encore en charge la vérification interactive. <button>Utiliser la vérification traditionnelle</button>.",
     "I don't want my encrypted messages": "Je ne veux pas de mes messages chiffrés",
     "Manually export keys": "Exporter manuellement les clés",
     "You'll lose access to your encrypted messages": "Vous perdrez l’accès à vos messages chiffrés",
     "Are you sure you want to sign out?": "Voulez-vous vraiment vous déconnecter ?",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Attention</b> : vous ne devriez configurer la sauvegarde des clés que depuis un ordinateur de confiance.",
     "Hide": "Masquer",
-    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "Nous conserverons une copie chiffrée de vos clés sur notre serveur. Protégez votre sauvegarde avec un mot de passe pour qu'elle reste sécurisée.",
     "For maximum security, this should be different from your account password.": "Pour une sécurité maximale, ceci devrait être différent du mot de passe de votre compte.",
-    "Set up with a Recovery Key": "Configurer une clé de récupération",
-    "Please enter your passphrase a second time to confirm.": "Veuillez saisir votre mot de passe une seconde fois pour le confirmer.",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Votre clé de récupération est une mesure de précaution. Vous pouvez l’utiliser pour restaurer l’accès à vos messages chiffrés si vous oubliez votre mot de passe.",
     "Your keys are being backed up (the first backup could take a few minutes).": "Vous clés sont en cours de sauvegarde (la première sauvegarde peut prendre quelques minutes).",
-    "Secure your backup with a passphrase": "Protégez votre sauvegarde avec un mot de passe",
-    "Confirm your passphrase": "Confirmez votre mot de passe",
-    "Recovery key": "Clé de récupération",
     "Success!": "Terminé !",
     "Allow Peer-to-Peer for 1:1 calls": "Autoriser les connexions pair-à-pair pour les appels individuels",
     "Credits": "Crédits",
@@ -1308,14 +1194,9 @@
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s a désactivé le badge pour %(groups)s dans ce salon.",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s a activé le badge pour %(newGroups)s et désactivé le badge pour %(oldGroups)s dans ce salon.",
     "Show read receipts sent by other users": "Afficher les accusés de lecture envoyés par les autres utilisateurs",
-    "Order rooms in the room list by most important first instead of most recent": "Trier les salons dans la liste des salons avec le plus important en premier plutôt que le plus récent",
     "Scissors": "Ciseaux",
     "Error updating main address": "Erreur lors de la mise à jour de l’adresse principale",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Une erreur est survenue lors de la mise à jour de l’adresse principale de salon. Ce n’est peut-être pas autorisé par le serveur ou une erreur temporaire est survenue.",
-    "Error creating alias": "Erreur lors de la création de l’alias",
-    "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "Une erreur est survenue lors de la création de cet alias. Ce n’est peut-être pas autorisé par le serveur ou une erreur temporaire est survenue.",
-    "Error removing alias": "Erreur lors de la suppression de l’alias",
-    "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "Une erreur est survenue lors de la suppression de cet alias. Il n’existe peut-être plus ou une erreur temporaire est survenue.",
     "Error updating flair": "Erreur lors de la mise à jour du badge",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Une erreur est survenue lors de la mise à jour du badge pour ce salon. Ce serveur ne l’autorise peut-être pas ou une erreur temporaire est survenue.",
     "Room Settings - %(roomName)s": "Paramètres du salon – %(roomName)s",
@@ -1369,8 +1250,8 @@
     "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.": "Un widget provenant de %(widgetUrl)s souhaite vérifier votre identité. Si vous acceptez cela, le widget pourra vérifier votre identifiant d’utilisateur mais il ne pourra rien faire en se faisant passer pour vous.",
     "Remember my selection for this widget": "Se souvenir de mon choix pour ce widget",
     "Deny": "Refuser",
-    "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot n’a pas pu récupérer la liste des protocoles depuis le serveur d’accueil. Ce serveur d’accueil est peut-être trop vieux pour prendre en charge les réseaux tiers.",
-    "Riot failed to get the public room list.": "Riot n’a pas pu récupérer la liste des salons publics.",
+    "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s n’a pas pu récupérer la liste des protocoles depuis le serveur d’accueil. Ce serveur d’accueil est peut-être trop vieux pour prendre en charge les réseaux tiers.",
+    "%(brand)s failed to get the public room list.": "%(brand)s n’a pas pu récupérer la liste des salons publics.",
     "The homeserver may be unavailable or overloaded.": "Le serveur d’accueil est peut-être indisponible ou surchargé.",
     "You have %(count)s unread notifications in a prior version of this room.|other": "Vous avez %(count)s notifications non lues dans une version précédente de ce salon.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Vous avez %(count)s notification non lue dans une version précédente de ce salon.",
@@ -1398,7 +1279,6 @@
     "Upload %(count)s other files|one": "Envoyer %(count)s autre fichier",
     "Cancel All": "Tout annuler",
     "Upload Error": "Erreur d’envoi",
-    "A conference call could not be started because the integrations server is not available": "L’appel en téléconférence n’a pas pu être lancé car les intégrations du serveur ne sont pas disponibles",
     "The server does not support the room version specified.": "Le serveur ne prend pas en charge la version de salon spécifiée.",
     "Name or Matrix ID": "Nom ou identifiant Matrix",
     "Changes your avatar in this current room only": "Change votre avatar seulement dans le salon actuel",
@@ -1467,7 +1347,6 @@
     "Create your Matrix account on <underlinedServerName />": "Créez votre compte Matrix sur <underlinedServerName />",
     "Your Matrix account on <underlinedServerName />": "Votre compte Matrix sur <underlinedServerName />",
     "Low bandwidth mode": "Mode faible bande passante",
-    "Show recently visited rooms above the room list": "Afficher les salons visités récemment au dessus de la liste des salons",
     "Uploaded sound": "Son téléchargé",
     "Sounds": "Sons",
     "Notification sound": "Son de notification",
@@ -1476,8 +1355,8 @@
     "Browse": "Parcourir",
     "Cannot reach homeserver": "Impossible de joindre le serveur d’accueil",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Vérifiez que vous avec une connexion internet stable ou contactez l’administrateur du serveur",
-    "Your Riot is misconfigured": "Votre Riot est mal configuré",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Demandez à votre administrateur Riot de vérifier que <a>votre configuration</a> ne contient pas d’entrées incorrectes ou en double.",
+    "Your %(brand)s is misconfigured": "Votre %(brand)s est mal configuré",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Demandez à votre administrateur %(brand)s de vérifier que <a>votre configuration</a> ne contient pas d’entrées incorrectes ou en double.",
     "Unexpected error resolving identity server configuration": "Une erreur inattendue est survenue pendant la résolution de la configuration du serveur d’identité",
     "Use lowercase letters, numbers, dashes and underscores only": "Utiliser uniquement des lettres minuscules, chiffres, traits d’union et tirets bas",
     "Cannot reach identity server": "Impossible de joindre le serveur d’identité",
@@ -1553,9 +1432,9 @@
     "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Vous n’utilisez actuellement aucun serveur d’identité. Pour découvrir et être découvert par les contacts existants que vous connaissez, ajoutez-en un ci-dessous.",
     "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.": "La déconnexion de votre serveur d’identité signifie que vous ne serez plus découvrable par d’autres utilisateurs et que vous ne pourrez plus faire d’invitation par e-mail ou téléphone.",
     "Integration Manager": "Gestionnaire d’intégration",
-    "Call failed due to misconfigured server": "Échec de l’appel à cause d’un serveur mal configuré",
+    "Call failed due to misconfigured server": "L’appel a échoué à cause d’un serveur mal configuré",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Demandez à l’administrateur de votre serveur d’accueil (<code>%(homeserverDomain)s</code>) de configurer un serveur TURN afin que les appels fonctionnent de manière fiable.",
-    "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.": "Sinon, vous pouvez essayer d’utiliser le serveur public à <code>turn.matrix.org</code>, mais ça ne sera pas aussi fiable et ça partagera votre adresse IP avec ce serveur. Vous pouvez aussi gérer cela dans les paramètres.",
+    "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.": "Vous pouvez sinon essayer d’utiliser le serveur public <code>turn.matrix.org</code>, mais ça ne sera pas aussi fiable et votre adresse IP sera partagée avec ce serveur. Vous pouvez aussi gérer ce réglage dans les paramètres.",
     "Try using turn.matrix.org": "Essayer d’utiliser turn.matrix.org",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Autoriser le repli sur le serveur d’assistance d’appel turn.matrix.org quand votre serveur n’en fournit pas (votre adresse IP serait partagée lors d’un appel)",
     "Only continue if you trust the owner of the server.": "Continuez seulement si vous faites confiance au propriétaire du serveur.",
@@ -1591,10 +1470,10 @@
     "Sends a message as plain text, without interpreting it as markdown": "Envoie un message en texte brut, sans l’interpréter en format markdown",
     "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Une erreur (%(errcode)s) a été retournée en essayant de valider votre invitation. Vous pouvez essayer de transmettre cette information à un administrateur du salon.",
     "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Cette invitation à %(roomName)s a été envoyée à %(email)s qui n’est pas associé à votre compte",
-    "Link this email with your account in Settings to receive invites directly in Riot.": "Liez cet e-mail à votre compte dans les paramètres pour recevoir les invitations directement dans Riot.",
+    "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Liez cet e-mail à votre compte dans les paramètres pour recevoir les invitations directement dans %(brand)s.",
     "This invite to %(roomName)s was sent to %(email)s": "Cette invitation à %(roomName)s a été envoyée à %(email)s",
-    "Use an identity server in Settings to receive invites directly in Riot.": "Utilisez un serveur d’identité dans les paramètres pour recevoir une invitation directement dans Riot.",
-    "Share this email in Settings to receive invites directly in Riot.": "Partagez cet e-mail dans les paramètres pour recevoir les invitations directement dans Riot.",
+    "Use an identity server in Settings to receive invites directly in %(brand)s.": "Utilisez un serveur d’identité dans les paramètres pour recevoir une invitation directement dans %(brand)s.",
+    "Share this email in Settings to receive invites directly in %(brand)s.": "Partagez cet e-mail dans les paramètres pour recevoir les invitations directement dans %(brand)s.",
     "Error changing power level": "Erreur de changement de rang",
     "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Une erreur est survenue lors du changement de rang de l’utilisateur. Vérifiez que vous avez les permissions nécessaires et réessayez.",
     "Bold": "Gras",
@@ -1636,14 +1515,9 @@
     "Read Marker lifetime (ms)": "Durée de vie du repère de lecture (ms)",
     "Read Marker off-screen lifetime (ms)": "Durée de vie du repère de lecture en dehors de l’écran (ms)",
     "Changes the avatar of the current room": "Change l’avatar du salon actuel",
-    "Room alias": "Alias du salon",
     "e.g. my-room": "par ex. mon-salon",
-    "Please provide a room alias": "Veuillez renseigner un alias de salon",
-    "This alias is available to use": "Cet alias est disponible",
-    "This alias is already in use": "Cet alias est déjà utilisé",
     "Close dialog": "Fermer la boîte de dialogue",
     "Please enter a name for the room": "Veuillez renseigner un nom pour le salon",
-    "Set a room alias to easily share your room with other people.": "Définissez un alias de salon pour partager facilement votre salon avec d’autres personnes.",
     "This room is private, and can only be joined by invitation.": "Ce salon est privé et ne peut être rejoint que sur invitation.",
     "Create a public room": "Créer un salon public",
     "Create a private room": "Créer un salon privé",
@@ -1725,7 +1599,6 @@
     "Error adding ignored user/server": "Erreur lors de l’ajout de l’utilisateur/du serveur ignoré",
     "Something went wrong. Please try again or view your console for hints.": "Une erreur est survenue. Réessayez ou consultez votre console pour des indices.",
     "Error subscribing to list": "Erreur lors de l’inscription à la liste",
-    "Please verify the room ID or alias and try again.": "Vérifiez l’identifiant ou l’alias du salon et réessayez.",
     "Error removing ignored user/server": "Erreur lors de la suppression de l’utilisateur/du serveur ignoré",
     "Error unsubscribing from list": "Erreur lors de la désinscription de la liste",
     "Please try again or view your console for hints.": "Réessayez ou consultez votre console pour des indices.",
@@ -1740,7 +1613,6 @@
     "View rules": "Voir les règles",
     "You are currently subscribed to:": "Vous êtes actuellement inscrit(e) à :",
     "⚠ These settings are meant for advanced users.": "⚠ Ces paramètres sont prévus pour les utilisateurs avancés.",
-    "Add users and servers you want to ignore here. Use asterisks to have Riot 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 remplacer n’importe quel caractère. Par exemple, <code>@bot:*</code> ignorerait tous les utilisateurs qui ont le nom « bot » sur n’importe quel serveur.",
     "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.": "Ignorer les gens est possible grâce à des listes de bannissement qui contiennent des règles sur les personnes à bannir. L’inscription à une liste de bannissement signifie que les utilisateurs/serveurs bloqués par cette liste seront cachés pour vous.",
     "Personal ban list": "Liste de bannissement personnelle",
     "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.": "Votre liste de bannissement personnelle contient tous les utilisateurs/serveurs dont vous ne voulez pas voir les messages personnellement. Quand vous aurez ignoré votre premier utilisateur/serveur, un nouveau salon nommé « Ma liste de bannissement » apparaîtra dans la liste de vos salons − restez dans ce salon pour que la liste de bannissement soit effective.",
@@ -1749,7 +1621,6 @@
     "Subscribed lists": "Listes souscrites",
     "Subscribing to a ban list will cause you to join it!": "En vous inscrivant à une liste de bannissement, vous la rejoindrez !",
     "If this isn't what you want, please use a different tool to ignore users.": "Si ce n’est pas ce que vous voulez, utilisez un autre outil pour ignorer les utilisateurs.",
-    "Room ID or alias of ban list": "Identifiant ou alias du salon de la liste de bannissement",
     "Subscribe": "S’inscrire",
     "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Vous avez ignoré cet utilisateur, donc ses messages sont cachés. <a>Les montrer quand même.</a>",
     "Custom (%(level)s)": "Personnalisé (%(level)s)",
@@ -1765,14 +1636,13 @@
     "Your avatar URL": "L’URL de votre avatar",
     "Your user ID": "Votre identifiant utilisateur",
     "Your theme": "Votre thème",
-    "Riot URL": "URL de Riot",
+    "%(brand)s URL": "URL de %(brand)s",
     "Room ID": "Identifiant du salon",
     "Widget ID": "Identifiant du widget",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "L’utilisation de ce widget pourrait partager des données <helpIcon /> avec %(widgetDomain)s et votre gestionnaire d’intégrations.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "L’utilisation de ce widget pourrait partager des données <helpIcon /> avec %(widgetDomain)s.",
     "Widget added by": "Widget ajouté par",
     "This widget may use cookies.": "Ce widget pourrait utiliser des cookies.",
-    "Enable local event indexing and E2EE search (requires restart)": "Activer l’indexation des événements locaux et la recherche des données chiffrées de bout en bout (nécessite un redémarrage)",
     "Connecting to integration manager...": "Connexion au gestionnaire d’intégrations…",
     "Cannot connect to integration manager": "Impossible de se connecter au gestionnaire d’intégrations",
     "The integration manager is offline or it cannot reach your homeserver.": "Le gestionnaire d’intégrations est hors ligne ou il ne peut pas joindre votre serveur d’accueil.",
@@ -1785,7 +1655,7 @@
     "Integrations are disabled": "Les intégrations sont désactivées",
     "Enable 'Manage Integrations' in Settings to do this.": "Activez « Gérer les intégrations » dans les paramètres pour faire ça.",
     "Integrations not allowed": "Les intégrations ne sont pas autorisées",
-    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Votre Riot ne vous autorise pas à utiliser un gestionnaire d’intégrations pour faire ça. Contactez un administrateur.",
+    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Votre %(brand)s ne vous autorise pas à utiliser un gestionnaire d’intégrations pour faire ça. Contactez un administrateur.",
     "Reload": "Recharger",
     "Take picture": "Prendre une photo",
     "Remove for everyone": "Supprimer pour tout le monde",
@@ -1793,7 +1663,6 @@
     "Decline (%(counter)s)": "Refuser (%(counter)s)",
     "Manage integrations": "Gérer les intégrations",
     "Verification Request": "Demande de vérification",
-    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
     "Match system theme": "S’adapter au thème du système",
     "%(senderName)s placed a voice call.": "%(senderName)s a passé un appel vocal.",
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s a passé un appel vocal. (pas pris en charge par ce navigateur)",
@@ -1809,7 +1678,7 @@
     "Upgrade private room": "Mettre à niveau le salon privé",
     "Upgrade public room": "Mettre à niveau le salon public",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "La mise à niveau d’un salon est une action avancée et qui est généralement recommandée quand un salon est instable à cause d’anomalies, de fonctionnalités manquantes ou de failles de sécurité.",
-    "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Cela n’affecte généralement que la façon dont le salon est traité sur le serveur. Si vous avez des problèmes avec votre Riot, <a>signalez une anomalie</a>.",
+    "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>.": "Cela n’affecte généralement que la façon dont le salon est traité sur le serveur. Si vous avez des problèmes avec votre %(brand)s, <a>signalez une anomalie</a>.",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Vous allez mettre à niveau ce salon de <oldVersion /> vers <newVersion />.",
     "Upgrade": "Mettre à niveau",
     "Notification settings": "Paramètres de notification",
@@ -1818,7 +1687,6 @@
     "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> ont réagi avec %(content)s</reactedWith>",
     "<userName/> wants to chat": "<userName/> veut discuter",
     "Start chatting": "Commencer à discuter",
-    "Send cross-signing keys to homeserver": "Envoyer les clés de signature croisée au serveur d’accueil",
     "Cross-signing public keys:": "Clés publiques de signature croisée :",
     "not found": "non trouvé",
     "Cross-signing private keys:": "Clés privées de signature croisée :",
@@ -1843,22 +1711,11 @@
     "Secret storage public key:": "Clé publique du coffre secret :",
     "in account data": "dans les données du compte",
     "Cross-signing": "Signature croisée",
-    "Enter secret storage passphrase": "Saisir le mot de passe du coffre secret",
-    "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Impossible d’accéder au coffre secret. Vérifiez que le mot de passe saisi est correct.",
-    "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Attention</b> : Vous devriez uniquement accéder au coffre secret depuis un ordinateur de confiance.",
-    "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Si vous avez oublié votre mot de passe, vous pouvez <button1>utiliser votre clé de récupération</button1> ou <button2>définir de nouvelles options de récupération</button2>.",
-    "Enter secret storage recovery key": "Saisir la clé de récupération du coffre secret",
-    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Impossible d’accéder au coffre secret. Vérifiez que vous avez saisi la bonne clé de récupération.",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "Si vous avez oublié votre clé de récupération vous pouvez <button>définir de nouvelles options de récupération</button>.",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Attention</b> : Vous ne devriez configurer la sauvegarde de clés que depuis un ordinateur de confiance.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Si vous avez oublié votre clé de récupération, vous pouvez <button>définir de nouvelles options de récupération</button>",
     "Set up with a recovery key": "Configurer avec une clé de récupération",
-    "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "Par mesure de sécurité, vous pouvez l’utiliser pour récupérer l’accès aux messages chiffrés si vous oubliez votre phrase de passe.",
-    "As a safety net, you can use it to restore your access to encrypted messages.": "Par mesure de sécurité, vous pouvez l’utiliser pour récupérer l’accès à vos messages chiffrés.",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "Conservez votre clé de récupération dans un endroit très sécurisé, comme un gestionnaire de mots de passe (ou un coffre-fort).",
     "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Votre clé de récupération a été <b>copiée dans votre presse-papiers</b>, collez-la pour :",
     "Your recovery key is in your <b>Downloads</b> folder.": "Votre clé de récupération est dans votre dossier de <b>Téléchargements</b>.",
-    "Storing secrets...": "Sauvegarde des secrets…",
     "Unable to set up secret storage": "Impossible de configurer le coffre secret",
     "Cross-signing and secret storage are enabled.": "La signature croisée et le coffre secret sont activés.",
     "Cross-signing and secret storage are not yet set up.": "La signature croisée et le coffre secret ne sont pas encore configurés.",
@@ -1885,7 +1742,6 @@
     "Suggestions": "Suggestions",
     "Failed to find the following users": "Impossible de trouver les utilisateurs suivants",
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Les utilisateurs suivant n’existent peut-être pas ou ne sont pas valides, et ne peuvent pas être invités : %(csvNames)s",
-    "Show a presence dot next to DMs in the room list": "Afficher une pastille de présence à côté des messages directs dans la liste des salons",
     "Lock": "Cadenas",
     "Restore": "Restaurer",
     "a few seconds ago": "il y a quelques secondes",
@@ -1907,9 +1763,6 @@
     "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",
-    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "S’il y a quelqu’un que vous n’arrivez pas à trouver, demandez-lui son nom d’utilisateur (par ex. @utilisateur:serveur.com) ou <a>partagez ce salon</a>.",
-    "Complete security": "Compléter la sécurité",
-    "Verify this session to grant it access to encrypted messages.": "Vérifiez cette session pour l’autoriser à accéder à vos messages chiffrés.",
     "Start": "Commencer",
     "Session verified": "Session vérifiée",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Votre nouvelle session est maintenant vérifiée. Elle a accès à vos messages chiffrés et les autres utilisateurs la verront comme fiable.",
@@ -1925,28 +1778,16 @@
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Vous pouvez utiliser <code>/help</code> pour obtenir la liste des commandes disponibles. Vouliez-vous envoyer un message ?",
     "Hint: Begin your message with <code>//</code> to start it with a slash.": "Astuce : Votre message doit démarrer par <code>//</code> pour commencer par une barre oblique.",
     "Send as message": "Envoyer comme message",
-    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s a ajouté %(addedAddresses)s et %(count)s autres adresses à ce salon",
-    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s a supprimé %(removedAddresses)s et %(count)s autres adresses de ce salon",
-    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s a supprimé %(countRemoved)s et ajouté %(countAdded)s adresses à ce salon",
     "Reject & Ignore user": "Rejeter et ignorer l’utilisateur",
     "Enter your account password to confirm the upgrade:": "Saisissez le mot de passe de votre compte pour confirmer la mise à niveau :",
     "You'll need to authenticate with the server to confirm the upgrade.": "Vous devrez vous identifier avec le serveur pour confirmer la mise à niveau.",
-    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Sécurisez vos clés de chiffrement avec un mot de passe. Pour une sécurité maximale, il devrait être différent du mot de passe de votre compte :",
-    "Enter a passphrase": "Saisissez un mot de passe",
-    "Enter your passphrase a second time to confirm it.": "Saisissez votre mot de passe une seconde fois pour le confirmer.",
-    "Verify other users in their profile.": "Vérifiez d’autres utilisateurs dans leur profil.",
     "Upgrade your encryption": "Mettre à niveau votre chiffrement",
     "Set up encryption": "Configurer le chiffrement",
-    "Encryption upgraded": "Chiffrement mis à niveau",
-    "Encryption setup complete": "Configuration du chiffrement terminé",
-    "%(senderName)s turned on end-to-end encryption.": "%(senderName)s a activé le chiffrement de bout en bout.",
-    "%(senderName)s turned on end-to-end encryption (unrecognised algorithm %(algorithm)s).": "%(senderName)s a activé le chiffrement de bout en bout (algorithme %(algorithm)s non reconnu).",
     "This room is end-to-end encrypted": "Ce salon est chiffré de bout en bout",
     "Everyone in this room is verified": "Tout le monde dans ce salon est vérifié",
     "Invite only": "Uniquement sur invitation",
     "Send a reply…": "Envoyer une réponse…",
     "Send a message…": "Envoyer un message…",
-    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Si vous n’arrivez pas à trouver quelqu’un, demandez-lui son nom d’utilisateur, partagez votre nom d’utilisateur (%(userId)s) ou votre <a>lien de profil</a>.",
     "Verify this session": "Vérifier cette session",
     "Encryption upgrade available": "Mise à niveau du chiffrement disponible",
     "Enable message search in encrypted rooms": "Activer la recherche de messages dans les salons chiffrés",
@@ -1957,17 +1798,13 @@
     "Manage": "Gérer",
     "Securely cache encrypted messages locally for them to appear in search results.": "Mettre en cache les messages chiffrés localement et de manière sécurisée pour qu’ils apparaissent dans les résultats de recherche.",
     "Enable": "Activer",
-    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Il manque quelques composants à Riot pour mettre en cache les messages chiffrés localement de manière sécurisée. Si vous voulez essayer cette fonctionnalité, construisez Riot Desktop vous-même en <nativeLink>ajoutant les composants de recherche</nativeLink>.",
-    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot ne peut pas mettre en cache les messages chiffrés localement de manière sécurisée dans un navigateur web. Utilisez <riotLink>Riot Desktop</riotLink> pour que les messages chiffrés apparaissent dans les résultats de recherche.",
+    "%(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>.": "Il manque quelques composants à %(brand)s pour mettre en cache les messages chiffrés localement de manière sécurisée. Si vous voulez essayer cette fonctionnalité, construisez %(brand)s Desktop vous-même en <nativeLink>ajoutant les composants de recherche</nativeLink>.",
     "Message search": "Recherche de message",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Si l’option est désactivée, les messages des salons chiffrés n’apparaîtront pas dans les résultats de recherche.",
     "Disable": "Désactiver",
-    "Not currently downloading messages for any room.": "Aucun téléchargement de message en cours pour les salons.",
-    "Downloading mesages for %(currentRoom)s.": "Téléchargement des messages pour %(currentRoom)s.",
-    "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot met en cache les messages chiffrés localement et de manière sécurisée pour qu’ils apparaissent dans les résultats de recherche :",
+    "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s met en cache les messages chiffrés localement et de manière sécurisée pour qu’ils apparaissent dans les résultats de recherche :",
     "Space used:": "Espace utilisé :",
     "Indexed messages:": "Messages indexés :",
-    "Number of rooms:": "Nombre de salons :",
     "Waiting for %(displayName)s to verify…": "Nous attendons que %(displayName)s vérifie…",
     "They match": "Ils correspondent",
     "They don't match": "Ils ne correspondent pas",
@@ -1991,33 +1828,21 @@
     "If you can't scan the code above, verify by comparing unique emoji.": "Si vous ne pouvez pas scanner le code ci-dessus, vérifiez en comparant des émojis uniques.",
     "You've successfully verified %(displayName)s!": "Vous avez vérifié %(displayName)s !",
     "Got it": "Compris",
-    "Verification timed out. Start verification again from their profile.": "La vérification a expiré. Recommencez la vérification depuis son profil.",
-    "%(displayName)s cancelled verification. Start verification again from their profile.": "%(displayName)s a annulé la vérification. Recommencez la vérification depuis son profil.",
-    "You cancelled verification. Start verification again from their profile.": "Vous avez annulé la vérification. Recommencez la vérification depuis son profil.",
     "New session": "Nouvelle session",
     "Use this session to verify your new one, granting it access to encrypted messages:": "Utilisez cette session pour vérifier la nouvelle, ce qui lui permettra d’accéder aux messages chiffrés :",
     "If you didn’t sign in to this session, your account may be compromised.": "Si vous ne vous êtes pas connecté à cette session, votre compte est peut-être compromis.",
     "This wasn't me": "Ce n’était pas moi",
     "Your new session is now verified. Other users will see it as trusted.": "Votre nouvelle session est maintenant vérifiée. Les autres utilisateurs la verront comme fiable.",
     "Restore your key backup to upgrade your encryption": "Restaurez votre sauvegarde de clés pour mettre à niveau votre chiffrement",
-    "Back up my encryption keys, securing them with the same passphrase": "Sauvegarder mes clés de chiffrement, en les sécurisant avec le même mot de passe",
-    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Il y a des sessions inconnues dans ce salon : si vous continuez sans les vérifier, quelqu’un pourra espionner votre appel.",
-    "Unverified session": "Session non vérifiée",
     "Verifies a user, session, and pubkey tuple": "Vérifie un utilisateur, une session et une collection de clés publiques",
     "Unknown (user, session) pair:": "Paire (utilisateur, session) inconnue :",
     "Session already verified!": "Session déjà vérifiée !",
     "WARNING: Session already verified, but keys do NOT MATCH!": "ATTENTION : La session a déjà été vérifiée mais les clés NE CORRESPONDENT PAS !",
     "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!": "ATTENTION : ÉCHEC DE LA VÉRIFICATION DE CLÉ ! La clé de signature pour %(userId)s et la session %(deviceId)s est « %(fprint)s » que ne correspond pas à la clé fournie « %(fingerprint)s ». Cela pourrait signifier que vos communications sont interceptées !",
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "La clé de signature que vous avez fournie correspond à celle que vous avez reçue de la session %(deviceId)s de %(userId)s. Session marquée comme vérifiée.",
-    "Enable cross-signing to verify per-user instead of per-session (in development)": "Activer la signature croisée pour vérifier par utilisateur plutôt que par session (en développement)",
-    "Show padlocks on invite only rooms": "Afficher des cadenas sur les salons accessibles uniquement par invitation",
     "Never send encrypted messages to unverified sessions from this session": "Ne jamais envoyer de messages chiffrés aux sessions non vérifiées depuis cette session",
     "Never send encrypted messages to unverified sessions in this room from this session": "Ne jamais envoyer des messages chiffrés aux sessions non vérifiées dans ce salon depuis cette session",
-    "Keep secret storage passphrase in memory for this session": "Conserver le mot de passe du coffre secret en mémoire pour cette session",
-    "Confirm the emoji below are displayed on both devices, in the same order:": "Confirmez que les émojis ci-dessous sont affichés sur les deux appareils, dans le même ordre :",
-    "Verify this device by confirming the following number appears on its screen.": "Vérifiez cet appareil en confirmant que le nombre suivant apparaît sur son écran.",
     "To be secure, do this in person or use a trusted way to communicate.": "Pour être sûr, faites cela en personne ou utilisez un moyen de communication fiable.",
-    "Verify your other sessions easier": "Vérifiez vos autres sessions plus facilement",
     "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.": "Changer votre mot de passe réinitialisera toutes les clés de chiffrement sur toutes les sessions, ce qui rendra l’historique de vos messages illisible, sauf si vous exportez d’abord vos clés de chiffrement et si vous les réimportez ensuite. Dans l’avenir, ce processus sera amélioré.",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Votre compte à une identité de signature croisée dans le coffre secret, mais cette session ne lui fait pas encore confiance.",
     "in memory": "en mémoire",
@@ -2038,23 +1863,16 @@
     "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "La sauvegarde a une session <validity>non valide</validity> de la session <verify>non vérifiée</verify> <device></device>",
     "Backup is not signed by any of your sessions": "La sauvegarde n’est signée par aucune de vos sessions",
     "This backup is trusted because it has been restored on this session": "Cette sauvegarde est fiable car elle a été restaurée sur cette session",
-    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Une sauvegarde de clés est stockée dans le coffre secret, mais cette fonctionnalité n’est pas activée sur cette session. Activez la signature croisée dans le Labo pour modifier l’état de la sauvegarde de clés.",
     "Your keys are <b>not being backed up from this session</b>.": "Vos clés <b>ne sont pas sauvegardées sur cette session</b>.",
     "Enable desktop notifications for this session": "Activer les notifications de bureau pour cette session",
     "Enable audible notifications for this session": "Activer les notifications sonores pour cette session",
     "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Votre mot de passe a été modifié. Vous ne recevrez plus de notifications push sur les autres sessions tant que vous ne vous y serez pas reconnecté",
     "Session ID:": "Identifiant de session :",
     "Session key:": "Clé de session :",
-    "Sessions": "Sessions",
     "A session's public name is visible to people you communicate with": "Le nom public d’une session est visible par les personnes avec lesquelles vous communiquez",
     "This user has not verified all of their sessions.": "Cet utilisateur n’a pas vérifié toutes ses sessions.",
-    "You have not verified this user. This user has verified all of their sessions.": "Vous n’avez pas vérifié cet utilisateur. Cet utilisateur a vérifié toutes ses sessions.",
     "You have verified this user. This user has verified all of their sessions.": "Vous avez vérifié cet utilisateur. Cet utilisateur a vérifié toutes ses sessions.",
     "Someone is using an unknown session": "Quelqu'un utilise une session inconnue",
-    "Some sessions for this user are not trusted": "Certaines sessions de cet utilisateur ne sont pas fiables",
-    "All sessions for this user are trusted": "Toutes les sessions de cet utilisateur sont fiables",
-    "Some sessions in this encrypted room are not trusted": "Certaines sessions dans ce salon chiffré ne sont pas fiables",
-    "All sessions in this encrypted room are trusted": "Toutes les sessions dans ce salon chiffré sont fiables",
     "Mod": "Modo",
     "Your key share request has been sent - please check your other sessions for key share requests.": "Votre demande de partage de clé a été envoyée − vérifiez les demandes de partage de clé sur vos autres sessions.",
     "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.": "Les demandes de partage de clé sont envoyées à vos autres sessions automatiquement. Si vous avez rejeté ou ignoré la demande de partage de clé sur vos autres sessions, cliquez ici pour redemander les clés pour cette session.",
@@ -2062,7 +1880,6 @@
     "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Redemander les clés de chiffrement</requestLink> à vos autres sessions.",
     "Encrypted by an unverified session": "Chiffré par une session non vérifiée",
     "Encrypted by a deleted session": "Chiffré par une session supprimée",
-    "No sessions with registered encryption keys": "Aucune session avec les clés de chiffrement enregistrées",
     "Yours, or the other users’ session": "Votre session ou celle de l’autre utilisateur",
     "%(count)s sessions|other": "%(count)s sessions",
     "%(count)s sessions|one": "%(count)s session",
@@ -2074,36 +1891,18 @@
     "Clear all data in this session?": "Supprimer toutes les données de cette session ?",
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "La suppression de toutes les données de cette session est permanente. Les messages chiffrés seront perdus sauf si les clés ont été sauvegardées.",
     "Verify session": "Vérifier la session",
-    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Pour vérifier que vous pouvez faire confiance à cette session, vérifiez que la clé que vous voyez dans les paramètres de l’utilisateur sur cet appareil correspond à la clé ci-dessous :",
-    "To verify that this session can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this session matches the key below:": "Pour vérifier que vous pouvez faire confiance à cette session, contactez son propriétaire en utilisant un autre moyen (par ex. en personne ou en l’appelant) et demandez-lui si la clé dans ses paramètres de l’utilisateur pour cette session correspond à la clé ci-dessous :",
     "Session name": "Nom de la session",
     "Session key": "Clé de la session",
-    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "Si elle correspond, cliquez sur le bouton Vérifier ci-dessous. Si ce n’est pas le cas, quelqu'un est en train d’intercepter cette session et vous devriez plutôt cliquer sur le bouton Ajouter à la liste noire.",
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Vérifier cet utilisateur marquera sa session comme fiable, et marquera aussi votre session comme fiable pour lui.",
     "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.": "Vérifier cet appareil le marquera comme fiable. Faire confiance à cette appareil vous permettra à vous et aux autres utilisateurs d’être sereins lors de l’utilisation de messages chiffrés.",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Vérifier cet appareil le marquera comme fiable, et les utilisateurs qui ont vérifié avec vous feront confiance à cet appareil.",
-    "You added a new session '%(displayName)s', which is requesting encryption keys.": "Vous avez ajouté une nouvelle session « %(displayName)s » qui demande les clés de chiffrement.",
-    "Your unverified session '%(displayName)s' is requesting encryption keys.": "Votre session non vérifiée « %(displayName)s » demande des clés de chiffrement.",
-    "Loading session info...": "Chargement des informations de la session…",
     "This will allow you to return to your account after signing out, and sign in on other sessions.": "Cela vous permettra de revenir sur votre compte après vous être déconnecté, et de vous connecter sur d’autres sessions.",
-    "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "Vous avez placé les sessions non vérifiées sur liste noire ; pour leur envoyer des messages vous devez les vérifier.",
-    "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Nous vous recommandons d’accomplir le processus de vérification pour chaque session afin de vérifier qu’elles correspondent à leur propriétaire légitime, mais vous pouvez renvoyer ce message sans vérifier si vous préférez.",
-    "Room contains unknown sessions": "Le salon contient des sessions inconnues",
-    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "« %(RoomName)s » contient des sessions que vous n’avez jamais vues auparavant.",
-    "Unknown sessions": "Sessions inconnues",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "Accédez à l’historique de vos messages sécurisés et à votre identité de signature croisée pour vérifier d’autres sessions en renseignant votre mot de passe.",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Accédez à l’historique de vos messages sécurisés et à votre identité de signature croisée pour vérifier d’autres sessions en renseignant votre clé de récupération.",
-    "Message not sent due to unknown sessions being present": "Message non envoyé à cause de la présence de sessions inconnues",
-    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Afficher les sessions</showSessionsText>, <sendAnywayText>envoyer quand même</sendAnywayText> ou <cancelText>annuler</cancelText>.",
     "Without completing security on this session, it won’t have access to encrypted messages.": "Sans compléter la sécurité sur cette session, elle n’aura pas accès aux messages chiffré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.": "Modifier votre mot de passe réinitialisera toutes les clés de chiffrement de bout en bout sur toutes vos sessions, ce qui rendra l’historique de vos messages chiffrés illisible. Configurez la sauvegarde de clés ou exportez vos clés de salon depuis une autre session avant de réinitialiser votre mot de passe.",
     "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.": "Vous avez été déconnecté de toutes les sessions et vous ne recevrez plus de notifications. Pour réactiver les notifications, reconnectez-vous sur chaque appareil.",
     "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.",
-    "Sender session information": "Informations de session de l’expéditeur",
     "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.",
-    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Configurez le chiffrement sur cette session pour lui permettre de 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.",
-    "This session can now verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Cette session peut à présent 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.",
     "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.",
@@ -2112,28 +1911,21 @@
     "You have not verified this user.": "Vous n’avez pas vérifié cet utilisateur.",
     "Recovery key mismatch": "La clé de récupération ne correspond pas",
     "Incorrect recovery passphrase": "Mot de passe de récupération incorrecte",
-    "Backup restored": "Sauvegarde restaurée",
     "Enter recovery passphrase": "Saisir le mot de passe de récupération",
     "Enter recovery key": "Saisir la clé de récupération",
     "Confirm your identity by entering your account password below.": "Confirmez votre identité en saisissant le mot de passe de votre compte ci-dessous.",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Gardez-en une copie en lieu sûr, comme un gestionnaire de mots de passe ou même un coffre.",
     "Your recovery key": "Votre clé de récupération",
     "Copy": "Copier",
-    "You can now verify your other devices, and other users to keep your chats safe.": "Vous pouvez à présent vérifier vos autres appareils et les autres utilisateurs afin que vos discussions restent sûres.",
     "Make a copy of your recovery key": "Faire une copie de votre clé de récupération",
-    "You're done!": "Vous avez terminé !",
     "Create key backup": "Créer une sauvegarde de clé",
     "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 vous l’avez fait accidentellement, vous pouvez configurer les messages sécurisés sur cette session ce qui re-chiffrera l’historique des messages de cette session avec une nouvelle méthode de récupération.",
     "How fast should messages be downloaded.": "À quelle fréquence les messages doivent être téléchargés.",
-    "of ": "sur ",
     "Message downloading sleep time(ms)": "Temps d’attente de téléchargement des messages (ms)",
     "Cancel entering passphrase?": "Annuler la saisie du mot de passe ?",
-    "If you cancel now, you won't complete your secret storage operation!": "Si vous annulez maintenant, vous ne terminerez pas votre opération du coffre secret !",
     "Indexed rooms:": "Salons indexés :",
-    "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s sur %(totalRooms)s",
     "If you cancel now, you won't complete verifying the other user.": "Si vous annuler maintenant, vous ne terminerez pas la vérification de l’autre utilisateur.",
     "If you cancel now, you won't complete verifying your other session.": "Si vous annulez maintenant, vous ne terminerez pas la vérification de votre autre session.",
-    "If you cancel now, you won't complete your secret storage operation.": "Si vous annulez maintenant, vous ne terminerez pas votre opération sur le coffre secret.",
     "Show typing notifications": "Afficher les notifications de saisie",
     "Reset cross-signing and secret storage": "Réinitialiser la signature croisée et le coffre secret",
     "Destroy cross-signing keys?": "Détruire les clés de signature croisée ?",
@@ -2147,18 +1939,13 @@
     "Not Trusted": "Non fiable",
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) s’est connecté à une nouvelle session sans la vérifier :",
     "Ask this user to verify their session, or manually verify it below.": "Demandez à cet utilisateur de vérifier sa session, ou vérifiez-la manuellement ci-dessous.",
-    "Manually Verify": "Vérifier manuellement",
     "Verify by scanning": "Vérifier en scannant",
-    "The version of Riot": "La version de Riot",
-    "Whether you're using Riot on a device where touch is the primary input mechanism": "Si vous utilisez Riot sur un appareil où le toucher est le mécanisme primaire de saisie",
-    "Whether you're using Riot as an installed Progressive Web App": "Si vous utilisez Riot en tant qu’application web progressive (PWA)",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Si vous utilisez %(brand)s sur un appareil où le toucher est le mécanisme primaire de saisie",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Si vous utilisez %(brand)s en tant qu’application web progressive (PWA)",
     "Your user agent": "Votre agent utilisateur",
-    "The information being sent to us to help make Riot better includes:": "Les informations qui nous sont envoyées et qui nous aident à améliorer Riot comportent :",
-    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "La session que vous essayez de vérifier ne prend pas en charge les codes QR ou la vérification d’émojis, qui sont les méthodes prises en charge par Riot. Essayez avec un autre 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.": "La session que vous essayez de vérifier ne prend pas en charge les codes QR ou la vérification d’émojis, qui sont les méthodes prises en charge par %(brand)s. Essayez avec un autre client.",
     "You declined": "Vous avez refusé",
     "%(name)s declined": "%(name)s a refusé",
-    "accepting …": "nous acceptons…",
-    "declining …": "nous refusons…",
     "Your homeserver does not support cross-signing.": "Votre serveur d’accueil ne prend pas en charge la signature croisée.",
     "Homeserver feature support:": "Prise en charge de la fonctionnalité par le serveur d’accueil :",
     "exists": "existant",
@@ -2182,7 +1969,6 @@
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Pour signaler un problème de sécurité lié à Matrix, consultez <a>la politique de divulgation de sécurité</a> de Matrix.org.",
     "Mark all as read": "Tout marquer comme lu",
     "Not currently indexing messages for any room.": "N’indexe aucun message en ce moment.",
-    "Currently indexing: %(currentRoom)s.": "En ce moment, indexe : %(currentRoom)s.",
     "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s sur %(totalRooms)s",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s a ajouté les adresses alternatives %(addresses)s pour ce salon.",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s a ajouté l’adresse alternative %(addresses)s pour ce salon.",
@@ -2191,10 +1977,6 @@
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s a modifié les adresses alternatives de ce salon.",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s a modifié l’adresse principale et les adresses alternatives pour ce salon.",
     "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Une erreur est survenue lors de la mise à jour des adresses alternatives du salon. Ce n’est peut-être pas permis par le serveur ou une défaillance temporaire est survenue.",
-    "Alternative addresses for this room:": "Adresses alternatives pour ce salon :",
-    "This room has no alternative addresses": "Ce salon n’a pas d’adresse alternative",
-    "New address (e.g. #foo:domain)": "Nouvelle adresse (par ex. #foo:domaine)",
-    "Local addresses (unmoderated content)": "Adresses locales (contenu non modéré)",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s a changé le nom du salon de %(oldRoomName)s en %(newRoomName)s.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s a changé les adresses de ce salon.",
     "Support adding custom themes": "Autoriser l’ajout de thèmes personnalisés",
@@ -2203,8 +1985,6 @@
     "Theme added!": "Thème ajouté !",
     "Custom theme URL": "URL personnalisée pour le thème",
     "Add theme": "Ajouter le thème",
-    "You don't have permission to delete the alias.": "Vous n'avez pas la permission de supprimer l'alias.",
-    "Review Sessions": "Vérifier les sessions",
     "Scroll to most recent messages": "Sauter aux messages les plus récents",
     "Local address": "Adresse locale",
     "Published Addresses": "Adresses publiées",
@@ -2214,9 +1994,6 @@
     "New published address (e.g. #alias:server)": "Nouvelles adresses publiées (par ex. #alias:serveur)",
     "Local Addresses": "Adresses locales",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Définissez les adresses de ce salon pour que les utilisateurs puissent trouver ce salon avec votre serveur d’accueil (%(localDomain)s)",
-    "Open an existing session & use it to verify this one, granting it access to encrypted messages.": "Ouvrez une session existante et utilisez-la pour vérifier celle-ci, ce qui lui permettra d’avoir accès aux messages chiffrés.",
-    "Waiting…": "Patientez…",
-    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "Si vous n’avez accès à aucune session, <button>utilisez votre clé de récupération ou votre phrase de passe.</button>",
     "Enter a server name": "Saisissez le nom d’un serveur",
     "Looks good": "Ça a l’air correct",
     "Can't find this server or its room list": "Impossible de trouver ce serveur ou sa liste de salons",
@@ -2237,10 +2014,9 @@
     "a new cross-signing key signature": "une nouvelle signature de clé de signature croisée",
     "a device cross-signing signature": "une signature de signature croisée d’un appareil",
     "a key signature": "une signature de clé",
-    "Riot encountered an error during upload of:": "Riot a rencontré une erreur pendant l’envoi de :",
+    "%(brand)s encountered an error during upload of:": "%(brand)s a rencontré une erreur pendant l’envoi de :",
     "Upload completed": "Envoi terminé",
     "Cancelled signature upload": "Envoi de signature annulé",
-    "Unabled to upload": "Envoi impossible",
     "Signature upload success": "Succès de l’envoi de signature",
     "Signature upload failed": "Échec de l’envoi de signature",
     "Navigation": "Navigation",
@@ -2255,7 +2031,6 @@
     "Toggle Bold": "(Dés)activer le gras",
     "Toggle Italics": "(Dés)activer l’italique",
     "Toggle Quote": "(Dés)activer la citation",
-    "Toggle Markdown": "(Dés)activer le Markdown",
     "New line": "Nouvelle ligne",
     "Navigate recent messages to edit": "Parcourir les messages récents pour éditer",
     "Jump to start/end of the composer": "Sauter au début/à la fin du compositeur",
@@ -2289,12 +2064,7 @@
     "Previous/next unread room or DM": "Salon ou message direct non lu précédent/suivant",
     "Previous/next room or DM": "Salon ou message direct précédent/suivant",
     "Toggle right panel": "Afficher/masquer le panneau de droite",
-    "Secret Storage key format:": "Format de clé du coffre secret :",
-    "outdated": "obsolète",
-    "up to date": "à jour",
-    "Unverified login. Was this you?": "Connexion non vérifiée. Était-ce vous ?",
     "Manually verify all remote sessions": "Vérifier manuellement toutes les sessions à distance",
-    "Update your secure storage": "Mettre à jour votre coffre sécurisé",
     "Self signing private key:": "Clé privée d’auto-signature :",
     "cached locally": "mise en cache localement",
     "not found locally": "non trouvée localement",
@@ -2362,32 +2132,20 @@
     "Failed to set topic": "Échec du changement de sujet",
     "Command failed": "La commande a échoué",
     "Could not find user in room": "Impossible de trouver l’utilisateur dans le salon",
-    "Use an existing session to verify this one, granting it access to encrypted messages.": "Utilisez une session existante pour vérifier celle-ci, ce qui lui permettra d’avoir accès aux messages chiffrés.",
-    "Use your other device to continue…": "Utilisez votre autre appareil pour continuer…",
     "Syncing...": "Synchronisation…",
     "Signing In...": "Authentification…",
     "If you've joined lots of rooms, this might take a while": "Si vous avez rejoint beaucoup de salons, cela peut prendre du temps",
     "If you cancel now, you won't complete your operation.": "Si vous annulez maintenant, vous ne pourrez par terminer votre opération.",
-    "Enable cross-signing to verify per-user instead of per-session": "Activez la signature croisée pour vérifier par utilisateur plutôt que par session",
-    "Keep recovery passphrase in memory for this session": "Conserver la phrase secrète de récupération en mémoire pour cette session",
     "Verify other session": "Vérifier une autre session",
     "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Impossible d’accéder au coffre secret. Vérifiez que vous avez renseigné la bonne phrase secrète de récupération.",
-    "<b>Warning</b>: You should only do this on a trusted computer.": "<b>Attention</b> : Vous devriez faire cela depuis un ordinateur fiable.",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Accédez à l’historique des messages sécurisés et à votre identité de signature croisée en vérifiant d’autres sessions en renseignant votre phrase secrète de récupération.",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Si vous avez oublié votre phrase secrète de récupération, vous pouvez <button1>utiliser votre clé de récupération</button1> ou <button2>définir de nouvelles options de récupération</button2>.",
     "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "La sauvegarde n’a pas pu être déchiffrée avec cette clé de récupération : vérifiez que vous avez renseigné la bonne clé de récupération.",
     "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "La sauvegarde n’a pas pu être déchiffrée avec cette phrase secrète de récupération : vérifiez que vous avez renseigné la bonne phrase secrète de récupération.",
-    "If you can’t access one, <button>use your recovery key or recovery passphrase.</button>": "Si vous ne pouvez pas, <button>utilisez votre clé de récupération ou votre phrase secrète de récupération.</button>",
     "Great! This recovery passphrase looks strong enough.": "Super ! Cette phrase secrète de récupération a l’air suffisamment robuste.",
-    "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:": "Définissez une phrase secrète de récupération pour sécuriser les informations chiffrées et les récupérer si vous vous déconnectez. Elle devrait être différente du mot de passe de votre compte :",
     "Enter a recovery passphrase": "Saisir une phrase secrète de récupération",
-    "Back up encrypted message keys": "Sauvegarder les clés des messages chiffrés",
     "Enter your recovery passphrase a second time to confirm it.": "Saisissez à nouveau votre phrase secrète de récupération pour la confirmer.",
     "Confirm your recovery passphrase": "Confirmer votre phrase secrète de récupération",
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Votre clé de récupération est un filet de sécurité : vous pouvez l’utiliser pour récupérer l’accès à vos messages chiffrés si vous oubliez votre phrase secrète de récupération.",
-    "Confirm recovery passphrase": "Confirmer la phrase secrète de récupération",
     "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Nous conserverons une copie chiffrée de vos clés sur notre serveur. Protégez votre sauvegarde avec une phrase secrète de récupération.",
-    "Enter a recovery passphrase...": "Saisir une phrase secrète de récupération…",
     "Please enter your recovery passphrase a second time to confirm.": "Saisissez à nouveau votre phrase secrète de récupération pour la confirmer.",
     "Repeat your recovery passphrase...": "Répéter votre phrase secrète de récupération…",
     "Secure your backup with a recovery passphrase": "Protégez votre sauvegarde avec une phrase secrète de récupération",
@@ -2401,7 +2159,223 @@
     "Unable to query secret storage status": "Impossible de demander le statut du coffre secret",
     "Verify this login": "Vérifier cette connexion",
     "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Confirmez votre identité en vérifiant cette connexion depuis une de vos autres sessions, cela lui permettra d’avoir accès aux messages chiffrés.",
-    "This requires the latest Riot on your other devices:": "Ceci nécessite la dernière version de Riot sur vos autres appareils :",
+    "This requires the latest %(brand)s on your other devices:": "Ceci nécessite la dernière version de %(brand)s sur vos autres appareils :",
     "or another cross-signing capable Matrix client": "ou un autre client Matrix compatible avec la signature croisée",
-    "Use Recovery Passphrase or Key": "Utiliser la phrase secrète ou la clé de récupération"
+    "Where you’re logged in": "Où vous vous êtes connecté",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Gérez les noms et déconnectez-vous de vos sessions ci-dessous ou <a>vérifiez-les dans votre profil utilisateur</a>.",
+    "Review where you’re logged in": "Vérifier où vous vous êtes connecté",
+    "New login. Was this you?": "Nouvelle connexion. Était-ce vous ?",
+    "Verify all your sessions to ensure your account & messages are safe": "Vérifiez toutes vos sessions pour vous assurer que votre compte et messages sont sécurisés",
+    "Verify the new login accessing your account: %(name)s": "Vérifiez la nouvelle connexion accédant à votre compte : %(name)s",
+    "Restoring keys from backup": "Restauration des clés depuis la sauvegarde",
+    "Fetching keys from server...": "Récupération des clés depuis le serveur…",
+    "%(completed)s of %(total)s keys restored": "%(completed)s clés sur %(total)s restaurées",
+    "Keys restored": "Clés restaurées",
+    "Successfully restored %(sessionCount)s keys": "%(sessionCount)s clés ont été restaurées avec succès",
+    "You signed in to a new session without verifying it:": "Vous vous êtes connecté·e à une nouvelle session sans la vérifier :",
+    "Verify your other session using one of the options below.": "Vérifiez votre autre session en utilisant une des options ci-dessous.",
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Invitez quelqu’un en utilisant leur nom, leur nom d’utilisateur (comme <userId/>), leur adresse e-mail ou <a>partagez ce salon</a>.",
+    "Message deleted": "Message supprimé",
+    "Message deleted by %(name)s": "Message supprimé par %(name)s",
+    "Opens chat with the given user": "Ouvre une discussion avec l’utilisateur fourni",
+    "Sends a message to the given user": "Envoie un message à l’utilisateur fourni",
+    "Waiting for your other session to verify…": "En attente de la vérification depuis votre autre session…",
+    "You've successfully verified your device!": "Vous avez bien vérifié votre appareil !",
+    "To continue, use Single Sign On to prove your identity.": "Pour continuer, utilisez l’authentification unique pour prouver votre identité.",
+    "Confirm to continue": "Confirmer pour continuer",
+    "Click the button below to confirm your identity.": "Cliquez sur le bouton ci-dessous pour confirmer votre identité.",
+    "Confirm encryption setup": "Confirmer la configuration du chiffrement",
+    "Click the button below to confirm setting up encryption.": "Cliquez sur le bouton ci-dessous pour confirmer la configuration du chiffrement.",
+    "QR Code": "Code QR",
+    "Dismiss read marker and jump to bottom": "Ignorer le signet de lecture et aller en bas",
+    "Jump to oldest unread message": "Aller au plus vieux message non lu",
+    "Upload a file": "Envoyer un fichier",
+    "IRC display name width": "Largeur du nom affiché IRC",
+    "Create room": "Créer un salon",
+    "Font scaling": "Mise à l’échelle de la police",
+    "Font size": "Taille de la police",
+    "Size must be a number": "La taille doit être un nombre",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "La taille de police personnalisée doit être comprise entre %(min)s pt et %(max)s pt",
+    "Use between %(min)s pt and %(max)s pt": "Utiliser entre %(min)s pt et %(max)s pt",
+    "Appearance": "Apparence",
+    "Room name or address": "Nom ou adresse du salon",
+    "Joins room with given address": "Rejoint le salon à l’adresse donnée",
+    "Unrecognised room address:": "Adresse de salon non reconnue :",
+    "Please verify the room ID or address and try again.": "Vérifiez l’identifiant ou l’adresse du salon et réessayez.",
+    "Room ID or address of ban list": "Identifiant du salon ou adresse de la liste de bannissement",
+    "To link to this room, please add an address.": "Pour créer un lien vers ce salon, ajoutez une adresse.",
+    "Error creating address": "Erreur lors de la création de l’adresse",
+    "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "Une erreur est survenue lors de la création de l’adresse. Ce n’est peut-être pas autorisé par le serveur ou une erreur temporaire est survenue.",
+    "You don't have permission to delete the address.": "Vous n’avez pas la permission de supprimer cette adresse.",
+    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Une erreur est survenue lors de la suppression de cette adresse. Elle n’existe peut-être plus ou une erreur temporaire est survenue.",
+    "Error removing address": "Erreur lors de la suppression de l’adresse",
+    "Categories": "Catégories",
+    "Room address": "Adresse du salon",
+    "Please provide a room address": "Veuillez fournir une adresse de salon",
+    "This address is available to use": "Cette adresse est disponible",
+    "This address is already in use": "Cette adresse est déjà utilisée",
+    "Set a room address to easily share your room with other people.": "Définissez une adresse de salon pour le partager facilement avec d’autres personnes.",
+    "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.": "Vous avez précédemment utilisé une version plus récente de %(brand)s avec cette session. Pour réutiliser cette version avec le chiffrement de bout en bout, vous devrez vous déconnecter et vous reconnecter.",
+    "Address (optional)": "Adresse (optionnel)",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "Supprimer l’adresse du salon %(alias)s et supprimer %(name)s du répertoire ?",
+    "delete the address.": "supprimer l’adresse.",
+    "Use a different passphrase?": "Utiliser une phrase secrète différente ?",
+    "Help us improve %(brand)s": "Aidez-nous à améliorer %(brand)s",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Envoyez des <UsageDataLink>données anonymes d’utilisation</UsageDataLink> qui nous aident à améliorer %(brand)s. Cela utilisera un <PolicyLink>cookie</PolicyLink>.",
+    "I want to help": "Je veux aider",
+    "Your homeserver has exceeded its user limit.": "Votre serveur d’accueil a dépassé ses limites d’utilisateurs.",
+    "Your homeserver has exceeded one of its resource limits.": "Votre serveur d’accueil a dépassé une de ses limites de ressources.",
+    "Contact your <a>server admin</a>.": "Contactez <a>l’administrateur de votre serveur</a>.",
+    "Ok": "OK",
+    "Set password": "Définir le mot de passe",
+    "To return to your account in future you need to set a password": "Pour réutiliser votre compte à l’avenir, vous devez définir un mot de passe",
+    "Restart": "Redémarrer",
+    "Upgrade your %(brand)s": "Mettre à niveau votre %(brand)s",
+    "A new version of %(brand)s is available!": "Une nouvelle version de %(brand)s est disponible !",
+    "New version available. <a>Update now.</a>": "Nouvelle version disponible. <a>Faire la mise à niveau maintenant.</a>",
+    "Emoji picker": "Sélecteur d’émojis",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "L’administrateur de votre serveur a désactivé le chiffrement de bout en bout par défaut dans les salons privés et les messages directs.",
+    "People": "Personnes",
+    "Switch to light mode": "Passer au mode clair",
+    "Switch to dark mode": "Passer au mode sombre",
+    "Switch theme": "Changer le thème",
+    "Security & privacy": "Sécurité & vie privée",
+    "All settings": "Tous les paramètres",
+    "Feedback": "Commentaire",
+    "No recently visited rooms": "Aucun salon visité récemment",
+    "Sort by": "Trier par",
+    "Unread rooms": "Salons non lus",
+    "Always show first": "Toujours afficher en premier",
+    "Show": "Afficher",
+    "Message preview": "Aperçu de message",
+    "List options": "Options de liste",
+    "Show %(count)s more|other": "En afficher %(count)s de plus",
+    "Show %(count)s more|one": "En afficher %(count)s de plus",
+    "Leave Room": "Quitter le salon",
+    "Room options": "Options du salon",
+    "Activity": "Activité",
+    "A-Z": "A-Z",
+    "Light": "Clair",
+    "Dark": "Sombre",
+    "Customise your appearance": "Personnalisez l’apparence",
+    "Appearance Settings only affect this %(brand)s session.": "Les paramètres d’apparence affecteront uniquement cette session de %(brand)s.",
+    "Looks good!": "Ça a l’air correct !",
+    "Use Recovery Key or Passphrase": "Utiliser la clé ou la phrase secrète de récupération",
+    "Use Recovery Key": "Utiliser la clé de récupération",
+    "Use the improved room list (will refresh to apply changes)": "Utiliser la liste de salons améliorée (actualisera pour appliquer les changements)",
+    "Use custom size": "Utiliser une taille personnalisée",
+    "Hey you. You're the best!": "Eh vous. Vous êtes les meilleurs !",
+    "Message layout": "Mise en page des messages",
+    "Compact": "Compacte",
+    "Modern": "Moderne",
+    "Use a system font": "Utiliser une police du système",
+    "System font name": "Nom de la police du système",
+    "The authenticity of this encrypted message can't be guaranteed on this device.": "L’authenticité de ce message chiffré ne peut pas être garantie sur cet appareil.",
+    "Use a more compact ‘Modern’ layout": "Utiliser une mise en page « moderne » plus compacte",
+    "You joined the call": "Vous avez rejoint l’appel",
+    "%(senderName)s joined the call": "%(senderName)s a rejoint l’appel",
+    "Call in progress": "Appel en cours",
+    "You left the call": "Vous avez quitté l’appel",
+    "%(senderName)s left the call": "%(senderName)s a quitté l’appel",
+    "Call ended": "Appel terminé",
+    "You started a call": "Vous avez démarré un appel",
+    "%(senderName)s started a call": "%(senderName)s a démarré un appel",
+    "Waiting for answer": "En attente d’une réponse",
+    "%(senderName)s is calling": "%(senderName)s appelle",
+    "You created the room": "Vous avez créé le salon",
+    "%(senderName)s created the room": "%(senderName)s a créé le salon",
+    "You made the chat encrypted": "Vous avez activé le chiffrement de la discussion",
+    "%(senderName)s made the chat encrypted": "%(senderName)s a activé le chiffrement de la discussion",
+    "You made history visible to new members": "Vous avez rendu l’historique visible aux nouveaux membres",
+    "%(senderName)s made history visible to new members": "%(senderName)s a rendu l’historique visible aux nouveaux membres",
+    "You made history visible to anyone": "Vous avez rendu l’historique visible à tout le monde",
+    "%(senderName)s made history visible to anyone": "%(senderName)s a rendu l’historique visible à tout le monde",
+    "You made history visible to future members": "Vous avez rendu l’historique visible aux futurs membres",
+    "%(senderName)s made history visible to future members": "%(senderName)s a rendu l’historique visible aux futurs membres",
+    "You were invited": "Vous avez été invité",
+    "%(targetName)s was invited": "%(targetName)s a été invité·e",
+    "You left": "Vous êtes parti·e",
+    "%(targetName)s left": "%(targetName)s est parti·e",
+    "You were kicked (%(reason)s)": "Vous avez été expulsé·e (%(reason)s)",
+    "%(targetName)s was kicked (%(reason)s)": "%(targetName)s a été expulsé·e (%(reason)s)",
+    "You were kicked": "Vous avez été expulsé·e",
+    "%(targetName)s was kicked": "%(targetName)s a été expulsé·e",
+    "You rejected the invite": "Vous avez rejeté l’invitation",
+    "%(targetName)s rejected the invite": "%(targetName)s a rejeté l’invitation",
+    "You were uninvited": "Votre invitation a été révoquée",
+    "%(targetName)s was uninvited": "L’invitation de %(targetName)s a été révoquée",
+    "You were banned (%(reason)s)": "Vous avez été banni·e (%(reason)s)",
+    "%(targetName)s was banned (%(reason)s)": "%(targetName)s a été banni·e (%(reason)s)",
+    "You were banned": "Vous avez été banni·e",
+    "%(targetName)s was banned": "%(targetName)s a été banni·e",
+    "You joined": "Vous avez rejoint le salon",
+    "%(targetName)s joined": "%(targetName)s a rejoint le salon",
+    "You changed your name": "Vous avez changé votre nom",
+    "%(targetName)s changed their name": "%(targetName)s a changé son nom",
+    "You changed your avatar": "Vous avez changé votre avatar",
+    "%(targetName)s changed their avatar": "%(targetName)s a changé son avatar",
+    "%(senderName)s %(emote)s": "%(senderName)s %(emote)s",
+    "%(senderName)s: %(message)s": "%(senderName)s : %(message)s",
+    "You changed the room name": "Vous avez changé le nom du salon",
+    "%(senderName)s changed the room name": "%(senderName)s a changé le nom du salon",
+    "%(senderName)s: %(reaction)s": "%(senderName)s : %(reaction)s",
+    "%(senderName)s: %(stickerName)s": "%(senderName)s : %(stickerName)s",
+    "You uninvited %(targetName)s": "Vous avez révoqué l’invitation de %(targetName)s",
+    "%(senderName)s uninvited %(targetName)s": "%(senderName)s a révoqué l’invitation de %(targetName)s",
+    "You invited %(targetName)s": "Vous avez invité %(targetName)s",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s a invité %(targetName)s",
+    "You changed the room topic": "Vous avez changé le sujet du salon",
+    "%(senderName)s changed the room topic": "%(senderName)s a changé le sujet du salon",
+    "New spinner design": "Nouveau design du spinner",
+    "Message deleted on %(date)s": "Message supprimé le %(date)s",
+    "Wrong file type": "Mauvais type de fichier",
+    "Wrong Recovery Key": "Mauvaise clé de récupération",
+    "Invalid Recovery Key": "Clé de récupération non valide",
+    "Security Phrase": "Phrase de sécurité",
+    "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Saisissez votre phrase de sécurité ou <button>utilisez votre clé de sécurité</button> pour continuer.",
+    "Security Key": "Clé de sécurité",
+    "Use your Security Key to continue.": "Utilisez votre clé de sécurité pour continuer.",
+    "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Protection afin d’éviter de perdre l’accès aux messages et données chiffrés en sauvegardant les clés de chiffrement sur votre serveur.",
+    "Generate a Security Key": "Générer une clé de sécurité",
+    "We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "Nous génèrerons une clé de sécurité que vous devrez stocker dans un endroit sûr, comme un gestionnaire de mots de passe ou un coffre.",
+    "Enter a Security Phrase": "Saisir une phrase de sécurité",
+    "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Utilisez une phrase secrète que vous êtes seul·e à connaître et enregistrez éventuellement une clé de sécurité à utiliser pour la sauvegarde.",
+    "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.": "Saisissez une phrase de sécurité que vous seul·e connaissez, car elle est utilisée pour protéger vos données. Pour plus de sécurité, vous ne devriez pas réutiliser le mot de passe de votre compte.",
+    "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "Stockez votre clé de sécurité dans un endroit sûr, comme un gestionnaire de mots de passe ou un coffre, car elle est utilisée pour protéger vos données chiffrées.",
+    "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Si vous annulez maintenant, vous pourriez perdre vos messages et données chiffrés si vous perdez l’accès à vos identifiants.",
+    "You can also set up Secure Backup & manage your keys in Settings.": "Vous pouvez aussi configurer la sauvegarde sécurisée et gérer vos clés depuis les paramètres.",
+    "Set up Secure backup": "Configurer la sauvegarde sécurisée",
+    "Set a Security Phrase": "Définir une phrase de sécurité",
+    "Confirm Security Phrase": "Confirmer la phrase de sécurité",
+    "Save your Security Key": "Sauvegarder votre clé de sécurité",
+    "Use your account to sign in to the latest version": "Connectez-vous à la nouvelle version",
+    "We’re excited to announce Riot is now Element": "Nous sommes heureux de vous annoncer que Riot est désormais Element",
+    "Riot is now Element!": "Riot est maintenant Element !",
+    "Learn More": "Plus d'infos",
+    "Enable experimental, compact IRC style layout": "Disposition expérimentale compacte style IRC",
+    "Incoming voice call": "Appel vocal entrant",
+    "Incoming video call": "Appel vidéo entrant",
+    "Incoming call": "Appel entrant",
+    "Make this room low priority": "Définir ce salon en priorité basse",
+    "Low priority rooms show up at the bottom of your room list in a dedicated section at the bottom of your room list": "Les salons de priorité basse s'affichent en bas de votre liste de salons, dans une section dédiée",
+    "Show rooms with unread messages first": "Afficher les salons non lus en premier",
+    "Show previews of messages": "Afficher un aperçu des messages",
+    "Use default": "Utiliser la valeur par défaut",
+    "Mentions & Keywords": "Mentions et mots-clés",
+    "Notification options": "Paramètres de notifications",
+    "Unknown caller": "Appelant inconnu",
+    "Favourited": "Favori",
+    "Forget Room": "Oublier le salon",
+    "This room is public": "Ce salon est public",
+    "Edited at %(date)s": "Édité le %(date)s",
+    "Click to view edits": "Cliquez pour éditer",
+    "Go to Element": "Aller à Element",
+    "We’re excited to announce Riot is now Element!": "Nous sommes heureux d'annoncer que Riot est désormais Element !",
+    "Learn more at <a>element.io/previously-riot</a>": "Plus d'infos sur <a>element.io/previously-riot</a>",
+    "Search rooms": "Chercher des salons",
+    "User menu": "Menu d'utilisateur",
+    "%(brand)s Web": "%(brand)s Web",
+    "%(brand)s Desktop": "%(brand)s Desktop",
+    "%(brand)s iOS": "%(brand)s iOS",
+    "%(brand)s X for Android": "%(brand)s X pour Android"
 }
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 346dda09f2..db8a8f8100 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -1,21 +1,16 @@
 {
-    "This email address is already in use": "Xa se está a usar este correo",
+    "This email address is already in use": "Xa se está a usar este email",
     "This phone number is already in use": "Xa se está a usar este teléfono",
     "Failed to verify email address: make sure you clicked the link in the email": "Fallo na verificación do enderezo de correo: asegúrese de ter picado na ligazón do correo",
-    "The remote side failed to pick up": "O interlocutor non respondeu",
+    "The remote side failed to pick up": "O correspondente non respondeu",
     "Unable to capture screen": "Non se puido capturar a pantalla",
     "Existing Call": "Rexistro de chamadas",
-    "You are already in a call.": "Xa está nunha chamada.",
+    "You are already in a call.": "Xa estás nunha chamada.",
     "VoIP is unsupported": "Sen soporte para VoIP",
-    "You cannot place VoIP calls in this browser.": "Non pode establecer chamadas VoIP neste navegador.",
-    "You cannot place a call with yourself.": "Non pode facer unha chamada a si mesmo.",
+    "You cannot place VoIP calls in this browser.": "Non poden establecer chamadas VoIP neste navegador.",
+    "You cannot place a call with yourself.": "Non podes facer unha chamada a ti mesma.",
     "Warning!": "Aviso!",
     "Call Failed": "Fallou a chamada",
-    "Review Devices": "Revisar dispositivos",
-    "Call Anyway": "Chamar igualmente",
-    "Answer Anyway": "Responder igualmente",
-    "Call": "Chamar",
-    "Answer": "Resposta",
     "Call Timeout": "Tempo de resposta de chamada",
     "Upload Failed": "Fallou o envío",
     "Sun": "Dom",
@@ -49,14 +44,13 @@
     "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?",
     "Add rooms to the community": "Engadir salas á comunidade",
-    "Room name or alias": "Nome da sala ou alcume",
     "Add to community": "Engadir á comunidade",
-    "Failed to invite the following users to %(groupId)s:": "Fallo ao convidar os seguintes usuarios a %(groupId)s:",
-    "Failed to invite users to community": "Houbo un fallo convidando usuarios á comunidade",
-    "Failed to invite users to %(groupId)s": "Houbo un fallo convidando usuarios a %(groupId)s",
+    "Failed to invite the following users to %(groupId)s:": "Fallo ao convidar ás seguintes usuarias a %(groupId)s:",
+    "Failed to invite users to community": "Houbo un fallo convidando usuarias á comunidade",
+    "Failed to invite users to %(groupId)s": "Houbo un fallo convidando usuarias a %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Fallo ao engadir as seguintes salas a %(groupId)s:",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot non ten permiso para enviarlle notificacións: comprobe os axustes do navegador",
-    "Riot was not given permission to send notifications - please try again": "Riot non ten permiso para enviar notificacións: inténteo de novo",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s non ten permiso para enviarlle notificacións: comprobe os axustes do navegador",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s non ten permiso para enviar notificacións: inténteo de novo",
     "Unable to enable Notifications": "Non se puideron activar as notificacións",
     "This email address was not found": "Non se atopou este enderezo de correo",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "O seu enderezo de correo semella non estar asociado a un ID Matrix neste servidor.",
@@ -64,10 +58,9 @@
     "Restricted": "Restrinxido",
     "Moderator": "Moderador",
     "Admin": "Administrador",
-    "Start a chat": "Iniciar unha conversa",
     "Operation failed": "Fallou a operación",
     "Failed to invite": "Fallou o convite",
-    "Failed to invite the following users to the %(roomName)s room:": "Houbo un fallo convidando os seguintes usuarios á sala %(roomName)s:",
+    "Failed to invite the following users to the %(roomName)s room:": "Houbo un fallo convidando as seguintes usuarias á sala %(roomName)s:",
     "You need to be logged in.": "Precisa estar conectada.",
     "You need to be able to invite users to do that.": "Precisa autorización para convidar a outros usuarias para poder facer iso.",
     "Unable to create widget.": "Non se puido crear o trebello.",
@@ -82,10 +75,9 @@
     "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.",
-    "Unrecognised room alias:": "Alcumes de sala non recoñecidos:",
     "Ignored user": "Usuaria ignorada",
     "You are now ignoring %(userId)s": "Agora está a ignorar %(userId)s",
-    "Unignored user": "Usuarios non ignorados",
+    "Unignored user": "Usuarias non ignoradas",
     "You are no longer ignoring %(userId)s": "Xa non está a ignorar a %(userId)s",
     "Verified key": "Chave verificada",
     "Reason": "Razón",
@@ -132,22 +124,20 @@
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s eliminado por %(senderName)s",
     "Failure to create room": "Fallou a creación da sala",
     "Server may be unavailable, overloaded, or you hit a bug.": "O servidor podería non estar dispoñible, con sobrecarga ou ter un fallo.",
-    "Send anyway": "Enviar de todos os xeitos",
     "Send": "Enviar",
     "Unnamed Room": "Sala sen nome",
     "Your browser does not support the required cryptography extensions": "O seu navegador non soporta as extensións de criptografía necesarias",
-    "Not a valid Riot keyfile": "Non é un ficheiro de chaves Riot válido",
+    "Not a valid %(brand)s keyfile": "Non é un ficheiro de chaves %(brand)s válido",
     "Authentication check failed: incorrect password?": "Fallou a comprobación de autenticación: contrasinal incorrecto?",
-    "Failed to join room": "Non se puido unir a sala",
+    "Failed to join room": "Non puideches entrar na sala",
     "Message Pinning": "Fixando mensaxe",
-    "Use compact timeline layout": "Utilizar a disposición compacta da liña temporal",
     "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ó lle afecta a vostede)",
+    "Enable URL previews for this room (only affects you)": "Activar avista previa de URL nesta sala (só che afesta 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)",
@@ -176,11 +166,8 @@
     "Confirm password": "Confirme o contrasinal",
     "Change Password": "Cambiar contrasinal",
     "Authentication": "Autenticación",
-    "Device ID": "ID de dispositivo",
     "Last seen": "Visto por última vez",
     "Failed to set display name": "Fallo ao establecer o nome público",
-    "Disable Notifications": "Desactivar notificacións",
-    "Enable Notifications": "Activar ass notificacións",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s  %(fullYear)s",
     "Mirror local video feed": "Copiar fonte de vídeo local",
     "Cannot add any more widgets": "Non pode engadir máis trebellos",
@@ -189,27 +176,24 @@
     "Drop File Here": "Solte aquí o ficheiro",
     "Drop file here to upload": "Solte aquí o ficheiro para subilo",
     " (unsupported)": " (non soportado)",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Únase como <voiceText>voz</voiceText> ou <videoText>vídeo</videoText>.",
+    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Únete como <voiceText>voz</voiceText> ou <videoText>vídeo</videoText>.",
     "Ongoing conference call%(supportedText)s.": "Chamada de conferencia en curso%(supportedText)s.",
     "%(senderName)s sent an image": "%(senderName)s enviou unha imaxe",
     "%(senderName)s sent a video": "%(senderName)s enviou un vídeo",
     "%(senderName)s uploaded a file": "%(senderName)s subiu un ficheiro",
     "Options": "Axustes",
     "Please select the destination room for this message": "Escolla por favor a sala de destino para esta mensaxe",
-    "Blacklisted": "Omitidos",
-    "device id: ": "id dispositivo: ",
     "Disinvite": "Retirar convite",
     "Kick": "Expulsar",
-    "Disinvite this user?": "Retirar convite a este usuario?",
-    "Kick this user?": "Expulsar este usuario?",
+    "Disinvite this user?": "Retirar convite a esta usuaria?",
+    "Kick this user?": "Expulsar esta usuaria?",
     "Failed to kick": "Fallo ao expulsar",
     "Unban": "Non bloquear",
     "Ban": "Bloquear",
-    "Unban this user?": "Non bloquear este usuario?",
-    "Ban this user?": "Bloquear a este usuario?",
-    "Failed to ban user": "Fallo ao bloquear usuario",
-    "Failed to mute user": "Fallo ao acalar usuario",
-    "Failed to toggle moderator status": "Fallo ao mudar a estado de moderador",
+    "Unban this user?": "¿Non bloquear esta usuaria?",
+    "Ban this user?": "¿Bloquear a esta usuaria?",
+    "Failed to ban user": "Fallo ao bloquear usuaria",
+    "Failed to mute user": "Fallo ó silenciar usuaria",
     "Failed to change power level": "Fallo ao cambiar o nivel de permisos",
     "Are you sure?": "Está segura?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Non poderá desfacer este cambio xa que lle estará promocionando e outorgándolle a outra persoa os mesmos permisos que os seus.",
@@ -218,12 +202,8 @@
     "Jump to read receipt": "Ir ao resgardo de lectura",
     "Mention": "Mención",
     "Invite": "Convidar",
-    "User Options": "Axustes de usuaria",
-    "Direct chats": "Conversa directa",
     "Unmute": "Non acalar",
     "Mute": "Acalar",
-    "Revoke Moderator": "Quitar Moderador",
-    "Make Moderator": "Facer Moderador",
     "Admin Tools": "Ferramentas de administración",
     "and %(count)s others...|other": "e %(count)s outras...",
     "and %(count)s others...|one": "e outra máis...",
@@ -236,9 +216,7 @@
     "Video call": "Chamada de vídeo",
     "Upload file": "Subir ficheiro",
     "Send an encrypted reply…": "Enviar unha resposta cifrada…",
-    "Send a reply (unencrypted)…": "Enviar unha resposta (non cifrada)…",
     "Send an encrypted message…": "Enviar unha mensaxe cifrada…",
-    "Send a message (unencrypted)…": "Enviar unha mensaxe (non cifrada)…",
     "You do not have permission to post to this room": "Non ten permiso para comentar nesta sala",
     "Server error": "Fallo no servidor",
     "Server unavailable, overloaded, or something else went wrong.": "Servidor non dispoñible, sobrecargado, ou outra cousa puido fallar.",
@@ -264,8 +242,8 @@
     "Seen by %(userName)s at %(dateTime)s": "Visto por %(userName)s as %(dateTime)s",
     "No rooms to show": "Sen salas que mostrar",
     "Unnamed room": "Sala sen nome",
-    "World readable": "Visible por todos",
-    "Guests can join": "Convidados pódense unir",
+    "World readable": "Visible para todas",
+    "Guests can join": "Convidadas pódense unir",
     "Save": "Gardar",
     "(~%(count)s results)|other": "(~%(count)s resultados)",
     "(~%(count)s results)|one": "(~%(count)s resultado)",
@@ -288,14 +266,14 @@
     "Banned by %(displayName)s": "Non aceptado por %(displayName)s",
     "unknown error code": "código de fallo descoñecido",
     "Failed to forget room %(errCode)s": "Fallo ao esquecer sala %(errCode)s",
-    "Privileged Users": "Usuarios con privilexios",
-    "No users have specific privileges in this room": "Non hai usuarios con privilexios específicos nesta sala",
-    "Banned users": "Usuarios excluídos",
+    "Privileged Users": "Usuarias con privilexios",
+    "No users have specific privileges in this room": "Non hai usuarias con privilexios específicos nesta sala",
+    "Banned users": "Usuarias excluídas",
     "This room is not accessible by remote Matrix servers": "Esta sala non é accesible por servidores Matrix remotos",
     "Leave room": "Deixar a sala",
     "Favourite": "Favorita",
-    "Guests cannot join this room even if explicitly invited.": "Os convidados non se poden unir a esta sala inda que fosen convidados explicitamente.",
-    "Click here to fix": "Pulse aquí para solución",
+    "Guests cannot join this room even if explicitly invited.": "As convidadas non se poden unir a esta sala ainda que fosen convidadas explicitamente.",
+    "Click here to fix": "Preme aquí para solucionar",
     "Who can access this room?": "Quen pode acceder a esta sala?",
     "Only people who have been invited": "Só persoas que foron convidadas",
     "Anyone who knows the room's link, apart from guests": "Calquera que coñeza o enderezo da sala, aparte das convidadas",
@@ -313,10 +291,7 @@
     "Jump to first unread message.": "Ir a primeira mensaxe non lida.",
     "Close": "Pechar",
     "not specified": "non indicado",
-    "Remote addresses for this room:": "Enderezos remotos para esta sala:",
-    "Local addresses for this room:": "O enderezo local para esta sala:",
     "This room has no local addresses": "Esta sala non ten enderezos locais",
-    "New address (e.g. #foo:%(localDomain)s)": "Novos enderezos (ex. #foo:%(localDomain)s)",
     "Invalid community ID": "ID da comunidade non válido",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' non é un ID de comunidade válido",
     "New community ID (e.g. +foo:%(localDomain)s)": "Novo ID da comunidade (ex. +foo:%(localDomain)s)",
@@ -339,12 +314,8 @@
     "Failed to copy": "Fallo ao copiar",
     "Add an Integration": "Engadir unha integración",
     "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?": "Vai ser redirixido a unha web de terceiros para poder autenticar a súa conta e así utilizar %(integrationsUrl)s. Quere continuar?",
-    "Removed or unknown message type": "Tipo de mensaxe descoñecida ou eliminada",
-    "Message removed by %(userId)s": "Mensaxe eliminada por %(userId)s",
-    "Message removed": "Mensaxe eliminada",
     "Custom Server Options": "Opcións personalizadas do servidor",
     "Dismiss": "Rexeitar",
-    "To continue, please enter your password.": "Para continuar, por favor introduza o seu contrasinal.",
     "An email has been sent to %(emailAddress)s": "Enviouse un correo a %(emailAddress)s",
     "Please check your email to continue registration.": "Comprobe o seu correo para continuar co rexistro.",
     "Token incorrect": "Testemuño incorrecto",
@@ -378,20 +349,15 @@
     "You're not currently a member of any communities.": "Ate o momento non é membro de ningunha comunidade.",
     "Unknown Address": "Enderezo descoñecido",
     "Allow": "Permitir",
-    "Delete Widget": "Eliminar trebello",
-    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Quitando un trebello elimínao para todas os usuarios desta sala. Está seguro de querer eliminar este trebello?",
-    "Delete widget": "Eliminar trebello",
+    "Delete Widget": "Eliminar widget",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Quitando un trebello elimínalo para todas as usuarias desta sala. ¿tes certeza de querer eliminar este widget?",
+    "Delete widget": "Eliminar widget",
     "Minimize apps": "Minimizar apps",
     "Edit": "Editar",
     "Create new room": "Crear unha nova sala",
-    "Unblacklist": "Quitar da lista negra",
-    "Blacklist": "Por na lista negra",
-    "Unverify": "Retirar verificación",
-    "Verify...": "Verificar...",
     "No results": "Sen resultados",
     "Communities": "Comunidades",
     "Home": "Inicio",
-    "Could not connect to the integration server": "Non se puido conectar ao servidor de integración",
     "Manage Integrations": "Xestionar integracións",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s uníronse %(count)s veces",
@@ -459,7 +425,7 @@
     "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",
-    "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á certa de que quere quitar (eliminar) este evento? Saiba que si elimina un nome de sala ou cambia o asunto, podería desfacer o cambio.",
+    "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.",
     "Something went wrong whilst creating your community": "Algo fallou mentres se creaba a súa comunidade",
@@ -473,15 +439,10 @@
     "Unknown error": "Fallo descoñecido",
     "Incorrect password": "Contrasinal incorrecto",
     "Deactivate Account": "Desactivar conta",
-    "I verify that the keys match": "Certifico que coinciden as chaves",
     "An error has occurred.": "Algo fallou.",
     "OK": "OK",
-    "Start verification": "Iniciar verificación",
-    "Share without verifying": "Compartir sen verificar",
-    "Ignore request": "Ignorar petición",
-    "Encryption key request": "Petición de chave de cifrado",
     "Unable to restore session": "Non se puido restaurar a sesión",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Si anteriormente utilizou unha versión máis recente de Riot, a súa sesión podería non ser compatible con esta versión. Peche esta ventá e volva a versión máis recente.",
+    "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.": "Se anteriormente utilizaches unha versión máis recente de %(brand)s, a túa sesión podería non ser compatible con esta versión. Pecha esta ventá e volve á versión máis recente.",
     "Invalid Email Address": "Enderezo de correo non válido",
     "This doesn't appear to be a valid email address": "Este non semella ser un enderezo de correo válido",
     "Verification Pending": "Verificación pendente",
@@ -500,10 +461,9 @@
     "Private Chat": "Conversa privada",
     "Public Chat": "Conversa pública",
     "Custom": "Personalizada",
-    "Alias (optional)": "Alias (opcional)",
     "Name": "Nome",
     "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": "Debe unirse a sala para ver os seus ficheiros",
+    "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",
     "Add rooms to the community summary": "Engadir salas ao resumo da comunidade",
@@ -513,9 +473,9 @@
     "Add a Room": "Engadir unha sala",
     "Failed to remove the room from the summary of %(groupId)s": "Algo fallou ao quitar a sala do resumo de %(groupId)s",
     "The room '%(roomName)s' could not be removed from the summary.": "A sala '%(roomName)s' non se puido eliminar do resumo.",
-    "Add users to the community summary": "Engadir usuarios ao resumo da comunidade",
+    "Add users to the community summary": "Engadir usuarias ó resumo da comunidade",
     "Who would you like to add to this summary?": "A quen desexa engadir a este resumo?",
-    "Failed to add the following users to the summary of %(groupId)s:": "Algo fallou ao engadir aos seguintes usuarios ao resumo de %(groupId)s:",
+    "Failed to add the following users to the summary of %(groupId)s:": "Algo fallou ó engadir ás seguintes usuarias ó resumo de %(groupId)s:",
     "Add a User": "Engadir unha usuaria",
     "Failed to remove a user from the summary of %(groupId)s": "Algo fallou ao eliminar a usuaria do resumo de %(groupId)s",
     "The user '%(displayName)s' could not be removed from the summary.": "A usuaria '%(displayName)s' non se puido eliminar do resumo.",
@@ -527,14 +487,14 @@
     "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óstranselle 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 aos membros da comunidade na páxina da comunidade. Os 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:": "Usuarios destacados:",
-    "%(inviter)s has invited you to join this community": "%(inviter)s convidouna a unirse a esta comunidade",
-    "You are an administrator of this community": "Vostede administra esta comunidade",
+    "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",
-    "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 súa comunidade non ten unha descrición longa, ou unha páxina HTML que lle mostrar aos seus participantes.<br />Pulse aquí para abrir os axustes e publicar unha!",
+    "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",
     "Community %(groupId)s not found": "Non se atopou a comunidade %(groupId)s",
@@ -545,15 +505,14 @@
     "Are you sure you want to leave the room '%(roomName)s'?": "Seguro que desexa saír da sala '%(roomName)s'?",
     "Failed to leave room": "Algo fallou ao saír da sala",
     "Signed Out": "Desconectada",
-    "For security, this session has been signed out. Please sign in again.": "Por seguridade, pechouse a sesión. Por favor, conéctese de novo.",
+    "For security, this session has been signed out. Please sign in again.": "Por seguridade, pechouse a sesión. Por favor, conéctate outra vez.",
     "Old cryptography data detected": "Detectouse o uso de criptografía sobre datos antigos",
     "Logout": "Desconectar",
     "Your Communities": "As súas Comunidades",
     "Error whilst fetching joined communities": "Fallo mentres se obtiñas as comunidades unidas",
     "Create a new community": "Crear unha nova comunidade",
-    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crear unha comunidade para agrupar usuarias e salas! Poña unha páxina de inicio personalizada para destacar o seu lugar no universo Matrix.",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crea unha comunidade para agrupar usuarias e salas! Pon unha páxina de inicio personalizada para destacar o teu lugar no universo Matrix.",
     "You have no visible notifications": "Non ten notificacións visibles",
-    "Scroll to bottom of page": "Desprácese ate o final da páxina",
     "%(count)s of your messages have not been sent.|other": "Algunha das súas mensaxes non foron enviadas.",
     "%(count)s of your messages have not been sent.|one": "A súa mensaxe non foi enviada.",
     "%(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> ou ben<cancelText>cancelar todo</cancelText>. Tamén pode seleccionar mensaxes individuais para reenviar ou cancelar.",
@@ -568,22 +527,19 @@
     "Search failed": "Fallou a busca",
     "Server may be unavailable, overloaded, or search timed out :(": "O servidor podería non estar dispoñible, sobrecargado, ou caducou a busca :(",
     "No more results": "Sen máis resultados",
-    "Unknown room %(roomId)s": "Sala descoñecida %(roomId)s",
     "Room": "Sala",
     "Failed to reject invite": "Fallo ao rexeitar o convite",
     "Fill screen": "Encher pantalla",
-    "Click to unmute video": "Pulse para escoitar vídeo",
-    "Click to mute video": "Pulse para acalar video",
-    "Click to unmute audio": "Pulse para escoitar audio",
-    "Click to mute audio": "Pulse para acalar audio",
-    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Intentouse cargar un punto concreto do historial desta sala, pero non ten permiso para ver a mensaxe en cuestión.",
+    "Click to unmute video": "Preme para escoitar vídeo",
+    "Click to mute video": "Preme para acalar video",
+    "Click to unmute audio": "Preme para escoitar audio",
+    "Click to mute audio": "Preme para acalar audio",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Intentouse cargar un punto concreto do historial desta sala, pero non tes permiso para ver a mensaxe en cuestión.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Intentouse cargar un punto específico do historial desta sala, pero non se puido atopar.",
     "Failed to load timeline position": "Fallo ao cargar posición da liña temporal",
     "Uploading %(filename)s and %(count)s others|other": "Subindo %(filename)s e %(count)s máis",
     "Uploading %(filename)s and %(count)s others|zero": "Subindo %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Subindo %(filename)s e %(count)s máis",
-    "Light theme": "Decorado claro",
-    "Dark theme": "Decorado escuro",
     "Sign out": "Desconectar",
     "Failed to change password. Is your password correct?": "Fallo ao cambiar o contrasinal. É correcto o contrasinal?",
     "Success": "Parabéns",
@@ -592,7 +548,7 @@
     "Import E2E room keys": "Importar chaves E2E da sala",
     "Cryptography": "Criptografía",
     "Analytics": "Analytics",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot recolle información analítica anónima para permitirnos mellorar o aplicativo.",
+    "%(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",
@@ -600,7 +556,7 @@
     "Reject all %(invitedRooms)s invites": "Rexeitar todos os %(invitedRooms)s convites",
     "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 Riot to access your microphone/webcam": "Igual ten que permitir manualmente a Riot acceder ao seus micrófono e cámara",
+    "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",
     "No Webcams detected": "Non se detectaron cámaras",
     "Default Device": "Dispositivo por defecto",
@@ -611,20 +567,20 @@
     "Profile": "Perfil",
     "Account": "Conta",
     "Access Token:": "Testemuño de acceso:",
-    "click to reveal": "pulse para revelar",
+    "click to reveal": "Preme para mostrar",
     "Homeserver is": "O servidor de inicio é",
     "Identity Server is": "O servidor de identidade é",
-    "riot-web version:": "versión riot-web:",
+    "%(brand)s version:": "versión %(brand)s:",
     "olm version:": "versión olm:",
     "Failed to send email": "Fallo ao enviar correo electrónico",
     "The email address linked to your account must be entered.": "Debe introducir o correo electrónico ligado a súa conta.",
     "A new password must be entered.": "Debe introducir un novo contrasinal.",
     "New passwords must match each other.": "Os novos contrasinais deben ser coincidentes.",
-    "Data from an older version of Riot 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.": "Detectáronse datos de una versión anterior de Riot. Isto causará un mal funcionamento da criptografía extremo-a-extremo na versión antiga. As mensaxes cifradas extremo-a-extremo intercambiadas mentres utilizaba a versión anterior poderían non ser descifrables en esta versión. Isto tamén podería causar que mensaxes intercambiadas con esta versión tampouco funcionasen. Se ten problemas, desconéctese e conéctese de novo. Para manter o historial de mensaxes, exporte e reimporte as súas chaves.",
-    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Enviouse un correo a %(emailAddress)s. Unha vez siga a ligazón que contén, pulse abaixo.",
-    "I have verified my email address": "Validei o meu enderezo de correo electrónico",
+    "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.": "Detectáronse datos de una versión anterior de %(brand)s. Isto causará un mal funcionamento da criptografía extremo-a-extremo na versión antiga. As mensaxes cifradas extremo-a-extremo intercambiadas mentres utilizaba a versión anterior poderían non ser descifrables en esta versión. Isto tamén podería causar que mensaxes intercambiadas con esta versión tampouco funcionasen. Se ten problemas, desconéctese e conéctese de novo. Para manter o historial de mensaxes, exporte e reimporte as súas chaves.",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Enviouse un correo a %(emailAddress)s. Unha vez sigas a ligazón que contén, preme embaixo.",
+    "I have verified my email address": "Validei o meu enderezo de email",
     "Return to login screen": "Volver a pantalla de conexión",
-    "Send Reset Email": "Enviar correo electrónico de restablecemento",
+    "Send Reset Email": "Enviar email de restablecemento",
     "Incorrect username and/or password.": "Nome de usuaria ou contrasinal non válidos.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Teña en conta que se está a conectar ao servidor %(hs)s, non a matrix.org.",
     "The phone number entered looks invalid": "O número de teléfono introducido non semella ser válido",
@@ -640,7 +596,6 @@
     "Bans user with given id": "Prohibe a usuaria co ID indicado",
     "Define the power level of a user": "Define o nivel de permisos de unha usuaria",
     "Invites user with given id to current room": "Convida a usuaria co id proporcionado a sala actual",
-    "Joins room with given alias": "Únese a sala co alias proporcionado",
     "Kicks user with given id": "Expulsa usuaria co id proporcionado",
     "Changes your display nickname": "Cambia o alcume mostrado",
     "Searches DuckDuckGo for results": "Buscar en DuckDuckGo por resultados",
@@ -651,44 +606,29 @@
     "Emoji": "Emoji",
     "Notify the whole room": "Notificar a toda a sala",
     "Room Notification": "Notificación da sala",
-    "Users": "Usuarios",
-    "unknown device": "dispositivo descoñecido",
-    "NOT verified": "Non validado",
-    "verified": "validado",
-    "Verification": "Validación",
-    "Ed25519 fingerprint": "pegada Ed25519",
-    "User ID": "ID de usuaria",
-    "Curve25519 identity key": "Chave de identidade Curve25519",
-    "none": "nada",
-    "Claimed Ed25519 fingerprint key": "Chave de pegada pedida Ed25519",
-    "Algorithm": "Algoritmo",
-    "unencrypted": "non cifrado",
-    "Decryption error": "Fallo ao descifrar",
+    "Users": "Usuarias",
     "Session ID": "ID de sesión",
-    "End-to-end encryption information": "Información do cifrado extremo-a-extremo",
-    "Event information": "Información do evento",
     "Passphrases must match": "As frases de paso deben coincidir",
     "Passphrase must not be empty": "A frase de paso non pode quedar baldeira",
     "Export room keys": "Exportar chaves da sala",
-    "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ítelle exportar a un ficheiro local as chaves para as mensaxes que recibiu en salas cifradas. Posteriormente permitiralle importar as chaves en outro 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 vostede ve, así que debería ter coidado e gardalo de xeito seguro. Para axudarlle, debe introducir unha frase de paso aquí abaixo que será utilizada para cifrar os datos exportados. Só será posible importar os datos utilizando a mesma frase de paso.",
+    "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",
     "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ítelle importar chaves de cifrado que vostede exportou de outro cliente Matrix. Así poderá descifrar calquera mensaxe que o outro cliente puidese cifrar.",
+    "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.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "O ficheiro exportado estará protexido con unha frase de paso. Debe introducir aquí esa frase de paso para descifrar o ficheiro.",
     "File to import": "Ficheiro a importar",
     "Import": "Importar",
-    "The information being sent to us to help make Riot.im better includes:": "A información enviada a Riot.im para axudarnos a mellorar inclúe:",
-    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Se esta páxina inclúe información identificable como ID de grupo, usuario ou sala, estes datos son eliminados antes de ser enviados ao servidor.",
+    "The information being sent to us to help make %(brand)s better includes:": "A información que nos envías para mellorar %(brand)s inclúe:",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Se esta páxina inclúe información identificable como ID de grupo, usuaria ou sala, estes datos son eliminados antes de ser enviados ó servidor.",
     "The platform you're on": "A plataforma na que está",
-    "The version of Riot.im": "A versión de Riot.im",
+    "The version of %(brand)s": "A versión de %(brand)s",
     "Your language of choice": "A súa preferencia de idioma",
     "Which officially provided instance you are using, if any": "Se a houbese, que instancia oficial está a utilizar",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Se utiliza o modo Richtext ou non do editor de texto enriquecido",
     "Your homeserver's URL": "O URL do seu servidor de inicio",
-    "Your identity server's URL": "O URL da súa identidade no servidor",
     "<a>In reply to</a> <pill>": "<a>En resposta a</a> <pill>",
     "This room is not public. You will not be able to rejoin without an invite.": "Esta sala non é pública. Non poderá volver a ela sen un convite.",
     "This room is not showing flair for any communities": "Esta sala non mostra popularidade para as comunidades",
@@ -698,20 +638,20 @@
     "Failed to remove tag %(tagName)s from room": "Fallo ao eliminar a etiqueta %(tagName)s da sala",
     "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": "Aura",
-    "Showing flair for these communities:": "Mostrar a aura para estas comunidades:",
-    "Display your community flair in rooms configured to show it.": "Mostrar a aura da súa comunidade nas salas configuradas para que a mostren.",
-    "Did you know: you can use communities to filter your Riot.im experience!": "Sabía que pode utilizar as comunidades para mellorar a súa experiencia con Riot.im!",
-    "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, arrastre un avatar da comunidade sobre o panel de filtros na parte esquerda da pantalla. Pode pulsar 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 o usuario con esa ID",
+    "Flair": "Popularidade",
+    "Showing flair for these communities:": "Mostrar 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",
     "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 se puido unir a comunidade",
+    "Unable to join community": "Non te puideches unir a comunidade",
     "Unable to leave community": "Non se puido deixar a comunidade",
-    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Os cambios realizados a súa comunidade <bold1>name</bold1> e <bold2>avatar</bold2> poida que non os vexan outros usuarios ate dentro de 30 minutos.",
-    "Join this community": "Únase a esta comunidade",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Os cambios realizados á túa comunidade <bold1>nome</bold1> e <bold2>avatar</bold2> poida que non os vexan outras usuarias ate dentro de 30 minutos.",
+    "Join this community": "Únete a esta comunidade",
     "Leave this community": "Deixar esta comunidade",
-    "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 enviou un reporte de fallo a través de GitHub, os informes poden axudarnos a examinar o problema. Os informes de fallo conteñen datos do uso do aplicativo incluíndo o seu nome de usuaria, os IDs ou alcumes das salas e grupos que visitou e os nomes de usuaria de outras persoas. Non conteñen mensaxes.",
+    "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 enviaches un informe de fallo a través de GitHub, os informes poden axudarnos a examinar o problema. Os informes de fallo conteñen datos do uso da aplicación incluíndo o teu nome de usuaria, os IDs ou alcumes das salas e grupos que visitaches e os nomes de usuaria de outras persoas. Non conteñen mensaxes.",
     "Submit debug logs": "Enviar informes de depuración",
     "Opens the Developer Tools dialog": "Abre o cadro de Ferramentas de desenvolvemento",
     "Stickerpack": "Iconas",
@@ -721,7 +661,6 @@
     "Who can join this community?": "Quen pode unirse a esta comunidade?",
     "Everyone": "Todo o mundo",
     "Fetching third party location failed": "Fallo ao obter a localización de terceiros",
-    "A new version of Riot is available.": "Está dispoñible unha nova versión de Riot.",
     "Send Account Data": "Enviar datos da conta",
     "All notifications are currently disabled for all targets.": "Todas as notificacións están desactivadas para todos os destinos.",
     "Uploading report": "Informe da subida",
@@ -738,8 +677,6 @@
     "Send Custom Event": "Enviar evento personalizado",
     "Advanced notification settings": "Axustes avanzados de notificación",
     "Failed to send logs: ": "Fallo ao enviar os informes: ",
-    "delete the alias.": "borrar alcume.",
-    "To return to your account in future you need to <u>set a password</u>": "Para volver a súa conta no futuro debe <u>establecer un contrasinal>/u>",
     "Forget": "Esquecer",
     "You cannot delete this image. (%(code)s)": "Non pode eliminar esta imaxe. (%(code)s)",
     "Cancel Sending": "Cancelar o envío",
@@ -756,7 +693,7 @@
     "Please set a password!": "Por favor estableza un contrasinal!",
     "You have successfully set a password!": "Mudou con éxito o seu contrasinal!",
     "An error occurred whilst saving your email notification preferences.": "Algo fallou mentres se gardaban as súas preferencias de notificación.",
-    "Explore Room State": "Explorar estado da sala",
+    "Explore Room State": "Ollar estado da sala",
     "Source URL": "URL fonte",
     "Messages sent by bot": "Mensaxes enviadas por bot",
     "Filter results": "Filtrar resultados",
@@ -765,7 +702,6 @@
     "Resend": "Volver a enviar",
     "Files": "Ficheiros",
     "Collecting app version information": "Obtendo información sobre a versión da app",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Eliminar o alcume da sala %(alias)s e borrar %(name)s do directorio?",
     "Keywords": "Palabras chave",
     "Enable notifications for this account": "Activar notificacións para esta conta",
     "Invite to this community": "Convidar a esta comunidade",
@@ -775,11 +711,11 @@
     "Enter keywords separated by a comma:": "Introduza palabras chave separadas por vírgulas:",
     "Search…": "Buscar…",
     "Remove %(name)s from the directory?": "Eliminar %(name)s do directorio?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot utiliza características avanzadas do navegador, algunhas das cales non están dispoñibles ou son experimentais no seu navegador actual.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s utiliza características avanzadas do navegador, algunhas das cales non están dispoñibles ou son experimentais no seu navegador actual.",
     "Developer Tools": "Ferramentas para desenvolver",
     "Preparing to send logs": "Preparándose para enviar informe",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Lembre que sempre poderá poñer un enderezo de correo nos axustes de usuario se cambiase de idea.",
-    "Explore Account Data": "Explorar datos da conta",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Lembra que sempre poderás poñer un enderezo de email nos axustes de usuaria se cambiases de idea.",
+    "Explore Account Data": "Ollar datos da conta",
     "All messages (noisy)": "Todas as mensaxes (alto)",
     "Saturday": "Sábado",
     "I understand the risks and wish to continue": "Entendo os riscos e desexo continuar",
@@ -789,7 +725,7 @@
     "Failed to set Direct Message status of room": "Fallo ao establecer o estado Mensaxe Directa da sala",
     "Monday": "Luns",
     "Remove from Directory": "Eliminar do directorio",
-    "Enable them now": "Activalos agora",
+    "Enable them now": "Activalas agora",
     "Toolbox": "Ferramentas",
     "Collecting logs": "Obtendo rexistros",
     "You must specify an event type!": "Debe indicar un tipo de evento!",
@@ -819,11 +755,10 @@
     "Back": "Atrás",
     "Reply": "Resposta",
     "Show message in desktop notification": "Mostrar mensaxe nas notificacións de 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.": "Os informes de depuración conteñen datos de utilización do aplicativo como o seu nome de usuario, os IDs ou alcumes de salas e grupos que vostede visitou e os nomes de usuarios doutras usuarias. Non conteñen mensaxes.",
+    "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 informes de depuración conteñen datos de utilización da aplicación como o teu nome de usuaria, os IDs ou alias de salas e grupos que visitachese os nomes de usuaria doutras usuarias. Non conteñen mensaxes.",
     "Unhide Preview": "Desagochar a vista previa",
-    "Unable to join network": "Non se puido conectar a rede",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Pode que os configurase nun cliente diferente de Riot. Non pode establecelos desde Riot pero aínda así aplicaranse",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Desculpe, o seu navegador <b>non pode</b> executar Riot.",
+    "Unable to join network": "Non se puido conectar ca rede",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Desculpe, o seu navegador <b>non pode</b> executar %(brand)s.",
     "Uploaded on %(date)s by %(user)s": "Subido a %(date)s por %(user)s",
     "Messages in group chats": "Mensaxes en grupos de chat",
     "Yesterday": "Onte",
@@ -832,9 +767,9 @@
     "Unable to fetch notification target list": "Non se puido procesar a lista de obxectivo de notificacións",
     "Set Password": "Establecer contrasinal",
     "Off": "Off",
-    "Riot does not know how to join a room on this network": "Riot non sabe como conectar cunha sala nesta rede",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s non sabe como conectar cunha sala nesta rede",
     "Mentions only": "Só mencións",
-    "You can now return to your account after signing out, and sign in on other devices.": "Pode volver a súa contra tras desconectarse, e conectarse en outros dispositivos.",
+    "You can now return to your account after signing out, and sign in on other devices.": "Podes voltar a túa conta tras desconectarte, e conectarte noutros dispositivos.",
     "Enable email notifications": "Activar notificacións de correo",
     "Event Type": "Tipo de evento",
     "Download this file": "Descargue este ficheiro",
@@ -845,12 +780,10 @@
     "View Source": "Ver fonte",
     "Event Content": "Contido do evento",
     "Thank you!": "Grazas!",
-    "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!": "Co seu navegador actual a aparencia e uso do aplicativo poderían estar totalmente falseadas, e algunhas características poderían non funcionar. Se quere pode continuar, pero debe ser consciente de que poden haber fallos!",
+    "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!": "Co teu navegador actual a aparencia e uso da aplicación poderían estar totalmente falseadas, e algunhas características poderían non funcionar. Se queres podes continuar, pero debes ser consciente de que pode haber fallos!",
     "Checking for an update...": "Comprobando as actualizacións...",
-    "There are advanced notifications which are not shown here": "Existen notificacións avanzadas que non se mostran aquí",
     "Every page you use in the app": "Cada páxina que use na aplicación",
     "e.g. <CurrentPageURL>": "p.ex. <CurrentPageURL>",
-    "Your User Agent": "Axente de usuario",
     "Your device resolution": "Resolución do dispositivo",
     "Missing roomId.": "Falta o ID da sala.",
     "Always show encryption icons": "Mostra sempre iconas de cifrado",
@@ -860,25 +793,22 @@
     "Clear Storage and Sign Out": "Limpar o almacenamento e Desconectar",
     "Refresh": "Actualizar",
     "We encountered an error trying to restore your previous session.": "Atopamos un fallo intentando restablecer a súa sesión anterior.",
-    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Limpando o almacenamento do navegador podería resolver o problema, pero desconectarao e non poderá ler o historial cifrado da conversa.",
+    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Limpando o almacenamento do navegador podería resolver o problema, pero desconectarate e non poderás ler o historial cifrado da conversa.",
     "Collapse Reply Thread": "Comprimir o fío de respostas",
     "e.g. %(exampleValue)s": "p.ex. %(exampleValue)s",
     "Send analytics data": "Enviar datos de análises",
     "Enable widget screenshots on supported widgets": "Activar as capturas de trebellos para aqueles que as permiten",
-    "Share Link to User": "Compartir a ligazón co usuario",
+    "Share Link to User": "Compartir a ligazón coa usuaria",
     "Share room": "Compartir sala",
-    "Muted Users": "Usuarios silenciados",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Mellore Riot.im enviando <UsageDataLink>os datos anónimos de uso</UsageDataLink>. Iso suporá o emprego dunha cookie (véxase a nosa <PolicyLink>Política de Cookies</PolicyLink>).",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Mellore Riot.im enviando <UsageDataLink>o uso de datos anónimo</UsageDataLink>. Iso usará unha cookie.",
-    "Yes, I want to help!": "Si, quero axuda",
-    "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 súa deixe de ter uso de xeito permanente. Non poderá acceder e ninguén vai a poder volver a rexistrar esa mesma ID de usuario. Suporá que saía de todas as salas de conversas nas que estaba e eliminará os detalles da súa conta do servidores de identificación.<b>Isto non se poderá desfacer</b>",
+    "Muted Users": "Usuarias silenciadas",
+    "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 ás dos correos electrónicos. Que esquezamos as súas mensaxes significa que as súas mensaxes non se van a compartir con ningún novo membro ou usuario que non estea rexistrado. Mais aqueles usuarios que xa tiveron acceso a estas mensaxes si que seguirán tendo acceso as súas propias copias desas mensaxes.",
+    "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.)",
     "Share Room": "Compartir sala",
     "Link to most recent message": "Ligazón ás mensaxes máis recentes",
-    "Share User": "Compartir usuario",
+    "Share User": "Compartir usuaria",
     "Share Community": "Compartir comunidade",
     "Share Room Message": "Compartir unha mensaxe da sala",
     "Link to selected message": "Ligazón á mensaxe escollida",
@@ -893,10 +823,10 @@
     "Audio Output": "Saída de audio",
     "Call in Progress": "Chamada en progreso",
     "A call is already in progress!": "Xa hai unha chamada en progreso!",
-    "Permission Required": "Precísase de permisos",
-    "You do not have permission to start a conference call in this room": "Non ten permisos para comezar unha chamada de conferencia nesta sala",
+    "Permission Required": "Precísanse permisos",
+    "You do not have permission to start a conference call in this room": "Non tes permisos para comezar unha chamada de conferencia nesta sala",
     "This event could not be displayed": "Non se puido amosar este evento",
-    "Demote yourself?": "Baixarse a si mesmo de rango?",
+    "Demote yourself?": "Baixarse a ti mesma de rango?",
     "Demote": "Baixar de rango",
     "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.": "Nas salas cifradas, como é esta, está desactivado por defecto a previsualización das URL co fin de asegurarse de que o servidor local (que é onde se gardan as previsualizacións) non poida recoller información sobre das ligazóns que se ven nesta sala.",
     "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.": "Cando alguén pon unha URL na mensaxe, esta previsualízarase para que así se coñezan xa cousas delas como o título, a descrición ou as imaxes que inclúe ese sitio web.",
@@ -911,13 +841,1574 @@
     "Please <a>contact your service administrator</a> to continue using the service.": "Por favor <a>contacte coa administración do servizo</a> para seguir utilizando o servizo.",
     "This homeserver has hit its Monthly Active User limit.": "Este servidor acadou o límite mensual de usuarias activas.",
     "This homeserver has exceeded one of its resource limits.": "Este servidor excedeu un dos seus límites de recursos.",
-    "Please <a>contact your service administrator</a> to get this limit increased.": "Por favor <a>contacte coa administración do servizo</a> para incrementar este límite.",
-    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "Este servidor acadou o Límite Mensual de usuarias activas polo que <b>algunhas usuarias non poderán conectar</b>.",
-    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Este servidor excedeu un dos límites de recursos polo que <b>algunhas usuarias no poderán conectar</b>.",
     "Failed to remove widget": "Fallo ao eliminar o widget",
     "An error ocurred whilst trying to remove the widget from the room": "Algo fallou mentras se intentaba eliminar o widget da sala",
     "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 súa mensaxe non foi enviada porque este servidor acadou o Límite Mensual de Usuaria Activa. Por favor <a>contacte coa administración do servizo</a> para continuar utilizando o servizo.",
     "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 súa mensaxe non foi enviada porque o servidor superou o límite de recursos. Por favor <a>contacte coa administración do servizo</a> para continuar utilizando o servizo.",
     "Legal": "Legal",
-    "Please <a>contact your service administrator</a> to continue using this service.": "Por favor <a>contacte coa administración do servizo</a> para continuar utilizando o servizo."
+    "Please <a>contact your service administrator</a> to continue using this service.": "Por favor <a>contacte coa administración do servizo</a> para continuar utilizando o servizo.",
+    "Use Single Sign On to continue": "Usar Single Sign On para continuar",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Confirma que queres engadir este email usando Single Sign On como proba de identidade.",
+    "Single Sign On": "Single Sign On",
+    "Confirm adding email": "Confirma novo email",
+    "Click the button below to confirm adding this email address.": "Preme no botón inferior para confirmar que queres engadir o email.",
+    "Confirm": "Confirmar",
+    "Add Email Address": "Engadir email",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Confirma que queres engadir este teléfono usando Single Sign On como proba de identidade.",
+    "Confirm adding phone number": "Confirma a adición do teléfono",
+    "Click the button below to confirm adding this phone number.": "Preme no botón inferior para confirmar que engades este número.",
+    "Add Phone Number": "Engadir novo Número",
+    "Whether or not you're logged in (we don't record your username)": "Se estás conectada ou non (non rexistramos o teu nome de usuaria)",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Se estás conectada utilizando %(brand)s nun dispositivo maiormente táctil",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Se estás a usar %(brand)s como unha Progressive Web App instalada",
+    "Your user agent": "User Agent do navegador",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Instala <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, ou <safariLink>Safari</safariLink> para ter unha mellor experiencia.",
+    "Sign In or Create Account": "Conéctate ou Crea unha Conta",
+    "Sign In": "Conectar",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Confirma o borrado destas sesións ao usar Single Sign On como proba da túa identidade.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Confirma o borrado desta sesión ao utilizar Single Sign On como proba da túa identidade.",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Xestiona os nomes e pecha as sesións embaixo ou <a>verificaas no teu Perfil de Usuaria</a>.",
+    "Sign Up": "Rexistro",
+    "Sign in with single sign-on": "Conectar usando Single Sign On",
+    "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.": "O eliminación das chaves de sinatura cruzada é permanente. Calquera a quen verificases con elas verá alertas de seguridade. Seguramente non queres facer esto, a menos que perdeses todos os dispositivos nos que podías asinar.",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "Confirma a desactivación da túa conta usando Single Sign On para probar a túa identidade.",
+    "To continue, use Single Sign On to prove your identity.": "Para continuar, usa Single Sign On para probar a túa identidade.",
+    "Are you sure you want to sign out?": "Tes a certeza de querer desconectar?",
+    "If you didn’t sign in to this session, your account may be compromised.": "Se ti non iniciaches esta sesión a túa conta podería estar comprometida.",
+    "Sign out and remove encryption keys?": "Desconectar e eliminar as chaves de cifrado?",
+    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Esto permitirache voltar a túa conta tras desconectar, e conectarte noutras sesións.",
+    "Sign in to your Matrix account on %(serverName)s": "Conecta a túa conta Matrix en %(serverName)s",
+    "Sign in to your Matrix account on <underlinedServerName />": "Conecta a túa conta Matrix en <underlinedServerName />",
+    "Sign in with SSO": "Conecta utilizando SSO",
+    "Sign in instead": "Conectar",
+    "A verification email will be sent to your inbox to confirm setting your new password.": "Ímosche enviar un email para confirmar o teu novo contrasinal.",
+    "Your password has been reset.": "Restableceuse o contrasinal.",
+    "Enter your password to sign in and regain access to your account.": "Escribe o contrasinal para conectarte e retomar o acceso a túa conta.",
+    "Sign in and regain access to your account.": "Conéctate e recupera o acceso a túa conta.",
+    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Non podes conectar a conta. Contacta coa administración do teu servidor para máis información.",
+    "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.": "Aviso: os teus datos personais (incluíndo chaves de cifrado) aínda están gardadas nesta sesión. Pechaa se remataches de usar esta sesión, ou se quere conectar con outra conta.",
+    "Unable to load! Check your network connectivity and try again.": "Non cargou! Comproba a conexión á rede e volta a intentalo.",
+    "Call failed due to misconfigured server": "Fallou a chamada porque o servidor está mal configurado",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Contacta coa administración do teu servidor (<code>%(homeserverDomain)s</code>) para configurar un servidor TURN para que as chamadas funcionen de xeito fiable.",
+    "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.": "De xeito alternativo, podes intentar usar o servidor público <code>turn.matrix.org</code>, pero non é tan fiable, e compartirá o teu enderezo IP con ese servidor. Podes xestionar esto en Axustes.",
+    "Try using turn.matrix.org": "Inténtao usando turn.matrix.org",
+    "Replying With Files": "Respondendo con Ficheiros",
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Neste intre non é posible responder cun ficheiro. Queres subir este ficheiro sen responder?",
+    "The file '%(fileName)s' failed to upload.": "Fallou a subida do ficheiro '%(fileName)s'.",
+    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "O ficheiro '%(fileName)s' supera o tamaño máximo permitido polo servidor",
+    "The server does not support the room version specified.": "O servidor non soporta a versión da sala indicada.",
+    "If you cancel now, you won't complete verifying the other user.": "Se cancelas agora non completarás a verificación da outra usuaria.",
+    "If you cancel now, you won't complete verifying your other session.": "Se cancelas agora non completarás o proceso de verificación da outra sesión.",
+    "If you cancel now, you won't complete your operation.": "Se cancelas agora, non completarás a operación.",
+    "Cancel entering passphrase?": "Cancelar a escrita da frase de paso?",
+    "Setting up keys": "Configurando as chaves",
+    "Verify this session": "Verificar esta sesión",
+    "Encryption upgrade available": "Mellora do cifrado dispoñible",
+    "Set up encryption": "Configurar cifrado",
+    "Review where you’re logged in": "Revisar onde estás conectada",
+    "New login. Was this you?": "Nova conexión. Foches ti?",
+    "Name or Matrix ID": "Nome ou ID Matrix",
+    "Identity server has no terms of service": "O servidor de identidade non ten termos dos servizo",
+    "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.": "Esta acción precisa acceder ao servidor de indentidade <server /> para validar o enderezo de email ou o número de teléfono, pero o servidor non publica os seus termos do servizo.",
+    "Only continue if you trust the owner of the server.": "Continúa se realmente confías no dono do servidor.",
+    "Trust": "Confiar",
+    "%(name)s is requesting verification": "%(name)s está pedindo a verificación",
+    "Use your account or create a new one to continue.": "Usa a túa conta ou crea unha nova para continuar.",
+    "Create Account": "Crear conta",
+    "Custom (%(level)s)": "Personalizado (%(level)s)",
+    "Failed to invite users to the room:": "Fallo a convidar a persoas a sala:",
+    "Messages": "Mensaxes",
+    "Actions": "Accións",
+    "Other": "Outro",
+    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Anteponse ¯\\_(ツ)_/¯  a mensaxe en texto plano",
+    "Sends a message as plain text, without interpreting it as markdown": "Envía unha mensaxe como texto plano, sen interpretalo como markdown",
+    "Sends a message as html, without interpreting it as markdown": "Envía unha mensaxe como html, sen interpretalo como markdown",
+    "Upgrades a room to a new version": "Subir a sala de versión",
+    "You do not have the required permissions to use this command.": "Non tes os permisos suficientes para usar este comando.",
+    "Error upgrading room": "Fallo ao actualizar a sala",
+    "Double check that your server supports the room version chosen and try again.": "Comproba ben que o servidor soporta a versión da sala escollida e inténtao outra vez.",
+    "Changes your display nickname in the current room only": "Cambia o teu nome mostrado só para esta esta sala",
+    "Changes 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",
+    "Gets or sets the room topic": "Obtén ou establece o asunto da sala",
+    "Failed to set topic": "Fallo ao establecer asunto",
+    "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. 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",
+    "Adds a custom widget by URL to the room": "Engade un widget por URL personalizado a sala",
+    "Please supply a widget URL or embed code": "Proporciona o URL do widget ou incrusta o código",
+    "Please supply a https:// or http:// widget URL": "Escribe un https:// ou http:// como URL do widget",
+    "You cannot modify widgets in this room.": "Non podes modificar os widgets desta sala.",
+    "Unknown (user, session) pair:": "Par descoñecido (usuaria, sesión):",
+    "Session already verified!": "A sesión xa está verificada!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "AVISO: xa está verificada a sesión, pero as chaves NON CONCORDAN!",
+    "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!": "AVISO: FALLOU A VERIFICACIÓN DAS CHAVES! A chave de firma para %(userId)s na sesión %(deviceId)s é \"%(fprint)s\" que non concordan coa chave proporcionada \"%(fingerprint)s\". Esto podería significar que as túas comunicacións foron interceptadas!",
+    "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 firma proporcionada concorda coa chave de firma recibida desde a sesión %(deviceId)s de %(userId)s. Sesión marcada como verificada.",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Se usas ou non a función 'breadcrumbs ' (avatares enriba da listaxe de salas)",
+    "Unbans user with given ID": "Desbloquea usuaria co ID dado",
+    "Verifies a user, session, and pubkey tuple": "Verifica unha usuaria, sesión e chave pública",
+    "Forces the current outbound group session in an encrypted room to be discarded": "Forza que se descarte a sesión de saída actual nunha sala cifrada",
+    "Sends the given message coloured as a rainbow": "Envía a mensaxe dada colorida como o arco da vella",
+    "Sends the given emote coloured as a rainbow": "Envía o emoji colorido como un arco da vella",
+    "Displays list of commands with usages and descriptions": "Mostra unha listaxe de comandos con usos e descricións",
+    "Displays information about a user": "Mostra información acerca da usuaria",
+    "Send a bug report with logs": "Envía un informe de fallos con rexistros",
+    "Opens chat with the given user": "Abre unha conversa coa usuaria",
+    "Sends a message to the given user": "Envía unha mensaxe a usuaria",
+    "%(senderName)s made no change.": "%(senderName)s non fixo cambios.",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s cambiou o nome da sala de %(oldRoomName)s a %(newRoomName)s.",
+    "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s actualizou esta sala.",
+    "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s converteu en pública a sala para calquera que teña a ligazón.",
+    "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s fixo que a sala sexa só por convite.",
+    "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s cambiou a regra de participación a %(rule)s",
+    "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s permite que as convidadas se unan a sala.",
+    "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s non permite que as convidadas se unan a sala.",
+    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s cambiou acceso de convidada a %(rule)s",
+    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s activou a popularidade para %(groups)s nesta sala.",
+    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s desactivou a popularidade para %(groups)s nesta sala.",
+    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s activou a popularidade para %(newGroups)s e desactivou a popularidade para %(oldGroups)s nesta sala.",
+    "Capitalization doesn't help very much": "Escribir con maiúsculas non axuda moito",
+    "Predictable substitutions like '@' instead of 'a' don't help very much": "Substitucións predecibles como '@' no lugar de 'a' non son de gran axuda",
+    "Group & filter rooms by custom tags (refresh to apply changes)": "Agrupar e filtrar salas con etiquetas personalizadas (actuliza para aplicar cambios)",
+    "Enable Community Filter Panel": "Activar o panel de Filtro de comunidades",
+    "General": "Xeral",
+    "Discovery": "Descubrir",
+    "Deactivate account": "Desactivar conta",
+    "For help with using %(brand)s, click <a>here</a>.": "Para ter axuda con %(brand)s, preme <a>aquí</a>.",
+    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "Se precisas axuda usando %(brand)s, preme <a>aquí</a> ou inicia unha conversa co noso bot usando o botón inferior.",
+    "Help & About": "Axuda & Acerca de",
+    "Security & Privacy": "Seguridade & Privacidade",
+    "Where you’re logged in": "Onde estás conectada",
+    "Change room name": "Cambiar nome da sala",
+    "Roles & Permissions": "Roles & Permisos",
+    "Room %(name)s": "Sala %(name)s",
+    "Recent rooms": "Salas recentes",
+    "Direct Messages": "Mensaxes Directas",
+    "Create room": "Crear sala",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Podes usar <code>axuda</code> para ver os comandos dispoñibles. ¿Querías mellor enviar esto como unha mensaxe?",
+    "Error updating flair": "Fallo ao actualizar popularidade",
+    "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Algo fallou cando se actualizaba a popularidade da sala. Pode ser un fallo temporal ou que o servidor non o permita.",
+    "Enter the name of a new server you want to explore.": "Escribe o nome do novo servidor que queres explorar.",
+    "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>.",
+    "Help": "Axuda",
+    "Explore Public Rooms": "Explorar Salas Públicas",
+    "Explore": "Explorar",
+    "Filter": "Filtrar",
+    "Filter rooms…": "Filtrar salas…",
+    "%(creator)s created and configured the room.": "%(creator)s creou e configurou a sala.",
+    "Explore rooms": "Explorar salas",
+    "General failure": "Fallo xeral",
+    "This homeserver does not support login using email address.": "Este servidor non soporta a conexión usando enderezos de email.",
+    "Clear room list filter field": "Baleirar o campo do filtro de salas",
+    "Room name or address": "Nome da sala ou enderezo",
+    "Joins room with given address": "Unirse a sala co enderezo dado",
+    "Unrecognised room address:": "Non se recoñece o enderezo da sala:",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s estableceu o enderezo principal da sala %(address)s.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s eliminiou o enderezo principal desta sala.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s engadiu os enderezos alternativos %(addresses)s para esta sala.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s engadiu o enderezo alternativo %(addresses)s para esta sala.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s eliminou os enderezos alternativos %(addresses)s desta sala.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s eliminou o enderezo alternativo %(addresses)s desta sala.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s cambiou os enderezos alternativos desta sala.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s cambiou o enderezo principal e alternativo para esta sala.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s cambiou o enderezo desta sala.",
+    "%(senderName)s placed a voice call.": "%(senderName)s fixo unha chamada de voz.",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s fixo unha chamada de voz. (non soportado neste navegador)",
+    "%(senderName)s placed a video call.": "%(senderName)s fixo unha chamada de vídeo.",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s fixo unha chamada de vídeo. (non soportado por este navegador)",
+    "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s revogou o convite para que %(targetDisplayName)s se una a esta sala.",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s eliminou a regra que bloqueaba usuarias con %(glob)s",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s eliminou a regra que bloquea salas con %(glob)s",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s eliminou a regra que bloquea servidores con %(glob)s",
+    "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s eliminou a regra de bloqueo con %(glob)s",
+    "%(senderName)s updated an invalid ban rule": "%(senderName)s actualizou unha regra de bloqueo non válida",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s actualizou a regra que bloquea usuarias con %(glob)s por %(reason)s",
+    "Show info about bridges in room settings": "Mostrar info sobre pontes nos axustes da sala",
+    "Room Addresses": "Enderezos da sala",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Algo fallou ao actualizar os enderezos alternativos da sala. É posible que o servidor non o permita ou acontecese un fallo temporal.",
+    "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 enderezos publicados poden ser usados por calquera persoa ou servidor para unirse a sala. Para publicar un enderezo, primeiro debe establecerse como enderezo local.",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Establecer enderezos para a sala para que poida ser atopada no teu servidor local (%(localDomain)s)",
+    "Room Settings - %(roomName)s": "Axustes da sala - %(roomName)s",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "Eliminar o enderezo da sala %(alias)s e eliminar %(name)s do directorio?",
+    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s actualizou a regra de bloqueo de salas con %(glob)s por %(reason)s",
+    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s actualizou a regra de bloqueo de servidores con %(glob)s por %(reason)s",
+    "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s actualizou a regra de bloqueo con %(glob)s por %(reason)s",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s creou unha regra de bloqueo de usuarias con %(glob)s por %(reason)s",
+    "You signed in to a new session without verifying it:": "Conectácheste nunha nova sesión sen verificala:",
+    "Verify your other session using one of the options below.": "Verifica a túa outra sesión usando unha das opcións inferiores.",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) conectouse a unha nova sesión sen verificala:",
+    "Ask this user to verify their session, or manually verify it below.": "Pídelle a usuaria que verifique a súa sesión, ou verificaa manualmente aquí.",
+    "Not Trusted": "Non confiable",
+    "Manually Verify by Text": "Verificar manualmente por texto",
+    "Interactively verify by Emoji": "Verificar interactivamente por Emoji",
+    "Done": "Feito",
+    "%(displayName)s is typing …": "%(displayName)s está escribindo…",
+    "%(names)s and %(count)s others are typing …|other": "%(names)s e outras %(count)s están escribindo…",
+    "%(names)s and %(count)s others are typing …|one": "%(names)s e outra están escribindo…",
+    "%(names)s and %(lastPerson)s are typing …": "%(names)s e %(lastPerson)s están escribindo…",
+    "Cannot reach homeserver": "Non se acadou o servidor",
+    "Ensure you have a stable internet connection, or get in touch with the server admin": "Asegúrate de que tes boa conexión a internet, ou contacta coa administración do servidor",
+    "Your %(brand)s is misconfigured": "O teu %(brand)s está mal configurado",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Pídelle a administración do teu %(brand)s que comprobe a <a>configuración</a> para entradas duplicadas ou incorrectas.",
+    "Cannot reach identity server": "Non se acadou o servidor de identidade",
+    "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.": "Podes rexistrarte, pero algunhas características non estarán dispoñibles ata que o servidor de identidade volte a conectarse. Se segues a ver este aviso, comproba os axustes ou contacta coa administración.",
+    "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.": "Podes restablecer o contrasinal, pero algunhas características non estarán dispoñibles ata que o servidor de identidade se conecte. Se segues a ver este aviso comproba os axustes ou contacta coa administración.",
+    "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.": "Podes conectarte, pero algunhas características non estarán dispoñibles ata que o servidor de identidade volte a conectarse. Se segues a ver este aviso, comproba os axustes ou contacta coa administración.",
+    "No homeserver URL provided": "Non se estableceu URL do servidor",
+    "Unexpected error resolving homeserver configuration": "Houbo un fallo ao acceder a configuración do servidor",
+    "Unexpected error resolving identity server configuration": "Houbo un fallo ao acceder a configuración do servidor de identidade",
+    "The message you are trying to send is too large.": "A mensaxe a enviar é demasiado grande.",
+    "Unable to connect to Homeserver. Retrying...": "Non se conectou co Servidor. Reintentando...",
+    "a few seconds ago": "fai uns segundos",
+    "about a minute ago": "fai un minuto",
+    "%(num)s minutes ago": "fai %(num)s minutos",
+    "about an hour ago": "fai unha hora",
+    "%(num)s hours ago": "fai %(num)s horas",
+    "about a day ago": "onte",
+    "%(num)s days ago": "fai %(num)s días",
+    "a few seconds from now": "hai só uns segundos",
+    "about a minute from now": "haberá un minuto",
+    "%(num)s minutes from now": "fará %(num)s minutos",
+    "about an hour from now": "fará unha hora",
+    "%(num)s hours from now": "fará %(num)s horas",
+    "about a day from now": "foi onte",
+    "%(num)s days from now": "fará %(num)s días",
+    "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
+    "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 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.",
+    "Messages in this room are not end-to-end encrypted.": "As mensaxes desta sala non están cifradas de extremo-a-extremo.",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "As mensaxes desta sala están cifradas de extremo-a-extremo. No perfil da usuaria tes máis info e podes verificala.",
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s creou unha regra bloqueando salas con %(glob)s por %(reason)s",
+    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s creou unha regra bloqueando servidores con %(glob)s por %(reason)s",
+    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s creou unha regra de bloqueo con %(glob)s por %(reason)s",
+    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s cambiou unha regra que bloqueaba usuarias con %(oldGlob)s a %(newGlob)s por %(reason)s",
+    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s cambiou unha regra que bloqueaba salas con %(oldGlob)s a %(newGlob)s por %(reason)s",
+    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s cambiou unha regra que bloqueaba servidores con %(oldGlob)s a %(newGlob)s por %(reason)s",
+    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s actualizou unha regra de bloqueo con %(oldGlob)s a %(newGlob)s por %(reason)s",
+    "The user's homeserver does not support the version of the room.": "O servidor da usuaria non soporta a versión da sala.",
+    "Unknown server error": "Erro descoñecido no servidor",
+    "Use a few words, avoid common phrases": "Usa unhas poucas palabras, evita frases comúns",
+    "No need for symbols, digits, or uppercase letters": "Non precisa símbolos, díxitos ou maiúsculas",
+    "Use a longer keyboard pattern with more turns": "Usa un patrón de teclado máis grande con algún xiro",
+    "Avoid repeated words and characters": "Evita palabras repetidas ou caracteres",
+    "Avoid sequences": "Evita secuencias",
+    "Avoid recent years": "Evita anos recentes",
+    "Avoid years that are associated with you": "Evita anos que están asociados a ti",
+    "Avoid dates and years that are associated with you": "Evita datas e anos que están relacionados contigo",
+    "All-uppercase is almost as easy to guess as all-lowercase": "As maiúsculas son case tan fáciles de adiviñar como as minúsculas",
+    "Reversed words aren't much harder to guess": "A escritura inversa non é moi difícil de adiviñar",
+    "Add another word or two. Uncommon words are better.": "Engade unha ou dúas palabras máis. Mellor que sexan raras.",
+    "Repeats like \"aaa\" are easy to guess": "Repeticións com \"aaa\" son fáciles de adiviñar",
+    "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Repeticións com \"abcabcabc\" son só un pouco máis difíciles de adiviñar que \"abc\"",
+    "Sequences like abc or 6543 are easy to guess": "Secuencias como abc ou 6543 son fáciles de adiviñar",
+    "Recent years are easy to guess": "Os anos recentes son fáciles de adiviñar",
+    "Dates are often easy to guess": "Normalmente as datas son fáciles de adiviñar",
+    "This is a top-10 common password": "Este é o top-10 dos contrasinais habituais",
+    "This is a top-100 common password": "Este un top-100 dos contrasinais habituais",
+    "This is a very common password": "Este é un contrasinal moi común",
+    "This is similar to a commonly used password": "É semellante a un contrasinal habitualmente utilizado",
+    "A word by itself is easy to guess": "Por si sola, unha palabra é fácil de adiviñar",
+    "Names and surnames by themselves are easy to guess": "Nomes e apelidos por si mesmos son fáciles de adiviñar",
+    "Common names and surnames are easy to guess": "Os nomes e alcumes son fáciles de adiviñar",
+    "Help us improve %(brand)s": "Axúdanos a mellorar %(brand)s",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Envía <UsageDataLink>datos de uso anónimos</UsageDataLink> que nos axudarán a mellorar %(brand)s. Esto precisa usar unha <PolicyLink>cookie</PolicyLink>.",
+    "I want to help": "Quero axudar",
+    "No": "Non",
+    "Verify all your sessions to ensure your account & messages are safe": "Verifica todas as outras sesións para asegurar que a túa conta e mensaxes están seguros",
+    "Review": "Revisar",
+    "Later": "Máis tarde",
+    "Your homeserver has exceeded its user limit.": "O teu servidor superou o seu límite de usuaras.",
+    "Your homeserver has exceeded one of its resource limits.": "O teu servidor superou un dous seus límites de recursos.",
+    "Contact your <a>server admin</a>.": "Contacta coa <a>administración</a>.",
+    "Ok": "Ok",
+    "Set password": "Establecer contrasinal",
+    "To return to your account in future you need to set a password": "Para voltar a túa conta no futuro debes establecer un contrasinal",
+    "Set up": "Configurar",
+    "Upgrade": "Mellorar",
+    "Verify": "Verificar",
+    "Verify yourself & others to keep your chats safe": "Verifica a túa conta e a de outras para ter conversas seguras",
+    "Other users may not trust it": "Outras usuarias poderían non confiar",
+    "Verify the new login accessing your account: %(name)s": "Verifica a conexión accedendo a túa conta: %(name)s",
+    "Restart": "Reiniciar",
+    "Upgrade your %(brand)s": "Mellora o teu %(brand)s",
+    "A new version of %(brand)s is available!": "Hai unha nova versión de %(brand)s!",
+    "There was an error joining the room": "Houbo un fallo ao unirte a sala",
+    "Font scaling": "Escalado da tipografía",
+    "Custom user status messages": "Mensaxes de estado personalizados",
+    "Render simple counters in room header": "Mostrar contadores simples na cabeceira da sala",
+    "Multiple integration managers": "Múltiples xestores da integración",
+    "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.",
+    "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.",
+    "Try to join anyway": "Inténtao igualmente",
+    "You can still join it because this is a public room.": "Podes unirte porque é unha sala pública.",
+    "Join the discussion": "Súmate a conversa",
+    "Do you want to join %(roomName)s?": "Queres unirte a %(roomName)s?",
+    "You're previewing %(roomName)s. Want to join it?": "Vista previa de %(roomName)s. Queres unirte?",
+    "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s non ten vista previa. Queres unirte?",
+    "Join": "Únete",
+    "Matrix rooms": "Salas Matrix",
+    "Join millions for free on the largest public server": "Únete a millóns de persoas gratuitamente no maior servidor público",
+    "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Se non atopas a sala que buscas, pide un convite ou <a>Crea unha nova sala</a>.",
+    "Match system theme": "Imitar o aspecto do sistema",
+    "Invalid theme schema.": "Esquema do decorado incorrecto.",
+    "Error downloading theme information.": "Erro ao descargar información do decorado.",
+    "Theme added!": "Decorado engadido!",
+    "Custom theme URL": "URL do decorado personalizado",
+    "Add theme": "Engadir decorado",
+    "Theme": "Decorado",
+    "Language and region": "Idioma e rexión",
+    "Your theme": "O teu decorado",
+    "Support adding custom themes": "Permitir engadir decorados personalizados",
+    "Font size": "Tamaño da letra",
+    "Enable Emoji suggestions while typing": "Activar suxestión de Emoji ao escribir",
+    "Show a placeholder for removed messages": "Resaltar o lugar das mensaxes eliminadas",
+    "Show avatar changes": "Mostrar cambios de avatar",
+    "Show display name changes": "Mostrar cambios do nome mostrado",
+    "Show read receipts sent by other users": "Mostrar resgardo de lectura enviados por outras usuarias",
+    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Mostrar recordatorio para activar Recuperación Segura de Mensaxes en salas cifradas",
+    "Show avatars in user and room mentions": "Mostrar avatares nas mencións de salas e usuarias",
+    "Enable big emoji in chat": "Activar Emojis grandes na conversa",
+    "Send typing notifications": "Enviar notificación de escritura",
+    "Show typing notifications": "Mostrar notificacións de escritura",
+    "Allow Peer-to-Peer for 1:1 calls": "Permitir Par-a-Par para chamadas 1:1",
+    "Never send encrypted messages to unverified sessions from this session": "Non enviar nunca desde esta sesión mensaxes cifradas a sesións non verificadas",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Non enviar mensaxes cifradas desde esta sesión a sesións non verificadas nesta sala",
+    "Prompt before sending invites to potentially invalid matrix IDs": "Avisar antes de enviar convites a IDs de Matrix potencialmente incorrectos",
+    "Show developer tools": "Mostrar ferramentas de desenvolvemento",
+    "Order rooms by name": "Ordenar salas por nome",
+    "Show rooms with unread notifications first": "Mostrar primeiro as salas que teñen notificacións sen ler",
+    "Show shortcuts to recently viewed rooms above the room list": "Mostrar atallos a salas vistas recentemente enriba da lista de salas",
+    "Show hidden events in timeline": "Mostrar na cronoloxía eventos ocultos",
+    "Low bandwidth mode": "Modo de ancho de banda reducido",
+    "Straight rows of keys are easy to guess": "Palabras de letras contiguas son doadas de adiviñar",
+    "Short keyboard patterns are easy to guess": "Patróns curtos de teclas son doados de adiviñar",
+    "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 o servidor de apoio para chamadas turn.matrix.org cando o servidor propio non ofreza un (o teu IP compartirase durante a chamada)",
+    "Send read receipts for messages (requires compatible homeserver to disable)": "Enviar resgardos de lectura para as mensaxes (require servidor compatible para desactivar)",
+    "Show previews/thumbnails for images": "Mostrar miniaturas/vista previa das imaxes",
+    "Enable message search in encrypted rooms": "Activar a busca de mensaxes en salas cifradas",
+    "How fast should messages be downloaded.": "Velocidade á que deberían descargarse as mensaxes.",
+    "Manually verify all remote sessions": "Verificar manualmente todas as sesións remotas",
+    "IRC display name width": "Ancho do nome mostrado de IRC",
+    "Messages containing my username": "Mensaxes que conteñen o meu nome de usuaria",
+    "Messages containing @room": "Mensaxes que conteñen @room",
+    "Encrypted messages in one-to-one chats": "Mensaxes cifradas en conversas 1:1",
+    "Encrypted messages in group chats": "Mensaxes cifradas en convesas en grupo",
+    "When rooms are upgraded": "Cando se actualizan as salas",
+    "My Ban List": "Listaxe de bloqueo",
+    "This is your list of users/servers you have blocked - don't leave the room!": "Esta é a listaxe de usuarias/servidores que ti bloqueaches - non deixes a sala!",
+    "The other party cancelled the verification.": "A outra parte cancelou a verificación.",
+    "Verified!": "Verificada!",
+    "You've successfully verified this user.": "Verificaches esta usuaria.",
+    "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "As mensaxes seguras con esta usuaria están cifradas extremo-a-extremo e non son lexibles por terceiras.",
+    "Got It": "Vale",
+    "Verify this session by completing one of the following:": "Verifica esta sesión completando un dos seguintes:",
+    "Scan this unique code": "Escanea este código único",
+    "or": "ou",
+    "Compare unique emoji": "Compara os emoji",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Compara o conxunto único de emoticonas se non tes cámara no outro dispositivo",
+    "Start": "Comezar",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Confirma que as emoticonas se mostran nas dúas sesións, na mesma orde:",
+    "Verify this user by confirming the following emoji appear on their screen.": "Verifica a usuaria confirmando que as emoticonas aparecen na súa pantalla.",
+    "Verify this session by confirming the following number appears on its screen.": "Verifica esta sesión confirmando que o seguinte número aparece na súa pantalla.",
+    "Verify this user by confirming the following number appears on their screen.": "Verifica esta usuaria confirmando que o seguinte número aparece na súa pantalla.",
+    "Unable to find a supported verification method.": "Non se atopa un método de verificación válido.",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Agardando pola outra sesión, %(deviceName)s %(deviceId)s, para verificar…",
+    "Waiting for your other session to verify…": "Agardando pola túa outra sesión para verificar…",
+    "Waiting for %(displayName)s to verify…": "Agardando por %(displayName)s para verificar…",
+    "Cancelling…": "Cancelando…",
+    "They match": "Concordan",
+    "They don't match": "Non concordan",
+    "To be secure, do this in person or use a trusted way to communicate.": "Para estar seguro, fai esto en persoa ou utiliza un xeito seguro para comunicarte.",
+    "Dog": "Can",
+    "Cat": "Gato",
+    "Lion": "León",
+    "Horse": "Cabalo",
+    "Unicorn": "Unicorno",
+    "Pig": "Porco",
+    "Elephant": "Elefante",
+    "Rabbit": "Coello",
+    "Panda": "Panda",
+    "Rooster": "Galo",
+    "Penguin": "Pingüino",
+    "Turtle": "Tartaruga",
+    "Fish": "Peixe",
+    "Octopus": "Polbo",
+    "Butterfly": "Bolboreta",
+    "Flower": "Flor",
+    "Tree": "Árbore",
+    "Cactus": "Cacto",
+    "Mushroom": "Cogomelo",
+    "Globe": "Globo",
+    "Moon": "Lúa",
+    "Cloud": "Nube",
+    "Fire": "Lume",
+    "Banana": "Plátano",
+    "Apple": "Mazá",
+    "Strawberry": "Amorodo",
+    "Corn": "Millo",
+    "Pizza": "Pizza",
+    "Cake": "Biscoito",
+    "Heart": "Corazón",
+    "Smiley": "Sorriso",
+    "Robot": "Robot",
+    "Hat": "Sombreiro",
+    "Glasses": "Gafas",
+    "Spanner": "Ferramenta",
+    "Santa": "Nöel",
+    "Thumbs up": "Oká",
+    "Umbrella": "Paraugas",
+    "Hourglass": "Reloxo area",
+    "Clock": "Reloxo",
+    "Gift": "Agasallo",
+    "Light bulb": "Lámpada",
+    "Book": "Libro",
+    "Pencil": "Lápis",
+    "Paperclip": "Prendedor",
+    "Scissors": "Tesoiras",
+    "Lock": "Cadeado",
+    "Key": "Chave",
+    "Hammer": "Martelo",
+    "Telephone": "Teléfono",
+    "Flag": "Bandeira",
+    "Train": "Tren",
+    "Bicycle": "Bicicleta",
+    "Aeroplane": "Aeroplano",
+    "Rocket": "Foguete",
+    "Trophy": "Trofeo",
+    "Ball": "Bola",
+    "Guitar": "Guitarra",
+    "Trumpet": "Trompeta",
+    "Bell": "Campá",
+    "Anchor": "Áncora",
+    "Headphones": "Auriculares",
+    "Folder": "Cartafol",
+    "Pin": "Pin",
+    "From %(deviceName)s (%(deviceId)s)": "Desde %(deviceName)s (%(deviceId)s)",
+    "Decline (%(counter)s)": "Rexeitar (%(counter)s)",
+    "Accept <policyLink /> to continue:": "Acepta <policyLink /> para continuar:",
+    "Upload": "Subir",
+    "This bridge was provisioned by <user />.": "Esta ponte está proporcionada por <user />.",
+    "This bridge is managed by <user />.": "Esta ponte está xestionada por <user />.",
+    "Workspace: %(networkName)s": "Espazo de traballo: %(networkName)s",
+    "Channel: %(channelName)s": "Canal: %(channelName)s",
+    "Show less": "Mostrar menos",
+    "Show more": "Mostrar máis",
+    "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.": "Ao cambiar o contrasinal vas restablecer todas as chaves de cifrado extremo-a-extremo en tódalas sesións, facendo que o historial de conversa cifrado non sexa lexible, a menos que primeiro exportes todas as chaves das salas e as importes posteriormente. No futuro melloraremos o procedemento.",
+    "Your homeserver does not support cross-signing.": "O teu servidor non soporta a sinatura cruzada.",
+    "Cross-signing and secret storage are enabled.": "A sinatura cruzada e o almacenaxe segredo está activados.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "A túa conta ten unha identidade de sinatura cruzada no almacenaxe segredo, pero aínda non confiaches nela nesta sesión.",
+    "Cross-signing and secret storage are not yet set up.": "A sinatura cruzada e almacenaxe segredo aínda non se configuraron.",
+    "Reset cross-signing and secret storage": "Restablecer sinatura cruzada e almacenaxe segredo",
+    "Bootstrap cross-signing and secret storage": "Configurar sinatura cruzada e almacenaxe segredo",
+    "well formed": "ben formado",
+    "unexpected type": "tipo non agardado",
+    "Cross-signing public keys:": "Chaves públicas da sinatura cruzada:",
+    "in memory": "en memoria",
+    "not found": "non atopado",
+    "Cross-signing private keys:": "Chaves privadas da sinatura cruzada:",
+    "in secret storage": "no almacenaxe segredo",
+    "Self signing private key:": "Auto asinado da chave privada:",
+    "cached locally": "na caché local",
+    "not found locally": "non se atopa localmente",
+    "User signing private key:": "Chave privada de sinatura da usuaria:",
+    "Session backup key:": "Chave de apoio da sesión:",
+    "Secret storage public key:": "Chave pública da almacenaxe segreda:",
+    "in account data": "nos datos da conta",
+    "Homeserver feature support:": "Soporte de funcións do servidor:",
+    "exists": "existe",
+    "Your homeserver does not support session management.": "O teu servidor non soporta a xestión da sesión.",
+    "Unable to load session list": "Non se puido cargar a lista de sesións",
+    "Confirm deleting these sessions": "Confirma o borrado destas sesións",
+    "Click the button below to confirm deleting these sessions.|other": "Preme no botón inferior para confirmar o borrado das sesións.",
+    "Click the button below to confirm deleting these sessions.|one": "Preme no botón inferior para confirmar o borrado da sesión.",
+    "Delete sessions|other": "Borrar sesións",
+    "Delete sessions|one": "Borrar sesión",
+    "Delete %(count)s sessions|other": "Borrar %(count)s sesións",
+    "Delete %(count)s sessions|one": "Borrar %(count)s sesión",
+    "ID": "ID",
+    "Public Name": "Nome público",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Verificar individualmente cada sesión utilizada pola usuaria para marcala como confiable, non confiando en dispositivos con sinatura cruzada.",
+    "Securely cache encrypted messages locally for them to appear in search results, using ": "Gardar de xeito seguro na caché mensaxes cifradas para que aparezan nos resultados de busca, usando ",
+    " to store messages from ": " para gardar mensaxes de ",
+    "rooms.": "salas.",
+    "Manage": "Xestionar",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Gardar de xeito seguro mensaxes cifradas na caché local para que aparezan nos resultados de buscas.",
+    "Enable": "Activar",
+    "%(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>.": "Falta un compoñente de %(brand)s requerido para almacenar localmente mensaxes cifradas na caché. Se queres experimentar con esta función, compila unha versión personalizada de %(brand)s Desktop <nativeLink>cos compoñentes de busca engadidos</nativeLink>.",
+    "Connecting to integration manager...": "Conectando co xestor de integración...",
+    "Cannot connect to integration manager": "Non se puido conectar co xestor de intregración",
+    "The integration manager is offline or it cannot reach your homeserver.": "O xestor de integración non está en liña ou non é accesible desde o teu servidor.",
+    "Delete Backup": "Borrar copia de apoio",
+    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Estás seguro? Perderás as mensaxes cifradas se non tes unha copia de apoio das chaves de cifrado.",
+    "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "As mensaxes cifradas están seguras con cifrado de extremo-a-extremo. Só ti e o correpondente(s) tedes as chaves para ler as mensaxes.",
+    "Unable to load key backup status": "Non se puido cargar o estado das chaves de apoio",
+    "Restore from Backup": "Restaurar desde copia de apoio",
+    "This session is backing up your keys. ": "Esta sesión está gardando as túas 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 sesión <b>non está facendo copia das chaves</b>, pero tes unha copia de apoio existente que podes restablecer e engadir para seguir adiante.",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Conecta esta sesión ao gardado das chaves antes de desconectarte para evitar perder calquera chave que só puidese estar nesta sesión.",
+    "Connect this session to Key Backup": "Conecta esta sesión a Copia de Apoio de chaves",
+    "not stored": "non gardado",
+    "Backing up %(sessionsRemaining)s keys...": "Copiando %(sessionsRemaining)s chaves...",
+    "All keys backed up": "Copiaronse todas as chaves",
+    "Backup has a <validity>valid</validity> signature from this user": "A copia ten unha sinatura <validity>válida</validity> desta usuaria",
+    "Backup has a <validity>invalid</validity> signature from this user": "A copia ten una sinatura <validity>non válida</validity> desta usuaria",
+    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "A copia ten unha sinatura dunha usuaria <verify>descoñecida</verify> con ID %(deviceId)s",
+    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "A copia ten unha sinatura dunha sesión <verify>descoñecida</verify> con ID %(deviceId)s",
+    "Backup has a <validity>valid</validity> signature from this session": "A copia ten unha sinatura <validity>válida</validity> desde esta sesión",
+    "Backup has an <validity>invalid</validity> signature from this session": "A copia ten unha sinatura <validity>non válida</validity> desde esta sesión",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "A copia ten unha sinatura <validity>válida</validity> desde a sesión <verify>verificada</verify> en <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "A copia ten unha sinatura <validity>válida</validity> desde a sesión <verify>non verificada</verify> en <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "A copia ten unha sinatura <validity>non válida</validity> desde a sesión <verify>verificada</verify> en <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "A copia ten unha sinatura <validity>non válida</validity> desde a sesión <verify>non verificada</verify> en <device></device>",
+    "Backup is not signed by any of your sessions": "A copia non está asinada por ningunha das túas sesións",
+    "This backup is trusted because it has been restored on this session": "Esta copia é de confianza porque foi restaurada nesta sesión",
+    "Backup version: ": "Versión da copia: ",
+    "Algorithm: ": "Algoritmo: ",
+    "Backup key stored: ": "Chave de apoio gardada: ",
+    "Your keys are <b>not being backed up from this session</b>.": "As túas chaves <b>non están a ser copiadas desde esta sesión</b>.",
+    "Back up your keys before signing out to avoid losing them.": "Fai unha copia de apoio das chaves antes de desconectarte para evitar perdelas.",
+    "Start using Key Backup": "Fai unha Copia de apoio das chaves",
+    "Clear notifications": "Eliminar notificacións",
+    "Add an email address to configure email notifications": "Engade un enderezo de email para configurar as notificacións por email",
+    "Enable desktop notifications for this session": "Activa as notificacións de escritorio para esta sesión",
+    "Enable audible notifications for this session": "Activa as notificacións por son para esta sesión",
+    "<a>Upgrade</a> to your own domain": "<a>Mellora</a> e usa un dominio propio",
+    "Display Name": "Nome mostrado",
+    "Profile picture": "Imaxe de perfil",
+    "Identity Server URL must be HTTPS": "O URL do servidor de identidade debe comezar HTTPS",
+    "Not a valid Identity Server (status code %(code)s)": "Servidor de Identidade non válido (código de estado %(code)s)",
+    "Could not connect to Identity Server": "Non hai conexión co Servidor de Identidade",
+    "Checking server": "Comprobando servidor",
+    "Change identity server": "Cambiar de servidor de identidade",
+    "Disconnect from the identity server <current /> and connect to <new /> instead?": "Desconectar do servidor de identidade <current /> e conectar con <new />?",
+    "Terms of service not accepted or the identity server is invalid.": "Non se aceptaron os Termos do servizo ou o servidor de identidade non é válido.",
+    "The identity server you have chosen does not have any terms of service.": "O servidor de identidade escollido non ten establecidos termos do servizo.",
+    "Disconnect identity server": "Desconectar servidor de identidade",
+    "Disconnect from the identity server <idserver />?": "Desconectar 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.": "Deberías <b>eliminar os datos personais</b> do servidor de identidade <idserver /> antes de desconectar. Desgraciadamente, o servidor <idserver /> non está en liña e no se pode acceder.",
+    "You should:": "Deberías:",
+    "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "comprobar os engadidos do navegador por algún está bloqueando o servidor de identidade (como Privacy Badger)",
+    "contact the administrators of identity server <idserver />": "contactar coa administración do servidor de identidade <idserver />",
+    "wait and try again later": "agardar e probar máis tarde",
+    "Disconnect anyway": "Desconectar igualmente",
+    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Aínda estás <b>compartindo datos personais</b> no servidor de identidade <idserver />.",
+    "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Recomendámosche que elimines os teus enderezos de email e números de teléfono do servidor de identidade antes de desconectar del.",
+    "Go back": "Atrás",
+    "Identity Server (%(server)s)": "Servidor de Identidade (%(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.": "Neste intre usas <server></server> para atopar e ser atopado polos contactos existentes que coñeces. Aquí abaixo podes cambiar de servidor de identidade.",
+    "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Se non queres usar <server /> para atopar e ser atopado polos contactos existentes que coñeces, escribe embaixo outro servidor de identidade.",
+    "Identity Server": "Servidor de Identidade",
+    "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Non estás a usar un servidor de identidade. Para atopar e ser atopado polos contactos existentes que coñeces, engade un embaixo.",
+    "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.": "Ao desconectar do teu servidor de identidade non te poderán atopar as outras usuarias e non poderás convidar a outras polo seu email ou teléfono.",
+    "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.": "Usar un servidor de identidade é optativo. Se escolles non usar un, non poderás ser atopado por outras usuarias e non poderás convidar a outras polo seu email ou teléfono.",
+    "Do not use an identity server": "Non usar un servidor de identidade",
+    "Enter a new identity server": "Escribe o novo servidor de identidade",
+    "Change": "Cambiar",
+    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "Usa un Xestor de Integración <b>(%(serverName)s)</b> para xestionar bots, widgets e paquetes de pegatinas.",
+    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Usa un Xestor de Integracións para xestionar bots, widgets e paquetes de pegatinas.",
+    "Manage integrations": "Xestionar integracións",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Os xestores de integracións reciben datos de configuración, e poden modificar os widgets, enviar convites das salas, e establecer roles no teu nome.",
+    "New version available. <a>Update now.</a>": "Nova versión dispoñible. <a>Actualiza.</a>",
+    "Size must be a number": "O tamaño ten que ser un número",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "O tamaño da fonte só pode estar entre %(min)s pt e %(max)s pt",
+    "Use between %(min)s pt and %(max)s pt": "Usa entre %(min)s pt e %(max)s pt",
+    "Appearance": "Aparencia",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Cambiouse o contrasinal. Non recibirás notificacións push noutras sesións ata que desconectes e voltes a conectar nelas",
+    "Email addresses": "Enderezos de email",
+    "Phone numbers": "Número de teléfono",
+    "Set a new account password...": "Establecer novo contrasinal da conta...",
+    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Acepta os Termos do Servizo do servidor (%(serverName)s) para permitir que te atopen polo enderezo de email ou número de teléfono.",
+    "Account management": "Xestión da conta",
+    "Deactivating your account is a permanent action - be careful!": "A desactivación da conta será permanente - ten coidado!",
+    "Credits": "Créditos",
+    "Chat with %(brand)s Bot": "Chat co Bot %(brand)s",
+    "Bug reporting": "Informar de fallos",
+    "Clear cache and reload": "Baleirar caché e recargar",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Para informar dun asunto relacionado coa seguridade de Matrix, le a <a>Política de Revelación de Privacidade</a> de Matrix.org.",
+    "FAQ": "PMF",
+    "Keyboard Shortcuts": "Atallos de teclado",
+    "Versions": "Versións",
+    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Personaliza a túa experiencia con características experimentais. <a>Coñecer máis</a>.",
+    "Ignored/Blocked": "Ignorado/Bloqueado",
+    "Error adding ignored user/server": "Fallo ao engadir a ignorado usuaria/servidor",
+    "Something went wrong. Please try again or view your console for hints.": "Algo fallou. Inténtao outra vez o mira na consola para ter algunha pista.",
+    "Error subscribing to list": "Fallo ao subscribirse a lista",
+    "Please verify the room ID or address and try again.": "Comproba o ID da sala ou enderezo e proba outra vez.",
+    "Error removing ignored user/server": "Fallo ao eliminar a usuaria/servidor de ignorados",
+    "Error unsubscribing from list": "Fallo ao retirar a susbscrición a lista",
+    "Please try again or view your console for hints.": "Inténtao outra vez ou mira na consola para ter algunha pista.",
+    "None": "Nada",
+    "Ban list rules - %(roomName)s": "Regras de bloqueo - %(roomName)s",
+    "Server rules": "Regras do servidor",
+    "User rules": "Regras da usuaria",
+    "You have not ignored anyone.": "Non ignoraches a ninguén.",
+    "You are currently ignoring:": "Estás a ignorar a:",
+    "You are not subscribed to any lists": "Non estás subscrita a ningunha lista",
+    "Unsubscribe": "Baixa na subscrición",
+    "View rules": "Ver regras",
+    "You are currently subscribed to:": "Estas subscrito a:",
+    "Ignored users": "Usuarias ignoradas",
+    "⚠ These settings are meant for advanced users.": "⚠ Estos axustes van dirixidos a usuarias avanzadas.",
+    "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.": "Engade aquí usuarias e servidores que desexas ignorar. Usa asterisco que %(brand)s usará como comodín. Exemplo, <code>@bot*</code> ignorará todas as usuarias de calquera servidor que teñan 'bot' no nome.",
+    "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.": "Ignorar a persoas faise a través de listaxes de bloqueo que conteñen regras. Subscribíndote a unha listaxe de bloqueo fará que esas usuarias/servidores sexan inaccesibles para ti.",
+    "Personal ban list": "Lista personal de bloqueo",
+    "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.": "A túa listaxe personal de bloqueo acolle as usuarias/servidores que personalmente non desexas ver. Tras ignorar a túa primeira usuaria/servidor, unha nova sala chamada 'Listaxe de bloqueos' aparecerá na listaxe de salas - non saias desta sala para que o bloqueo siga surtindo efecto.",
+    "Server or user ID to ignore": "ID de usuaria ou servidor a ignorar",
+    "eg: @bot:* or example.org": "ex: @bot:* ou exemplo.org",
+    "Subscribed lists": "Listaxes subscritas",
+    "If this isn't what you want, please use a different tool to ignore users.": "Se esto non é o que queres, usa unha ferramenta diferente para ignorar usuarias.",
+    "Room ID or address of ban list": "ID da sala ou enderezo da listaxe de bloqueo",
+    "Subscribe": "Subscribir",
+    "Always show the window menu bar": "Mostrar sempre a barra de menú da ventá",
+    "Show tray icon and minimize window to it on close": "Mostrar icona na bandexa do sistema e minizar nela ao pechar",
+    "Preferences": "Preferencias",
+    "Room list": "Listaxe de Salas",
+    "Composer": "Editor",
+    "Timeline": "Cronoloxía",
+    "Autocomplete delay (ms)": "Retraso no autocompletado (ms)",
+    "Read Marker lifetime (ms)": "Duración do marcador de lectura (ms)",
+    "Read Marker off-screen lifetime (ms)": "Duración do marcador de lectura fóra de pantall (ms)",
+    "Session ID:": "ID da sesión:",
+    "Session key:": "Chave da sesión:",
+    "Bulk options": "Opcións agrupadas",
+    "Accept all %(invitedRooms)s invites": "Aceptar os %(invitedRooms)s convites",
+    "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.",
+    "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",
+    "Voice & Video": "Voz e Vídeo",
+    "Upgrade this room to the recommended room version": "Actualiza esta sala á versión recomendada",
+    "this room": "esta sala",
+    "View older messages in %(roomName)s.": "Ver mensaxes antigas en %(roomName)s.",
+    "Room information": "Información da sala",
+    "Internal room ID:": "ID interno da sala:",
+    "Room version": "Versión da sala",
+    "Room version:": "Versión da sala:",
+    "Developer options": "Opcións desenvolvemento",
+    "Open Devtools": "Abrir Devtools",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Esta sala está enviando mensaxes ás seguintes plataformas. <a>Coñece máis.</a>",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Esta sala non está enviando mensaxes a outras plataformas. <a>Saber máis.</a>",
+    "Bridges": "Pontes",
+    "Uploaded sound": "Audio subido",
+    "Sounds": "Audios",
+    "Notification sound": "Ton de notificación",
+    "Reset": "Restablecer",
+    "Set a new custom sound": "Establecer novo ton personalizado",
+    "Browse": "Buscar",
+    "Change room avatar": "Cambiar avatar da sala",
+    "Change main address for the room": "Cambiar enderezo principal da sala",
+    "Change history visibility": "Cambiar visibilidade do historial",
+    "Change permissions": "Cambiar permisos",
+    "Change topic": "Cambiar tema",
+    "Upgrade the room": "Actualizar a sala",
+    "Enable room encryption": "Activar cifrado da sala",
+    "Modify widgets": "Modificar widgets",
+    "Error changing power level requirement": "Erro ao cambiar o requerimento de nivel de responsabilidade",
+    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Algo fallou ao cambiar os requerimentos de nivel de responsabilidade na sala. Asegúrate de ter os permisos suficientes e volve a intentalo.",
+    "Error changing power level": "Erro ao cambiar nivel de responsabilidade",
+    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Algo fallou ao cambiar o nivel de responsabilidade da usuaria. Asegúrate de ter permiso suficiente e inténtao outra vez.",
+    "Default role": "Rol por omsión",
+    "Send messages": "Enviar mensaxes",
+    "Invite users": "Convidar usuarias",
+    "Change settings": "Cambiar axustes",
+    "Kick users": "Expulsar usuarias",
+    "Ban users": "Bloquear usuarias",
+    "Remove messages": "Eliminar mensaxes",
+    "Notify everyone": "Notificar a todas",
+    "Send %(eventType)s events": "Enviar %(eventType)s eventos",
+    "Select the roles required to change various parts of the room": "Escolle os roles requeridos para cambiar determinadas partes da sala",
+    "Enable encryption?": "Activar cifrado?",
+    "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>": "Unha vez activado, non se pode desactivar o cifrado da sala. As mensaxes enviadas nunha sala cifrada non poder ser vistas polo servidor, só polas participantes da sala. Ao activar o cifrado poderías causar que bots e pontes deixen de funcionar correctamente. <a>Coñece máis sobre o cifrado.</a>",
+    "To link to this room, please add an address.": "Para ligar a esta sala, engade un enderezo.",
+    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Os cambios sobre quen pode ler o historial só se aplicarán as mensaxes futuras nesta sala. A visibilidade do historial precedente non cambiará.",
+    "Encryption": "Cifrado",
+    "Once enabled, encryption cannot be disabled.": "Unha vez activado, non se pode desactivar.",
+    "Encrypted": "Cifrado",
+    "Unable to revoke sharing for email address": "Non se puido revogar a compartición para o enderezo de correo",
+    "Unable to share email address": "Non se puido compartir co enderezo de email",
+    "Your email address hasn't been verified yet": "O teu enderezo de email aínda non foi verificado",
+    "Click the link in the email you received to verify and then click continue again.": "Preme na ligazón do email recibido para verificalo e após preme en continuar outra vez.",
+    "Verify the link in your inbox": "Verifica a ligazón na túa caixa de correo",
+    "Complete": "Completar",
+    "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 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.",
+    "Verification code": "Código de verificación",
+    "Discovery options will appear once you have added a phone number above.": "As opción para atoparte aparecerán cando engadas un número de teléfono.",
+    "Remove %(email)s?": "Eliminar %(email)s?",
+    "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Enviamosche un email para verificar o enderezo. Segue as instrucións incluídas e após preme no botón inferior.",
+    "Email Address": "Enderezo de Email",
+    "Remove %(phone)s?": "Eliminar %(phone)s?",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Enviamosche un SMS ao +%(msisdn)s. Escribe o código de verificación que contén.",
+    "Phone Number": "Número de teléfono",
+    "This user has not verified all of their sessions.": "Esta usuaria non verificou ningunha das súas sesións.",
+    "You have not verified this user.": "Non verificaches esta usuaria.",
+    "You have verified this user. This user has verified all of their sessions.": "Verificaches esta usuaria. A usuaria verificou todas as súas sesións.",
+    "Someone is using an unknown session": "Alguén está a usar unha sesión descoñecida",
+    "This room is end-to-end encrypted": "Esta sala está cifrada extremo-a-extremo",
+    "Everyone in this room is verified": "Todas nesta sala están verificadas",
+    "Edit message": "Editar mensaxe",
+    "Mod": "Mod",
+    "Your key share request has been sent - please check your other sessions for key share requests.": "Enviouse a solicitude de compartir chave - comproba as túas outras sesións para solicitudes de compartir chave.",
+    "Light": "Claro",
+    "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.",
+    "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",
+    "Encrypted by an unverified session": "Cifrada por unha sesión non verificada",
+    "Unencrypted": "Non cifrada",
+    "Encrypted by a deleted session": "Cifrada por unha sesión eliminada",
+    "Invite only": "Só por convite",
+    "Scroll to most recent messages": "Ir ás mensaxes máis recentes",
+    "Close preview": "Pechar vista previa",
+    "Emoji picker": "Selector Emoticona",
+    "Send a reply…": "Responder…",
+    "Send a message…": "Enviar mensaxe…",
+    "The conversation continues here.": "A conversa continúa aquí.",
+    "This room has been replaced and is no longer active.": "Esta sala foi substituída e xa non está activa.",
+    "Bold": "Resaltado",
+    "Italics": "Cursiva",
+    "Code block": "Bloque de código",
+    "No recently visited rooms": "Sen salas recentes visitadas",
+    "People": "Persoas",
+    "Joining room …": "Uníndote a sala…",
+    "Loading …": "Cargando…",
+    "Rejecting invite …": "Rexeitando convite…",
+    "Loading room preview": "Cargando vista previa",
+    "You were kicked from %(roomName)s by %(memberName)s": "Foches expulsada de %(roomName)s por %(memberName)s",
+    "Reason: %(reason)s": "Razón: %(reason)s",
+    "Forget this room": "Esquecer sala",
+    "You were banned from %(roomName)s by %(memberName)s": "Foches bloqueada en %(roomName)s por %(memberName)s",
+    "Something went wrong with your invite to %(roomName)s": "Algo fallou co teu convite para %(roomName)s",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Un erro (%(errcode)s) foi devolto ao intentar validar o convite. Podes intentar enviarlle esta información a administración da sala.",
+    "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Este convite para %(roomName)s foi enviado a %(email)s que non está asociado coa túa conta",
+    "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Liga este email coa túa conta nos Axustes para recibir convites directamente en %(brand)s.",
+    "This invite to %(roomName)s was sent to %(email)s": "Este convite para %(roomName)s foi enviado a %(email)s",
+    "Use an identity server in Settings to receive invites directly in %(brand)s.": "Usa un servidor de identidade nos Axustes para recibir convites directamente en %(brand)s.",
+    "Share this email in Settings to receive invites directly in %(brand)s.": "Comparte este email en Axustes para recibir convites directamente en %(brand)s.",
+    "Do you want to chat with %(user)s?": "Desexas conversar con %(user)s?",
+    "<userName/> wants to chat": "<userName/> quere conversar",
+    "Start chatting": "Comeza a conversa",
+    "<userName/> invited you": "<userName/> convidoute",
+    "Reject & Ignore user": "Rexeitar e Ignorar usuaria",
+    "This room doesn't exist. Are you sure you're at the right place?": "Esta sala non existe. ¿Tes a certeza de estar no lugar correcto?",
+    "Try again later, or ask a room admin to check if you have access.": "Inténtao máis tarde, ou pídelle á administración da instancia que comprobe se tes 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 foi devolto ao intentar acceder a sala. Se cres que esta mensaxe non é correcta, por favor <issueLink>envía un informe de fallo</issueLink>.",
+    "Never lose encrypted messages": "Non perdas nunca acceso ás mensaxes cifradas",
+    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "As mensaxes nesta sala están aseguradas con cifrado extremo-a-extremo. Só ti e o correspondente(s) tedes as chaves para ler as mensaxes.",
+    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Fai unha copia das chaves para evitar perdelas. <a>Saber máis.</a>",
+    "Not now": "Agora non",
+    "Don't ask me again": "Non preguntarme outra vez",
+    "Sort by": "Orde por",
+    "Activity": "Actividade",
+    "A-Z": "A-Z",
+    "Unread rooms": "Salas non lidas",
+    "Always show first": "Mostrar sempre primeiro",
+    "Show": "Mostrar",
+    "Message preview": "Vista previa da mensaxe",
+    "List options": "Opcións da listaxe",
+    "Add room": "Engadir sala",
+    "Show %(count)s more|other": "Mostrar %(count)s máis",
+    "Show %(count)s more|one": "Mostrar %(count)s máis",
+    "%(count)s unread messages including mentions.|other": "%(count)s mensaxes non lidas incluíndo mencións.",
+    "%(count)s unread messages including mentions.|one": "1 mención non lida.",
+    "%(count)s unread messages.|other": "%(count)s mensaxe non lidas.",
+    "%(count)s unread messages.|one": "1 mensaxe non lida.",
+    "Unread mentions.": "Mencións non lidas.",
+    "Unread messages.": "Mensaxes non lidas.",
+    "Leave Room": "Deixar a Sala",
+    "Room options": "Opcións da Sala",
+    "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Ao actualizar a sala pecharás a instancia actual da sala e crearás unha versión mellorada co mesmo nome.",
+    "This room has already been upgraded.": "Esta sala xa foi actualizada.",
+    "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "A sala está usando a versión <roomVersion />, que este servidor considera como <i>non estable</i>.",
+    "Only room administrators will see this warning": "Só a administración da sala pode ver este aviso",
+    "Unknown Command": "Comando descoñecido",
+    "Unrecognised command: %(commandText)s": "Comando non recoñecido: %(commandText)s",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "Truco: Comeza a mensaxe con <code>//</code> para comezar cun trazo.",
+    "Send as message": "Enviar como mensaxe",
+    "Failed to connect to integration manager": "Fallou a conexión co xestor de integracións",
+    "Add some now": "Engade algún agora",
+    "Failed to revoke invite": "Fallo ao revogar o convite",
+    "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Non se revogou o convite. O servidor podería estar experimentando un problema temporal ou non tes permisos suficientes para revogar o convite.",
+    "Revoke invite": "Revogar convite",
+    "Invited by %(sender)s": "Convidada por %(sender)s",
+    "Mark all as read": "Marcar todo como lido",
+    "Error updating main address": "Fallo ao actualizar o enderezo principal",
+    "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Algo fallou ao actualizar o enderezo principal da sala. Podería non estar autorizado polo servidor ou ser un fallo temporal.",
+    "Error creating address": "Fallo ao crear o enderezo",
+    "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "Algo fallou ao crear ese enderezo. Podería non estar autorizado polo servidor ou ser un fallo temporal.",
+    "You don't have permission to delete the address.": "Non tes permiso para eliminar o enderezo.",
+    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Houbo un erro ao eliminar o enderezo. Podería non existir ou ser un fallo temporal.",
+    "Error removing address": "Erro ao eliminar o enderezo",
+    "Main address": "Enderezo principal",
+    "Local address": "Enderezo local",
+    "Published Addresses": "Enderezos publicados",
+    "Other published addresses:": "Outros enderezos publicados:",
+    "No other published addresses yet, add one below": "Aínda non hai outros enderezos publicados, engade un embaixo",
+    "New published address (e.g. #alias:server)": "Novo enderezo publicado (ex. #alias:servidor)",
+    "Local Addresses": "Enderezos locais",
+    "Room Name": "Nome da sala",
+    "Room Topic": "Asunto da sala",
+    "Room avatar": "Avatar da sala",
+    "Waiting for you to accept on your other session…": "Agardando a que aceptes na túa outra sesión…",
+    "Waiting for %(displayName)s to accept…": "Agardando a que %(displayName)s acepte…",
+    "Accepting…": "Aceptando…",
+    "Start Verification": "Comezar a Verificación",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "As túas mensaxes están seguras e só ti e o correspondente tedes as únicas chaves que as desbloquean.",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "Nas salas cifradas, as túas mensaxes están seguras e só ti e o correspondente tedes as únicas chaves que as desbloquean.",
+    "Verify User": "Verificar Usuaria",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "Para maior seguridade, verifica esta usuaria comprobando o código temporal en dous dos teus dispositivos.",
+    "Your messages are not secure": "As túas mensaxes non están aseguradas",
+    "One of the following may be compromised:": "Un dos seguintes podería estar comprometido:",
+    "Your homeserver": "O teu servidor",
+    "The homeserver the user you’re verifying is connected to": "O servidor ao que a usuaria que estás a verificar está conectada",
+    "Yours, or the other users’ internet connection": "A túa, ou a conexión a internet da outra usuaria",
+    "Yours, or the other users’ session": "A túa, ou a sesión da outra usuaria",
+    "Trusted": "Confiable",
+    "Not trusted": "Non confiable",
+    "%(count)s verified sessions|other": "%(count)s sesións verificadas",
+    "%(count)s verified sessions|one": "1 sesión verificada",
+    "Hide verified sessions": "Agochar sesións verificadas",
+    "%(count)s sessions|other": "%(count)s sesións",
+    "%(count)s sessions|one": "%(count)s sesión",
+    "Hide sessions": "Agochar sesións",
+    "Direct message": "Mensaxe directa",
+    "No recent messages by %(user)s found": "Non se atoparon mensaxes recentes de %(user)s",
+    "Try scrolling up in the timeline to see if there are any earlier ones.": "Desprázate na cronoloxía para ver se hai algúns máis recentes.",
+    "Remove recent messages by %(user)s": "Eliminar mensaxes recentes de %(user)s",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "Vas eliminar %(count)s mensaxes de %(user)s. Esto non ten volta, ¿desexas continuar?",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "Vas eliminar unha mensaxe de %(user)s. Esto non ten volta, ¿desexas continuar?",
+    "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Podería demorar un tempo se é un número grande de mensaxes. Non actualices o cliente mentras tanto.",
+    "Remove %(count)s messages|other": "Eliminar %(count)s mensaxes",
+    "Remove %(count)s messages|one": "Eliminar 1 mensaxe",
+    "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?",
+    "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.",
+    "Security": "Seguridade",
+    "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.": "A sesión que intentas verificar non soporta a verificación por código QR ou por emoticonas, que é o que soporta %(brand)s. Inténtao cun cliente diferente.",
+    "Verify by scanning": "Verificar escaneando",
+    "Ask %(displayName)s to scan your code:": "Pídelle a %(displayName)s que escanee o teu código:",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Se non podes escanear o código superior, verifica comparando as emoticonas.",
+    "Verify by comparing unique emoji.": "Verficación por comparación de emoticonas.",
+    "Verify by emoji": "Verificar por emoticonas",
+    "Almost there! Is your other session showing the same shield?": "Case feito! ¿Podes ver as mesmas na túa outra sesión?",
+    "Almost there! Is %(displayName)s showing the same shield?": "Case feito! ¿está %(displayName)s mostrando as mesmas emoticonas?",
+    "Yes": "Si",
+    "Verify all users in a room to ensure it's secure.": "Verificar todas as usuarias da sala para asegurar que é segura.",
+    "Use the improved room list (will refresh to apply changes)": "Usa a lista de salas mellorada (actualizará para aplicar)",
+    "Strikethrough": "Sobrescrito",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "En salas cifradas, verifica todas as usuarias para asegurar que é segura.",
+    "You've successfully verified your device!": "Verificaches correctamente o teu dispositivo!",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Verificaches correctamente %(deviceName)s (%(deviceId)s)!",
+    "You've successfully verified %(displayName)s!": "Verificaches correctamente a %(displayName)s!",
+    "Verified": "Verficiado",
+    "Got it": "Vale",
+    "Start verification again from the notification.": "Inicia o proceso de novo desde a notificación.",
+    "Start verification again from their profile.": "Inicia a verificación outra vez desde o seu perfil.",
+    "Verification timed out.": "Verificación caducada.",
+    "You cancelled verification on your other session.": "Cancelaches a verificación na túa outra sesión.",
+    "%(displayName)s cancelled verification.": "%(displayName)s cancelou a verificación.",
+    "You cancelled verification.": "Cancelaches a verificación.",
+    "Verification cancelled": "Verificación cancelada",
+    "Compare emoji": "Comparar emoticonas",
+    "Encryption enabled": "Cifrado activado",
+    "Encryption not enabled": "Cifrado desactivado",
+    "The encryption used by this room isn't supported.": "O cifrado desta sala non está soportado.",
+    "React": "Reacciona",
+    "Message Actions": "Accións da mensaxe",
+    "Show image": "Mostrar imaxe",
+    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Estás a ignorar a esta usuaria, polo que a imaxe está agochada. <a>Mostrar igualmente.</a>",
+    "You verified %(name)s": "Verificaches a %(name)s",
+    "You cancelled verifying %(name)s": "Cancelaches a verificación de %(name)s",
+    "%(name)s cancelled verifying": "%(name)s cancelou a verificación",
+    "You accepted": "Aceptaches",
+    "%(name)s accepted": "%(name)s aceptou",
+    "You declined": "Declinaches",
+    "You cancelled": "Cancelaches",
+    "%(name)s declined": "%(name)s declinou",
+    "%(name)s cancelled": "%(name)s cancelou",
+    "Accepting …": "Aceptando…",
+    "Declining …": "Declinando…",
+    "%(name)s wants to verify": "%(name)s desexa verificar",
+    "You sent a verification request": "Enviaches unha solicitude de verificación",
+    "Show all": "Mostrar todo",
+    "Reactions": "Reaccións",
+    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reaccionaron con %(content)s</reactedWith>",
+    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>reaccionaron con %(shortName)s</reactedWith>",
+    "Message deleted": "Mensaxe eliminada",
+    "Message deleted by %(name)s": "Mensaxe eliminada por %(name)s",
+    "This room is a continuation of another conversation.": "Esta sala é continuación doutra conversa.",
+    "Click here to see older messages.": "Preme aquí para ver mensaxes antigas.",
+    "Edited at %(date)s. Click to view edits.": "Editada o %(date)s. Preme para ver edicións.",
+    "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",
+    "Frequently Used": "Utilizado con frecuencia",
+    "Smileys & People": "Sorrisos e Persoas",
+    "Animals & Nature": "Animais e Natureza",
+    "Food & Drink": "Comida e Bebida",
+    "Activities": "Actividades",
+    "Travel & Places": "Viaxes e Lugares",
+    "Objects": "Obxectos",
+    "Symbols": "Símbolos",
+    "Flags": "Bandeiras",
+    "Categories": "Categorías",
+    "Quick Reactions": "Reaccións rápidas",
+    "Cancel search": "Cancelar busca",
+    "Any of the following data may be shared:": "Calquera do seguinte podería ser compartido:",
+    "Your display name": "Nome mostrado",
+    "Your avatar URL": "URL do avatar",
+    "Your user ID": "ID de usuaria",
+    "%(brand)s URL": "URL %(brand)s",
+    "Room ID": "ID da sala",
+    "Widget ID": "ID do widget",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Ao utilizar este widget poderías compartir datos <helpIcon /> con %(widgetDomain)s e o teu Xestor de integracións.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Ao utilizar este widget poderías compartir datos <helpIcon /> con %(widgetDomain)s.",
+    "Widgets do not use message encryption.": "Os Widgets non usan cifrado de mensaxes.",
+    "Widget added by": "Widget engadido por",
+    "This widget may use cookies.": "Este widget podería usar cookies.",
+    "Maximize apps": "Maximizar apps",
+    "More options": "Máis opcións",
+    "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Por favor <newIssueLink>abre un novo informe</newIssueLink> en GitHub para poder investigar o problema.",
+    "Rotate Left": "Rotar á esquerda",
+    "Rotate counter-clockwise": "Rotar sentido contra-horario",
+    "Rotate Right": "Rotar á dereita",
+    "Rotate clockwise": "Rotar sentido horario",
+    "Language Dropdown": "Selector de idioma",
+    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s non fixeron cambios %(count)s veces",
+    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s non fixeron cambios",
+    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s non fixo cambios %(count)s veces",
+    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s non fixo cambios",
+    "QR Code": "Código QR",
+    "Room address": "Enderezo da sala",
+    "e.g. my-room": "ex. a-miña-sala",
+    "Some characters not allowed": "Algúns caracteres non permitidos",
+    "Please provide a room address": "Proporciona un enderezo para a sala",
+    "This address is available to use": "Este enderezo está dispoñible",
+    "This address is already in use": "Este enderezo xa se está a utilizar",
+    "Enter a server name": "Escribe un nome de servidor",
+    "Looks good": "Pinta ben",
+    "Can't find this server or its room list": "Non se atopa o servidor ou a súa lista de salas",
+    "All rooms": "Todas as salas",
+    "Your server": "O teu servidor",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "¿Tes a certeza de querer eliminar <b>%(serverName)s</b>",
+    "Remove server": "Eliminar servidor",
+    "Matrix": "Matrix",
+    "Add a new server": "Engadir novo servidor",
+    "Server name": "Nome do servidor",
+    "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. 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?",
+    "Invite anyway and never warn me again": "Convidar igualmente e non avisarme outra vez",
+    "Invite anyway": "Convidar igualmente",
+    "Close dialog": "Pechar diálogo",
+    "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Cóntanos o que fallou ou, mellor aínda, abre un informe en GitHub que describa o problema.",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Lembra: o teu navegador non está soportado, polo que poderían acontecer situacións non agardadas.",
+    "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Antes de enviar os rexistros, deberías <a>abrir un informe en GitHub</a> para describir o problema.",
+    "GitHub issue": "Informe en GitHub",
+    "Notes": "Notas",
+    "Unable to load commit detail: %(msg)s": "Non se cargou o detalle do commit: %(msg)s",
+    "Removing…": "Eliminando…",
+    "Destroy cross-signing keys?": "Destruír chaves de sinatura-cruzada?",
+    "Clear cross-signing keys": "Baleirar chaves de sinatura-cruzada",
+    "Clear all data in this session?": "¿Baleirar todos os datos desta sesión?",
+    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "O baleirado dos datos da sesión é permanente. As mensaxes cifradas perderánse a menos que as súas chaves estiveren nunha copia de apoio.",
+    "Clear all data": "Eliminar todos os datos",
+    "Please enter a name for the room": "Escribe un nome para a sala",
+    "Set a room address to easily share your room with other people.": "Establece un enderezo para a sala fácil de compartir con outras persoas.",
+    "This room is private, and can only be joined by invitation.": "Esta sala é privada, e só te podes unir a través dun convite.",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "Podes desactivar esto posteriormente. As pontes e maioría de bots aínda non funcionarán.",
+    "Enable end-to-end encryption": "Activar cifrado extremo-a-extremo",
+    "Create a public room": "Crear sala pública",
+    "Create a private room": "Crear sala privada",
+    "Topic (optional)": "Asunto (optativo)",
+    "Make this room public": "Facer pública esta sala",
+    "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.",
+    "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.",
+    "Confirm account deactivation": "Confirma a desactivación da conta",
+    "There was a problem communicating with the server. Please try again.": "Houbo un problema ao comunicar co servidor. Inténtao outra vez.",
+    "Server did not require any authentication": "O servidor non require auténticación",
+    "Server did not return valid authentication information.": "O servidor non devolveu información válida de autenticación.",
+    "View Servers in Room": "Ver Servidores na Sala",
+    "Verification Requests": "Solicitudes de Verificación",
+    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifica esta usuaria para marcala como confiable. Ao confiar nas usuarias proporcionache tranquilidade extra cando usas cifrado de extremo-a-extremo.",
+    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Ao verificar esta usuaria marcarás a súa sesión como confiable, e tamén marcará a túa sesión como confiable para elas.",
+    "Use custom size": "Usar tamaño personalizado",
+    "Use a system font": "Usar tipo de letra do sistema",
+    "System font name": "Nome da letra do sistema",
+    "Hey you. You're the best!": "Ei ti. Es grande!",
+    "Message layout": "Disposición da mensaxe",
+    "Compact": "Compacta",
+    "Modern": "Moderna",
+    "Power level": "Poderío",
+    "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...",
+    "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.",
+    "Integrations not allowed": "Non se permiten Integracións",
+    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "O teu %(brand)s non permite que uses o Xestor de Integracións, contacta coa administración.",
+    "Confirm to continue": "Confirma para continuar",
+    "Click the button below to confirm your identity.": "Preme no botón inferior para confirmar a túa identidade.",
+    "Failed to invite the following users to chat: %(csvUsers)s": "Fallo ao convidar as seguintes usuarias a conversa: %(csvUsers)s",
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "Non puidemos crear o teu MD. Comproba as usuarias que queres convidar e inténtao outra vez.",
+    "Something went wrong trying to invite the users.": "Algo fallou ao convidar as usuarias.",
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "Non puidemos invitar esas usuarias. Comprobas que son correctas e intenta convidalas outra vez.",
+    "Failed to find the following users": "Non atopamos as seguintes usuarias",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "As seguintes usuarias poderían non existir ou non son válidas, e non se poden convidar: %(csvNames)s",
+    "Recent Conversations": "Conversas recentes",
+    "Suggestions": "Suxestións",
+    "Recently Direct Messaged": "Mensaxes Directas recentes",
+    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Inicia a conversa con alguén usando o seu nome, nome de usuaria (como <userId/>) ou enderezo de email.",
+    "Go": "Ir",
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Convida alguén usando o seu nome, nome de usuaria (como <userId/>), enderezo de email ou <a>comparte esta sala</a>.",
+    "a new master key signature": "unha nova firma con chave mestra",
+    "a new cross-signing key signature": "unha nova firma con chave de sinatura-cruzada",
+    "a device cross-signing signature": "unha sinatura sinatura-cruzada de dispositivo",
+    "a key signature": "unha chave de sinatura",
+    "%(brand)s encountered an error during upload of:": "%(brand)s atopou un fallo ao subir:",
+    "Upload completed": "Subida completa",
+    "Cancelled signature upload": "Cancelada a subida da sinatura",
+    "Unable to upload": "Non foi posible a subida",
+    "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.",
+    "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!",
+    "Updating %(brand)s": "Actualizando %(brand)s",
+    "I don't want my encrypted messages": "Non quero as miñas mensaxes cifradas",
+    "Manually export keys": "Exportar manualmente as chaves",
+    "You'll lose access to your encrypted messages": "Perderás o acceso as túas mensaxes cifradas",
+    "Confirm by comparing the following with the User Settings in your other session:": "Corfirma comparando o seguinte cos Axustes de Usuaria na outra sesión:",
+    "Confirm this user's session by comparing the following with their User Settings:": "Confirma a sesión desta usuaria comparando o seguinte cos seus Axustes de Usuaria:",
+    "Session name": "Nome da sesión",
+    "Session key": "Chave da sesión",
+    "If they don't match, the security of your communication may be compromised.": "Se non concordan, a seguridade da comunicación podería estar comprometida.",
+    "Verify session": "Verificar sesión",
+    "Your homeserver doesn't seem to support this feature.": "O servidor non semella soportar esta característica.",
+    "Guest": "Convidada",
+    "Message edits": "Edicións da mensaxe",
+    "Your account is not secure": "A túa conta non é segura",
+    "Your password": "O teu contrasinal",
+    "This session, or the other session": "Esta sesión, ou a outra sesión",
+    "The internet connection either session is using": "A conexión a internet que está a usar cada sesión",
+    "We recommend you change your password and recovery key in Settings immediately": "Recomendámosche cambiar inmediatamente o contrasinal e chave de recuperación nos Axustes",
+    "New session": "Nova sesión",
+    "Use this session to verify your new one, granting it access to encrypted messages:": "Usa esta seseión para verificar a nova, dándolle acceso ás mensaxes cifradas:",
+    "This wasn't me": "Non fun eu",
+    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Se atopas fallos ou queres compartir a túa experiencia, compárteos con nós en GitHub.",
+    "Report bugs & give feedback": "Informe de fallos & opinión",
+    "Please fill why you're reporting.": "Escribe a razón do informe.",
+    "Report Content to Your Homeserver Administrator": "Denuncia sobre contido á Administración do teu servidor",
+    "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.": "Ao denunciar esta mensaxe vasnos enviar o seu 'event ID' único á administración do servidor. Se as mensaxes da sala están cifradas, a administración do servidor non poderá ler o texto da mensaxe ou ver imaxes ou ficheiros.",
+    "Send report": "Enviar denuncia",
+    "Failed to upgrade room": "Fallou a actualización da sala",
+    "The room upgrade could not be completed": "A actualización da sala non se completou",
+    "Upgrade this room to version %(version)s": "Actualiza esta sala á versión %(version)s",
+    "Upgrade Room Version": "Actualiza a Versión da Sala",
+    "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:": "Para actualizar a sala debes pechar a instancia actual da sala e crear unha nova sala no seu lugar. Para proporcionar a mellor experiencia de usuaria, imos:",
+    "Create a new room with the same name, description and avatar": "Crear unha nova sala co mesmo nome, descrición e avatar",
+    "Update any local room aliases to point to the new room": "Actualizar calquera alias local da sala para que apunte á nova sala",
+    "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Evitar que as usuarias conversen na sala antiga e publicar unha mensaxe avisando ás usuarias para que veñan á nova sala",
+    "Put a link back to the old room at the start of the new room so people can see old messages": "Poñer unha ligazón na nova sala cara a antiga para que as persoas poidan ver as mensaxes antigas",
+    "Automatically invite users": "Convidar automáticamente ás usuarias",
+    "Upgrade private room": "Actualizar sala privada",
+    "Upgrade public room": "Actualizar sala pública",
+    "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "A actualización da sala é unha acción avanzada e recomendada cando unha sala se volta inestable debido aos fallos, características obsoletas e vulnerabilidades da seguridade.",
+    "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 normalmente só afecta ao xeito en que a sala se procesa no servidor. Se tes problemas con %(brand)s, <a>informa do problema</a>.",
+    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Vas actualizar a sala da versión <oldVersion /> á <newVersion />.",
+    "A username can only contain lower case letters, numbers and '=_-./'": "Un nome de usuaria só pode ter minúsculas, números e  '=_-./'",
+    "Checking...": "Comprobando...",
+    "Missing session data": "Faltan datos da sesión",
+    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Faltan algúns datos da sesión, incluíndo chaves de mensaxes cifradas. Desconecta e volve a conectar para arranxalo, restaurando as chaves desde a copia.",
+    "Your browser likely removed this data when running low on disk space.": "O navegador probablemente eliminou estos datos ao quedar con pouco espazo de disco.",
+    "Integration Manager": "Xestor de Integracións",
+    "Find others by phone or email": "Atopa a outras por teléfono ou email",
+    "Be found by phone or email": "Permite ser atopada polo email ou teléfono",
+    "Use bots, bridges, widgets and sticker packs": "Usa bots, pontes, widgets e paquetes de adhesivos",
+    "Terms of Service": "Termos do Servizo",
+    "To continue you need to accept the terms of this service.": "Para continuar tes que aceptar os termos deste servizo.",
+    "Service": "Servizo",
+    "Summary": "Resumo",
+    "Document": "Documento",
+    "Next": "Seguinte",
+    "Upload files (%(current)s of %(total)s)": "Subir ficheiros (%(current)s de %(total)s)",
+    "Upload files": "Subir ficheiros",
+    "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 ficheiro é <b>demasiado grande</b> para subilo. O límite é %(limit)s mais o ficheiro é %(sizeOfThisFile)s.",
+    "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Estes ficheiros son <b>demasiado grandes</b> para subilos. O límite é %(limit)s.",
+    "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Algúns ficheiros son <b>demasiado grandes</b> para subilos. O límite é %(limit)s.",
+    "Upload %(count)s other files|other": "Subir outros %(count)s ficheiros",
+    "Upload %(count)s other files|one": "Subir %(count)s ficheiro máis",
+    "Cancel All": "Cancelar todo",
+    "Upload Error": "Fallo ao subir",
+    "Verify other session": "Verificar outra sesión",
+    "Verification Request": "Solicitude de Verificación",
+    "A widget would like to verify your identity": "Un widget quere verificar a túa indentidade",
+    "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.": "Un widget localizado en %(widgetUrl)s quere verificar a túa identidade. Se o permites, o widget poderá verificar o teu ID de usuaria, pero non realizar accións por ti.",
+    "Remember my selection for this widget": "Lembrar a miña decisión para este widget",
+    "Deny": "Denegar",
+    "Enter recovery passphrase": "Escribe a frase de paso de recuperación",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Non se pode acceder ao almacenaxe segredo. Verifica que escribiches a frase de paso correta.",
+    "Enter recovery key": "Escribe a chave de recuperación",
+    "This looks like a valid recovery key!": "Semella unha chave de recuperación válida!",
+    "Not a valid recovery key": "Non é unha chave de recuperación válida",
+    "Restoring keys from backup": "Restablecendo chaves desde a copia",
+    "Fetching keys from server...": "Obtendo chaves desde o servidor...",
+    "%(completed)s of %(total)s keys restored": "%(completed)s de %(total)s chaves restablecidas",
+    "Unable to load backup status": "Non cargou o estado da copia",
+    "Recovery key mismatch": "A chave de recuperación non concorda",
+    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "A copia non se puido descifrar con esta chave de recuperación: comproba que introduciches a chave de recuperación correcta.",
+    "Incorrect recovery passphrase": "Frase da paso de recuperación incorrecta",
+    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "A copia non se descifrou con esta frase de paso: comproba que escribiches a frase de paso correcta.",
+    "Unable to restore backup": "Non se restableceu a copia",
+    "No backup found!": "Non se atopou copia!",
+    "Keys restored": "Chaves restablecidas",
+    "Failed to decrypt %(failedCount)s sessions!": "Fallo ao descifrar %(failedCount)s sesións!",
+    "Successfully restored %(sessionCount)s keys": "Restablecidas correctamente %(sessionCount)s chaves",
+    "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Aviso</b>: só deberías realizar a copia de apoio desde un ordenador de confianza.",
+    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Accede ó historial de mensaxes seguras escribindo a frase de paso de recuperación.",
+    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Se esqueceches a frase de paso de recuperación pode <button1>usar a chave de recuperación</button1> ou establecer <button2>novas opcións de recuperación</button2>",
+    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Aviso</b>: só deberías configurar a copia das chaves desde un ordenador de confianza.",
+    "Access your secure message history and set up secure messaging by entering your recovery key.": "Accede ó teu historial de mensaxes seguras e configura a comunicación segura escribindo a chave de recuperación.",
+    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Se esqueceches a chave de recuperación podes <button>establecer novas opcións de recuperación</button>",
+    "Address (optional)": "Enderezo (optativo)",
+    "Resend edit": "Editar reenvío",
+    "Resend %(unsentCount)s reaction(s)": "Reenviar %(unsentCount)s reacción(s)",
+    "Resend removal": "Reenviar retirada",
+    "Share Permalink": "Comparte ligazón permanente",
+    "Report Content": "Denunciar contido",
+    "Notification settings": "Axustes de notificacións",
+    "Clear status": "Baleirar estado",
+    "Update status": "Actualizar estado",
+    "Set status": "Establecer estado",
+    "Set a new status...": "Establecer novo estado...",
+    "Hide": "Agochar",
+    "Reload": "Recargar",
+    "Take picture": "Tomar foto",
+    "Remove for everyone": "Eliminar para todas",
+    "Remove for me": "Eliminar para min",
+    "User Status": "Estado da usuaria",
+    "This homeserver would like to make sure you are not a robot.": "Este servidor quere asegurarse de que non es un robot.",
+    "Country Dropdown": "Despregable de países",
+    "Confirm your identity by entering your account password below.": "Confirma a túa identidade escribindo o contrasinal da conta embaixo.",
+    "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",
+    "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",
+    "Enter password": "Escribe contrasinal",
+    "Nice, strong password!": "Ben, bo contrasinal!",
+    "Password is allowed, but unsafe": "O contrasinal é admisible, pero inseguro",
+    "Keep going...": "Segue intentándoo...",
+    "The username field must not be blank.": "O campo de nome de usuaria non pode estar baleiro.",
+    "Username": "Nome de usuaria",
+    "Not sure of your password? <a>Set a new one</a>": "¿Non estás segura do contrasinal? <a>Crea un novo</a>",
+    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Non hai un servidor de identidade configurado polo que non poderás engadir enderezos de email para poder restablecer o contrasinal no futuro.",
+    "Use an email address to recover your account": "Usa un enderezo de email para recuperar a túa conta",
+    "Enter email address (required on this homeserver)": "Escribe o enderzo de email (requerido neste servidor)",
+    "Doesn't look like a valid email address": "Non semella un enderezo válido",
+    "Passwords don't match": "Non concordan os contrasinais",
+    "Other users can invite you to rooms using your contact details": "Outras usuarias poden convidarte ás salas usando os teus detalles de contacto",
+    "Enter phone number (required on this homeserver)": "Escribe un número de teléfono (requerido neste servidor)",
+    "Doesn't look like a valid phone number": "Non semella un número de teléfono válido",
+    "Use lowercase letters, numbers, dashes and underscores only": "Usa só minúsculas, números, trazos e trazos baixos",
+    "Enter username": "Escribe nome de usuaria",
+    "Email (optional)": "Email (optativo)",
+    "Phone (optional)": "Teléfono (optativo)",
+    "Create your Matrix account on %(serverName)s": "Crea a conta Matrix en %(serverName)s",
+    "Create your Matrix account on <underlinedServerName />": "Crea a túa conta Matrix en <underlinedServerName />",
+    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Establece un email para recuperación da conta. Usa un email ou teléfono de xeito optativo para que poidan atoparte os contactos.",
+    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Establece un email para recuperación da conta. Optativamente usa un email para que poidan atoparte os contactos existentes.",
+    "Enter your custom homeserver URL <a>What does this mean?</a>": "Escribe o URL do servidor personalizado <a>¿Qué significa esto?</a>",
+    "Homeserver URL": "URL do servidor",
+    "Enter your custom identity server URL <a>What does this mean?</a>": "Escribe o URL do servidor de identidade personalizado <a>¿Que significa esto?</a>",
+    "Identity Server URL": "URL do servidor de identidade",
+    "Other servers": "Outros servidores",
+    "Free": "Gratuíto",
+    "Premium": "Premium",
+    "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.",
+    "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",
+    "Liberate your communication": "Libera as túas comunicacións",
+    "Send a Direct Message": "Envía unha Mensaxe Directa",
+    "Create a Group Chat": "Crear unha Conversa en Grupo",
+    "Self-verification request": "Solicitude de auto-verificación",
+    "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s non puido obter a lista de protocolos desde o servidor. O servidor podería ser moi antigo para soportar redes de terceiros.",
+    "%(brand)s failed to get the public room list.": "%(brand)s non puido obter a lista de salas públicas.",
+    "The homeserver may be unavailable or overloaded.": "O servidor podería non estar dispoñible ou con sobrecarga.",
+    "delete the address.": "eliminar o enderezo.",
+    "Preview": "Vista previa",
+    "View": "Vista",
+    "Find a room…": "Atopa unha sala…",
+    "Find a room… (e.g. %(exampleRoom)s)": "Atopa unha sala... (ex. %(exampleRoom)s)",
+    "Jump to first unread room.": "Vaite a primeira sala non lida.",
+    "Jump to first invite.": "Vai ó primeiro convite.",
+    "You have %(count)s unread notifications in a prior version of this room.|other": "Tes %(count)s notificacións non lidas nunha versión previa desta sala.",
+    "You have %(count)s unread notifications in a prior version of this room.|one": "Tes %(count)s notificacións non lidas nunha versión previa desta sala.",
+    "Your profile": "Perfil",
+    "Switch to light mode": "Cambiar a decorado claro",
+    "Switch to dark mode": "Cambiar a decorado escuro",
+    "Switch theme": "Cambiar decorado",
+    "Security & privacy": "Seguridade & privacidade",
+    "All settings": "Todos os axustes",
+    "Feedback": "Comenta",
+    "Could not load user profile": "Non se cargou o perfil da usuaria",
+    "Verify this login": "Verifcar esta conexión",
+    "Session verified": "Sesión verificada",
+    "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.": "Ao cambiar o contrasinal vas restablecer todas as chaves de cifrado das túas sesións, impedindo ler o historial de conversa. Configura a Copia de Apoio das Chaves ou exporta as chaves da sala desde outra sesión antes de restablecer o contrasinal.",
+    "Your Matrix account on %(serverName)s": "A túa conta Matrix en %(serverName)s",
+    "Your Matrix account on <underlinedServerName />": "A túa conta Matrix en <underlinedServerName />",
+    "No identity server is configured: add one in server settings to reset your password.": "Non hai un Servidor de Identidade configurado: engade un nos axustes para restablecer o contrasinal.",
+    "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.": "Desconectaches todas as sesións e non recibirás notificacións push. Para reactivalas, conéctate outra vez nos dispositivos.",
+    "Set a new password": "Novo contrasinal",
+    "Invalid homeserver discovery response": "Resposta de descubrimento do servidor non válida",
+    "Failed to get autodiscovery configuration from server": "Fallo ó obter a configuración de autodescubrimento desde o servidor",
+    "Invalid base_url for m.homeserver": "base_url non válido para m.homeserver",
+    "Homeserver URL does not appear to be a valid Matrix homeserver": "O URL do servidor non semella ser un servidor Matrix válido",
+    "Invalid identity server discovery response": "Resposta de descubrimento de identidade do servidor non válida",
+    "Invalid base_url for m.identity_server": "base_url para m.identity_server non válida",
+    "Identity server URL does not appear to be a valid identity server": "O URL do servidor de identidade non semella ser un servidor de identidade válido",
+    "This account has been deactivated.": "Esta conta foi desactivada.",
+    "Failed to perform homeserver discovery": "Fallo ao intentar o descubrimento do servidor",
+    "Syncing...": "Sincronizando...",
+    "Signing In...": "Conectando con...",
+    "If you've joined lots of rooms, this might take a while": "Se te uniches a moitas salas, esto podería levarnos un anaco",
+    "Create account": "Crea unha conta",
+    "Use a more compact ‘Modern’ layout": "Usa o deseño compacto 'Moderno'",
+    "Unable to query for supported registration methods.": "Non se puido consultar os métodos de rexistro soportados.",
+    "Registration has been disabled on this homeserver.": "O rexistro está desactivado neste servidor.",
+    "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "A tú conta (%(newAccountId)s) foi rexistrada, pero estás conectada usando outra conta (%(loggedInUserId)s).",
+    "Continue with previous account": "Continúa coa conta anterior",
+    "<a>Log in</a> to your new account.": "<a>Conecta</a> usando a conta nova.",
+    "You can now close this window or <a>log in</a> to your new account.": "Podes pechar esta ventá ou <a>conectar</a> usando a conta nova.",
+    "Registration Successful": "Rexistro correcto",
+    "Create your account": "Crea a túa conta",
+    "Use Recovery Key or Passphrase": "Usa a Chave de recuperación ou Frase de paso",
+    "Use Recovery Key": "Usa chave de recuperación",
+    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Confirma a túa identidade verificando esta conexión desde unha das outras sesións, permitindo así acceder ás mensaxes cifradas.",
+    "This requires the latest %(brand)s on your other devices:": "Require a última versión de %(brand)s nos outros dispositivos:",
+    "or another cross-signing capable Matrix client": "ou outro cliente Matrix que permita a sinatura-cruzada",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "A nova sesión foi verificada. Tes acceso ás mensaxes cifradas, e outras persoas verante como confiable.",
+    "Your new session is now verified. Other users will see it as trusted.": "A nova sesión foi verificada. Outras persoas verante como confiable.",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "Sen non garantes a seguridade para esta sesión non poderá acceder a mensaxes cifradas.",
+    "Go Back": "Atrás",
+    "Failed to re-authenticate due to a homeserver problem": "Fallo ó reautenticar debido a un problema no servidor",
+    "Failed to re-authenticate": "Fallo na reautenticació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.": "Recupera o acceso á túa conta e recupera as chaves de cifrado gardadas nesta sesión. Sen elas, non poderás ler as mensaxes seguras en calquera das sesións.",
+    "Forgotten your password?": "¿Esqueceches o contrasinal?",
+    "You're signed out": "Estás desconectada",
+    "Clear personal data": "Baleirar datos personais",
+    "Command Autocomplete": "Autocompletado de comandos",
+    "Community Autocomplete": "Autocompletado de comunidade",
+    "DuckDuckGo Results": "Resultados DuckDuckGo",
+    "Emoji Autocomplete": "Autocompletado emoticonas",
+    "Notification Autocomplete": "Autocompletado de notificacións",
+    "Room Autocomplete": "Autocompletado de Salas",
+    "User Autocomplete": "Autocompletados de Usuaria",
+    "Confirm encryption setup": "Confirma os axustes de cifrado",
+    "Click the button below to confirm setting up encryption.": "Preme no botón inferior para confirmar os axustes do cifrado.",
+    "Enter your account password to confirm the upgrade:": "Escribe o contrasinal para confirmar a actualización:",
+    "Restore your key backup to upgrade your encryption": "Restablece a copia das chaves para actualizar o cifrado",
+    "Restore": "Restablecer",
+    "You'll need to authenticate with the server to confirm the upgrade.": "Debes autenticarte no servidor para confirmar a actualización.",
+    "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Actualiza esta sesión para permitirlle que verifique as outras sesións, outorgándolles acceso ás mensaxes cifradas e marcándoas como confiables para outras usuarias.",
+    "Enter a recovery passphrase": "Escribe a frase de paso de recuperación",
+    "Great! This recovery passphrase looks strong enough.": "Ben! Esta frase de paso de recuperación semella ser forte.",
+    "Set up with a recovery key": "Configura cunha chave de recuperación",
+    "That matches!": "Concorda!",
+    "Use a different passphrase?": "¿Usar unha frase de paso diferente?",
+    "That doesn't match.": "Non concorda.",
+    "Go back to set it again.": "Vai atrás e volve a escribila.",
+    "Enter your recovery passphrase a second time to confirm it.": "Escribe a frase de paso de recuperación por segunda vez para confirmala.",
+    "Confirm your recovery passphrase": "Confirma a frase de paso de recuperación",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "A chave de recuperación é unha rede de seguridade - podes usala para recuperar o acceso ás mensaxes cifradas se esqueces a frase de paso de recuperación.",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Garda unha copia nun lugar seguro, como un xestor de contrasinais ou nun lugar aínda máis seguro.",
+    "Your recovery key": "A chave de recuperación",
+    "Copy": "Copiar",
+    "Download": "Descargar",
+    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "A chave de recuperación foi <b>copiada no portapapeis</b>, pégaa en:",
+    "Your recovery key is in your <b>Downloads</b> folder.": "A chave de recuperación está no teu cartafol de <b>Descargas</b>.",
+    "<b>Print it</b> and store it somewhere safe": "<b>Imprímea</b> e gárdaa nun lugar seguro",
+    "<b>Save it</b> on a USB key or backup drive": "<b>Gárdaa</b> nunha memoria USB ou disco duro",
+    "<b>Copy it</b> to your personal cloud storage": "<b>Copiaa</b> no almacenaxe personal na nube",
+    "Unable to query secret storage status": "Non se obtivo o estado do almacenaxe segredo",
+    "Retry": "Reintentar",
+    "Upgrade your encryption": "Mellora o teu cifrado",
+    "Make a copy of your recovery key": "Fai unha copia da túa chave de recuperación",
+    "Unable to set up secret storage": "Non se configurou un almacenaxe segredo",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Imos gardar unha copia cifrada das túas chaves no noso servidor. Asegura a copia cunha frase de paso de recuperación.",
+    "For maximum security, this should be different from your account password.": "Para máxima seguridade, esta debería ser diferente ó contrasinal da túa conta.",
+    "Please enter your recovery passphrase a second time to confirm.": "Escribe a frase de paso de recuperación outra vez para confirmala.",
+    "Repeat your recovery passphrase...": "Repite a frase de paso de recuperación...",
+    "Your keys are being backed up (the first backup could take a few minutes).": "As chaves estanse a copiar (a primeira copia podería tardar un anaco).",
+    "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.": "Se non configuras Recuperación de Mensaxes Seguras, non poderás restablecer o historial de mensaxes cifradas se te desconectas ou usas outra sesión.",
+    "Set up Secure Message Recovery": "Cofigurar Recuperación de Mensaxes Seguras",
+    "Secure your backup with a recovery passphrase": "Asegura a túa copia cunha frase de paso de recuperación",
+    "Starting backup...": "Iniciando a copia...",
+    "Success!": "Feito!",
+    "Create key backup": "Crear copia da chave",
+    "Unable to create key backup": "Non se creou a copia da chave",
+    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Se non configuras a Recuperación de Mensaxes Seguras, perderás o acceso ó historial de mensaxes seguras cando te desconectes.",
+    "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.",
+    "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",
+    "Set up Secure Messages": "Configurar Mensaxes Seguras",
+    "Recovery Method Removed": "Método de Recuperación eliminado",
+    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Esta sesión detectou que a túa frase de paso de recuperación e chave para Mensaxes Seguras foron eliminadas.",
+    "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 fixeches esto sen querer, podes configurar Mensaxes Seguras nesta sesión e volverá a cifrar as mensaxes da sesión cun novo 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.": "Se non eliminaches o método de recuperación, un atacante podería estar a intentar acceder á túa conta. Cambia inmediatamente o contrasinal da conta e establece un novo método de recuperación nos Axustes.",
+    "If disabled, messages from encrypted rooms won't appear in search results.": "Se está desactivado, as mensaxes das salas cifradas non aparecerán nos resultados das buscas.",
+    "Disable": "Desactivar",
+    "Not currently indexing messages for any room.": "Non se están indexando as mensaxes de ningunha sala.",
+    "Currently indexing: %(currentRoom)s": "Indexando actualmente: %(currentRoom)s",
+    "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s está gardando de xeito seguro na caché local mensaxes cifradas para que aparezan nos resultados das buscas:",
+    "Space used:": "Espazo utilizado:",
+    "Indexed messages:": "Mensaxes indexadas:",
+    "Indexed rooms:": "Salas indexadas:",
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s de %(totalRooms)s",
+    "New spinner design": "Novo deseño da roda",
+    "Message downloading sleep time(ms)": "Tempo de espera da mensaxe de descarga(ms)",
+    "Navigation": "Navegación",
+    "Calls": "Chamadas",
+    "Room List": "Lista de Salas",
+    "Autocomplete": "Autocompletado",
+    "Alt": "Alt",
+    "Alt Gr": "Alt Gr",
+    "Shift": "Maiús",
+    "Super": "Super",
+    "Ctrl": "Ctrl",
+    "Toggle Bold": "Activa Resaltar",
+    "Toggle Italics": "Activa Cursiva",
+    "Toggle Quote": "Activa Citación",
+    "New line": "Nova liña",
+    "Navigate recent messages to edit": "Mira nas mensaxes recentes para editar",
+    "Jump to start/end of the composer": "Vai ó inicio/fin no editor",
+    "Navigate composer history": "Vai ó historial do editor",
+    "Cancel replying to a message": "Cancelar a resposta a mensaxe",
+    "Toggle microphone mute": "Acalar micrófono",
+    "Toggle video on/off": "Activar vídeo on/off",
+    "Scroll up/down in the timeline": "Desprazarse arriba/abaixo na cronoloxía",
+    "Dismiss read marker and jump to bottom": "Ignorar marcador de lectura e ir ó final",
+    "Jump to oldest unread message": "Ir á mensaxe máis antiga non lida",
+    "Upload a file": "Subir ficheiro",
+    "Jump to room search": "Ir a busca na sala",
+    "Navigate up/down in the room list": "Ir arriba/abaixo na lista de salas",
+    "Select room from the room list": "Escoller sala da lista de salas",
+    "Collapse room list section": "Contraer a sección de lista de salas",
+    "Expand room list section": "Expandir a sección da lista de salas",
+    "Previous/next unread room or DM": "Anterior/seguinte para salas non lidas ou MD",
+    "Previous/next room or DM": "Anterior/seguinte para sala ou MD",
+    "Toggle the top left menu": "Activar o menú superior esquerdo",
+    "Close dialog or context menu": "Pechar o diálogo ou menú contextual",
+    "Activate selected button": "Activar o botón seleccionado",
+    "Toggle right panel": "Activar panel dereito",
+    "Toggle this dialog": "Activar este diálogo",
+    "Move autocomplete selection up/down": "Mover selección autocompletado arriba/abaixo",
+    "Cancel autocomplete": "Cancelar autocompletado",
+    "Page Up": "Páxina superior",
+    "Page Down": "Páxina inferior",
+    "Esc": "Esc",
+    "Enter": "Intro",
+    "Space": "Espazo",
+    "End": "Fin",
+    "You joined the call": "Unícheste á chamada",
+    "%(senderName)s joined the call": "%(senderName)s uniuse á chamada",
+    "Call in progress": "Chamada en curso",
+    "You left the call": "Deixáchela chamada",
+    "%(senderName)s left the call": "%(senderName)s deixou a chamada",
+    "Call ended": "Chamada rematada",
+    "You started a call": "Iniciaches unha chamada",
+    "%(senderName)s started a call": "%(senderName)s iniciou unha chamada",
+    "Waiting for answer": "Agardando resposta",
+    "%(senderName)s is calling": "%(senderName)s está chamando",
+    "You created the room": "Creaches a sala",
+    "%(senderName)s created the room": "%(senderName)s creou a sala",
+    "You made the chat encrypted": "Cifraches a conversa",
+    "%(senderName)s made the chat encrypted": "%(senderName)s cifrou a conversa",
+    "You made history visible to new members": "Fixeches visible o historial para novos membros",
+    "%(senderName)s made history visible to new members": "%(senderName)s fixo o historial visible para novos membros",
+    "You made history visible to anyone": "Fixeches que o historial sexa visible para todas",
+    "%(senderName)s made history visible to anyone": "%(senderName)s fixo o historial visible para todas",
+    "You made history visible to future members": "Fixeches o historial visible para membros futuros",
+    "%(senderName)s made history visible to future members": "%(senderName)s fixo o historial visible para futuros membros",
+    "You were invited": "Foches convidada",
+    "%(targetName)s was invited": "%(targetName)s foi convidada",
+    "You left": "Saíches",
+    "%(targetName)s left": "%(targetName)s saíu",
+    "You were kicked (%(reason)s)": "Expulsáronte (%(reason)s)",
+    "%(targetName)s was kicked (%(reason)s)": "%(targetName)s foi expulsada (%(reason)s)",
+    "You were kicked": "Foches expulsada",
+    "%(targetName)s was kicked": "%(targetName)s foi expulsada",
+    "You rejected the invite": "Rexeitaches o convite",
+    "%(targetName)s rejected the invite": "%(targetName)s rexeitou o convite",
+    "You were uninvited": "Retiraronche o convite",
+    "%(targetName)s was uninvited": "Retirouse o convite para %(targetName)s",
+    "You were banned (%(reason)s)": "Foches bloqueada (%(reason)s)",
+    "%(targetName)s was banned (%(reason)s)": "%(targetName)s foi bloqueada (%(reason)s)",
+    "You were banned": "Foches bloqueada",
+    "%(targetName)s was banned": "%(targetName)s foi bloqueada",
+    "You joined": "Unícheste",
+    "%(targetName)s joined": "%(targetName)s uneuse",
+    "You changed your name": "Cambiaches o nome",
+    "%(targetName)s changed their name": "%(targetName)s cambiou o seu nome",
+    "You changed your avatar": "Cambiáchelo avatar",
+    "%(targetName)s changed their avatar": "%(targetName)s cambiou o seu avatar",
+    "%(senderName)s %(emote)s": "%(senderName)s %(emote)s",
+    "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
+    "You changed the room name": "Cambiaches o nome da sala",
+    "%(senderName)s changed the room name": "%(senderName)s cambiou o nome da sala",
+    "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
+    "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
+    "You uninvited %(targetName)s": "Retiraches o convite para %(targetName)s",
+    "%(senderName)s uninvited %(targetName)s": "%(senderName)s retiroulle o convite a %(targetName)s",
+    "You invited %(targetName)s": "Convidaches a %(targetName)s",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s convidou a %(targetName)s",
+    "You changed the room topic": "Cambiaches o tema da sala",
+    "%(senderName)s changed the room topic": "%(senderName)s cambiou o asunto da sala",
+    "Message deleted on %(date)s": "Mensaxe eliminada o %(date)s",
+    "Wrong file type": "Tipo de ficheiro erróneo",
+    "Looks good!": "Pinta ben!",
+    "Wrong Recovery Key": "Chave de recuperación errónea",
+    "Invalid Recovery Key": "Chave de recuperación non válida",
+    "Security Phrase": "Frase de seguridade",
+    "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Escribe a túa Frase de Seguridade ou <button>Utiliza a Chave de Seguridade</button> para continuar.",
+    "Security Key": "Chave de Seguridade",
+    "Use your Security Key to continue.": "Usa a túa Chave de Seguridade para continuar.",
+    "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Protección contra a perda do acceso ás mensaxes cifradas e datos facendo unha copia de apoio das chaves no servidor.",
+    "Generate a Security Key": "Crear unha Chave de Seguridade",
+    "We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "Crearemos unha Chave de Seguridade para que a gardes nalgún lugar seguro, como un xestor de contrasinais ou caixa de seguridade.",
+    "Enter a Security Phrase": "Escribe unha Frase de Seguridade",
+    "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Usa unha frase segreda que só ti coñezas, e de xeito optativo unha Chave de Seguridade para usar como apoio.",
+    "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.": "Escribe unha frase de seguridade que só ti coñezas, será utilizada para protexer os teus datos. Para maior seguridade, non deberías reutilizar o contrasinal da conta.",
+    "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "Garda a Chave de Seguridade nalgún lugar seguro, como un xestor de contrasinais ou caixa de seguridade, será utiizada para protexer os teus datos cifrados.",
+    "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Se cancelas agora, poderías perder mensaxes e datos cifrados se perdes o acceso ós datos de conexión.",
+    "You can also set up Secure Backup & manage your keys in Settings.": "Podes configurar a Copia de apoio Segura e xestionar as chaves en Axustes.",
+    "Set up Secure backup": "Configurar Copia de apoio Segura",
+    "Set a Security Phrase": "Establece a Frase de Seguridade",
+    "Confirm Security Phrase": "Confirma a Frase de Seguridade",
+    "Save your Security Key": "Garda a Chave de Seguridade",
+    "Use your account to sign in to the latest version": "Usa a túa conta para conectarte á última versión",
+    "We’re excited to announce Riot is now Element": "Emociónanos anunciar que Riot agora chámase Element",
+    "Riot is now Element!": "Riot agora é Element!",
+    "Learn More": "Saber máis",
+    "Enable experimental, compact IRC style layout": "Activar o estilo experimental IRC compacto",
+    "Unknown caller": "Descoñecido",
+    "Incoming voice call": "Chamada de voz entrante",
+    "Incoming video call": "Chamada de vídeo entrante",
+    "Incoming call": "Chamada entrante",
+    "%(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 non pode por na caché local de xeito as mensaxes cifradas cando usa un navegador web. Usa <desktopLink>%(brand)s Desktop</desktopLink> para que as mensaxes cifradas aparezan nos resultados.",
+    "There are advanced notifications which are not shown here.": "Existen notificacións avanzadas que non aparecen aquí.",
+    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Deberialas ter configurado nun cliente diferente de %(brand)s. Non podes modificalas en %(brand)s pero aplícanse igualmente.",
+    "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",
+    "Mentions & Keywords": "Mencións e Palabras chave",
+    "Notification options": "Opcións de notificación",
+    "Favourited": "Con marca de Favorita",
+    "Forget Room": "Esquecer sala",
+    "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 versión de %(brand)s aínda está aberta noutra lapela, péchaa xa que usar %(brand)s no mesmo servidor con carga preguiceira activada e desactivada ao mesmo tempo causará problemas.",
+    "Use your account to sign in to the latest version of the app at <a />": "Usa a túa conta para conectarte á última versión da app en <a />",
+    "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>.": "Xa estás conectada e podes ir alá, pero tamén podes ir á última versión da app en tódalas plataformas en <a>element.io/get-started</a>.",
+    "Go to Element": "Ir a Element",
+    "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>.",
+    "Search rooms": "Buscar salas",
+    "User menu": "Menú de usuaria",
+    "%(brand)s Web": "Web %(brand)s",
+    "%(brand)s Desktop": "%(brand)s Desktop",
+    "%(brand)s iOS": "%(brand)s iOS",
+    "%(brand)s X for Android": "%(brand)s X para Android",
+    "This room is public": "Esta é unha sala pública",
+    "Away": "Fóra",
+    "Enable advanced debugging for the room list": "Activar depuración avanzada para a lista da sala",
+    "Show rooms with unread messages first": "Mostrar primeiro as salas con mensaxes sen ler",
+    "Show previews of messages": "Mostrar vista previa das mensaxes",
+    "Edited at %(date)s": "Editado o %(date)s",
+    "Click to view edits": "Preme para ver as edicións",
+    "Are you sure you want to cancel entering passphrase?": "¿Estás seguro de que non queres escribir a frase de paso?",
+    "Custom Tag": "Etiqueta personal",
+    "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
+    "The person who invited you already left the room.": "A persoa que te convidou xa deixou a sala.",
+    "The person who invited you already left the room, or their server is offline.": "A persoa que te convidou xa deixou a sala, ou o seu servidor non está a funcionar.",
+    "Change notification settings": "Cambiar os axustes das notificacións",
+    "Your server isn't responding to some <a>requests</a>.": "O teu servidor non responde a algunhas <a>solicitudes</a>.",
+    "You're all caught up.": "Xa estás ó día.",
+    "Server isn't responding": "O servidor non responde",
+    "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "O servidor non responde a algunhas peticións. Aquí tes algunha das razóns máis probables.",
+    "The server (%(serverName)s) took too long to respond.": "O servidor (%(serverName)s) tardou moito en responder.",
+    "Your firewall or anti-virus is blocking the request.": "O cortalumes ou antivirus está bloqueando a solicitude.",
+    "A browser extension is preventing the request.": "Unha extensión do navegador está evitando a solicitude.",
+    "The server is offline.": "O servidor está apagado.",
+    "The server has denied your request.": "O servidor rexeitou a solicitude.",
+    "Your area is experiencing difficulties connecting to the internet.": "Hai problemas de conexión a internet na túa localidade.",
+    "A connection error occurred while trying to contact the server.": "Aconteceu un fallo de conexión ó intentar contactar co servidor.",
+    "The server is not configured to indicate what the problem is (CORS).": "O servidor non está configurado para sinalar cal é o problema (CORS).",
+    "Recent changes that have not yet been received": "Cambios recentes que aínda non foron recibidos",
+    "No files visible in this room": "Non hai ficheiros visibles na sala",
+    "Attach files from chat or just drag and drop them anywhere in a room.": "Anexa filecheiros desde a conversa ou arrastra e sóltaos onde queiras nunha sala.",
+    "You’re all caught up": "Xa estás ó día",
+    "You have no visible notifications in this room.": "Non tes notificacións visibles nesta sala.",
+    "%(brand)s Android": "%(brand)s Android",
+    "Master private key:": "Chave mestra principal:"
 }
diff --git a/src/i18n/strings/he.json b/src/i18n/strings/he.json
index 2883da0abb..b17fc5abc5 100644
--- a/src/i18n/strings/he.json
+++ b/src/i18n/strings/he.json
@@ -3,11 +3,6 @@
     "This phone number is already in use": "מספר הטלפון הזה כבר בשימוש",
     "Failed to verify email address: make sure you clicked the link in the email": "אימות כתובת הדוא\"ל נכשלה: וודא שלחצת על הקישור בדוא\"ל",
     "Call Failed": "השיחה נכשלה",
-    "Review Devices": "סקירת מכשירים",
-    "Call Anyway": "התקשר בכל זאת",
-    "Answer Anyway": "ענה בכל זאת",
-    "Call": "התקשר",
-    "Answer": "ענה",
     "The remote side failed to pick up": "הצד המרוחק לא ענה",
     "Unable to capture screen": "כישלון בצילום המסך",
     "Existing Call": "שיחה קיימת",
@@ -45,7 +40,6 @@
     "Which rooms would you like to add to this community?": "אילו חדרים תרצה להוסיף לקהילה?",
     "Show these rooms to non-members on the community page and room list?": "הצג חדרים אלה לחסרי-חשבון על דף הקהילה ורשימת החדרים?",
     "Add rooms to the community": "הוסף חדרים לקהילה",
-    "Room name or alias": "שם חדר או כינוי",
     "Warning": "התראה",
     "Submit debug logs": "הזן יומני ניפוי שגיאה (דבאג)",
     "Edit": "ערוך",
@@ -78,7 +72,6 @@
     "Guests can join": "אורחים יכולים להצטרף",
     "No rooms to show": "אין חדרים להצגה",
     "Fetching third party location failed": "נסיון להביא מיקום צד שלישי נכשל",
-    "A new version of Riot is available.": "יצאה גרסה חדשה של Riot.",
     "Send Account Data": "שלח נתוני משתמש",
     "All notifications are currently disabled for all targets.": "התראות מנוטרלות לכלל המערכת.",
     "Uploading report": "מעדכן דוח",
@@ -98,8 +91,6 @@
     "Send Custom Event": "שלח אירוע מותאם אישית",
     "Advanced notification settings": "הגדרות מתקדמות להתראות",
     "Failed to send logs: ": "כשל במשלוח יומנים: ",
-    "delete the alias.": "מחיקת כינוי.",
-    "To return to your account in future you need to <u>set a password</u>": "להשתמש בחשבונך בעתיד, עליך <u>להגדיר סיסמא</u>",
     "Forget": "שכח",
     "You cannot delete this image. (%(code)s)": "אי אפשר למחוק את התמונה. (%(code)s)",
     "Cancel Sending": "ביטול שליחה",
@@ -124,7 +115,6 @@
     "No update available.": "אין עדכון זמין.",
     "Resend": "שלח מחדש",
     "Collecting app version information": "אוסף מידע על גרסת היישום",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "מחק כינוי %(alias)s של החדר  והסר את %(name)s מהרשימה?",
     "Keywords": "מילות מפתח",
     "Enable notifications for this account": "אפשר התראות לחשבון זה",
     "Invite to this community": "הזמן לקהילה זו",
@@ -134,7 +124,7 @@
     "Enter keywords separated by a comma:": "הכנס מילים מופרדות באמצעות פסיק:",
     "Forward Message": "העבר הודעה",
     "Remove %(name)s from the directory?": "הסר את %(name)s מהרשימה?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot משתמש במספר רב של אפשרויות מתקדמות בדפדפן, חלק מהן לא זמינות או בשלבי נסיון בדפדפן שבשימושך כרגע.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s משתמש במספר רב של אפשרויות מתקדמות בדפדפן, חלק מהן לא זמינות או בשלבי נסיון בדפדפן שבשימושך כרגע.",
     "Event sent!": "ארוע נשלח!",
     "Preparing to send logs": "מתכונן לשלוח יומנים",
     "Remember, you can always set an email address in user settings if you change your mind.": "להזכירך: תמיד ניתן לשנות כתובת אימייל בהגדרות משתש. למקרה שתתחרט/י.",
@@ -181,8 +171,7 @@
     "You must specify an event type!": "חובה להגדיר סוג ארוע!",
     "Unhide Preview": "הצג מחדש תצוגה מקדימה",
     "Unable to join network": "לא ניתן להצטרף לרשת",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "יתכן כי בצעת את ההגדרות בצד לקוח ולא ב Riot. לא תוכל לעדכן אותם ב Riot אבל הם עדיין תקפים",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "מצטערים, הדפדפן שלך הוא <b> אינו</b> יכול להריץ את Riot.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "מצטערים, הדפדפן שלך הוא <b> אינו</b> יכול להריץ את %(brand)s.",
     "Uploaded on %(date)s by %(user)s": "עודכן ב %(date)s ע\"י %(user)s",
     "Messages in group chats": "הודעות בקבוצות השיחה",
     "Yesterday": "אתמול",
@@ -191,7 +180,7 @@
     "Unable to fetch notification target list": "לא ניתן לאחזר רשימת יעדי התראה",
     "Set Password": "הגדר סיסמא",
     "Off": "סגור",
-    "Riot does not know how to join a room on this network": "Riot אינו יודע כיצד להצטרף לחדר ברשת זו",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s אינו יודע כיצד להצטרף לחדר ברשת זו",
     "Mentions only": "מאזכר בלבד",
     "Failed to remove tag %(tagName)s from room": "נכשל בעת נסיון הסרת תג %(tagName)s מהחדר",
     "You can now return to your account after signing out, and sign in on other devices.": "תוכל עתה לחזור לחשבון שלך רק אחרי התנתקות וחיבור מחדש לחשבון ממכשיר אחר.",
@@ -207,6 +196,5 @@
     "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...": "בודק עדכונים...",
-    "There are advanced notifications which are not shown here": "ישנן התראות מתקדמות אשר אינן מוצגות כאן",
-    "Your Riot is misconfigured": "ה Riot שלך מוגדר באופן שגוי"
+    "Your %(brand)s is misconfigured": "ה %(brand)s שלך מוגדר באופן שגוי"
 }
diff --git a/src/i18n/strings/hi.json b/src/i18n/strings/hi.json
index 3028566536..75b14cca18 100644
--- a/src/i18n/strings/hi.json
+++ b/src/i18n/strings/hi.json
@@ -1,5 +1,4 @@
 {
-    "A new version of Riot is available.": "रायट के एक नया वर्शन उपलब्ध है।",
     "All messages": "सारे संदेश",
     "All Rooms": "सारे कमरे",
     "Please set a password!": "कृपया एक पासवर्ड सेट करें!",
@@ -9,29 +8,21 @@
     "This phone number is already in use": "यह फ़ोन नंबर पहले से इस्तेमाल में है",
     "Failed to verify email address: make sure you clicked the link in the email": "ईमेल आईडी सत्यापित नही हो पाया: कृपया सुनिश्चित कर लें कि आपने ईमेल में मौजूद लिंक पर क्लिक किया है",
     "The platform you're on": "आप जिस प्लेटफार्म पर हैं",
-    "The version of Riot.im": "रायट.आई एम का जो संस्करण",
     "Your language of choice": "आपकी चयन की भाषा",
     "Which officially provided instance you are using, if any": "क्या आप कोई अधिकृत संस्करण इस्तेमाल कर रहे हैं? अगर हां, तो कौन सा",
     "Your homeserver's URL": "आपके होमसर्वर का यूआरएल",
     "Every page you use in the app": "हर पृष्ठ जिसका आप इस एप में इस्तेमाल करते हैं",
-    "Your User Agent": "आपका उपभोक्ता प्रतिनिधि",
     "Custom Server Options": "कस्टम सर्वर विकल्प",
     "Dismiss": "खारिज",
     "powered by Matrix": "मैट्रिक्स द्वारा संचालित",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "चाहे आप रिच टेक्स्ट एडिटर के रिच टेक्स्ट मोड का उपयोग कर रहे हों या नहीं",
-    "Your identity server's URL": "आपका आइडेंटिटी सर्वर का URL",
     "e.g. %(exampleValue)s": "उदाहरणार्थ %(exampleValue)s",
     "e.g. <CurrentPageURL>": "उदाहरणार्थ <CurrentPageURL>",
     "Your device resolution": "आपके यंत्र का रेसोलुशन",
     "Analytics": "एनालिटिक्स",
-    "The information being sent to us to help make Riot.im better includes:": "Riot.im को बेहतर बनाने के लिए हमें भेजी गई जानकारी में निम्नलिखित शामिल हैं:",
+    "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.": "जहां इस पृष्ठ में पहचान योग्य जानकारी शामिल है, जैसे कि रूम, यूजर या समूह आईडी, वह डाटा सर्वर को भेजे से पहले हटा दिया जाता है।",
     "Call Failed": "कॉल विफल",
-    "Review Devices": "डिवाइस की समीक्षा करें",
-    "Call Anyway": "वैसे भी कॉल करें",
-    "Answer Anyway": "वैसे भी जवाब दें",
-    "Call": "कॉल",
-    "Answer": "उत्तर",
     "Call Timeout": "कॉल टाइमआउट",
     "The remote side failed to pick up": "दूसरी पार्टी ने जवाब नहीं दिया",
     "Unable to capture screen": "स्क्रीन कैप्चर करने में असमर्थ",
@@ -40,7 +31,6 @@
     "VoIP is unsupported": "VoIP असमर्थित है",
     "You cannot place VoIP calls in this browser.": "आप इस ब्राउज़र में VoIP कॉल नहीं कर सकते हैं।",
     "You cannot place a call with yourself.": "आप अपने साथ कॉल नहीं कर सकते हैं।",
-    "Could not connect to the integration server": "इंटीग्रेशन सर्वर से संपर्क नहीं हो सका",
     "Call in Progress": "कॉल चालू हैं",
     "A call is currently being placed!": "वर्तमान में एक कॉल किया जा रहा है!",
     "A call is already in progress!": "कॉल पहले ही प्रगति पर है!",
@@ -79,25 +69,19 @@
     "Which rooms would you like to add to this community?": "आप इस समुदाय में कौन से रूम जोड़ना चाहते हैं?",
     "Show these rooms to non-members on the community page and room list?": "क्या आप इन मैट्रिक्स रूम को कम्युनिटी पृष्ठ और रूम लिस्ट के गैर सदस्यों को दिखाना चाहते हैं?",
     "Add rooms to the community": "कम्युनिटी में रूम जोड़े",
-    "Room name or alias": "रूम का नाम या उपनाम",
     "Add to community": "कम्युनिटी में जोड़ें",
     "Failed to invite the following users to %(groupId)s:": "निम्नलिखित उपयोगकर्ताओं को %(groupId)s में आमंत्रित करने में विफल:",
     "Failed to invite users to community": "उपयोगकर्ताओं को कम्युनिटी में आमंत्रित करने में विफल",
     "Failed to invite users to %(groupId)s": "उपयोगकर्ताओं को %(groupId)s में आमंत्रित करने में विफल",
     "Failed to add the following rooms to %(groupId)s:": "निम्नलिखित रूम को %(groupId)s में जोड़ने में विफल:",
-    "Riot does not have permission to send you notifications - please check your browser settings": "आपको सूचनाएं भेजने की रायट की अनुमति नहीं है - कृपया अपनी ब्राउज़र सेटिंग्स जांचें",
-    "Riot was not given permission to send notifications - please try again": "रायट को सूचनाएं भेजने की अनुमति नहीं दी गई थी - कृपया पुनः प्रयास करें",
     "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.": "आपका ईमेल पता इस होमसर्वर पर मैट्रिक्स आईडी से जुड़ा प्रतीत नहीं होता है।",
-    "Registration Required": "पंजीकरण आवश्यक",
-    "You need to register to do this. Would you like to register now?": "ऐसा करने के लिए आपको पंजीकरण करने की आवश्यकता है। क्या आप अभी पंजीकरण करना चाहते हैं?",
     "Register": "पंजीकरण करें",
     "Default": "डिफ़ॉल्ट",
     "Restricted": "वर्जित",
     "Moderator": "मध्यस्थ",
     "Admin": "व्यवस्थापक",
-    "Start a chat": "एक चैट शुरू करें",
     "Operation failed": "कार्रवाई विफल",
     "Failed to invite": "आमंत्रित करने में विफल",
     "Failed to invite the following users to the %(roomName)s room:": "निम्नलिखित उपयोगकर्ताओं को %(roomName)s रूम में आमंत्रित करने में विफल:",
@@ -120,9 +104,7 @@
     "To use it, just wait for autocomplete results to load and tab through them.": "इसका उपयोग करने के लिए, बस स्वत: पूर्ण परिणामों को लोड करने और उनके माध्यम से टैब के लिए प्रतीक्षा करें।",
     "Changes your display nickname": "अपना प्रदर्शन उपनाम बदलता है",
     "Invites user with given id to current room": "दिए गए आईडी के साथ उपयोगकर्ता को वर्तमान रूम में आमंत्रित करता है",
-    "Joins room with given alias": "दिए गए उपनाम के साथ रूम में शामिल हो जाता है",
     "Leave room": "रूम छोड़ें",
-    "Unrecognised room alias:": "अपरिचित रूम उपनाम:",
     "Kicks user with given id": "दिए गए आईडी के साथ उपयोगकर्ता को निर्वासन(किक) करता हैं",
     "Bans user with given id": "दिए गए आईडी के साथ उपयोगकर्ता को प्रतिबंध लगाता है",
     "Ignores a user, hiding their messages from you": "उपयोगकर्ता को अनदेखा करें और स्वयं से संदेश छुपाएं",
@@ -161,11 +143,6 @@
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s ने रूम का नाम हटा दिया।",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s कमरे का नाम बदलकर %(roomName)s कर दिया।",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s ने एक छवि भेजी।",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s ने इस रूम के लिए पते के रूप में %(addedAddresses)s को जोड़ा।",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s ने इस रूम के लिए एक पते के रूप में %(addedAddresses)s को जोड़ा।",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s ने इस कमरे के लिए पते के रूप में %(removedAddresses)s को हटा दिया।",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s ने इस कमरे के लिए एक पते के रूप में %(removedAddresses)s को हटा दिया।",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s ने इस कमरे के लिए पते के रूप में %(addedAddresses)s को जोड़ा और %(removedAddresses)s को हटा दिया।",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s ने इस कमरे के लिए मुख्य पता %(address)s पर सेट किया।",
     "%(senderName)s removed the main address for this room.": "%(senderName)s ने इस कमरे के लिए मुख्य पता हटा दिया।",
     "Someone": "कोई",
@@ -189,7 +166,6 @@
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s विजेट %(senderName)s द्वारा हटा दिया गया",
     "Failure to create room": "रूम बनाने में विफलता",
     "Server may be unavailable, overloaded, or you hit a bug.": "सर्वर अनुपलब्ध, अधिभारित हो सकता है, या अपने एक सॉफ्टवेयर गर्बरी को पाया।",
-    "Send anyway": "वैसे भी भेजें",
     "Send": "भेजें",
     "Unnamed Room": "अनाम रूम",
     "This homeserver has hit its Monthly Active User limit.": "इस होमसर्वर ने अपनी मासिक सक्रिय उपयोगकर्ता सीमा को प्राप्त कर लिया हैं।",
@@ -197,13 +173,11 @@
     "Please <a>contact your service administrator</a> to continue using the service.": "सेवा का उपयोग जारी रखने के लिए कृपया <a> अपने सेवा व्यवस्थापक से संपर्क करें </a>।",
     "Unable to connect to Homeserver. Retrying...": "होमसर्वर से कनेक्ट करने में असमर्थ। पुनः प्रयास किया जा रहा हैं...",
     "Your browser does not support the required cryptography extensions": "आपका ब्राउज़र आवश्यक क्रिप्टोग्राफी एक्सटेंशन का समर्थन नहीं करता है",
-    "Not a valid Riot keyfile": "यह एक वैध रायट कीकुंजी नहीं है",
     "Authentication check failed: incorrect password?": "प्रमाणीकरण जांच विफल: गलत पासवर्ड?",
     "Sorry, your homeserver is too old to participate in this room.": "क्षमा करें, इस रूम में भाग लेने के लिए आपका होमसर्वर बहुत पुराना है।",
     "Please contact your homeserver administrator.": "कृपया अपने होमसर्वर व्यवस्थापक से संपर्क करें।",
     "Failed to join room": "रूम में शामिल होने में विफल",
     "Message Pinning": "संदेश पिनिंग",
-    "Use compact timeline layout": "कॉम्पैक्ट टाइमलाइन लेआउट का प्रयोग करें",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "१२ घंटे प्रारूप में टाइमस्टैम्प दिखाएं (उदहारण:२:३० अपराह्न बजे)",
     "Always show message timestamps": "हमेशा संदेश टाइमस्टैम्प दिखाएं",
     "Autoplay GIFs and videos": "जीआईएफ और वीडियो को स्वत: प्ले करें",
@@ -254,14 +228,10 @@
     "Confirm password": "पासवर्ड की पुष्टि कीजिये",
     "Change Password": "पासवर्ड बदलें",
     "Authentication": "प्रमाणीकरण",
-    "Device ID": "यंत्र आईडी",
     "Last seen": "अंतिम बार देखा गया",
     "Failed to set display name": "प्रदर्शन नाम सेट करने में विफल",
-    "Disable Notifications": "नोटीफिकेशन निष्क्रिय करें",
-    "Enable Notifications": "सूचनाएं सक्षम करें",
     "Delete Backup": "बैकअप हटाएं",
     "Unable to load key backup status": "कुंजी बैकअप स्थिति लोड होने में असमर्थ",
-    "Verify...": "सत्यापित करें ...",
     "Backup version: ": "बैकअप संस्करण: ",
     "Algorithm: ": "कलन विधि: ",
     "Error saving email notification preferences": "ईमेल अधिसूचना प्राथमिकताओं को सहेजने में त्रुटि",
@@ -282,7 +252,6 @@
     "Unable to fetch notification target list": "अधिसूचना लक्ष्य सूची लाने में असमर्थ",
     "Notification targets": "अधिसूचना के लक्ष्य",
     "Advanced notification settings": "उन्नत अधिसूचना सेटिंग्स",
-    "There are advanced notifications which are not shown here": "उन्नत सूचनाएं हैं जो यहां दिखाई नहीं दी गई हैं",
     "Failed to invite users to the room:": "रूम में उपयोगकर्ताओं को आमंत्रित करने में विफल:",
     "There was an error joining the room": "रूम में शामिल होने में एक त्रुटि हुई",
     "Use a few words, avoid common phrases": "कम शब्दों का प्रयोग करें, सामान्य वाक्यांशों से बचें",
@@ -317,7 +286,6 @@
     "Messages containing @room": "@Room युक्त संदेश",
     "Encrypted messages in one-to-one chats": "एक एक के साथ चैट में एन्क्रिप्टेड संदेश",
     "Encrypted messages in group chats": "समूह चैट में एन्क्रिप्टेड संदेश",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "हो सकता है कि आपने उन्हें रायट के अलावा किसी अन्य ग्राहक में कॉन्फ़िगर किया हो। आप उन्हें रायट में ट्यून नहीं कर सकते लेकिन वे अभी भी आवेदन करते हैं",
     "Show message in desktop notification": "डेस्कटॉप अधिसूचना में संदेश दिखाएं",
     "Off": "बंद",
     "On": "चालू",
@@ -337,8 +305,6 @@
     "Options": "विकल्प",
     "Key request sent.": "कुंजी अनुरोध भेजा गया।",
     "Please select the destination room for this message": "कृपया इस संदेश के लिए गंतव्य रूम का चयन करें",
-    "Blacklisted": "काली सूची में डाला गया",
-    "device id: ": "डिवाइस आईडी: ",
     "Disinvite": "आमंत्रित नहीं करना",
     "Kick": "किक",
     "Disinvite this user?": "इस उपयोगकर्ता को आमंत्रित नहीं करें?",
@@ -353,7 +319,6 @@
     "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": "अवनत",
     "Failed to mute user": "उपयोगकर्ता को म्यूट करने में विफल",
-    "Failed to toggle moderator status": "मॉडरेटर स्थिति टॉगल करने में विफल",
     "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.": "आप इस परिवर्तन को पूर्ववत नहीं कर पाएंगे क्योंकि आप उपयोगकर्ता को अपने आप से समान शक्ति स्तर रखने के लिए प्रोत्साहित कर रहे हैं।",
     "Are you sure?": "क्या आपको यकीन है?",
@@ -363,12 +328,8 @@
     "Mention": "उल्लेख",
     "Invite": "आमंत्रण",
     "Share Link to User": "उपयोगकर्ता को लिंक साझा करें",
-    "User Options": "उपयोगकर्ता विकल्प",
-    "Direct chats": "प्रत्यक्ष चैट",
     "Unmute": "अनम्यूट",
     "Mute": "म्यूट",
-    "Revoke Moderator": "मॉडरेटर को रद्द करें",
-    "Make Moderator": "मॉडरेटर बनायें",
     "Admin Tools": "व्यवस्थापक उपकरण",
     "Close": "बंद",
     "and %(count)s others...|other": "और %(count)s अन्य ...",
@@ -382,9 +343,7 @@
     "Video call": "वीडियो कॉल",
     "Upload file": "फाइल अपलोड करें",
     "Send an encrypted reply…": "एक एन्क्रिप्टेड उत्तर भेजें …",
-    "Send a reply (unencrypted)…": "एक उत्तर भेजें (अनएन्क्रिप्टेड) …",
     "Send an encrypted message…": "एक एन्क्रिप्टेड संदेश भेजें …",
-    "Send a message (unencrypted)…": "एक संदेश भेजें (अनएन्क्रिप्टेड) …",
     "This room has been replaced and is no longer active.": "इस रूम को बदल दिया गया है और अब सक्रिय नहीं है।",
     "The conversation continues here.": "वार्तालाप यहां जारी है।",
     "You do not have permission to post to this room": "आपको इस रूम में पोस्ट करने की अनुमति नहीं है",
@@ -408,7 +367,6 @@
     "Idle": "निष्क्रिय",
     "Offline": "ऑफलाइन",
     "Unknown": "अज्ञात",
-    "Chat with Riot Bot": "रायट बॉट के साथ चैट करें",
     "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' अपलोड के लिए इस होमस्वर के आकार की सीमा से अधिक है",
     "Upgrades a room to a new version": "एक रूम को एक नए संस्करण में अपग्रेड करता है",
@@ -562,14 +520,11 @@
     "Phone numbers": "फोन नंबर",
     "Language and region": "भाषा और क्षेत्र",
     "Theme": "थीम",
-    "Dark theme": "डार्क थीम",
     "Account management": "खाता प्रबंधन",
     "Deactivating your account is a permanent action - be careful!": "अपने खाते को निष्क्रिय करना एक स्थायी कार्रवाई है - सावधान रहें!",
     "Deactivate Account": "खाता निष्क्रिय करें",
     "Legal": "कानूनी",
     "Credits": "क्रेडिट",
-    "For help with using Riot, click <a>here</a>.": "रायट का उपयोग करने में मदद के लिए, <a>यहां</a>  क्लिक करें।",
-    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "रायट का उपयोग करने में सहायता के लिए, <a>यहां</a> क्लिक करें या नीचे दिए गए बटन का उपयोग करके हमारे बॉट के साथ एक चैट शुरू करें।",
     "Check for update": "अपडेट के लिये जांचें",
     "Help & About": "सहायता और के बारे में",
     "Bug reporting": "बग रिपोर्टिंग",
@@ -577,7 +532,6 @@
     "Submit debug logs": "डिबग लॉग जमा करें",
     "FAQ": "सामान्य प्रश्न",
     "Versions": "संस्करण",
-    "riot-web version:": "रायट-वेब संस्करण:",
     "olm version:": "olm संस्करण:",
     "Homeserver is": "होमेसेर्वेर हैं",
     "Identity Server is": "आइडेंटिटी सर्वर हैं",
@@ -592,9 +546,7 @@
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s ने फ्लेयर %(groups)s के लिए अक्षम कर दिया।",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s ने इस कमरे में %(newGroups)s के लिए फ्लेयर सक्षम किया और %(oldGroups)s के लिए फ्लेयर अक्षम किया।",
     "Show read receipts sent by other users": "अन्य उपयोगकर्ताओं द्वारा भेजी गई रसीदें दिखाएं",
-    "Order rooms in the room list by most important first instead of most recent": "कक्ष सूचि में सभी कक्षों को हाल के कक्षों के बजाय सबसे महत्वपूर्ण वाले कक्ष पहले रखे",
     "Scissors": "कैंची",
-    "Light theme": "लाइट थीम",
     "Timeline": "समयसीमा",
     "Room list": "कक्ष सूचि",
     "Autocomplete delay (ms)": "स्वत: पूर्ण विलंब (ms)",
@@ -606,11 +558,9 @@
     "Reject all %(invitedRooms)s invites": "सभी %(invitedRooms)s की आमंत्रण को अस्वीकार करें",
     "Key backup": "कुंजी बैकअप",
     "Security & Privacy": "सुरक्षा और गोपनीयता",
-    "Riot collects anonymous analytics to allow us to improve the application.": "रायट हमें आवेदन में सुधार करने की अनुमति देने के लिए अनाम विश्लेषण एकत्र करता है।",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "गोपनीयता हमारे लिए महत्वपूर्ण है, इसलिए हम अपने विश्लेषिकी के लिए कोई व्यक्तिगत या पहचान योग्य डेटा एकत्र नहीं करते हैं।",
     "Learn more about how we use analytics.": "हम एनालिटिक्स का उपयोग कैसे करते हैं, इसके बारे में और जानें।",
     "No media permissions": "मीडिया की अनुमति नहीं",
-    "You may need to manually permit Riot to access your microphone/webcam": "आपको अपने माइक्रोफ़ोन/वेबकैम तक पहुंचने के लिए रायट को मैन्युअल रूप से अनुमति देने की आवश्यकता हो सकती है",
     "Missing media permissions, click the button below to request.": "मीडिया अनुमतियाँ गुम, अनुरोध करने के लिए नीचे दिए गए बटन पर क्लिक करें।",
     "Request media permissions": "मीडिया अनुमति का अनुरोध करें",
     "No Audio Outputs detected": "कोई ऑडियो आउटपुट नहीं मिला",
diff --git a/src/i18n/strings/hr.json b/src/i18n/strings/hr.json
index 1d90dd7321..527b86e0a7 100644
--- a/src/i18n/strings/hr.json
+++ b/src/i18n/strings/hr.json
@@ -3,6 +3,6 @@
     "This phone number is already in use": "Ovaj broj telefona se već koristi",
     "Failed to verify email address: make sure you clicked the link in the email": "Nismo u mogućnosti verificirati Vašu email adresu. Provjerite dali ste kliknuli link u mailu",
     "The platform you're on": "Platforma na kojoj se nalazite",
-    "The version of Riot.im": "Verzija Riot.im",
+    "The version of %(brand)s": "Verzija %(brand)s",
     "Your language of choice": "Izabrani jezik"
 }
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index b1db06fa4b..209c237c0c 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2,7 +2,7 @@
     "Cancel": "Mégse",
     "Search": "Keresés",
     "OK": "Rendben",
-    "Custom Server Options": "Egyedi szerverbeállítások",
+    "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",
@@ -10,7 +10,7 @@
     "Mute": "Elnémít",
     "Notifications": "Értesítések",
     "Operation failed": "Sikertelen művelet",
-    "powered by Matrix": "Matrix hajtja",
+    "powered by Matrix": "a gépházban: Matrix",
     "Remove": "Kitakarás",
     "Settings": "Beállítások",
     "unknown error code": "ismeretlen hibakód",
@@ -27,15 +27,13 @@
     "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 Riot to access your microphone/webcam": "Lehet hogy manuálisan kell engedélyeznie a Riot-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 manuálisan kell engedélyezned a %(brand)s-nak a hozzáférést a mikrofonhoz ás webkamerához",
     "Default Device": "Alapértelmezett eszköz",
     "Microphone": "Mikrofon",
     "Camera": "Kamera",
     "Advanced": "Speciális",
-    "Algorithm": "Algoritmus",
     "Always show message timestamps": "Üzenet időbélyeg folyamatos megjelenítése",
     "Authentication": "Azonosítás",
-    "Alias (optional)": "Becenév (opcionális)",
     "Failed to change password. Is your password correct?": "Nem sikerült megváltoztatni a jelszót. Helyesen írtad be a jelszavadat?",
     "Continue": "Folytatás",
     "Create new room": "Új szoba létrehozása",
@@ -60,7 +58,6 @@
     "Ban": "Kitilt",
     "Banned users": "Kitiltott felhasználók",
     "Bans user with given id": "Kitiltja a megadott azonosítójú felhasználót",
-    "Blacklisted": "Fekete listára téve",
     "Call Timeout": "Hívás időtúllépé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.": "Nem lehet kapcsolódni a Matrix szerverhez - ellenőrizd a kapcsolatot, biztosítsd, hogy a <a>Matrix szerver tanúsítványa</a> hiteles legyen, és a böngésző kiterjesztések ne blokkolják a kéréseket.",
     "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>.": "Nem lehet csatlakozni a Matrix szerverhez HTTP-n keresztül ha HTTPS van a böngésző címsorában. Vagy használj HTTPS-t vagy <a>engedélyezd a nem biztonságos script-et</a>.",
@@ -70,8 +67,7 @@
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s megváltoztatta a szoba nevét erre: %(roomName)s.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s törölte a szoba nevét.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s megváltoztatta a témát erre \"%(topic)s\".",
-    "Changes your display nickname": "Becenév megváltoztatása",
-    "Claimed Ed25519 fingerprint key": "Igényelt Ed25519 ujjlenyomat kulcs",
+    "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 video": "A videó kikapcsoláshoz kattints ide",
@@ -81,38 +77,27 @@
     "Command error": "Parancs hiba",
     "Commands": "Parancsok",
     "Confirm password": "Jelszó megerősítése",
-    "Could not connect to the integration server": "Az integrációs szerverhez nem lehet kapcsolódni",
     "Create Room": "Szoba készítése",
     "Cryptography": "Titkosítás",
     "Current password": "Jelenlegi jelszó",
-    "Curve25519 identity key": "Curve25519 azonosítási kulcs",
     "Custom": "Egyedi",
     "Custom level": "Egyedi szint",
-    "/ddg is not a command": "/ddg nem egy parancs",
+    "/ddg is not a command": "A /ddg nem egy parancs",
     "Deactivate Account": "Fiók bezárása",
     "Decline": "Elutasít",
     "Decrypt %(text)s": "%(text)s visszafejtése",
-    "Decryption error": "Visszafejtési hiba",
     "Default": "Alapértelmezett",
-    "Device ID": "Készülék azonosító",
-    "device id: ": "készülék azonosító: ",
-    "Direct chats": "Közvetlen csevegés",
-    "Disable Notifications": "Értesítések tiltása",
     "Disinvite": "Meghívás visszavonása",
     "Displays action": "Tevékenységek megjelenítése",
     "Download %(text)s": "%(text)s letöltése",
     "Drop File Here": "Ide húzd a fájlt",
-    "Ed25519 fingerprint": "Ed25519 ujjlenyomat",
     "Email": "E-mail",
     "Email address": "E-mail cím",
     "Emoji": "Emodzsi",
-    "Enable Notifications": "Értesítések bekapcsolása",
     "%(senderName)s ended the call.": "%(senderName)s befejezte a hívást.",
-    "End-to-end encryption information": "Ponttól pontig való titkosítási információk",
     "Enter passphrase": "Jelmondat megadása",
     "Error decrypting attachment": "Csatolmány visszafejtése sikertelen",
     "Error: Problem communicating with the given homeserver.": "Hiba: Probléma van a Matrix szerverrel való kommunikációval.",
-    "Event information": "Esemény információ",
     "Existing Call": "Hívás folyamatban",
     "Export": "Mentés",
     "Export E2E room keys": "E2E szoba kulcsok mentése",
@@ -129,7 +114,6 @@
     "Failed to send email": "E-mail nem sikerült elküldeni",
     "Failed to send request.": "A kérést nem sikerült elküldeni.",
     "Failed to set display name": "Megjelenítési nevet nem sikerült beállítani",
-    "Failed to toggle moderator status": "Moderátor státuszt nem sikerült átá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",
@@ -159,12 +143,11 @@
     "%(senderName)s invited %(targetName)s.": "%(senderName)s meghívta: %(targetName)s.",
     "Invited": "Meghívva",
     "Invites": "Meghívók",
-    "Invites user with given id to current room": "Felhasználó meghívása ebbe a szobába megadott azonosítóval",
+    "Invites user with given id to current room": "A megadott azonosítójú felhasználó meghívása a jelenlegi szobába",
     "Sign in with": "Belépés ezzel:",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Csatlakozás <voiceText>hang</voiceText>gal vagy <videoText>videó</videoText>val.",
+    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Csatlakozás <voiceText>hanggal</voiceText> vagy <videoText>videóval</videoText>.",
     "Join Room": "Belépés a szobába",
     "%(targetName)s joined the room.": "%(targetName)s belépett a szobába.",
-    "Joins room with given alias": "A megadott becenévvel belépett a szobába",
     "Jump to first unread message.": "Ugrás az első olvasatlan üzenetre.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s kizárta: %(targetName)s.",
     "Kick": "Elküld",
@@ -173,27 +156,23 @@
     "Last seen": "Utoljára láttuk",
     "Leave room": "Szoba elhagyása",
     "%(targetName)s left the room.": "%(targetName)s elhagyta a szobát.",
-    "Local addresses for this room:": "A szoba helyi címe:",
     "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 elérhetővé tette a szoba új üzeneteit nekik minden résztvevő a szobában, amióta meg van hívva.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s elérhetővé tette a szoba új üzeneteit nekik minden résztvevő a szobában, amióta csatlakozott.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s elérhetővé tette a szoba új üzeneteit nekik minden szoba tagság.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s elérhetővé tette a szoba új üzeneteit nekik bárki.",
+    "%(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.": "%(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).",
     "Manage Integrations": "Integrációk kezelése",
-    "Missing room_id in request": "Hiányzó room_id a kérésben",
-    "Missing user_id in request": "Hiányzó user_id a kérésben",
+    "Missing room_id in request": "A kérésből hiányzik a room_id",
+    "Missing user_id in request": "A kérésből hiányzik a user_id",
     "Moderator": "Moderátor",
     "Name": "Név",
-    "New address (e.g. #foo:%(localDomain)s)": "Új cím (e.g. #foo:%(localDomain)s)",
     "New passwords don't match": "Az új jelszavak nem egyeznek",
     "New passwords must match each other.": "Az új jelszavaknak meg kell egyezniük egymással.",
-    "none": "semmi",
     "not specified": "nincs meghatározva",
     "(not supported by this browser)": "(ebben a böngészőben nem támogatott)",
     "<not supported>": "<nem támogatott>",
-    "NOT verified": "NEM ellenőrzött",
     "No display name": "Nincs megjelenítési név",
     "No more results": "Nincs több találat",
     "No results": "Nincs találat",
@@ -211,36 +190,32 @@
     "Profile": "Profil",
     "Public Chat": "Nyilvános csevegés",
     "Reason": "Ok",
-    "Revoke Moderator": "Moderátor visszahívása",
     "Register": "Regisztráció",
     "%(targetName)s rejected the invitation.": "%(targetName)s elutasította a meghívót.",
     "Reject invitation": "Meghívó elutasítása",
-    "Remote addresses for this room:": "A szoba távoli címei:",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s törölte a megjelenítési nevet (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s törölte a profil képét.",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s VoIP konferenciát kezdeményez.",
     "Results from DuckDuckGo": "Eredmények a DuckDuckGo-ból",
     "Return to login screen": "Vissza a bejelentkezési képernyőre",
-    "Riot does not have permission to send you notifications - please check your browser settings": "A Riotnak nincs jogosultsága értesítést küldeni neked – ellenőrizd a böngésző beállításait",
-    "Riot was not given permission to send notifications - please try again": "A Riotnak nincs jogosultsága értesítést küldeni neked – próbáld újra",
-    "riot-web version:": "riot-web verzió:",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "A %(brand)snak nincs jogosultsága értesítést küldeni neked – ellenőrizd a böngésző beállításait",
+    "%(brand)s was not given permission to send notifications - please try again": "A %(brand)snak nincs jogosultsága értesítést küldeni neked – próbáld újra",
+    "%(brand)s version:": "%(brand)s verzió:",
     "Room %(roomId)s not visible": "%(roomId)s szoba nem látható",
     "Room Colour": "Szoba színe",
     "%(roomName)s does not exist.": "%(roomName)s nem létezik.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s jelenleg nem érhető el.",
     "Rooms": "Szobák",
     "Save": "Mentés",
-    "Scroll to bottom of page": "Az oldal aljára görget",
     "Search failed": "Keresés sikertelen",
     "Searches DuckDuckGo for results": "Keresés DuckDuckGóval",
     "Seen by %(userName)s at %(dateTime)s": "%(userName)s %(dateTime)s időpontban látta",
-    "Send anyway": "Küld mindenképpen",
     "Send Reset Email": "Visszaállítási e-mail küldése",
     "%(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 you hit a bug.": "A szerver elérhetetlen, túlterhelt vagy hibára futott.",
+    "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.",
@@ -251,7 +226,6 @@
     "Sign out": "Kijelentkezés",
     "%(count)s of your messages have not been sent.|other": "Néhány üzeneted nem lett elküldve.",
     "Someone": "Valaki",
-    "Start a chat": "Csevegés indítása",
     "Start authentication": "Azonosítás indítása",
     "Submit": "Elküld",
     "Success": "Sikeres",
@@ -266,7 +240,7 @@
     "This phone number is already in use": "Ez a telefonszám már használatban van",
     "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éshez a találatok betöltését és TAB-bal választhatsz közülük.",
+    "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.",
     "Unable to add email address": "Az e-mail címet nem sikerült hozzáadni",
@@ -276,13 +250,9 @@
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s visszaengedte %(targetName)s felhasználót.",
     "Unable to capture screen": "A képernyő felvétele sikertelen",
     "Unable to enable Notifications": "Az értesítések engedélyezése sikertelen",
-    "unencrypted": "titkosítatlan",
     "unknown caller": "ismeretlen hívó",
-    "unknown device": "ismeretlen eszköz",
-    "Unknown room %(roomId)s": "Ismeretlen szoba %(roomId)s",
     "Unmute": "Némítás kikapcsolása",
     "Unnamed Room": "Névtelen szoba",
-    "Unrecognised room alias:": "Ismeretlen szoba becenév:",
     "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",
     "Uploading %(filename)s and %(count)s others|other": "%(filename)s és még %(count)s db másik feltöltése",
@@ -291,20 +261,16 @@
     "Upload file": "Fájl feltöltése",
     "Upload new:": "Új feltöltése:",
     "Usage": "Használat",
-    "Use compact timeline layout": "Egyszerű idővonal séma használata",
-    "User ID": "Felhasználói azonosító",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (szint: %(powerLevelNumber)s)",
     "Username invalid: %(errMessage)s": "Felhasználói név érvénytelen: %(errMessage)s",
     "Users": "Felhasználók",
     "Verification Pending": "Ellenőrzés függőben",
-    "Verification": "Ellenőrzés",
-    "verified": "ellenőrizve",
     "Verified key": "Ellenőrzött kulcs",
-    "Video call": "Videó hívás",
+    "Video call": "Videóhívás",
     "Voice call": "Hang hívás",
     "VoIP conference finished.": "VoIP konferencia befejeződött.",
     "VoIP conference started.": "VoIP konferencia elkezdődött.",
-    "VoIP is unsupported": "VoIP nem támogatott",
+    "VoIP is unsupported": "A VoIP nem támogatott",
     "(could not connect media)": "(média kapcsolat nem hozható létre)",
     "(no answer)": "(nincs válasz)",
     "(unknown failure: %(reason)s)": "(ismeretlen hiba: %(reason)s)",
@@ -320,39 +286,38 @@
     "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",
     "You must <a>register</a> to use this functionality": "<a>Regisztrálnod kell</a> hogy ezt használhasd",
-    "You need to be able to invite users to do that.": "Hogy ezt csinálhasd meg kell tudnod hívni felhasználókat.",
+    "You need to be able to invite users to do that.": "Hogy ezt tehesd, meg kell tudnod hívni felhasználókat.",
     "You need to be logged in.": "Be kell jelentkezz.",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Ez az e-mail cím, úgy néz ki, nincs összekötve a Matrix azonosítóval ezen a Matrix szerveren.",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Ez az e-mail cím, úgy néz ki, nincs összekötve a Matrix azonosítóval ezen a Matrix-kiszolgálón.",
     "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": "vas",
-    "Mon": "hé",
+    "Sun": "v",
+    "Mon": "h",
     "Tue": "k",
     "Wed": "sze",
-    "Thu": "csü",
-    "Fri": "pé",
+    "Thu": "cs",
+    "Fri": "p",
     "Sat": "szo",
-    "Jan": "jan",
-    "Feb": "feb",
-    "Mar": "már",
-    "Apr": "ápr",
-    "May": "máj",
-    "Jun": "jún",
-    "Jul": "júl",
-    "Aug": "aug",
-    "Sep": "szept",
-    "Oct": "okt",
-    "Nov": "nov",
-    "Dec": "dec",
-    "%(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",
+    "Jan": "jan.",
+    "Feb": "feb.",
+    "Mar": "már.",
+    "Apr": "ápr.",
+    "May": "máj.",
+    "Jun": "jún.",
+    "Jul": "júl.",
+    "Aug": "aug.",
+    "Sep": "szept.",
+    "Oct": "okt.",
+    "Nov": "nov.",
+    "Dec": "dec.",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(monthName)s %(day)s, %(weekDayName)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(fullYear)s. %(monthName)s %(day)s, %(weekDayName)s %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
     "Set a display name:": "Megjelenítési név beállítása:",
     "Upload an avatar:": "Avatar kép feltöltése:",
     "This server does not support authentication with a phone number.": "Ez a szerver nem támogatja a telefonszámmal való azonosítást.",
     "An error occurred: %(error_string)s": "Hiba történt: %(error_string)s",
-    "Make Moderator": "Legyen moderátor",
     "There are no visible files in this room": "Ebben a szobában láthatólag nincsenek fájlok",
     "Room": "Szoba",
     "Connectivity to the server has been lost.": "A szerverrel a kapcsolat megszakadt.",
@@ -365,7 +330,7 @@
     "Start automatically after system login": "Rendszerindításkor automatikus elindítás",
     "Analytics": "Analitika",
     "Options": "Opciók",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot 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.": "%(brand)s személytelen 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",
@@ -380,14 +345,8 @@
     "Confirm Removal": "Törlés megerősítése",
     "Unknown error": "Ismeretlen hiba",
     "Incorrect password": "Helytelen jelszó",
-    "To continue, please enter your password.": "A folytatáshoz, kérlek add meg a jelszavadat.",
-    "I verify that the keys match": "Megerősítem, hogy a kulcsok egyeznek",
     "Unable to restore session": "A kapcsolatot nem lehet visszaállítani",
     "Unknown Address": "Ismeretlen cím",
-    "Unblacklist": "Tiltólistáról kivesz",
-    "Blacklist": "Tiltólistára",
-    "Unverify": "Azonosítás visszavonása",
-    "Verify...": "Ellenőrzés...",
     "ex. @bob:example.com": "pl.: @bob:example.com",
     "Add User": "Felhasználó hozzáadás",
     "Please check your email to continue registration.": "Ellenőrizd az e-mailedet a regisztráció folytatásához.",
@@ -397,7 +356,6 @@
     "Error decrypting image": "Hiba a kép visszafejtésénél",
     "Error decrypting video": "Hiba a videó visszafejtésénél",
     "Add an Integration": "Integráció hozzáadása",
-    "Removed or unknown message type": "Eltávolított üzenet vagy ismeretlen üzenet típus",
     "URL Previews": "URL előnézet",
     "Drop file here to upload": "Feltöltéshez húzz ide egy fájlt",
     " (unsupported)": " (nem támogatott)",
@@ -413,7 +371,7 @@
     "Something went wrong!": "Valami tönkrement!",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Ha már van Matrix fiókod, akkor <a>beléphetsz</a> helyette.",
     "Your browser does not support the required cryptography extensions": "A böngésződ nem támogatja a szükséges titkosítási kiterjesztést",
-    "Not a valid Riot keyfile": "Nem érvényes Riot kulcsfájl",
+    "Not a valid %(brand)s keyfile": "Nem érvényes %(brand)s kulcsfájl",
     "Authentication check failed: incorrect password?": "Azonosítás sikertelen: hibás jelszó?",
     "Do you want to set an email address?": "Meg szeretnéd adni az e-mail címet?",
     "This will allow you to reset your password and receive notifications.": "Ezzel alaphelyzetbe tudod állítani a jelszavad és értesítéseket fogadhatsz.",
@@ -422,15 +380,11 @@
     "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.",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Ha egy újabb Riot 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 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?",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Ez lesz a felhasználói neved a <span></span> Matrix szerveren, vagy választhatsz egy <a>másik szervert</a>.",
     "Skip": "Kihagy",
-    "Start verification": "Ellenőrzés megkezdése",
-    "Share without verifying": "Megosztás ellenőrzés nélkül",
-    "Ignore request": "Kérés figyelmen kívül hagyása",
-    "Encryption key request": "Titkosítási kulcs kérés",
     "Check for update": "Frissítések keresése",
     "Add a widget": "Kisalkalmazás hozzáadása",
     "Allow": "Engedélyez",
@@ -438,8 +392,8 @@
     "Define the power level of a user": "A felhasználó szintjének meghatározása",
     "Edit": "Szerkeszt",
     "Enable automatic language detection for syntax highlighting": "Nyelv automatikus felismerése szintaxis kiemeléshez",
-    "AM": "de",
-    "PM": "du",
+    "AM": "de.",
+    "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.",
@@ -460,20 +414,18 @@
     "Failed to copy": "Sikertelen másolás",
     "Ignore": "Figyelmen kívül hagy",
     "Unignore": "Figyelembe vesz",
-    "User Options": "Felhasználói beállítások",
     "You are now ignoring %(userId)s": "Most figyelmen kívül hagyod: %(userId)s",
     "You are no longer ignoring %(userId)s": "Ismét figyelembe veszed: %(userId)s",
     "Unignored user": "Figyelembe vett felhasználó",
     "Ignored user": "Figyelmen kívül hagyott felhasználó",
-    "Stops ignoring a user, showing their messages going forward": "Felhasználót újra figyelembe vesszük és megmutatjuk az új üzeneteit",
-    "Ignores a user, hiding their messages from you": "Felhasználó figyelmen kívül hagyásával elrejtheted az üzeneteit magad elől",
+    "Stops ignoring a user, showing their messages going forward": "A felhasználó újbóli figyelembe vétele, és az üzenetei megjelenítése a jövőben",
+    "Ignores a user, hiding their messages from you": "Figyelmen kívül hagy egy felhasználót, elrejtve előled az üzeneteit",
     "Banned by %(displayName)s": "Kitiltotta: %(displayName)s",
-    "Message removed by %(userId)s": "Üzenetet törölte: %(userId)s",
     "Description": "Leírás",
     "Unable to accept invite": "A meghívót nem lehet elfogadni",
     "Leave": "Elhagy",
-    "Failed to invite the following users to %(groupId)s:": "Az alábbi felhasználókat nem sikerült meghívni a(z) %(groupId)s:",
-    "Failed to invite users to %(groupId)s": "Nem sikerült meghívni a felhasználókat ebbe a csoportba: %(groupId)s",
+    "Failed to invite the following users to %(groupId)s:": "A következő felhasználókat nem sikerült meghívni a(z) %(groupId)s csoportba:",
+    "Failed to invite users to %(groupId)s": "A felhasználók meghívása a(z) %(groupId)s csoportba sikertelen",
     "Unable to reject invite": "Nem sikerül elutasítani a meghívót",
     "Leave %(groupName)s?": "Elhagyod a csoportot: %(groupName)s?",
     "Add a Room": "Szoba hozzáadása",
@@ -482,16 +434,13 @@
     "Add to summary": "Összefoglalóhoz adás",
     "Failed to add the following users to the summary of %(groupId)s:": "Az alábbi felhasználókat nem sikerült hozzáadni a(z) %(groupId)s csoport összefoglalójához:",
     "Which rooms would you like to add to this summary?": "Melyik szobákat szeretnéd hozzáadni ehhez az összefoglalóhoz?",
-    "Room name or alias": "Szoba neve vagy beceneve",
     "Failed to add the following rooms to the summary of %(groupId)s:": "Az alábbi szobákat nem sikerült hozzáadni a(z) %(groupId)s csoport összefoglalójához:",
     "Failed to remove the room from the summary of %(groupId)s": "Az alábbi szobákat nem sikerült eltávolítani a(z) %(groupId)s csoport összefoglalójából",
     "The room '%(roomName)s' could not be removed from the summary.": "Nem sikerült törölni az összefoglalóból ezt a szobát: '%(roomName)s'.",
     "Failed to remove a user from the summary of %(groupId)s": "Nem sikerült törölni az összefoglalóból ezt a felhasználót: %(groupId)s",
     "The user '%(displayName)s' could not be removed from the summary.": "Nem sikerült törölni az összefoglalóból a(z) %(displayName)s felhasználót.",
-    "Light theme": "Világos téma",
-    "Dark theme": "Sötét téma",
     "Unknown": "Ismeretlen",
-    "Failed to add the following rooms to %(groupId)s:": "Az alábbi szobákat nem sikerült hozzáadni a(z) %(groupId)s csoporthoz:",
+    "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",
@@ -504,13 +453,13 @@
     "Pinned Messages": "Kitűzött üzenetek",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s megváltoztatta a szoba kitűzött szövegeit.",
     "Who would you like to add to this community?": "Kit szeretnél hozzáadni ehhez a közösséghez?",
-    "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",
+    "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?",
     "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": "Nem sikerült tagokat meghívni a közösségbe",
+    "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",
@@ -554,7 +503,6 @@
     "Something went wrong whilst creating your community": "Valami nem sikerült a közösség létrehozásánál",
     "Mention": "Említ",
     "Invite": "Meghív",
-    "Message removed": "Üzenet eltávolítva",
     "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?",
     "Mirror local video feed": "Helyi videó folyam tükrözése",
@@ -636,7 +584,7 @@
     "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 közösségednek nincs bő leírása, HTML oldala ami megjelenik a közösség tagjainak.<br />A létrehozáshoz kattints ide!",
     "Notify the whole room": "Az egész szoba értesítése",
     "Room Notification": "Szoba értesítések",
-    "Show these rooms to non-members on the community page and room list?": "Mutassuk meg ezeket a szobákat kívülállóknak a közösségi oldalon és a szobák listájában?",
+    "Show these rooms to non-members on the community page and room list?": "Megjelenjenek ezek a szobák kívülállóknak a közösségi oldalon és a szobalistában?",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Figyelem, a %(hs)s szerverre jelentkezel be és nem a matrix.org szerverre.",
     "Restricted": "Korlátozott",
     "Enable inline URL previews by default": "Beágyazott URL előnézetek alapértelmezett engedélyezése",
@@ -662,36 +610,28 @@
     "collapse": "becsuk",
     "expand": "kinyit",
     "Call Failed": "Sikertelen hívás",
-    "Review Devices": "Eszközök áttekintése",
-    "Call Anyway": "Hívás mindenképpen",
-    "Answer Anyway": "Felvétel mindenképpen",
-    "Call": "Hívás",
-    "Answer": "Felvétel",
-    "Send": "Elküld",
+    "Send": "Elküldés",
     "Old cryptography data detected": "Régi titkosítási adatot találhatók",
-    "Data from an older version of Riot 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.": "Régebbi Riot verzióból származó adatok találhatók. Ezek hibás működéshez vezethettek a végponttól-végpontig titkosításban régebbi verzióknál. A nemrég küldött/fogadott titkosított üzenetek ha a régi adatokat használták lehetséges hogy nem lesznek visszafejthetők ebben a verzióban. Ha problémákba ütközöl jelentkezz ki és vissza. A régi üzenetek elérésének biztosításához mentsd ki a kulcsokat és töltsd be újra.",
+    "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.": "Régebbi %(brand)s verzióból származó adatok találhatók. Ezek hibás működéshez vezethettek a végponttól-végpontig titkosításban régebbi verzióknál. A nemrég küldött/fogadott titkosított üzenetek ha a régi adatokat használták lehetséges hogy nem lesznek visszafejthetők ebben a verzióban. Ha problémákba ütközöl jelentkezz ki és vissza. A régi üzenetek elérésének biztosításához mentsd ki a kulcsokat és töltsd be újra.",
     "Warning": "Figyelmezteté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.": "Ahogy lefokozod magad a változás visszafordíthatatlan, ha te vagy az utolsó jogosultságokkal bíró felhasználó a szobában a jogok már nem szerezhetők vissza.",
     "%(count)s of your messages have not been sent.|one": "Az üzeneted nem lett elküldve.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Újraküldöd mind</resendText> vagy <cancelText>elveted mind</cancelText>. Az üzeneteket egyenként is elküldheted vagy elvetheted.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Üzenet újraküldése</resendText> vagy <cancelText>üzenet elvetése</cancelText> most.",
     "Send an encrypted reply…": "Titkosított válasz küldése…",
-    "Send a reply (unencrypted)…": "Válasz küldése (titkosítatlanul)…",
     "Send an encrypted message…": "Titkosított üzenet küldése…",
-    "Send a message (unencrypted)…": "Üzenet küldése (titkosítás nélkül)…",
     "Replying": "Válaszolni",
     "Minimize apps": "Alkalmazás összecsukása",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "A személyes adatok védelme fontos számunkra, így mi nem gyűjtünk személyes és személyhez köthető adatokat az analitikánkhoz.",
     "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 Riot.im better includes:": "Az adatok amiket a Riot.im javításához felhasználunk az alábbiak:",
-    "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 adatot mint a szoba, felhasználó vagy csoport azonosítót mielőtt az adatokat elküldenénk eltávolításra kerülnek.",
+    "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 version of Riot.im": "Riot.im verziója",
+    "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": "Milyen hivatalosan nyújtott verziót használsz",
+    "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 szerver URL-t",
-    "Your identity server's URL": "Az azonosítási szerver URL-t",
+    "Your homeserver's URL": "A Matrix kiszolgálód 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.",
@@ -701,7 +641,7 @@
     "Failed to remove tag %(tagName)s from room": "Nem sikerült a szobáról eltávolítani ezt: %(tagName)s",
     "Failed to add tag %(tagName)s to room": "Nem sikerült hozzáadni a szobához ezt: %(tagName)s",
     "Clear filter": "Szűrő törlése",
-    "Did you know: you can use communities to filter your Riot.im experience!": "Tudtad, hogy a Riot.im élmény fokozásához használhatsz közösségeket!",
+    "Did you know: you can use communities to filter your %(brand)s experience!": "Tudtad, hogy a %(brand)s élmény fokozásához használhatsz közösségeket!",
     "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",
@@ -721,7 +661,6 @@
     "Who can join this community?": "Ki tud csatlakozni ehhez a közösséghez?",
     "Everyone": "Mindenki",
     "Fetching third party location failed": "Nem sikerült lekérdezni a harmadik fél helyét",
-    "A new version of Riot is available.": "Elérhető egy új Riot verzió.",
     "Send Account Data": "Fiókadatok küldése",
     "All notifications are currently disabled for all targets.": "Minden céleszközön minden értesítés tiltva van.",
     "Uploading report": "Jelentés feltöltése",
@@ -739,8 +678,6 @@
     "Send Custom Event": "Egyéni esemény elküldése",
     "Advanced notification settings": "Haladó értesítési beállítások",
     "Failed to send logs: ": "Hiba a napló küldésénél: ",
-    "delete the alias.": "becenév törlése.",
-    "To return to your account in future you need to <u>set a password</u>": "Hogy később visszaléphess a fiókodba, be kell állítanod egy <u>jelszót</u>",
     "Forget": "Elfelejt",
     "You cannot delete this image. (%(code)s)": "Nem törölheted ezt a képet. (%(code)s)",
     "Cancel Sending": "Küldés megszakítása",
@@ -765,7 +702,6 @@
     "No update available.": "Nincs elérhető frissítés.",
     "Noisy": "Hangos",
     "Collecting app version information": "Alkalmazás verzió információk összegyűjtése",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Törlöd a szoba nevét (%(alias)s) és eltávolítod a listából ezt: %(name)s?",
     "Keywords": "Kulcsszavak",
     "Enable notifications for this account": "Értesítések engedélyezése ehhez a fiókhoz",
     "Invite to this community": "Meghívás ebbe a közösségbe",
@@ -776,7 +712,7 @@
     "Forward Message": "Üzenet továbbítása",
     "You have successfully set a password and an email address!": "Sikerült beállítani a jelszavad és e-mail címed!",
     "Remove %(name)s from the directory?": "Törlöd ezt a szobát a listából: %(name)s?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "A Riot sok fejlett böngészőfunkciót használ, amelyeknek egy része egyáltalán nem, vagy csak kísérleti jelleggel érhető el a jelenlegi böngésződben.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "A %(brand)s sok fejlett böngészőfunkciót használ, amelyeknek egy része egyáltalán nem, vagy csak kísérleti jelleggel érhető el a jelenlegi böngésződben.",
     "Developer Tools": "Fejlesztői eszközök",
     "Preparing to send logs": "Előkészülés napló küldéshez",
     "Remember, you can always set an email address in user settings if you change your mind.": "Ha meggondolod magad, bármikor beállíthatod az e-mail címed a felhasználói beállításoknál.",
@@ -821,8 +757,7 @@
     "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.": "A hibakereső napló alkalmazás használati adatokat tartalmaz beleértve a felhasználói nevedet, az általad meglátogatott szobák és csoportok azonosítóit alternatív neveit és más felhasználói neveket. Csevegés üzenetek szövegét nem tartalmazza.",
     "Unhide Preview": "Előnézet mutatása",
     "Unable to join network": "Nem sikerült kapcsolódni a hálózathoz",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Egy másik, nem Riot-klienssel állítothattad be. A Riotban módosítani nem tudod ezeket, de érvényben vannak",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Elnézést, a böngésződben <b>nem</b> fut a Riot.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Elnézést, a böngésződben <b>nem</b> fut a %(brand)s.",
     "Uploaded on %(date)s by %(user)s": "Feltöltötte %(user)s ekkor: %(date)s",
     "Messages in group chats": "Csoportszobák üzenetei",
     "Yesterday": "Tegnap",
@@ -831,7 +766,7 @@
     "Unable to fetch notification target list": "Nem sikerült letölteni az értesítési célok listáját",
     "Set Password": "Jelszó beállítása",
     "Off": "Ki",
-    "Riot does not know how to join a room on this network": "A Riot nem tud csatlakozni szobához ezen a hálózaton",
+    "%(brand)s does not know how to join a room on this network": "A %(brand)s nem tud csatlakozni szobához ezen a hálózaton",
     "Mentions only": "Csak ha megemlítenek",
     "Wednesday": "Szerda",
     "You can now return to your account after signing out, and sign in on other devices.": "Most már kijelentkezés után is vissza tudsz lépni a fiókodba, és más készülékekről is be tudsz lépni.",
@@ -847,12 +782,10 @@
     "Thank you!": "Köszönjük!",
     "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!": "Ebben a böngészőben az alkalmazás felülete tele lehet hibával, és az is lehet, hogy egyáltalán nem működik. Ha így is ki szeretnéd próbálni, megteheted, de ha valami gondod van, nem tudunk segíteni!",
     "Checking for an update...": "Frissítés keresése...",
-    "There are advanced notifications which are not shown here": "Vannak itt nem látható, haladó értesítések",
-    "Missing roomId.": "Hiányzó szoba azonosító.",
+    "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",
     "e.g. <CurrentPageURL>": "pl.: <CurrentPageURL>",
-    "Your User Agent": "Felhasználói ügynököd",
     "Your device resolution": "Eszközöd felbontása",
     "Always show encryption icons": "Titkosítási ikon folyamatos megjelenítése",
     "Send Logs": "Naplók küldése",
@@ -874,9 +807,6 @@
     "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)",
     "e.g. %(exampleValue)s": "pl. %(exampleValue)s",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Kérlek segíts javítani a Riot.im-et azzal, hogy <UsageDataLink>anonim felhasználási adatokat</UsageDataLink> küldesz. Ez sütit (cookie) fog használni (lásd a <PolicyLink>sütire vonatkozó szabályozásunkat</PolicyLink>).",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Kérlek segíts javítani a Riot.im-et azzal, hogy <UsageDataLink>anonim felhasználási adatokat</UsageDataLink> küldesz. Ez sütit (cookie) fog használni.",
-    "Yes, I want to help!": "Igen, segítek!",
     "Can't leave Server Notices room": "Nem lehet elhagyni a Szerver Üzenetek szobát",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ez a szoba fontos szerverüzenetek közlésére jött létre, nem tudsz kilépni belőle.",
     "No Audio Outputs detected": "Nem található hang kimenet",
@@ -902,7 +832,7 @@
     "Demote yourself?": "Lefokozod magad?",
     "Demote": "Lefokozás",
     "This event could not be displayed": "Az eseményt nem lehet megjeleníteni",
-    "Permission Required": "Engedély szükséges",
+    "Permission Required": "Jogosultság szükséges",
     "You do not have permission to start a conference call in this room": "Nincs jogosultságod konferencia hívást kezdeményezni ebben a szobában",
     "A call is currently being placed!": "A hívás indítás alatt!",
     "Failed to remove widget": "A kisalkalmazás törlése sikertelen",
@@ -912,9 +842,6 @@
     "Please <a>contact your service administrator</a> to continue using the service.": "A szolgáltatás további használata érdekében kérlek <a>vedd fel a kapcsolatot a szolgáltatás adminisztrátorával</a>.",
     "This homeserver has hit its Monthly Active User limit.": "A Matrix szerver elérte a havi aktív felhasználói korlátot.",
     "This homeserver has exceeded one of its resource limits.": "A Matrix szerver túllépte valamelyik erőforrás korlátját.",
-    "Please <a>contact your service administrator</a> to get this limit increased.": "A korlát emelése érdekében kérlek <a>vedd fel a kapcsolatot a szolgáltatás adminisztrátorával</a>.",
-    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "Ez a Matrix szerver elérte a havi aktív felhasználói korlátját <b>néhány felhasználó nem fog tudni bejelentkezni</b>.",
-    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Ez a Matrix szerver túllépte valamelyik erőforrás korlátját így <b>néhány felhasználó nem tud majd bejelentkezni</b>.",
     "Upgrade Room Version": "Szoba verziójának fejlesztése",
     "Create a new room with the same name, description and avatar": "Készíts egy új szobát ugyanazzal a névvel, leírással és profilképpel",
     "Update any local room aliases to point to the new room": "Állíts át minden helyi alternatív nevet erre a szobára",
@@ -934,21 +861,14 @@
     "The room upgrade could not be completed": "A szoba fejlesztését nem sikerült befejezni",
     "Upgrade this room to version %(version)s": "A szoba fejlesztése %(version)s verzióra",
     "Forces the current outbound group session in an encrypted room to be discarded": "A jelenlegi csoport munkamenet törlését kikényszeríti a titkosított szobában",
-    "Registration Required": "Regisztrációt igényel",
-    "You need to register to do this. Would you like to register now?": "Hogy ezt megtedd regisztrálnod kell. Szeretnél regisztrálni?",
     "Unable to connect to Homeserver. Retrying...": "A Matrix szerverrel nem lehet felvenni a kapcsolatot. Újrapróbálkozás...",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s szoba címnek beállította: %(addedAddresses)s.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s szoba címnek hozzáadta: %(addedAddresses)s.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s törölte a szoba címek közül: %(removedAddresses)s.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s törölte a szoba címek közül: %(removedAddresses)s.",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s hozzáadta a szoba címekhez: %(addedAddresses)s és törölte a címek közül: %(removedAddresses)s.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s elsődleges szoba címnek beállította: %(address)s.",
     "%(senderName)s removed the main address for this room.": "A szoba elsődleges címét %(senderName)s törölte.",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Mielőtt a naplót elküldöd, egy <a>Github jegyet kell nyitni</a> amiben leírod a problémádat.",
-    "Riot 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 Riot 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 Riot": "Riot frissítése",
-    "You've previously used Riot 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, Riot 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 Riotot: %(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 Riotnak újra kell szinkronizálnia a fiókot.",
-    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Ha a másik Riot verzió fut még egy másik fülön, kérlek zárd be, mivel ha ugyanott használod a Riotot bekapcsolt késleltetett betöltéssel és kikapcsolva is akkor problémák adódhatnak.",
+    "%(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.",
     "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:",
@@ -957,8 +877,7 @@
     "Open Devtools": "Fejlesztői eszközök megnyitása",
     "Show developer tools": "Fejlesztői eszközök megjelenítése",
     "Please review and accept all of the homeserver's policies": "Kérlek nézd át és fogadd el a Matrix szerver felhasználási feltételeit",
-    "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 Riot to do this": "Hogy a régi üzenetekhez továbbra is hozzáférhess kijelentkezés előtt ki kell mentened a szobák titkosító kulcsait. Ehhez a Riot egy frissebb verzióját kell használnod",
-    "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ": "Előzőleg a Riot egy frissebb verzióját használtad itt: %(host)s. Ki-, és vissza kell jelentkezned, hogy megint ezt a verziót használhasd végponttól végpontig titkosításhoz. ",
+    "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": "Hogy a régi üzenetekhez továbbra is hozzáférhess kijelentkezés előtt ki kell mentened a szobák titkosító kulcsait. Ehhez a %(brand)s egy frissebb verzióját kell használnod",
     "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”",
@@ -967,34 +886,23 @@
     "Unable to load key backup status": "A mentett kulcsok állapotát nem lehet lekérdezni",
     "Backup version: ": "Mentés verzió: ",
     "Algorithm: ": "Algoritmus: ",
-    "Enter a passphrase...": "Add meg a jelmondatot...",
     "Next": "Következő",
     "That matches!": "Egyeznek!",
     "That doesn't match.": "Nem egyeznek.",
     "Go back to set it again.": "Lépj vissza és állítsd be újra.",
-    "Repeat your passphrase...": "Ismételd meg a jelmondatot...",
-    "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Mint egy biztonsági háló, ha elfelejted a Helyreállítási jelmondatot felhasználhatod, hogy hozzáférj a régi titkosított üzeneteidhez.",
-    "Your Recovery Key": "A Helyreállítási kulcsod",
-    "Copy to clipboard": "Másolás a vágólapra",
     "Download": "Letölt",
     "<b>Print it</b> and store it somewhere safe": "<b>Nyomtad ki</b> és tárold biztonságos helyen",
     "<b>Save it</b> on a USB key or backup drive": "<b>Mentsd el</b> egy Pendrive-ra vagy a biztonsági mentésekhez",
     "<b>Copy it</b> to your personal cloud storage": "<b>Másold fel</b> a személyes felhődbe",
     "Set up Secure Message Recovery": "Biztonságos Üzenet Visszaállítás beállítása",
-    "Keep it safe": "Tartsd biztonságban",
-    "Create Key Backup": "Kulcs mentés készítése",
     "Unable to create key backup": "Kulcs mentés sikertelen",
     "Retry": "Újra",
     "Unable to load backup status": "A mentés állapotát nem lehet lekérdezni",
     "Unable to restore backup": "A mentést nem lehet visszaállítani",
     "No backup found!": "Mentés nem található!",
-    "Backup Restored": "Mentés visszaállítva",
     "Failed to decrypt %(failedCount)s sessions!": "%(failedCount)s kapcsolatot nem lehet visszafejteni!",
-    "Restored %(sessionCount)s session keys": "%(sessionCount)s kapcsolati kulcsok visszaállítva",
-    "Enter Recovery Passphrase": "Add meg a Helyreállítási jelmondatot",
     "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "A helyreállítási jelmondattal hozzáférsz a régi titkosított üzeneteidhez és beállíthatod a biztonságos üzenetküldést.",
     "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Ha elfelejtetted a helyreállítási jelmondatodat használhatod a <button1>helyreállítási kulcsodat</button1> vagy <button2>új helyreállítási paramétereket állíthatsz be</button2>",
-    "Enter Recovery Key": "Add meg a Helyreállítási kulcsot",
     "This looks like a valid recovery key!": "Ez érvényes helyreállítási kulcsnak tűnik!",
     "Not a valid recovery key": "Nem helyreállítási kulcs",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "A helyreállítási kulcs megadásával hozzáférhetsz a régi biztonságos üzeneteidhez és beállíthatod a biztonságos üzenetküldést.",
@@ -1025,10 +933,8 @@
     "A word by itself is easy to guess": "Egy szót magában könnyű kitalálni",
     "Names and surnames by themselves are easy to guess": "Neveket egymagukban könnyű kitalálni",
     "Common names and surnames are easy to guess": "Elterjedt neveket könnyű kitalálni",
-    "Great! This passphrase looks strong enough.": "Szuper! Ez a jelmondat elég erősnek látszik.",
-    "As a safety net, you can use it to restore your encrypted message history.": "Használhatod egy biztonsági hálóként a titkosított üzenetek visszaállításához.",
     "Failed to load group members": "A közösség tagságokat nem sikerült betölteni",
-    "Failed to invite users to the room:": "Felhasználókat nem sikerült meghívni a szobába:",
+    "Failed to invite users to the room:": "A felhasználók meghívása a szobába sikertelen:",
     "You do not have permission to invite people to this room.": "Nincs jogosultságod embereket meghívni ebbe a szobába.",
     "User %(user_id)s does not exist": "%(user_id)s felhasználó nem létezik",
     "Unknown server error": "Ismeretlen szerver hiba",
@@ -1058,12 +964,11 @@
     "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",
-    "Waiting for %(userId)s to confirm...": "Várakozás %(userId)s felhasználóra, hogy megerősítse...",
     "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)": "Se akkor ha bejelentkezel se akkor ha nem; mi nem tároljuk a felhasználói nevedet",
+    "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",
     "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.",
@@ -1114,9 +1019,9 @@
     "Theme": "Téma",
     "Account management": "Fiók menedzsment",
     "Deactivating your account is a permanent action - be careful!": "A fiók felfüggesztése végleges - légy óvatos!",
-    "For help with using Riot, click <a>here</a>.": "A Riot használatában való segítséghez kattints <a>ide</a>.",
-    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "A Riot használatában való segítségér kattints <a>ide</a> vagy kezdj beszélgetni a botunkkal az alábbi gombra kattintva.",
-    "Help & About": "Segítség & Névjegy",
+    "For help with using %(brand)s, click <a>here</a>.": "A %(brand)s használatában való segítséghez kattints <a>ide</a>.",
+    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "A %(brand)s használatában való segítségér kattints <a>ide</a> vagy kezdj beszélgetni a botunkkal az alábbi gombra kattintva.",
+    "Help & About": "Súgó és névjegy",
     "Bug reporting": "Hiba bejelentése",
     "FAQ": "GYIK",
     "Versions": "Verziók",
@@ -1126,9 +1031,8 @@
     "Timeline": "Idővonal",
     "Autocomplete delay (ms)": "Automatikus kiegészítés késleltetése (ms)",
     "Roles & Permissions": "Szerepek & Jogosultságok",
-    "To link to this room, please add an alias.": "A szobához való összekötéshez adj hozzá egy alternatív nevet.",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "A üzenetek olvashatóságának változtatása csak az új üzenetekre lesz érvényes. A régi üzenetek láthatósága nem fog változni.",
-    "Security & Privacy": "Biztonság & Adatvédelem",
+    "Security & Privacy": "Biztonság és adatvédelem",
     "Encryption": "Titkosítás",
     "Once enabled, encryption cannot be disabled.": "Ha egyszer bekapcsolod, már nem lehet kikapcsolni.",
     "Encrypted": "Titkosítva",
@@ -1137,27 +1041,20 @@
     "Key backup": "Kulcsok biztonsági mentése",
     "Missing media permissions, click the button below to request.": "Hiányzó média jogosultságok, kattints a gombra alul a jogok megadásához.",
     "Request media permissions": "Média jogosultságok megkérése",
-    "Voice & Video": "Hang & Videó",
+    "Voice & Video": "Hang és videó",
     "Main address": "Fő cím",
     "Room avatar": "Szoba képe",
     "Room Name": "Szoba neve",
     "Room Topic": "Szoba témája",
     "Join": "Belép",
-    "Use Legacy Verification (for older clients)": "Hagyományos hitelesítés használata (régi kliensekhez)",
-    "Verify by comparing a short text string.": "Rövid szöveggel való hitelesítés.",
-    "Begin Verifying": "Hitelesítés megkezdése",
-    "Waiting for partner to accept...": "Várjuk, hogy a partner elfogadja...",
-    "Use two-way text verification": "Kétirányú hitelesítés",
     "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.",
     "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.",
     "Report bugs & give feedback": "Hibajelentés & visszajelzés küldése",
     "Go back": "Vissza",
-    "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "A mentést nem lehet visszafejteni ezzel a kulccsal: kérlek ellenőrizd, hogy a megfelelő visszaállítási kulcsot adtad meg.",
     "Update status": "Állapot frissítése",
     "Set status": "Állapot beállítása",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "Az egyedi szerver beállítással beléphetsz másik Matrix szerverbe ha megadod annak URL-jét. Ezzel használhatod az alkalmazást megy másik Matrix szerveren meglévő felhasználói fiókkal.",
     "Your Modular server": "A te Modular servered",
     "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Add meg a Modular Matrix szerveredet. Ami vagy saját domaint használ vagy a <a>modular.im</a> aldomainját.",
     "Server Name": "Szerver neve",
@@ -1167,7 +1064,7 @@
     "Create your account": "Felhasználói fiók létrehozása",
     "Email (optional)": "E-mail (nem kötelező)",
     "Phone (optional)": "Telefonszám (nem kötelező)",
-    "Confirm": "Megerősít",
+    "Confirm": "Megerősítés",
     "Other servers": "Más szerverek",
     "Homeserver URL": "Matrixszerver URL",
     "Identity Server URL": "Azonosítási Szerver URL",
@@ -1186,8 +1083,8 @@
     "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.",
-    "Chat with Riot Bot": "Csevegés a Riot Robottal",
-    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "'%(fileName)s' mérete nagyobb mint amekkorát a Matrix szerver megenged feltölteni",
+    "Chat with %(brand)s Bot": "Csevegés a %(brand)s Robottal",
+    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "A(z) „%(fileName)s” mérete nagyobb mint amekkorát a Matrix-kiszolgáló enged feltölteni",
     "Gets or sets the room topic": "Lekérdezi vagy beállítja a szoba témáját",
     "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.",
@@ -1261,9 +1158,6 @@
     "Headphones": "Fejhallgató",
     "Folder": "Dosszié",
     "Pin": "Gombostű",
-    "Recovery Key Mismatch": "Visszaállítási Kulcs eltérés",
-    "Incorrect Recovery Passphrase": "Visszaállítási jelmondat hiba",
-    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "A mentést nem lehet visszafejteni a jelmondattal: kérlek ellenőrizd, hogy helyesen adtad meg a visszaállítási jelmondatot.",
     "This homeserver would like to make sure you are not a robot.": "A Matrix szerver meg kíván győződni arról, hogy nem vagy robot.",
     "Change": "Változtat",
     "Couldn't load page": "Az oldal nem tölthető be",
@@ -1276,46 +1170,33 @@
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Biztos vagy benne? Ha a kulcsaid nincsenek megfelelően elmentve elveszted a titkosított üzeneteidet.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "A titkosított üzenetek végponttól végpontig titkosítással védettek. Csak neked és a címzetteknek lehet meg a kulcs az üzenet visszafejtéséhez.",
     "Restore from Backup": "Visszaállítás mentésből",
-    "Back up your keys before signing out to avoid losing them.": "Ments el a kulcsaidat mielőtt kijelentkezel, hogy ne veszítsd el őket.",
+    "Back up your keys before signing out to avoid losing them.": "Töltsd fel kulcsaidat a szerverre mielőtt kijelentkezel, hogy ne veszítsd el őket.",
     "Start using Key Backup": "Kulcs mentés használatának megkezdése",
     "Never lose encrypted messages": "Soha ne veszíts el titkosított üzenetet",
     "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "A szobában az üzenetek végponttól végpontig titkosítva vannak. Csak neked és a címzetteknek vannak meg a kulcsok az üzenetek visszafejtéséhez.",
-    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Mentsd el megfelelően a kulcsaidat, hogy ne vesszenek el. <a>Tudj meg róla többet.</a>",
+    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Mentsd el megfelelően a kulcsaidat a szerverre, hogy ne vesszenek el. <a>Tudj meg erről többet.</a>",
     "Not now": "Most nem",
     "Don't ask me again": "Ne kérdezz többet",
-    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Nem jelent meg semmi? Az interaktív hitelesítést még nem minden kliens támogatja. <button>Használd a hagyományos hitelesítést</button>.",
     "I don't want my encrypted messages": "Nincs szükségem a titkosított üzeneteimre",
     "Manually export keys": "Kulcsok kézi mentése",
     "You'll lose access to your encrypted messages": "Elveszted a hozzáférést a titkosított üzeneteidhez",
     "Are you sure you want to sign out?": "Biztos, hogy ki akarsz jelentkezni?",
     "<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.",
     "Hide": "Eltakar",
-    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "A kulcsaid másolatát titkosítva tároljuk a Matrix szerveren. Védd a mentésedet jelmondattal, hogy biztonságban legyen.",
     "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.",
-    "Set up with a Recovery Key": "Beállítás Visszaállítási Kulccsal",
-    "Please enter your passphrase a second time to confirm.": "Kérlek add meg a jelmondatot másodszor is a biztonság kedvéért.",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "A Visszaállítási Kulcs egy olyan biztonsági elem amivel visszaállíthatod a hozzáférésed a titkosított üzenetekhez még akkor is, ha a jelmondatot elfelejtetted.",
     "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).",
-    "Secure your backup with a passphrase": "Védd a mentést egy jelmondattal",
-    "Confirm your passphrase": "Erősítsd meg a jelmondatot",
-    "Recovery key": "Visszaállítási Kulcs",
     "Success!": "Sikeres!",
     "Allow Peer-to-Peer for 1:1 calls": "Ponttól-pontig 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áltoztatod meg a becenevedet",
+    "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.",
     "Show read receipts sent by other users": "Mások által küldött olvasási visszajelzések mutatása",
-    "Order rooms in the room list by most important first instead of most recent": "Szobák fontosság szerinti rendezése a szobák listájában az utoljára érkezett üzenet helyett",
     "Scissors": "Ollók",
     "Error updating main address": "Az elsődleges cím frissítése sikertelen",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "A szoba elsődleges címének frissítésénél hiba történt. Vagy nincs engedélyezve a szerveren vagy átmeneti hiba történt.",
-    "Error creating alias": "Alternatív név készítése sikertelen",
-    "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "Az alternatív név készítésénél hiba történt. Lehet, hogy nincs engedélyezve a szerveren vagy átmeneti hiba történt.",
-    "Error removing alias": "Alternatív név törlése sikertelen",
-    "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "Az alternatív név törlésénél hiba történt. Lehet, hogy már nem is létezik vagy átmeneti hiba történt.",
     "Error updating flair": "Kitűző frissítése sikertelen",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "A kitűző a szobában való frissítésekor hiba történt. Lehet, hogy a szerver nem engedélyezi vagy átmeneti hiba történt.",
     "Room Settings - %(roomName)s": "Szoba beállítások: %(roomName)s",
@@ -1325,7 +1206,7 @@
     "Create your Matrix account on %(serverName)s": "Készíts egy Matrix fiókot itt: %(serverName)s",
     "Could not load user profile": "A felhasználói profil nem tölthető be",
     "Your Matrix account on %(serverName)s": "A Matrix fiókod itt: %(serverName)s",
-    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Hozzáteszi a sima szöveges üzenethez ezt: ¯\\_(ツ)_/¯",
+    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "A sima szöveges üzenet elé teszi ezt: ¯\\_(ツ)_/¯",
     "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",
@@ -1351,11 +1232,11 @@
     "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>",
     "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.": "Kérlek telepíts <chromeLink>Chrome</chromeLink>ot, <firefoxLink>Firefox</firefoxLink>ot vagy <safariLink>Safari</safariLink>t a jegjobb élményhez.",
+    "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>.",
     "<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>Figyelmeztetés</b>: A szoba frissítése <i>nem fogja automatikusan átvinni a szoba résztvevőit az új verziójú szobába.</i> A régi szobába bekerül egy link az új szobához - a tagoknak rá kell kattintani a linkre az új szobába való belépéshez.",
-    "Adds a custom widget by URL to the room": "Egyedi kisalkalmazás hozzáadása a szobához URL-lel",
-    "Please supply a https:// or http:// widget URL": "Kérlek add meg a https:// vagy http:// kisalkalmazás URL-t",
-    "You cannot modify widgets in this room.": "A kisalkalmazásokat nem módosíthatod a szobában.",
+    "Adds a custom widget by URL to the room": "Egyéni kisalkalmazás hozzáadása a szobához URL alapján",
+    "Please supply a https:// or http:// widget URL": "Add meg a kisalkalmazás https:// vagy http:// URL-jét",
+    "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.",
@@ -1369,15 +1250,15 @@
     "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",
     "Deny": "Megtilt",
-    "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riotnak 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.",
-    "Riot failed to get the public room list.": "Riotnak nem sikerült beszereznie a nyilvános szoba listát.",
+    "%(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)",
     "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?": "Egyenlőre nem lehet fájlal válaszolni. Szeretnéd feltölteni a fájlt úgy, hogy az nem egy válasz lesz?",
-    "The file '%(fileName)s' failed to upload.": "A %(fileName)s fájlt nem sikerült feltölteni.",
+    "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?",
+    "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",
     "GitHub issue": "GitHub hibajegy",
@@ -1398,8 +1279,8 @@
     "Upload %(count)s other files|one": "Feltölt %(count)s másik fájlt",
     "Cancel All": "Mindent megszakít",
     "Upload Error": "Feltöltési hiba",
-    "The server does not support the room version specified.": "A szerver nem támogatja a megadott szoba verziót.",
-    "Changes your avatar in this current room only": "A profilképedet csak ebben a szobában változtatja meg",
+    "The server does not support the room version specified.": "A kiszolgáló nem támogatja a megadott szobaverziót.",
+    "Changes your avatar in this current room only": "Csak ebben a szobában változtatja meg a profilképedet",
     "Sends the given message coloured as a rainbow": "A megadott üzenetet szivárvány színben küldi el",
     "Sends the given emote coloured as a rainbow": "A megadott hangulatjelet szivárvány színben küldi el",
     "The user's homeserver does not support the version of the room.": "A felhasználó matrix szervere nem támogatja a megadott szoba verziót.",
@@ -1451,8 +1332,7 @@
     "Homeserver URL does not appear to be a valid Matrix homeserver": "A matrix URL nem tűnik érvényesnek",
     "Invalid base_url for m.identity_server": "Érvénytelen base_url az m.identity_server -hez",
     "Identity server URL does not appear to be a valid identity server": "Az Azonosító szerver URL nem tűnik érvényesnek",
-    "A conference call could not be started because the integrations server is not available": "A konferencia hívást nem lehet elkezdeni mert az integrációs szerver nem érhető el",
-    "Name or Matrix ID": "Név vagy Matrix azon.",
+    "Name or Matrix ID": "Név vagy Matrix azonosító",
     "Unbans user with given ID": "Visszaengedi a megadott azonosítójú felhasználót",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>ezzel reagált: %(shortName)s</reactedWith>",
     "edited": "szerkesztve",
@@ -1469,10 +1349,9 @@
     "Low bandwidth mode": "Alacsony sávszélesség mód",
     "Cannot reach homeserver": "A matrix szerver elérhetetlen",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Legyen stabil az Internet elérésed vagy a szerver adminisztrátorával vedd fel a kapcsolatot",
-    "Your Riot is misconfigured": "A Riotod hibásan van beállítva",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Kérd meg a Riot adminisztrátorodat, hogy ellenőrizze a <a>beállításaidat</a> hibás vagy duplikált bejegyzéseket keresve.",
+    "Your %(brand)s is misconfigured": "A %(brand)sod hibásan van beállítva",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Kérd meg a %(brand)s adminisztrátorodat, hogy ellenőrizze a <a>beállításaidat</a> hibás vagy duplikált bejegyzéseket keresve.",
     "Unexpected error resolving identity server configuration": "Az azonosítási szerver beállításainak feldolgozásánál váratlan hiba történt",
-    "Show recently visited rooms above the room list": "Legutóbb meglátogatott szobák megjelenítése a szobalista felett",
     "Uploaded sound": "Feltöltött hang",
     "Sounds": "Hangok",
     "Notification sound": "Értesítési hang",
@@ -1500,7 +1379,7 @@
     "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s nem változtattak semmit",
     "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s %(count)s alkalommal nem változtatott semmit",
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)snem változtatott semmit",
-    "Changes your avatar in all rooms": "A profilképed megváltozik minden szobában",
+    "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.",
@@ -1523,10 +1402,10 @@
     "Terms of Service": "Felhasználási feltételek",
     "Service": "Szolgáltatás",
     "Summary": "Összefoglaló",
-    "Call failed due to misconfigured server": "A hívás meghiúsult a helytelenül beállított szerver miatt",
-    "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 szerver (<code>%(homeserverDomain)s</code>) adminisztrátorát, hogy a hívások megfelelő működéséhez állítson be egy TURN szervert.",
-    "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 nyilvános szervert: <code>turn.matrix.org</code>, de ez nem lesz annyira megbízható és megosztja az IP címedet a szerverrel. A Beállításokban állíthatod be.",
-    "Try using turn.matrix.org": "Próbáld meg használni a turn.matrix.org-ot",
+    "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.",
+    "Try using turn.matrix.org": "A turn.matrix.org használatának kipróbálása",
     "Messages": "Üzenetek",
     "Actions": "Műveletek",
     "Displays list of commands with usages and descriptions": "Parancsok megjelenítése példával és leírással",
@@ -1539,14 +1418,14 @@
     "Could not connect to Identity Server": "Az Azonosítási Szerverhez nem lehet csatlakozni",
     "Checking server": "Szerver ellenőrzése",
     "Terms of service not accepted or the identity server is invalid.": "A felhasználási feltételek nincsenek elfogadva vagy az azonosítási szerver nem érvényes.",
-    "Identity server has no terms of service": "Az azonosítási szerverhez nincsenek felhasználási feltételek",
+    "Identity server has no terms of service": "Az azonosítási kiszolgálónak nincsenek felhasználási feltételei",
     "The identity server you have chosen does not have any terms of service.": "Az általad választott azonosítási szerverhez nincsenek felhasználási feltételek.",
-    "Only continue if you trust the owner of the server.": "Csak akkor lépj tovább ha megbízol a szerver tulajdonosában.",
+    "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.",
-    "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "Azonosítási szervert nem használsz jelenleg. Ahhoz, hogy megtalálj ismerősöket vagy téged megtaláljanak ismerősök adj hozzá egyet alább.",
+    "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",
     "Integration Manager": "Integrációs Menedzser",
@@ -1566,7 +1445,7 @@
     "Remove %(email)s?": "%(email)s törlése?",
     "Remove %(phone)s?": "%(phone)s törlése?",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "A szöveges üzenetet elküldtük a +%(msisdn)s számra. Kérlek add meg az ellenőrző kódot amit tartalmazott.",
-    "Command Help": "Parancs Segítség",
+    "Command Help": "Parancsok súgója",
     "No identity server is configured: add one in server settings to reset your password.": "Nincs azonosítási szerver beállítva: adj meg egyet a szerver beállításoknál, hogy a jelszavadat vissza tudd állítani.",
     "This account has been deactivated.": "Ez a fiók zárolva van.",
     "You do not have the required permissions to use this command.": "A parancs használatához nincs meg a megfelelő jogosultságod.",
@@ -1582,19 +1461,19 @@
     "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>.",
     "Enable room encryption": "Szoba titkosításának bekapcsolása",
-    "Use an identity server": "Azonosítási szerver használata",
-    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Azonosítási szerver használata e-maillel való meghíváshoz. Kattints a folytatáshoz az alapértelmezett (%(defaultIdentityServerName)s) azonosítási szerverrel vagy változtasd meg a Beállításokban.",
-    "Use an identity server to invite by email. Manage in Settings.": "Az e-maillel való meghíváshoz használj azonosítási szervert. Módosítsd a Beállításokban.",
+    "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. 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?",
     "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ás lenne",
+    "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.",
     "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "A meghívó ehhez a szobához: %(roomName)s erre az e-mail címre lett elküldve: %(email)s ami nincs társítva a fiókodhoz",
-    "Link this email with your account in Settings to receive invites directly in Riot.": "Kösd össze a Beállításokban ezt az e-mail címet a fiókoddal, hogy közvetlenül a Riotba kaphassa meghívókat.",
+    "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Kösd össze a Beállításokban ezt az e-mail címet a fiókoddal, hogy közvetlenül a %(brand)sba kaphassa meghívókat.",
     "This invite to %(roomName)s was sent to %(email)s": "A meghívó ehhez a szobához: %(roomName)s ide lett elküldve: %(email)s",
-    "Use an identity server in Settings to receive invites directly in Riot.": "Állíts be azonosítási szervert a Beállításokban, hogy közvetlen meghívókat kaphass Riotba.",
-    "Share this email in Settings to receive invites directly in Riot.": "Oszd meg a Beállításokban ezt az e-mail címet, hogy közvetlen meghívókat kaphass Riotba.",
+    "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.",
     "Bold": "Félkövér",
@@ -1604,7 +1483,7 @@
     "Change identity server": "Azonosítási szerver kicserélése",
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "<current /> azonosítási szerverről lecsatlakozás és csatlakozás ehhez: <new />?",
     "Disconnect identity server": "Az azonosítási szerverről lecsatlakozás",
-    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Az azonosítási szerverrel (<idserver />) továbbra is <b>megosztasz személyes adatokat</b>.",
+    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Továbbra is <b>megosztasz személyes adatokat</b> a(z) <idserver /> azonosítási kiszolgálón.",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Javasoljuk, hogy mielőtt az azonosítási szerverről lecsatlakozol töröld az e-mail címedet és telefonszámodat.",
     "Disconnect anyway": "Mindenképpen lecsatlakozás",
     "No recent messages by %(user)s found": "Nincs friss üzenet ettől a felhasználótól: %(user)s",
@@ -1635,14 +1514,9 @@
     "Report Content": "Tartalom jelentése",
     "Read Marker lifetime (ms)": "Olvasás visszajelzés érvényesség (ms)",
     "Read Marker off-screen lifetime (ms)": "Olvasás visszajelzés érvényessége képernyőn kívül (ms)",
-    "Changes the avatar of the current room": "Profilkép megváltoztatása az adott szobában",
-    "Room alias": "Szoba álnév",
+    "Changes the avatar of the current room": "Megváltoztatja a profilképed a jelenlegi szobában",
     "e.g. my-room": "pl.: szobam",
-    "Please provide a room alias": "Kérlek adj meg egy álnevet a szobához",
-    "This alias is available to use": "Az álnév használható",
-    "This alias is already in use": "Az álnév már használatban van",
     "Please enter a name for the room": "Kérlek adj meg egy nevet a szobához",
-    "Set a room alias to easily share your room with other people.": "A szoba emberekkel való könnyebb megosztásához állíts be álnevet.",
     "This room is private, and can only be joined by invitation.": "A szoba zárt, csak meghívóval lehet belépni.",
     "Create a public room": "Nyilvános szoba készítése",
     "Create a private room": "Zárt szoba készítése",
@@ -1705,7 +1579,7 @@
     "%(count)s unread messages.|one": "1 olvasatlan üzenet.",
     "Unread messages.": "Olvasatlan üzenetek.",
     "Show tray icon and minimize window to it on close": "Tálcaikon mutatása és az ablak összecsukása bezáráskor",
-    "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.": "Ez a művelet az e-mail cím vagy telefonszám ellenőrzése miatt hozzáférést igényel az alapértelmezett azonosítási szerverhez (<server />), de a szervernek nincsen semmilyen felhasználási feltétele.",
+    "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.": "Ez a művelet az e-mail cím vagy telefonszám ellenőrzése miatt hozzáférést igényel a(z) <server /> alapértelmezett azonosítási kiszolgálóhoz, de a kiszolgálónak nincsenek felhasználási feltételei.",
     "Trust": "Megbízom benne",
     "Message Actions": "Üzenet Műveletek",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
@@ -1725,7 +1599,6 @@
     "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.",
     "Error subscribing to list": "A listára való feliratkozásnál hiba történt",
-    "Please verify the room ID or alias and try again.": "Kérünk ellenőrizd a szoba azonosítóját vagy alternatív nevét és próbáld újra.",
     "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.",
@@ -1740,7 +1613,6 @@
     "View rules": "Szabályok megtekintése",
     "You are currently subscribed to:": "Jelenleg ezekre iratkoztál fel:",
     "⚠ These settings are meant for advanced users.": "⚠ Ezek a beállítások haladó felhasználók számára vannak.",
-    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Adj hozzá olyan felhasználókat és szervereket akiket figyelmen kívül kívánsz hagyni. Használj csillagot ahol bármilyen karakter állhat. Például: <code>@bot:*</code> minden „bot” nevű felhasználót figyelmen kívül fog hagyni akármelyik szerverről.",
     "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.": "Emberek figyelmen kívül hagyása tiltólistán keresztül történik ami arról tartalmaz szabályokat, hogy kiket kell kitiltani. A feliratkozás a tiltólistára azt jelenti, hogy azok a felhasználók/szerverek amik tiltva vannak a lista által, azoknak az üzenetei rejtve maradnak számodra.",
     "Personal ban list": "Személyes tiltó lista",
     "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.": "A személyes tiltólistád tartalmazza azokat a személyeket/szervereket akiktől nem szeretnél üzeneteket látni. Az első felhasználó/szerver figyelmen kívül hagyása után egy új szoba jelenik meg a szobák listájában „Tiltólistám” névvel - ahhoz, hogy a lista érvényben maradjon maradj a szobában.",
@@ -1749,10 +1621,9 @@
     "Subscribed lists": "Feliratkozott listák",
     "Subscribing to a ban list will cause you to join it!": "A feliratkozás egy tiltó listára azzal jár, hogy csatlakozol hozzá!",
     "If this isn't what you want, please use a different tool to ignore users.": "Ha nem ez az amit szeretnél, kérlek használj más eszközt a felhasználók figyelmen kívül hagyásához.",
-    "Room ID or alias of ban list": "Tiltó lista szoba azonosítója vagy alternatív neve",
     "Subscribe": "Feliratkozás",
     "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Ezt a felhasználót figyelmen kívül hagyod, így az üzenetei el lesznek rejtve. <a>Mindenképpen megmutat.</a>",
-    "Custom (%(level)s)": "Egyedi (%(level)s)",
+    "Custom (%(level)s)": "Egyéni (%(level)s)",
     "Trusted": "Megbízható",
     "Not trusted": "Megbízhatatlan",
     "Direct message": "Közvetlen beszélgetés",
@@ -1765,14 +1636,13 @@
     "Your avatar URL": "Profilképed URL-je",
     "Your user ID": "Felhasználói azonosítód",
     "Your theme": "Témád",
-    "Riot URL": "Riot URL",
+    "%(brand)s URL": "%(brand)s URL",
     "Room ID": "Szoba azonosító",
-    "Widget ID": "Kisalkalmazás azon.",
+    "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.": "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.",
-    "Enable local event indexing and E2EE search (requires restart)": "Helyi esemény indexálás és végponttól végpontig titkosított események keresésének engedélyezése (újraindítás szükséges)",
     "More options": "További beállítások",
     "Reload": "Újratölt",
     "Take picture": "Fénykép készítés",
@@ -1789,11 +1659,10 @@
     "Integrations are disabled": "Az integrációk le vannak tiltva",
     "Enable 'Manage Integrations' in Settings to do this.": "Ehhez engedélyezd az „Integrációk Kezelésé”-t a Beállításokban.",
     "Integrations not allowed": "Az integrációk nem engedélyezettek",
-    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "A Riotod nem használhat ehhez Integrációs Menedzsert. Kérlek vedd fel a kapcsolatot az adminisztrátorral.",
+    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "A %(brand)sod nem használhat ehhez Integrációs Menedzsert. Kérlek vedd fel a kapcsolatot az adminisztrátorral.",
     "Decline (%(counter)s)": "Elutasítás (%(counter)s)",
     "Manage integrations": "Integrációk kezelése",
     "Verification Request": "Ellenőrzési kérés",
-    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
     "%(senderName)s placed a voice call.": "%(senderName)s hanghívást kezdeményezett.",
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s hanghívást kezdeményezett. (ebben a böngészőben nem támogatott)",
     "%(senderName)s placed a video call.": "%(senderName)s videóhívást kezdeményezett.",
@@ -1801,15 +1670,15 @@
     "Match system theme": "A rendszer témájához megfelelő",
     "Clear notifications": "Értesítések törlése",
     "Customise your experience with experimental labs features. <a>Learn more</a>.": "Kísérleti labor tulajdonságokkal egyénre szabhatod az élményt. <a>Tudj meg többet</a>.",
-    "Error upgrading room": "A szoba verziófrissítésénél hiba történt",
-    "Double check that your server supports the room version chosen and try again.": "Ellenőrizd még egyszer, hogy a szervered támogatja-e a szoba verzióját és próbáld újra.",
+    "Error upgrading room": "Hiba a szoba verziófrissítésekor",
+    "Double check that your server supports the room version chosen and try again.": "Ellenőrizd még egyszer, hogy a kiszolgálód támogatja-e kiválasztott szobaverziót, és próbáld újra.",
     "This message cannot be decrypted": "Ezt az üzenetet nem lehet visszafejteni",
     "Unencrypted": "Titkosítatlan",
     "Automatically invite users": "Felhasználók automatikus meghívása",
     "Upgrade private room": "Privát szoba fejlesztése",
     "Upgrade public room": "Nyilvános szoba fejlesztése",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "A szoba frissítése nem egyszerű művelet, általában a szoba hibás működése, hiányzó funkció vagy biztonsági sérülékenység esetén javasolt.",
-    "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Ez általában a szoba szerver oldali kezelésében jelent változást. Ha a Riotban van problémád, kérlek <a>küldj egy hibajelentést</a>.",
+    "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>.": "Ez általában a szoba szerver oldali kezelésében jelent változást. Ha a %(brand)sban van problémád, kérlek <a>küldj egy hibajelentést</a>.",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "<oldVersion /> verzióról <newVersion /> verzióra fejleszted a szobát.",
     "Upgrade": "Fejlesztés",
     "Notification settings": "Értesítések beállítása",
@@ -1818,34 +1687,22 @@
     "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> ezzel reagáltak: %(content)s</reactedWith>",
     "<userName/> wants to chat": "<userName/> csevegni szeretne",
     "Start chatting": "Beszélgetés elkezdése",
-    "Send cross-signing keys to homeserver": "Kereszt-aláírás kulcsok küldése a matrix szervernek",
-    "Cross-signing public keys:": "Kereszt-aláírás nyilvános kulcsok:",
+    "Cross-signing public keys:": "Eszközök közti hitelesítés nyilvános kulcsai:",
     "not found": "nem található",
-    "Cross-signing private keys:": "Kereszt-aláírás privát kulcsok:",
+    "Cross-signing private keys:": "Eszközök közti hitelesítés privát kulcsai:",
     "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": "Kereszt-aláírás",
-    "Enter secret storage passphrase": "Add meg a jelmondatot a biztonsági tárolóhoz",
-    "Unable to access secret storage. Please verify that you entered the correct passphrase.": "A biztonsági tárolóhoz nem lehet hozzáférni. Kérlek ellenőrizd, hogy jó jelmondatot adtál-e meg.",
-    "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Figyelem</b>: Csak biztonságos eszközről férj hozzá a biztonságos tárolóhoz.",
-    "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Ha elfelejtetted a jelmondatodat <button1>használd a visszaállítási kulcsod</button1> vagy <button2>állíts be új visszaállítási lehetőséget</button2>.",
-    "Enter secret storage recovery key": "Add meg a visszaállítási kulcsot a biztonsági tárolóhoz",
-    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "A biztonsági tárolóhoz nem lehet hozzáférni. Kérlek ellenőrizd, hogy jó visszaállítási kulcsot adtál-e meg.",
-    "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>.",
+    "Cross-signing": "Eszközök közti aláírá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",
-    "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "Mint egy biztonsági háló, ha elfelejted a jelmondatot akkor felhasználhatod ahhoz, hogy hozzáférj a titkosított üzeneteidhez.",
-    "As a safety net, you can use it to restore your access to encrypted messages.": "Használhatod egy biztonsági hálóként a titkosított üzenetekhez való hozzáférés visszaállításához.",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókezelő (vagy széf).",
     "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "A visszaállítási kulcsod <b>a vágólapra lett másolva</b>, illeszd be ide:",
     "Your recovery key is in your <b>Downloads</b> folder.": "A visszaállítási kulcsod a <b>Letöltések</b> mappában van.",
-    "Storing secrets...": "Titkok tárolása...",
     "Unable to set up secret storage": "A biztonsági tárolót nem sikerült beállítani",
     "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s törölte azt a szabályt amivel ilyen felhasználók voltak kitiltva: %(glob)s",
     "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s törölte azt a szabályt amivel ilyen szobák voltak kitiltva: %(glob)s",
-    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s törölte azt a szabályt amivel ilyen szerverek voltak kitiltva: %(glob)s",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s törölte azt a szabályt, amivel az ennek megfelelő kiszolgálók ki voltak tiltva: %(glob)s",
     "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s törölte ezt a kitiltó szabályt: %(glob)s",
     "%(senderName)s updated an invalid ban rule": "%(senderName)s frissített egy érvénytelen kitiltó szabályt",
     "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s frissítette azt a szabályt amivel ilyen felhasználók voltak kitiltva: %(glob)s ezért: %(reason)s",
@@ -1860,9 +1717,9 @@
     "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s megváltoztatta a szabályt amivel szobák voltak kitiltva erről: %(oldGlob)s erre: %(newGlob)s ezért: %(reason)s",
     "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s megváltoztatta a szabályt amivel szerverek voltak kitiltva erről: %(oldGlob)s erre: %(newGlob)s ezért: %(reason)s",
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s megváltoztatta a kitiltó szabályt erről: %(oldGlob)s erre: %(newGlob)s ezért: %(reason)s",
-    "Cross-signing and secret storage are enabled.": "Kereszt-aláírás és a biztonsági tároló engedélyezve van.",
-    "Cross-signing and secret storage are not yet set up.": "Kereszt-aláírás és a biztonsági tároló egyenlőre nincs beállítva.",
-    "Bootstrap cross-signing and secret storage": "Kereszt-aláírás és biztonsági tároló beállítása",
+    "Cross-signing and secret storage are enabled.": "Eszközök közti hitelesítés és a biztonsági tároló engedélyezve van.",
+    "Cross-signing and secret storage are not yet set up.": "Az eszközök közti hitelesítés és a biztonsági tároló egyenlőre nincs beállítva.",
+    "Bootstrap cross-signing and secret storage": "Az eszközök közti hitelesítés és biztonsági tároló beállítása",
     "not stored": "nincs mentve",
     "Backup has a <validity>valid</validity> signature from this user": "A mentés <validity>érvényes</validity> aláírást tartalmaz a felhasználótól",
     "Backup has a <validity>invalid</validity> signature from this user": "A mentés <validity>érvénytelen</validity> aláírást tartalmaz a felhasználótól",
@@ -1875,7 +1732,7 @@
     "Language Dropdown": "Nyelvválasztó lenyíló menü",
     "Country Dropdown": "Ország lenyíló menü",
     "The message you are trying to send is too large.": "Túl nagy képet próbálsz elküldeni.",
-    "Help": "Segítség",
+    "Help": "Súgó",
     "Show more": "Mutass többet",
     "Recent Conversations": "Legújabb Beszélgetések",
     "Direct Messages": "Közvetlen Beszélgetések",
@@ -1885,7 +1742,6 @@
     "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",
-    "Show a presence dot next to DMs in the room list": "Jelenlét pötty mutatása a Közvetlen beszélgetések mellett a szobák listájában",
     "Lock": "Zár",
     "a few seconds ago": "néhány másodperce",
     "about a minute ago": "percekkel ezelőtt",
@@ -1902,8 +1758,6 @@
     "about a day from now": "egy nap múlva",
     "%(num)s days from now": "%(num)s nap múlva",
     "Restore": "Visszaállít",
-    "Complete security": "Biztonság beállítása",
-    "Verify this session to grant it access to encrypted messages.": "A titkosított üzenetekhez való hozzáféréshez hitelesítsd ezt a munkamenetet.",
     "Start": "Indít",
     "Session verified": "Munkamenet hitelesítve",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Ez a munkameneted hitelesítve van. A titkosított üzenetekhez hozzáférése van és más felhasználók megbízhatónak látják.",
@@ -1916,7 +1770,6 @@
     "Something went wrong trying to invite the users.": "Valami nem sikerült a felhasználók meghívásával.",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "Ezeket a felhasználókat nem tudtuk meghívni. Ellenőrizd azokat a felhasználókat akiket meg szeretnél hívni és próbáld újra.",
     "Recently Direct Messaged": "Nemrég küldött Közvetlen Üzenetek",
-    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Ha nem találsz valakit, akkor kérdezd meg a Matrix címét (pl.: @felhasználó:szerver.com) vagy <a>oszd meg ezt a szobát</a>.",
     "Verify User": "Felhasználó ellenőrzése",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "A biztonság fokozásáért ellenőrizd ezt a felhasználót egy egyszeri kód egyeztetésével mindkettőtök készülékén.",
     "Start Verification": "Ellenőrzés elindítása",
@@ -1925,29 +1778,18 @@
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Használhatod a <code>/help</code>-et az elérhető parancsok kilistázásához. Ezt üzenetként akartad küldeni?",
     "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",
-    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s szoba címnek, %(count)s másikkal együtt, hozzáadta: %(addedAddresses)s",
-    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s %(count)s másikkal együtt törölte a szoba címek közül: %(removedAddresses)s",
-    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s %(countRemoved)s darabot törölt és %(countAdded)s darabot hozzáadott a szoba címekhez",
     "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",
     "Invite only": "Csak meghívóval",
     "Send a reply…": "Válasz küldése…",
     "Send a message…": "Üzenet küldése…",
     "Reject & Ignore user": "Felhasználó elutasítása és figyelmen kívül hagyása",
-    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Ha nem találsz valakit, kérdezd meg a Matrix címét, vagy add meg neki a te Matrix címed (%(userId)s), vagy a <a>profil hivatkozásod</a>.",
     "Enter your account password to confirm the upgrade:": "A fejlesztés megerősítéséhez add meg a fiók jelszavadat:",
     "You'll need to authenticate with the server to confirm the upgrade.": "Azonosítanod kell magad a szerveren a fejlesztés megerősítéséhez.",
-    "Enter a passphrase": "Jelmondat bevitele",
-    "Enter your passphrase a second time to confirm it.": "Add meg a jelmondatot másodszor is a biztonság kedvéért.",
-    "Verify other users in their profile.": "Más felhasználók ellenőrzése a profiljukban.",
     "Upgrade your encryption": "Titkosításod fejlesztése",
     "Set up encryption": "Titkosítás beállítása",
-    "Encryption upgraded": "Titkosítás fejlesztve",
-    "Encryption setup complete": "Titkosítás beállítása kész",
     "Verify this session": "Munkamenet ellenőrzése",
-    "Encryption upgrade available": "A titkosítás fejlesztése elérhető",
-    "%(senderName)s turned on end-to-end encryption.": "%(senderName)s bekapcsolta a végpontok közötti titkosítást.",
-    "%(senderName)s turned on end-to-end encryption (unrecognised algorithm %(algorithm)s).": "%(senderName)s bekapcsolta a végpontok közötti titkosítást (ismeretlen algoritmus: %(algorithm)s).",
+    "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",
     "Review": "Átnéz",
     "This bridge was provisioned by <user />.": "Ezt a hidat az alábbi felhasználó készítette: <user />.",
@@ -1960,8 +1802,7 @@
     "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.",
     "Enable": "Engedélyez",
-    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "A  Riotbó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 Riotot a <nativeLink>kereső komponens hozzáadásával</nativeLink>.",
-    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "A Riot a web böngészőben nem tud biztonságosan titkosított üzenetet helyben elmenteni. Hogy a titkosított üzenetekre tudjál keresni használj <riotLink>Asztali Riot klienst</riotLink>.",
+    "%(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>.",
     "Message search": "Üzenet keresése",
     "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Ez a szoba összeköti az üzeneteket a következő platformokkal, <a>tudj meg többet.</a>",
     "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Ez a szoba egy platformmal sem köt össze üzeneteket. <a>Tudj meg többet.</a>",
@@ -1970,45 +1811,34 @@
     "Use this session to verify your new one, granting it access to encrypted messages:": "Az új munkamenet ellenőrzéséhez használd ezt, amivel hozzáférést adsz a titkosított üzenetekhez:",
     "If you didn’t sign in to this session, your account may be compromised.": "Ha nem te jelentkeztél be ebbe a munkamenetbe akkor a fiókodat feltörték.",
     "This wasn't me": "Nem én voltam",
-    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Helyezd biztonságba a titkosítási kulcsaidat egy jelmondattal. A maximális biztonság érdekében ez térjen el a felhasználói fióknál használt jelszótól:",
     "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",
-    "Not currently downloading messages for any room.": "Jelenleg egy szobából sem folyik üzenet letöltés.",
-    "Downloading mesages for %(currentRoom)s.": "Üzenetek letöltése innen: %(currentRoom)s.",
-    "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot a kereshetőség érdekében a titkosított üzeneteket biztonságos módon helyileg tárolja:",
+    "%(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:",
     "Indexed messages:": "Indexált üzenetek:",
-    "Number of rooms:": "Szobák száma:",
     "Restore your key backup to upgrade your encryption": "A titkosítás fejlesztéséhez allítsd vissza a kulcs mentést",
-    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Ismeretlen munkamenetek vannak a szobában: ha ellenőrzés nélkül folytatod lehet, hogy valaki belehallgat a hívásodba.",
     "Setting up keys": "Kulcsok beállítása",
-    "Unverified session": "Ellenőrizetlen munkamenet",
     "Verifies a user, session, and pubkey tuple": "Felhasználó, munkamenet és nyilvános kulcs hármas ellenőrzése",
     "Unknown (user, session) pair:": "Ismeretlen (felhasználó, munkamenet) páros:",
-    "Session already verified!": "Munkamenet  már ellenőrizve!",
+    "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!",
-    "Enable cross-signing to verify per-user instead of per-session (in development)": "Kereszt-aláírás engedélyezése a felhasználó alapú azonosításhoz a munkamenet alapú helyett (fejlesztés alatt)",
-    "Show padlocks on invite only rooms": "Lakat mutatása azoknál a szobáknál amikbe csak meghívóval lehet belépni",
-    "Never send encrypted messages to unverified sessions from this session": "Sose küldj titkosított üzenetet nem ellenőrizetlen munkamenetbe ebből a munkamenetből",
+    "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",
-    "Keep secret storage passphrase in memory for this session": "A biztonsági tároló jelmondatát ebben a munkamenetben tartsa a memóriában",
     "How fast should messages be downloaded.": "Milyen gyorsan legyenek az üzenetek letöltve.",
-    "Confirm the emoji below are displayed on both devices, in the same order:": "Erősítsd meg, hogy az emodzsik alul mind a két eszközön ugyanazok ugyanabban a sorrendben:",
-    "Verify this device by confirming the following number appears on its screen.": "Ellenőrizd az eszközt azzal, hogy megerősíted az alábbi számok jelentek meg a képernyőjén.",
     "Waiting for %(displayName)s to verify…": "%(displayName)s felhasználóra várakozás az ellenőrzéshez…",
     "They match": "Egyeznek",
     "They don't match": "Nem egyeznek",
     "To be secure, do this in person or use a trusted way to communicate.": "A biztonság érdekében ezt végezd el személyesen vagy egy megbízható kommunikációs csatornán.",
     "Verify yourself & others to keep your chats safe": "Ellenőrizd magad és másokat, hogy a csevegéseid biztonságban legyenek",
-    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "A fiókodhoz tartozik egy kereszt-aláírás a biztonsági tárolóban de ebben a munkamenetben ez még nem megbízható.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "A fiókodhoz tartozik egy eszköz-közti hitelesítési identitás, de ez a munkamenet még nem jelölte megbízhatónak.",
     "in memory": "memóriában",
     "Your homeserver does not support session management.": "A matrix szervered nem támogatja a munkamenetek kezelését.",
     "Unable to load session list": "A munkamenet listát nem lehet betölteni",
     "Delete %(count)s sessions|other": "%(count)s munkamenet törlése",
     "Delete %(count)s sessions|one": "%(count)s munkamenet törlése",
     "This session is backing up your keys. ": "Ez a munkamenet elmenti a kulcsaidat. ",
-    "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: KULCS ELLENŐRZÉS HIBÁS! %(userId)s aláírási kulcsa és a munkamenet: %(deviceId)s ujjlenyomata \"%(fprint)s\" ami nem egyezik meg a megadott ujjlenyomattal ami \"%(fingerprint)s\". Ez jelentheti azt, 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 hitelesnek lett jelölve.",
+    "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.",
     "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.",
@@ -2022,23 +1852,17 @@
     "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "A mentés <validity>érvénytelen</validity> aláírást tartalmaz <verify>ellenőrizetlen</verify> munkamenetből <device></device>",
     "Backup is not signed by any of your sessions": "A mentés nem tartalmaz aláírást egyetlen munkamenetedből sem",
     "This backup is trusted because it has been restored on this session": "Ez a mentés megbízható mert ebben a munkamenetben lett visszaállítva",
-    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "A mentési kulcs a biztonsági tárolóban van elmentve, de ebben a munkamenetben ez a lehetőség nincs engedélyezve. Kérlek engedélyezd az eszközök közötti hitelesítést a Laborokban a kulcs mentés állapotának megváltoztatásához.",
     "Your keys are <b>not being backed up from this session</b>.": "A kulcsaid <b>nem kerülnek elmentésre erről a munkamenetről</b>.",
     "Enable desktop notifications for this session": "Asztali értesítések engedélyezése ebben a munkamenetben",
     "Enable audible notifications for this session": "Hallható értesítések engedélyezése ebben a munkamenetben",
     "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "A jelszavad sikeresen megváltozott. Addig nem kapsz push értesítéseket más munkamenetekben amíg nem jelentkezel vissza bennük",
     "Session ID:": "Munkamenet azonosító:",
     "Session key:": "Munkamenet kulcs:",
-    "Sessions": "Munkamenetek",
     "A session's public name is visible to people you communicate with": "A munkamenet nyilvános neve megjelenik azoknál az embereknél, akikkel beszélgetsz",
     "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",
-    "Some sessions for this user are not trusted": "Ennek a felhasználónak néhány munkamenete nem megbízható",
-    "All sessions for this user are trusted": "A felhasználónak minden munkamenete megbízható",
-    "Some sessions in this encrypted room are not trusted": "Ebben a titkosított szobában nem minden munkamenet megbízható",
-    "All sessions in this encrypted room are trusted": "Ebben a titkosított szobában minden munkamenet megbízható",
     "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.",
@@ -2046,13 +1870,12 @@
     "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Titkosítási kulcsok újrakérése</requestLink> a többi munkamenetből.",
     "Encrypted by an unverified session": "Ellenőrizetlen munkamenet titkosította",
     "Encrypted by a deleted session": "Törölt munkamenet által lett titkosítva",
-    "No sessions with registered encryption keys": "Nincs munkamenet regisztrált titkosítási kulcsokkal",
     "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 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",
-    "The homeserver the user you’re verifying is connected to": "Az ellenőrizendő felhasználó ehhez a matrix szerverhez kapcsolódik:",
+    "The homeserver the user you’re verifying is connected to": "Az ellenőrizendő felhasználó ehhez a matrix kiszolgálóhoz kapcsolódik:",
     "Yours, or the other users’ internet connection": "A te vagy a másik felhasználó Internet kapcsolata",
     "Yours, or the other users’ session": "A te vagy a másik felhasználó munkamenete",
     "%(count)s sessions|other": "%(count)s munkamenet",
@@ -2064,9 +1887,6 @@
     "If you can't scan the code above, verify by comparing unique emoji.": "Ha nem tudod beolvasni az alábbi kódot, ellenőrizd az egyedi emodzsik összehasonlításával.",
     "You've successfully verified %(displayName)s!": "Sikeresen ellenőrizted a felhasználót: %(displayName)s!",
     "Got it": "Értem",
-    "Verification timed out. Start verification again from their profile.": "Ellenőrzés időtúllépés. Kezd újra az ellenőrzést a másik felhasználó profiljából.",
-    "%(displayName)s cancelled verification. Start verification again from their profile.": "%(displayName)s törölte az ellenőrzést. Kezd újra az ellenőrzést a felhasználó profiljából.",
-    "You cancelled verification. Start verification again from their profile.": "Törölted az ellenőrzést. Kezd újra az ellenőrzést a felhasználó profiljából.",
     "Encryption enabled": "Titkosítás bekapcsolva",
     "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Ebben a szobában az üzenetek végpontok között titkosítottak. További információkért és ellenőrzéshez nyisd meg a felhasználó profilját.",
     "Encryption not enabled": "Titkosítás nincs engedélyezve",
@@ -2074,62 +1894,38 @@
     "Clear all data in this session?": "Minden adat törlése ebben a munkamenetben?",
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Az adatok törlése ebből a munkamenetből végleges. A titkosított üzenetek elvesznek hacsak nincsenek elmentve a kulcsai.",
     "Verify session": "Munkamenet ellenőrzése",
-    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "A munkamenet megbízhatóságának eldöntéséhez ellenőrizd a kulcsot a Felhasználói Beállításokban ezen az eszközön, hogy megegyezik-e az alábbi kulccsal:",
-    "To verify that this session can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this session matches the key below:": "A munkamenet megbízhatóságának eldöntéséhez vedd fel a kapcsolatot a tulajdonosával valami másik módon (pl. személyesen vagy telefonhívással) és kérdezd meg, hogy a Felhasználói Beállításokban ugyanazt a kulcsot látja-e mint ami alul van:",
     "Session name": "Munkamenet neve",
     "Session key": "Munkamenet kulcs",
-    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "Ha egyezik akkor nyomd meg az ellenőriz gombot alul. Ha nem akkor valaki lehallgatja a munkamenetet és valószínű, hogy inkább a tiltólista gombra kellene kattintani.",
     "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.",
-    "You added a new session '%(displayName)s', which is requesting encryption keys.": "Új munkamenetet adtál hozzá '%(displayName)s' néven ami kéri a titkosítási kulcsokat.",
-    "Your unverified session '%(displayName)s' is requesting encryption keys.": "Az ellenőrizetlen munkameneted '%(displayName)s' néven titkosítási kulcsokat kér.",
-    "Loading session info...": "Munkamenet információk betöltése...",
     "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.",
-    "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "Jelenleg tiltólistán vannak az ellenőrizetlen munkamenetek; hogy üzeneteket tudj küldeni ezekbe a munkamenetekbe ellenőrizned kell őket.",
-    "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Javasoljuk, hogy minden munkamenetet ellenőrizz, hogy a tényleges tulajdonosához tartoznak vagy újraküldheted az üzenetet ha akarod anélkül, hogy ellenőriznéd őket.",
-    "Room contains unknown sessions": "A szoba ismeretlen munkameneteket tartalmaz",
-    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "\"%(RoomName)s\" még nem látott munkameneteket tartalmaz.",
-    "Unknown sessions": "Ismeretlen munkamenetek",
     "Cancel entering passphrase?": "Megszakítod a jelmondat bevitelét?",
-    "If you cancel now, you won't complete your secret storage operation!": "Ha most megszakítod, akkor nem fejezed be a biztonságos tárolóval kapcsolatos műveletet!",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "A jelmondat megadásával hozzáférhetsz a biztonságos üzeneteidhez és az eszközök közötti hitelesítéshez használt személyazonosságodhoz, hogy más munkameneteket hitelesíthess.",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "A visszaállítási kulcs megadásával hozzáférhetsz a biztonságos üzeneteidhez és az eszközök közötti hitelesítéshez használt személyazonosságodhoz, hogy más munkameneteket hitelesíthess.",
     "Recovery key mismatch": "A visszaállítási kulcs nem megfelelő",
     "Incorrect recovery passphrase": "A visszaállítási jelmondat helytelen",
-    "Backup restored": "Mentés visszaállítva",
     "Enter recovery passphrase": "Visszaállítási jelmondat megadása",
     "Enter recovery key": "Visszaállítási kulcs megadása",
     "Confirm your identity by entering your account password below.": "A fiók jelszó megadásával erősítsd meg a személyazonosságodat.",
-    "Message not sent due to unknown sessions being present": "Ismeretlen munkamenet miatt az üzenet nem került elküldésre",
-    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Munkamenetek megmutatása</showSessionsText>, <sendAnywayText>küldés mindenképpen</sendAnywayText> vagy <cancelText>küldés megszakítása</cancelText>.",
     "Your new session is now verified. Other users will see it as trusted.": "Az új munkameneted ellenőrizve. Mások megbízhatónak fogják látni.",
     "Without completing security on this session, it won’t have access to encrypted messages.": "Amíg a biztonság nincs beállítva a munkameneten nem fér hozzá a titkosított üzenetekhez.",
     "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.": "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.",
     "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.",
-    "Sender session information": "Küldő munkamenet információ",
     "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.",
-    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Állítsd be a titkosítást ezen a munkameneten, 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.",
-    "Back up my encryption keys, securing them with the same passphrase": "Mentsd el a titkosítási kulcsaimat és védd őket ugyanazzal a jelmondattal",
     "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",
-    "You can now verify your other devices, and other users to keep your chats safe.": "Már ellenőrizheted a többi eszközödet és más felhasználókat, hogy a beszélgetéseidet biztonságban tudhasd.",
     "Make a copy of your recovery key": "Készíts másolatot a visszaállítási kulcsodról",
-    "You're done!": "Kész!",
     "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.",
     "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:",
-    "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s / %(totalRooms)s",
     "Message downloading sleep time(ms)": "Üzenet letöltés alvási idő (ms)",
     "If you cancel now, you won't complete verifying the other user.": "A másik felhasználó ellenőrzését nem fejezed be, ha ezt most megszakítod.",
     "If you cancel now, you won't complete verifying your other session.": "A másik munkameneted ellenőrzését nem fejezed be, ha ezt most megszakítod.",
-    "If you cancel now, you won't complete your secret storage operation.": "A Biztonsági tárolóval kapcsolatos műveletet nem fejezed be ha ezt most megszakítod.",
     "Show typing notifications": "Gépelés visszajelzés megjelenítése",
     "Verify this session by completing one of the following:": "Ellenőrizd ezt a munkamenetet az alábbiak egyikével:",
     "Scan this unique code": "Ennek az egyedi kódnak a beolvasása",
@@ -2139,22 +1935,17 @@
     "Not Trusted": "Megbízhatatlan",
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) új munkamenetbe lépett be anélkül, hogy ellenőrizte volna:",
     "Ask this user to verify their session, or manually verify it below.": "Kérd meg a felhasználót, hogy hitelesítse a munkamenetét vagy ellenőrizd kézzel alább.",
-    "Manually Verify": "Manuális ellenőrzés",
     "Verify by scanning": "Ellenőrzés kód beolvasással",
-    "Destroy cross-signing keys?": "Eszközök közti hitelesítési kulcsok megsemmisítése?",
+    "Destroy cross-signing keys?": "Megsemmisíted az eszközök közti hitelesítés kulcsait?",
     "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ó visszaállítása",
-    "The version of Riot": "Riot verziója",
-    "Whether you're using Riot on a device where touch is the primary input mechanism": "Olyan eszközön használod-e a Riotot, ahol az érintés az elsődleges beviteli mód",
-    "Whether you're using Riot as an installed Progressive Web App": "A Riotot progresszív webalkalmazásként használod-e",
+    "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",
     "Your user agent": "Felhasználói ügynök",
-    "The information being sent to us to help make Riot better includes:": "Az alábbi információk kerülnek elküldésre amivel a Riotot jobbá tudjuk tenni:",
-    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot 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 Riot támogat. Próbáld meg egy másik klienssel.",
+    "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",
-    "accepting …": "elfogadás …",
-    "declining …": "elutasítás …",
     "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:",
@@ -2170,15 +1961,14 @@
     "We recommend you change your password and recovery key in Settings immediately": "Javasoljuk, hogy a jelszavadat és a visszaállítási kulcsodat mihamarabb változtasd meg a Beállításokban",
     "Order rooms by name": "Szobák rendezése név szerint",
     "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": "Billentyűkombináció megjelenítése a nemrég meglátogatott szobákhoz a szoba lista felett",
-    "Sign In or Create Account": "Belépés vagy Fiók Készítés",
-    "Use your account or create a new one to continue.": "A folytatáshoz használd a fiókodat vagy készíts egy újat.",
+    "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.",
     "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>.",
     "Mark all as read": "Mindent olvasottnak jelöl",
     "Not currently indexing messages for any room.": "Jelenleg egyik szoba indexelése sem történik.",
-    "Currently indexing: %(currentRoom)s.": "Indexelés alatt jelenleg: %(currentRoom)s.",
     "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s / %(totalRooms)s",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s a szoba nevét megváltoztatta erről: %(oldRoomName)s erre: %(newRoomName)s.",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s egy alternatív nevet (%(addresses)s) adott hozzá a szobához.",
@@ -2189,27 +1979,18 @@
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s ennek a szobának megváltoztatta az elsődleges és az alternatív címét.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s megváltoztatta ennek a szobának a címét.",
     "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "A szoba címének megváltoztatásakor hiba történt. Lehet, hogy a szerver nem engedélyezi vagy átmeneti hiba történt.",
-    "Alternative addresses for this room:": "A szoba alternatív címei:",
-    "This room has no alternative addresses": "A szobának nincsen alternatív címe",
-    "New address (e.g. #foo:domain)": "Új cím (pl.: #foo:domain)",
-    "Local addresses (unmoderated content)": "Helyi cím (nem moderált tartalom)",
-    "You don't have permission to delete the alias.": "Ezt az alternatív nevet nincs jogod törölni.",
     "Support adding custom themes": "Egyedi téma támogatás hozzáadása",
     "Invalid theme schema.": "Téma séma érvénytelen.",
     "Error downloading theme information.": "A téma információk letöltése sikertelen.",
     "Theme added!": "Téma hozzáadva!",
     "Custom theme URL": "Egyedi téma URL",
     "Add theme": "Téma hozzáadása",
-    "Review Sessions": "Munkamenetek átnézése",
     "Manually Verify by Text": "Manuális szöveges ellenőrzés",
     "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ó",
     "User signing private key:": "Titkos felhasználó aláíró kulcs:",
-    "Secret Storage key format:": "Biztonsági tároló kulcs formátum:",
-    "outdated": "lejárt",
-    "up to date": "friss",
     "Keyboard Shortcuts": "Billentyűzet kombinációk",
     "Scroll to most recent messages": "A legfrissebb üzenethez görget",
     "Local address": "Helyi cím",
@@ -2227,10 +2008,8 @@
     "Remove server": "Szerver törlése",
     "Matrix": "Matrix",
     "Add a new server": "Új szerver hozzáadása",
-    "Unverified login. Was this you?": "Ellenőrizetlen bejelentkezés. Te voltál?",
     "Manually verify all remote sessions": "Az összes távoli munkamenet manuális ellenőrzése",
-    "Update your secure storage": "A biztonsági tárolód frissítése",
-    "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 kereszt-aláírással hitelesített eszközökben nem bízol meg.",
+    "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.",
@@ -2249,18 +2028,14 @@
     "a new cross-signing key signature": "az új eszközök közötti kulcs aláírása",
     "a device cross-signing signature": "az eszköz eszközök közötti aláírása",
     "a key signature": "kulcs aláírás",
-    "Riot encountered an error during upload of:": "Riot hibába ütközött a feltöltés közben:",
+    "%(brand)s encountered an error during upload of:": "%(brand)s hibába ütközött a feltöltés közben:",
     "Upload completed": "A feltöltés befejeződött",
     "Cancelled signature upload": "Az aláírás feltöltése megszakítva",
-    "Unabled to upload": "A feltöltés nem lehetséges",
     "Signature upload success": "Az aláírások feltöltése sikeres",
     "Signature upload failed": "Az aláírások feltöltése sikertelen",
     "Confirm by comparing the following with the User Settings in your other session:": "Erősítsd meg a felhasználói beállítások összehasonlításával a többi munkamenetedben:",
     "Confirm this user's session by comparing the following with their User Settings:": "Ezt a munkamenetet hitelesítsd az ő felhasználói beállításának az összehasonlításával:",
     "If they don't match, the security of your communication may be compromised.": "Ha nem egyeznek akkor a kommunikációtok biztonsága veszélyben lehet.",
-    "Open an existing session & use it to verify this one, granting it access to encrypted messages.": "Nyiss meg egy meglévő munkamenetet és használd ennek az ellenőrzéséhez, hogy a titkosított üzenetekhez hozzáférhessen.",
-    "Waiting…": "Várakozik…",
-    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "Ha nem érsz el egyet sem, <button>használd a visszaállítási kulcsodat vagy jelmondatot.</button>",
     "Navigation": "Navigálás",
     "Calls": "Hívások",
     "Room List": "Szoba lista",
@@ -2270,15 +2045,15 @@
     "Shift": "Shift",
     "Super": "Super",
     "Ctrl": "Ctrl",
-    "Toggle Bold": "Félkövér váltása",
-    "Toggle Italics": "Dőlt váltása",
-    "Toggle Quote": "Idézet váltása",
+    "Toggle Bold": "Félkövér be/ki",
+    "Toggle Italics": "Dőlt be/ki",
+    "Toggle Quote": "Idézet be/ki",
     "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",
-    "Toggle microphone mute": "Mikrofon némítás váltása",
-    "Toggle video on/off": "Videó ki-/bekapcsolás váltása",
+    "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",
     "Navigate up/down in the room list": "A szoba listában fel/le navigál",
     "Select room from the room list": "Szoba kiválasztása a szoba listából",
@@ -2288,11 +2063,11 @@
     "Scroll up/down in the timeline": "Az idővonalon görgetés fel/le",
     "Previous/next unread room or DM": "Előző/következő olvasatlan szoba vagy közvetlen üzenet",
     "Previous/next room or DM": "Előző/következő szoba vagy közvetlen üzenet",
-    "Toggle the top left menu": "Bal felső menü ki-/bekapcsolása",
+    "Toggle the top left menu": "Bal felső menü be/ki",
     "Close dialog or context menu": "Párbeszédablak vagy menü bezárása",
     "Activate selected button": "Kiválasztott gomb aktiválása",
-    "Toggle right panel": "Jobb oldali panel váltása",
-    "Toggle this dialog": "Ennek a párbeszédablaknak a váltása",
+    "Toggle right panel": "Jobb oldali panel be/ki",
+    "Toggle this dialog": "E párbeszédablak be/ki",
     "Move autocomplete selection up/down": "Automatikus kiegészítés kijelölésének mozgatása fel/le",
     "Cancel autocomplete": "Automatikus kiegészítés megszakítása",
     "Page Up": "Page Up",
@@ -2304,8 +2079,8 @@
     "Session backup key:": "Munkamenet másolat kulcs:",
     "Use Single Sign On to continue": "A folytatáshoz használd az egyszeri bejelentkezést (SSO)",
     "Single Sign On": "Egyszeri bejelentkezés",
-    "%(name)s is requesting verification": "%(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ás lenne",
+    "%(name)s is requesting verification": "A(z) %(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:",
     "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)…",
@@ -2348,11 +2123,9 @@
     "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.",
     "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 nem sikerült",
-    "Command failed": "A parancs nem sikerült",
+    "Failed to set topic": "A téma beállítása sikertelen",
+    "Command failed": "A parancs sikertelen",
     "Could not find user in room": "A felhasználó nem található a szobában",
-    "Enable cross-signing to verify per-user instead of per-session": "A felhasználó alapú ellenőrzéshez a munkamenet alapú helyett engedélyezd az eszközök közötti hitelesítést",
-    "Keep recovery passphrase in memory for this session": "A visszaállítási jelmondat memóriában tartása ebben a munkamenetben",
     "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Erősítsd meg az egyszeri bejelentkezéssel, hogy ezeket a munkameneteteket törlöd.",
     "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Erősítsd meg egyszeri bejelentkezéssel, hogy ezt a munkamenetet törlöd.",
     "Can't load this message": "Ezt az üzenetet nem sikerült betölteni",
@@ -2363,27 +2136,17 @@
     "Unable to upload": "Nem lehet feltölteni",
     "Verify other session": "Más munkamenetek ellenőrzése",
     "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "A biztonsági tárolóhoz nem lehet hozzáférni. Kérlek ellenőrizd, hogy jó visszaállítási jelmondatot adtál-e meg.",
-    "<b>Warning</b>: You should only do this on a trusted computer.": "<b>Figyelmeztetés</b>: Ezt csak megbízható számítógépen tedd meg.",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "A visszaállítási jelmondat megadásával hozzáférhetsz a titkosított üzeneteidhez és az eszközök közötti aláírásnál használt személyazonosságodhoz hogy más munkameneteket ellenőrizhess.",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Ha elfelejtetted a visszaállítási jelmondatodat, akkor <button1>használhatod a visszaállítási kulcsot</button1> vagy <button2>új visszaállítási lehetőséget állíthatsz be</button2>.",
     "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Ezzel a visszaállítási kulccsal a mentést nem lehet visszafejteni: kérlek ellenőrizd, hogy a visszaállítási kulcsot jól adtad-e meg.",
     "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",
-    "Use an existing session to verify this one, granting it access to encrypted messages.": "A titkosított üzenetekhez való hozzáféréshez nyiss meg egy létező munkamenetet és használd ennek a hitelesítésére.",
-    "If you can’t access one, <button>use your recovery key or recovery passphrase.</button>": "Ha nem érsz el egyet sem, <button>használd a visszaállítási kulcsot vagy visszaállítási jelmondatot.</button>",
-    "Use your other device to continue…": "A folytatáshoz használd a más eszközödet…",
     "Great! This recovery passphrase looks strong enough.": "Nagyszerű! Ez a visszaállítási jelmondat elég erősnek tűnik.",
-    "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:": "Helyezd biztonságba a titkosított információkat, hogy kijelentkezés után is vissza tudd állítani, a visszaállítási jelmondat beállításával. Ez legyen a fiók jelszótól különböző:",
     "Enter a recovery passphrase": "Visszaállítási jelmondat megadása",
-    "Back up encrypted message keys": "Titkosított üzenetek kulcsainak mentése",
     "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.",
     "Confirm your recovery passphrase": "Visszaállítási jelmondat megerősítése",
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "A visszaállítási kulcs egy biztonsági háló - arra az esetre ha elfelejted a visszaállítási jelmondatot a titkosított üzenetekhez való hozzáférést vissza tudd állítani.",
-    "Confirm recovery passphrase": "Visszaállítási jelmondat megerősítése",
     "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "A kulcsaidat titkosított formában tároljuk a szerverünkön. Helyezd biztonságba a mentéseded a visszaállítási jelmondattal.",
-    "Enter a recovery passphrase...": "Visszaállítási jelmondat megadása…",
     "Please enter your recovery passphrase a second time to confirm.": "A megerősítéshez kérlek add meg a visszaállítási jelmondatot még egyszer.",
     "Repeat your recovery passphrase...": "Ismételd meg a visszaállítási jelmondatot…",
     "Secure your backup with a recovery passphrase": "Védd a mentést a visszaállítási jelmondattal",
@@ -2392,8 +2155,254 @@
     "Please supply a widget URL or embed code": "Add meg a kisalkalmazás URL-jét vagy a beágyazott kódot",
     "Verify this login": "Belépés ellenőrzése",
     "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Erősítsd meg ebben a bejelentkezésben a személyazonosságodat egy másik munkamenetből, hogy hozzáférhess a titkosított üzenetekhez.",
-    "This requires the latest Riot on your other devices:": "A Riot legújabb kliensére van ehhez szükséged a többi eszközödön:",
+    "This requires the latest %(brand)s on your other devices:": "A %(brand)s legújabb kliensére van ehhez szükséged a többi eszközödön:",
     "or another cross-signing capable Matrix client": "vagy másik eszközök közötti hitelesítésre alkalmas Matrix kliensre",
-    "Use Recovery Passphrase or Key": "Használd a Visszaállítási Jelmondatot vagy Kulcsot",
-    "Unable to query secret storage status": "A biztonsági tároló állapotát nem lehet lekérdezni"
+    "Unable to query secret storage status": "A biztonsági tároló állapotát nem lehet lekérdezni",
+    "Review where you’re logged in": "Tekintsd át hol vagy bejelentkezve",
+    "New login. Was this you?": "Új bejelentkezés. Te voltál?",
+    "Verify all your sessions to ensure your account & messages are safe": "Ellenőrizd minden munkamenetedet, hogy a fiókod és az üzeneteid biztonságban legyenek",
+    "Verify the new login accessing your account: %(name)s": "Ellenőrizd ezt az új bejelentkezést ami hozzáfér a fiókodhoz: %(name)s",
+    "Where you’re logged in": "Ahol be vagy jelentkezve",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Állítsd be a munkameneteid neveit, jelentkezz ki belőlük, vagy <a>ellenőrizd őket a Felhasználói Beállításokban</a>.",
+    "Restoring keys from backup": "Kulcsok visszaállítása mentésből",
+    "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",
+    "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>.",
+    "Opens chat with the given user": "Beszélgetés megnyitása a megadott felhasználóval",
+    "Sends a message to the given user": "Üzenet küldése a megadott felhasználónak",
+    "Waiting for your other session to verify…": "A másik munkameneted ellenőrzésére várunk…",
+    "You've successfully verified your device!": "Sikeresen ellenőrizted az eszközödet!",
+    "Message deleted": "Üzenet törölve",
+    "Message deleted by %(name)s": "%(name)s törölte 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.",
+    "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.",
+    "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",
+    "Jump to oldest unread message": "A legrégebbi olvasatlan üzenetre ugrás",
+    "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:",
+    "Font scaling": "Betű nagyítás",
+    "Font size": "Betűméret",
+    "IRC display name width": "IRC megjelenítési név szélessége",
+    "Size must be a number": "A méretnek számnak kell lennie",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "Az egyedi betűméret csak %(min)s pont és %(max)s pont között lehet",
+    "Use between %(min)s pt and %(max)s pt": "Csak %(min)s pont és %(max)s pont közötti értéket használj",
+    "Appearance": "Megjelenítés",
+    "Help us improve %(brand)s": "Segíts nekünk jobbá tenni a %(brand)sot",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "<UsageDataLink>Anonim használati adatok</UsageDataLink> küldésével segíthetsz nekünk a %(brand)s fejlesztésében. Ehhez <PolicyLink>sütiket</PolicyLink> használ.",
+    "I want to help": "Segíteni akarok",
+    "Your homeserver has exceeded its user limit.": "A Matrix szervered túllépte a felhasználói szám korlátot.",
+    "Your homeserver has exceeded one of its resource limits.": "A Matrix szervered túllépte valamelyik erőforrás korlátját.",
+    "Contact your <a>server admin</a>.": "Vedd fel a kapcsolatot a <a>szerver gazdájával</a>.",
+    "Ok": "Rendben",
+    "Set password": "Jelszó beállítása",
+    "To return to your account in future you need to set a password": "Ahhoz, hogy a jövőben vissza tudj térni a fiókodba, jelszót kell beállítanod",
+    "Restart": "Újraindít",
+    "Upgrade your %(brand)s": "%(brand)s frissítése",
+    "A new version of %(brand)s is available!": "Új verzió érhető el a %(brand)sból!",
+    "New version available. <a>Update now.</a>": "Új verzió érhető el.<a>Frissíts most.</a>",
+    "Please verify the room ID or address and try again.": "Kérlek ellenőrizd a szoba azonosítót vagy címet és próbáld újra.",
+    "Room ID or address of ban list": "Tiltó lista szoba azonosító vagy cím",
+    "To link to this room, please add an address.": "Hogy linkelhess egy szobához, adj hozzá egy címet.",
+    "Create room": "Szoba létrehozása",
+    "Error creating address": "Cím beállítási hiba",
+    "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "A cím beállításánál hiba történt. Vagy nincs engedélyezve a szerveren vagy átmeneti hiba történt.",
+    "You don't have permission to delete the address.": "A cím törléséhez nincs jogosultságod.",
+    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "A cím törlésénél hiba történt. Vagy már nem létezik vagy átmeneti hiba történt.",
+    "Error removing address": "Cím törlésénél hiba történt",
+    "Categories": "Kategóriák",
+    "Room address": "Szoba címe",
+    "Please provide a room address": "Kérlek add meg a szoba címét",
+    "This address is available to use": "Ez a cím használható",
+    "This address is already in use": "Ez a cím már használatban van",
+    "Set a room address to easily share your room with other people.": "A szoba egyszerű megosztásához másokkal állíts be egy címet.",
+    "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.": "Ezt a munkamenetet előzőleg egy újabb %(brand)s verzióval használtad. Ahhoz, hogy újra ezt a verziót tudd használni végpontok közötti titkosítással, ki kell lépned majd újra vissza.",
+    "Address (optional)": "Cím (nem kötelező)",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "Törlöd a szoba címét: %(alias)s és eltávolítod a könyvtárból ezt: %(name)s?",
+    "delete the address.": "cím törlése.",
+    "Use a different passphrase?": "Másik jelmondat használata?",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "A szerver adminisztrátorod alapesetben kikapcsolta a végpontok közötti titkosítást a közvetlen beszélgetésekben.",
+    "Emoji picker": "Emodzsi választó",
+    "No recently visited rooms": "Nincsenek nemrégiben meglátogatott szobák",
+    "People": "Emberek",
+    "Sort by": "Rendezve:",
+    "Unread rooms": "Olvasatlan szobák",
+    "Always show first": "Mindig az elsőt mutatja",
+    "Show": "Mutat",
+    "Message preview": "Üzenet előnézet",
+    "List options": "Lista beállítások",
+    "Show %(count)s more|other": "Még %(count)s megjelenítése",
+    "Show %(count)s more|one": "Még %(count)s megjelenítése",
+    "Leave Room": "Szoba elhagyása",
+    "Room options": "Szoba beállítások",
+    "Switch to light mode": "Világos módra váltás",
+    "Switch to dark mode": "Sötét módra váltás",
+    "Switch theme": "Kinézet váltása",
+    "Security & privacy": "Biztonság és adatvédelem",
+    "All settings": "Minden beállítás",
+    "Feedback": "Visszajelzés",
+    "Light": "Világos",
+    "Dark": "Sötét",
+    "Customise your appearance": "Szabd személyre a megjelenítést",
+    "Activity": "Aktivitás",
+    "A-Z": "A-Z",
+    "Looks good!": "Jól néz ki!",
+    "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 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!",
+    "Message layout": "Üzenet kinézete",
+    "Compact": "Egyszerű",
+    "Modern": "Modern",
+    "The authenticity of this encrypted message can't be guaranteed on this device.": "A titkosított üzenetek valódiságát ezen az eszközön nem lehet garantálni.",
+    "You joined the call": "Csatlakoztál a hívásba",
+    "%(senderName)s joined the call": "%(senderName)s csatlakozott a híváshoz",
+    "Call in progress": "Hívás folyamatban van",
+    "You left the call": "Kiléptél a hívásból",
+    "%(senderName)s left the call": "%(senderName)s kilépett a hívásból",
+    "Call ended": "Hívás befejeződött",
+    "You started a call": "Hívást kezdeményeztél",
+    "%(senderName)s started a call": "%(senderName)s hívást kezdeményezett",
+    "Waiting for answer": "Válaszra várakozás",
+    "%(senderName)s is calling": "%(senderName)s hív",
+    "You created the room": "Létrehoztál egy szobát",
+    "%(senderName)s created the room": "%(senderName)s létrehozott egy szobát",
+    "You made the chat encrypted": "A beszélgetést titkosítottá tetted",
+    "%(senderName)s made the chat encrypted": "%(senderName)s titkosítottá tette a beszélgetést",
+    "You made history visible to new members": "A régi beszélgetéseket láthatóvá tetted az új tagok számára",
+    "%(senderName)s made history visible to new members": "%(senderName)s a régi beszélgetéseket láthatóvá tette az új tagok számára",
+    "You made history visible to anyone": "A régi beszélgetéseket láthatóvá tette mindenki számára",
+    "%(senderName)s made history visible to anyone": "%(senderName)s a régi beszélgetéseket láthatóvá tette mindenki számára",
+    "You made history visible to future members": "A régi beszélgetéseket láthatóvá tetted a leendő tagok számára",
+    "%(senderName)s made history visible to future members": "%(senderName)s a régi beszélgetéseket láthatóvá tette a leendő tagok számára",
+    "You were invited": "Meghívtak",
+    "%(targetName)s was invited": "Meghívták őt: %(targetName)s",
+    "You left": "Távoztál",
+    "%(targetName)s left": "%(targetName)s távozott",
+    "You were kicked (%(reason)s)": "Kirúgtak (%(reason)s)",
+    "%(targetName)s was kicked (%(reason)s)": "Kirúgták őt: %(targetName)s (%(reason)s)",
+    "You were kicked": "Kirúgtak",
+    "%(targetName)s was kicked": "Kirúgták őt: %(targetName)s",
+    "You rejected the invite": "A meghívót elutasítottad",
+    "%(targetName)s rejected the invite": "%(targetName)s elutasította a meghívót",
+    "You were uninvited": "A meghívódat visszavonták",
+    "%(targetName)s was uninvited": "A meghívóját visszavonták neki: %(targetName)s",
+    "You were banned (%(reason)s)": "Kitiltottak (%(reason)s)",
+    "%(targetName)s was banned (%(reason)s)": "Kitiltották őt: %(targetName)s (%(reason)s)",
+    "You were banned": "Kitiltottak",
+    "%(targetName)s was banned": "Kitiltották őt: %(targetName)s",
+    "You joined": "Beléptél",
+    "%(targetName)s joined": "%(targetName)s belépett",
+    "You changed your name": "A neved megváltoztattad",
+    "%(targetName)s changed their name": "%(targetName)s megváltoztatta a nevét",
+    "You changed your avatar": "A profilképedet megváltoztattad",
+    "%(targetName)s changed their avatar": "%(targetName)s megváltoztatta a profilképét",
+    "%(senderName)s %(emote)s": "%(senderName)s %(emote)s",
+    "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
+    "You changed the room name": "A szoba nevét megváltoztattad",
+    "%(senderName)s changed the room name": "%(senderName)s megváltoztatta a szoba nevét",
+    "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
+    "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
+    "You uninvited %(targetName)s": "A meghívóját visszavontad neki: %(targetName)s",
+    "%(senderName)s uninvited %(targetName)s": "%(senderName)s visszavonta a meghívóját neki: %(targetName)s",
+    "You invited %(targetName)s": "Meghívtad őt: %(targetName)s",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s meghívta őt: %(targetName)s",
+    "You changed the room topic": "A szoba témáját megváltoztattad",
+    "%(senderName)s changed the room topic": "%(senderName)s megváltoztatta a szoba témáját",
+    "New spinner design": "Új várakozási animáció",
+    "Use a more compact ‘Modern’ layout": "Egyszerűbb 'Modern' kinézet használata",
+    "Message deleted on %(date)s": "Az üzenetet ekkor törölték: %(date)s",
+    "Wrong file type": "A fájl típus hibás",
+    "Wrong Recovery Key": "A Visszaállítási Kulcs hibás",
+    "Invalid Recovery Key": "A Visszaállítási Kulcs hibás",
+    "Security Phrase": "Biztonsági jelmondat",
+    "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Add meg a Biztonsági jelmondatot vagy <button>Használd a Biztonsági Kulcsot</button> a folytatáshoz.",
+    "Security Key": "Biztonsági Kulcs",
+    "Use your Security Key to continue.": "Használd a Biztonsági Kulcsot a folytatáshoz.",
+    "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "A titkosított üzenetekhez és adatokhoz való hozzáférés elvesztése esetén használható biztonsági tartalék a titkosított kulcsok a szerveredre való elmentésével.",
+    "Generate a Security Key": "Biztonsági Kulcs elkészítése",
+    "We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "A Biztonsági Kulcsodat elkészítjük neked amit tárolj valamilyen biztonságos helyen mint pl. a jelszókezelő vagy széf.",
+    "Enter a Security Phrase": "Biztonsági Jelmondat megadása",
+    "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Olyan biztonsági jelmondatot használj amit csak te ismersz és esetleg mentsd el a Biztonsági Kulcsot vésztartaléknak.",
+    "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.": "Olyan biztonsági jelmondatot adj meg amit csak te ismersz, mert ez fogja az adataidat őrizni. Hogy biztonságos legyen ne használd a fiókod jelszavát.",
+    "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "A Biztonsági Kulcsot tárold biztonságos helyen, mint pl. a jelszókezelő vagy széf, mivel ez tartja biztonságban a titkosított adataidat.",
+    "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Ha most megszakítod, akkor a munkameneteidhez való hozzáférés elvesztésével elveszítheted a titkosított üzeneteidet és adataidat.",
+    "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",
+    "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",
+    "Riot is now Element!": "Riot mostantól Element!",
+    "Learn More": "Tudj meg többet",
+    "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 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.",
+    "Make this room low priority": "Ez a szoba legyen alacsony prioritású",
+    "Use default": "Alapértelmezett használata",
+    "Mentions & Keywords": "Megemlítések és kulcsszavak",
+    "Notification options": "Értesítési beállítások",
+    "Favourited": "Kedvencek",
+    "Forget Room": "Szoba elfelejtése",
+    "Use your account to sign in to the latest version of the app at <a />": "Az alkalmazás legutolsó verzióba való bejelentkezéshez itt <a /> használd a fiókodat",
+    "Go to Element": "Irány az Element",
+    "We’re excited to announce Riot is now Element!": "Izgatottan jelentjük, hogy a Riot mostantól Element!",
+    "Learn more at <a>element.io/previously-riot</a>": "Tudj meg többet: <a>element.io/previously-riot</a>",
+    "Search rooms": "Szobák keresése",
+    "User menu": "Felhasználói menü",
+    "%(brand)s Web": "%(brand)s Web",
+    "%(brand)s Desktop": "Asztali %(brand)s",
+    "%(brand)s iOS": "%(brand)s iOS",
+    "%(brand)s X for Android": "%(brand)s X Android",
+    "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.",
+    "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.",
+    "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",
+    "Show rooms with unread messages first": "Olvasatlan üzeneteket tartalmazó szobák megjelenítése elől",
+    "Show previews of messages": "Üzenet előnézet megjelenítése",
+    "Edited at %(date)s": "Szerkesztve ekkor: %(date)s",
+    "Click to view edits": "A szerkesztések megtekintéséhez kattints",
+    "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>.": "Már be vagy jelentkezve és ez rendben van, de minden platformon az alkalmazás legfrissebb verziójának beszerzéséhez látogass el ide: <a>element.io/get-started</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.": "Használhatod a más szerver opciót, hogy egy másik matrix szerverre jelentkezz be amihez megadod a szerver url címét. Ezzel használhatod %(brand)s klienst egy már létező Matrix fiókkal egy másik matrix szerveren.",
+    "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>.": "Add meg az Element Matrix Services matrix szerveredet. Használhatod a saját domain-edet vagy az <a>element.io</a> al-domain-jét.",
+    "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
+    "The person who invited you already left the room.": "Aki meghívott a szobába már távozott.",
+    "The person who invited you already left the room, or their server is offline.": "Aki meghívott a szobába már távozott, vagy a szervere elérhetetlen.",
+    "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",
+    "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.",
+    "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.",
+    "Your area is experiencing difficulties connecting to the internet.": "Probléma az Internet elérésben.",
+    "A connection error occurred while trying to contact the server.": "Kapcsolati hiba lépett fel miközben a szervert próbáltad elérni.",
+    "The server is not configured to indicate what the problem is (CORS).": "A szerver nincs beállítva, hogy megmutassa mi okozhatta a hibát (CORS).",
+    "Recent changes that have not yet been received": "Legutóbbi változások amik még nem érkeztek meg"
 }
diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json
index 38d2693500..2de350bae3 100644
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@@ -7,7 +7,6 @@
     "No media permissions": "Tidak ada izin media",
     "Microphone": "Mikrofon",
     "Camera": "Kamera",
-    "Alias (optional)": "Alias (pilihan)",
     "Are you sure?": "Anda yakin?",
     "An error has occurred.": "Telah terjadi kesalahan.",
     "Are you sure you want to reject the invitation?": "Anda yakin menolak undangannya?",
@@ -20,18 +19,13 @@
     "Create Room": "Buat Ruang",
     "Current password": "Password sekarang",
     "Deactivate Account": "Nonaktifkan Akun",
-    "Device ID": "ID Perangkat",
     "Email": "Email",
     "Email address": "Alamat email",
-    "Enable Notifications": "Aktifkan Notifikasi",
-    "Algorithm": "Algoritma",
     "Attachment": "Lampiran",
     "Command error": "Perintah gagal",
     "Decline": "Tolak",
     "Default": "Bawaan",
-    "Direct chats": "Obrolan langsung",
     "Download %(text)s": "Unduh %(text)s",
-    "Event information": "Informasi Event",
     "Export": "Ekspor",
     "Failed to join room": "Gagal gabung ruang",
     "Failed to leave room": "Gagal meninggalkan ruang",
@@ -51,7 +45,6 @@
     "Name": "Nama",
     "New passwords don't match": "Password baru tidak cocok",
     "<not supported>": "<tidak didukung>",
-    "NOT verified": "TIDAK terverifikasi",
     "No results": "Tidak ada hasil",
     "OK": "OK",
     "Operation failed": "Operasi gagal",
@@ -62,14 +55,13 @@
     "Public Chat": "Obrolan Publik",
     "Reason": "Alasan",
     "Register": "Registrasi",
-    "riot-web version:": "riot-web versi:",
+    "%(brand)s version:": "%(brand)s versi:",
     "Return to login screen": "Kembali ke halaman masuk",
     "Room Colour": "Warna Ruang",
     "Rooms": "Ruang",
     "Save": "Simpan",
     "Search": "Cari",
     "Search failed": "Pencarian gagal",
-    "Send anyway": "Kirim saja",
     "Send Reset Email": "Kirim Email Atur Ulang",
     "Server error": "Server bermasalah",
     "Session ID": "ID Sesi",
@@ -83,12 +75,7 @@
     "This room": "Ruang ini",
     "Unable to add email address": "Tidak dapat menambahkan alamat email",
     "Unable to verify email address.": "Tidak dapat memverifikasi alamat email.",
-    "unencrypted": "tidak terenkripsi",
     "unknown error code": "kode kesalahan tidak diketahui",
-    "unknown device": "perangkat tidak diketahui",
-    "User ID": "ID Pengguna",
-    "Verification": "Verifikasi",
-    "verified": "terverifikasi",
     "Verification Pending": "Verifikasi Tertunda",
     "Video call": "Panggilan Video",
     "Voice call": "Panggilan Suara",
@@ -122,7 +109,7 @@
     "Admin": "Admin",
     "Admin Tools": "Peralatan Admin",
     "No Webcams detected": "Tidak ada Webcam terdeteksi",
-    "You may need to manually permit Riot to access your microphone/webcam": "Anda mungkin perlu secara manual mengizinkan Riot untuk mengakses mikrofon/webcam",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "Anda mungkin perlu secara manual mengizinkan %(brand)s untuk mengakses mikrofon/webcam",
     "Default Device": "Perangkat Bawaan",
     "Advanced": "Tingkat Lanjut",
     "Always show message timestamps": "Selalu tampilkan cap waktu dari pesan",
@@ -133,7 +120,6 @@
     "%(senderName)s answered the call.": "%(senderName)s telah menjawab panggilan.",
     "Anyone who knows the room's link, including guests": "Siapa pun yang tahu tautan ruang, termasuk tamu",
     "Anyone who knows the room's link, apart from guests": "Siapa pun yang tahu tautan ruang, selain tamu",
-    "Blacklisted": "Didaftarhitamkan",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s telah memblokir %(targetName)s.",
     "Banned users": "Pengguna yang diblokir",
     "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.": "Tidak dapat terhubung ke server Home - harap cek koneksi anda, pastikan <a>sertifikat SSL server Home</a> Anda terpercaya, dan ekstensi dari browser tidak memblokir permintaan.",
@@ -145,15 +131,11 @@
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s telah mengubah nama ruang menjadi %(roomName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s telah mengubah topik menjadi \"%(topic)s\".",
     "click to reveal": "Klik untuk menampilkan",
-    "Could not connect to the integration server": "Tidak dapat terhubung ke server integrasi",
     "Cryptography": "Kriptografi",
     "Decrypt %(text)s": "Dekrip %(text)s",
-    "Decryption error": "Dekripsi gagal",
-    "device id: ": "id perangkat: ",
     "Ban": "Blokir",
     "Bans user with given id": "Blokir pengguna dengan id",
     "Fetching third party location failed": "Gagal mengambil lokasi pihak ketiga",
-    "A new version of Riot is available.": "Riot versi baru telah tersedia.",
     "All notifications are currently disabled for all targets.": "Semua notifikasi saat ini dinonaktifkan untuk semua target.",
     "Uploading report": "Unggah laporan",
     "Sunday": "Minggu",
@@ -172,8 +154,6 @@
     "Waiting for response from server": "Menunggu respon dari server",
     "Leave": "Tinggalkan",
     "Advanced notification settings": "Pengaturan notifikasi lanjutan",
-    "delete the alias.": "hapus alias.",
-    "To return to your account in future you need to <u>set a password</u>": "Untuk kembali ke akun di lain waktu, Anda perlu <u>mengisi password</u>",
     "Forget": "Lupakan",
     "World readable": "Terpublikasi Umum",
     "You cannot delete this image. (%(code)s)": "Anda tidak dapat menghapus gambar ini. (%(code)s)",
@@ -201,7 +181,6 @@
     "Resend": "Kirim Ulang",
     "Files": "Files",
     "Collecting app version information": "Mengumpukan informasi versi aplikasi",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Hapus alias ruang %(alias)s dan hapus %(name)s dari direktori?",
     "Enable notifications for this account": "Aktifkan notifikasi untuk akun ini",
     "Messages containing <span>keywords</span>": "Pesan mengandung <span>kata kunci</span>",
     "Room not found": "Ruang tidak ditemukan",
@@ -209,7 +188,7 @@
     "Enter keywords separated by a comma:": "Masukkan kata kunci dipisahkan oleh koma:",
     "Search…": "Cari…",
     "Remove %(name)s from the directory?": "Hapus %(name)s dari direktori?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot menggunakan banyak fitur terdepan dari browser, dimana tidak tersedia atau dalam fase eksperimen di browser Anda.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s menggunakan banyak fitur terdepan dari browser, dimana tidak tersedia atau dalam fase eksperimen di browser Anda.",
     "Unnamed room": "Ruang tanpa nama",
     "Friday": "Jumat",
     "Remember, you can always set an email address in user settings if you change your mind.": "Ingat, Anda selalu dapat mengubah alamat email di pengaturan pengguna jika anda berubah pikiran.",
@@ -251,8 +230,7 @@
     "Show message in desktop notification": "Tampilkan pesan pada desktop",
     "Unhide Preview": "Tampilkan Pratinjau",
     "Unable to join network": "Tidak dapat bergabung di jaringan",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Anda mungkin sudah konfigurasi di klien selain Riot. Anda tidak dapat setel di Riot tetap berlaku",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Maaf, browser Anda <b>tidak</b> dapat menjalankan Riot.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Maaf, browser Anda <b>tidak</b> dapat menjalankan %(brand)s.",
     "Uploaded on %(date)s by %(user)s": "Diunggah pada %(date)s oleh %(user)s",
     "Messages in group chats": "Pesan di obrolan grup",
     "Yesterday": "Kemarin",
@@ -262,7 +240,7 @@
     "Unable to fetch notification target list": "Tidak dapat mengambil daftar notifikasi target",
     "Set Password": "Ubah Password",
     "Off": "Mati",
-    "Riot does not know how to join a room on this network": "Riot tidak tau bagaimana gabung ruang di jaringan ini",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s tidak tau bagaimana gabung ruang di jaringan ini",
     "Mentions only": "Hanya jika disinggung",
     "Failed to remove tag %(tagName)s from room": "Gagal menghapus tag %(tagName)s dari ruang",
     "Remove": "Hapus",
@@ -277,28 +255,20 @@
     "Thank you!": "Terima kasih!",
     "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!": "Dengan browser ini, tampilan dari aplikasi mungkin tidak sesuai, dan beberapa atau bahkan semua fitur mungkin tidak berjalan. Jika Anda ingin tetap mencobanya, Anda bisa melanjutkan, tapi Anda tanggung sendiri jika muncul masalah yang terjadi!",
     "Checking for an update...": "Cek pembaruan...",
-    "There are advanced notifications which are not shown here": "Ada notifikasi lanjutan yang tidak ditampilkan di sini",
     "This email address is already in use": "Alamat email ini telah terpakai",
     "This phone number is already in use": "Nomor telepon ini telah terpakai",
     "Failed to verify email address: make sure you clicked the link in the email": "Gagal memverifikasi alamat email: pastikan Anda telah menekan link di dalam email",
-    "The version of Riot.im": "Versi Riot.im",
+    "The version of %(brand)s": "Versi %(brand)s",
     "Your language of choice": "Pilihan bahasamu",
     "Your homeserver's URL": "URL Homeserver Anda",
-    "Your identity server's URL": "URL Server Identitas Anda",
     "e.g. %(exampleValue)s": "",
     "Every page you use in the app": "Setiap halaman yang digunakan di app",
     "e.g. <CurrentPageURL>": "e.g. <URLHalamanSaatIni>",
-    "Your User Agent": "User Agent Anda",
     "Your device resolution": "Resolusi perangkat Anda",
     "Analytics": "Analitik",
-    "The information being sent to us to help make Riot.im better includes:": "Informasi yang dikirim membantu kami memperbaiki Riot.im, termasuk:",
+    "The information being sent to us to help make %(brand)s better includes:": "Informasi yang dikirim membantu kami memperbaiki %(brand)s, termasuk:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Apabila terdapat informasi yang dapat digunakan untuk pengenalan pada halaman ini, seperti ruang, pengguna, atau ID grup, kami akan menghapusnya sebelum dikirim ke server.",
     "Call Failed": "Panggilan Gagal",
-    "Review Devices": "Telaah Perangkat",
-    "Call Anyway": "Tetap Panggil",
-    "Answer Anyway": "Tetap Jawab",
-    "Call": "Panggilan",
-    "Answer": "Jawab",
     "Call Timeout": "Masa Berakhir Panggilan",
     "The remote side failed to pick up": "Gagal jawab oleh pihak lain",
     "Unable to capture screen": "Tidak dapat menangkap tampilan",
diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
index 2e13f4b231..6f561331f6 100644
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -4,13 +4,8 @@
     "Failed to verify email address: make sure you clicked the link in the email": "Gat ekki sannprófað tölvupóstfang: gakktu úr skugga um að þú hafir smellt á tengilinn í tölvupóstinum",
     "e.g. %(exampleValue)s": "t.d. %(exampleValue)s",
     "e.g. <CurrentPageURL>": "t.d. <CurrentPageURL>",
-    "Your User Agent": "Kennisstrengur þinn",
     "Your device resolution": "Skjáupplausn tækisins þíns",
     "Analytics": "Greiningar",
-    "Call Anyway": "hringja samt",
-    "Answer Anyway": "Svara samt",
-    "Call": "Samtal",
-    "Answer": "Svara",
     "The remote side failed to pick up": "Ekki var svarað á fjartengda endanum",
     "VoIP is unsupported": "Enginn stuðningur við VoIP",
     "Warning!": "Aðvörun!",
@@ -40,12 +35,10 @@
     "%(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",
-    "Room name or alias": "Nafn eða samnefni spjallrásar",
     "Default": "Sjálfgefið",
     "Restricted": "Takmarkað",
     "Moderator": "Umsjónarmaður",
     "Admin": "Stjórnandi",
-    "Start a chat": "Hefja spjall",
     "Operation failed": "Aðgerð tókst ekki",
     "You need to be logged in.": "Þú þarft að vera skráð/ur inn.",
     "Unable to create widget.": "Gat ekki búið til viðmótshluta.",
@@ -63,7 +56,6 @@
     "Someone": "Einhver",
     "(not supported by this browser)": "(Ekki stutt af þessum vafra)",
     "(no answer)": "(ekkert svar)",
-    "Send anyway": "Senda samt",
     "Send": "Senda",
     "Unnamed Room": "Nafnlaus spjallrás",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Birta tímamerki á 12 stunda sniði (t.d. 2:30 fh)",
@@ -98,9 +90,7 @@
     "Confirm password": "Staðfestu lykilorðið",
     "Change Password": "Breyta lykilorði",
     "Authentication": "Auðkenning",
-    "Device ID": "Auðkenni tækis",
     "Last seen": "Sást síðast",
-    "Enable Notifications": "Virkja tilkynningar",
     "Error saving email notification preferences": "Villa við að vista valkosti pósttilkynninga",
     "An error occurred whilst saving your email notification preferences.": "Villa kom upp við að vista valkosti tilkynninga í tölvupósti.",
     "Keywords": "Stikkorð",
@@ -128,8 +118,6 @@
     "%(senderName)s sent a video": "%(senderName)s sendi myndskeið",
     "%(senderName)s uploaded a file": "%(senderName)s sendi inn skrá",
     "Options": "Valkostir",
-    "Blacklisted": "Á bannlista",
-    "device id: ": "Auðkenni tækis: ",
     "Kick": "Sparka",
     "Unban": "Afbanna",
     "Ban": "Banna",
@@ -140,11 +128,8 @@
     "Ignore": "Hunsa",
     "Mention": "Minnst á",
     "Invite": "Bjóða",
-    "User Options": "User Options",
-    "Direct chats": "Beint spjall",
     "Unmute": "Kveikja á hljóði",
     "Mute": "Þagga hljóð",
-    "Make Moderator": "Gera að umsjónarmanni",
     "Admin Tools": "Kerfisstjóratól",
     "Invited": "Boðið",
     "Filter room members": "Sía meðlimi spjallrásar",
@@ -154,7 +139,6 @@
     "Video call": "_Myndsímtal",
     "Upload file": "Hlaða inn skrá",
     "Send an encrypted message…": "Senda dulrituð skilaboð…",
-    "Send a message (unencrypted)…": "Senda skilaboð (ódulrituð)…",
     "You do not have permission to post to this room": "Þú hefur ekki heimild til að senda skilaboð á þessa spjallrás",
     "Server error": "Villa á þjóni",
     "Command error": "Skipanavilla",
@@ -217,7 +201,6 @@
     "Copied!": "Afritað",
     "Custom Server Options": "Sérsniðnir valkostir vefþjóns",
     "Dismiss": "Hunsa",
-    "To continue, please enter your password.": "Til að halda áfram, settu inn lykilorðið þitt.",
     "Please check your email to continue registration.": "Skoðaðu tölvupóstinn þinn til að geta haldið áfram með skráningu.",
     "Code": "Kóði",
     "powered by Matrix": "keyrt með Matrix",
@@ -228,13 +211,11 @@
     "Remove": "Fjarlægja",
     "Something went wrong!": "Eitthvað fór úrskeiðis!",
     "Filter community rooms": "Sía spjallrásir samfélags",
-    "Yes, I want to help!": "Já, ég vil hjálpa til",
     "You are not receiving desktop notifications": "Þú færð ekki tilkynningar á skjáborði",
     "Enable them now": "Virkja þetta núna",
     "What's New": "Nýtt á döfinni",
     "Update": "Uppfæra",
     "What's new?": "Hvað er nýtt á döfinni?",
-    "A new version of Riot is available.": "Ný útgáfa af Riot er tiltæk.",
     "Set Password": "Setja lykilorð",
     "Error encountered (%(errorDetail)s).": "Villa fannst (%(errorDetail)s).",
     "Checking for an update...": "Athuga með uppfærslu...",
@@ -243,10 +224,6 @@
     "Warning": "Aðvörun",
     "Allow": "Leyfa",
     "Edit": "Breyta",
-    "Unblacklist": "Taka af bannlista",
-    "Blacklist": "Bannlisti",
-    "Unverify": "Afturkalla sannvottun",
-    "Verify...": "Sannreyna...",
     "No results": "Engar niðurstöður",
     "Communities": "Samfélög",
     "Home": "Heim",
@@ -280,17 +257,12 @@
     "Incorrect password": "Rangt lykilorð",
     "Deactivate Account": "Gera notandaaðgang óvirkann",
     "To continue, please enter your password:": "Til að halda áfram, settu inn lykilorðið þitt:",
-    "I verify that the keys match": "Ég staðfesti að dulritunarlyklarnir samsvari",
     "Back": "Til baka",
     "Send Account Data": "Senda upplýsingar um notandaaðgang",
     "Filter results": "Sía niðurstöður",
     "Toolbox": "Verkfærakassi",
     "Developer Tools": "Forritunartól",
     "An error has occurred.": "Villa kom upp.",
-    "Start verification": "Hefja sannvottun",
-    "Share without verifying": "Deila án sannvottunar",
-    "Ignore request": "Hunsa beiðni",
-    "Encryption key request": "Beiðni um dulritunarlykil",
     "Sign out": "Skrá út",
     "Send Logs": "Senda atvikaskrár",
     "Refresh": "Endurlesa",
@@ -306,7 +278,6 @@
     "(HTTP status %(httpStatus)s)": "(HTTP staða %(httpStatus)s)",
     "Please set a password!": "Stilltu lykilorð!",
     "Custom": "Sérsniðið",
-    "Alias (optional)": "Samnefni (valfrjálst)",
     "You cannot delete this message. (%(code)s)": "Þú getur ekki eytt þessum skilaboðum. (%(code)s)",
     "Resend": "Endursenda",
     "Cancel Sending": "Hætta við sendingu",
@@ -327,7 +298,7 @@
     "Low Priority": "Lítill forgangur",
     "Direct Chat": "Beint spjall",
     "View Community": "Skoða samfélag",
-    "I understand the risks and wish to continue": "Ég skil áhættuna og vil halda áfram",
+    "I understand the risks and wish to continue": "Ég skil áhættuna og óska að halda áfram",
     "Name": "Nafn",
     "Failed to upload image": "Gat ekki sent inn mynd",
     "Add rooms to this community": "Bæta spjallrásum í þetta samfélag",
@@ -350,12 +321,10 @@
     "Room": "Spjallrás",
     "Fill screen": "Fylla skjáinn",
     "Clear filter": "Hreinsa síu",
-    "Light theme": "Ljóst þema",
-    "Dark theme": "Dökkt þema",
     "Success": "Tókst",
     "Import E2E room keys": "Flytja inn E2E dulritunarlykla spjallrásar",
     "Cryptography": "Dulritun",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot safnar nafnlausum greiningargögnum til að gera okkur kleift að bæta forritið.",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s safnar nafnlausum greiningargögnum til að gera okkur kleift að bæta forritið.",
     "Labs": "Tilraunir",
     "Check for update": "Athuga með uppfærslu",
     "Default Device": "Sjálfgefið tæki",
@@ -367,7 +336,7 @@
     "Access Token:": "Aðgangsteikn:",
     "click to reveal": "smelltu til að birta",
     "Identity Server is": "Auðkennisþjónn er",
-    "riot-web version:": "Útgáfa riot-web:",
+    "%(brand)s version:": "Útgáfa %(brand)s:",
     "olm version:": "Útgáfa olm:",
     "Failed to send email": "Mistókst að senda tölvupóst",
     "The email address linked to your account must be entered.": "Það þarf að setja inn tölvupóstfangið sem tengt er notandaaðgangnum þínum.",
@@ -380,21 +349,7 @@
     "Upload an avatar:": "Hlaða inn auðkennismynd:",
     "Commands": "Skipanir",
     "Users": "Notendur",
-    "unknown device": "óþekkt tæki",
-    "NOT verified": "EKKI sannreynt",
-    "verified": "sannreynt",
-    "Verification": "Sannvottun",
-    "Ed25519 fingerprint": "Ed25519 fingrafar",
-    "User ID": "Notandaauðkenni",
-    "Curve25519 identity key": "Curve25519 auðkennislykill",
-    "none": "ekkert",
-    "Claimed Ed25519 fingerprint key": "Tilkynnti Ed25519 fingrafarslykil",
-    "Algorithm": "Reiknirit",
-    "unencrypted": "ódulritað",
-    "Decryption error": "Afkóðunarvilla",
     "Session ID": "Auðkenni setu",
-    "End-to-end encryption information": "Enda-í-enda dulritunarupplýsingar",
-    "Event information": "Upplýsingar um atburð",
     "Export room keys": "Flytja út dulritunarlykla spjallrásar",
     "Enter passphrase": "Settu inn lykilsetningu (passphrase)",
     "Confirm passphrase": "Staðfestu lykilsetningu",
@@ -403,11 +358,9 @@
     "File to import": "Skrá til að flytja inn",
     "Import": "Flytja inn",
     "The platform you're on": "Stýrikerfið sem þú ert á",
-    "The version of Riot.im": "Útgáfan af Riot.im",
+    "The version of %(brand)s": "Útgáfan af %(brand)s",
     "Your language of choice": "Tungumálið þitt",
     "Your homeserver's URL": "Vefslóð á heimaþjóninn þinn",
-    "Your identity server's URL": "Vefslóð á auðkenningarþjóninn þinn",
-    "Review Devices": "Yfirfara tæki",
     "Call Timeout": "Tímamörk hringingar",
     "Unable to capture screen": "Get ekki tekið skjámynd",
     "Invite to Community": "Bjóða í samfélag",
@@ -456,7 +409,7 @@
     "Private Chat": "Einkaspjall",
     "Public Chat": "Opinbert spjall",
     "Collapse Reply Thread": "Fella saman svarþráð",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Því miður, vafrinn þinn getur <b>ekki</b> keyrt Riot.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Því miður, vafrinn þinn getur <b>ekki</b> keyrt %(brand)s.",
     "Add a Room": "Bæta við spjallrás",
     "Add a User": "Bæta við notanda",
     "Unable to accept invite": "Mistókst að þiggja boð",
@@ -478,9 +431,7 @@
     "Reject invitation": "Hafna boði",
     "Are you sure you want to reject the invitation?": "Ertu viss um að þú viljir hafna þessu boði?",
     "Failed to reject invitation": "Mistókst að hafna boði",
-    "Scroll to bottom of page": "Skruna neðst á síðu",
     "No more results": "Ekki fleiri niðurstöður",
-    "Unknown room %(roomId)s": "Óþekkt spjallrás %(roomId)s",
     "Failed to reject invite": "Mistókst að hafna boði",
     "Click to unmute video": "Smelltu til að virkja hljóð í myndskeiði",
     "Click to mute video": "Smelltu til að þagga niður í myndskeiði",
@@ -505,5 +456,7 @@
     "Notify the whole room": "Tilkynna öllum á spjallrásinni",
     "Room Notification": "Tilkynning á spjallrás",
     "Passphrases must match": "Lykilfrasar verða að stemma",
-    "Passphrase must not be empty": "Lykilfrasi má ekki vera auður"
+    "Passphrase must not be empty": "Lykilfrasi má ekki vera auður",
+    "Create Account": "Stofna Reikning",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "vinsamlegast setja upp <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, eða <safariLink>Safari</safariLink> fyrir besta reynsluna."
 }
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 78020c7bb8..d86070018b 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -30,15 +30,13 @@
     "Admin Tools": "Strumenti di amministrazione",
     "No Microphones detected": "Nessun Microfono rilevato",
     "No Webcams detected": "Nessuna Webcam rilevata",
-    "You may need to manually permit Riot to access your microphone/webcam": "Potresti dover permettere manualmente a Riot di accedere al tuo microfono/webcam",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "Potresti dover permettere manualmente a %(brand)s di accedere al tuo microfono/webcam",
     "Default Device": "Dispositivo Predefinito",
     "Microphone": "Microfono",
     "Camera": "Videocamera",
     "Advanced": "Avanzato",
-    "Algorithm": "Algoritmo",
     "Always show message timestamps": "Mostra sempre il timestamps dei messaggi",
     "Authentication": "Autenticazione",
-    "Alias (optional)": "Alias (opzionale)",
     "Add a widget": "Aggiungi un widget",
     "Edit": "Modifica",
     "This email address is already in use": "Questo indirizzo e-mail è già in uso",
@@ -76,8 +74,6 @@
     "Rooms": "Stanze",
     "The remote side failed to pick up": "Dall'altro lato non è giunta risposta",
     "Unable to capture screen": "Impossibile catturare la schermata",
-    "Call": "Chiama",
-    "Answer": "Rispondi",
     "Invite to Community": "Invita alla community",
     "Unpin Message": "Sblocca messaggio",
     "Add rooms to this community": "Aggiungi stanze a questa community",
@@ -85,19 +81,15 @@
     "Unnamed room": "Stanza senza nome",
     "Online": "Online",
     "The platform you're on": "La piattaforma in cui sei",
-    "The version of Riot.im": "La versione di Riot.im",
+    "The version of %(brand)s": "La versione di %(brand)s",
     "Your language of choice": "La lingua scelta",
     "Which officially provided instance you are using, if any": "Quale istanza ufficialmente fornita stai usando, se ne usi una",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Se stai usando o meno la modalità richtext dell'editor con testo arricchito",
     "Your homeserver's URL": "L'URL del tuo server home",
-    "Your identity server's URL": "L'URL del tuo server identità",
     "Analytics": "Statistiche",
-    "The information being sent to us to help make Riot.im better includes:": "Le informazioni inviate per aiutarci a migliorare Riot.im includono:",
+    "The information being sent to us to help make %(brand)s better includes:": "Le informazioni che ci vengono inviate per aiutarci a migliorare %(brand)s includono:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Se questa pagina include informazioni identificabili, come una stanza, un utente o un ID di un gruppo, tali dati saranno rimossi prima di essere inviati al server.",
     "Call Failed": "Chiamata fallita",
-    "Review Devices": "Controlla i dispositivi",
-    "Call Anyway": "Chiama comunque",
-    "Answer Anyway": "Rispondi comunque",
     "Call Timeout": "Tempo di attesa della chiamata",
     "Existing Call": "Chiamata esistente",
     "You are already in a call.": "Partecipi già ad una chiamata.",
@@ -113,21 +105,19 @@
     "Which rooms would you like to add to this community?": "Quali stanze vuoi aggiungere a questa comunità?",
     "Show these rooms to non-members on the community page and room list?": "Mostrare queste stanze ai non membri nella pagina comunità e all'elenco stanze?",
     "Add rooms to the community": "Aggiungi stanze alla comunità",
-    "Room name or alias": "Nome stanza o alias",
     "Add to community": "Aggiungi alla comunità",
     "Failed to invite the following users to %(groupId)s:": "Invito ad unirsi in %(groupId)s fallito per i seguenti utenti:",
     "Failed to invite users to community": "Invito degli utenti alla comunità fallito",
     "Failed to invite users to %(groupId)s": "Invito degli utenti a %(groupId)s fallito",
     "Failed to add the following rooms to %(groupId)s:": "Aggiunta a %(groupId)s fallita per le seguenti stanze:",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot non ha l'autorizzazione ad inviarti notifiche - controlla le impostazioni del browser",
-    "Riot was not given permission to send notifications - please try again": "Non è stata data a Riot l'autorizzazione ad inviare notifiche - riprova",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s non ha l'autorizzazione ad inviarti notifiche - controlla le impostazioni del browser",
+    "%(brand)s was not given permission to send notifications - please try again": "Non è stata data a %(brand)s l'autorizzazione ad inviare notifiche - riprova",
     "Unable to enable Notifications": "Impossibile attivare le notifiche",
     "This email address was not found": "Indirizzo email non trovato",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Il tuo indirizzo email sembra non essere associato ad un ID Matrix su questo Homeserver.",
     "Default": "Predefinito",
     "Restricted": "Limitato",
     "Moderator": "Moderatore",
-    "Start a chat": "Inizia una conversazione",
     "Failed to invite": "Invito fallito",
     "Failed to invite the following users to the %(roomName)s room:": "Invito nella stanza %(roomName)s fallito per i seguenti utenti:",
     "You need to be logged in.": "Devi aver eseguito l'accesso.",
@@ -143,7 +133,6 @@
     "Usage": "Utilizzo",
     "/ddg is not a command": "/ddg non è un comando",
     "To use it, just wait for autocomplete results to load and tab through them.": "Per usarlo, attendi l'autocompletamento dei risultati e selezionali con tab.",
-    "Unrecognised room alias:": "Alias della stanza non riconosciuto:",
     "Ignored user": "Utente ignorato",
     "You are now ignoring %(userId)s": "Ora stai ignorando %(userId)s",
     "Unignored user": "Utente non più ignorato",
@@ -188,14 +177,12 @@
     "%(widgetName)s widget removed by %(senderName)s": "Widget %(widgetName)s rimosso da %(senderName)s",
     "Failure to create room": "Creazione della stanza fallita",
     "Server may be unavailable, overloaded, or you hit a bug.": "Il server potrebbe essere non disponibile, sovraccarico o hai trovato un errore.",
-    "Send anyway": "Invia comunque",
     "Send": "Invia",
     "Unnamed Room": "Stanza senza nome",
     "Your browser does not support the required cryptography extensions": "Il tuo browser non supporta l'estensione crittografica richiesta",
-    "Not a valid Riot keyfile": "Non è una chiave di Riot valida",
+    "Not a valid %(brand)s keyfile": "Non è una chiave di %(brand)s valida",
     "Authentication check failed: incorrect password?": "Controllo di autenticazione fallito: password sbagliata?",
     "Failed to join room": "Accesso alla stanza fallito",
-    "Use compact timeline layout": "Usa impaginazione cronologia compatta",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Mostra gli orari nel formato 12 ore (es. 2:30pm)",
     "Autoplay GIFs and videos": "Riproduzione automatica di GIF e video",
     "Enable automatic language detection for syntax highlighting": "Attiva la rilevazione automatica della lingua per l'evidenziazione della sintassi",
@@ -206,8 +193,8 @@
     "Room Colour": "Colore della stanza",
     "Active call (%(roomName)s)": "Chiamata attiva (%(roomName)s)",
     "unknown caller": "Chiamante sconosciuto",
-    "Incoming voice call from %(name)s": "Chiamata vocale in arrivo da %(name)s",
-    "Incoming video call from %(name)s": "Chiamata video in arrivo da %(name)s",
+    "Incoming voice call from %(name)s": "Telefonata in arrivo da %(name)s",
+    "Incoming video call from %(name)s": "Videochiamata in arrivo da %(name)s",
     "Incoming call from %(name)s": "Chiamata in arrivo da %(name)s",
     "Decline": "Rifiuta",
     "Accept": "Accetta",
@@ -226,11 +213,8 @@
     "New Password": "Nuova password",
     "Confirm password": "Conferma password",
     "Change Password": "Modifica password",
-    "Device ID": "ID dispositivo",
     "Last seen": "Visto l'ultima volta",
     "Failed to set display name": "Impostazione nome visibile fallita",
-    "Disable Notifications": "Disattiva le notifiche",
-    "Enable Notifications": "Attiva le notifiche",
     "Cannot add any more widgets": "Impossibile aggiungere altri widget",
     "The maximum permitted number of widgets have already been added to this room.": "Il numero massimo consentito di widget è già stato raggiunto in questa stanza.",
     "Drop File Here": "Trascina file qui",
@@ -243,8 +227,6 @@
     "Options": "Opzioni",
     "Key request sent.": "Richiesta chiave inviata.",
     "Please select the destination room for this message": "Seleziona la stanza di destinazione per questo messaggio",
-    "Blacklisted": "In lista nera",
-    "device id: ": "ID dispositivo: ",
     "Disinvite": "Revoca invito",
     "Kick": "Butta fuori",
     "Disinvite this user?": "Revocare l'invito a questo utente?",
@@ -256,7 +238,6 @@
     "Ban this user?": "Bandire questo utente?",
     "Failed to ban user": "Ban utente fallito",
     "Failed to mute user": "Impossibile silenziare l'utente",
-    "Failed to toggle moderator status": "Cambio di stato moderatore fallito",
     "Failed to change power level": "Cambio di livello poteri fallito",
     "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.": "Non potrai annullare questa modifica dato che ti stai declassando, se sei l'ultimo utente privilegiato nella stanza sarà impossibile ottenere di nuovo i privilegi.",
     "Are you sure?": "Sei sicuro?",
@@ -265,11 +246,7 @@
     "Ignore": "Ignora",
     "Mention": "Cita",
     "Invite": "Invita",
-    "User Options": "Opzioni utente",
-    "Direct chats": "Conversazioni dirette",
     "Unmute": "Togli silenzio",
-    "Revoke Moderator": "Declassa moderatore",
-    "Make Moderator": "Promuovi a moderatore",
     "and %(count)s others...|other": "e altri %(count)s ...",
     "and %(count)s others...|one": "e un altro...",
     "Invited": "Invitato",
@@ -277,13 +254,11 @@
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (poteri %(powerLevelNumber)s)",
     "Attachment": "Allegato",
     "Hangup": "Riaggancia",
-    "Voice call": "Chiamata vocale",
-    "Video call": "Chiamata video",
+    "Voice call": "Telefonata",
+    "Video call": "Videochiamata",
     "Upload file": "Invia file",
     "Send an encrypted reply…": "Invia una risposta criptata…",
-    "Send a reply (unencrypted)…": "Invia una risposta (non criptata)…",
     "Send an encrypted message…": "Invia un messaggio criptato…",
-    "Send a message (unencrypted)…": "Invia un messaggio (non criptato)…",
     "You do not have permission to post to this room": "Non hai il permesso di inviare in questa stanza",
     "Server error": "Errore del server",
     "Server unavailable, overloaded, or something else went wrong.": "Server non disponibile, sovraccarico o qualcos'altro è andato storto.",
@@ -346,10 +321,7 @@
     "Permissions": "Autorizzazioni",
     "Jump to first unread message.": "Salta al primo messaggio non letto.",
     "not specified": "non specificato",
-    "Remote addresses for this room:": "Indirizzi remoti di questa stanza:",
-    "Local addresses for this room:": "Indirizzi locali di questa stanza:",
     "This room has no local addresses": "Questa stanza non ha indirizzi locali",
-    "New address (e.g. #foo:%(localDomain)s)": "Nuovo indirizzo (es. #foo:%(localDomain)s)",
     "Invalid community ID": "ID comunità non valido",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' non è un ID comunità valido",
     "Showing flair for these communities:": "Predisposizione della stanza per queste comunità:",
@@ -375,10 +347,6 @@
     "Failed to copy": "Copia fallita",
     "Add an Integration": "Aggiungi un'integrazione",
     "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?": "Stai per essere portato in un sito di terze parti per autenticare il tuo account da usare con %(integrationsUrl)s. Vuoi continuare?",
-    "Removed or unknown message type": "Tipo messaggio rimosso o sconosciuto",
-    "Message removed by %(userId)s": "Messaggio rimosso da %(userId)s",
-    "Message removed": "Messaggio rimosso",
-    "To continue, please enter your password.": "Per continuare, inserisci la tua password.",
     "An email has been sent to %(emailAddress)s": "È stata inviata un'email a %(emailAddress)s",
     "Please check your email to continue registration.": "Controlla la tua email per continuare la registrazione.",
     "Token incorrect": "Token errato",
@@ -415,14 +383,9 @@
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "L'eliminazione di un widget lo rimuove per tutti gli utenti della stanza. Sei sicuro di eliminare il widget?",
     "Delete widget": "Elimina widget",
     "Minimize apps": "Riduci le app",
-    "Unblacklist": "Togli dalla lista nera",
-    "Blacklist": "Lista nera",
-    "Unverify": "Togli la verifica",
-    "Verify...": "Verifica...",
     "No results": "Nessun risultato",
     "Communities": "Comunità",
     "Home": "Inizio",
-    "Could not connect to the integration server": "Impossibile connettersi al server di integrazione",
     "Manage Integrations": "Gestisci integrazioni",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)ssono entrati %(count)s volte",
@@ -503,14 +466,9 @@
     "Unknown error": "Errore sconosciuto",
     "Incorrect password": "Password sbagliata",
     "Deactivate Account": "Disattiva l'account",
-    "I verify that the keys match": "Confermo che le chiavi coincidono",
     "An error has occurred.": "Si è verificato un errore.",
-    "Start verification": "Inizia la verifica",
-    "Share without verifying": "Condividi senza verificare",
-    "Ignore request": "Ignora la richiesta",
-    "Encryption key request": "Richiesta chiave di cifratura",
     "Unable to restore session": "Impossibile ripristinare la sessione",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Se hai usato precedentemente una versione più recente di Riot, la tua sessione potrebbe essere incompatibile con questa versione. Chiudi questa finestra e torna alla versione più recente.",
+    "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.": "Se hai usato precedentemente una versione più recente di %(brand)s, la tua sessione potrebbe essere incompatibile con questa versione. Chiudi questa finestra e torna alla versione più recente.",
     "Invalid Email Address": "Indirizzo email non valido",
     "This doesn't appear to be a valid email address": "Questo non sembra essere un indirizzo email valido",
     "Verification Pending": "In attesa di verifica",
@@ -574,17 +532,16 @@
     "Failed to leave room": "Uscita dalla stanza fallita",
     "Signed Out": "Disconnesso",
     "For security, this session has been signed out. Please sign in again.": "Per sicurezza questa sessione è stata disconnessa. Accedi di nuovo.",
-    "Old cryptography data detected": "Rilevati dati di cifratura obsoleti",
-    "Data from an older version of Riot 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.": "Sono stati rilevati dati da una vecchia versione di Riot. Ciò avrà causato malfunzionamenti della crittografia end-to-end nella vecchia versione. I messaggi cifrati end-to-end scambiati di recente usando la vecchia versione potrebbero essere indecifrabili in questa versione. Anche i messaggi scambiati con questa versione possono fallire. Se riscontri problemi, disconnettiti e riaccedi. Per conservare la cronologia, esporta e re-importa le tue chiavi.",
+    "Old cryptography data detected": "Rilevati dati di crittografia obsoleti",
+    "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.": "Sono stati rilevati dati da una vecchia versione di %(brand)s. Ciò avrà causato malfunzionamenti della crittografia end-to-end nella vecchia versione. I messaggi cifrati end-to-end scambiati di recente usando la vecchia versione potrebbero essere indecifrabili in questa versione. Anche i messaggi scambiati con questa versione possono fallire. Se riscontri problemi, disconnettiti e riaccedi. Per conservare la cronologia, esporta e re-importa le tue chiavi.",
     "Logout": "Disconnetti",
     "Your Communities": "Le tue comunità",
-    "Did you know: you can use communities to filter your Riot.im experience!": "Sapevi che: puoi usare le comunità per filtrare la tua esperienza su Riot.im!",
+    "Did you know: you can use communities to filter your %(brand)s experience!": "Sapevi che: puoi usare le comunità per filtrare la tua esperienza su %(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.": "Per impostare un filtro, trascina l'avatar di una comunità sul pannello dei filtri a sinistra dello schermo. Puoi cliccare un avatar nel pannello dei filtri quando vuoi per vedere solo le stanze e le persone associate a quella comunità.",
     "Error whilst fetching joined communities": "Errore nella rilevazione delle comunità a cui ti sei unito",
     "Create a new community": "Crea una nuova comunità",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crea una comunità per raggruppare utenti e stanze! Crea una pagina iniziale personalizzata per stabilire il tuo spazio nell'universo di Matrix.",
     "You have no visible notifications": "Non hai alcuna notifica visibile",
-    "Scroll to bottom of page": "Scorri in fondo alla pagina",
     "%(count)s of your messages have not been sent.|other": "Alcuni dei tuoi messaggi non sono stati inviati.",
     "%(count)s of your messages have not been sent.|one": "Il tuo messaggio non è stato inviato.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Reinvia tutti</resendText> o <cancelText>annulla tutti</cancelText> adesso. Puoi anche selezionare i singoli messaggi da reinviare o annullare.",
@@ -598,7 +555,6 @@
     "Search failed": "Ricerca fallita",
     "Server may be unavailable, overloaded, or search timed out :(": "Il server potrebbe essere non disponibile, sovraccarico o la ricerca è scaduta :(",
     "No more results": "Nessun altro risultato",
-    "Unknown room %(roomId)s": "Stanza %(roomId)s sconosciuta",
     "Room": "Stanza",
     "Failed to reject invite": "Rifiuto dell'invito fallito",
     "Fill screen": "Riempi schermo",
@@ -613,8 +569,6 @@
     "Uploading %(filename)s and %(count)s others|other": "Invio di %(filename)s e altri %(count)s",
     "Uploading %(filename)s and %(count)s others|zero": "Invio di %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Invio di %(filename)s e altri %(count)s",
-    "Light theme": "Tema chiaro",
-    "Dark theme": "Tema scuro",
     "Sign out": "Disconnetti",
     "Success": "Successo",
     "Unable to remove contact information": "Impossibile rimuovere le informazioni di contatto",
@@ -623,7 +577,7 @@
     "Cryptography": "Crittografia",
     "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 hai segnalato un errore via Github, i log di debug possono aiutarci a identificare il problema. I log di debug contengono dati di utilizzo dell'applicazione inclusi il nome utente, gli ID o alias delle stanze o gruppi visitati e i nomi degli altri utenti. Non contengono messaggi.",
     "Submit debug logs": "Invia log di debug",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot raccoglie statistiche anonime per permetterci di migliorare l'applicazione.",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s raccoglie statistiche anonime per permetterci di migliorare l'applicazione.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Diamo importanza alla privacy, perciò non raccogliamo dati personali o identificabili per le nostre statistiche.",
     "Learn more about how we use analytics.": "Ulteriori informazioni su come usiamo le statistiche.",
     "Labs": "Laboratori",
@@ -636,7 +590,7 @@
     "click to reveal": "clicca per mostrare",
     "Homeserver is": "L'homeserver è",
     "Identity Server is": "Il server di identità è",
-    "riot-web version:": "versione riot-web:",
+    "%(brand)s version:": "versione %(brand)s:",
     "olm version:": "versione olm:",
     "Failed to send email": "Invio dell'email fallito",
     "The email address linked to your account must be entered.": "Deve essere inserito l'indirizzo email collegato al tuo account.",
@@ -663,7 +617,6 @@
     "Define the power level of a user": "Definisce il livello di poteri di un utente",
     "Deops user with given id": "Toglie privilegi all'utente per ID",
     "Invites user with given id to current room": "Invita l'utente per ID alla stanza attuale",
-    "Joins room with given alias": "Entra nella stanza con l'alias definito",
     "Kicks user with given id": "Caccia un utente per ID",
     "Changes your display nickname": "Modifica il tuo nick visualizzato",
     "Searches DuckDuckGo for results": "Cerca risultati su DuckDuckGo",
@@ -676,20 +629,7 @@
     "Notify the whole room": "Notifica l'intera stanza",
     "Room Notification": "Notifica della stanza",
     "Users": "Utenti",
-    "unknown device": "dispositivo sconosciuto",
-    "NOT verified": "NON verificato",
-    "verified": "verificato",
-    "Verification": "Verifica",
-    "Ed25519 fingerprint": "Impronta ed25519",
-    "User ID": "ID utente",
-    "Curve25519 identity key": "Chiave di identità curve25519",
-    "none": "nessuno",
-    "Claimed Ed25519 fingerprint key": "Chiave di impronta ed25519 dichiarata",
-    "unencrypted": "non criptato",
-    "Decryption error": "Errore di decifrazione",
     "Session ID": "ID sessione",
-    "End-to-end encryption information": "Informazioni di cifratura end-to-end",
-    "Event information": "Informazioni evento",
     "Passphrases must match": "Le password devono coincidere",
     "Passphrase must not be empty": "La password non può essere vuota",
     "Export room keys": "Esporta chiavi della stanza",
@@ -699,7 +639,7 @@
     "Confirm passphrase": "Conferma password",
     "Export": "Esporta",
     "Import room keys": "Importa chiavi della stanza",
-    "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.": "Questa procedura ti permette di importare le chiavi di cifratura precedentemente esportate da un altro client Matrix. Potrai poi decifrare tutti i messaggi che quel client poteva decifrare.",
+    "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.": "Questa procedura ti permette di importare le chiavi di crittografia precedentemente esportate da un altro client Matrix. Potrai poi decifrare tutti i messaggi che quel client poteva decifrare.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Il file esportato sarà protetto da una password. Dovresti inserire la password qui, per decifrarlo.",
     "File to import": "File da importare",
     "Import": "Importa",
@@ -718,7 +658,6 @@
     "Who can join this community?": "Chi può unirsi a questa comunità?",
     "Everyone": "Tutti",
     "Fetching third party location failed": "Rilevazione posizione di terze parti fallita",
-    "A new version of Riot is available.": "È disponibile una nuova versione di Riot.",
     "Send Account Data": "Invia dati account",
     "Advanced notification settings": "Impostazioni di notifica avanzate",
     "Uploading report": "Sto caricando il report",
@@ -729,15 +668,13 @@
     "You are not receiving desktop notifications": "Non stai ricevendo le notifiche sul desktop",
     "Friday": "Venerdì",
     "Update": "Aggiornamento",
-    "Riot does not know how to join a room on this network": "Riot non sa come entrare nella stanza su questa rete",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s non sa come entrare nella stanza su questa rete",
     "On": "Acceso",
     "Changelog": "Cambiamenti",
     "Waiting for response from server": "In attesa di una risposta dal server",
     "Send Custom Event": "Invia evento personalizzato",
     "All notifications are currently disabled for all targets.": "Tutte le notifiche sono disabilitate per tutti gli obbiettivi.",
     "Failed to send logs: ": "Invio dei log fallito: ",
-    "delete the alias.": "elimina l'alias.",
-    "To return to your account in future you need to <u>set a password</u>": "Per tornare nel tuo account in futuro devi <u>impostare una password</u>",
     "Forget": "Dimentica",
     "You cannot delete this image. (%(code)s)": "Non puoi eliminare quest'immagine. (%(code)s)",
     "Cancel Sending": "Annulla invio",
@@ -762,7 +699,6 @@
     "No update available.": "Nessun aggiornamento disponibile.",
     "Resend": "Reinvia",
     "Collecting app version information": "Raccolta di informazioni sulla versione dell'applicazione",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Eliminare l'alias %(alias)s e rimuovere %(name)s dalla lista?",
     "Keywords": "Parole chiave",
     "Enable notifications for this account": "Abilita le notifiche per questo account",
     "Invite to this community": "Invita a questa comunità",
@@ -773,14 +709,14 @@
     "Search…": "Cerca…",
     "You have successfully set a password and an email address!": "Hai impostato con successo una password e un indirizzo email!",
     "Remove %(name)s from the directory?": "Rimuovere %(name)s dalla lista?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot utilizza molte funzioni avanzate del browser, alcune delle quali non sono disponibili o sono sperimentali nel tuo browser attuale.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s utilizza molte funzioni avanzate del browser, alcune delle quali non sono disponibili o sono sperimentali nel tuo browser attuale.",
     "Developer Tools": "Strumenti per sviluppatori",
     "Preparing to send logs": "Preparazione invio dei log",
     "Remember, you can always set an email address in user settings if you change your mind.": "Ricorda, puoi sempre specificare un indirizzo email nelle impostazioni utente se cambi idea.",
     "Explore Account Data": "Esplora dati account",
     "All messages (noisy)": "Tutti i messaggi (rumoroso)",
     "Saturday": "Sabato",
-    "I understand the risks and wish to continue": "Sono consapevole dei rischi e vorrei continuare",
+    "I understand the risks and wish to continue": "Capisco i rischi e desidero continuare",
     "Direct Chat": "Chat Diretta",
     "The server may be unavailable or overloaded": "Il server potrebbe essere non disponibile o sovraccarico",
     "Reject": "Rifiuta",
@@ -820,8 +756,7 @@
     "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.": "I log di debug contengono dati di utilizzo dell'applicazione inclusi il nome utente, gli ID o alias delle stanze o gruppi visitati e i nomi degli altri utenti. Non contengono messaggi.",
     "Unhide Preview": "Mostra anteprima",
     "Unable to join network": "Impossibile collegarsi alla rete",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Potresti averli configurati in un client diverso da Riot. Non puoi cambiarli in Riot ma sono comunque applicati",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Spiacenti, ma il tuo browser <b>non</b>  è in grado di utilizzare Riot.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Spiacenti, ma il tuo browser <b>non</b>  è in grado di utilizzare %(brand)s.",
     "Uploaded on %(date)s by %(user)s": "Caricato il %(date)s da %(user)s",
     "Messages in group chats": "Messaggi nelle chat di gruppo",
     "Yesterday": "Ieri",
@@ -844,13 +779,11 @@
     "Unable to fetch notification target list": "Impossibile ottenere la lista di obiettivi notifiche",
     "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!": "Con il tuo attuale browser, l'aspetto e la sensazione generale dell'applicazione potrebbero essere completamente sbagliati e alcune delle funzionalità potrebbero non funzionare. Se vuoi provare comunque puoi continuare, ma non riceverai aiuto per qualsiasi problema tu possa riscontrare!",
     "Checking for an update...": "Controllo aggiornamenti...",
-    "There are advanced notifications which are not shown here": "Ci sono notifiche avanzate che non sono mostrate qui",
     "Every page you use in the app": "Ogni pagina che usi nell'app",
     "e.g. <CurrentPageURL>": "es. <CurrentPageURL>",
-    "Your User Agent": "Il tuo User Agent",
     "Your device resolution": "La risoluzione del dispositivo",
     "Missing roomId.": "ID stanza mancante.",
-    "Always show encryption icons": "Mostra sempre icone di cifratura",
+    "Always show encryption icons": "Mostra sempre icone di crittografia",
     "Enable widget screenshots on supported widgets": "Attiva le schermate dei widget sui widget supportati",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Impossibile caricare l'evento a cui si è risposto, o non esiste o non hai il permesso di visualizzarlo.",
     "Refresh": "Aggiorna",
@@ -861,9 +794,6 @@
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Eliminare l'archiviazione del browser potrebbe risolvere il problema, ma verrai disconnesso e la cronologia delle chat criptate sarà illeggibile.",
     "Collapse Reply Thread": "Riduci finestra di risposta",
     "e.g. %(exampleValue)s": "es. %(exampleValue)s",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Per favore aiuta a migliorare Riot.im inviando <UsageDataLink>dati di utilizzo anonimi</UsageDataLink>. Verrà usato un cookie (vedi la nostra <PolicyLink>politica sui cookie</PolicyLink>).",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Per favore aiutaci a migliorare Riot.im inviando <UsageDataLink>dati di utilizzo anonimi</UsageDataLink>. Verrà usato un cookie.",
-    "Yes, I want to help!": "Sì, voglio aiutare!",
     "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.",
@@ -912,9 +842,6 @@
     "Please <a>contact your service administrator</a> to continue using the service.": "<a>Contatta l'amministratore del servizio</a> per continuare ad usarlo.",
     "This homeserver has hit its Monthly Active User limit.": "Questo homeserver ha raggiunto il suo limite di utenti attivi mensili.",
     "This homeserver has exceeded one of its resource limits.": "Questo homeserver ha oltrepassato uno dei suoi limiti di risorse.",
-    "Please <a>contact your service administrator</a> to get this limit increased.": "<a>Contatta l'amministratore del servizio</a> per fare aumentare questo limite.",
-    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "Questo homeserver ha raggiunto il suo limite di utenti attivi mensili, perciò <b>alcuni utenti non potranno accedere</b>.",
-    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Questo homeserver ha oltrepassato uno dei suoi limiti di risorse, perciò <b>alcuni utenti non potranno accedere</b>.",
     "Upgrade Room Version": "Aggiorna versione stanza",
     "Create a new room with the same name, description and avatar": "Creeremo una nuova stanza con lo stesso nome, descrizione e avatar",
     "Update any local room aliases to point to the new room": "Aggiorneremo qualsiasi alias di stanza in modo che punti a quella nuova",
@@ -934,21 +861,14 @@
     "Failed to upgrade room": "Aggiornamento stanza fallito",
     "The room upgrade could not be completed": "Non è stato possibile completare l'aggiornamento della stanza",
     "Upgrade this room to version %(version)s": "Aggiorna questa stanza alla versione %(version)s",
-    "Registration Required": "Registrazione necessaria",
-    "You need to register to do this. Would you like to register now?": "Devi registrarti per eseguire questa azione. Vuoi registrarti ora?",
     "Unable to connect to Homeserver. Retrying...": "Impossibile connettersi all'homeserver. Riprovo...",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s ha aggiunto %(addedAddresses)s come indirizzo per questa stanza.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s ha aggiunto %(addedAddresses)s come indirizzi per questa stanza.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s ha rimosso %(removedAddresses)s tra gli indirizzi di questa stanza.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s ha rimosso %(removedAddresses)s tra gli indirizzi di questa stanza.",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s ha aggiunto %(addedAddresses)s e rimosso %(removedAddresses)s tra gli indirizzi di questa stanza.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s ha messo %(address)s come indirizzo principale per questa stanza.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s ha rimosso l'indirizzo principale di questa stanza.",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Prima di inviare i log, devi <a>creare una segnalazione su GitHub</a> per descrivere il tuo problema.",
-    "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Riot ora usa da 3 a 5 volte meno memoria, caricando le informazioni degli altri utenti solo quando serve. Si prega di attendere mentre ci risincronizziamo con il server!",
-    "Updating Riot": "Aggiornamento di Riot",
-    "You've previously used Riot 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, Riot needs to resync your account.": "Hai usato Riot precedentemente su %(host)s con il caricamento lento dei membri attivato. In questa versione il caricamento lento è disattivato. Dato che la cache locale non è compatibile tra queste due impostazioni, Riot deve risincronizzare il tuo account.",
-    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Se l'altra versione di Riot è ancora aperta in un'altra scheda, chiudila perché usare Riot nello stesso host con il caricamento lento sia attivato che disattivato può causare errori.",
+    "%(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 ora usa da 3 a 5 volte meno memoria, caricando le informazioni degli altri utenti solo quando serve. Si prega di attendere mentre ci risincronizziamo con il server!",
+    "Updating %(brand)s": "Aggiornamento di %(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.": "Hai usato %(brand)s precedentemente su %(host)s con il caricamento lento dei membri attivato. In questa versione il caricamento lento è disattivato. Dato che la cache locale non è compatibile tra queste due impostazioni, %(brand)s deve risincronizzare il tuo account.",
+    "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 l'altra versione di %(brand)s è ancora aperta in un'altra scheda, chiudila perché usare %(brand)s nello stesso host con il caricamento lento sia attivato che disattivato può causare errori.",
     "Incompatible local cache": "Cache locale non compatibile",
     "Clear cache and resync": "Svuota cache e risincronizza",
     "Please review and accept the policies of this homeserver:": "Consulta ed accetta le condizioni di questo homeserver:",
@@ -992,21 +912,16 @@
     "Backup version: ": "Versione backup: ",
     "Algorithm: ": "Algoritmo: ",
     "Please review and accept all of the homeserver's policies": "Si prega di rivedere e accettare tutte le politiche dell'homeserver",
-    "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 Riot to do this": "Per evitare di perdere la cronologia della chat, devi esportare le tue chiavi della stanza prima di uscire. Dovrai tornare alla versione più recente di Riot per farlo",
-    "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ": "Hai usato in precedenza una versione più recente di Riot su %(host)s. Per usare di nuovo questa versione con cifratura end-to-end, dovrai disconnettere e riaccedere. ",
+    "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": "Per evitare di perdere la cronologia della chat, devi esportare le tue chiavi della stanza prima di uscire. Dovrai tornare alla versione più recente di %(brand)s per farlo",
     "Incompatible Database": "Database non compatibile",
-    "Continue With Encryption Disabled": "Continua con la cifratura disattivata",
+    "Continue With Encryption Disabled": "Continua con la crittografia disattivata",
     "Unable to load backup status": "Impossibile caricare lo stato del backup",
     "Unable to restore backup": "Impossibile ripristinare il backup",
     "No backup found!": "Nessun backup trovato!",
-    "Backup Restored": "Backup ripristinato",
     "Failed to decrypt %(failedCount)s sessions!": "Decifrazione di %(failedCount)s sessioni fallita!",
-    "Restored %(sessionCount)s session keys": "Ripristinate le chiavi di %(sessionCount)s sessioni",
-    "Enter Recovery Passphrase": "Inserisci la password di recupero",
     "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Accedi alla cronologia sicura dei messaggi e imposta la messaggistica sicura inserendo la tua password di recupero.",
     "Next": "Avanti",
     "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Se hai dimenticato la password di recupero puoi <button1>usare la tua chiave di recupero</button1> o <button2>impostare nuove opzioni di recupero</button2>",
-    "Enter Recovery Key": "Inserisci la chiave di recupero",
     "This looks like a valid recovery key!": "Sembra essere una chiave di recupero valida!",
     "Not a valid recovery key": "Non è una chiave di recupero valida",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Accedi alla cronologia sicura dei messaggi e imposta la messaggistica sicura inserendo la tua chiave di recupero.",
@@ -1014,23 +929,14 @@
     "Failed to perform homeserver discovery": "Ricerca dell'homeserver fallita",
     "Invalid homeserver discovery response": "Risposta della ricerca homeserver non valida",
     "Sign in with single sign-on": "Accedi con single sign-on",
-    "Great! This passphrase looks strong enough.": "Ottimo! Questa password sembra abbastanza forte.",
-    "Enter a passphrase...": "Inserisci una password...",
     "That matches!": "Corrisponde!",
     "That doesn't match.": "Non corrisponde.",
     "Go back to set it again.": "Torna per reimpostare.",
-    "Repeat your passphrase...": "Ripeti la password...",
-    "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Come rete di sicurezza, puoi usarla per ripristinare la cronologia dei messaggi cifrati se dimentichi la password di recupero.",
-    "As a safety net, you can use it to restore your encrypted message history.": "Come rete di sicurezza, puoi usarla per ripristinare la cronologia dei messaggi cifrati.",
-    "Your Recovery Key": "La tua chiave di recupero",
-    "Copy to clipboard": "Copia negli appunti",
     "Download": "Scarica",
     "<b>Print it</b> and store it somewhere safe": "<b>Stampala</b> e conservala in un luogo sicuro",
     "<b>Save it</b> on a USB key or backup drive": "<b>Salvala</b> in una chiave USB o disco di backup",
     "<b>Copy it</b> to your personal cloud storage": "<b>Copiala</b> nel tuo archivio cloud personale",
     "Set up Secure Message Recovery": "Imposta ripristino sicuro dei messaggi",
-    "Keep it safe": "Tienila al sicuro",
-    "Create Key Backup": "Crea backup chiave",
     "Unable to create key backup": "Impossibile creare backup della chiave",
     "Retry": "Riprova",
     "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Mostra un promemoria per attivare il ripristino sicuro dei messaggi nelle stanze cifrate",
@@ -1055,7 +961,6 @@
     "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 hai impostato il nuovo metodo di recupero, un aggressore potrebbe tentare di accedere al tuo account. Cambia la password del tuo account e imposta immediatamente un nuovo metodo di recupero nelle impostazioni.",
     "Set up Secure Messages": "Imposta i messaggi sicuri",
     "Go to Settings": "Vai alle impostazioni",
-    "Waiting for %(userId)s to confirm...": "In attesa che %(userId)s confermi...",
     "Unrecognised address": "Indirizzo non riconosciuto",
     "User %(user_id)s may or may not exist": "L'utente %(user_id)s potrebbe non esistere",
     "Prompt before sending invites to potentially invalid matrix IDs": "Chiedi prima di inviare inviti a possibili ID matrix non validi",
@@ -1100,7 +1005,6 @@
     "Send typing notifications": "Invia notifiche di scrittura",
     "Enable Community Filter Panel": "Attiva il pannello dei filtri di comunità",
     "Allow Peer-to-Peer for 1:1 calls": "Permetti il peer-to-peer per chiamate 1:1",
-    "Order rooms in the room list by most important first instead of most recent": "Ordina le stanze nell'elenco per importanza, non per più recente",
     "Messages containing my username": "Messaggi contenenti il mio nome utente",
     "The other party cancelled the verification.": "L'altra parte ha annullato la verifica.",
     "Verified!": "Verificato!",
@@ -1178,7 +1082,7 @@
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "Ti abbiamo inviato un'email per verificare il tuo indirizzo. Segui le istruzioni contenute e poi clicca il pulsante sotto.",
     "Email Address": "Indirizzo email",
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Sei sicuro? Perderai i tuoi messaggi cifrati se non hai salvato adeguatamente le tue chiavi.",
-    "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "I messaggi criptati sono resi sicuri con una cifratura end-to-end. Solo tu e il/i destinatario/i avete le chiavi per leggere questi messaggi.",
+    "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "I messaggi cifrati sono resi sicuri con una crittografia end-to-end. Solo tu e il/i destinatario/i avete le chiavi per leggere questi messaggi.",
     "Restore from Backup": "Ripristina da un backup",
     "Back up your keys before signing out to avoid losing them.": "Fai una copia delle tue chiavi prima di disconnetterti per evitare di perderle.",
     "Backing up %(sessionsRemaining)s keys...": "Copia di %(sessionsRemaining)s chiavi...",
@@ -1200,9 +1104,9 @@
     "Deactivating your account is a permanent action - be careful!": "La disattivazione dell'account è permanente - attenzione!",
     "General": "Generale",
     "Credits": "Crediti",
-    "For help with using Riot, click <a>here</a>.": "Per aiuto su come usare Riot, clicca <a>qui</a>.",
-    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "Per aiuto su come usare Riot, clicca <a>qui</a> o inizia una chat con il nostro bot usando il pulsante sotto.",
-    "Chat with Riot Bot": "Chatta con Riot Bot",
+    "For help with using %(brand)s, click <a>here</a>.": "Per aiuto su come usare %(brand)s, clicca <a>qui</a>.",
+    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "Per aiuto su come usare %(brand)s, clicca <a>qui</a> o inizia una chat con il nostro bot usando il pulsante sotto.",
+    "Chat with %(brand)s Bot": "Chatta con %(brand)s Bot",
     "Help & About": "Aiuto e informazioni",
     "Bug reporting": "Segnalazione errori",
     "FAQ": "FAQ",
@@ -1244,12 +1148,11 @@
     "Send %(eventType)s events": "Invia eventi %(eventType)s",
     "Roles & Permissions": "Ruoli e permessi",
     "Select the roles required to change various parts of the room": "Seleziona i ruoli necessari per cambiare varie parti della stanza",
-    "Enable encryption?": "Attivare la cifratura?",
-    "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 volta attivata, la cifratura di una stanza non può essere disattivata. I messaggi inviati in una stanza cifrata non possono essere letti dal server, solo dai partecipanti della stanza. L'attivazione della cifratura può impedire il corretto funzionamento di bot e bridge. <a>Maggiori informazioni sulla cifratura.</a>",
-    "To link to this room, please add an alias.": "Per creare un collegamento alla stanza, aggiungi un alias.",
+    "Enable encryption?": "Attivare la crittografia?",
+    "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 volta attivata, la crittografia di una stanza non può essere disattivata. I messaggi inviati in una stanza cifrata non possono essere letti dal server, solo dai partecipanti della stanza. L'attivazione della crittografia può impedire il corretto funzionamento di bot e bridge. <a>Maggiori informazioni sulla crittografia.</a>",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Le modifiche a chi può leggere la cronologia si applicheranno solo ai messaggi futuri in questa stanza. La visibilità della cronologia esistente rimarrà invariata.",
-    "Encryption": "Cifratura",
-    "Once enabled, encryption cannot be disabled.": "Una volta attivata, la cifratura non può essere disattivata.",
+    "Encryption": "Crittografia",
+    "Once enabled, encryption cannot be disabled.": "Una volta attivata, la crittografia non può essere disattivata.",
     "Encrypted": "Cifrato",
     "Never lose encrypted messages": "Non perdere mai i messaggi cifrati",
     "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "I messaggi in questa stanza sono protetti con crittografia end-to-end. Solo tu e i destinatari avete le chiavi per leggere questi messaggi.",
@@ -1258,10 +1161,6 @@
     "Don't ask me again": "Non chiedermelo più",
     "Error updating main address": "Errore di aggiornamento indirizzo principale",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Si è verificato un errore aggiornando l'indirizzo principale della stanza. Potrebbe non essere permesso dal server o un problema temporaneo.",
-    "Error creating alias": "Errore creazione alias",
-    "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "Si è verificato un errore nella creazione di quell'alias. Potrebbe non essere permesso dal server o si è verificato un errore temporaneo.",
-    "Error removing alias": "Errore rimozione alias",
-    "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "Si è verificato un errore nella rimozione di quell'alias. Potrebbe non esistere più o si è verificato un errore temporaneo.",
     "Main address": "Indirizzo principale",
     "Error updating flair": "Errore aggiornamento predisposizione",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Si è verificato un errore nell'aggiornamento della predisposizione di questa stanza. Potrebbe non essere permesso dal server o si è verificato un errore temporaneo.",
@@ -1270,12 +1169,6 @@
     "Room Topic": "Argomento stanza",
     "Join": "Entra",
     "Power level": "Livello poteri",
-    "Use Legacy Verification (for older clients)": "Usa verifica obsoleta (per i vecchi client)",
-    "Verify by comparing a short text string.": "Verifica confrontando una piccola porzione di testo.",
-    "Begin Verifying": "Inizia la verifica",
-    "Waiting for partner to accept...": "In attesa che il partner accetti...",
-    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Non compare niente? Non tutti i client supportano ancora la verifica interattiva. <button>Usa la verifica obsoleta</button>.",
-    "Use two-way text verification": "Usa la verifica testuale bidirezionale",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifica questo utente per contrassegnarlo come affidabile. La fiducia degli utenti offre una maggiore tranquillità quando si utilizzano messaggi cifrati end-to-end.",
     "Waiting for partner to confirm...": "In attesa che il partner confermi...",
     "Incoming Verification Request": "Richiesta di verifica in arrivo",
@@ -1289,17 +1182,12 @@
     "Go back": "Torna",
     "Room Settings - %(roomName)s": "Impostazioni stanza - %(roomName)s",
     "A username can only contain lower case letters, numbers and '=_-./'": "Un nome utente può contenere solo minuscole, numeri e '=_-./'",
-    "Recovery Key Mismatch": "La chiave di ripristino non corrisponde",
-    "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "Il backup non può essere decifrato con questa chiave: verifica di aver inserito la chiave di ripristino corretta.",
-    "Incorrect Recovery Passphrase": "Password di recupero sbagliata",
-    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "Il backup non può essere decifrato con questa password: verifica di aver inserito la password di ripristino corretta.",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Attenzione</b>: dovresti impostare il backup chiavi solo da un computer fidato.",
     "Share Permalink": "Condividi permalink",
     "Update status": "Stato aggiornamento",
     "Set status": "Imposta stato",
     "Hide": "Nascondi",
     "This homeserver would like to make sure you are not a robot.": "Questo homeserver vorrebbe assicurarsi che non sei un robot.",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "Puoi usare le opzioni server personalizzate per accedere ad altri server Matrix specificando un URL homeserver diverso. Ciò ti permette di usare questa app con un account Matrix esistente su un homeserver differente.",
     "Your Modular server": "Il tuo server Modular",
     "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Inserisci l'indirizzo del tuo homeserver Modular. Potrebbe usare il tuo nome di dominio o essere un sottodominio di <a>modular.im</a>.",
     "Server Name": "Nome server",
@@ -1321,7 +1209,7 @@
     "Premium hosting for organisations <a>Learn more</a>": "Hosting premium per organizzazioni <a>Maggior informazioni</a>",
     "Other": "Altro",
     "Find other public servers or use a custom server": "Trova altri server pubblici o usane uno personale",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Ti suggeriamo di installare <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> o <safariLink>Safari</safariLink> per la migliore esperienza.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Installa <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, o <safariLink>Safari</safariLink> per una migliore esperienza.",
     "Couldn't load page": "Caricamento pagina fallito",
     "Want more than a community? <a>Get your own server</a>": "Vuoi più di una comunità? <a>Ottieni il tuo server personale</a>",
     "This homeserver does not support communities": "Questo homeserver non supporta le comunità",
@@ -1338,15 +1226,8 @@
     "Unable to query for supported registration methods.": "Impossibile richiedere i metodi di registrazione supportati.",
     "Create your account": "Crea il tuo account",
     "Keep going...": "Continua...",
-    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "Salveremo una copia cifrata delle tue chiavi sul nostro server. Proteggi il tuo backup con una password per tenerlo al sicuro.",
     "For maximum security, this should be different from your account password.": "Per la massima sicurezza, questa dovrebbe essere diversa dalla password del tuo account.",
-    "Set up with a Recovery Key": "Imposta con una chiave di ripristino",
-    "Please enter your passphrase a second time to confirm.": "Inserisci la tua password un'altra volta per confermare.",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "La tua chiave di recupero è come una rete di sicurezza - puoi usarla per recuperare l'accesso ai tuoi messaggi cifrati se dimentichi la tua password.",
     "Your keys are being backed up (the first backup could take a few minutes).": "Il backup delle chiavi è in corso (il primo backup potrebbe richiedere qualche minuto).",
-    "Secure your backup with a passphrase": "Proteggi il tuo backup con una password",
-    "Confirm your passphrase": "Conferma la tua password",
-    "Recovery key": "Chiave di ripristino",
     "Starting backup...": "Avvio del backup...",
     "Success!": "Completato!",
     "A new recovery passphrase and key for Secure Messages have been detected.": "Sono state rilevate una nuova password di ripristino e una chiave per i messaggi sicuri.",
@@ -1369,13 +1250,12 @@
     "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.": "Un widget su %(widgetUrl)s vorrebbe verificare la tua identità. Se lo permetti, il widget sarà in grado di verificare il tuo ID utente, ma non di compiere azioni come te.",
     "Remember my selection for this widget": "Ricorda la mia scelta per questo widget",
     "Deny": "Nega",
-    "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot non è riuscito ad ottenere l'elenco di protocolli dall'homeserver. L'homeserver potrebbe essere troppo vecchio per supportare reti di terze parti.",
-    "Riot failed to get the public room list.": "Riot non è riuscito ad ottenere l'elenco di stanze pubbliche.",
+    "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s non è riuscito ad ottenere l'elenco di protocolli dall'homeserver. L'homeserver potrebbe essere troppo vecchio per supportare reti di terze parti.",
+    "%(brand)s failed to get the public room list.": "%(brand)s non è riuscito ad ottenere l'elenco di stanze pubbliche.",
     "The homeserver may be unavailable or overloaded.": "L'homeserver potrebbe non essere disponibile o sovraccarico.",
     "You have %(count)s unread notifications in a prior version of this room.|other": "Hai %(count)s notifiche non lette in una versione precedente di questa stanza.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Hai %(count)s notifiche non lette in una versione precedente di questa stanza.",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Che tu stia usando o meno la funzione 'breadcrumbs' (avatar sopra l'elenco delle stanze)",
-    "A conference call could not be started because the integrations server is not available": "Non è stato possibile avviare una conferenza perchè il server di integrazione non è disponibile",
     "Replying With Files": "Risposta con dei file",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Al momento non è possibile rispondere con un file. Vorresti inviare questo file senza rispondere?",
     "The file '%(fileName)s' failed to upload.": "Invio del file '%(fileName)s' fallito.",
@@ -1426,7 +1306,7 @@
     "Notes": "Note",
     "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 ci sono ulteriori dettagli che possono aiutare ad analizzare il problema, ad esempio cosa stavi facendo in quel momento, ID stanze, ID utenti, ecc., puoi includerli qui.",
     "View Servers in Room": "Vedi i server nella stanza",
-    "Sign out and remove encryption keys?": "Disconnettere e rimuovere le chiavi di cifratura?",
+    "Sign out and remove encryption keys?": "Disconnettere e rimuovere le chiavi di crittografia?",
     "To help us prevent this in future, please <a>send us logs</a>.": "Per aiutarci a prevenire questa cosa in futuro, <a>inviaci i log</a>.",
     "Missing session data": "Dati di sessione mancanti",
     "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Alcuni dati di sessione, incluse le chiavi dei messaggi cifrati, sono mancanti. Esci e riaccedi per risolvere, ripristinando le chiavi da un backup.",
@@ -1467,7 +1347,6 @@
     "Create your Matrix account on <underlinedServerName />": "Crea il tuo account Matrix su <underlinedServerName />",
     "Your Matrix account on <underlinedServerName />": "Il tuo account Matrix su <underlinedServerName />",
     "Low bandwidth mode": "Modalità larghezza di banda bassa",
-    "Show recently visited rooms above the room list": "Mostra le stanze visitate di recente sopra l'elenco stanze",
     "Uploaded sound": "Suono inviato",
     "Sounds": "Suoni",
     "Notification sound": "Suoni di notifica",
@@ -1476,8 +1355,8 @@
     "Browse": "Sfoglia",
     "Cannot reach homeserver": "Impossibile raggiungere l'homeserver",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Assicurati di avere una connessione internet stabile, o contatta l'amministratore del server",
-    "Your Riot is misconfigured": "Il tuo Riot è configurato male",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Chiedi al tuo amministratore di Riot di controllare <a>la tua configurazione</a> per voci non valide o doppie.",
+    "Your %(brand)s is misconfigured": "Il tuo %(brand)s è configurato male",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Chiedi al tuo amministratore di %(brand)s di controllare <a>la tua configurazione</a> per voci non valide o doppie.",
     "Cannot reach identity server": "Impossibile raggiungere il server identità",
     "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.": "Puoi registrarti, ma alcune funzioni non saranno disponibili finchè il server identità non sarà tornato online. Se continui a vedere questo avviso, controlla la tua configurazione o contatta un amministratore del server.",
     "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.": "Puoi ripristinare la password, ma alcune funzioni non saranno disponibili finchè il server identità non sarà tornato online. Se continui a vedere questo avviso, controlla la tua configurazione o contatta un amministratore del server.",
@@ -1578,7 +1457,7 @@
     "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Usa un server di identità per invitare via email. Clicca \"Continua\" per usare quello predefinito (%(defaultIdentityServerName)s) o gestiscilo nelle impostazioni.",
     "Use an identity server to invite by email. Manage in Settings.": "Usa un server di identità per invitare via email. Gestisci nelle impostazioni.",
     "Upgrade the room": "Aggiorna la stanza",
-    "Enable room encryption": "Attiva la cifratura della stanza",
+    "Enable room encryption": "Attiva la crittografia della stanza",
     "Deactivate user?": "Disattivare l'utente?",
     "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?": "Disattivare questo utente lo disconnetterà e ne impedirà nuovi accessi. In aggiunta, abbandonerà tutte le stanze in cui è presente. Questa azione non può essere annullata. Sei sicuro di volere disattivare questo utente?",
     "Deactivate user": "Disattiva utente",
@@ -1593,10 +1472,10 @@
     "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Si è verificato un errore cambiando il livello di poteri dell'utente. Assicurati di averne l'autorizzazione e riprova.",
     "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Si è verificato un errore (%(errcode)s) tentando di validare il tuo invito. Puoi provare a passare questa informazione ad un admin della stanza.",
     "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Questo invito per %(roomName)s è stato inviato a %(email)s , la quale non è associata al tuo account",
-    "Link this email with your account in Settings to receive invites directly in Riot.": "Collega questa email al tuo account nelle impostazioni per ricevere inviti direttamente in Riot.",
+    "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Collega questa email al tuo account nelle impostazioni per ricevere inviti direttamente in %(brand)s.",
     "This invite to %(roomName)s was sent to %(email)s": "Questo invito per %(roomName)s è stato inviato a %(email)s",
-    "Use an identity server in Settings to receive invites directly in Riot.": "Usa un server di identià nelle impostazioni per ricevere inviti direttamente in Riot.",
-    "Share this email in Settings to receive invites directly in Riot.": "Condividi questa email nelle impostazioni per ricevere inviti direttamente in Riot.",
+    "Use an identity server in Settings to receive invites directly in %(brand)s.": "Usa un server di identià nelle impostazioni per ricevere inviti direttamente in %(brand)s.",
+    "Share this email in Settings to receive invites directly in %(brand)s.": "Condividi questa email nelle impostazioni per ricevere inviti direttamente in %(brand)s.",
     "Change identity server": "Cambia Identity Server",
     "Disconnect from the identity server <current /> and connect to <new /> instead?": "Disconnettersi dall'Identity Server <current /> e connettesi invece a <new />?",
     "Disconnect identity server": "Disconnetti dall'Identity Server",
@@ -1620,14 +1499,9 @@
     "Send read receipts for messages (requires compatible homeserver to disable)": "Invia notifiche di lettura per i messaggi (richiede homeserver compatibile per disattivare)",
     "Verify the link in your inbox": "Verifica il link nella tua posta in arrivo",
     "Complete": "Completa",
-    "Room alias": "Alias stanza",
     "e.g. my-room": "es. mia-stanza",
-    "Please provide a room alias": "Inserisci un alias per la stanza",
-    "This alias is available to use": "Questo alias è disponibile",
-    "This alias is already in use": "Questo alias è già in uso",
     "Close dialog": "Chiudi finestra",
     "Please enter a name for the room": "Inserisci un nome per la stanza",
-    "Set a room alias to easily share your room with other people.": "Imposta un alias stanza per condividerla facilmente con gli altri.",
     "This room is private, and can only be joined by invitation.": "Questa stanza è privata ed è accessibile solo tramite invito.",
     "Create a public room": "Crea una stanza pubblica",
     "Create a private room": "Crea una stanza privata",
@@ -1680,7 +1554,7 @@
     "contact the administrators of identity server <idserver />": "contattare l'amministratore del server di identità <idserver />",
     "wait and try again later": "attendere e riprovare più tardi",
     "Failed to deactivate user": "Disattivazione utente fallita",
-    "This client does not support end-to-end encryption.": "Questo client non supporta la cifratura end-to-end.",
+    "This client does not support end-to-end encryption.": "Questo client non supporta la crittografia end-to-end.",
     "Messages in this room are not end-to-end encrypted.": "I messaggi in questa stanza non sono cifrati end-to-end.",
     "React": "Reagisci",
     "Frequently Used": "Usati di frequente",
@@ -1713,7 +1587,6 @@
     "Error adding ignored user/server": "Errore di aggiunta utente/server ignorato",
     "Something went wrong. Please try again or view your console for hints.": "Qualcosa è andato storto. Riprova o controlla la console per suggerimenti.",
     "Error subscribing to list": "Errore di iscrizione alla lista",
-    "Please verify the room ID or alias and try again.": "Verifica l'ID della stanza o l'alias e riprova.",
     "Error removing ignored user/server": "Errore di rimozione utente/server ignorato",
     "Error unsubscribing from list": "Errore di disiscrizione dalla lista",
     "Please try again or view your console for hints.": "Riprova o controlla la console per suggerimenti.",
@@ -1728,7 +1601,7 @@
     "View rules": "Vedi regole",
     "You are currently subscribed to:": "Attualmente sei iscritto a:",
     "⚠ These settings are meant for advanced users.": "⚠ Queste opzioni sono pensate per utenti esperti.",
-    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Aggiungi qui gli utenti e i server che vuoi ignorare. Usa l'asterisco perchè Riot consideri qualsiasi carattere. Ad esempio, <code>@bot:*</code> ignorerà tutti gli utenti che hanno il nome 'bot' su qualsiasi server.",
+    "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.": "Aggiungi qui gli utenti e i server che vuoi ignorare. Usa l'asterisco perchè %(brand)s consideri qualsiasi carattere. Ad esempio, <code>@bot:*</code> ignorerà tutti gli utenti che hanno il nome 'bot' su qualsiasi server.",
     "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.": "Si possono ignorare persone attraverso liste di ban contenenti regole per chi bandire. Iscriversi ad una lista di ban significa che gli utenti/server bloccati da quella lista ti verranno nascosti.",
     "Personal ban list": "Lista di ban personale",
     "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.": "La tua lista personale di ban contiene tutti gli utenti/server da cui non vuoi vedere messaggi. Dopo aver ignorato il tuo primo utente/server, apparirà una nuova stanza nel tuo elenco stanze chiamata 'Mia lista ban' - resta in questa stanza per mantenere effettiva la lista ban.",
@@ -1737,7 +1610,6 @@
     "Subscribed lists": "Liste sottoscritte",
     "Subscribing to a ban list will cause you to join it!": "Iscriversi ad una lista di ban implica di unirsi ad essa!",
     "If this isn't what you want, please use a different tool to ignore users.": "Se non è ciò che vuoi, usa uno strumento diverso per ignorare utenti.",
-    "Room ID or alias of ban list": "ID stanza o alias della lista di ban",
     "Subscribe": "Iscriviti",
     "Message Actions": "Azioni messaggio",
     "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Hai ignorato questo utente, perciò il suo messaggio è nascosto. <a>Mostra comunque.</a>",
@@ -1763,14 +1635,13 @@
     "Your avatar URL": "L'URL del tuo avatar",
     "Your user ID": "Il tuo ID utente",
     "Your theme": "Il tuo tema",
-    "Riot URL": "URL di Riot",
+    "%(brand)s URL": "URL di %(brand)s",
     "Room ID": "ID stanza",
     "Widget ID": "ID widget",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Usando questo widget i dati possono essere condivisi <helpIcon /> con %(widgetDomain)s e il tuo Gestore di Integrazione.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Usando questo widget i dati possono essere condivisi <helpIcon /> con %(widgetDomain)s.",
     "Widget added by": "Widget aggiunto da",
     "This widget may use cookies.": "Questo widget può usare cookie.",
-    "Enable local event indexing and E2EE search (requires restart)": "Attiva l'indicizzazione di eventi locali e la ricerca E2EE (richiede riavvio)",
     "Connecting to integration manager...": "Connessione al gestore di integrazioni...",
     "Cannot connect to integration manager": "Impossibile connettere al gestore di integrazioni",
     "The integration manager is offline or it cannot reach your homeserver.": "Il gestore di integrazioni è offline o non riesce a raggiungere il tuo homeserver.",
@@ -1778,12 +1649,12 @@
     "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Usa un gestore di integrazioni per gestire bot, widget e pacchetti di adesivi.",
     "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "I gestori di integrazione ricevono dati di configurazione e possono modificare widget, inviare inviti alla stanza, assegnare permessi a tuo nome.",
     "Failed to connect to integration manager": "Connessione al gestore di integrazioni fallita",
-    "Widgets do not use message encryption.": "I widget non usano la cifratura dei messaggi.",
+    "Widgets do not use message encryption.": "I widget non usano la crittografia dei messaggi.",
     "More options": "Altre opzioni",
     "Integrations are disabled": "Le integrazioni sono disattivate",
     "Enable 'Manage Integrations' in Settings to do this.": "Attiva 'Gestisci integrazioni' nelle impostazioni per continuare.",
     "Integrations not allowed": "Integrazioni non permesse",
-    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Il tuo Riot non ti permette di usare il gestore di integrazioni per questa azione. Contatta un amministratore.",
+    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Il tuo %(brand)s non ti permette di usare il gestore di integrazioni per questa azione. Contatta un amministratore.",
     "Reload": "Ricarica",
     "Take picture": "Scatta foto",
     "Remove for everyone": "Rimuovi per tutti",
@@ -1793,12 +1664,11 @@
     "Manage integrations": "Gestisci integrazioni",
     "Ignored/Blocked": "Ignorati/Bloccati",
     "Verification Request": "Richiesta verifica",
-    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
     "Match system theme": "Usa il tema di sistema",
-    "%(senderName)s placed a voice call.": "%(senderName)s ha effettuato una chiamata vocale.",
-    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s ha effettuato una chiamata vocale. (non supportata da questo browser)",
-    "%(senderName)s placed a video call.": "%(senderName)s ha effettuato una videochiamata.",
-    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s ha effettuato una videochiamata. (non supportata da questo browser)",
+    "%(senderName)s placed a voice call.": "%(senderName)s ha iniziato una telefonata.",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s ha iniziato una telefonata. (non supportata da questo browser)",
+    "%(senderName)s placed a video call.": "%(senderName)s ha iniziato una videochiamata.",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s ha iniziato una videochiamata. (non supportata da questo browser)",
     "Clear notifications": "Cancella le notifiche",
     "Customise your experience with experimental labs features. <a>Learn more</a>.": "Personalizza la tua esperienza con funzionalità sperimentali. <a>Maggiori informazioni</a>.",
     "Error upgrading room": "Errore di aggiornamento stanza",
@@ -1811,7 +1681,7 @@
     "Upgrade private room": "Aggiorna stanza privata",
     "Upgrade public room": "Aggiorna stanza pubblica",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Aggiornare una stanza è un'azione avanzata ed è consigliabile quando una stanza non è stabile a causa di errori, funzioni mancanti o vulnerabilità di sicurezza.",
-    "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Solitamente ciò influisce solo come la stanza viene elaborata sul server. Se stai riscontrando problemi con il tuo Riot, <a>segnala un errore</a>.",
+    "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>.": "Solitamente ciò influisce solo come la stanza viene elaborata sul server. Se stai riscontrando problemi con il tuo %(brand)s, <a>segnala un errore</a>.",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Aggiornerai questa stanza dalla <oldVersion /> alla <newVersion />.",
     "Upgrade": "Aggiorna",
     "Notification settings": "Impostazioni di notifica",
@@ -1833,7 +1703,6 @@
     "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ha modificato una regola che bandiva stanze corrispondenti a %(oldGlob)s per corrispondere a %(newGlob)s perchè %(reason)s",
     "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ha modificato una regola che bandiva server corrispondenti a %(oldGlob)s per corrispondere a %(newGlob)s perchè %(reason)s",
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s ha modificato una regola di ban che corrispondeva a %(oldGlob)s per corrispondere a %(newGlob)s perchè %(reason)s",
-    "Send cross-signing keys to homeserver": "Invia chiavi di firma incrociata all'homeserver",
     "Cross-signing public keys:": "Chiavi pubbliche di firma incrociata:",
     "not found": "non trovato",
     "Cross-signing private keys:": "Chiavi private di firma incrociata:",
@@ -1843,9 +1712,6 @@
     "Cross-signing": "Firma incrociata",
     "<userName/> wants to chat": "<userName/> vuole chattare",
     "Start chatting": "Inizia a chattare",
-    "Enter secret storage passphrase": "Inserisci la password dell'archivio segreto",
-    "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Impossibile accedere all'archivio segreto. Controlla di avere inserito la password corretta.",
-    "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Attenzione</b>: dovresti accedere all'archivio segreto solo da un computer fidato.",
     "Cross-signing and secret storage are enabled.": "La firma incrociata e l'archivio segreto sono attivi.",
     "Cross-signing and secret storage are not yet set up.": "La firma incrociata e l'archivio segreto non sono ancora impostati.",
     "not stored": "non salvato",
@@ -1856,19 +1722,11 @@
     "Hide verified sessions": "Nascondi sessioni verificate",
     "%(count)s verified sessions|other": "%(count)s sessioni verificate",
     "%(count)s verified sessions|one": "1 sessione verificata",
-    "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Se hai dimenticato la password puoi <button1>usare la tua chiave di recupero</button1> o <button2>impostare nuove opzioni di recupero</button2>.",
-    "Enter secret storage recovery key": "Inserisci la chiave di recupero dell'archivio segreto",
-    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Impossibile accedere all'archivio segreto. Controlla di avere inserito la chiave di recupero corretta.",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "Se hai dimenticato la tua chiave di recupero puoi <button>impostare nuove opzioni di recupero</button>.",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Attenzione</b>: dovresti impostare il backup chiavi solo da un computer fidato.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Se hai dimenticato la tua chiave di recupero puoi <button>impostare nuove opzioni di recupero</button>",
     "Set up with a recovery key": "Imposta con una chiave di recupero",
-    "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "Come àncora di salvezza, puoi usarla per recuperare l'accesso ai tuoi messaggi cifrati se dimentichi la password.",
-    "As a safety net, you can use it to restore your access to encrypted messages.": "Come àncora di salvezza, puoi usarla per recuperare l'accesso ai tuoi messaggi cifrati.",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "Tieni la chiave di recupero in un posto molto sicuro, come un gestore di password (o una cassaforte).",
     "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "La tua chiave di recupero è stata <b>copiata negli appunti</b>, incollala in:",
     "Your recovery key is in your <b>Downloads</b> folder.": "La chiave di recupero è nella tua cartella <b>Scaricati</b>.",
-    "Storing secrets...": "Memorizzo i segreti...",
     "Unable to set up secret storage": "Impossibile impostare un archivio segreto",
     "Close preview": "Chiudi anteprima",
     "Language Dropdown": "Lingua a tendina",
@@ -1896,7 +1754,6 @@
     "%(num)s hours from now": "%(num)s ore da adesso",
     "about a day from now": "circa un giorno da adesso",
     "%(num)s days from now": "%(num)s giorni da adesso",
-    "Show a presence dot next to DMs in the room list": "Mostra un punto di presenza accanto ai mess. diretti nell'elenco stanza",
     "Lock": "Lucchetto",
     "Bootstrap cross-signing and secret storage": "Inizializza firma incrociata e archivio segreto",
     "Failed to find the following users": "Impossibile trovare i seguenti utenti",
@@ -1909,9 +1766,6 @@
     "Something went wrong trying to invite the users.": "Qualcosa è andato storto provando ad invitare gli utenti.",
     "We couldn't invite those users. Please check the users you want to invite and try again.": "Impossibile invitare quegli utenti. Ricontrolla gli utenti che vuoi invitare e riprova.",
     "Recently Direct Messaged": "Contattati direttamente di recente",
-    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Se non riesci a trovare qualcuno, chiedi il nome utente (es. @utente:server.it) o <a>condividi questa stanza</a>.",
-    "Complete security": "Sicurezza completa",
-    "Verify this session to grant it access to encrypted messages.": "Verifica questa sessione per concederle accesso ai messaggi cifrati.",
     "Start": "Inizia",
     "Session verified": "Sessione verificata",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "La tua sessione ora è verificata. Ha accesso ai tuoi messaggi cifrati e gli altri utenti la vedranno come fidata.",
@@ -1920,9 +1774,6 @@
     "Verify User": "Verifica utente",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "Per maggiore sicurezza, verifica questo utente controllando un codice univoco sui vostri dispositivi.",
     "Start Verification": "Inizia la verifica",
-    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s ha aggiunto %(addedAddresses)s e %(count)s altri indirizzi a questa stanza",
-    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s ha rimosso %(removedAddresses)s e %(count)s altri indirizzi da questa stanza",
-    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s ha rimosso %(countRemoved)s e aggiunto %(countAdded)s indirizzi a questa stanza",
     "This room is end-to-end encrypted": "Questa stanza è cifrata end-to-end",
     "Everyone in this room is verified": "Tutti in questa stanza sono verificati",
     "Invite only": "Solo a invito",
@@ -1936,18 +1787,10 @@
     "Send as message": "Invia come messaggio",
     "Enter your account password to confirm the upgrade:": "Inserisci la password del tuo account per confermare l'aggiornamento:",
     "You'll need to authenticate with the server to confirm the upgrade.": "Dovrai autenticarti con il server per confermare l'aggiornamento.",
-    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Proteggi le chiavi di cifratura con una password. Per massima sicurezza questa dovrebbe essere diversa da quella del tuo account:",
-    "Enter a passphrase": "Inserisci una password",
-    "Enter your passphrase a second time to confirm it.": "Inserisci di nuovo la tua password per confermarla.",
-    "Verify other users in their profile.": "Verifica gli altri utenti nel loro profilo.",
-    "Upgrade your encryption": "Aggiorna la tua cifratura",
-    "Set up encryption": "Imposta la cifratura",
-    "Encryption upgraded": "Cifratura aggiornata",
-    "Encryption setup complete": "Impostazione cifratura completata",
+    "Upgrade your encryption": "Aggiorna la tua crittografia",
+    "Set up encryption": "Imposta la crittografia",
     "Verify this session": "Verifica questa sessione",
-    "Encryption upgrade available": "Aggiornamento cifratura disponibile",
-    "%(senderName)s turned on end-to-end encryption.": "%(senderName)s ha attivato la cifratura end-to-end.",
-    "%(senderName)s turned on end-to-end encryption (unrecognised algorithm %(algorithm)s).": "%(senderName)s ha attivato la cifratura end-to-end (algoritmo %(algorithm)s sconosciuto).",
+    "Encryption upgrade available": "Aggiornamento crittografia disponibile",
     "Enable message search in encrypted rooms": "Attiva la ricerca messaggi nelle stanze cifrate",
     "Waiting for %(displayName)s to verify…": "In attesa della verifica da %(displayName)s …",
     "They match": "Corrispondono",
@@ -1963,28 +1806,23 @@
     "Manage": "Gestisci",
     "Securely cache encrypted messages locally for them to appear in search results.": "Tieni in cache localmente i messaggi cifrati in modo sicuro affinché appaiano nei risultati di ricerca.",
     "Enable": "Attiva",
-    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "A Riot mancano alcuni componenti richiesti per tenere in cache i messaggi cifrati in modo sicuro. Se vuoi sperimentare questa funzionalità, compila un Riot Desktop personale con <nativeLink>i componenti di ricerca aggiunti</nativeLink>.",
-    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Ci sono sessioni sconosciute in questa stanza: se procedi senza verificarle, sarà possibile per qualcuno origliare la tua chiamata.",
-    "Unverified session": "Sessione non verificata",
+    "%(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)s mancano alcuni componenti richiesti per tenere in cache i messaggi cifrati in modo sicuro. Se vuoi sperimentare questa funzionalità, compila un %(brand)s Desktop personale con <nativeLink>i componenti di ricerca aggiunti</nativeLink>.",
     "Verifies a user, session, and pubkey tuple": "Verifica un utente, una sessione e una tupla pubblica",
     "Unknown (user, session) pair:": "Coppia (utente, sessione) sconosciuta:",
     "Session already verified!": "Sessione già verificata!",
     "WARNING: Session already verified, but keys do NOT MATCH!": "ATTENZIONE: sessione già verificata, ma le chiavi NON CORRISPONDONO!",
     "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!": "ATTENZIONE: VERIFICA CHIAVI FALLITA! La chiave per %(userId)s e per la sessione %(deviceId)s è \"%(fprint)s\" la quale non corriponde con la chiave \"%(fingerprint)s\" fornita. Ciò può significare che le comunicazioni vengono intercettate!",
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "La chiave che hai fornito corrisponde alla chiave che hai ricevuto dalla sessione di %(userId)s %(deviceId)s. Sessione contrassegnata come verificata.",
-    "Enable cross-signing to verify per-user instead of per-session (in development)": "Attiva la firma incrociata per la verifica per-utente invece di per-sessione (in sviluppo)",
     "Never send encrypted messages to unverified sessions from this session": "Non inviare mai messaggi cifrati a sessioni non verificate da questa sessione",
     "Never send encrypted messages to unverified sessions in this room from this session": "Non inviare mai messaggi cifrati a sessioni non verificate in questa stanza da questa sessione",
     "To be secure, do this in person or use a trusted way to communicate.": "Per sicurezza, fatelo di persona o usate un metodo fidato per comunicare.",
-    "Verify your other sessions easier": "Verifica facilmente le tue altre sessioni",
-    "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.": "Il cambio della password reimposterà qualsiasi chiave di cifratura end-to-end in tutte le sessioni, rendendo illeggibile la cronologia di chat, a meno che prima non esporti le chiavi della stanza e le reimporti dopo. In futuro questa cosa verrà migliorata.",
+    "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.": "Il cambio della password reimposterà qualsiasi chiave di crittografia end-to-end in tutte le sessioni, rendendo illeggibile la cronologia di chat, a meno che prima non esporti le chiavi della stanza e le reimporti dopo. In futuro questa cosa verrà migliorata.",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Il tuo account ha un'identità a firma incrociata nell'archivio segreto, ma non è ancora fidata da questa sessione.",
     "in memory": "in memoria",
     "Your homeserver does not support session management.": "Il tuo homeserver non supporta la gestione della sessione.",
     "Unable to load session list": "Impossibile caricare l'elenco sessioni",
     "Delete %(count)s sessions|other": "Elimina %(count)s sessioni",
     "Delete %(count)s sessions|one": "Elimina %(count)s sessione",
-    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot non può conservare in cache i messaggi cifrati in modo sicuro nella versione browser. Usa <riotLink>Riot Desktop</riotLink> affinché i messaggi cifrati appaiano nei risultati di ricerca.",
     "This session is backing up your keys. ": "Questa sessione sta facendo il backup delle tue chiavi. ",
     "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.": "Questa sessione <b>non sta facendo il backup delle tue chiavi</b>, ma hai un backup esistente dal quale puoi ripristinare e che puoi usare da ora in poi.",
     "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Connetti questa sessione al backup chiavi prima di disconnetterti per non perdere eventuali chiavi che possono essere solo in questa sessione.",
@@ -2000,15 +1838,9 @@
     "This backup is trusted because it has been restored on this session": "Questo backup è fidato perchè è stato ripristinato in questa sessione",
     "Space used:": "Spazio usato:",
     "Indexed messages:": "Messaggi indicizzati:",
-    "Number of rooms:": "Numero di stanze:",
     "Setting up keys": "Configurazione chiavi",
-    "Show padlocks on invite only rooms": "Mostra lucchetto nelle stanze solo a invito",
-    "Keep secret storage passphrase in memory for this session": "Tieni in memoria la password dell'archivio segreto per questa sessione",
     "How fast should messages be downloaded.": "Quanto veloce devono essere scaricati i messaggi.",
-    "Confirm the emoji below are displayed on both devices, in the same order:": "Conferma che le emoji sottostanti sono mostrate in entrambi i dispositivi, nello stesso ordine:",
-    "Verify this device by confirming the following number appears on its screen.": "Verifica questo dispositivo confermando che il seguente numero appare sullo schermo.",
     "Verify yourself & others to keep your chats safe": "Verifica te stesso e gli altri per mantenere sicure le chat",
-    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Backup chiavi salvato nell'archivio segreto, ma questa funzione non è attiva in questa sessione. Attiva la firma incrociata in Laboratori per modificare lo stato del backup chiavi.",
     "Your keys are <b>not being backed up from this session</b>.": "Il backup chiavi <b>non viene fatto per questa sessione</b>.",
     "Enable desktop notifications for this session": "Attiva le notifiche desktop per questa sessione",
     "Enable audible notifications for this session": "Attiva le notifiche audio per questa sessione",
@@ -2016,7 +1848,6 @@
     "Session ID:": "ID sessione:",
     "Session key:": "Chiave sessione:",
     "Message search": "Ricerca messaggio",
-    "Sessions": "Sessioni",
     "A session's public name is visible to people you communicate with": "Il nome pubblico di una sessione è visibile alle persone con cui comunichi",
     "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Questa stanza fa un bridge dei messaggi con le seguenti piattaforme. <a>Maggiori informazioni.</a>",
     "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Questa stanza non fa un bridge dei messaggi con alcuna piattaforma. <a>Maggiori informazioni.</a>",
@@ -2025,17 +1856,12 @@
     "You have not verified this user.": "Non hai verificato questo utente.",
     "You have verified this user. This user has verified all of their sessions.": "Hai verificato questo utente. Questo utente ha verificato tutte le sue sessioni.",
     "Someone is using an unknown session": "Qualcuno sta usando una sessione sconosciuta",
-    "Some sessions for this user are not trusted": "Alcune sessioni di questo utente non sono fidate",
-    "All sessions for this user are trusted": "Tutte le sessioni di questo utente sono fidate",
-    "Some sessions in this encrypted room are not trusted": "Alcune sessioni in questa stanza cifrata non sono fidate",
-    "All sessions in this encrypted room are trusted": "Tutte le sessioni in questa stanza cifrata sono fidate",
     "Your key share request has been sent - please check your other sessions for key share requests.": "La tua richiesta di condivisione chiavi è stata inviata - controlla le tue altre sessioni per le richieste.",
     "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.": "Le richieste di condivisione chiavi vengono inviate alle tue altre sessioni automaticamente. Se sulle altre sessioni l'hai rifiutata o annullata, clicca qui per chiedere di nuovo le chiavi per questa sessione.",
     "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Se le altre sessioni non hanno la chiave per questo messaggio non sarai in grado di decifrarlo.",
-    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Chiedi di nuovo le chiavi di cifratura</requestLink> dalle altre sessioni.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Chiedi di nuovo le chiavi di crittografia</requestLink> dalle altre sessioni.",
     "Encrypted by an unverified session": "Cifrato da una sessione non verificata",
     "Encrypted by a deleted session": "Cifrato da una sessione eliminata",
-    "No sessions with registered encryption keys": "Nessuna sessione con chiavi di cifratura registrate",
     "Waiting for %(displayName)s to accept…": "In attesa che %(displayName)s accetti…",
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "I tuoi messaggi sono protetti e solo tu ed il destinatario avete le chiavi univoche per sbloccarli.",
     "Your messages are not secure": "I tuoi messaggi non sono sicuri",
@@ -2053,65 +1879,40 @@
     "If you can't scan the code above, verify by comparing unique emoji.": "Se non riesci a scansionare il codice sopra, verifica confrontando emoji specifiche.",
     "You've successfully verified %(displayName)s!": "Hai verificato correttamente %(displayName)s!",
     "Got it": "Capito",
-    "Verification timed out. Start verification again from their profile.": "Verifica scaduta. Inizia di nuovo la verifica dal suo profilo.",
-    "%(displayName)s cancelled verification. Start verification again from their profile.": "%(displayName)s ha annullato la verifica. Inizia di nuovo la verifica dal suo profilo.",
-    "You cancelled verification. Start verification again from their profile.": "Hai annullato la verifica. Inizia di nuovo la verifica dal suo profilo.",
-    "Encryption enabled": "Cifratura attivata",
+    "Encryption enabled": "Crittografia attivata",
     "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "I messaggi in questa stanza sono cifrati end-to-end. Maggiori info e verifica di questo utente nel suo profilo.",
-    "Encryption not enabled": "Cifratura non attivata",
-    "The encryption used by this room isn't supported.": "La cifratura usata da questa stanza non è supportata.",
+    "Encryption not enabled": "Crittografia non attivata",
+    "The encryption used by this room isn't supported.": "La crittografia usata da questa stanza non è supportata.",
     "Clear all data in this session?": "Svuotare tutti i dati in questa sessione?",
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Lo svuotamento dei dati di questa sessione è permanente. I messaggi cifrati andranno persi a meno non si abbia un backup delle loro chiavi.",
     "Verify session": "Verifica sessione",
-    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Per verficare che questa sessione sia fidata, controlla che la chiave che vedi nelle impostazioni utente su quel dispositivo corrisponda a questa sotto:",
-    "To verify that this session can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this session matches the key below:": "Per verificare che questa sessione sia fidata, contatta il suo proprietario usando altri metodi (es. di persona o per telefono) e chiedi se la chiave che vede nelle sue impostazioni utente di questa sessione corrisponde con questa sotto:",
     "Session name": "Nome sessione",
     "Session key": "Chiave sessione",
-    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "Se corrisponde, premi il pulsante di verifica sottostante. Se non corrisponde, qualcuno sta intercettando questa sessione e dovresti invece premere il pulsante della lista nera.",
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "La verifica di questo utente contrassegnerà come fidata la sua sessione a te e viceversa.",
     "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 questo dispositivo per segnarlo come fidato. Fidarsi di questo dispositivo offre a te e agli altri utenti una maggiore tranquillità nell'uso di messaggi cifrati end-to-end.",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "La verifica di questo dispositivo lo segnerà come fidato e gli utenti che si sono verificati con te si fideranno di questo dispositivo.",
-    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Se non riesci a trovare qualcuno, chiedigli il nome utente, condividi il tuo (%(userId)s) o il <a>collegamento al profilo</a>.",
-    "You added a new session '%(displayName)s', which is requesting encryption keys.": "Hai aggiunto una nuova sessione '%(displayName)s', che sta chiedendo le chiavi di cifratura.",
-    "Your unverified session '%(displayName)s' is requesting encryption keys.": "La tua sessione non verificata '%(displayName)s' sta chiedendo le chiavi di cifratura.",
-    "Loading session info...": "Caricamento info di sessione...",
     "New session": "Nuova sessione",
     "Use this session to verify your new one, granting it access to encrypted messages:": "Usa questa sessione per verificare quella nuova, dandole accesso ai messaggi cifrati:",
     "If you didn’t sign in to this session, your account may be compromised.": "Se non hai fatto l'accesso a questa sessione, il tuo account potrebbe essere compromesso.",
     "This wasn't me": "Non ero io",
     "This will allow you to return to your account after signing out, and sign in on other sessions.": "Ciò ti permetterà di tornare al tuo account dopo la disconnessione e di accedere in altre sessioni.",
-    "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "Stai attualmente bloccando sessioni non verificate; per inviare messaggi a queste sessioni devi verificarle.",
-    "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Ti consigliamo di eseguire il processo di verifica per ogni sessione per confermare l'appartenenza al loro legittimo proprietario, ma puoi reinviare il messaggio senza la verifica se lo preferisci.",
-    "Room contains unknown sessions": "La stanza contiene sessioni sconosciute",
-    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "\"%(RoomName)s\" contiene sessioni che non hai mai visto prima.",
-    "Unknown sessions": "Sessioni sconosciute",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "Accedi alla tua cronologia di messaggi sicuri e all'identità a firma incrociata per verificare altre sessioni inserendo la tua password.",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Accedi alla tua cronologia di messaggi sicuri e all'identità a firma incrociata per verificare altre sessioni inserendo la tua chiave di recupero.",
     "Recovery key mismatch": "La chiave di recupero non corrisponde",
     "Incorrect recovery passphrase": "Password di recupero errata",
-    "Backup restored": "Backup ripristinato",
     "Enter recovery passphrase": "Inserisci password di recupero",
     "Enter recovery key": "Inserisci chiave di recupero",
     "Confirm your identity by entering your account password below.": "Conferma la tua identità inserendo la password dell'account sotto.",
-    "Message not sent due to unknown sessions being present": "Messaggio non inviato a causa della presenza di sessioni sconosciute",
-    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Mostra le sessioni</showSessionsText>, <sendAnywayText>invia comunque</sendAnywayText> o <cancelText>annulla</cancelText>.",
     "Your new session is now verified. Other users will see it as trusted.": "La tua nuova sessione è ora verificata. Gli altri utenti la vedranno come fidata.",
     "Without completing security on this session, it won’t have access to encrypted messages.": "Senza completare la sicurezza di questa sessione, essa non avrà accesso ai messaggi cifrati.",
-    "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.": "La modifica della password reimposterà qualsiasi chiave di cifratura end-to-end su tutte le sessioni, rendendo illeggibile la cronologia delle chat cifrate. Configura il Backup Chiavi o esporta le tue chiavi della stanza da un'altra sessione prima di reimpostare la 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.": "La modifica della password reimposterà qualsiasi chiave di crittografia end-to-end su tutte le sessioni, rendendo illeggibile la cronologia delle chat cifrate. Configura il Backup Chiavi o esporta le tue chiavi della stanza da un'altra sessione prima di reimpostare la password.",
     "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.": "Sei stato disconnesso da tutte le sessioni e non riceverai più notifiche push. Per riattivare le notifiche, riaccedi su ogni dispositivo.",
-    "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.": "Riprendi l'accesso al tuo account e recupera le chiavi di cifratura memorizzate in questa sessione. Senza di esse, non sarai in grado di leggere tutti i tuoi messaggi sicuri in qualsiasi sessione.",
-    "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.": "Attenzione: i tuoi dati personali (incluse le chiavi di cifratura) sono ancora memorizzati in questa sessione. Cancellali se hai finito di usare questa sessione o se vuoi accedere ad un altro account.",
-    "Sender session information": "Informazioni sessione del mittente",
-    "Restore your key backup to upgrade your encryption": "Ripristina il tuo backup chiavi per aggiornare la cifratura",
+    "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.": "Riprendi l'accesso al tuo account e recupera le chiavi di crittografia memorizzate in questa sessione. Senza di esse, non sarai in grado di leggere tutti i tuoi messaggi sicuri in qualsiasi sessione.",
+    "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.": "Attenzione: i tuoi dati personali (incluse le chiavi di crittografia) sono ancora memorizzati in questa sessione. Cancellali se hai finito di usare questa sessione o se vuoi accedere ad un altro account.",
+    "Restore your key backup to upgrade your encryption": "Ripristina il tuo backup chiavi per aggiornare la crittografia",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Aggiorna questa sessione per consentirle di verificare altre sessioni, garantendo loro l'accesso ai messaggi cifrati e contrassegnandole come fidate per gli altri utenti.",
-    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Imposta la cifratura su questa sessione per consentirle di verificare le altre sessioni, garantendo loro l'accesso ai messaggi cifrati e contrassegnandole come fidate per gli altri utenti.",
-    "Back up my encryption keys, securing them with the same passphrase": "Fai il backup delle mie chiavi di cifratura, proteggendole con la stessa password",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Conservane una copia in un luogo sicuro, come un gestore di password o una cassaforte.",
     "Your recovery key": "La tua chiave di recupero",
     "Copy": "Copia",
-    "You can now verify your other devices, and other users to keep your chats safe.": "Ora puoi verificare i tuoi altri dispositivi e gli altri utenti per tenere al sicuro le tue chat.",
     "Make a copy of your recovery key": "Fai una copia della chiave di recupero",
-    "You're done!": "Hai finito!",
     "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.": "Senza configurare il Recupero Messaggi Sicuri, non potrai ripristinare la cronologia di messaggi cifrati se ti disconnetti o se usi un'altra sessione.",
     "Create key backup": "Crea backup chiavi",
     "This session is encrypting history using the new recovery method.": "Questa sessione sta cifrando la cronologia usando il nuovo metodo di recupero.",
@@ -2119,23 +1920,16 @@
     "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 l'hai fatto accidentalmente, puoi configurare Messaggi Sicuri su questa sessione che cripterà nuovamente la cronologia dei messaggi con un nuovo metodo di recupero.",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Se disattivato, i messaggi delle stanze cifrate non appariranno nei risultati di ricerca.",
     "Disable": "Disattiva",
-    "Not currently downloading messages for any room.": "Nessuno scaricamento di messaggi in corso per alcuna stanza.",
-    "Downloading mesages for %(currentRoom)s.": "Scaricamento messaggi per %(currentRoom)s.",
-    "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot sta tenendo in cache localmente i messaggi cifrati in modo sicuro affinché appaiano nei risultati di ricerca:",
-    "of ": "di ",
+    "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s sta tenendo in cache localmente i messaggi cifrati in modo sicuro affinché appaiano nei risultati di ricerca:",
     "Message downloading sleep time(ms)": "Tempo di attesa scaricamento messaggi (ms)",
     "If you cancel now, you won't complete verifying the other user.": "Se adesso annulli, non completerai la verifica dell'altro utente.",
     "If you cancel now, you won't complete verifying your other session.": "Se adesso annulli, non completerai la verifica dell'altra tua sessione.",
-    "If you cancel now, you won't complete your secret storage operation.": "Se adesso annulli, non completerai l'operazione dell'archivio segreto.",
     "Cancel entering passphrase?": "Annullare l'inserimento della password?",
     "Mod": "Moderatore",
     "Indexed rooms:": "Stanze indicizzate:",
-    "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s di %(totalRooms)s",
-    "The version of Riot": "La versione di Riot",
-    "Whether you're using Riot on a device where touch is the primary input mechanism": "Se stai usando Riot su un dispositivo dove il tocco è il metodo di input principale",
-    "Whether you're using Riot as an installed Progressive Web App": "Se stai usando Riot installato come Web App Progressiva",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Se stai usando %(brand)s su un dispositivo dove il tocco è il metodo di input principale",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Se stai usando %(brand)s installato come Web App Progressiva",
     "Your user agent": "Il tuo user agent",
-    "The information being sent to us to help make Riot better includes:": "Le informazioni che ci vengono inviate per aiutarci a migliorare Riot includono:",
     "Show typing notifications": "Mostra notifiche di scrittura",
     "Verify this session by completing one of the following:": "Verifica questa sessione completando una delle seguenti cose:",
     "Scan this unique code": "Scansiona questo codice univoco",
@@ -2146,16 +1940,13 @@
     "Not Trusted": "Non fidato",
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) ha fatto l'accesso con una nuova sessione senza verificarla:",
     "Ask this user to verify their session, or manually verify it below.": "Chiedi a questo utente di verificare la sua sessione o verificala manualmente sotto.",
-    "Manually Verify": "Verifica manualmente",
     "Verify by scanning": "Verifica con la scansione",
     "Destroy cross-signing keys?": "Distruggere le chiavi di firma incrociata?",
     "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.": "L'eliminazione delle chiavi di firma incrociata è permanente. Chiunque si sia verificato con te vedrà avvisi di sicurezza. Quasi sicuramente non vuoi fare questa cosa, a meno che tu non abbia perso tutti i dispositivi da cui puoi fare l'accesso.",
     "Clear cross-signing keys": "Elimina chiavi di firma incrociata",
-    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "La sessione che stai cercando di verificare non supporta la scansione del codice QR o la verifica emoji, che sono supportate da Riot. Prova con un client diverso.",
+    "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.": "La sessione che stai cercando di verificare non supporta la scansione del codice QR o la verifica emoji, che sono supportate da %(brand)s. Prova con un client diverso.",
     "You declined": "Hai rifiutato",
     "%(name)s declined": "%(name)s ha rifiutato",
-    "accepting …": "accettazione …",
-    "declining …": "rifiuto …",
     "Your homeserver does not support cross-signing.": "Il tuo homeserver non supporta la firma incrociata.",
     "Homeserver feature support:": "Funzioni supportate dall'homeserver:",
     "exists": "esiste",
@@ -2179,7 +1970,6 @@
     "The internet connection either session is using": "La connessione internet di una sessione",
     "We recommend you change your password and recovery key in Settings immediately": "Ti consigliamo di cambiare immediatamente la password e la chiave di recupero nelle impostazioni",
     "Not currently indexing messages for any room.": "Attualmente non si stanno indicizzando i messaggi di alcuna stanza.",
-    "Currently indexing: %(currentRoom)s.": "Attualmente si indicizzano: %(currentRoom)s.",
     "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s di %(totalRooms)s",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s ha cambiato il nome della stanza da %(oldRoomName)s a %(newRoomName)s.",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s ha aggiunto gli indirizzi alternativi %(addresses)s per questa stanza.",
@@ -2190,18 +1980,12 @@
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s ha cambiato gli indirizzi principali ed alternativi per questa stanza.",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s ha cambiato gli indirizzi per questa stanza.",
     "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Si è verificato un errore aggiornando gli indirizzi alternativi della stanza. Potrebbe non essere consentito dal server o essere un errore temporaneo.",
-    "Alternative addresses for this room:": "Indirizzi alternativi per questa stanza:",
-    "This room has no alternative addresses": "Questa stanza non ha indirizzi alternativi",
-    "New address (e.g. #foo:domain)": "Nuovo indirizzo (es. #abc:dominio)",
-    "Local addresses (unmoderated content)": "Indirizzi locali (contenuto non moderato)",
     "Support adding custom themes": "Supporta l'aggiunta di temi personalizzati",
     "Invalid theme schema.": "Schema del tema non valido.",
     "Error downloading theme information.": "Errore scaricando informazioni sul tema.",
     "Theme added!": "Tema aggiunto!",
     "Custom theme URL": "URL tema personalizzato",
     "Add theme": "Aggiungi tema",
-    "You don't have permission to delete the alias.": "Non hai l'autorizzazione per eliminare l'alias.",
-    "Review Sessions": "Controlla sessioni",
     "Scroll to most recent messages": "Scorri ai messaggi più recenti",
     "Local address": "Indirizzo locale",
     "Published Addresses": "Indirizzi pubblicati",
@@ -2211,9 +1995,6 @@
     "New published address (e.g. #alias:server)": "Nuovo indirizzo pubblicato (es. #alias:server)",
     "Local Addresses": "Indirizzi locali",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Imposta gli indirizzi per la stanza affinché gli utenti la trovino attraverso il tuo homeserver (%(localDomain)s)",
-    "Open an existing session & use it to verify this one, granting it access to encrypted messages.": "Apri una sessione esistente e usala per verificare questa, dandole accesso ai messaggi cifrati.",
-    "Waiting…": "In attesa…",
-    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "Se non puoi accedere a nessuna, <button>usa la chiave di recupero o la password.</button>",
     "Enter a server name": "Inserisci il nome di un server",
     "Looks good": "Sembra giusto",
     "Can't find this server or its room list": "Impossibile trovare questo server o l'elenco delle sue stanze",
@@ -2234,10 +2015,9 @@
     "a new cross-signing key signature": "una nuova firma della chiave a firma incrociata",
     "a device cross-signing signature": "una firma incrociata di dispositivo",
     "a key signature": "una firma di chiave",
-    "Riot encountered an error during upload of:": "Riot ha riscontrato un errore durante l'invio di:",
+    "%(brand)s encountered an error during upload of:": "%(brand)s ha riscontrato un errore durante l'invio di:",
     "Upload completed": "Invio completato",
     "Cancelled signature upload": "Invio della firma annullato",
-    "Unabled to upload": "Impossibile inviare",
     "Signature upload success": "Firma inviata correttamente",
     "Signature upload failed": "Invio della firma fallito",
     "Navigation": "Navigazione",
@@ -2252,7 +2032,6 @@
     "Toggle Bold": "Grassetto sì/no",
     "Toggle Italics": "Corsivo sì/no",
     "Toggle Quote": "Cita sì/no",
-    "Toggle Markdown": "Markdown sì/no",
     "New line": "Nuova riga",
     "Navigate recent messages to edit": "Naviga i messaggi recenti da modificare",
     "Jump to start/end of the composer": "Salta all'inizio/fine del compositore",
@@ -2279,9 +2058,6 @@
     "End": "Fine",
     "Manually Verify by Text": "Verifica manualmente con testo",
     "Interactively verify by Emoji": "Verifica interattivamente con emoji",
-    "Secret Storage key format:": "Formato chiave di archivio segreto:",
-    "outdated": "non aggiornato",
-    "up to date": "aggiornato",
     "Confirm by comparing the following with the User Settings in your other session:": "Conferma confrontando il seguente con le impostazioni utente nell'altra sessione:",
     "Confirm this user's session by comparing the following with their User Settings:": "Conferma questa sessione confrontando il seguente con le sue impostazioni utente:",
     "If they don't match, the security of your communication may be compromised.": "Se non corrispondono, la sicurezza delle tue comunicazioni potrebbe essere compromessa.",
@@ -2289,9 +2065,7 @@
     "Previous/next unread room or DM": "Stanza o msg non letti successivi/precedenti",
     "Previous/next room or DM": "Stanza o msg successivi/precedenti",
     "Toggle right panel": "Apri/chiudi pannello a destra",
-    "Unverified login. Was this you?": "Accesso non verificato. Eri tu?",
     "Manually verify all remote sessions": "Verifica manualmente tutte le sessioni remote",
-    "Update your secure storage": "Aggiorna la tua archiviazione sicura",
     "Self signing private key:": "Chiave privata di auto-firma:",
     "cached locally": "in cache locale",
     "not found locally": "non trovato in locale",
@@ -2343,7 +2117,7 @@
     "Click the button below to confirm deleting these sessions.|one": "Clicca il pulsante sottostante per confermare l'eliminazione di questa sessione.",
     "Delete sessions|other": "Elimina sessioni",
     "Delete sessions|one": "Elimina sessione",
-    "Enable end-to-end encryption": "Attiva cifratura end-to-end",
+    "Enable end-to-end encryption": "Attiva crittografia end-to-end",
     "You can’t disable this later. Bridges & most bots won’t work yet.": "Non potrai più disattivarla. I bridge e molti bot non funzioneranno.",
     "Confirm your account deactivation by using Single Sign On to prove your identity.": "Conferma la disattivazione del tuo account usando Single Sign On per dare prova della tua identità.",
     "Are you sure you want to deactivate your account? This is irreversible.": "Sei sicuro di volere disattivare il tuo account? È irreversibile.",
@@ -2359,46 +2133,285 @@
     "Failed to set topic": "Impostazione argomento fallita",
     "Command failed": "Comando fallito",
     "Could not find user in room": "Utente non trovato nella stanza",
-    "Use an existing session to verify this one, granting it access to encrypted messages.": "Usa una sessione esistente per verificare questa, dandole l'accesso ai messaggi cifrati.",
-    "Use your other device to continue…": "Usa il tuo altro dispositivo per continuare…",
     "Syncing...": "Sincronizzazione...",
     "Signing In...": "Accesso...",
     "If you've joined lots of rooms, this might take a while": "Se sei dentro a molte stanze, potrebbe impiegarci un po'",
     "If you cancel now, you won't complete your operation.": "Se annulli adesso, non completerai l'operazione.",
     "Please supply a widget URL or embed code": "Inserisci un URL del widget o un codice di incorporamento",
     "Send a bug report with logs": "Invia una segnalazione di errore con i registri",
-    "Enable cross-signing to verify per-user instead of per-session": "Attiva la firma incrociata per verificare per-utente invece di per-sessione",
-    "Keep recovery passphrase in memory for this session": "Tieni la password di ripristino in memoria per questa sessione",
     "Can't load this message": "Impossibile caricare questo messaggio",
     "Submit logs": "Invia registri",
     "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Promemoria: il tuo browser non è supportato, perciò la tua esperienza può essere imprevedibile.",
     "Unable to upload": "Impossibile inviare",
     "Verify other session": "Verifica l'altra sessione",
     "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Impossibile accedere all'archivio segreto. Verifica di avere inserito la password di ripristino giusta.",
-    "<b>Warning</b>: You should only do this on a trusted computer.": "<b>Attenzione</b>: dovresti farlo solo con un computer fidato.",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Accedi alla cronologia dei messaggi sicuri e all'identità di firma incrociata per verificare altre sessioni inserendo la password di ripristino.",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Se hai dimenticato la password di ripristino puoi <button1>usare la chiave di ripristino</button1> o <button2>configurare nuove opzioni di recupero</button2>.",
     "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Impossibile decifrare il backup con questa chiave di ripristino: verifica di avere inserito la chiave di ripristino giusta.",
     "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Impossibile decifrare il backup con questa password di ripristino: verifica di avere inserito la password di ripristino giusta.",
-    "If you can’t access one, <button>use your recovery key or recovery passphrase.</button>": "Se non riesci ad accedere, <button>usa la chiave o password di ripristino.</button>",
     "Great! This recovery passphrase looks strong enough.": "Ottimo! Questa password di ripristino sembra abbastanza robusta.",
-    "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:": "Imposta una password di ripristino per proteggere le informazioni cifrate e recuperarle se ti disconnetti. Dovrebbe essere diversa dalla password dell'account:",
     "Enter a recovery passphrase": "Inserisci una password di ripristino",
-    "Back up encrypted message keys": "Fai un backup delle chiavi dei messaggi cifrati",
     "Enter your recovery passphrase a second time to confirm it.": "Inserisci di nuovo la password di ripristino per confermarla.",
     "Confirm your recovery passphrase": "Conferma la password di ripristino",
     "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "La chiave di ripristino è come una rete di sicurezza - puoi usarla per recuperare l'accesso ai messaggi cifrati se dimentichi la password di ripristino.",
     "Unable to query secret storage status": "Impossibile rilevare lo stato dell'archivio segreto",
-    "Confirm recovery passphrase": "Conferma la password di ripristino",
     "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Salveremo una copia cifrata delle tue chiavi sul nostro server. Proteggi il tuo backup con una password di ripristino.",
-    "Enter a recovery passphrase...": "Inserisci una password di ripristino...",
     "Please enter your recovery passphrase a second time to confirm.": "Inserisci di nuovo la password di ripristino per confermarla.",
     "Repeat your recovery passphrase...": "Ripeti la password di ripristino...",
     "Secure your backup with a recovery passphrase": "Proteggi il backup con una password di ripristino",
     "Currently indexing: %(currentRoom)s": "Attualmente si indicizzano: %(currentRoom)s",
     "Verify this login": "Verifica questo accesso",
     "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Conferma la tua identità verificando questo accesso da una delle tue altre sessioni, dandogli l'accesso ai messaggi cifrati.",
-    "This requires the latest Riot on your other devices:": "È richiesta l'ultima versione di Riot sui tuoi altri dispositivi:",
+    "This requires the latest %(brand)s on your other devices:": "È richiesta l'ultima versione di %(brand)s sui tuoi altri dispositivi:",
     "or another cross-signing capable Matrix client": "o un altro client Matrix che supporti la firma incrociata",
-    "Use Recovery Passphrase or Key": "Usa la password di ripristino o la chiave"
+    "Review where you’re logged in": "Controlla dove hai fatto l'accesso",
+    "Where you’re logged in": "Dove hai fatto l'accesso",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Gestisci i nomi e disconnettiti dalle tue sessioni sotto o <a>verificale nel tuo profilo utente</a>.",
+    "New login. Was this you?": "Nuovo accesso. Eri tu?",
+    "Verify all your sessions to ensure your account & messages are safe": "Verifica tutte le tue sessioni per assicurarti che il tuo account e i messaggi siano protetti",
+    "Verify the new login accessing your account: %(name)s": "Verifica il nuovo accesso entrando nel tuo account: %(name)s",
+    "Restoring keys from backup": "Ripristino delle chiavi dal backup",
+    "Fetching keys from server...": "Ricezione delle chiavi dal server...",
+    "%(completed)s of %(total)s keys restored": "%(completed)s di %(total)s chiavi ripristinate",
+    "Keys restored": "Chiavi ripristinate",
+    "Successfully restored %(sessionCount)s keys": "Ripristinate %(sessionCount)s chiavi correttamente",
+    "You signed in to a new session without verifying it:": "Hai fatto l'accesso ad una nuova sessione senza verificarla:",
+    "Verify your other session using one of the options below.": "Verifica la tua altra sessione usando una delle opzioni sotto.",
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Invita qualcuno usando il suo nome, nome utente (come <userId/>), indirizzo email o <a>condividi questa stanza</a>.",
+    "Message deleted": "Messaggio eliminato",
+    "Message deleted by %(name)s": "Messaggio eliminato da %(name)s",
+    "Opens chat with the given user": "Apre una chat con l'utente specificato",
+    "Sends a message to the given user": "Invia un messaggio all'utente specificato",
+    "Waiting for your other session to verify…": "In attesa che la tua altra sessione verifichi…",
+    "You've successfully verified your device!": "Hai verificato correttamente il tuo dispositivo!",
+    "To continue, use Single Sign On to prove your identity.": "Per continuare, usa Single Sign On per provare la tua identità.",
+    "Confirm to continue": "Conferma per continuare",
+    "Click the button below to confirm your identity.": "Clicca il pulsante sotto per confermare la tua identità.",
+    "Confirm encryption setup": "Conferma impostazione crittografia",
+    "Click the button below to confirm setting up encryption.": "Clicca il pulsante sotto per confermare l'impostazione della crittografia.",
+    "QR Code": "Codice QR",
+    "Dismiss read marker and jump to bottom": "Scarta il segno di lettura e salta alla fine",
+    "Jump to oldest unread message": "Salta al messaggio non letto più vecchio",
+    "Upload a file": "Invia un file",
+    "IRC display name width": "Larghezza nome di IRC",
+    "Create room": "Crea stanza",
+    "Font scaling": "Ridimensionamento carattere",
+    "Font size": "Dimensione carattere",
+    "Size must be a number": "La dimensione deve essere un numero",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "La dimensione del carattere personalizzata può solo essere tra %(min)s pt e %(max)s pt",
+    "Use between %(min)s pt and %(max)s pt": "Usa tra %(min)s pt e %(max)s pt",
+    "Appearance": "Aspetto",
+    "Room name or address": "Nome stanza o indirizzo",
+    "Joins room with given address": "Accede alla stanza con l'indirizzo dato",
+    "Unrecognised room address:": "Indirizzo stanza non riconosciuto:",
+    "Please verify the room ID or address and try again.": "Verifica l'ID o l'indirizzo della stanza e riprova.",
+    "Room ID or address of ban list": "ID o indirizzo stanza della lista ban",
+    "To link to this room, please add an address.": "Per collegare a questa stanza, aggiungi un indirizzo.",
+    "Error creating address": "Errore creazione indirizzo",
+    "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "Si è verificato un errore creando l'indirizzo. Potrebbe non essere permesso dal server o un problema temporaneo.",
+    "You don't have permission to delete the address.": "Non hai l'autorizzazione per eliminare l'indirizzo.",
+    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Si è verificato un errore rimuovendo l'indirizzo. Potrebbe non esistere più o essere un problema temporaneo.",
+    "Error removing address": "Errore rimozione indirizzo",
+    "Categories": "Categorie",
+    "Room address": "Indirizzo stanza",
+    "Please provide a room address": "Inserisci un indirizzo della stanza",
+    "This address is available to use": "Questo indirizzo è disponibile per l'uso",
+    "This address is already in use": "Questo indirizzo è già in uso",
+    "Set a room address to easily share your room with other people.": "Imposta un indirizzo della stanza per condividerla facilmente con le altre persone.",
+    "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.": "Hai precedentemente usato una versione più recente di %(brand)s con questa sessione. Per usare ancora questa versione con la crittografia end to end, dovrai disconnetterti e riaccedere.",
+    "Address (optional)": "Indirizzo (facoltativo)",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "Eliminare l'indirizzo della stanza %(alias)s e rimuovere %(name)s dalla cartella?",
+    "delete the address.": "elimina l'indirizzo.",
+    "Use a different passphrase?": "Usare una password diversa?",
+    "Help us improve %(brand)s": "Aiutaci a migliorare %(brand)s",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Invia <UsageDataLink>dati di utilizzo anonimi</UsageDataLink> che ci aiutano a migliorare %(brand)s. Verrà usato un <PolicyLink>cookie</PolicyLink>.",
+    "I want to help": "Voglio aiutare",
+    "Your homeserver has exceeded its user limit.": "Il tuo homeserver ha superato il limite di utenti.",
+    "Your homeserver has exceeded one of its resource limits.": "Il tuo homeserver ha superato uno dei suoi limiti di risorse.",
+    "Contact your <a>server admin</a>.": "Contatta il tuo <a>amministratore del server</a>.",
+    "Ok": "Ok",
+    "Set password": "Imposta password",
+    "To return to your account in future you need to set a password": "Per tornare nel tuo account in futuro, devi impostare una password",
+    "Restart": "Riavvia",
+    "Upgrade your %(brand)s": "Aggiorna %(brand)s",
+    "A new version of %(brand)s is available!": "È disponibile una nuova versione di %(brand)s!",
+    "New version available. <a>Update now.</a>": "Nuova versione disponibile. <a>Aggiorna ora.</a>",
+    "Emoji picker": "Selettore emoji",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "L'amministratore del server ha disattivato la crittografia end-to-end in modo predefinito nelle stanze private e nei messaggi diretti.",
+    "People": "Persone",
+    "Switch to light mode": "Passa alla modalità chiara",
+    "Switch to dark mode": "Passa alla modalità scura",
+    "Switch theme": "Cambia tema",
+    "Security & privacy": "Sicurezza e privacy",
+    "All settings": "Tutte le impostazioni",
+    "Feedback": "Feedback",
+    "No recently visited rooms": "Nessuna stanza visitata di recente",
+    "Sort by": "Ordina per",
+    "Unread rooms": "Stanze non lette",
+    "Show": "Mostra",
+    "Message preview": "Anteprima messaggio",
+    "List options": "Opzioni lista",
+    "Show %(count)s more|other": "Mostra altri %(count)s",
+    "Show %(count)s more|one": "Mostra %(count)s altro",
+    "Leave Room": "Lascia stanza",
+    "Room options": "Opzioni stanza",
+    "Activity": "Attività",
+    "A-Z": "A-Z",
+    "Light": "Chiaro",
+    "Dark": "Scuro",
+    "Customise your appearance": "Personalizza l'aspetto",
+    "Appearance Settings only affect this %(brand)s session.": "Le impostazioni dell'aspetto hanno effetto solo in questa sessione di %(brand)s.",
+    "Looks good!": "Sembra giusta!",
+    "Use Recovery Key or Passphrase": "Usa la chiave o password di recupero",
+    "Use Recovery Key": "Usa chiave di recupero",
+    "Use the improved room list (will refresh to apply changes)": "Usa l'elenco stanze migliorato (verrà ricaricato per applicare le modifiche)",
+    "Use custom size": "Usa dimensione personalizzata",
+    "Hey you. You're the best!": "Ehi tu. Sei il migliore!",
+    "Message layout": "Layout messaggio",
+    "Compact": "Compatto",
+    "Modern": "Moderno",
+    "Use a system font": "Usa un carattere di sistema",
+    "System font name": "Nome carattere di sistema",
+    "The authenticity of this encrypted message can't be guaranteed on this device.": "L'autenticità di questo messaggio cifrato non può essere garantita su questo dispositivo.",
+    "You joined the call": "Ti sei unito alla chiamata",
+    "%(senderName)s joined the call": "%(senderName)s si è unito alla chiamata",
+    "Call in progress": "Chiamata in corso",
+    "You left the call": "Hai abbandonato la chiamata",
+    "%(senderName)s left the call": "%(senderName)s ha abbandonato la chiamata",
+    "Call ended": "Chiamata terminata",
+    "You started a call": "Hai iniziato una chiamata",
+    "%(senderName)s started a call": "%(senderName)s ha iniziato una chiamata",
+    "Waiting for answer": "In attesa di risposta",
+    "%(senderName)s is calling": "%(senderName)s sta chiamando",
+    "You created the room": "Hai creato la stanza",
+    "%(senderName)s created the room": "%(senderName)s ha creato la stanza",
+    "You made the chat encrypted": "Hai reso la chat crittografata",
+    "%(senderName)s made the chat encrypted": "%(senderName)s ha reso la chat crittografata",
+    "You made history visible to new members": "Hai reso visibile la cronologia ai nuovi membri",
+    "%(senderName)s made history visible to new members": "%(senderName)s ha reso visibile la cronologia ai nuovi membri",
+    "You made history visible to anyone": "Hai reso visibile la cronologia a chiunque",
+    "%(senderName)s made history visible to anyone": "%(senderName)s ha reso visibile la cronologia a chiunque",
+    "You made history visible to future members": "Hai reso visibile la cronologia ai membri futuri",
+    "%(senderName)s made history visible to future members": "%(senderName)s ha reso visibile la cronologia ai membri futuri",
+    "You were invited": "Sei stato invitato",
+    "%(targetName)s was invited": "%(targetName)s è stato invitato",
+    "You left": "Sei uscito",
+    "%(targetName)s left": "%(targetName)s è uscito",
+    "You were kicked (%(reason)s)": "Sei stato buttato fuori (%(reason)s)",
+    "%(targetName)s was kicked (%(reason)s)": "%(targetName)s è stato buttato fuori (%(reason)s)",
+    "You were kicked": "Sei stato buttato fuori",
+    "%(targetName)s was kicked": "%(targetName)s è stato buttato fuori",
+    "You rejected the invite": "Hai rifiutato l'invito",
+    "%(targetName)s rejected the invite": "%(targetName)s ha rifiutato l'invito",
+    "You were uninvited": "Ti è stato revocato l'invito",
+    "%(targetName)s was uninvited": "È stato revocato l'invito a %(targetName)s",
+    "You were banned (%(reason)s)": "Sei stato bandito (%(reason)s)",
+    "%(targetName)s was banned (%(reason)s)": "%(targetName)s è stato bandito (%(reason)s)",
+    "You were banned": "Sei stato bandito",
+    "%(targetName)s was banned": "%(targetName)s è stato bandito",
+    "You joined": "Ti sei unito",
+    "%(targetName)s joined": "%(targetName)s si è unito",
+    "You changed your name": "Hai cambiato il tuo nome",
+    "%(targetName)s changed their name": "%(targetName)s ha cambiato il suo nome",
+    "You changed your avatar": "Hai cambiato il tuo avatar",
+    "%(targetName)s changed their avatar": "%(targetName)s ha cambiato il suo avatar",
+    "%(senderName)s %(emote)s": "%(senderName)s %(emote)s",
+    "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
+    "You changed the room name": "Hai cambiato il nome della stanza",
+    "%(senderName)s changed the room name": "%(senderName)s ha cambiato il nome della stanza",
+    "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
+    "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
+    "You uninvited %(targetName)s": "Hai revocato l'invito a %(targetName)s",
+    "%(senderName)s uninvited %(targetName)s": "%(senderName)s ha revocato l'invito a %(targetName)s",
+    "You invited %(targetName)s": "Hai invitato %(targetName)s",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s ha invitato %(targetName)s",
+    "You changed the room topic": "Hai cambiato l'argomento della stanza",
+    "%(senderName)s changed the room topic": "%(senderName)s ha cambiato l'argomento della stanza",
+    "New spinner design": "Nuovo design dello spinner",
+    "Use a more compact ‘Modern’ layout": "Usa un layout più compatto e moderno",
+    "Always show first": "Mostra sempre per prime",
+    "Message deleted on %(date)s": "Messaggio eliminato il %(date)s",
+    "Use your account to sign in to the latest version": "Usa il tuo account per accedere alla versione più recente",
+    "We’re excited to announce Riot is now Element": "Siamo entusiasti di annunciare che Riot ora si chiama Element",
+    "Riot is now Element!": "Riot ora si chiama Element!",
+    "Learn More": "Maggiori info",
+    "Enable experimental, compact IRC style layout": "Attiva il layout in stile IRC, sperimentale e compatto",
+    "Unknown caller": "Chiamante sconosciuto",
+    "Incoming voice call": "Telefonata in arrivo",
+    "Incoming video call": "Videochiamata in arrivo",
+    "Incoming call": "Chiamata in arrivo",
+    "%(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 non può tenere in cache i messaggi cifrati quando usato in un browser web. Usa <desktopLink>%(brand)s Desktop</desktopLink> affinché i messaggi cifrati appaiano nei risultati di ricerca.",
+    "There are advanced notifications which are not shown here.": "Ci sono notifiche avanzate che non vengono mostrate qui.",
+    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Potresti averle configurate in un client diverso da %(brand)s. Non puoi regolarle in %(brand)s ma sono comunque applicate.",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Imposta il nome di un font installato nel tuo sistema e %(brand)s proverà ad usarlo.",
+    "Make this room low priority": "Rendi questa stanza a bassa priorità",
+    "Low priority rooms show up at the bottom of your room list in a dedicated section at the bottom of your room list": "Le stanze a bassa priorità vengono mostrate in fondo all'elenco stanze in una sezione dedicata",
+    "Use default": "Usa predefinito",
+    "Mentions & Keywords": "Citazioni e parole chiave",
+    "Notification options": "Opzioni di notifica",
+    "Favourited": "Preferito",
+    "Forget Room": "Dimentica stanza",
+    "Use your account to sign in to the latest version of the app at <a />": "Usa il tuo account per accedere alla versione più recente dell'app in <a />",
+    "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>.": "Hai già fatto l'accesso e sei pronto ad iniziare, ma puoi anche ottenere le versioni più recenti dell'app su tutte le piattaforme in <a>element.io/get-started</a>.",
+    "Go to Element": "Vai su Element",
+    "We’re excited to announce Riot is now Element!": "Siamo entusiasti di annunciare che Riot ora si chiama Element!",
+    "Learn more at <a>element.io/previously-riot</a>": "Maggiori informazioni su <a>element.io/previously-riot</a>",
+    "Wrong file type": "Tipo di file errato",
+    "Wrong Recovery Key": "Chiave di ripristino errata",
+    "Invalid Recovery Key": "Chiave di ripristino non valida",
+    "Security Phrase": "Frase di sicurezza",
+    "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Inserisci una frase di sicurezza o <button>Usa la tua chiave di sicurezza</button> per continuare.",
+    "Security Key": "Chiave di sicurezza",
+    "Use your Security Key to continue.": "Usa la tua chiave di sicurezza per continuare.",
+    "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.": "Puoi usare le opzioni di server personalizzato per accedere ad altri server Matrix, specificando un URL diverso di homeserver. Ciò ti consente di usare %(brand)s con un account Matrix esistente su un homeserver diverso.",
+    "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>.": "Inserisci la posizione del tuo homeserver di Element Matrix Services. Potrebbe usare il tuo nome di dominio o essere un sottodominio di <a>element.io</a>.",
+    "Search rooms": "Cerca stanze",
+    "User menu": "Menu utente",
+    "%(brand)s Web": "%(brand)s Web",
+    "%(brand)s Desktop": "%(brand)s Desktop",
+    "%(brand)s iOS": "%(brand)s iOS",
+    "%(brand)s X for Android": "%(brand)s X per Android",
+    "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Proteggiti contro la perdita dell'accesso ai messaggi e dati cifrati facendo un backup delle chiavi crittografiche sul tuo server.",
+    "Generate a Security Key": "Genera una chiave di sicurezza",
+    "We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "Genereremo per te una chiave di sicurezza da conservare in un posto sicuro, come un gestore di password o una cassaforte.",
+    "Enter a Security Phrase": "Inserisci una frase di sicurezza",
+    "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Usa una frase segreta che conosci solo tu e salva facoltativamente una chiave di sicurezza da usare come backup.",
+    "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.": "Inserisci una frase di sicurezza che conosci solo tu, dato che è usata per proteggere i tuoi dati. Per sicurezza, non dovresti riutilizzare la password dell'account.",
+    "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "Conserva la chiave di sicurezza in un posto sicuro, come un gestore di password o una cassaforte, dato che è usata per proteggere i tuoi dati cifrati.",
+    "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Se annulli ora, potresti perdere i messaggi e dati cifrati in caso tu perda l'accesso ai tuoi login.",
+    "You can also set up Secure Backup & manage your keys in Settings.": "Puoi anche impostare il Backup Sicuro e gestire le tue chiavi nelle impostazioni.",
+    "Set up Secure backup": "Imposta il Backup Sicuro",
+    "Set a Security Phrase": "Imposta una frase di sicurezza",
+    "Confirm Security Phrase": "Conferma frase di sicurezza",
+    "Save your Security Key": "Salva la tua chiave di sicurezza",
+    "This room is public": "Questa stanza è pubblica",
+    "Away": "Assente",
+    "Enable advanced debugging for the room list": "Attiva il debug avanzato per l'elenco di stanze",
+    "Show rooms with unread messages first": "Mostra prima le stanze con messaggi non letti",
+    "Show previews of messages": "Mostra anteprime dei messaggi",
+    "Edited at %(date)s": "Modificato il %(date)s",
+    "Click to view edits": "Clicca per vedere le modifiche",
+    "Are you sure you want to cancel entering passphrase?": "Sei sicuro di volere annullare l'inserimento della frase?",
+    "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
+    "Custom Tag": "Etichetta personalizzata",
+    "The person who invited you already left the room.": "La persona che ti ha invitato è già uscita dalla stanza.",
+    "The person who invited you already left the room, or their server is offline.": "La persona che ti ha invitato è già uscita dalla stanza, o il suo server è offline.",
+    "Change notification settings": "Cambia impostazioni di notifica",
+    "Your server isn't responding to some <a>requests</a>.": "Il tuo server non sta rispondendo ad alcune <a>richieste</a>.",
+    "Master private key:": "Chiave privata principale:",
+    "You're all caught up.": "Non hai nulla di nuovo da vedere.",
+    "Server isn't responding": "Il server non risponde",
+    "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "Il tuo server non sta rispondendo ad alcune tue richieste. Sotto trovi alcuni probabili motivi.",
+    "The server (%(serverName)s) took too long to respond.": "Il server (%(serverName)s) ha impiegato troppo tempo per rispondere.",
+    "Your firewall or anti-virus is blocking the request.": "Il tuo firewall o antivirus sta bloccando la richiesta.",
+    "A browser extension is preventing the request.": "Un'estensione del browser sta impedendo la richiesta.",
+    "The server is offline.": "Il server è offline.",
+    "The server has denied your request.": "Il server ha negato la tua richiesta.",
+    "Your area is experiencing difficulties connecting to the internet.": "La tua area sta riscontrando difficoltà di connessione a internet.",
+    "A connection error occurred while trying to contact the server.": "Si è verificato un errore di connessione tentando di contattare il server.",
+    "The server is not configured to indicate what the problem is (CORS).": "Il server non è configurato per indicare qual è il problema (CORS).",
+    "Recent changes that have not yet been received": "Modifiche recenti che non sono ancora state ricevute",
+    "No files visible in this room": "Nessun file visibile in questa stanza",
+    "Attach files from chat or just drag and drop them anywhere in a room.": "Allega file dalla chat o trascinali in qualsiasi punto in una stanza.",
+    "You’re all caught up": "Non hai nulla di nuovo da vedere",
+    "You have no visible notifications in this room.": "Non hai alcuna notifica visibile in questa stanza.",
+    "%(brand)s Android": "%(brand)s Android"
 }
diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 7e7c1443a4..ff2afb67be 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -7,7 +7,6 @@
     "Close": "閉じる",
     "Create Room": "部屋を作成",
     "Current password": "現在のパスワード",
-    "Direct chats": "対話",
     "Favourite": "お気に入り",
     "Favourites": "お気に入り",
     "Invited": "招待中",
@@ -28,9 +27,8 @@
     "Filter room members": "部屋メンバーを検索",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "発言時刻を12時間形式で表示 (例 2:30PM)",
     "Upload avatar": "アイコン画像を変更",
-    "Upload file": "添付ファイル送信",
-    "Use compact timeline layout": "会話表示の行間を狭くする",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riotはアプリケーションを改善するために匿名の分析情報を収集しています。",
+    "Upload file": "ファイルのアップロード",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)sはアプリケーションを改善するために匿名の分析情報を収集しています。",
     "Add": "追加",
     "No Microphones detected": "マイクが見つかりません",
     "No Webcams detected": "カメラが見つかりません",
@@ -62,17 +60,15 @@
     "This phone number is already in use": "この電話番号は既に使われています",
     "Failed to verify email address: make sure you clicked the link in the email": "メールアドレスの認証に失敗しました。メール中のリンクをクリックしたか、確認してください",
     "The platform you're on": "利用中のプラットフォーム",
-    "The version of Riot.im": "Riot.imのバージョン",
+    "The version of %(brand)s": "%(brand)s のバージョン",
     "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": "あなたのホームサーバーの URL",
-    "Your identity server's URL": "あなたのアイデンティティサーバーの URL",
     "Analytics": "分析",
-    "The information being sent to us to help make Riot.im better includes:": "Riot.imをよりよくするために私達に送信される情報は以下を含みます:",
+    "The information being sent to us to help make %(brand)s better includes:": "%(brand)sをよりよくするために私達に送信される情報は以下を含みます:",
     "Thursday": "木曜日",
     "Messages in one-to-one chats": "1対1のチャットでのメッセージ",
-    "A new version of Riot is available.": "新しいバージョンのRiotが利用可能です。",
     "All Rooms": "全ての部屋",
     "You cannot delete this message. (%(code)s)": "あなたはこの発言を削除できません (%(code)s)",
     "Send": "送信",
@@ -84,7 +80,7 @@
     "Files": "添付ファイル",
     "Room not found": "部屋が見つかりません",
     "Set Password": "パスワードを設定",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "申し訳ありません。あなたのブラウザではRiotは<b>動作できません</b>。",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "申し訳ありません。あなたのブラウザでは%(brand)sは<b>動作できません</b>。",
     "Monday": "月曜日",
     "Messages in group chats": "グループチャットでのメッセージ",
     "Friday": "金曜日",
@@ -110,7 +106,7 @@
     "Download this file": "この添付ファイルをダウンロード",
     "Call invitation": "通話への招待",
     "Forget": "忘れる",
-    "Messages containing <span>keywords</span>": "<span>keywords</span>を含むメッセージ",
+    "Messages containing <span>keywords</span>": "<span>キーワード</span> を含むメッセージ",
     "Error saving email notification preferences": "電子メール通知設定の保存エラー",
     "Tuesday": "火曜日",
     "Enter keywords separated by a comma:": "キーワードをコンマで区切って入力:",
@@ -134,8 +130,6 @@
     "Send Custom Event": "カスタムイベントを送信する",
     "All notifications are currently disabled for all targets.": "現在すべての対象についての全通知が無効です。",
     "Failed to send logs: ": "ログの送信に失敗しました: ",
-    "delete the alias.": "エイリアスを削除する。",
-    "To return to your account in future you need to <u>set a password</u>": "今後アカウントを回復するには、 <u>パスワードを設定</u> する必要があります",
     "You cannot delete this image. (%(code)s)": "この画像を消すことはできません。 (%(code)s)",
     "Cancel Sending": "送信を取り消す",
     "Remember, you can always set an email address in user settings if you change your mind.": "利用者設定でいつでもメールアドレスを設定できます。",
@@ -148,12 +142,11 @@
     "Source URL": "ソースのURL",
     "Filter results": "絞り込み結果",
     "Noisy": "音量大",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "部屋のエイリアス %(alias)s を削除し、ディレクトリから %(name)s を消去しますか？",
     "Invite to this community": "このコミュニティに招待する",
     "View Source": "ソースコードを表示する",
     "Back": "戻る",
     "Remove %(name)s from the directory?": "ディレクトリから %(name)s を消去しますか？",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riotは多くの高度なブラウザの機能を使用しています。そのうちのいくつかはご使用のブラウザでは使えないか、実験的な機能です。",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)sは多くの高度なブラウザの機能を使用しています。そのうちのいくつかはご使用のブラウザでは使えないか、実験的な機能です。",
     "Event sent!": "イベントが送信されました！",
     "Preparing to send logs": "ログを送信する準備をしています",
     "Explore Account Data": "アカウントのデータを調べる",
@@ -183,12 +176,11 @@
     "Show message in desktop notification": "デスクトップ通知にメッセージ内容を表示する",
     "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.": "デバッグログはあなたのユーザ名、訪問した部屋やグループのIDやエイリアス、他のユーザのユーザ名を含むアプリの使用データを含みます。メッセージは含みません。",
     "Unable to join network": "ネットワークに接続できません",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Riot以外のクライアントで設定した可能性があります。Riotで設定することはできませんが、引き続き使用可能です",
     "Error encountered (%(errorDetail)s).": "エラーが発生しました (%(errorDetail)s)。",
     "Event Type": "イベントの形式",
     "What's New": "新着",
     "remove %(name)s from the directory.": "ディレクトリから %(name)s を消去する。",
-    "Riot does not know how to join a room on this network": "Riotはこのネットワークで部屋に参加する方法を知りません",
+    "%(brand)s does not know how to join a room on this network": "%(brand)sはこのネットワークで部屋に参加する方法を知りません",
     "You can now return to your account after signing out, and sign in on other devices.": "サインアウト後にあなたの\nアカウントに戻る、また、他の端末でサインインすることができます。",
     "Pin Message": "メッセージを固定する",
     "Thank you!": "ありがとうございます！",
@@ -198,23 +190,17 @@
     "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...": "アップデートを確認しています…",
-    "There are advanced notifications which are not shown here": "ここに表示されない詳細な通知があります",
-    "Call": "通話",
-    "Answer": "応答",
     "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などの識別可能な情報が含まれている場合、そのデータはサーバーに送信される前に削除されます。",
-    "Answer Anyway": "とにかく応答",
-    "Call Anyway": "とにかく通話",
     "Call Timeout": "通話タイムアウト",
     "The remote side failed to pick up": "相手が応答しませんでした",
     "Unable to capture screen": "画面をキャプチャできません",
     "Existing Call": "既存の通話",
     "You are already in a call.": "すでに通話中です。",
-    "VoIP is unsupported": "VoIPはサポートされていません",
+    "VoIP is unsupported": "VoIPは対応していません",
     "You cannot place VoIP calls in this browser.": "このブラウザにはVoIP通話はできません。",
     "You cannot place a call with yourself.": "自分自身に電話をかけることはできません。",
-    "Could not connect to the integration server": "統合サーバーに接続できません",
     "Call in Progress": "発信中",
     "A call is currently being placed!": "現在発信中です！",
     "A call is already in progress!": "既に発信しています!",
@@ -253,24 +239,20 @@
     "Which rooms would you like to add to this community?": "このコミュニティに追加したい部屋はどれですか？",
     "Show these rooms to non-members on the community page and room list?": "コミュニティページとルームリストのメンバー以外にこれらの部屋を公開しますか？",
     "Add rooms to the community": "コミュニティに部屋を追加します",
-    "Room name or alias": "部屋名またはエイリアス",
     "Add to community": "コミュニティに追加",
     "Failed to invite the following users to %(groupId)s:": "次のユーザーを %(groupId)s に招待できませんでした:",
     "Failed to invite users to community": "ユーザーをコミュニティに招待できませんでした",
     "Failed to invite users to %(groupId)s": "ユーザーを %(groupId)s に招待できませんでした",
     "Failed to add the following rooms to %(groupId)s:": "次の部屋を %(groupId)s に追加できませんでした:",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riotに通知を送信する権限がありません - ブラウザの設定を確認してください",
-    "Riot was not given permission to send notifications - please try again": "Riotに通知を送信する権限がありませんでした。もう一度お試しください",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)sに通知を送信する権限がありません - ブラウザの設定を確認してください",
+    "%(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.": "あなたのメールアドレスは、このホームサーバー上のマトリックスIDと関連付けられていないようです。",
-    "Registration Required": "登録が必要です",
-    "You need to register to do this. Would you like to register now?": "これを行うには登録する必要があります。 今すぐ登録しますか？",
     "Default": "既定値",
     "Restricted": "制限",
     "Moderator": "仲裁者",
     "Admin": "管理者",
-    "Start a chat": "チャットを開始する",
     "Failed to invite": "招待できませんでした",
     "Failed to invite the following users to the %(roomName)s room:": "次のユーザーを %(roomName)s の部屋に招待できませんでした:",
     "You need to be logged in.": "ログインする必要があります。",
@@ -291,9 +273,7 @@
     "To use it, just wait for autocomplete results to load and tab through them.": "それを使用するには、結果が完全にロードされるのを待ってから、Tabキーを押してください。",
     "Changes your display nickname": "表示されるニックネームを変更",
     "Invites user with given id to current room": "指定されたIDを持つユーザーを現在のルームに招待する",
-    "Joins room with given alias": "指定された別名で部屋に参加する",
     "Leave room": "部屋を退出",
-    "Unrecognised room alias:": "認識されない部屋の別名:",
     "Kicks user with given id": "与えられたIDを持つユーザーを追放する",
     "Bans user with given id": "指定されたIDでユーザーをブロックする",
     "Ignores a user, hiding their messages from you": "ユーザーを無視し、自分からのメッセージを隠す",
@@ -305,7 +285,7 @@
     "Define the power level of a user": "ユーザーの権限レベルを定義",
     "Deops user with given id": "指定されたIDのユーザーを非表示",
     "Opens the Developer Tools dialog": "開発者ツールダイアログを開きます",
-    "Verified key": "確認済みのキー",
+    "Verified key": "検証済みの鍵",
     "Displays action": "アクションを表示",
     "Forces the current outbound group session in an encrypted room to be discarded": "暗号化されたルーム内の現在のアウトバウンドグループセッションを強制的に破棄します",
     "Reason": "理由",
@@ -331,11 +311,6 @@
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s が部屋名を削除しました。",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s が部屋名を %(roomName)s に変更しました。",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s が画像を送信しました。",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s はこの部屋のアドレスとして %(addedAddresses)s を追加しました。",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s はこの部屋のアドレスとして %(addedAddresses)s を追加しました。",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s はこの部屋のアドレスとして %(removedAddresses)s を削除しました。",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s はこの部屋のアドレスとして %(removedAddresses)s を削除しました。",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s はこの部屋のアドレスとして %(addedAddresses)s を追加し、%(removedAddresses)s を削除しました。",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s が、この部屋のメインアドレスを %(address)s に設定しました。",
     "%(senderName)s removed the main address for this room.": "%(senderName)s がこの部屋のメインアドレスを削除しました。",
     "Someone": "誰か",
@@ -359,14 +334,13 @@
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s ウィジェットが %(senderName)s によって削除されました",
     "Failure to create room": "部屋の作成に失敗しました",
     "Server may be unavailable, overloaded, or you hit a bug.": "サーバーが使用できない、オーバーロードされている、またはバグが発生した可能性があります。",
-    "Send anyway": "とにかく送る",
     "Unnamed Room": "名前のない部屋",
     "This homeserver has hit its Monthly Active User limit.": "このホームサーバーは、月間アクティブユーザー制限を超えています。",
     "This homeserver has exceeded one of its resource limits.": "このホームサーバーは、リソース制限の1つを超えています。",
     "Please <a>contact your service administrator</a> to continue using the service.": "サービスを引き続き使用するには、<a>サービス管理者にお問い合わせ</a>ください。",
     "Unable to connect to Homeserver. Retrying...": "ホームサーバーに接続できません。 再試行中...",
     "Your browser does not support the required cryptography extensions": "お使いのブラウザは、必要な暗号化拡張機能をサポートしていません",
-    "Not a valid Riot keyfile": "有効なRiotキーファイルではありません",
+    "Not a valid %(brand)s keyfile": "有効な%(brand)sキーファイルではありません",
     "Authentication check failed: incorrect password?": "認証チェックに失敗しました: パスワードの間違い?",
     "Sorry, your homeserver is too old to participate in this room.": "申し訳ありませんが、あなたのホームサーバーはこの部屋に参加するには古すぎます。",
     "Please contact your homeserver administrator.": "ホームサーバー管理者に連絡してください。",
@@ -376,9 +350,9 @@
     "Enable automatic language detection for syntax highlighting": "構文強調表示の自動言語検出を有効にする",
     "Mirror local video feed": "ローカルビデオ映像送信",
     "Send analytics data": "分析データを送信する",
-    "Enable inline URL previews by default": "デフォルトでインラインURLプレビューを有効にする",
-    "Enable URL previews for this room (only affects you)": "この部屋のURLプレビューを有効にする (あなたにのみ影響する)",
-    "Enable URL previews by default for participants in this room": "この部屋の参加者のためにデフォルトでURLプレビューを有効にする",
+    "Enable inline URL previews by default": "デフォルトでインライン URL プレビューを有効にする",
+    "Enable URL previews for this room (only affects you)": "この部屋の URL プレビューを有効にする (あなたにのみ影響する)",
+    "Enable URL previews by default for participants in this room": "この部屋の参加者のためにデフォルトで URL プレビューを有効にする",
     "Room Colour": "部屋の色",
     "Enable widget screenshots on supported widgets": "サポートされているウィジェットでウィジェットのスクリーンショットを有効にする",
     "Active call (%(roomName)s)": "アクティブな通話 (%(roomName)s)",
@@ -402,11 +376,8 @@
     "Password": "パスワード",
     "Confirm password": "確認のパスワード",
     "Authentication": "認証",
-    "Device ID": "端末ID",
     "Last seen": "最近の使用履歴",
     "Failed to set display name": "表示名の設定に失敗しました",
-    "Disable Notifications": "通知を無効にする",
-    "Enable Notifications": "通知を有効にする",
     "Off": "オフ",
     "On": "オン",
     "Cannot add any more widgets": "ウィジェットを追加できません",
@@ -424,8 +395,6 @@
     "Options": "オプション",
     "Key request sent.": "キーリクエストが送信されました。",
     "Please select the destination room for this message": "このメッセージを送り先部屋を選択してください",
-    "Blacklisted": "ブラックリストに載せた",
-    "device id: ": "端末id: ",
     "Disinvite": "招待拒否",
     "Kick": "追放する",
     "Disinvite this user?": "このユーザーを招待拒否しますか?",
@@ -433,37 +402,29 @@
     "Failed to kick": "追放できませんでした",
     "e.g. %(exampleValue)s": "例えば %(exampleValue)s",
     "Every page you use in the app": "アプリで使用するすべてのページ",
-    "Your User Agent": "ユーザーエージェント",
     "Call Failed": "呼び出しに失敗しました",
-    "Review Devices": "端末を確認する",
     "Automatically replace plain text Emoji": "自動的にプレーンテキスト絵文字を置き換える",
     "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 room it will be impossible to regain privileges.": "自分自身を降格させるときにこの変更を元に戻すことはできません。あなたが部屋の最後の特権ユーザーである場合、特権を回復することは不可能です。",
     "Demote": "降格",
     "Failed to mute user": "ユーザーのミュートに失敗しました",
-    "Failed to toggle moderator status": "モデレータステータスを切り替えることができませんでした",
     "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.": "この変更を元に戻すことはできません。そのユーザーが自分と同じ権限レベルを持つように促します。",
     "Ignore": "無視",
     "Jump to read receipt": "既読へジャンプ",
     "Invite": "招待",
     "Share Link to User": "ユーザーへのリンクを共有する",
-    "User Options": "ユーザーオプション",
     "Unmute": "ミュート解除",
-    "Revoke Moderator": "モデレーターを取り消す",
-    "Make Moderator": "モデレーターにする",
     "Admin Tools": "管理者ツール",
     "and %(count)s others...|other": "そして、他 %(count)s ...",
     "and %(count)s others...|one": "そして、もう1つ...",
-    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (パワー %(powerLevelNumber)s）",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (権限レベル: %(powerLevelNumber)s )",
     "Attachment": "付属品",
     "Hangup": "電話を切る",
     "Voice call": "音声通話",
     "Video call": "ビデオ通話",
     "Send an encrypted reply…": "暗号化された返信を送信する…",
-    "Send a reply (unencrypted)…": "(暗号化されていない) 返信を送信する…",
     "Send an encrypted message…": "暗号化されたメッセージを送信する…",
-    "Send a message (unencrypted)…": "(暗号化されていない) メッセージを送信する…",
     "This room has been replaced and is no longer active.": "この部屋は交換されており、もうアクティブではありません。",
     "The conversation continues here.": "会話はここで続けられます。",
     "You do not have permission to post to this room": "この部屋に投稿する権限がありません",
@@ -485,9 +446,9 @@
     "Idle": "アイドル",
     "Offline": "オフライン",
     "Unknown": "未知の",
-    "Seen by %(userName)s at %(dateTime)s": "%(dateTime)s に %(userName)s が閲覧",
-    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(dateTime)s に %(displayName)s (%(userName)s) が見た",
-    "Replying": "返信中",
+    "Seen by %(userName)s at %(dateTime)s": "%(dateTime)s に %(userName)s が既読",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(dateTime)s に %(displayName)s (%(userName)s) が既読",
+    "Replying": "以下に返信",
     "Save": "保存",
     "(~%(count)s results)|other": "(~%(count)s 結果)",
     "(~%(count)s results)|one": "(~%(count)s 結果)",
@@ -531,21 +492,18 @@
     "Show Stickers": "ステッカーを表示",
     "Jump to first unread message.": "最初の未読メッセージにジャンプします。",
     "not specified": "指定なし",
-    "Remote addresses for this room:": "この部屋のリモートアドレス:",
-    "Local addresses for this room:": "この部屋のローカルアドレス:",
     "This room has no local addresses": "この部屋にはローカルアドレスはありません",
-    "New address (e.g. #foo:%(localDomain)s)": "新しいアドレス (例 #foo:%(localDomain)s）",
     "Invalid community ID": "無効なコミュニティID",
     "'%(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)",
-    "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プレビューが有効です。",
-    "URL previews are disabled by default for participants in this room.": "この部屋の参加者は、デフォルトで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": "URLプレビュー",
+    "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 プレビューが有効です。",
+    "URL previews are disabled by default for participants in this room.": "この部屋の参加者は、デフォルトで 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": "URL プレビュー",
     "Historical": "履歴のある",
     "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プレビューが表示され、タイトル、説明、ウェブサイトからの画像など、そのリンクに関する詳細情報が表示されます。",
     "Error decrypting audio": "オーディオの復号化エラー",
@@ -554,7 +512,7 @@
     "Download %(text)s": "%(text)s をダウンロード",
     "Invalid file%(extra)s": "無効なファイル %(extra)s",
     "Error decrypting image": "イメージの復号化エラー",
-    "Error decrypting video": "動画の復号化エラー",
+    "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/>に変更しました",
@@ -564,10 +522,6 @@
     "Failed to copy": "コピーに失敗しました",
     "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?": "サードパーティのサイトに移動して、%(integrationsUrl)s で使用するためにアカウントを認証できるようになります。続行しますか？",
-    "Removed or unknown message type": "削除されたまたは未知のメッセージタイプ",
-    "Message removed by %(userId)s": "%(userId)s によってメッセージが削除されました",
-    "Message removed": "メッセージが削除された",
-    "To continue, please enter your password.": "続行するには、パスワードを入力してください。",
     "Please review and accept the policies of this homeserver:": "このホームサーバーのポリシーを確認し、同意してください:",
     "An email has been sent to %(emailAddress)s": "電子メールが %(emailAddress)s に送信されました",
     "Please check your email to continue registration.": "登録を続行するにはメールをご確認ください。",
@@ -603,12 +557,6 @@
     "Display your community flair in rooms configured to show it.": "表示するよう設定した部屋であなたのコミュニティ バッジを表示",
     "Show developer tools": "開発者ツールを表示",
     "You're not currently a member of any communities.": "あなたは現在、どのコミュニティのメンバーでもありません。",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "<UsageDataLink>匿名利用データ</UsageDataLink>を送信して、Riot.imの改善を支援してください。 これはCookieを使用します (<PolicyLink>クッキーポリシー</PolicyLink>をご覧ください)>。",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "<UsageDataLink>匿名利用データ</UsageDataLink>を送信して、Riot.imの改善を支援してください。 これはクッキーを使用します。",
-    "Yes, I want to help!": "はい、協力します!",
-    "Please <a>contact your service administrator</a> to get this limit increased.": "この制限を増やすには、<a>サービス管理者にお問い合わせ</a>ください。",
-    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "このホームサーバーは月間アクティブユーザー数の上限に達しているため、<b>一部のユーザーはログインできません</ b>。",
-    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "このホームサーバーはリソース制限の1つを超えており、<b>一部のユーザーはログインできません</b>。",
     "Unknown Address": "不明な住所",
     "Allow": "許可",
     "Delete Widget": "ウィジェットを削除",
@@ -618,9 +566,6 @@
     "An error ocurred whilst trying to remove the widget from the room": "ウィジェットをその部屋から削除しようとしているときにエラーが発生しました",
     "Minimize apps": "アプリを最小化する",
     "Popout widget": "ウィジェットをポップアウト",
-    "Unblacklist": "ブラックリスト解除",
-    "Blacklist": "ブラックリスト",
-    "Verify...": "検証する...",
     "No results": "結果がありません",
     "Communities": "コミュニティ",
     "Home": "ホーム",
@@ -708,18 +653,13 @@
     "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:": "続行するには、パスワードを入力してください:",
-    "I verify that the keys match": "キーが一致することを確認します",
     "An error has occurred.": "エラーが発生しました。",
-    "Start verification": "検証を開始する",
-    "Share without verifying": "検証せずに共有する",
-    "Ignore request": "要求を無視する",
-    "Encryption key request": "暗号化キー要求",
-    "You've previously used Riot 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, Riot needs to resync your account.": "以前 %(host)s にて、メンバーの遅延ロードを有効にしたRiotを使用していました。このバージョンでは、遅延ロードは無効です。ローカルキャッシュはこれらの2つの設定の間で互換性がないため、Riotはアカウントを再同期する必要があります。",
-    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "他のバージョンのRiotがまだ別のタブで開いている場合は、同じホスト上でRiotを使用するように閉じてください。遅延ロードが同時に有効と無効になっていると問題が発生します。",
+    "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.": "以前 %(host)s にて、メンバーの遅延ロードを有効にした%(brand)sを使用していました。このバージョンでは、遅延ロードは無効です。ローカルキャッシュはこれらの2つの設定の間で互換性がないため、%(brand)sはアカウントを再同期する必要があります。",
+    "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を使用するように閉じてください。遅延ロードが同時に有効と無効になっていると問題が発生します。",
     "Incompatible local cache": "互換性のないローカルキャッシュ",
     "Clear cache and resync": "キャッシュをクリアして再同期する",
-    "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Riotは、必要に応じて他のユーザーに関する情報をロードするだけで、メモリの使用量を3〜5倍減らしました。サーバーと再同期するのを待ってください!",
-    "Updating Riot": "Riot更新中",
+    "%(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倍減らしました。サーバーと再同期するのを待ってください!",
+    "Updating %(brand)s": "%(brand)s更新中",
     "Failed to upgrade room": "部屋をアップグレードできませんでした",
     "The room upgrade could not be completed": "部屋のアップグレードを完了できませんでした",
     "Upgrade this room to version %(version)s": "この部屋をバージョン %(version)s にアップグレードします",
@@ -728,7 +668,6 @@
     "Update any local room aliases to point to the new room": "新しいルームを指すようにローカルルームのエイリアスを更新する",
     "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "古いバージョンの部屋でのユーザーの発言を停止し、新しい部屋に移動するようユーザーに通知するメッセージを投稿する",
     "Mention": "記載",
-    "Unverify": "未検証",
     "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s が %(count)s 回招待を撤回した",
     "was unbanned %(count)s times|one": "ブロック解除されました",
     "Put a link back to the old room at the start of the new room so people can see old messages": "新しい部屋の始めに古い部屋にリンクを張って、人々が古いメッセージを見ることができるようにする",
@@ -738,7 +677,7 @@
     "Refresh": "リフレッシュ",
     "Unable to restore session": "セッションを復元できません",
     "We encountered an error trying to restore your previous session.": "以前のセッションを復元しようとしてエラーが発生しました。",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "以前にRiotの最新バージョンを使用していた場合、セッションはこのバージョンと互換性がない可能性があります。 このウィンドウを閉じて、最新のバージョンに戻ります。",
+    "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の最新バージョンを使用していた場合、セッションはこのバージョンと互換性がない可能性があります。 このウィンドウを閉じて、最新のバージョンに戻ります。",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "ブラウザのストレージをクリアすると問題は解決するかもしれませんが、ログアウトして暗号化されたチャット履歴を読むことができなくなります。",
     "Invalid Email Address": "無効なメールアドレス",
     "This doesn't appear to be a valid email address": "これは有効なメールアドレスではないようです",
@@ -765,7 +704,6 @@
     "Private Chat": "プライベートチャット",
     "Public Chat": "パブリックチャット",
     "Custom": "カスタム",
-    "Alias (optional)": "エイリアス (オプション)",
     "Reject invitation": "招待を拒否する",
     "Are you sure you want to reject the invitation?": "招待を拒否しますか?",
     "Unable to reject invite": "招待を拒否できません",
@@ -774,7 +712,7 @@
     "Name": "名前",
     "You must <a>register</a> to use this functionality": "この機能を使用するには<a>登録</a>する必要があります",
     "You must join the room to see its files": "そのファイルを見るために部屋に参加する必要があります",
-    "There are no visible files in this room": "この部屋には目に見えるファイルはありません",
+    "There are no visible files in this room": "この部屋に表示可能なファイルは存在しません",
     "<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",
     "Add rooms to the community summary": "コミュニティサマリーに部屋を追加する",
     "Which rooms would you like to add to this summary?": "このサマリーにどの部屋を追加したいですか?",
@@ -816,8 +754,8 @@
     "Failed to load %(groupId)s": "%(groupId)s をロードできませんでした",
     "Failed to reject invitation": "招待を拒否できませんでした",
     "This room is not public. You will not be able to rejoin without an invite.": "この部屋は公開されていません。 あなたは招待なしで再び参加することはできません。",
-    "Are you sure you want to leave the room '%(roomName)s'?": "本当にその部屋 '%(roomName)s' を離れますか?",
-    "Failed to leave room": "部屋を離れることができなかった",
+    "Are you sure you want to leave the room '%(roomName)s'?": "本当にこの部屋「%(roomName)s」から退出してよろしいですか？",
+    "Failed to leave room": "部屋からの退出に失敗しました",
     "Can't leave Server Notices room": "サーバー通知部屋を離れることはできません",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "この部屋はホームサーバーからの重要なメッセージに使用されるため、そこを離れることはできません。",
     "Signed Out": "サインアウト",
@@ -826,16 +764,15 @@
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "%(homeserverDomain)s ホームサーバーを引き続き使用するには、利用規約を確認して同意する必要があります。",
     "Review terms and conditions": "利用規約を確認する",
     "Old cryptography data detected": "古い暗号化データが検出されました",
-    "Data from an older version of Riot 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.": "Riotの古いバージョンのデータが検出されました。 これにより、古いバージョンではエンドツーエンドの暗号化が機能しなくなります。 古いバージョンを使用している間に最近交換されたエンドツーエンドの暗号化されたメッセージは、このバージョンでは復号化できません。 これにより、このバージョンで交換されたメッセージが失敗することもあります。 問題が発生した場合は、ログアウトして再度ログインしてください。 メッセージ履歴を保持するには、キーをエクスポートして再インポートします。",
+    "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の古いバージョンのデータが検出されました。 これにより、古いバージョンではエンドツーエンドの暗号化が機能しなくなります。 古いバージョンを使用している間に最近交換されたエンドツーエンドの暗号化されたメッセージは、このバージョンでは復号化できません。 これにより、このバージョンで交換されたメッセージが失敗することもあります。 問題が発生した場合は、ログアウトして再度ログインしてください。 メッセージ履歴を保持するには、キーをエクスポートして再インポートします。",
     "Logout": "ログアウト",
     "Your Communities": "あなたのコミュニティ",
-    "Did you know: you can use communities to filter your Riot.im experience!": "知っていましたか: コミュニティを使ってRiot.imの経験を絞り込むことができます！",
+    "Did you know: you can use communities to filter your %(brand)s experience!": "知っていましたか: コミュニティを使って%(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.": "フィルターを設定するには、画面左側のフィルターパネルへコミュニティアバターをドラッグします。フィルタパネルのアバターをクリックすると、そのコミュニティに関連付けられた部屋や人だけが表示されます。",
     "Error whilst fetching joined communities": "参加したコミュニティを取得中にエラーが発生しました",
     "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.": "ユーザーと部屋をグループ化するコミュニティを作成してください! Matrixユニバースにあなたの空間を目立たせるためにカスタムホームページを作成してください。",
-    "You have no visible notifications": "表示される通知はありません",
-    "Scroll to bottom of page": "ページの一番下にスクロールする",
+    "You have no visible notifications": "通知はありません",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "<consentLink>利用規約</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.": "このホームサーバーが月間アクティブユーザー制限を超えたため、メッセージは送信されませんでした。 サービスを引き続き使用するには、<a>サービス管理者にお問い合わせ</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.": "このホームサーバーがリソース制限を超えたため、メッセージは送信されませんでした。 サービスを引き続き使用するには、<a>サービス管理者にお問い合わせ</a>ください。",
@@ -852,7 +789,6 @@
     "Search failed": "検索に失敗しました",
     "Server may be unavailable, overloaded, or search timed out :(": "サーバーが使用できない、オーバーロードされている、または検索がタイムアウトしているようです :(",
     "No more results": "もう結果はありません",
-    "Unknown room %(roomId)s": "未知の部屋 %(roomId)s",
     "Room": "部屋",
     "Failed to reject invite": "招待を拒否できませんでした",
     "Click to unmute video": "ビデオの音消解除するにはクリックしてください",
@@ -880,7 +816,7 @@
     "Reject all %(invitedRooms)s invites": "%(invitedRooms)s すべての招待を拒否する",
     "Start automatically after system login": "システムログイン後に自動的に起動する",
     "No media permissions": "メディア権限がありません",
-    "You may need to manually permit Riot to access your microphone/webcam": "自分のマイク/ウェブカメラにアクセスするために手動でRiotを許可する必要があるかもしれません",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "自分のマイク/ウェブカメラにアクセスするために手動で%(brand)sを許可する必要があるかもしれません",
     "No Audio Outputs detected": "オーディオ出力が検出されませんでした",
     "Default Device": "既定のデバイス",
     "Audio Output": "音声出力",
@@ -891,7 +827,7 @@
     "click to reveal": "クリックすると表示されます",
     "Homeserver is": "ホームサーバーは",
     "Identity Server is": "アイデンティティ・サーバー",
-    "riot-web version:": "riot-web のバージョン:",
+    "%(brand)s version:": "%(brand)s のバージョン:",
     "olm version:": "olm のバージョン:",
     "Failed to send email": "メールを送信できませんでした",
     "The email address linked to your account must be entered.": "あなたのアカウントにリンクされているメールアドレスを入力する必要があります。",
@@ -919,21 +855,7 @@
     "Notify the whole room": "部屋全体に通知する",
     "Room Notification": "ルーム通知",
     "Users": "ユーザー",
-    "unknown device": "未知の端末",
-    "NOT verified": "検証されていない",
-    "verified": "検証済み",
-    "Verification": "検証",
-    "Ed25519 fingerprint": "Ed25519フィンガープリント",
-    "User ID": "ユーザーID",
-    "Curve25519 identity key": "Curve25519 ID鍵",
-    "none": "無し",
-    "Claimed Ed25519 fingerprint key": "Claimed Ed25519フィンガープリント鍵",
-    "Algorithm": "アルゴリズム",
-    "unencrypted": "暗号化されていない",
-    "Decryption error": "復号化エラー",
-    "Session ID": "セッションID",
-    "End-to-end encryption information": "エンドツーエンド暗号化情報",
-    "Event information": "イベント情報",
+    "Session ID": "セッション ID",
     "Passphrases must match": "パスフレーズは一致する必要があります",
     "Passphrase must not be empty": "パスフレーズは空であってはいけません",
     "Export room keys": "ルームキーのエクスポート",
@@ -953,12 +875,9 @@
     "Open Devtools": "開発ツールを開く",
     "Flair": "バッジ",
     "Fill screen": "フィルスクリーン",
-    "Light theme": "明るいテーマ",
-    "Dark theme": "暗いテーマ",
     "Unignore": "無視しない",
     "Unable to load! Check your network connectivity and try again.": "ロードできません！ ネットワーク通信を確認の上もう一度お試しください。",
     "Failed to invite users to the room:": "部屋にユーザーを招待できませんでした:",
-    "Waiting for %(userId)s to confirm...": "%(userId)s の確認を待っています...",
     "You do not have permission to invite people to this room.": "この部屋にユーザーを招待する権限がありません。",
     "Unknown server error": "不明なサーバーエラー",
     "No need for symbols, digits, or uppercase letters": "記号、数字、大文字を含む必要はありません",
@@ -986,9 +905,8 @@
     "Add Phone Number": "電話番号の追加",
     "Call failed due to misconfigured server": "サーバの誤設定により呼び出し失敗",
     "Try using turn.matrix.org": "turn.matrix.orgで試してみる",
-    "A conference call could not be started because the integrations server is not available": "統合サーバーが利用できないので電話会議を開始できませんでした",
     "Replying With Files": "ファイルを添付して返信",
-    "The file '%(fileName)s' failed to upload.": "ファイル '%(fileName)s' のアップロードに失敗しました。",
+    "The file '%(fileName)s' failed to upload.": "ファイル '%(fileName)s' のアップロードに失敗しました.",
     "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",
@@ -1025,13 +943,13 @@
     "Use an identity server to invite by email. Manage in Settings.": "メールによる招待のためにIDサーバーを用いる。設定画面で管理する。",
     "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s が参加ルールを「%(rule)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 に変更しました。",
     "%(displayName)s is typing …": "%(displayName)s が入力中 …",
     "%(names)s and %(count)s others are typing …|other": "%(names)s と他 %(count)s 名が入力中 …",
     "%(names)s and %(count)s others are typing …|one": "%(names)s ともう一人が入力中 …",
     "%(names)s and %(lastPerson)s are typing …": "%(names)s と %(lastPerson)s が入力中 …",
     "Cannot reach homeserver": "ホームサーバーに接続できません",
-    "Your Riot is misconfigured": "あなたのRiotは設定が間違っています",
+    "Your %(brand)s is misconfigured": "あなたの%(brand)sは設定が間違っています",
     "Cannot reach identity server": "IDサーバーに接続できません",
     "No homeserver URL provided": "ホームサーバーのURLが与えられていません",
     "User %(userId)s is already in the room": "ユーザー %(userId)s はすでにその部屋にいます",
@@ -1050,9 +968,8 @@
     "Show display name changes": "表示名の変更を表示する",
     "Show read receipts sent by other users": "他の人の既読情報を表示する",
     "Enable big emoji in chat": "チャットで大きな絵文字を有効にする",
-    "Send typing notifications": "入力中であることを通知する",
+    "Send typing notifications": "入力中通知を送信する",
     "Enable Community Filter Panel": "コミュニティーフィルターパネルを有効にする",
-    "Show recently visited rooms above the room list": "最近訪問した部屋をリストの上位に表示する",
     "Low bandwidth mode": "低帯域通信モード",
     "Public Name": "公開名",
     "<a>Upgrade</a> to your own domain": "あなた自身のドメインに<a>アップグレード</a>",
@@ -1134,7 +1051,7 @@
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "暗号化されたメッセージは、エンドツーエンドの暗号化によって保護されています。これらの暗号化されたメッセージを読むための鍵を持っているのは、あなたと参加者だけです。",
     "Restore from Backup": "バックアップから復元",
     "Credits": "クレジット",
-    "For help with using Riot, click <a>here</a>.": "Riotの使用方法に関するヘルプは<a>こちら</a>をご覧ください。",
+    "For help with using %(brand)s, click <a>here</a>.": "%(brand)sの使用方法に関するヘルプは<a>こちら</a>をご覧ください。",
     "Help & About": "ヘルプと概要",
     "Bug reporting": "バグの報告",
     "FAQ": "よくある質問",
@@ -1158,32 +1075,23 @@
     "Error updating flair": "バッジの更新でエラーが発生しました。",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "この部屋のバッジの更新でエラーが発生しました。サーバーが許可していないか、一時的なエラーが発生しました。",
     "Edited at %(date)s. Click to view edits.": "%(date)sに編集。クリックして編集を表示。",
-    "edited": "編集済",
+    "edited": "編集済み",
     "I don't want my encrypted messages": "暗号化されたメッセージは必要ありません",
     "Manually export keys": "手動でキーをエクスポート",
     "You'll lose access to your encrypted messages": "暗号化されたメッセージにアクセスできなくなります",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "このルームを<oldVersion />から<newVersion />にアップグレードします。",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>警告</b>: 信頼できるコンピュータからのみキーのバックアップをセットアップしてください。",
     "For maximum security, this should be different from your account password.": "セキュリティの効果を高めるために、アカウントのパスワードと別のものを設定するべきです。",
-    "Enter a passphrase...": "パスワードを入力...",
     "That matches!": "同じです!",
-    "Please enter your passphrase a second time to confirm.": "確認のために、パスワードをもう一度入力してください。",
-    "Repeat your passphrase...": "パスワードを再度入力...",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "リカバリキーは安全網です - パスワードを忘れた際は、リカバリキーを使って復元できます。",
-    "Copy to clipboard": "クリップボードにコピー",
     "Download": "ダウンロード",
     "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "リカバリキーが<b>クリップボードにコピーされました</b>。ペーストして:",
     "<b>Print it</b> and store it somewhere safe": "<b>印刷して</b>安全な場所に保管しましょう",
     "<b>Save it</b> on a USB key or backup drive": "USB メモリーやバックアップ用のドライブに<b>保存</b>しましょう",
     "<b>Copy it</b> to your personal cloud storage": "個人のクラウドストレージに<b>コピー</b>しましょう",
-    "Confirm your passphrase": "パスワードを確認",
-    "Recovery key": "リカバリキー",
-    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "キーの暗号化されたコピーがサーバーに保存されます。バックアップを保護するために、パスワードを設定してください。",
-    "Secure your backup with a passphrase": "バックアップをパスワードで保護",
     "Display Name": "表示名",
     "Profile picture": "プロフィール画像",
     "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.": "この部屋内でのメッセージの送受信はエンドツーエンド暗号化されています。詳細およびユーザーの検証に関しては各ユーザーのプロフィールをご確認ください。",
     "Encryption not enabled": "暗号化が無効です",
     "The encryption used by this room isn't supported.": "この部屋では暗号化の使用がサポートされていません。",
     "Cross-signing public keys:": "クロス署名公開鍵:",
@@ -1192,14 +1100,12 @@
     "Delete %(count)s sessions|one": "%(count)s 件のセッションを削除",
     "ID": "ID",
     "Clear cache and reload": "キャッシュを削除して再読み込み",
-    "Session ID:": "セッションID:",
+    "Session ID:": "セッション ID:",
     "Session key:": "セッション鍵:",
     "Cross-signing": "クロス署名",
-    "Sessions": "セッション",
     "A session's public name is visible to people you communicate with": "各セッションの公開名は、あなたの連絡先のユーザーが閲覧できます。",
     "Session name": "セッション名",
     "Session key": "セッション鍵",
-    "Sender session information": "送信者のセッション情報",
     "Never send encrypted messages to unverified sessions from this session": "このセッションでは、未検証のセッションに対して暗号化されたメッセージを送信しない",
     "Never send encrypted messages to unverified sessions in this room from this session": "このセッションでは、この部屋の未検証のセッションに対して暗号化されたメッセージを送信しない",
     "Encrypted messages in one-to-one chats": "1対1のチャットでの暗号化されたメッセージ",
@@ -1208,13 +1114,9 @@
     "Enable desktop notifications for this session": "このセッションでデスクトップ通知を行う",
     "Email addresses": "メールアドレス",
     "This room is end-to-end encrypted": "この部屋はエンドツーエンド暗号化されています",
-    "Some sessions for this user are not trusted": "このユーザーの一部のセッションは信頼されていません",
-    "All sessions for this user are trusted": "このユーザーの全てのセッションを信頼しています",
-    "Some sessions in this encrypted room are not trusted": "この暗号化された部屋の一部のセッションは信頼されていません",
-    "All sessions in this encrypted room are trusted": "この暗号化された部屋の全てのセッションを信頼しています",
     "Encrypted by an unverified session": "未検証のセッションによる暗号化",
     "Close preview": "プレビューを閉じる",
-    "Direct Messages": "ダイレクトメッセージ",
+    "Direct Messages": "対話",
     "Loading …": "読み込み中 …",
     "Direct message": "ダイレクトメッセージ",
     "Your display name": "あなたの表示名",
@@ -1226,7 +1128,6 @@
     "Clear all data": "全てのデータを削除",
     "Create a public room": "公開された部屋を作成",
     "Make this room public": "この部屋を公開する",
-    "Loading session info...": "セッション情報を読み込み中...",
     "Message edits": "メッセージの編集履歴",
     "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.": "このメッセージを報告すると、このメッセージの一意の「イベントID」があなたのホームサーバーの管理者に送信されます。この部屋内のメッセージが暗号化されている場合、ホームサーバーの管理者はメッセージのテキストを読んだり、ファイルや画像を表示することはできません。",
@@ -1239,7 +1140,6 @@
     "Help": "ヘルプ",
     "Filter rooms…": "部屋を検索…",
     "Preview": "プレビュー",
-    "The version of Riot": "Riot のバージョン",
     "Your user agent": "あなたの User Agent",
     "Bold": "太字",
     "Italics": "イタリック体",
@@ -1272,5 +1172,206 @@
     "Enter your custom homeserver URL <a>What does this mean?</a>": "独自のホームサーバー URL を入力 <a>詳細情報</a>",
     "Homeserver URL": "ホームサーバー URL",
     "Sign in instead": "サインインする",
-    "Create your account": "アカウントの作成"
+    "Create your account": "アカウントの作成",
+    "Verify this session": "このセッションの検証",
+    "Encryption upgrade available": "暗号化のアップグレードが利用できます",
+    "Not Trusted": "まだ信頼されていません",
+    "Manually Verify by Text": "テキストを使って手動で検証",
+    "Interactively verify by Emoji": "絵文字を使って検証",
+    "Done": "戻る",
+    "Later": "後で",
+    "Review": "検証",
+    "Verify yourself & others to keep your chats safe": "あなたと他の人々とのチャットの安全性を検証",
+    "Upgrade": "アップグレード",
+    "Verify": "検証",
+    "Invite only": "招待者のみ参加可能",
+    "Trusted": "信頼済み",
+    "Not trusted": "未信頼",
+    "%(count)s verified sessions|other": "%(count)s 件の検証済みのセッション",
+    "%(count)s verified sessions|one": "1 件の検証済みのセッション",
+    "Hide verified sessions": "検証済みのセッションを隠す",
+    "%(count)s sessions|other": "%(count)s 件のセッション",
+    "%(count)s sessions|one": "%(count)s 件のセッション",
+    "Hide sessions": "セッションを隠す",
+    "Security": "セキュリティ",
+    "Welcome to %(appName)s": "%(appName)s へようこそ",
+    "Liberate your communication": "あなたのコミュニケーションを解放する",
+    "Send a Direct Message": "ダイレクトメッセージを送信",
+    "Explore Public Rooms": "公開された部屋を探す",
+    "Create a Group Chat": "グループチャットを作成",
+    "Go Back": "戻る",
+    "Messages in this room are end-to-end encrypted.": "この部屋内でのメッセージの送受信はエンドツーエンド暗号化されています。",
+    "Messages in this room are not end-to-end encrypted.": "この部屋内でのメッセージの送受信はエンドツーエンド暗号化されていません。",
+    "You signed in to a new session without verifying it:": "あなたのこのセッションはまだ検証されていません：",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) のこのセッションはまだ検証されていません：",
+    "Recent Conversations": "最近会話したユーザー",
+    "Suggestions": "提案",
+    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "相手の名前、( <userId/> のような)ユーザー名、メールアドレスを使って会話を開始できます。",
+    "Go": "続行",
+    "Session already verified!": "このセッションは検証済みです。",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "警告: このセッションは検証済みです、しかし鍵が一致していません！",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "警告: 鍵の検証に失敗しました！提供された鍵「%(fingerprint)s」は、%(userId)s およびセッション %(deviceId)s の署名鍵「%(fprint)s」と一致しません。これはつまり、あなたの会話が傍受・盗聴されようとしている恐れがあるということです！",
+    "Show typing notifications": "入力中通知を表示する",
+    "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 アドレスが相手に共有されるのを防ぐために) 代替通話支援サーバー turn.matrix.org の使用を許可する",
+    "Your homeserver does not support cross-signing.": "あなたのホームサーバーはクロス署名に対応していません。",
+    "Cross-signing and secret storage are enabled.": "クロス署名および機密ストレージは有効です。",
+    "Reset cross-signing and secret storage": "クロス署名および機密ストレージをリセット",
+    "in memory": "メモリー内",
+    "not found": "存在しない",
+    "in secret storage": "機密ストレージ内",
+    "Self signing private key:": "自己署名秘密鍵:",
+    "cached locally": "ローカルキャッシュ",
+    "not found locally": "ローカルに存在しない",
+    "User signing private key:": "ユーザー署名秘密鍵:",
+    "Session backup key:": "セッションバックアップ鍵:",
+    "Secret storage public key:": "機密ストレージ公開鍵:",
+    "in account data": "アカウントデータ内",
+    "Homeserver feature support:": "ホームサーバーの対応状況:",
+    "exists": "対応している",
+    "Your homeserver does not support session management.": "あなたのホームサーバーはセッション管理に対応していません。",
+    "Unable to load session list": "セッション一覧を読み込めません",
+    "Securely cache encrypted messages locally for them to appear in search results, using ": "検索結果を表示するため、暗号化されたメッセージをローカルに安全にキャッシュしています。 キャッシュの保存に ",
+    " to store messages from ": " を使用中であり ",
+    "rooms.": "件の部屋のメッセージが含まれています。",
+    "Manage": "管理",
+    "Add an email address to configure email notifications": "メールアドレスを追加すると電子メール通知の設定も行えます。",
+    "Custom theme URL": "カスタムテーマ URL",
+    "Add theme": "テーマの追加",
+    "Account management": "アカウントの管理",
+    "Deactivating your account is a permanent action - be careful!": "アカウントの無効化は取り消せません。ご注意ください。",
+    "Deactivate account": "アカウントの無効化",
+    "Room list": "部屋一覧",
+    "Timeline": "タイムライン",
+    "Message search": "メッセージの検索",
+    "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.": "公開アドレスを使うと、どのサーバーのどのユーザーでもあなたの部屋に参加することができます。アドレスを公開するには、まずローカルアドレスとして設定する必要があります。",
+    "Local Addresses": "ローカルアドレス",
+    "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s は検索結果を表示するため、暗号化されたメッセージをローカルに安全にキャッシュしています:",
+    "Space used:": "使用中のストレージ容量:",
+    "Indexed messages:": "インデックス済みのメッセージ数:",
+    "Indexed rooms:": "インデックス済みの部屋数:",
+    "%(doneRooms)s out of %(totalRooms)s": "%(totalRooms)s 件の部屋の内 %(doneRooms)s 件",
+    "Error changing power level": "権限レベルの変更中にエラーが発生しました",
+    "Frequently Used": "使用頻度の高いリアクション",
+    "Smileys & People": "表情と人々",
+    "Animals & Nature": "動物と植物",
+    "Food & Drink": "食べ物と飲み物",
+    "Activities": "アクティビティ",
+    "Travel & Places": "旅行と場所",
+    "Objects": "物体",
+    "Symbols": "シンボル",
+    "Flags": "旗",
+    "Cancel search": "検索をキャンセル",
+    "Your avatar URL": "あなたのアバター URL",
+    "Your user ID": "あなたのユーザー ID",
+    "Your theme": "あなたのテーマ",
+    "%(brand)s URL": "%(brand)s URL",
+    "Room ID": "部屋 ID",
+    "Maximize apps": "アプリを最大化する",
+    "More options": "更なるオプション",
+    "Manually verify all remote sessions": "すべてのリモートセッションを手動で検証する",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "クロス署名されたデバイスを信頼せず、信頼済みとしてマークするためにユーザーが使用する各セッションを個別に検証します。",
+    "This session is backing up your keys. ": "このセッションでは鍵をバックアップしています。 ",
+    "Show all": "すべて表示",
+    "Message deleted": "メッセージが削除されました",
+    "Message deleted by %(name)s": "%(name)s によってメッセージが削除されました",
+    "Show less": "詳細を非表示",
+    "Show more": "詳細を表示",
+    "Backup has a <validity>valid</validity> signature from this user": "バックアップには、このユーザーによる<validity>有効</validity>な署名があります",
+    "Backup has a <validity>invalid</validity> signature from this user": "バックアップには、このユーザーによる<validity>無効</validity>な署名があります",
+    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "バックアップには、ID %(deviceId)s の<verify>未知のユーザー</verify>による署名があります",
+    "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 is not signed by any of your sessions": "バックアップには、あなたのどのセッションからも署名がありません",
+    "This backup is trusted because it has been restored on this session": "このバックアップは、このセッションで復元されたため信頼されています",
+    "Where you’re logged in": "現在ログイン中のセッション",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "以下のセッションの公開名を変更したり、サインアウトしたり、<a>あなたのユーザープロフィールからセッションの検証を行う</a>ことができます。",
+    "Enable end-to-end encryption": "エンドツーエンド暗号化を有効にする",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "後から無効化することはできません。ブリッジおよびほとんどのボットはまだ動作しません。",
+    "Use bots, bridges, widgets and sticker packs": "ボット、ブリッジ、ウィジェット、ステッカーパックを使用",
+    "Service": "サービス",
+    "Summary": "概要",
+    "Document": "ドキュメント",
+    "Appearance": "外観",
+    "Other users may not trust it": "他のユーザーはこのセッションを信頼しない可能性があります",
+    "Show a placeholder for removed messages": "削除されたメッセージの場所にプレースホルダーを表示",
+    "Show join/leave messages (invites/kicks/bans unaffected)": "参加/退出のメッセージを表示 (招待/追放/ブロック には影響しません)",
+    "Prompt before sending invites to potentially invalid matrix IDs": "不正な可能性のある Matrix ID に招待を送るまえに確認を表示",
+    "Order rooms by name": "名前順で部屋を整列",
+    "Show rooms with unread notifications first": "未読通知のある部屋をトップに表示",
+    "Show shortcuts to recently viewed rooms above the room list": "最近表示した部屋のショートカットを部屋リストの上に表示",
+    "Show previews/thumbnails for images": "画像のプレビュー/サムネイルを表示",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by 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>。ですが、あなたは復元に使用したり今後キーを追加したりできるバックアップを持っています。",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "このセッションのみにあるキーを失なわないために、セッションをキーバックアップに接続しましょう。",
+    "Connect this session to Key Backup": "このセッションをキーバックアップに接続",
+    "Autocomplete delay (ms)": "自動補完の遅延 (ms)",
+    "Missing media permissions, click the button below to request.": "メディア権限が不足しています、リクエストするには下のボタンを押してください。",
+    "Request media permissions": "メディア権限をリクエスト",
+    "Joining room …": "部屋に参加中...",
+    "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": "リカバリキーを入力",
+    "Verify this login": "このログインを承認",
+    "Signing In...": "サインインしています...",
+    "If you've joined lots of rooms, this might take a while": "たくさんの部屋に参加している場合は、時間がかかる可能性があります",
+    "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:": "最新版の %(brand)s が他のあなたのデバイスで実行されている必要があります:",
+    "or another cross-signing capable Matrix client": "もしくはクロス署名に対応した他の Matrix クライアント",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "このセッションでのセキュリティを完了させない限り、暗号化されたメッセージにはアクセスできません。",
+    "Single Sign On": "シングルサインオン",
+    "Light": "ライト",
+    "Dark": "ダーク",
+    "Font size": "フォントサイズ",
+    "Use custom size": "独自のサイズを使用",
+    "Use a more compact ‘Modern’ layout": "よりコンパクトで現代的なレイアウトを使用",
+    "Use a system font": "システムフォントを使用",
+    "System font name": "システムフォントの名前",
+    "Enable experimental, compact IRC style layout": "コンパクトな IRC スタイルレイアウトを使用 (実験的機能)",
+    "Messages containing my username": "自身のユーザー名を含むメッセージ",
+    "Messages containing @room": "@room を含むメッセージ",
+    "When rooms are upgraded": "部屋がアップグレードされた時",
+    "Hey you. You're the best!": "こんにちは、よろしくね！",
+    "Customise your appearance": "外観のカスタマイズ",
+    "Appearance Settings only affect this %(brand)s session.": "外観の設定はこの %(brand)s セッションにのみ適用されます。",
+    "People": "連絡先",
+    "Notification options": "通知設定",
+    "Verify User": "ユーザーの検証",
+    "Your homeserver": "あなたのホームサーバー",
+    "%(displayName)s cancelled verification.": "%(displayName)s が検証をキャンセルしました。",
+    "You cancelled verification.": "あなたが検証をキャンセルしました。",
+    "Verification cancelled": "検証のキャンセル",
+    "Notification settings": "通知設定",
+    "Switch to light mode": "ライトテーマに切り替え",
+    "Switch to dark mode": "ダークテーマに切り替え",
+    "Switch theme": "テーマを切り替え",
+    "Security & privacy": "セキュリティとプライバシー",
+    "All settings": "全ての設定",
+    "Feedback": "フィードバック",
+    "User menu": "ユーザーメニュー",
+    "Connecting to integration manager...": "インテグレーションマネージャに接続中...",
+    "Cannot connect to integration manager": "インテグレーションマネージャに接続できません",
+    "Leave Room": "部屋を退出",
+    "Failed to connect to integration manager": "インテグレーションマネージャへの接続に失敗しました",
+    "Start verification again from their profile.": "プロフィールから再度検証を開始してください。",
+    "Integration Manager": "インテグレーションマネージャ",
+    "Do not use an identity server": "ID サーバーを使用しない",
+    "Composer": "入力欄",
+    "Sort by": "並び替え",
+    "List options": "一覧の設定",
+    "Use Single Sign On to continue": "シングルサインオンを使用して続行",
+    "Accept <policyLink /> to continue:": "<policyLink /> に同意して続行：",
+    "Always show the window menu bar": "常にウィンドウメニューバーを表示する",
+    "Create room": "部屋を作成",
+    "Show %(count)s more|other": "さらに %(count)s 件を表示",
+    "Show %(count)s more|one": "さらに %(count)s 件を表示",
+    "%(num)s minutes ago": "%(num)s 分前",
+    "%(num)s hours ago": "%(num)s 時間前",
+    "%(num)s days ago": "%(num)s 日前"
 }
diff --git a/src/i18n/strings/jbo.json b/src/i18n/strings/jbo.json
index 8bb052cfe2..f2c9dc6e43 100644
--- a/src/i18n/strings/jbo.json
+++ b/src/i18n/strings/jbo.json
@@ -1,182 +1,158 @@
 {
-    "This email address is already in use": ".i ca'o pilno le ve samymri",
-    "This phone number is already in use": ".i ca'o pilno le fonjudri",
-    "Failed to verify email address: make sure you clicked the link in the email": ".i na pu facki lo du'u xu kau do ponse le skami te mrilu .i ko birti lo du'u do pu skami cuxna le urli pe le se samymri",
-    "The platform you're on": "le ciste poi do pilno",
-    "The version of Riot.im": "le farvi tcini be la nu zunti",
-    "Your language of choice": "le se cuxna be fi lo'i bangu",
-    "Which officially provided instance you are using, if any": "le klesi poi ca'irselzau se sabji poi do pilno",
-    "Whether or not you're using the Richtext mode of the Rich Text Editor": "lo du'u xu kau do pilno la .markdaun. lo nu ciski",
-    "Your homeserver's URL": "le urli be le do samtcise'u",
-    "Your identity server's URL": "le urli be le do prenu datni samtcise'u",
-    "e.g. %(exampleValue)s": "mu'a zoi gy. %(exampleValue)s .gy.",
-    "Every page you use in the app": "ro lo pagbu poi do pilno pe le samtci",
-    "e.g. <CurrentPageURL>": "mu'a zoi urli. <CurrentPageURL> .urli",
-    "Your User Agent": "le datni be lo do kibyca'o",
-    "Your device resolution": "le ni vidnysle",
-    "Analytics": "lo se lanli datni",
-    "The information being sent to us to help make Riot.im better includes:": ".i ti liste lo datni poi se dunda fi lo favgau te zu'e lo nu xagzengau la nu zunti",
-    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": ".i pu lo nu benji fi lo samtcise'u cu vimcu lo datni poi termi'u no'u mu'a lo termi'u be lo kumfa pe'a .o nai lo pilno .o nai lo girzu",
-    "Call Failed": ".i pu fliba lo nu fonjo'e",
-    "Review Devices": "za'u re'u viska lo liste be lo samtciselse'u",
-    "Call Anyway": "je'e fonjo'e",
-    "Answer Anyway": "je'e spuda",
-    "Call": "fonjo'e",
-    "Answer": "spuda",
-    "You are already in a call.": ".i do ca'o pu zvati lo nu fonjo'e",
-    "VoIP is unsupported": ".i na kakne tu'a la .voip.",
-    "You cannot place VoIP calls in this browser.": ".i le kibyca'o na kakne tu'a la .voip.",
-    "You cannot place a call with yourself.": ".i lo nu do fonjo'e do na cumki",
-    "Call in Progress": ".i ca'o nu fonjo'e",
-    "A call is currently being placed!": ".i pu'o nu fonjo'e",
-    "A call is already in progress!": ".i ca'o drata nu fonjo'e",
-    "Permission Required": ".i do notci lo nu curmi",
-    "You do not have permission to start a conference call in this room": ".i na curmi lo nu do co'a nunjmaji fonjo'e ne'i le kumfa pe'a",
-    "Upload Failed": ".i pu fliba lo nu kibdu'a",
-    "Failure to create room": ".i fliba lo nu zbasu lo kumfa pe'a",
-    "Call Timeout": ".i mutce temci lo nu co'a fonjo'e",
-    "The remote side failed to pick up": ".i lo se fonjo'e na pu spuda",
-    "Unable to capture screen": ".i na kakne lo nu benji lo vidvi be lo vidni",
-    "Existing Call": ".i ca'o pu fonjo'e",
-    "Could not connect to the integration server": ".i na kakne lo nu co'a samjo'e le jmina samtcise'u",
-    "Server may be unavailable, overloaded, or you hit a bug.": ".i la'a cu'i lo samtcise'u cu spofu gi'a mutce gunka .i ja samcfi",
-    "Send anyway": "je'e benji",
-    "Send": "benji",
-    "Sun": "nondei",
-    "Mon": "pavdei",
-    "Tue": "reldei",
-    "Wed": "cibdei",
-    "Thu": "vondei",
-    "Fri": "mumdei",
-    "Sat": "xavdei",
-    "Jan": "pa",
-    "Feb": "re",
-    "Mar": "ci",
-    "Apr": "vo",
-    "May": "mu",
-    "Jun": "xa",
-    "Jul": "ze",
-    "Aug": "bi",
-    "Sep": "so",
-    "Oct": "pa no",
-    "Nov": "pa pa",
-    "Dec": "pa re",
-    "PM": "su'i pa re",
-    "AM": "su'i no",
-    "%(weekDayName)s %(time)s": "de'i lo %(weekDayName)s ti'u li %(time)s",
-    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "de'i li %(day)s pi'e %(monthName)s noi %(weekDayName)s ge'u ti'u li %(time)s",
-    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "de'i li %(day)s pi'e %(monthName)s pi'e %(fullYear)s noi %(weekDayName)s",
-    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "de'i li %(day)s pi'e %(monthName)s pi'e %(fullYear)s noi %(weekDayName)s ge'u ti'u li %(time)s",
-    "Who would you like to add to this community?": ".i do djica lo nu jmina ma le girzu",
-    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": ".i ju'i lo djuno be lo judri be lo girzu cu kakne lo nu viska lo liste be ro lo prenu poi se jmina do gy.",
-    "Invite new community members": "vi'ecpe lo prenu poi cnino le girzu",
-    "Invite to Community": "vi'ecpe fi le girzu",
-    "Which rooms would you like to add to this community?": ".i do djica lo nu jmina ma poi kumfa pe'a po'u le girzu",
-    "Show these rooms to non-members on the community page and room list?": ".i .au pei le kumfa cu gubni zvati le girzu pagbu .e le liste be lo'i kumfa pe'a",
-    "Add rooms to the community": "jmina lo kumfa pe'a le girzu",
-    "Room name or alias": "lo cmene ja datcme be lo kumfa",
-    "Add to community": "jmina fi le girzu",
-    "Failed to invite the following users to %(groupId)s:": "lo pilno poi fliba lo nu vi'ecpe ke'a la'o ny. %(groupId)s .ny.",
-    "Failed to invite users to community": ".i pu fliba lo nu vi'ecpe lo pilno le girzu",
-    "Failed to invite users to %(groupId)s": ".i pu fliba lo nu vi'ecpe lo pilno la'o ny. %(groupId)s .ny.",
-    "Failed to add the following rooms to %(groupId)s:": "lo kumfa pe'a poi fliba lo nu jmina ke'a la'o ny. %(groupId)s .ny.",
-    "Unnamed Room": "lo kumfa pe'a noi no da cmene",
-    "Riot does not have permission to send you notifications - please check your browser settings": ".i na curmi lo nu la nu zunti cu benji lo sajgau do .i .e'o do cipcta lo te cuxna pe le do kibyca'o",
-    "Riot was not given permission to send notifications - please try again": ".i na pu curmi lo nu la nu zunti cu benji lo sajgau .i .e'o do za'u re'u troci",
+    "This email address is already in use": ".i xa'o pilno fa da le samymri judri",
+    "This phone number is already in use": ".i xa'o pilno fa da le fonxa judri",
+    "Failed to verify email address: make sure you clicked the link in the email": ".i da nabmi fi lo nu facki le du'u do ponse le te samymri .i ko birti le du'u do samcu'a le judrysni pe le se samymri",
+    "The platform you're on": "jicmu vau je se pilno do",
+    "Your language of choice": "se cuxna fo le ka bangu",
+    "Which officially provided instance you are using, if any": "samtcise'u vau je catni jai te selfu vau je se pilno do",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "jei do pilno le se jadni ciska tadji pe le notci ciska tutci",
+    "Your homeserver's URL": "judri le samtcise'u",
+    "e.g. %(exampleValue)s": ".i zoi zoi. %(exampleValue)s .zoi mupli",
+    "Every page you use in the app": "liste lu'i ro pagbu be le samtci be'o poi se pilno do",
+    "e.g. <CurrentPageURL>": ".i zoi zoi. <CurrentPageURL> .zoi mupli",
+    "Your device resolution": "vidnysle relca'u le vidni",
+    "Analytics": "lanli datni",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": ".i zilbe'i le samtcise'u fa le te zilvi'u be le datni bei lu'o ro datni be le du'u mu'a pa ve zilbe'i ja pa pilno ja pa girzu ja pa drata cu jai steci do",
+    "Call Failed": ".i da nabmi fi lo nu co'a fonjo'e",
+    "You are already in a call.": ".i do xa'o ca'o fonjo'e da",
+    "VoIP is unsupported": ".i na ka'e pilno la .voip.",
+    "You cannot place VoIP calls in this browser.": ".i le kibrbrauzero na ka'e pilno la .voip. lo nu fonjo'e",
+    "You cannot place a call with yourself.": ".i do na ka'e fonjo'e do",
+    "Call in Progress": ".i ca'o fonjo'e",
+    "A call is currently being placed!": ".i ca'o co'a fonjo'e",
+    "A call is already in progress!": ".i xa'o ca'o fonjo'e da",
+    "Permission Required": ".i lo nu curmi cu sarcu",
+    "You do not have permission to start a conference call in this room": ".i na curmi lo nu le du'u co'a girzu fonjo'e cu zilbe'i do fo le ca se cuxna",
+    "Upload Failed": ".i da nabmi fi lo nu kibdu'a",
+    "Failure to create room": ".i da nabmi fi lo nu cupra le ve zilbe'i",
+    "Call Timeout": ".i dukse le ka ca'o ce'u co'a fonjo'e",
+    "The remote side failed to pick up": ".i da poi do co'a fonjo'e ke'a na spuda",
+    "Unable to capture screen": ".i na ka'e facki le du'u vidvi fi le vidni",
+    "Existing Call": ".i xa'o ca'o fonjo'e",
+    "Server may be unavailable, overloaded, or you hit a bug.": ".i la'a cu'i gi ja le samtcise'u cu spofu vau ja mutce le ka gunka gi da samcfi",
+    "Send": "nu zilbe'i",
+    "Sun": "jy. dy. ze",
+    "Mon": "jy. dy. pa",
+    "Tue": "jy. dy. re",
+    "Wed": "jy. dy. ci",
+    "Thu": "dy. jy. vo",
+    "Fri": "dy. jy. mu",
+    "Sat": "dy. jy. xa",
+    "Jan": "ly. pa",
+    "Feb": "ly. re",
+    "Mar": "ly. ci",
+    "Apr": "ly. vo",
+    "May": "ly. mu",
+    "Jun": "ly. xa",
+    "Jul": "ly. ze",
+    "Aug": "ly. bi",
+    "Sep": "ly. so",
+    "Oct": "ly. pa no",
+    "Nov": "ly. pa pa",
+    "Dec": "ly. pa re",
+    "PM": "ly. cy.",
+    "AM": "cy. cy.",
+    "%(weekDayName)s %(time)s": ".i li %(weekDayName)s %(time)s detri",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": ".i li %(monthName)s %(day)s %(weekDayName)s %(time)s detri",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": ".i li %(fullYear)s %(monthName)s %(day)s %(weekDayName)s detri",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": ".i li %(fullYear)s %(monthName)s %(day)s %(weekDayName)s %(time)s detri",
+    "Who would you like to add to this community?": ".i do djica lo nu ma ziljmina le girzu",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": ".i ju'i zo'e ro djuno be le du'u judri le girzu cu ka'e zgana le du'u ro da poi pagbu le girzu zo'u da go'i",
+    "Invite new community members": "nu friti le ka ziljmina le girzu",
+    "Invite to Community": "nu friti le ka ziljmina le girzu",
+    "Which rooms would you like to add to this community?": ".i do djica lo nu ma poi ve zilbe'i cu ziljmina le girzu",
+    "Show these rooms to non-members on the community page and room list?": ".i xu do djica lo nu ro na cmima cu ka'e zgana le du'u le ve zilbe'i cu pagbu le girzu je le ve zilbe'i liste",
+    "Add rooms to the community": "nu jmina pa ve zilbe'i le girzu",
+    "Add to community": "nu ziljmina le girzu",
+    "Failed to invite the following users to %(groupId)s:": ".i da nabmi fi lo nu friti le ka ziljmina la'o zoi. %(groupId)s .zoi kei le di'e pilno",
+    "Failed to invite users to community": ".i da nabmi fi lo nu friti le ka ziljmina le girzu",
+    "Failed to invite users to %(groupId)s": ".i da nabmi fi lo nu friti le ka ziljmina la'o zoi. %(groupId)s .zoi",
+    "Failed to add the following rooms to %(groupId)s:": ".i da nabmi fi lo nu le di'e ve zilbe'i cu ziljmina la'o zoi. %(groupId)s .zoi",
+    "Unnamed Room": "na da cmene",
     "Unable to enable Notifications": ".i na kakne lo nu co'a kakne lo nu benji lo sajgau",
-    "This email address was not found": ".i na pu facki fi le ve samymri",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": ".i za'a le ve samymri be fo do cu ckini no lo judri be fi la nacmeimei be'o pe le samtcise'u",
-    "Registration Required": ".i .ei do se cmeveigau",
-    "You need to register to do this. Would you like to register now?": ".i lo nu cmeveigau do sarcu ti .i do ca .au pei cmeveigau do",
-    "Register": "cmeveigau",
-    "Default": "lo zmiselcu'a",
-    "Restricted": "li so'u",
-    "Moderator": "li so'i",
-    "Admin": "li ro",
-    "Start a chat": "lo nu co'a tavla",
-    "Power level must be positive integer.": ".i .ei lo ni vlipa cu kacna'u",
+    "This email address was not found": ".i na da zo'u facki le du'u samymri judri da",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": ".i za'a le samymri judri na ckini pa judri be fi la .meitriks. be'o pe le samtcise'u",
+    "Register": "nu co'a na'o jaspu",
+    "Default": "zmiselcu'a",
+    "Restricted": "vlipa so'u da",
+    "Moderator": "vlipa so'o da",
+    "Admin": "vlipa so'i da",
+    "Power level must be positive integer.": ".i lo nu le ni vlipa cu kacna'u cu sarcu",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": ".i la'o ly. %(senderName)s .ly. gafygau %(powerLevelDiffText)s",
     "Failed to change power level": ".i pu fliba lo nu gafygau lo ni vlipa",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "lo ni la'o ny. %(userId)s .ny. vlipa noi pu du %(fromPowerLevel)s ku %(toPowerLevel)s",
-    "Operation failed": ".i pu fliba",
-    "Failed to invite": ".i pu fliba lo nu vi'ecpe",
-    "Failed to invite the following users to the %(roomName)s room:": "lo pilno poi fliba lo nu vi'ecpe ke'a la'o ly. %(roomName)s .ly. noi kumfa pe'a",
-    "You need to be logged in.": ".i .ei do cmisau",
-    "You need to be able to invite users to do that.": ".i lo nu do kakne lo nu vi'ecpe lo pilno cu sarcu ta",
+    "Operation failed": ".i da nabmi",
+    "Failed to invite": ".i da nabmi fi lo nu friti le ka ziljmina",
+    "Failed to invite the following users to the %(roomName)s room:": ".i da nabmi fi lo nu friti le ka ziljmina le se zilbe'i be fo la'o zoi. %(roomName)s .zoi kei le di'e pilno",
+    "You need to be logged in.": ".i lo nu da jaspu do sarcu",
+    "You need to be able to invite users to do that.": ".i lo nu do vlipa le ka friti le ka ziljmina cu sarcu",
     "Unable to create widget.": ".i na kakne lo nu zbasu lo uidje",
     "Missing roomId.": ".i claxu lo judri be lo kumfa pe'a",
-    "Failed to send request.": ".i pu fliba lo nu benji lo ve cpedu",
+    "Failed to send request.": ".i da nabmi fi lo nu benji le ve cpedu",
     "This room is not recognised.": ".i na sanji le kumfa pe'a",
-    "You are not in this room.": ".i do na zvati le kumfa pe'a",
-    "You do not have permission to do that in this room.": ".i ne'i le kumfa pe'a na curmi ta poi do troci",
-    "Missing room_id in request": ".i lo ve cpedu cu claxu lo judri be lo kumfa pe'a",
+    "You are not in this room.": ".i do na pagbu le se zilbe'i",
+    "You do not have permission to do that in this room.": ".i do na vlipa le ka zo'e zilbe'i do fo zo'e",
+    "Missing room_id in request": ".i na pa judri be pa ve zilbe'i cu pagbu le ve cpedu",
     "Room %(roomId)s not visible": ".i na kakne lo nu viska la'o ly. %(roomId)s .ly. noi kumfa pe'a",
-    "Missing user_id in request": ".i lo ve cpedu cu claxu lo judri be lo pilno",
-    "Usage": "lo tadji be lo nu pilno",
+    "Missing user_id in request": ".i na pa judri be pa pilno cu pagbu le ve cpedu",
+    "Usage": "tadji lo nu pilno",
     "Searches DuckDuckGo for results": ".i sisku se pi'o la datkysisku",
     "/ddg is not a command": "zoi ny. /ddg .ny. na nu minde",
-    "Changes your display nickname": ".i galfi le do cmene",
+    "Changes your display nickname": "",
     "Invites user with given id to current room": ".i vi'ecpe lo pilno poi se judri ti ku le kumfa pe'a",
-    "Joins room with given alias": ".i drata judri le kumfa pe'a",
-    "Leave room": "cliva le kumfa pe'a",
-    "Unrecognised room alias:": "lo drata judri poi na se sanji",
+    "Leave room": "nu do zilvi'u le se zilbe'i",
     "Kicks user with given id": ".i rinka lo nu lo pilno poi se judri ti cu cliva",
     "Bans user with given id": ".i rinka lo nu lo pilno poi se judri ti cu vitno cliva",
     "Ignores a user, hiding their messages from you": ".i rinka lo nu no'e jundi lo pilno gi'e mipri lo notci be fi py. do",
-    "Ignored user": ".i do no'e jundi le pilno",
-    "You are now ignoring %(userId)s": ".i do ca no'e jundi la'o ny. %(userId)s .ny.",
+    "Ignored user": ".i mo'u co'a na jundi tu'a le pilno",
+    "You are now ignoring %(userId)s": ".i ca na jundi tu'a la'o zoi. %(userId)s .zoi",
     "Stops ignoring a user, showing their messages going forward": ".i sisti lo nu no'e jundi lo pilno gi'e mipri lo notci be fi py. do",
-    "Unignored user": ".i do sisti lo nu no'e jundi le pilno",
-    "You are no longer ignoring %(userId)s": ".i do ca sisti lo nu no'e jundi la'o ny. %(userId)s .ny.",
+    "Unignored user": ".i mo'u co'a jundi tu'a le pilno",
+    "You are no longer ignoring %(userId)s": ".i ca jundi tu'a la'o zoi. %(userId)s .zoi",
     "Define the power level of a user": ".i ninga'igau lo ni lo pilno cu vlipa",
     "Deops user with given id": ".i xruti lo ni lo pilno poi se judri ti cu vlipa",
     "Opens the Developer Tools dialog": ".i samymo'i lo favgau se pilno uidje",
-    "Verified key": "lo termifckiku poi se lacri",
+    "Verified key": "ckiku vau je se lacri",
     "Displays action": ".i mrilu lo nu do gasnu",
     "Forces the current outbound group session in an encrypted room to be discarded": ".i macnu vimcu lo ca barkla termifckiku gunma lo kumfa pe'a poi mifra",
-    "Reason": "lo krinu",
-    "%(targetName)s accepted the invitation for %(displayName)s.": ".i la'o ly. %(targetName)s .ly. fitytu'i lo ve vi'ecpe be fi la'o ly. %(displayName)s .ly.",
-    "%(targetName)s accepted an invitation.": ".i la'o ly. %(targetName)s .ly. fitytu'i lo ve vi'ecpe",
-    "%(senderName)s requested a VoIP conference.": ".i la'o ly. %(senderName)s .ly. cpedu lo .voip. zei nunjmaji",
-    "%(senderName)s invited %(targetName)s.": ".i la'o ly. %(senderName)s .ly. vi'ecpe la'o ly. %(targetName)s .ly.",
+    "Reason": "krinu",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "",
+    "%(targetName)s accepted an invitation.": ".i la'o zoi. %(targetName)s .zoi zukte pa se friti",
+    "%(senderName)s requested a VoIP conference.": "",
+    "%(senderName)s invited %(targetName)s.": ".i la'o zoi. %(senderName)s .zoi friti le ka ziljmina kei la'o zoi. %(targetName)s .zoi",
     "%(senderName)s banned %(targetName)s.": ".i la'o ly. %(senderName)s .ly. gasnu lo nu la'o ly. %(targetName)s .ly. vitno cliva",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": ".i la'o ly. %(oldDisplayName)s .ly. gafygau lo cmene be ri zoi ly. %(displayName)s .ly.",
-    "%(senderName)s set their display name to %(displayName)s.": ".i la'o ny. %(senderName)s .ny. jmina lo cmene be ri be'o no'u zoi ly. %(displayName)s .ly.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": ".i la'o ny. %(senderName)s .ny. vimcu lo cmene be ri be'o no'u zoi ly. %(oldDisplayName)s .ly.",
-    "%(senderName)s removed their profile picture.": ".i la'o ly. %(senderName)s .ly. vimcu lo predatni pixra pe ri",
-    "%(senderName)s changed their profile picture.": ".i la'o ly. %(senderName)s .ly. gafygau lo predatni pixra pe ri",
-    "%(senderName)s set a profile picture.": ".i la'o ly. %(senderName)s .ly. jmina lo predatni pixra pe ri",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": ".i zoi zoi. %(displayName)s .zoi basti zoi zoi. %(oldDisplayName)s .zoi le ka cmene",
+    "%(senderName)s set their display name to %(displayName)s.": ".i zoi zoi. %(displayName)s .zoi co'a cmene la'o zoi. %(senderName)s .zoi",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": ".i zoi zoi. %(oldDisplayName)s .zoi co'u cmene la'o zoi. %(senderName)s .zoi",
+    "%(senderName)s removed their profile picture.": ".i da co'u pixra sinxa la'o zoi. %(senderName)s .zoi",
+    "%(senderName)s changed their profile picture.": ".i da basti de le ka pixra sinxa la'o zoi. %(senderName)s .zoi",
+    "%(senderName)s set a profile picture.": ".i da co'a pixra sinxa la'o zoi. %(senderName)s .zoi",
     "VoIP conference started.": ".i co'a .voip. zei nunjmaji",
-    "%(targetName)s joined the room.": ".i la'o ly. %(targetName)s .ly. binxo lo cmima be le kumfa pe'a",
+    "%(targetName)s joined the room.": ".i la'o zoi. %(targetName)s .zoi ziljmina le se zilbe'i",
     "VoIP conference finished.": ".i mo'u .voip. zei nunjmaji",
-    "%(targetName)s rejected the invitation.": ".i la'o ly. %(targetName)s .ly. fitytoltu'i lo ve vi'ecpe",
-    "%(targetName)s left the room.": ".i la'o ly. %(targetName)s .ly. cliva le kumfa pe'a",
+    "%(targetName)s rejected the invitation.": ".i la'o zoi. %(targetName)s .zoi zukte le ka na ckaji le se friti",
+    "%(targetName)s left the room.": ".i la'o zoi. %(targetName)s .zoi zilvi'u le se zilbe'i",
     "%(senderName)s unbanned %(targetName)s.": ".i la'o ly. %(senderName)s .ly. xruti fo lo nu la'o ly. %(targetName)s .ly. vitno cliva",
-    "%(senderName)s kicked %(targetName)s.": ".i la'o ly. %(senderName)s .ly. gasnu lo nu la'o ly. %(targetName)s .ly. cliva",
-    "%(senderName)s withdrew %(targetName)s's invitation.": ".i la'o ly. %(senderName)s .ly. lebna lo ve vi'ecpe be la'o ly. %(targetName)s .ly.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": ".i la'o ly. %(senderDisplayName)s .ly. gafygau lo se casnu pe le kumfa pe'a zoi ly. %(topic)s .ly.",
-    "%(senderDisplayName)s removed the room name.": ".i la'o ly. %(senderDisplayName)s .ly. vimcu lo cmene be le kumfa pe'a",
-    "%(senderDisplayName)s changed the room name to %(roomName)s.": ".i la'o ly. %(senderDisplayName)s .ly. gafygau lo cmene be le kumfa zoi ly. %(roomName)s .ly.",
-    "%(senderDisplayName)s sent an image.": ".i la'o ly. %(senderDisplayName)s .ly. mrilu lo pixra",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": ".i la'o ly. %(senderName)s .ly. jmina zoi ny. %(addedAddresses)s .ny. lo'i judri be le kumfa pe'a",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": ".i la'o ly. %(senderName)s .ly. jmina zoi ny. %(addedAddresses)s .ny. lo'i judri be le kumfa pe'a",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": ".i la'o ly. %(senderName)s .ly. vimcu zoi ny. %(removedAddresses)s .ny. lo'i judri be le kumfa pe'a",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": ".i la'o ly. %(senderName)s .ly. vimcu zoi ny. %(removedAddresses)s .ny. lo'i judri be le kumfa pe'a",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": ".i la'o ly. %(senderName)s .ly. jmina zoi ny. %(addedAddresses)s .ny. lo'i judri be le kumfa pe'a gi'e vimcu zoi ny. %(removedAddresses)s .ny. jy.",
-    "%(senderName)s set the main address for this room to %(address)s.": ".i la'o ly. %(senderName)s .ly. gafygau lo ralju cmene be le kumfa pe'a zoi ny. %(address)s .ny.",
-    "%(senderName)s removed the main address for this room.": ".i la'o ly. %(senderName)s .ly. vimcu lo ralju cmene be le kumfa pe'a",
-    "Someone": "da poi prenu",
-    "(not supported by this browser)": "to le do kibyca'o na kakne toi",
-    "%(senderName)s answered the call.": ".i la'o ly. %(senderName)s .ly. spuda lo nu fonjo'e",
+    "%(senderName)s kicked %(targetName)s.": ".i gau la'o zoi. %(senderName)s .zoi la'o zoi. %(targetName)s .zoi zilvi'u le se zilbe'i",
+    "%(senderName)s withdrew %(targetName)s's invitation.": ".i la'o zoi. %(senderName)s .zoi co'u friti le ka ziljmina kei la'o zoi. %(targetName)s .zoi",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": ".i gau la'o zoi. %(senderDisplayName)s .zoi zoi zoi. %(topic)s .zoi basti da le ka skicu lerpoi",
+    "%(senderDisplayName)s removed the room name.": ".i gau la'o zoi. %(senderDisplayName)s .zoi da co'u cmene le se zilbe'i",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": ".i gau la'o zoi. %(senderDisplayName)s .zoi zoi zoi. %(roomName)s .zoi basti da le ka cmene le se zilbe'i",
+    "%(senderDisplayName)s sent an image.": ".i pa pixra cu zilbe'i fi la'o zoi. %(senderDisplayName)s .zoi",
+    "%(senderName)s set the main address for this room to %(address)s.": ".i gau la'o zoi. %(senderName)s .zoi zoi zoi. %(address)s .zoi co'a ralju le'i judri be le ve zilbe'i",
+    "%(senderName)s removed the main address for this room.": ".i gau la'o zoi. %(senderName)s .zoi da co'u ralju le'i judri be le ve zilbe'i",
+    "Someone": "da",
+    "(not supported by this browser)": ".i le kibrbrauzero na kakne",
+    "%(senderName)s answered the call.": ".i mo'u co'a fonjo'e la'o zoi. %(senderName)s .zoi",
     "(could not connect media)": "to na kakne lo nu ganvi samjongau toi",
-    "(no answer)": "to na spuda toi",
+    "(no answer)": ".i na spuda",
     "(unknown failure: %(reason)s)": "to na'e te djuno nu fliba fi'o ve skicu zoi gy. %(reason)s .gy. toi",
-    "%(senderName)s ended the call.": ".i la'o ly. %(senderName)s .ly. sisti lo nu fonjo'e",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": ".i la'o ly. %(senderName)s .ly. vi'ecpe la'o ly. %(targetDisplayName)s .ly. le kumfa pe'a",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": ".i la'o ly. %(senderName)s .ly. gasnu lo nu ro lo cmima ka'e viska ro lo notci be ba lo mu'e cy. se vi'ecpe",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": ".i la'o ly. %(senderName)s .ly. gasnu lo nu ro lo cmima ka'e viska ro lo notci be ba lo mu'e cy. cmibi'o",
-    "%(senderName)s made future room history visible to all room members.": ".i la'o ly. %(senderName)s .ly. gasnu lo nu ro lo cmima ka'e viska ro lo ba notci",
-    "%(senderName)s made future room history visible to anyone.": ".i la'o ly. %(senderName)s .ly. gasnu lo nu ro lo prenu ka'e viska ro lo ba notci",
+    "%(senderName)s ended the call.": ".i gau la'o zoi. %(senderName)s .zoi co'u fonjo'e ri",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": ".i la'o zoi. %(senderName)s .zoi friti le ka ziljmina le se zilbe'i kei la'o zoi. %(targetDisplayName)s .zoi",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": ".i ro da poi pagbu le se zilbe'i zo'u gau la'o zoi. %(senderName)s .zoi da ka'e tcidu ro notci poi ba lo nu da te friti ba zilbe'i",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": ".i ro da poi pagbu le se zilbe'i zo'u gau la'o zoi. %(senderName)s .zoi da ka'e tcidu ro notci poi ba lo nu da ziljmina ba zilbe'i",
+    "%(senderName)s made future room history visible to all room members.": ".i gau la'o zoi. %(senderName)s .zoi ro pagbu be le se zilbe'i cu ka'e tcidu ro notci poi ba zilbe'i",
+    "%(senderName)s made future room history visible to anyone.": ".i gau la'o zoi. %(senderName)s .zoi ro da ka'e tcidu ro notci poi ba zilbe'i",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": ".i la'o ly. %(senderName)s .ly. gasnu lo nu zo'e ka'e viska lo notci to cuxna zoi ny. %(visibility)s .ny. toi",
     "%(senderName)s changed the pinned messages for the room.": ".i la'o ly. %(senderName)s .ly. gafygau lo vitno notci pe le kumfa pe'a",
     "%(widgetName)s widget modified by %(senderName)s": ".i la'o ly. %(senderName)s .ly. gafygau la'o ny. %(widgetName)s .ny. noi uidje",
@@ -184,16 +160,14 @@
     "%(widgetName)s widget removed by %(senderName)s": ".i la'o ly. %(senderName)s .ly. vimcu la'o ny. %(widgetName)s .ny. noi uidje",
     "This homeserver has hit its Monthly Active User limit.": ".i le samtcise'u cu bancu lo masti jimte be ri bei lo ni ca'o pilno",
     "This homeserver has exceeded one of its resource limits.": ".i le samtcise'u cu bancu pa lo jimte be ri",
-    "Please <a>contact your service administrator</a> to continue using the service.": ".i .e'o ko <a>tavla lo do te selfu admine</a> .i ja nai do djica lo nu ca'o pilno le te selfu",
-    "Unable to connect to Homeserver. Retrying...": ".i pu fliba lo nu samjo'e le samtcise'u .i za'u re'u ca'o troci",
-    "Your browser does not support the required cryptography extensions": ".i le do kibyca'o na kakne tu'a le te mifra ciste noi se nitcu",
-    "Not a valid Riot keyfile": ".i na'e drani ckiku datnyvei",
+    "Please <a>contact your service administrator</a> to continue using the service.": ".i lo nu do <a>tavla pa jitro be le samtcise'u</a> cu sarcu lo nu za'o selfu do",
+    "Unable to connect to Homeserver. Retrying...": ".i da nabmi fi lo nu samjo'e le samtcise'u .i ca'o za'u re'u troci",
+    "Your browser does not support the required cryptography extensions": ".i le kibrbrauzero na ka'e pilno le mifra ciste poi jai sarcu",
     "Authentication check failed: incorrect password?": ".i pu fliba lo nu birti lo du'u curmi lo nu do jonse .i na'e drani xu japyvla",
     "Sorry, your homeserver is too old to participate in this room.": ".i .uu le do samtcise'u cu dukse lo ka laldo ku ja'e lo du'u sy. na kakne lo nu pagbu le kumfa pe'a",
     "Please contact your homeserver administrator.": ".i .e'o ko tavla lo admine be le samtcise'u",
-    "Failed to join room": ".i pu fliba lo nu cmibi'o le kumfa pe'a",
+    "Failed to join room": ".i da nabmi lo nu ziljmina le se zilbe'i",
     "Message Pinning": "lo du'u xu kau kakne lo nu mrilu lo vitno notci",
-    "Use compact timeline layout": "lo du'u xu kau lo liste be lo notci cu tagji",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "lo du'u xu kau lo tcika cu se tarmi mu'a lu ti'u li re pi'e ci no su'i pa re li'u",
     "Always show message timestamps": "lo du'u xu kau do ro roi viska ka'e lo tcika be tu'a lo notci",
     "Autoplay GIFs and videos": "lo du'u xu kau lo vidvi cu zmiku cfari",
@@ -205,49 +179,46 @@
     "Enable inline URL previews by default": "lo zmiselcu'a pe lo du'u xu kau zmiku purzga lo se urli",
     "Enable URL previews for this room (only affects you)": "lo du'u xu kau do zmiku purzga lo se urli ne'i le kumfa pe'a",
     "Enable URL previews by default for participants in this room": "lo zmiselcu'a pe lo du'u xu kau lo cmima be le kumfa pe'a cu zmiku purzga lo se urli",
-    "Room Colour": "lo se skari be le kumfa pe'a",
+    "Room Colour": "se skari le ve zilbe'i",
     "Enable widget screenshots on supported widgets": "lo du'u xu kau kakne lo nu co'a pixra lo uidje kei lo nu kakne tu'a .ubu",
-    "Collecting app version information": ".i ca'o crepu lo datni be lo favytcinymupli",
-    "Collecting logs": ".i ca'o crepu lo vreji",
-    "Uploading report": ".i ca'o kibdu'a lo datnynoi",
+    "Collecting app version information": ".i ca'o facki le du'u favytcinymupli",
+    "Collecting logs": ".i ca'o facki le du'u citri",
+    "Uploading report": ".i ca'o kibdu'a le vreji",
     "Waiting for response from server": ".i ca'o denpa lo nu le samtcise'u cu spuda",
-    "Messages containing my display name": "lo notci poi vasru lo cmene be mi",
-    "Messages in one-to-one chats": "lo notci be fi pa lo prenu bei pa lo prenu",
-    "Messages in group chats": "lo notci pe lo girzu tavla",
-    "When I'm invited to a room": "lo nu vi'ecpe mi lo kumfa pe'a",
-    "Call invitation": "lo nu vi'ecpe mi lo nu fonjo'e",
-    "Messages sent by bot": "lo notci be fi lo sampre",
+    "Messages containing my display name": "nu pa se pagbu be le cmene be mi cu zilbe'i",
+    "Messages in one-to-one chats": "nu da zilbe'i pa prenu",
+    "Messages in group chats": "nu da zilbe'i lu'o pa prenu",
+    "When I'm invited to a room": "nu da friti le ka ziljmina lo se zilbe'i kei do",
+    "Call invitation": "nu da co'a fonjo'e do",
+    "Messages sent by bot": "nu da zilbe'i fi pa sampre",
     "Active call (%(roomName)s)": "le ca fonjo'e ne la'o ly. %(roomName)s .ly.",
     "unknown caller": "lo fonjo'e noi na'e te djuno",
     "Incoming voice call from %(name)s": ".i la'o ly. %(name)s .ly. ca'o snavi fonjo'e",
     "Incoming video call from %(name)s": ".i la'o ly. %(name)s .ly. ca'o vidvi fonjo'e",
     "Incoming call from %(name)s": ".i la'o ly. %(name)s .ly. ca'o fonjo'e",
-    "Decline": "fitytoltu'i",
-    "Accept": "fitytu'i",
-    "Error": "lo se srera",
+    "Decline": "nu na fonjo'e",
+    "Accept": "nu fonjo'e",
+    "Error": "nabmi",
     "Incorrect verification code": ".i na'e drani ke lacri lerpoi",
-    "Submit": "benji",
-    "Phone": "lo fonxa",
+    "Submit": "nu zilbe'i",
+    "Phone": "fonxa",
     "Add": "jmina",
-    "Failed to upload profile picture!": ".i pu fliba lo nu kibdu'a lo predatni pixra",
-    "No display name": ".i no da cmene",
-    "New passwords don't match": ".i le'i japyvla poi cnino na simxu lo nu mintu",
+    "Failed to upload profile picture!": ".i da nabmi lo nu kibdu'a le pixra sinxa",
+    "No display name": ".i na da cmene",
+    "New passwords don't match": ".i le'i lerpoijaspu poi cnino na simxu le ka du",
     "Passwords can't be empty": ".i lu li'u .e'a nai japyvla",
     "Warning!": ".i ju'i",
     "Export E2E room keys": "barbei lo kumfa pe'a termifckiku",
     "Continue": "",
     "Do you want to set an email address?": ".i .au pei do jmina lo te samymri",
     "Current password": "lo ca japyvla",
-    "Password": "lo japyvla",
-    "New Password": "lo japyvla poi cnino",
+    "Password": "lerpoijaspu",
+    "New Password": "lerpoijaspu vau je cnino",
     "Confirm password": "lo za'u re'u japyvla poi cnino",
-    "Change Password": "galfi lo japyvla",
+    "Change Password": "nu basti fi le ka lerpoijaspu",
     "Authentication": "lo nu facki lo du'u do du ma kau",
-    "Device ID": "lo judri be lo samtciselse'u",
     "Last seen": "lo ro re'u nu viska",
     "Failed to set display name": ".i pu fliba lo nu galfi lo cmene",
-    "Disable Notifications": "na sajgau",
-    "Enable Notifications": "sajgau",
     "Error saving email notification preferences": ".i pu fliba lo nu co'a vreji lo se cuxna pe lo nu samymri",
     "An error occurred whilst saving your email notification preferences.": ".i pu fliba lo nu co'a vreji lo se cuxna pe lo nu samymri sajgau",
     "Keywords": "lo midvla",
@@ -256,5 +227,358 @@
     "Failed to change settings": ".i pu fliba lo nu galfi lo se cuxna",
     "Can't update user notification settings": ".i pu fliba lo nu galfi lo se cuxna pe lo nu sajgau",
     "Failed to update keywords": ".i pu fliba lo nu galfi lo midvla",
-    "Messages containing <span>keywords</span>": "lo notci poi vasru <span>lo midvla</span>"
+    "Messages containing <span>keywords</span>": "lo notci poi vasru <span>lo midvla</span>",
+    "Try using turn.matrix.org": ".i ko troci le ka pilno le se judri be zoi zoi. turn.matrix.org .zoi",
+    "Room name or address": "fe pa ve zilbe'i cu cmene vau ja judri",
+    "Custom (%(level)s)": "drata (%(level)s)",
+    "Failed to invite users to the room:": ".i la'e di'e nabmi fi lo nu friti le ka ziljmina le se zilbe'i kei le pilno",
+    "Messages": "notci",
+    "Actions": "ka'e se zukte",
+    "Advanced": "macnu",
+    "Other": "drata",
+    "Command error": ".i da nabmi fi lo nu minde",
+    "Failed to set topic": ".i da nabmi lo nu co'a skicu lerpoi",
+    "This room has no topic.": ".i na da skicu lerpoi le ve zilbe'i",
+    "Command failed": ".i da nabmi lo nu minde",
+    "Could not find user in room": ".i le pilno na pagbu le se zilbe'i",
+    "Session already verified!": ".i xa'o lacri le se samtcise'u",
+    "WARNING: Session already verified, but keys do NOT MATCH!": ".i ju'i zo'e xa'o lacri le se samtcise'u .i ku'i le'i ckiku ba'e na simxu le ka mapti",
+    "%(senderName)s made no change.": ".i la'o zoi. %(senderName)s .zoi na binxo da de",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": ".i gau la'o zoi. %(senderDisplayName)s .zoi zoi zoi. %(newRoomName)s .zoi basti zoi zoi. %(oldRoomName)s .zoi le ka cmene le se zilbe'i",
+    "%(senderDisplayName)s made the room public to whoever knows the link.": ".i gau la'o zoi. %(senderDisplayName)s .zoi ro djuno be le du'u judri cu ka'e ziljmina le se zilbe'i",
+    "%(senderDisplayName)s made the room invite only.": ".i ro da zo'u gau la'o zoi. %(senderDisplayName)s .zoi lo nu de friti le ka ziljmina le se zilbe'i kei da sarcu",
+    "%(senderDisplayName)s has allowed guests to join the room.": ".i la'o zoi. %(senderDisplayName)s .zoi curmi lo nu ro na te friti cu ka'e ziljmina le se zilbe'i",
+    "%(senderDisplayName)s has prevented guests from joining the room.": ".i la'o zoi. %(senderDisplayName)s .zoi na curmi lo nu ro na te friti cu ka'e ziljmina le se zilbe'i",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": ".i gau la'o zoi. %(senderName)s .zoi zoi zoi. %(addresses)s .zoi poi na ralju co'a judri le se zilbe'i",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": ".i gau la'o zoi. %(senderName)s .zoi zoi zoi. %(addresses)s .zoi poi na ralju co'a judri le se zilbe'i",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": ".i gau la'o zoi. %(senderName)s .zoi zoi zoi. %(addresses)s .zoi poi na ralju co'u judri le se zilbe'i",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": ".i gau la'o zoi. %(senderName)s .zoi zoi zoi. %(addresses)s .zoi poi na ralju co'u judri le se zilbe'i",
+    "%(senderName)s changed the alternative addresses for this room.": ".i gau la'o zoi. %(senderName)s .zoi pa na ralju cu basti da le ka judri le se zilbe'i",
+    "%(senderName)s changed the main and alternative addresses for this room.": ".i gau la'o zoi. %(senderName)s .zoi pa ralju je pa na ralju cu basti da le ka judri le se zilbe'i",
+    "%(senderName)s changed the addresses for this room.": ".i gau la'o zoi. %(senderName)s .zoi da basti de le ka judri le se zilbe'i",
+    "%(senderName)s placed a voice call.": ".i la'o zoi. %(senderName)s .zoi co'a fonjo'e",
+    "%(senderName)s placed a voice call. (not supported by this browser)": ".i la'o zoi. %(senderName)s .zoi co'a fonjo'e .i le do kibrbrauzero na kakne",
+    "%(senderName)s placed a video call.": ".i la'o zoi. %(senderName)s .zoi co'a vidvi fonjo'e",
+    "%(senderName)s placed a video call. (not supported by this browser)": ".i la'o zoi. %(senderName)s .zoi co'a vidvi fonjo'e .i le do kibrbrauzero na kakne",
+    "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": ".i la'o zoi. %(senderName)s .zoi co'u friti le ka ziljmina le se zilbe'i kei la'o zoi. %(targetDisplayName)s .zoi",
+    "Light": "carmi",
+    "Dark": "manku",
+    "You signed in to a new session without verifying it:": ".i fe le di'e se samtcise'u pu co'a jaspu vau je za'o na lacri",
+    "They match": "du",
+    "They don't match": "na du",
+    "Dog": "gerku",
+    "Cat": "mlatu",
+    "Lion": "cinfo",
+    "Horse": "xirma",
+    "Unicorn": "pavyseljirna",
+    "Pig": "xarju",
+    "Elephant": "xanto",
+    "Rabbit": "ractu",
+    "Panda": "ribrmelanole'usa",
+    "Rooster": "jipci",
+    "Penguin": "zipcpi",
+    "Turtle": "cakyrespa",
+    "Fish": "finpe",
+    "Octopus": "dalroktopoda",
+    "Butterfly": "toldi",
+    "Flower": "xrula",
+    "Tree": "tricu",
+    "Cactus": "jesyspa",
+    "Mushroom": "mledi",
+    "Globe": "bolcartu",
+    "Moon": "lunra",
+    "Cloud": "dilnu",
+    "Fire": "fagri",
+    "Banana": "badna",
+    "Apple": "plise",
+    "Strawberry": "grutrananasa",
+    "Corn": "zumri",
+    "Pizza": "cidjrpitsa",
+    "Cake": "titnanba",
+    "Heart": "risna",
+    "Smiley": "cisma",
+    "Robot": "sampre",
+    "Hat": "mapku",
+    "Glasses": "vistci",
+    "Santa": "la santa",
+    "Umbrella": "santa",
+    "Hourglass": "canjunla",
+    "Clock": "junla",
+    "Light bulb": "te gusni",
+    "Book": "cukta",
+    "Pencil": "pinsi",
+    "Scissors": "jinci",
+    "Lock": "stela",
+    "Key": "ckiku",
+    "Hammer": "mruli",
+    "Telephone": "fonxa",
+    "Flag": "lanci",
+    "Train": "trene",
+    "Bicycle": "carvrama'e",
+    "Aeroplane": "vinji",
+    "Rocket": "jakne",
+    "Ball": "bolci",
+    "Guitar": "jgita",
+    "Trumpet": "tabra",
+    "Bell": "janbe",
+    "Headphones": "selsnapra",
+    "Pin": "pijne",
+    "Upload": "nu kibdu'a",
+    "Send an encrypted reply…": "nu pa mifra be pa jai te spuda cu zilbe'i",
+    "Send a reply…": "nu pa jai te spuda cu zilbe'i",
+    "Send an encrypted message…": "nu pa mifra be pa notci cu zilbe'i",
+    "Send a message…": "nu pa notci cu zilbe'i",
+    "Search": "nu sisku",
+    "People": "prenu",
+    "Rooms": "ve zilbe'i",
+    "Show %(count)s more|other": "nu viska %(count)s na du",
+    "Show %(count)s more|one": "nu viska %(count)s na du",
+    "Search…": "nu sisku",
+    "Sunday": "li jy. dy. ze detri",
+    "Monday": "li jy. dy. pa detri",
+    "Tuesday": "li jy. dy. re detri",
+    "Wednesday": "li jy. dy. ci detri",
+    "Thursday": "li jy. dy. vo detri",
+    "Friday": "li jy. dy. mu detri",
+    "Saturday": "li jy. dy. xa detri",
+    "Today": "cabdei",
+    "Yesterday": "prulamdei",
+    "Cancel search": "nu co'u sisku",
+    "Search rooms": "sisku fi le'i ve zilbe'i",
+    "Search failed": ".i da nabmi lo nu sisku",
+    "Switch to light mode": "nu le jvinu cu binxo le ka carmi",
+    "Switch to dark mode": "nu le jvinu cu binxo le ka manku",
+    "Switch theme": "nu basti fi le ka jvinu",
+    "Syncing...": ".i ca'o samymo'i",
+    "Signing In...": ".i ca'o co'a jaspu",
+    "If you've joined lots of rooms, this might take a while": ".i gi na ja do pagbu so'i se zilbe'i gi la'a ze'u gunka",
+    "Set a display name:": ".i ko cuxna fo le ka cmene",
+    "Upload an avatar:": ".i ko cuxna fo le ka pixra sinxa",
+    "Incorrect password": ".i le lerpoijaspu na drani",
+    "Emoji": "cinmo sinxa",
+    "Users": "pilno",
+    "That matches!": ".i du",
+    "Download": "nu kibycpa",
+    "Retry": "nu za'u re'u troci",
+    "Success!": ".i snada",
+    "Room List": "liste le'i ve zilbe'i",
+    "Upload a file": "nu kibdu'a pa vreji",
+    "Verify your other session using one of the options below.": ".i ko cuxna da le di'e cei'i le ka tadji lo nu do co'a lacri",
+    "Ask this user to verify their session, or manually verify it below.": ".i ko cpedu le ka co'a lacri le se samtcise'u kei le pilno vau ja pilno le di'e cei'i le ka co'a lacri",
+    "Not Trusted": "na se lacri",
+    "Manually Verify by Text": "nu pilno pa lerpoi lo nu co'a lacri",
+    "Interactively verify by Emoji": "nu pilno vu'i pa cinmo sinxa lo nu co'a lacri",
+    "Done": "nu mo'u co'e",
+    "%(displayName)s is typing …": ".i la'o zoi. %(displayName)s .zoi ca'o ciska",
+    "%(names)s and %(count)s others are typing …|other": ".i la'o zoi. %(names)s .zoi je %(count)s na du ca'o ciska",
+    "%(names)s and %(count)s others are typing …|one": ".i la'o zoi. %(names)s .zoi je pa na du ca'o ciska",
+    "%(names)s and %(lastPerson)s are typing …": ".i la'o zoi. %(names)s .zoi je la'o zoi. %(lastPerson)s .zoi ca'o ciska",
+    "Cannot reach homeserver": ".i ca ku na da ka'e zilbe'i le samtcise'u",
+    "Match system theme": "nu mapti le jvinu be le vanbi",
+    "Never send encrypted messages to unverified sessions in this room from this session": "nu na pa mifra be pa notci cu zilbe'i pa se samtcise'u poi na se lanli ku'o le se samtcise'u le cei'i",
+    "Order rooms by name": "nu porsi tu'a lo cmene",
+    "Messages containing my username": "nu pa se pagbu be le judri be mi cu zilbe'i",
+    "Messages containing @room": "nu pa se pagbu be zoi zoi. @room .zoi cu zilbe'i",
+    "Encrypted messages in one-to-one chats": "nu pa mifra cu zilbe'i pa prenu",
+    "Encrypted messages in group chats": "nu pa mifra cu zilbe'i lu'o pa prenu",
+    "Active call": ".i ca'o fonjo'e",
+    "Incoming voice call": ".i da co'a snavi fonjo'e do",
+    "Incoming video call": ".i da co'a vidvi fonjo'e do",
+    "Incoming call": ".i da co'a fonjo'e do",
+    "The other party cancelled the verification.": ".i le na du be do co'u troci le ka co'a lacri",
+    "Verified!": ".i mo'u co'a lacri",
+    "You've successfully verified this user.": ".i mo'u co'a lacri le pilno",
+    "Got It": "je'e",
+    "Start": "nu co'a co'e",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": ".i ca'o denpa lo nu le se samtcise'u poi na du vau je du la'o zoi. %(deviceName)s .zoi poi se judri zoi zoi. %(deviceId)s .zoi mo'u co'a lacri",
+    "Waiting for your other session to verify…": ".i ca'o denpa lo nu le se samtcise'u poi na du mo'u co'a lacri",
+    "Waiting for %(displayName)s to verify…": ".i ca'o denpa lo nu la'o zoi. %(displayName)s .zoi mo'u co'a lacri",
+    "Cancelling…": ".i ca'o co'u co'e",
+    "To be secure, do this in person or use a trusted way to communicate.": ".i lo nu marji penmi vau ja pilno pa se lacri lo nu tavla cu sarcu lo nu snura",
+    "Matrix ID": "judri fi la .meitriks.",
+    "Matrix Room ID": "judri pa ve zilbe'i la .meitriks.",
+    "email address": "samymri judri",
+    "User %(userId)s is already in the room": ".i la'o zoi. %(userId)s .zoi xa'o pagbu le se zilbe'i",
+    "User %(user_id)s does not exist": ".i zoi zoi. %(user_id)s .zoi na judri pa pilno",
+    "User %(user_id)s may or may not exist": ".i la'a cu'i zoi zoi. %(user_id)s .zoi na judri pa pilno",
+    "Help us improve %(brand)s": ".i ko sidju fi le ka xagzengau la'o zoi. %(brand)s .zoi",
+    "I want to help": ".i mi kaidji le ka sidju",
+    "No": ".i na co'e",
+    "Close": "nu zilmipri",
+    "Ok": "je'e",
+    "Verify this session": "nu co'a lacri le se samtcise'u",
+    "Verify": "nu co'a lacri",
+    "What's New": "notci le du'u cnino",
+    "A new version of %(brand)s is available!": ".i da favytcinymupli pa cnino la'o zoi. %(brand)s .zoi",
+    "You joined the call": ".i do mo'u co'a fonjo'e",
+    "%(senderName)s joined the call": ".i la'o zoi. %(senderName)s .zoi mo'u co'a fonjo'e",
+    "Call in progress": ".i ca'o fonjo'e",
+    "You left the call": ".i do co'u fonjo'e",
+    "%(senderName)s left the call": ".i la'o zoi. %(senderName)s .zoi co'u fonjo'e",
+    "Call ended": ".i co'u fonjo'e",
+    "You started a call": ".i do co'a fonjo'e",
+    "%(senderName)s started a call": ".i la'o zoi. %(senderName)s .zoi co'a fonjo'e",
+    "Waiting for answer": ".i ca'o denpa lo nu spuda",
+    "%(senderName)s is calling": ".i la'o zoi. %(senderName)s .zoi co'a fonjo'e",
+    "You created the room": ".i do cupra le ve zilbe'i",
+    "%(senderName)s created the room": ".i la'o zoi. %(senderName)s .zoi cupra le ve zilbe'i",
+    "You made the chat encrypted": ".i gau do ro ba zilbe'i be fo le gai'o cu mifra",
+    "%(senderName)s made the chat encrypted": ".i gau la'o zoi. %(senderName)s .zoi ro ba zilbe'i be fo le gai'o cu mifra",
+    "You were invited": ".i da friti le ka ziljmina kei do",
+    "%(targetName)s was invited": ".i da friti le ka ziljmina kei la'o zoi. %(targetName)s .zoi",
+    "You left": ".i do zilvi'u",
+    "%(targetName)s left": ".i la'o zoi. %(targetName)s .zoi zilvi'u",
+    "You were kicked (%(reason)s)": ".i gau da do zilvi'u fi'o krinu lerpoi zoi zoi. %(reason)s .zoi",
+    "%(targetName)s was kicked (%(reason)s)": ".i gau da la'o zoi. %(targetName)s .zoi zilvi'u fi'o krinu lerpoi zoi zoi. %(reason)s .zoi",
+    "You were kicked": ".i gau da do zilvi'u",
+    "%(targetName)s was kicked": ".i gau da la'o zoi. %(targetName)s .zoi zilvi'u",
+    "You rejected the invite": ".i do zukte le ka na ckaji le se friti",
+    "%(targetName)s rejected the invite": ".i la'o zoi. %(targetName)s .zoi zukte le ka na ckaji le se friti",
+    "You were uninvited": ".i da co'u friti le ka ziljmina kei do",
+    "%(targetName)s was uninvited": ".i da co'u friti le ka ziljmina kei la'o zoi. %(targetName)s .zoi",
+    "You changed your name": ".i gau do da basti de le ka cmene do",
+    "%(targetName)s changed their name": ".i gau da zoi zoi. %(targetName)s .zoi basti de le ka cmene da",
+    "You changed your avatar": ".i gau do da basti de le ka pixra sinxa do",
+    "%(targetName)s changed their avatar": ".i gau la'o zoi. %(targetName)s .zoi da basti de le ka pixra sinxa ri",
+    "%(senderName)s %(emote)s": ".i la'o zoi. %(senderName)s .zoi ckaji le smuni be zoi zoi. %(emote)s .zoi",
+    "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
+    "You changed the room name": ".i gau do da basti de le ka cmene le ve zilbe'i",
+    "%(senderName)s changed the room name": ".i gau la'o zoi. %(senderName)s .zoi da basti de le ka cmene le ve zilbe'i",
+    "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
+    "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
+    "You uninvited %(targetName)s": ".i do co'u friti le ka ziljmina kei la'o zoi. %(targetName)s .zoi",
+    "%(senderName)s uninvited %(targetName)s": ".i la'o zoi. %(senderName)s .zoi co'u friti le ka ziljmina kei la'o zoi. %(targetName)s .zoi",
+    "You invited %(targetName)s": ".i do friti le ka ziljmina kei la'o zoi. %(targetName)s .zoi",
+    "%(senderName)s invited %(targetName)s": ".i la'o zoi. %(senderName)s .zoi friti le ka ziljmina kei la'o zoi. %(targetName)s .zoi",
+    "You changed the room topic": ".i gau do da basti de le ka skicu be le ve zilbe'i be'o lerpoi",
+    "%(senderName)s changed the room topic": ".i gau la'o zoi. %(senderName)s .zoi da basti de le ka skicu be le ve zilbe'i be'o lerpoi",
+    "Use a system font": "nu da pe le vanbi cu ci'artai",
+    "System font name": "cmene le ci'artai pe le vanbi",
+    "Never send encrypted messages to unverified sessions from this session": "nu na pa mifra be pa notci cu zilbe'i pa se samtcise'u poi na se lanli ku'o le se samtcise'u",
+    "Sign In": "nu co'a jaspu",
+    "Later": "nu ca na co'e",
+    "Other users may not trust it": ".i la'a na pa na du be do cu lacri",
+    "Change": "nu basti",
+    "Change room avatar": "nu basti fi le ka pixra sinxa le ve zilbe'i",
+    "Change room name": "nu basti fi le ka cmene le ve zilbe'i",
+    "Change main address for the room": "nu basti fi le ka ralju lu'i ro judri be le ve zilbe'i",
+    "Change topic": "nu basti fi le ka skicu lerpoi",
+    "Sign Up": "nu co'a na'o jaspu",
+    "<userName/> wants to chat": ".i la'o zoi. <userName/> .zoi kaidji le ka tavla do",
+    "<userName/> invited you": ".i la'o zoi. <userName/> .zoi friti le ka ziljmina kei do",
+    "Username": "judri cmene",
+    "Enter username": ".i ko cuxna fo le ka judri cmene",
+    "We’re excited to announce Riot is now Element": ".i fizbu lo nu zo .elyment. basti zo .raiyt. le ka cmene",
+    "Riot is now Element!": ".i zo .elyment. basti zo .raiyt. le ka cmene",
+    "Learn More": "nu facki",
+    "We’re excited to announce Riot is now Element!": ".i fizbu lo nu gubni xusra le du'u zo .elyment. basti zo .raiyt. le ka cmene",
+    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": ".i ro zilbe'i be fo le cei'i cu mifra .i le ka ka'e tcidu lo notci cu steci fi lu'i do je ro pagbu be le se zilbe'i",
+    "Messages in this room are end-to-end encrypted.": ".i ro zilbe'i be fo le cei'i cu mifra",
+    "Messages in this room are not end-to-end encrypted.": ".i na pa zilbe'i be fo le cei'i cu mifra",
+    "Members": "pagbu le se zilbe'i",
+    "Files": "vreji",
+    "Trusted": "se lacri",
+    "Not trusted": "na se lacri",
+    "%(count)s verified sessions|other": ".i lacri %(count)s se samtcise'u",
+    "%(count)s verified sessions|one": ".i lacri pa se samtcise'u",
+    "Hide verified sessions": "nu ro se samtcise'u poi se lacri cu zilmipri",
+    "%(count)s sessions|other": ".i samtcise'u %(count)s da",
+    "%(count)s sessions|one": ".i samtcise'u %(count)s da",
+    "Hide sessions": "nu ro se samtcise'u cu zilmipri",
+    "Invite": "nu friti le ka ziljmina",
+    "Logout": "nu co'u jaspu",
+    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": ".i gi je lo nu samcu'a <a>le dei cei'i</a> gi lo nu co'a tavla le sampre cu tadji lo nu facki le du'u tadji lo nu pilno la'o zoi. %(brand)s .zoi",
+    "This room is end-to-end encrypted": ".i ro zilbe'i be fo le cei'i cu mifra",
+    "Everyone in this room is verified": ".i do lacri ro pagbu be le se zilbe'i",
+    "Start chat": "nu co'a tavla",
+    "Create room": "nu cupra pa ve zilbe'i",
+    "The file '%(fileName)s' failed to upload.": ".i da nabmi fi lo nu kibdu'a la'o zoi. %(fileName)s .zoi",
+    "Invite users": "nu friti le ka ziljmina kei pa pilno",
+    "Invite to this room": "nu friti le ka ziljmina le se zilbe'i",
+    "Voice call": "nu snavi fonjo'e",
+    "Video call": "nu vidvi fonjo'e",
+    "Upload file": "nu kibdu'a pa vreji",
+    "Rejecting invite …": ".i ca'o zukte le ka na ckaji le se friti",
+    "Leave Room": "nu co'u pagbu le se zilbe'i",
+    "Revoke invite": "nu zukte le ka na ckaji le se friti",
+    "Invalid community ID": ".i na drani le ka judri pa girzu",
+    "'%(groupId)s' is not a valid community ID": ".i zoi zoi. %(groupId)s .zoi na drani le ka judri pa girzu",
+    "Showing flair for these communities:": ".i sinxa jarco le ka pagbu le di'e girzu",
+    "This room is not showing flair for any communities": ".i na da poi girzu zo'u le ve zilbe'i cu sinxa jarco le ka pagbu da",
+    "New community ID (e.g. +foo:%(localDomain)s)": "judri le girzu to zoi zoi. +foo:%(localDomain)s .zoi mupli toi",
+    "Remove from community": "nu zilvi'u le girzu",
+    "Disinvite this user from community?": ".i xu do djica lo nu co'u friti le ka ziljmina le girzu",
+    "Remove this user from community?": ".i xu do djica lo nu le pilno co'u pagbu le girzu",
+    "Failed to remove user from community": ".i da nabmi fi lo nu le pilno co'u pagbu le girzu",
+    "Invite to this community": "nu friti le ka ziljmina le girzu",
+    "Failed to remove room from community": ".i da nabmi fi lo nu le ve zilbe'i co'u pagbu le girzu",
+    "Add rooms to this community": "nu pa ve zilbe'i cu ziljmina le girzu",
+    "Filter community rooms": "nu sisku fi lu'i ro ve zilbe'i poi pagbu le girzu",
+    "Something went wrong when trying to get your communities.": ".i da nabmi fi lo nu facki le du'u do pagbu lo girzu",
+    "You're not currently a member of any communities.": ".i do ca na pagbu pa girzu",
+    "collapse": "nu tcila be na ku viska",
+    "expand": "nu tcila viska",
+    "Create Community": "nu cupra pa girzu",
+    "Community Name": "cmene le girzu",
+    "Community ID": "judri le girzu",
+    "Create a public room": "nu cupra pa ve zilbe'i poi gubni",
+    "Create a private room": "nu cupra pa ve zilbe'i poi na gubni",
+    "Create Room": "nu cupra pa ve zilbe'i",
+    "Sign out": "nu co'u jaspu",
+    "Are you sure you want to sign out?": ".i xu do birti le du'u do kaidji le ka co'u se jaspu",
+    "Sign out and remove encryption keys?": ".i xu do djica lo nu co'u jaspu do je lo nu tolmo'i le du'u mifra ckiku",
+    "Upload %(count)s other files|one": "nu kibdu'a %(count)s vreji poi na du",
+    "View Community": "nu viska le girzu",
+    "Hide": "nu zilmipri",
+    "Leave Community": "nu do zilvi'u le girzu",
+    "Unable to leave community": ".i da nabmi fi lo nu do zilvi'u le girzu",
+    "Join this community": "nu do ziljmina le girzu",
+    "Leave this community": "nu do zilvi'u le girzu",
+    "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!": ".i na da tcila skicu be le girzu bei ro girzu pagbu be'o lerpoi bau la'au xy. bu ty. my. ly. li'u<br />.i lo nu samcu'a le dei cei'i cu tadji lo nu da go'i",
+    "Long Description (HTML)": "tcila skicu lerpoi bau la'au xy. bu ty. my. ly. li'u",
+    "Community %(groupId)s not found": ".i na da poi girzu zo'u facki le du'u zoi zoi. %(groupId)s .zoi judri da",
+    "This homeserver does not support communities": ".i le samtcise'u na kakne tu'a lo girzu",
+    "Are you sure you want to leave the room '%(roomName)s'?": ".i xu do birti le du'u do kaidji le ka co'u pagbu le se zilbe'i be fo la'o zoi. %(roomName)s .zoi",
+    "Failed to leave room": ".i da nabmi fi lo nu do co'u pagbu le se zilbe'i",
+    "For security, this session has been signed out. Please sign in again.": ".i ki'u lo nu snura co'u jaspu le se samtcise'u .i ko za'u re'u co'a se jaspu",
+    "Your Communities": "girzu vau je se pagbu do",
+    "Error whilst fetching joined communities": ".i da nabmi fi lo nu kibycpa ro girzu poi se pagbu do",
+    "Communities": "girzu",
+    "Create a new community": "nu cupra pa girzu",
+    "React": "nu cinmo spuda",
+    "Reply": "nu spuda",
+    "<a>In reply to</a> <pill>": ".i nu <a>spuda</a> tu'a la'o zoi. <pill> .zoi",
+    "%(senderName)s made history visible to anyone": ".i gau la'o zoi. %(senderName)s .zoi ro da ka'e tcidu ro pu zilbe'i",
+    "You joined": ".i do ziljmina",
+    "%(targetName)s joined": ".i la'o zoi. %(targetName)s .zoi ziljmina",
+    "Show less": "nu viska so'u da",
+    "Save": "nu co'a vreji",
+    "Unable to share email address": ".i da nabmi fi lo nu jungau le du'u samymri judri",
+    "Share": "nu jungau",
+    "Unable to share phone number": ".i da nabmi fi lo nu jungau le du'u fonjudri",
+    "Edit message": "nu basti fi le ka notci",
+    "Share room": "nu jungau fi le du'u ve zilbe'i",
+    "Share Link to User": "nu jungau pa pilno le du'u judri",
+    "Edit": "nu basti",
+    "Share Room": "nu jungau fi le du'u ve zilbe'i",
+    "Share User": "nu jungau fi le du'u pilno",
+    "Share Community": "nu jungau fi le du'u girzu",
+    "Share Room Message": "nu jungau fi le du'u notci",
+    "Resend edit": "nu le basti cu za'u re'u zilbe'i",
+    "Share Permalink": "nu jungau fi le du'u vitno judri",
+    "Share Message": "nu jungau fi le du'u notci",
+    "%(senderName)s made history visible to new members": ".i gau la'o zoi. %(senderName)s .zoi ro cnino be fi le ka pagbu le se zilbe'i cu ka'e tcidu ro pu zilbe'i",
+    "%(senderName)s made history visible to future members": ".i gau la'o zoi. %(senderName)s .zoi ro ba pagbu be le se zilbe'i cu ka'e tcidu ro pu zilbe'i",
+    "%(senderName)s sent an image": ".i pa pixra cu zilbe'i fi la'o zoi. %(senderName)s .zoi",
+    "%(senderName)s sent a video": ".i pa se vidvi cu zilbe'i fi la'o zoi. %(senderName)s .zoi",
+    "%(senderName)s uploaded a file": ".i pa vreji cu zilbe'i fi la'o zoi. %(senderName)s .zoi",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": ".i la'o zoi. %(displayName)s .zoi poi se judri zoi zoi. %(userName)s .zoi zgana de'i li %(dateTime)s",
+    "Waiting for %(displayName)s to accept…": ".i ca'o denpa lo nu la'o zoi. %(displayName)s .zoi zanru",
+    "Ask %(displayName)s to scan your code:": ".i ko cpedu le ka gau ce'u kacma samymo'i le sinxa kei la'o zoi. %(displayName)s .zoi",
+    "Almost there! Is %(displayName)s showing the same shield?": ".uo ru'e .i xu la'o zoi. %(displayName)s .zoi jarco ta'i tu'a pa sinxa poi mapti",
+    "You've successfully verified %(displayName)s!": ".i do mo'u co'a lacri la'o zoi. %(displayName)s .zoi",
+    "%(displayName)s cancelled verification.": ".i la'o zoi. %(displayName)s .zoi co'u co'a lacri",
+    "Decrypt %(text)s": "nu facki le du'u mifra la'o zoi. %(text)s .zoi",
+    "Download %(text)s": "nu kibycpa la'o zoi. %(text)s .zoi",
+    "Download this file": "nu kibycpa le vreji"
 }
diff --git a/src/i18n/strings/kab.json b/src/i18n/strings/kab.json
new file mode 100644
index 0000000000..6073fbfd38
--- /dev/null
+++ b/src/i18n/strings/kab.json
@@ -0,0 +1,793 @@
+{
+    "Confirm": "Sentem",
+    "Analytics": "Tiselḍin",
+    "Error": "Tuccḍa",
+    "Dismiss": "Agi",
+    "OK": "IH",
+    "Permission Required": "Tasiregt tlaq",
+    "Continue": "Kemmel",
+    "Cancel": "Sefsex",
+    "Sun": "Iṭij",
+    "Mon": "Ari",
+    "Tue": "Ara",
+    "Wed": "Aha",
+    "Thu": "Amh",
+    "Fri": "Sem",
+    "Sat": "Sed",
+    "Jan": "Yen",
+    "Feb": "Fuṛ",
+    "Mar": "Meɣ",
+    "Apr": "Yeb",
+    "May": "May",
+    "Jun": "Yun",
+    "Jul": "Yul",
+    "Aug": "Ɣuc",
+    "Sep": "Cte",
+    "Oct": "Tub",
+    "Nov": "Wam",
+    "Dec": "Duj",
+    "PM": "MD",
+    "AM": "FT",
+    "Trust": "Ittkel",
+    "Create Account": "Rnu amiḍan",
+    "Sign In": "Kcem",
+    "Default": "Amezwer",
+    "Moderator": "Aseɣyad",
+    "Admin": "Anedbal",
+    "You need to be logged in.": "Tesriḍ ad teqqneḍ.",
+    "Messages": "Iznan",
+    "Actions": "Tigawin",
+    "Advanced": "Talqayt",
+    "Other": "Nniḍen",
+    "Usage": "Aseqdec",
+    "Thank you!": "Tanemmirt!",
+    "Reason": "Taɣẓint",
+    "Someone": "Albaɛḍ",
+    "Light": "Aceɛlal",
+    "Dark": "Aberkan",
+    "Done": "Immed",
+    "Add another word or two. Uncommon words are better.": "Rnu awal-nniḍen neɣ sin. Awalen imexḍa ad lhun.",
+    "No": "Uhu",
+    "Review": "Senqed",
+    "Later": "Ticki",
+    "Notifications": "Ilɣa",
+    "Close": "Mdel",
+    "Warning": "Asmigel",
+    "Ok": "Ih",
+    "Set password": "Sbadu awal uffir",
+    "Upgrade": "Leqqem",
+    "Verify": "Senqed",
+    "What's New": "D acu-t umaynut",
+    "Update": "Leqqem",
+    "Restart": "Ales tanekra",
+    "Font size": "Tuɣzi n tsefsit",
+    "Decline": "Agwi",
+    "Accept": "Qbel",
+    "or": "neɣ",
+    "Start": "Bdu",
+    "Cat": "Amcic",
+    "Lion": "Izem",
+    "Rabbit": "Awtul",
+    "Turtle": "Afekrun",
+    "Tree": "Aseklu",
+    "Clock": "Tamrint",
+    "Book": "Adlis",
+    "Lock": "Sekkeṛ",
+    "Key": "Tasarut",
+    "Telephone": "Tiliγri",
+    "Flag": "Anay",
+    "Bicycle": "Azlalam",
+    "Ball": "Balles",
+    "Anchor": "Tamdeyt",
+    "Headphones": "Wennez",
+    "Folder": "Akaram",
+    "Upload": "Sali",
+    "Remove": "Sfeḍ",
+    "Show less": "Sken-d drus",
+    "Show more": "Sken-d ugar",
+    "Warning!": "Ɣur-k·m!",
+    "Current password": "Awal uffir amiran",
+    "Password": "Awal uffir",
+    "New Password": "Awal uffir amaynut",
+    "Confirm password": "Sentem awal uffir",
+    "Change Password": "Snifel Awal Uffir",
+    "not found": "ulac-it",
+    "Authentication": "Asesteb",
+    "ID": "ID",
+    "Manage": "Sefrek",
+    "Enable": "Rmed",
+    "Keywords": "Awalen tisura",
+    "Clear notifications": "Sfeḍ ilɣuyen",
+    "Off": "Insa",
+    "Display Name": "Sken isem",
+    "Save": "Sekles",
+    "Disconnect": "Ffeɣ seg tuqqna",
+    "Go back": "Uɣal ɣer deffir",
+    "Change": "Beddel",
+    "Theme": "Asentel",
+    "Success": "Yedda",
+    "Profile": "Amaɣnu",
+    "Account": "Amiḍan",
+    "General": "Amatu",
+    "Legal": "Usḍif",
+    "Credits": "Asenmer",
+    "Chat with %(brand)s Bot": "Asqerdec akked %(brand)s Bot",
+    "FAQ": "Isteqsiyen FAQ",
+    "Keyboard Shortcuts": "Inegzumen n unasiw",
+    "Versions": "Ileqman",
+    "None": "Ula yiwen",
+    "Unsubscribe": "Sefsex ajerred",
+    "Ignore": "Ttu",
+    "Subscribe": "Jerred",
+    "Preferences": "Ismenyifen",
+    "Composer": "Imsuddes",
+    "Timeline": "Amazray",
+    "Microphone": "Asawaḍ",
+    "Camera": "Takamiṛatt",
+    "Sounds": "Imesla",
+    "Reset": "Wennez",
+    "Browse": "Inig",
+    "Default role": "Tamlilt tamzwert",
+    "Permissions": "Tisirag",
+    "Anyone": "Yal yiwen",
+    "Encryption": "Awgelhen",
+    "Complete": "Yemmed",
+    "Share": "Bḍu",
+    "Verification code": "Tangalt n usenqed",
+    "Add": "Rnu",
+    "Email Address": "Tansa n yimayl",
+    "Phone Number": "Uṭṭun n tiliɣri",
+    "Upload file": "Sali-d afaylu",
+    "Bold": "Azuran",
+    "Strikethrough": "Derrer",
+    "Quote": "Tanebdurt",
+    "Loading...": "La d-yettali…",
+    "Idle": "Arurmid",
+    "Unknown": "Arussin",
+    "Settings": "Iɣewwaren",
+    "Search": "Nadi",
+    "Favourites": "Ismenyifen",
+    "People": "Imdanen",
+    "Sign Up": "Jerred",
+    "Reject": "Agi",
+    "Not now": "Mačči tura",
+    "Sort by": "Semyizwer s",
+    "Activity": "Armud",
+    "A-Z": "A-Z",
+    "Show": "Sken",
+    "Options": "Tixtiṛiyin",
+    "Server error": "Tuccḍa n uqeddac",
+    "Members": "Imettekkiyen",
+    "Files": "Ifuyla",
+    "Trusted": "Yettwattkal",
+    "Invite": "Nced",
+    "Unmute": "Rmed imesli",
+    "Mute": "Sens imesli",
+    "Are you sure?": "Tebɣiḍ s tidet?",
+    "Security": "Taɣellist",
+    "Yes": "Ih",
+    "Verified": "Yettwasenqed",
+    "Got it": "Awi-t",
+    "Sunday": "Acer",
+    "Monday": "Arim",
+    "Tuesday": "Aram",
+    "Wednesday": "Ahad",
+    "Thursday": "Amhad",
+    "Friday": "Sem",
+    "Saturday": "Sed",
+    "Today": "Ass-a",
+    "Yesterday": "Iḍelli",
+    "View Source": "Wali aɣbalu",
+    "Reply": "Err",
+    "Edit": "Ẓreg",
+    "Attachment": "Taceqquft yeddan",
+    "Error decrypting attachment": "Tuccḍa deg uwgelhen n tceqquft yeddan",
+    "Show all": "Sken akk",
+    "Message deleted": "Izen yettwakksen",
+    "Copied!": "Yettwanɣel!",
+    "edited": "yettwaẓreg",
+    "Food & Drink": "Učči d tissit",
+    "Objects": "Tiɣawsiwin",
+    "Symbols": "Izamulen",
+    "Flags": "Anayen",
+    "Categories": "Taggayin",
+    "More options": "Ugar n textiṛiyin",
+    "Join": "Rnu",
+    "No results": "Ulac igmad",
+    "collapse": "fneẓ",
+    "Rotate counter-clockwise": "Zzi mgal tanila n tessegnatin n temrilt",
+    "Rotate clockwise": "Zzi almend n tnila n tsegnatin n temrilt",
+    "Add User": "Rnu aseqdac",
+    "Server name": "Isem n uqeddac",
+    "email address": "tansa n yimayl",
+    "Close dialog": "Mdel adiwenni",
+    "Notes": "Tamawin",
+    "Unavailable": "Ulac",
+    "Changelog": "Aɣmis n yisnifal",
+    "Removing…": "Tukksa…",
+    "Confirm Removal": "Sentem tukksa",
+    "Example": "Amedya",
+    "example": "amedya",
+    "Create": "Snulfu-d",
+    "Name": "Isem",
+    "Sign out": "Ffeɣ seg tuqqna",
+    "Back": "Uɣal ɣer deffir",
+    "Send": "Azen",
+    "Suggestions": "Isumar",
+    "Go": "Ddu",
+    "Session name": "Isem n tɣimit",
+    "Send report": "Azen aneqqis",
+    "Refresh": "Smiren",
+    "Email address": "Tansa n yimayl",
+    "Skip": "Zgel",
+    "Username not available": "Ulac isem n useqdac",
+    "Checking...": "Asenqed...",
+    "Username available": "Yella yisem n useqdac",
+    "Terms of Service": "Tiwtilin n useqdec",
+    "Service": "Ameẓlu",
+    "Summary": "Agzul",
+    "Document": "Isemli",
+    "Next": "Γer sdat",
+    "Upload files": "Sali-d ifuyla",
+    "Appearance": "Arwes",
+    "Allow": "Sireg",
+    "Deny": "Agi",
+    "Custom": "Sagen",
+    "Source URL": "URL aɣbalu",
+    "Notification settings": "Iɣewwaren n yilɣa",
+    "Leave": "Ffeɣ",
+    "Set status": "Sbadu addaden",
+    "Hide": "Ffer",
+    "Home": "Agejdan",
+    "Sign in": "Qqen",
+    "Help": "Tallalt",
+    "Reload": "Smiren",
+    "powered by Matrix": "s lmendad n Matrix",
+    "Custom Server Options": "Iɣewwaren n uqeddac udmawan",
+    "Code": "Tangalt",
+    "Submit": "Azen",
+    "Email": "Imayl",
+    "Username": "Isem n useqdac",
+    "Phone": "Tiliɣri",
+    "Passwords don't match": "Awalen uffiren ur mṣadan ara",
+    "Email (optional)": "Imayl (Afrayan)",
+    "Register": "Jerred",
+    "Free": "Ilelli",
+    "Failed to upload image": "Tegguma ad d-tali tugna",
+    "Description": "Aglam",
+    "Explore": "Snirem",
+    "Filter": "Imsizdeg",
+    "Explore rooms": "Snirem tixxamin",
+    "Unknown error": "Tuccḍa tarussint",
+    "Logout": "Tuffɣa",
+    "Preview": "Taskant",
+    "View": "Sken",
+    "Guest": "Anerzaf",
+    "Your profile": "Amaɣnu-ik/im",
+    "Feedback": "Takti",
+    "Your password has been reset.": "Awal uffir-inek/inem yettuwennez.",
+    "Syncing...": "Amtawi...",
+    "Create account": "Rnu amiḍan",
+    "Create your account": "Rnu amiḍan-ik/im",
+    "Go Back": "Uɣal ɣer deffir",
+    "Commands": "Tiludna",
+    "Users": "Iseqdacen",
+    "Export": "Sifeḍ",
+    "Import": "Kter",
+    "Restore": "Err-d",
+    "Copy": "Nɣel",
+    "Download": "Sader",
+    "Retry": "Ɛreḍ tikkelt-nniḍen",
+    "Starting backup...": "Asenker n uḥraz...",
+    "Success!": "Tammug akken iwata!",
+    "Disable": "Sens",
+    "Navigation": "Tunigin",
+    "Calls": "Isawalen",
+    "Alt": "Alt",
+    "Shift": "Shift",
+    "New line": "Izirig amaynut",
+    "Upload a file": "Sali-d afaylu",
+    "Page Up": "Asebter afellay",
+    "Page Down": "Asebter adday",
+    "Esc": "Senser",
+    "Enter": "Anekcum",
+    "Space": "Tallunt",
+    "End": "Taggara",
+    "This email address is already in use": "Tansa-agi n yimayl tettuseqdac yakan",
+    "This phone number is already in use": "Uṭṭun-agi n tilifun yettuseqddac yakan",
+    "Your %(brand)s is misconfigured": "%(brand)s inek(inem) ur ittusbadu ara",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Ma ulac aɣilif, sebded <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, neɣ<safariLink>Safari</safariLink> i tirmit igerrzen.",
+    "I understand the risks and wish to continue": "Gziɣ ayen ara d-yeḍrun maca bɣiɣ ad kemmleɣ",
+    "Use Single Sign On to continue": "Seqdec anekcum asuf akken ad tkemmleḍ",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Sentem timerna n tansa-a n yimayl s useqdec n unekcum asuf i ubeggen n timagit-in(im).",
+    "Single Sign On": "Anekcum asuf",
+    "Confirm adding email": "Sentem timerna n yimayl",
+    "Click the button below to confirm adding this email address.": "Sit ɣef tqeffalt yellan ddaw i usentem n tmerna n tansa-a n yimayl.",
+    "Add Email Address": "Rnu tansa n yimayl",
+    "Failed to verify email address: make sure you clicked the link in the email": "Asenqed n tansa n yimayl ur yeddi ara: wali ma yella tsateḍ ɣef useɣwen yellan deg yimayl",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Sentem timerna n wuṭṭun n tilifun s useqdec n unekcum asuf i ubeggen n timagit-ik(im).",
+    "Confirm adding phone number": "Sentem timerna n wuṭṭun n tilifun",
+    "Click the button below to confirm adding this phone number.": "Sit ɣef tqeffalt yellan ddaw i usentem n tmerna n wuṭṭun-a n tilifun.",
+    "Add Phone Number": "Rnu uṭṭun n tilifun",
+    "The platform you're on": "Tiɣerɣert ideg telliḍ akka tura",
+    "The version of %(brand)s": "Lqem n %(brand)s",
+    "Whether or not you're logged in (we don't record your username)": "Ma teqqneḍ neɣ uhu (isem-ik(im) n useqdac ur yettwasekles ara)",
+    "Your language of choice": "Tutlayt i tferneḍ",
+    "Which officially provided instance you are using, if any": "Tummant i d-yettunefken tunṣibt ara tesseqdace, ma yella tella",
+    "Your homeserver's URL": "URL n uqeddac-ik(im) agejdan",
+    "e.g. %(exampleValue)s": "e.g. %(exampleValue)s",
+    "Every page you use in the app": "Isebtar akk i tesseqdaceḍ deg usnas",
+    "e.g. <CurrentPageURL>": "e.g. <CurrentPageURL>",
+    "Your user agent": "Ameggi-ik(im) aseqdac",
+    "Your device resolution": "Afray n yiben-ik(im)",
+    "Jump to oldest unread message": "Uɣal alamma d izen aqdim ur nettwaɣra ara",
+    "Jump to room search": "Ɛeddi ɣer unadi n texxamt",
+    "Navigate up/down in the room list": "Inig s afellay/adday deg tebdert n texxamin",
+    "Select room from the room list": "Fren taxxamt seg tebdert n texxamin",
+    "Collapse room list section": "Fneẓ tigemi n tebdert n texxamin",
+    "Expand room list section": "Snerni tigezmi n tebdert n texxamin",
+    "Clear room list filter field": "Kkes urti n usizdeg n tebdert n texxamin",
+    "Previous/next unread room or DM": "Taxxamt neɣ izen uzrid ur yettwaɣra send/seld",
+    "Previous/next room or DM": "Taxxamt neɣ izen usrid send/seld",
+    "Toggle the top left menu": "Sken/ffer umuɣ aεlayan azelmaḍ",
+    "Close dialog or context menu": "Mdel umuɣ n udiwenni neɣ n ugbur",
+    "Activate selected button": "Rmed taqeffalt i d-yettwafernen",
+    "Toggle right panel": "Sken/ffer agalis ayeffus",
+    "Toggle this dialog": "Sken/ffer adiwanni-a",
+    "Move autocomplete selection up/down": "Err tafrant n tacart tawurmant afellay/adday",
+    "Cancel autocomplete": "Sefsex tacaṛt tawurmant",
+    "Toggle Bold": "Err-it d azuran",
+    "Toggle Italics": "Err-it ɣer uknan",
+    "Toggle Quote": "Err-it ɣer yizen aneẓli",
+    "Navigate recent messages to edit": "Nadi iznan imaynuten i usiẓreg",
+    "Jump to start/end of the composer": "Ṛuḥ ɣer tazwara/taggara n yimsuddes",
+    "Navigate composer history": "Nadi deg uzray n yimsuddes",
+    "Cancel replying to a message": "Sefsex tiririt ɣef yizen",
+    "Toggle microphone mute": "Rmed/sens tanusi n usawaḍ",
+    "Toggle video on/off": "Rmed/sens tavidyut",
+    "Scroll up/down in the timeline": "Drurem gar afellay/addday n tesnakudt",
+    "Updating %(brand)s": "Leqqem %(brand)s",
+    "I don't want my encrypted messages": "Ur bɣiɣ ara izan-inu iwgelhanen",
+    "Manually export keys": "Sifeḍ s ufus tisura",
+    "Session ID": "Asulay n tqimit",
+    "Session key": "Tasarut n tɣimit",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Ma ulac aɣilif, senqed imayl-ik/im syen sit ɣef useɣwen i yellan. Akken ara yemmed waya, sit ad tkemmleḍ.",
+    "This will allow you to reset your password and receive notifications.": "Ayagi ad ak(akem)-yeǧǧ ad twennzeḍ awal-ik/im uffir yerna ad d-tremseḍ ilɣa.",
+    "A username can only contain lower case letters, numbers and '=_-./'": "Isem n useqdac yezmer kan ad yegber isekkilen imeẓyanen, izwilen neɣ '=_-./'",
+    "Username invalid: %(errMessage)s": "Isem n useqdac d armeɣtu",
+    "An error occurred: %(error_string)s": "Tella-d tuccḍa: %(error_string)s",
+    "To get started, please pick a username!": "I wakken ad tebduḍ, ttxil-k/m fren isem n useqdac!",
+    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Wagi ad yili d isem-ik/im deg <span></span> usebter agejdan, neɣ tzemreḍ ad tferneḍ <a>aqeddac-nniḍen</a>.",
+    "If you already have a Matrix account you can <a>log in</a> instead.": "Ma yella tesεiḍ yakan amiḍan di Matrix, tzemreḍ <a>ad tkecmeḍ</a> deg umḍq-nni.",
+    "Call Failed": "Ur iddi ara usiwel",
+    "Call Timeout": "Akud n uṛaǧu n usiwel",
+    "Try using turn.matrix.org": "Ɛreḍ aseqdec n turn.matrix.org",
+    "Unable to capture screen": "Tuṭṭfa n ugdil ulamek",
+    "Existing Call": "Asiwel amiran",
+    "You are already in a call.": "Aql-ak(qkem)-id yakan tessawaleḍ.",
+    "VoIP is unsupported": "VoIP ur tettusefrak ara",
+    "You cannot place VoIP calls in this browser.": "Ur tezmireḍ ara ad tesεeddiḍ asiwel VoIP deg yiminig-a.",
+    "You cannot place a call with yourself.": "Ur tezmireḍ ara a temsawaleḍ d yiman-ik.",
+    "Call in Progress": "Asiwel iteddu",
+    "A call is currently being placed!": "Yella usiwel ila iteddu!",
+    "A call is already in progress!": "Yella usiwel ila iteddun akka tura!",
+    "Replying With Files": "Tiririt s yifuyla",
+    "The file '%(fileName)s' failed to upload.": "Yegguma ad d-yali '%(fileName)s' ufaylu.",
+    "Upload Failed": "Asali ur yeddi ara",
+    "Enter passphrase": "Sekcem tafyirt tuffirt",
+    "Setting up keys": "Asebded n tsura",
+    "%(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",
+    "Who would you like to add to this community?": "Anwa i tebɣiḍ ad t-ternuḍ ɣer temɣiwent-a?",
+    "Name or Matrix ID": "Isem neɣ asulay n Matrix",
+    "Invite to Community": "Ɛreḍ-d ɣer temɣiwent",
+    "Room name or address": "Isem neɣ tansa n texxamt",
+    "Add to community": "Rnu ɣer temɣiwent",
+    "Unnamed Room": "Taxxamt war isem",
+    "The server does not support the room version specified.": "Aqeddac ur issefrek ara lqem n texxamt yettwafernen.",
+    "If you cancel now, you won't complete verifying the other user.": "Ma yella teffɣeḍ tura, asenqed n yiseqdacen-nniḍen ur ittemmed ara.",
+    "Cancel entering passphrase?": "Sefsex tafyirt tuffirt n uεeddi?",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Γur-k: yal amdan ara ternuḍ ɣer temɣiwent ad d-iban s wudem azayaz i yal yiwen yessnen asulay n temɣiwent",
+    "Invite new community members": "Nced-d imttekkiyen imaynuten ɣer temɣiwent",
+    "Which rooms would you like to add to this community?": "Anti tixxamin i tebɣiḍ adternuḍ i temɣiwent-a?",
+    "Add rooms to the community": "Rnu tixxamin ɣer temɣiwent",
+    "Failed to invite the following users to %(groupId)s:": "Ancad n yiseqdacen i d-iteddun %(groupId)s ur yeddi ara:",
+    "Failed to invite users to community": "Ancad n yiseqdacen ɣer temɣiwent ur yeddi ara",
+    "Failed to invite users to %(groupId)s": "Ancad n yiseqdacen ɣer %(groupId)s ur yedi ara",
+    "Failed to add the following rooms to %(groupId)s:": "Timerna n texxamin i d-iteddun ɣer %(groupId)s ur yedi ara:",
+    "Identity server has no terms of service": "Timagit n uqeddac ulac ɣer-sen iferdisen n umeẓlu",
+    "%(name)s is requesting verification": "%(name)s yesra asenqed",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s ulac ɣer-s tisirag i tuzna n yilɣa - ttxil-k/m senqed iɣewwaren n yiminig-ik/im",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s ur d-yefk ara tisirag i tuzna n yilɣa - ttxil-k/m εreḍ tikkelt-nniḍen",
+    "Unable to enable Notifications": "Sens irmad n yilɣa",
+    "This email address was not found": "Tansa-a n yimayl ulac-it",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Tansa-ik/im n yimayl ur d-tban ara akken ad tettwacudd d usulay Matrix deg usebter-a agejdan.",
+    "Sign In or Create Account": "Kcem ɣer neɣ rnu amiḍan",
+    "Use your account or create a new one to continue.": "Seqdec amiḍan-ik/im neɣ snulfu-d yiwen akken ad tkemmleḍ.",
+    "Custom (%(level)s)": "Sagen (%(level)s)",
+    "Failed to invite": "Ulamek i d-tnecdeḍ",
+    "You need to be able to invite users to do that.": "Tesriḍ ad tizmireḍ ad d-tnecdeḍ iseqdacen ad gen ayagi.",
+    "Failed to send request.": "Tuzna n usuter ur teddi ara.",
+    "This room is not recognised.": "Taxxamt-a ur tṣeggem ara.",
+    "You are not in this room.": "Ulac-ik/ikem deg texxamt-a.",
+    "You do not have permission to do that in this room.": "Ur tesεiḍ ara tasiregt ad tgeḍ ayagi deg texxamt-a.",
+    "Missing room_id in request": "Ixuṣṣ taxxamt_asulay deg usuter",
+    "Room %(roomId)s not visible": "Taxxamt %(roomId)s ur d-tban ara",
+    "Missing user_id in request": "Ixuṣṣ useqdac_asulay deg usuter",
+    "Command error": "Tuccḍa n tladna",
+    "/ddg is not a command": "/ddg mačči d taladna",
+    "Upgrades a room to a new version": "Leqqem taxxamt ɣer lqem amaynut",
+    "Error upgrading room": "Tuccḍa deg uleqqem n texxamt",
+    "Changes your avatar in this current room only": "Snifel avatar-ik/im deg texxamat-agi kan tamirant",
+    "Changes your avatar in all rooms": "Snifel avatar/ik/om deg yixxamin",
+    "Use an identity server": "Seqdec timagit n uqeddac",
+    "Joins room with given address": "Kcem ɣer texxamt s tansa i d-yettunefken",
+    "Leave room": "Ffeɣ seg texxamt",
+    "Ignores a user, hiding their messages from you": "Anef iuseqdac, ffer iznan-ines sɣur-k",
+    "Ignored user": "Aseqdac yettunfen",
+    "You are now ignoring %(userId)s": "Aql-ak tura tunfeḍ i %(userId)s",
+    "Command failed": "Taladna ur teddi ara",
+    "Could not find user in room": "Ur yettwaf ara useqdac deg texxamt",
+    "(no answer)": "(ulac tiririt)",
+    "New login. Was this you?": "Anekcam amaynut. D kečč/kemm?",
+    "Verify the new login accessing your account: %(name)s": "Senqed anekcam amaynut i ikecmen ɣer umiḍan-ik/im: %(name)s",
+    "What's new?": "D acu-t umaynut?",
+    "Upgrade your %(brand)s": "Leqqem %(brand)s inek/inem",
+    "A new version of %(brand)s is available!": "Lqem amaynut n %(brand)s yella!",
+    "There was an error joining the room": "Tella-d tuccḍa deg unekcum ɣer texxamt",
+    "Sorry, your homeserver is too old to participate in this room.": "Suref-aɣ, asebter-ik/im agejdan d aqbur aṭas akken ad yettekki deg texxamt-a.",
+    "Please contact your homeserver administrator.": "Ttxil-k/m nermes anedbal-ik/im n usebter agejdan.",
+    "Failed to join room": "Anekcum ɣer texxamt ur yeddi ara",
+    "Custom user status messages": "Sagen addaden n yiznan n useqdac",
+    "Support adding custom themes": "Tallalt n tmerna n yisental udmawanen",
+    "Use custom size": "Seqdec teɣzi tudmawant",
+    "Show avatar changes": "Sken isnifal n avatar",
+    "Always show encryption icons": "Sken yal tikkelt tignitin tiwgelhanen",
+    "Send typing notifications": "Azen ilɣa yettuszemlen",
+    "Show typing notifications": "Azen ilɣa yettuszemlen",
+    "Room Colour": "Initen n texxamt",
+    "Show developer tools": "Sken ifecka n uneflay",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Ama tseqdaceḍ askar-inek.inem n umaẓrag n uḍris anesbaɣur neɣ xaṭi",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Γas ma tseqdaceḍ %(brand)s inek.inem deg yibenk anida asami d ametwi agejdan n unekcum",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Γas ma tseqdaceḍ tamahilt 'breadcrumbs' neɣ xaṭi(avatar nnig tebdert n texxamt)",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Γas ma tseqdaceḍ %(brand)s d asnas web n usfari i ibedden",
+    "The information being sent to us to help make %(brand)s better includes:": "Talɣut i aɣ-d-yettwaznen ɣef tallalt n usnerni n %(brand)s deg-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.": "Ma yili asebter-a degs talɣut tummilt, am texxamt neɣ aseqdac neɣ asulay n ugraw, isefka-a ad ttwakksen send ad ttwaznen i uqeddac.",
+    "Unable to load! Check your network connectivity and try again.": "Yegguma ad d-yali! Senqed tuqqna-inek.inem ɣer uzeṭṭa syen tεerḍeḍ tikkelt-nniḍen.",
+    "Failure to create room": "Timerna n texxamt ur teddi ara",
+    "If you cancel now, you won't complete verifying your other session.": "Ma yella teffɣeḍ tura, ur tessawaḍeḍ ara ad tesneqdeḍ akk tiɣimiyin-inek.inem.",
+    "If you cancel now, you won't complete your operation.": "Ma yella teffɣeḍ tura, tamhelt-ik.im ur tettemmed ara.",
+    "Show these rooms to non-members on the community page and room list?": "Sken tixxamin-a i wid ur nettekka ara deg usebter n temɣiwent d tebdert n texxamt?",
+    "The remote side failed to pick up": "Amazan ur yessaweḍ ara ad d-yerr",
+    "Call failed due to misconfigured server": "Ur yeddi ara usiwel ssebba n uqeddac ur nettuswel ara akken iwata",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Ttxil-k·m suter deg anedbal n uqeddac-ik·im agejdan (<code>%(homeserverDomain)s</code>) ad yeswel aqeddac TURN akken isawalen ad ddun akken ilaq.",
+    "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.": "Neɣ, tzemreḍ ad tεerḍed aseqdec n uqeddac azayez deg <code>turn.matrix.org</code>, maca ayagi ur yelhi ara, yezmer ad yebḍu tansa-inek·inem IP d uqeddac-a. Tzemreḍ ad tesferkeḍ daɣen ayagi deg yiɣewwaren.",
+    "You do not have permission to start a conference call in this room": "Ur tesεiḍ ara tisirag ad tebduḍ asireg s usiwel deg texxamt-a",
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Akka tura, d awezɣi ad tili tririt s ufaylu. Tebɣiḍ ad tessaliḍ afaylu-a s war tiririt?",
+    "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Teɣzi n ufaylu-a '%(fileName)s' tεedda teɣzi yettusirgen sɣur aqeddac-a i usali",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Yezmer ulac aqeddac, yeččur ugar neɣ temlaleḍ-d d wabug.",
+    "Are you sure you want to cancel entering passphrase?": "S tidet tebɣiḍ ad tesfesxeḍ asekcem n tefyirt tuffirt?",
+    "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.": "Tigawt-a tesra anekcum ɣer uqeddac n tmagit tamezwert <server /> i usentem n tansa n yimayl neɣ uṭṭun n tiliɣri, maca aqeddac ur yesεi ula d yiwet n twali n umeẓlu.",
+    "Only continue if you trust the owner of the server.": "Ala ma tettekleḍ ɣef bab n uqeddac ara tkemmleḍ.",
+    "Use your account to sign in to the latest version": "Seqdec amiḍan-ik·im akken ad tkecmeḍ ɣer lqem aneggaru",
+    "Riot is now Element!": "Tura, Riot d aferdis!",
+    "Learn More": "Issin ugar",
+    "Restricted": "Yesεa tilas",
+    "Set up": "Sbadu",
+    "Pencil": "Akeryun",
+    "Compact": "Akussem",
+    "Modern": "Atrar",
+    "Online": "Srid",
+    "Mention": "Abder",
+    "Verify session": "Asenqed n tɣimit",
+    "Message edits": "Tiẓrigin n yizen",
+    "Your account is not secure": "Amiḍan-ik·im d araɣelsan",
+    "Your password": "Awal-ik·im uffir",
+    "New session": "Tiɣimit tamaynut",
+    "This wasn't me": "Wagi/tagi mačči d nekk",
+    "Security Key": "Tasarut n tɣellist",
+    "Resend": "Ɛawed azen",
+    "Premium": "Premium",
+    "Everyone": "Yal yiwen",
+    "New Recovery Method": "Tarrayt tamaynut n ujebber",
+    "Go to Settings": "Ddu ɣer yiɣewwaren",
+    "Set up Secure Messages": "Sbadu iznan iɣelsanen",
+    "Not currently indexing messages for any room.": "Ulac asmiter amiran n yiznan i yal taxxamt.",
+    "Currently indexing: %(currentRoom)s": "Asmiter amiran: %(currentRoom)s",
+    "Space used:": "Tallunt yettwasqedcen:",
+    "Indexed messages:": "Iznan s umatar:",
+    "Indexed rooms:": "Tixxamin s umatar:",
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s beṛṛa n %(totalRooms)s",
+    "Room List": "Tabdert n texxamt",
+    "Autocomplete": "Asmad awurman",
+    "Alt Gr": "Alt Gr",
+    "Super": "Ayuz",
+    "Ctrl": "Ctrl",
+    "We’re excited to announce Riot is now Element": "S tumert meqqren ara d-nselɣu belli Riot tura d aferdis",
+    "Operation failed": "Tamhelt ur teddi ara",
+    "Failed to invite users to the room:": "Yegguma ad yeddu usnubget n yiseqdacen ɣer texxamt:",
+    "Failed to invite the following users to the %(roomName)s room:": "Asnubget n yiseqdacen i d-iteddun ɣer taxxamt %(roomName)s ur yeddi ara:",
+    "Unable to create widget.": "Timerna n uwiǧit ulamek.",
+    "Missing roomId.": "Ixuṣ usulay n texxamt.",
+    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Yerna ¯\\_(ツ)_/¯ ɣer yizen n uḍris arewway",
+    "Searches DuckDuckGo for results": "Yettnadi DuckDuckGo ɣef yigmaḍ",
+    "To use it, just wait for autocomplete results to load and tab through them.": "I useqdec-ines, ṛǧu kan i yigmaḍ iwurmanen iččuranen i usali syen nadi deg-sen.",
+    "Changes the avatar of the current room": "Ibeddel avatar n texxamt tamirant",
+    "Gets or sets the room topic": "Yufa-d neɣ yesbadu asentel n texxamt",
+    "Failed to set topic": "Asbadu n usentel ur yeddi ara",
+    "This room has no topic.": "Taxxamt-a ulac ɣur-s asentel.",
+    "Sets the room name": "Yesbadu isem n texxamt",
+    "Invites user with given id to current room": "Inced iseqdacen s tikci n usulay i texxamt tamirant",
+    "Use an identity server to invite by email. Manage in Settings.": "Seqdec aqeddac n timagit i uncad s yimayl. Asefrek deg yiɣewwaren.",
+    "Unrecognised room address:": "Tansa n texxamt ur tettwassen ara:",
+    "Bans user with given id": "Agi aseqdac s usulay i d-yettunefken",
+    "Unbans user with given ID": "Kkes aseqdac s usulay i d-yettunefkan",
+    "Stops ignoring a user, showing their messages going forward": "Ḥbes tiǧǧtin n useqdac, sken iznan-ines sya d afella",
+    "Define the power level of a user": "Sbadu aswir iǧehden n useqdac",
+    "Please supply a https:// or http:// widget URL": "Ttxil-k·m mudd URL n uwigit https:// neɣ http://",
+    "You cannot modify widgets in this room.": "Ur tezmireḍ ara ad tbeddleḍ iwiǧiten n texxamt-a.",
+    "Unknown (user, session) pair:": "Tayuga tarussint (aseqdac, tiɣimit):",
+    "Session already verified!": "Tiɣimit tettwasenqed yakan!",
+    "Verified key": "Tasarut tettwasenqed",
+    "Displays information about a user": "Yeskan talɣut ɣef useqdac",
+    "Send a bug report with logs": "Azen aneqqis n wabug s yiɣƔisen",
+    "Logs sent": "Iɣmisen ttewaznen",
+    "Opens chat with the given user": "Yeldi adiwenni d useqdac i d-yettunefken",
+    "Sends a message to the given user": "Yuzen iznan i useqdac i d-yettunefken",
+    "Displays action": "Yeskan tigawt",
+    "%(targetName)s accepted an invitation.": "%(targetName)s yeqbel tinnubga.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s inced-d %(targetName)s.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s yugi %(targetName)s.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s kksen isem ara d-ibanen (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s yekkes tawlaft n umaqnu-ines.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s ibeddel tawlaft n umaɣnu-ines.",
+    "%(senderName)s set a profile picture.": "%(senderName)s yesbadu tawlaft n umaɣnu.",
+    "%(senderName)s made no change.": "%(senderName)s ur yegi ara ula d yiwen n ubeddel.",
+    "VoIP conference started.": "Asarag VoIP yebda.",
+    "%(targetName)s joined the room.": "%(targetName)s yerna-d ɣer texxamt.",
+    "VoIP conference finished.": "Asarag VoIP yekfa.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s yeugi tinnubga.",
+    "%(targetName)s left the room.": "%(targetName)s yeǧǧa texxamt.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s yeqbel %(targetName)s.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s yekkes-d tinnubga n %(targetName)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s ibeddel asentel ɣer \"%(topic)s\".",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s yekkes isem n texxamt.",
+    "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s ileqqem taxxamt-a.",
+    "%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s yerra taxxamt s tinnubga kan.",
+    "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s yefka tisirag i uttekki deg texxamt.",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s yuzen-d tugna.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s yekkes tansa tagejdant n texxamt-a.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s yerna tansiwin-nniḍen %(addresses)s ɣer texxamt-a.",
+    "(unknown failure: %(reason)s)": "(abrir tarussint: %(reason)s)",
+    "%(senderName)s ended the call.": "%(senderName)s yekfa asiwel.",
+    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s awiǧit yettwarna sɣur %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s awiǧit yettwakkes sɣur %(senderName)s",
+    "Not Trusted": "Ur yettwattkal ara",
+    "%(displayName)s is typing …": "%(displayName)s yettaru-d …",
+    "%(names)s and %(count)s others are typing …|other": "%(names)s d %(count)s wiyaḍ ttarun-d …",
+    "%(names)s and %(count)s others are typing …|one": "%(names)s d wayeḍ-nniḍen yettaru-d …",
+    "%(names)s and %(lastPerson)s are typing …": "%(names)s d %(count)s ttarun-d …",
+    "%(items)s and %(count)s others|other": "%(names)s d %(count)s wiyaḍ",
+    "%(items)s and %(count)s others|one": "%(names)s d wayeḍ-nniḍen",
+    "%(items)s and %(lastItem)s": "%(items)s d %(lastItem)s",
+    "a few seconds ago": "kra n tesinin seg yimir-nni",
+    "about a minute ago": "tasdidt seg yimir-nni",
+    "%(num)s minutes ago": "%(num)s tesdat seg yimir-nni",
+    "about an hour ago": "azal n usrag seg yimir-nni",
+    "Set Password": "Sbadu awal uffir",
+    "Set up encryption": "Swel awgelhen",
+    "Encryption upgrade available": "Yella uleqqem n uwgelhen",
+    "Verify this session": "Asenqed n tɣimit",
+    "Other users may not trust it": "Iseqdacen-nniḍen yezmer ur tettamnen ara",
+    "You joined the call": "Terniḍ ɣer usiwel",
+    "%(senderName)s joined the call": "%(senderName)s yerna ɣer usiwel",
+    "Call in progress": "Asiwel la iteddu",
+    "You left the call": "Teǧǧiḍ asiwel",
+    "%(senderName)s left the call": "%(senderName)s yeǧǧa asiwel",
+    "Call ended": "Asiwel yekfa",
+    "You started a call": "Tebdiḍ asiwel",
+    "%(senderName)s started a call": "%(senderName)s yebda asiwel",
+    "Waiting for answer": "Yettṛaǧu tiririt",
+    "%(senderName)s is calling": "%(senderName)s yessawal",
+    "You created the room": "Terniḍ taxxamt",
+    "%(senderName)s created the room": "%(senderName)s yerna taxxamt",
+    "You made the chat encrypted": "Terriḍ adiwenni yettuwgelhen",
+    "%(senderName)s made the chat encrypted": "%(senderName)s yerra adiwenni yettuwgelhen",
+    "You made history visible to new members": "Terriḍ amazray yettban i yimttekkiyen imaynuten",
+    "%(senderName)s made history visible to new members": "%(senderName)s yerra amazray yettban i yimttekkiyen imaynuten",
+    "You made history visible to anyone": "Terriḍ amazray yettban i yal amdan",
+    "%(senderName)s made history visible to anyone": "%(senderName)s yerra amazray yettban i yal amdan",
+    "You made history visible to future members": "Terriḍ amazray yettban i yimttekkiyen ara d-yernun",
+    "%(senderName)s made history visible to future members": "%(senderName)s yerra amazray yettban i yimttekkiyen ara d-yernun",
+    "You were invited": "Tettusnubegteḍ",
+    "%(targetName)s was invited": "%(senderName)s yettusnubget",
+    "You left": "Truḥeḍ",
+    "%(targetName)s left": "%(targetName)s iṛuḥ",
+    "You rejected the invite": "Tugiḍ tinnubga",
+    "%(targetName)s rejected the invite": "%(targetName)s yugi tinnubga",
+    "You were uninvited": "Ur tettusnubegteḍ ara",
+    "%(targetName)s was uninvited": "%(senderName)s ur yettusnubget ara",
+    "You joined": "Terniḍ",
+    "%(targetName)s joined": "%(targetName)s yerna",
+    "You changed your name": "Tbeddleḍ isem-ik·im",
+    "%(targetName)s changed their name": "%(targetName)s ibeddel isem-is",
+    "You changed your avatar": "Tbeddleḍ avatar-inek·inem",
+    "%(targetName)s changed their avatar": "%(targetName)s ibeddel avatar-ines",
+    "%(senderName)s %(emote)s": "%(senderName)s %(emote)s",
+    "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
+    "You changed the room name": "Tbeddleḍ isem n texxamt",
+    "%(senderName)s changed the room name": "%(senderName)s kksen isem n texxamt",
+    "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
+    "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
+    "You uninvited %(targetName)s": "Ur tettusnubegteḍ ara sɣur %(targetName)s",
+    "%(senderName)s uninvited %(targetName)s": "%(senderName)s ur yettusnubget ara sɣur %(targetName)s",
+    "You invited %(targetName)s": "Tettusnubegteḍ sɣur %(targetName)s",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s yettusnubget %(targetName)s",
+    "You changed the room topic": "Tbeddleḍ asentel n texxamt",
+    "%(senderName)s changed the room topic": "%(senderName)s ibeddel asentel n texxamt",
+    "Message Pinning": "Arezzi n yizen",
+    "Group & filter rooms by custom tags (refresh to apply changes)": "Sdukkel tixxamin, tsizedgeḍ-tent s tebzimin tudmawanin (smiren akken ad alin yisnifal)",
+    "Order rooms by name": "Semyizwer tixxamin s yisem",
+    "Show rooms with unread notifications first": "Sken tixxamin yesεan ilɣa ur nettwaɣra ara d timezwura",
+    "Collecting logs": "Alqaḍ n yiɣmisen",
+    "Uploading report": "Asali n uneqqis",
+    "Waiting for response from server": "Aṛaǧu n tririt sɣur aqeddac",
+    "Messages containing my display name": "Iznan ideg yella yisem-iw yettwaskanen",
+    "Messages containing my username": "Iznan ideg yella yisem-iw n useqdac",
+    "Messages containing @room": "Iznan ideg yella @taxxamt",
+    "Delete sessions|other": "Kkes tiɣimiyin",
+    "Delete sessions|one": "Kkes tiɣimit",
+    "Delete %(count)s sessions|other": "Kkes tiɣimiyin n %(count)s",
+    "Delete %(count)s sessions|one": "Kkes tiɣimit n %(count)s",
+    "Public Name": "Isem azayez",
+    "Last seen": "Timeẓri taneggarut",
+    "Failed to set display name": "Asbadu n yisem yettwaskanen ur yeddi ara",
+    " to store messages from ": " i usekles n yiznan sɣur ",
+    "rooms.": "tixxamin.",
+    "Connecting to integration manager...": "Tuqqna ɣer umsefrak n useddu...",
+    "Cannot connect to integration manager": "Ur nessaweḍ ara ad neqqen ɣer umsefrak n useddu...",
+    "Delete Backup": "Kkes aḥraz",
+    "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Iznan yettwawgelhen ttuḥerzen s uwgelhen n yixef ɣer yixef. Ala kečč d unermas (inermasen) i yesεan tisura akken ad ɣren iznan-a.",
+    "This session is backing up your keys. ": "Tiɣimit tḥerrez tisura-inek·inem. ",
+    "Connect this session to Key Backup": "Qqen tiɣimit-a ɣer uḥraz n tsarut",
+    "Server Name": "Isem n uqeddac",
+    "Enter password": "Sekcem awal n uffir",
+    "Nice, strong password!": "Igerrez, d awal uffir iǧhed aṭas!",
+    "Password is allowed, but unsafe": "Awal uffir yettusireg, maca d araɣelsan",
+    "Keep going...": "Kemmel ddu...",
+    "The email field must not be blank.": "Urti n yimayl ur ilaq ara ad yili d ilem.",
+    "The username field must not be blank.": "Urti n yisem n useqdac ur ilaq ara ad yili d ilem.",
+    "The phone number field must not be blank.": "Urti n wuṭṭun n tiliɣri ur ilaq ara ad yili d ilem.",
+    "The password field must not be blank.": "Urti n wawal uffir ilaq ara ad yili d ilem.",
+    "Not sure of your password? <a>Set a new one</a>": "Tcukkteḍ deg wawal-ik·im uffir? <a>Sbadu yiwen-nniḍen d amaynut</a>",
+    "Sign in with": "Kcem s",
+    "Use an email address to recover your account": "Seqdec tansa n yimayl akken ad t-terreḍ amiḍan-ik:im",
+    "Enter email address (required on this homeserver)": "Sekcem tansa n yimayl (yettusra deg uqeddac-a agejdan)",
+    "Doesn't look like a valid email address": "Ur tettban ara d tansa n yimayl tameɣtut",
+    "Other users can invite you to rooms using your contact details": "Iseqdacen wiyaḍ zemren ad ak·akem-snubegten ɣer texxamin s useqdec n tlqayt n unermas",
+    "Enter phone number (required on this homeserver)": "Sekcem uṭṭun n tiliɣri (yettusra deg uqeddac-a agejdan)",
+    "Doesn't look like a valid phone number": "Ur tettban ara d uṭṭun n tiliɣri ameɣtu",
+    "Enter username": "Sekcem isem n useqdac",
+    "Phone (optional)": "Tiliɣri (d afrayan)",
+    "Create your Matrix account on %(serverName)s": "Rnu amiḍan-ik·im Matrix deg %(serverName)s",
+    "Create your Matrix account on <underlinedServerName />": "Rnu amiḍan-ik·im Matrix deg <underlinedServerName />",
+    "Enter your custom homeserver URL <a>What does this mean?</a>": "Sekcem URL n uqeddac agejdan udmawan <a>D acu-t unamek n waya?</a>",
+    "Homeserver URL": "URL n uqeddac agejdan",
+    "Enter your custom identity server URL <a>What does this mean?</a>": "Sekcem URL n uqeddac n timagit udmawan <a>D acu-t unamek n waya?</a>",
+    "Forgotten your password?": "Tettuḍ awal-ik·im uffir?",
+    "Sign in and regain access to your account.": "Qqen syen εreḍ anekcum ɣer umiḍan-inek·inem tikkelt-nniḍen.",
+    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Ur tessawḍeḍ ara ad teqqneḍ ɣer umiḍan-inek:inem. Ttxil-k·m nermes anedbal n uqeddac-ik·im agejdan i wugar n talɣut.",
+    "You're signed out": "Teffɣeḍ-d seg tuqqna",
+    "Clear personal data": "Sfeḍ isefka udmawanen",
+    "Community Autocomplete": "Asmad awurman n temɣiwent",
+    "Results from DuckDuckGo": "Igmaḍ seg DuckDuchGo",
+    "DuckDuckGo Results": "Igmaḍ n DuckDuckGo",
+    "Notify the whole room": "Selɣu akk taxxamt",
+    "Room Notification": "Ilɣa n texxamt",
+    "Notification Autocomplete": "Asmad awurman n yilɣa",
+    "Room Autocomplete": "Asmad awurman n texxamt",
+    "User Autocomplete": "Asmad awurman n useqdac",
+    "Passphrases must match": "Tifyar tuffirin ilaq ad mṣadant",
+    "Passphrase must not be empty": "Tafyirt tuffirt ur ilaq ara ad ilint d tilmawin",
+    "Export room keys": "Sifeḍ tisura n texxamt",
+    "Confirm passphrase": "Sentem tafyirt tuffirt",
+    "Import room keys": "Kter tisura n texxamt",
+    "File to import": "Afaylu i uktar",
+    "Confirm encryption setup": "Sentem asebded n uwgelhen",
+    "Click the button below to confirm setting up encryption.": "Sit ɣef tqeffalt ddaw akken ad tesnetmeḍ asebded n uwgelhen.",
+    "Generate a Security Key": "Sirew tasarut n tɣellist",
+    "Enter a Security Phrase": "Sekcem tafyirt tuffirt",
+    "Enter your account password to confirm the upgrade:": "Sekcem awal uffir n umiḍan-ik·im akken ad tesnetmeḍ aleqqem:",
+    "Great! This recovery passphrase looks strong enough.": "Ayuz! Tafyirt-agi tuffirt n ujebber tettban teǧhed nezzeh.",
+    "That matches!": "Yemṣada!",
+    "Use a different passphrase?": "Seqdec tafyirt tuffirt yemgaraden?",
+    "That doesn't match.": "Ur yemṣada ara.",
+    "Go back to set it again.": "Uɣal ɣer deffir akken ad t-tesbaduḍ i tikkelt-nniḍen.",
+    "Enter your recovery passphrase a second time to confirm it.": "Sekcem tafyirt-ik·im tuffirt n ujebber i tikkelt-nniḍen akken ad tt-tesnetmeḍ.",
+    "Confirm your recovery passphrase": "Sentem tafyirt-ik·im tuffirt n ujebber",
+    "Set up Secure backup": "Sebded aḥraz aɣelsan",
+    "Upgrade your encryption": "Leqqem awgelhen-inek·inem",
+    "Set a Security Phrase": "Sbadu tafyirt taɣelsant",
+    "Confirm Security Phrase": "Sentem tafyirt tuffirt",
+    "Don't ask again": "Ur d-sutur ara tikelt-nniḍen",
+    "Recovery Method Removed": "Tarrayt n ujebber tettwakkes",
+    "Failed to set direct chat tag": "Asbadu n tebzimt n udiwenni usrid ur yeddi ara",
+    "Failed to remove tag %(tagName)s from room": "Tukksa n tebzimt %(tagName)s seg texxamt ur yeddi ara",
+    "Failed to add tag %(tagName)s to room": "Timerna n tebzimt %(tagName)s ɣer texxamt ur yeddi ara",
+    "%(num)s hours ago": "%(num)s usrag seg yimir-nni",
+    "about a day ago": "azal n wass seg yimir-nni",
+    "%(num)s days ago": "%(num)s wussan seg yimir-nni",
+    "a few seconds from now": "Kra n tesinin seg yimir-a",
+    "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
+    "Not a valid %(brand)s keyfile": "Afaylu n tsarut %(brand)s d arameɣtu",
+    "User %(user_id)s does not exist": "Aseqdac %(user_id)s ulac-it",
+    "Unknown server error": "Tuccḍa n uqeddac d tarussint",
+    "Avoid repeated words and characters": "Zgel i wawalen i d-yettasen d yisekkilen",
+    "Avoid sequences": "Zgel igzumen",
+    "Avoid recent years": "Zgel iseggasen ineggura",
+    "Avoid years that are associated with you": "Zgel iseggasen i icudden ɣur-k",
+    "Avoid dates and years that are associated with you": "Zgel izmaz akked iseggasen i icudden ɣur-k",
+    "System font name": "Isem n tsefsit n unagraw",
+    "Send analytics data": "Azen isefka n tesleḍt",
+    "Cancelling…": "Asefsex...",
+    "They match": "Mṣadan",
+    "They don't match": "Ur mṣadan ara",
+    "Dog": "Aqjun",
+    "Horse": "Aεewdiw",
+    "Pig": "Ilef",
+    "Elephant": "Ilu",
+    "Panda": "Apunda",
+    "Rooster": "Ayaziḍ",
+    "Fish": "Lḥut",
+    "Butterfly": "Aferteṭṭu",
+    "Flower": "Ajeǧǧig",
+    "Mushroom": "Agersal",
+    "Moon": "Ayyur",
+    "Cloud": "Agu",
+    "Fire": "Times",
+    "Banana": "Tabanant",
+    "Apple": "Tatteffaḥt",
+    "Strawberry": "Tazwelt",
+    "Corn": "Akbal",
+    "Cake": "Angul",
+    "Heart": "Ul",
+    "Smiley": "Acmumeḥ",
+    "Robot": "Aṛubut",
+    "Hat": "Acapun",
+    "Glasses": "Tisekkadin",
+    "Umbrella": "Tasiwant",
+    "Gift": "Asefk",
+    "Light bulb": "Taftilt",
+    "Power level must be positive integer.": "Ilaq ad yili uswir n tezmert d ummid ufrir.",
+    "Sends a message as plain text, without interpreting it as markdown": "Yuzen izen d aḍris aččuran war ma isegza-t s tukksa n tecreḍt",
+    "You do not have the required permissions to use this command.": "Ur tesεiḍ ara tisirag akken ad tesqedceḍ taladna-a.",
+    "Double check that your server supports the room version chosen and try again.": "Senqed akken ilaq ma yella aqeddac-inek·inem issefrak lqem n texxamtyettwafernen syen εreḍ tikkelt-nniḍen.",
+    "Changes your display nickname": "Ibeddel isem-inek·inem yettwaskanen",
+    "Changes your display nickname in the current room only": "Ibeddel isem-inek·inem i d-yettwaskanen degtexxamt kan tamirant",
+    "Kicks user with given id": "Suffeɣ aseqdac s usulay i d-yettunefken",
+    "Unignored user": "Aseqdac ur yettuzeglen ara",
+    "You are no longer ignoring %(userId)s": "Dayen ur tettazgaleḍ ara akk %(userId)s",
+    "Opens the Developer Tools dialog": "Yeldi adiwenni n yifecka n uneflay",
+    "Adds a custom widget by URL to the room": "Yerna awiǧit udmawan s URL ɣer texxamt",
+    "Please supply a widget URL or embed code": "Ttxil-k·m mudd URL n uwiǧit neɣ tangalt tusliɣt",
+    "Verifies a user, session, and pubkey tuple": "Yessenqad tagrumma-a: aseqdac, tiɣimit d tsarut tazayezt",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "ΓUR-K·M: Tettwasenqed tɣimit yakan maca tisura ur mṣadant ara!",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s isuter-d asarag VoIP.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s ibeddel isem-ines yettwaskanen s %(displayName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s yesbadu isem yettwaskanen s %(displayName)s.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s yessuffeɣ %(targetName)s.",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s ibeddel isem n texxamt seg %(oldRoomName)s ɣer %(newRoomName)s.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s ibeddel isem n texxamt s %(roomName)s.",
+    "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s yerra taxxamt d tazayazt i kra n win yessnen aseɣwen.",
+    "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s ibeddel alugen n uttekki s %(rule)s",
+    "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s ur yeǧǧi ara i yimerza ad kecmen ɣer texxamt.",
+    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s ibeddel anekcum n yimerza s %(rule)s",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s yesbadu tansa tagejdant i texxamt-a s %(address)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s yerna tansa-nniḍen %(addresses)s i texxamt-a.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s yekkes tansa-nni-nniḍen %(addresses)s i texxamt-a.",
+    "%(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."
+}
diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index 4271864216..59bb68af94 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -28,10 +28,8 @@
     "Microphone": "마이크",
     "Camera": "카메라",
     "Advanced": "고급",
-    "Algorithm": "알고리즘",
     "Always show message timestamps": "항상 메시지의 시간을 보이기",
     "Authentication": "인증",
-    "Alias (optional)": "별칭 (선택)",
     "A new password must be entered.": "새 비밀번호를 입력해주세요.",
     "An error has occurred.": "오류가 발생했습니다.",
     "Anyone": "누구나",
@@ -41,17 +39,12 @@
     "Autoplay GIFs and videos": "GIF와 동영상을 자동으로 재생하기",
     "Ban": "출입 금지",
     "Banned users": "출입 금지된 사용자",
-    "Blacklisted": "블랙리스트 대상",
     "Change Password": "비밀번호 바꾸기",
     "Changes your display nickname": "표시 별명 변경하기",
     "Confirm password": "비밀번호 확인",
     "Create Room": "방 만들기",
     "Custom": "사용자 지정",
-    "Device ID": "기기 ID",
     "Default": "기본",
-    "device id: ": "기기 ID: ",
-    "Direct chats": "다이렉트 대화",
-    "Disable Notifications": "알림 끄기",
     "Email": "이메일",
     "Email address": "이메일 주소",
     "Failed to forget room %(errCode)s": "%(errCode)s 방 지우기에 실패함",
@@ -63,7 +56,7 @@
     "Access Token:": "접근 토큰:",
     "Active call (%(roomName)s)": "현재 전화 (%(roomName)s 방)",
     "Add a topic": "주제 추가",
-    "You may need to manually permit Riot to access your microphone/webcam": "수동으로 Riot에 마이크와 카메라를 허용해야 함",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "수동으로 %(brand)s에 마이크와 카메라를 허용해야 함",
     "%(items)s and %(lastItem)s": "%(items)s님과 %(lastItem)s님",
     "and %(count)s others...|one": "외 한 명...",
     "and %(count)s others...|other": "외 %(count)s명...",
@@ -81,7 +74,6 @@
     "%(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\"(으)로 바꿨습니다.",
-    "Claimed Ed25519 fingerprint key": "Ed25519 핑거프린트 키가 필요함",
     "Click here to fix": "해결하려면 여기를 누르세요",
     "Click to mute audio": "소리를 끄려면 클릭",
     "Click to mute video": "영상 소리를 끄려면 클릭",
@@ -90,30 +82,23 @@
     "Click to unmute audio": "소리를 켜려면 클릭",
     "Command error": "명령어 오류",
     "Commands": "명령어",
-    "Could not connect to the integration server": "통합 서버에 연결할 수 없음",
     "Cryptography": "암호화",
     "Current password": "현재 비밀번호",
-    "Curve25519 identity key": "Curve25519 ID 키",
     "Custom level": "맞춤 등급",
     "/ddg is not a command": "/ddg는 명령어가 아닙니다",
     "Deactivate Account": "계정 비활성화",
     "Decline": "거절",
     "Decrypt %(text)s": "%(text)s 복호화",
-    "Decryption error": "암호 복호화 오류",
     "Deops user with given id": "받은 ID로 사용자의 등급을 낮추기",
     "Disinvite": "초대 취소",
     "Displays action": "활동 표시하기",
     "Download %(text)s": "%(text)s 다운로드",
     "Drop File Here": "여기에 파일을 놓아주세요",
-    "Ed25519 fingerprint": "Ed25519 핑거프린트",
     "Emoji": "이모지",
-    "Enable Notifications": "알림 켜기",
     "%(senderName)s ended the call.": "%(senderName)s님이 전화를 끊었습니다.",
-    "End-to-end encryption information": "종단간 암호화 정보",
     "Enter passphrase": "암호 입력",
     "Error decrypting attachment": "첨부 파일 복호화 중 오류",
     "Error: Problem communicating with the given homeserver.": "오류: 지정한 홈서버와 통신에 문제가 있습니다.",
-    "Event information": "이벤트 정보",
     "Existing Call": "기존 전화",
     "Export": "내보내기",
     "Export E2E room keys": "종단간 암호화 방 열쇠 내보내기",
@@ -130,7 +115,6 @@
     "Failed to send email": "이메일 보내기에 실패함",
     "Failed to send request.": "요청을 보내지 못했습니다.",
     "Failed to set display name": "표시 이름을 설정하지 못함",
-    "Failed to toggle moderator status": "조정자 상태 설정에 실패함",
     "Failed to unban": "출입 금지 풀기에 실패함",
     "Failed to upload profile picture!": "프로필 사진 업로드에 실패함!",
     "Failed to verify email address: make sure you clicked the link in the email": "이메일 주소를 인증하지 못했습니다. 메일에 나온 주소를 눌렀는지 확인해 보세요",
@@ -166,7 +150,6 @@
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "<voiceText>음성</voiceText> 또는 <videoText>영상</videoText>으로 참가하세요.",
     "Join Room": "방에 참가",
     "%(targetName)s joined the room.": "%(targetName)s님이 방에 참가했습니다.",
-    "Joins room with given alias": "받은 별칭으로 방에 들어가기",
     "Jump to first unread message.": "읽지 않은 첫 메시지로 건너뜁니다.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s님이 %(targetName)s님을 추방했습니다.",
     "Kick": "추방",
@@ -175,7 +158,6 @@
     "Last seen": "마지막으로 본 순간",
     "Leave room": "방 떠나기",
     "%(targetName)s left the room.": "%(targetName)s님이 방을 떠났습니다.",
-    "Local addresses for this room:": "이 방의 로컬 주소:",
     "Logout": "로그아웃",
     "Low priority": "중요하지 않음",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s님이 이후 방 구성원 모두, 초대받은 시점부터 방의 기록을 볼 수 있게 했습니다.",
@@ -188,14 +170,11 @@
     "Missing user_id in request": "요청에서 user_id이(가) 빠짐",
     "Moderator": "조정자",
     "Name": "이름",
-    "New address (e.g. #foo:%(localDomain)s)": "새 주소 (예: #foo:%(localDomain)s)",
     "New passwords don't match": "새 비밀번호가 맞지 않음",
     "New passwords must match each other.": "새 비밀번호는 서로 같아야 합니다.",
-    "none": "없음",
     "not specified": "지정되지 않음",
     "(not supported by this browser)": "(이 브라우저에서 지원하지 않습니다)",
     "<not supported>": "<지원하지 않음>",
-    "NOT verified": "인증하지 않음",
     "No display name": "표시 이름 없음",
     "No more results": "더 이상 결과 없음",
     "No results": "결과 없음",
@@ -217,29 +196,25 @@
     "%(senderName)s set a profile picture.": "%(senderName)s님이 프로필 사진을 설정했습니다.",
     "Public Chat": "공개 대화",
     "Reason": "이유",
-    "Revoke Moderator": "조정자 철회",
     "Register": "등록",
     "%(targetName)s rejected the invitation.": "%(targetName)s님이 초대를 거절했습니다.",
     "Reject invitation": "초대 거절",
-    "Remote addresses for this room:": "이 방의 원격 주소:",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s님이 표시 이름 (%(oldDisplayName)s)을(를) 제거했습니다.",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s님이 VoIP 회의를 요청했습니다.",
     "Results from DuckDuckGo": "DuckDuckGo에서 검색한 결과",
     "Return to login screen": "로그인 화면으로 돌아가기",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot은 알림을 보낼 권한을 가지고 있지 않습니다. 브라우저 설정을 확인해주세요",
-    "Riot was not given permission to send notifications - please try again": "Riot이 알림을 보낼 권한을 받지 못했습니다. 다시 해주세요",
-    "riot-web version:": "Riot 웹 버전:",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s은 알림을 보낼 권한을 가지고 있지 않습니다. 브라우저 설정을 확인해주세요",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s이 알림을 보낼 권한을 받지 못했습니다. 다시 해주세요",
+    "%(brand)s version:": "%(brand)s 웹 버전:",
     "Room %(roomId)s not visible": "방 %(roomId)s이(가) 보이지 않음",
     "Room Colour": "방 색",
     "%(roomName)s does not exist.": "%(roomName)s은 없는 방이에요.",
     "%(roomName)s is not accessible at this time.": "현재는 %(roomName)s에 들어갈 수 없습니다.",
     "Rooms": "방",
     "Save": "저장",
-    "Scroll to bottom of page": "화면 맨 아래로 이동",
     "Search failed": "검색 실패함",
     "Searches DuckDuckGo for results": "DuckDuckGo에서 검색하기",
     "Seen by %(userName)s at %(dateTime)s": "%(userName)s님이 %(dateTime)s에 확인함",
-    "Send anyway": "무시하고 보내기",
     "Send Reset Email": "초기화 이메일 보내기",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s님이 사진을 보냈습니다.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "방에 들어오라고 %(senderName)s님이 %(targetDisplayName)s님에게 초대를 보냈습니다.",
@@ -255,7 +230,6 @@
     "Sign out": "로그아웃",
     "%(count)s of your messages have not been sent.|other": "일부 메시지를 보내지 못했습니다.",
     "Someone": "다른 사람",
-    "Start a chat": "대화 시작하기",
     "Start authentication": "인증 시작",
     "Submit": "제출",
     "Success": "성공",
@@ -280,13 +254,9 @@
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s님이 %(targetName)s님에 대한 출입 금지를 풀었습니다.",
     "Unable to capture screen": "화면을 찍을 수 없음",
     "Unable to enable Notifications": "알림을 사용할 수 없음",
-    "unencrypted": "암호화하지 않음",
     "unknown caller": "알 수 없는 발신자",
-    "unknown device": "알 수 없는 기기",
-    "Unknown room %(roomId)s": "알 수 없는 방 %(roomId)s",
     "Unmute": "음소거 끄기",
     "Unnamed Room": "이름 없는 방",
-    "Unrecognised room alias:": "인식할 수 없는 방 별칭:",
     "Uploading %(filename)s and %(count)s others|zero": "%(filename)s을(를) 올리는 중",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s 외 %(count)s개를 올리는 중",
     "Uploading %(filename)s and %(count)s others|other": "%(filename)s 외 %(count)s개를 올리는 중",
@@ -295,13 +265,9 @@
     "Upload file": "파일 업로드",
     "Upload new:": "새로 업로드:",
     "Usage": "사용",
-    "Use compact timeline layout": "간단한 타임라인 구성 사용",
-    "User ID": "사용자 ID",
     "Username invalid: %(errMessage)s": "잘못된 사용자 이름: %(errMessage)s",
     "Users": "사용자",
     "Verification Pending": "인증을 기다리는 중",
-    "Verification": "인증",
-    "verified": "인증함",
     "Verified key": "인증한 열쇠",
     "Video call": "영상 통화",
     "Voice call": "음성 통화",
@@ -354,7 +320,6 @@
     "Upload an avatar:": "아바타 업로드:",
     "This server does not support authentication with a phone number.": "이 서버는 전화번호 인증을 지원하지 않습니다.",
     "An error occurred: %(error_string)s": "오류가 발생함: %(error_string)s",
-    "Make Moderator": "조정자 임명",
     "There are no visible files in this room": "이 방에는 보여줄 수 있는 파일이 없습니다",
     "Room": "방",
     "Connectivity to the server has been lost.": "서버 연결이 끊어졌습니다.",
@@ -367,7 +332,7 @@
     "Start automatically after system login": "컴퓨터를 시작할 때 자동으로 실행하기",
     "Analytics": "정보 분석",
     "Options": "옵션",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot은 앱을 발전시키기 위해 익명으로 정보 분석을 수집합니다.",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s은 앱을 발전시키기 위해 익명으로 정보 분석을 수집합니다.",
     "Passphrases must match": "암호가 일치해야 함",
     "Passphrase must not be empty": "암호를 입력해야 함",
     "Export room keys": "방 키 내보내기",
@@ -380,20 +345,14 @@
     "Confirm Removal": "삭제 확인",
     "Unknown error": "알 수 없는 오류",
     "Incorrect password": "맞지 않는 비밀번호",
-    "To continue, please enter your password.": "계속하려면, 비밀번호를 입력해주세요.",
     "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.": "이 과정으로 암호화한 방에서 받은 메시지의 키를 로컬 파일로 내보낼 수 있습니다. 그런 다음 나중에 다른 Matrix 클라이언트에서 파일을 가져와서, 해당 클라이언트에서도 이 메시지를 복호화할 수 있도록 할 수 있습니다.",
     "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 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.": "이 과정으로 다른 Matrix 클라이언트에서 내보낸 암호화 키를 가져올 수 있습니다. 그런 다음 이전 클라이언트에서 복호화할 수 있는 모든 메시지를 복호화할 수 있습니다.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "내보낸 파일이 암호로 보호되어 있습니다.  파일을 복호화하려면, 여기에 암호를 입력해야 합니다.",
     "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.": "이 이벤트를 감추길(삭제하길) 원하세요? 방 이름을 삭제하거나 주제를 바꾸면, 다시 생길 수도 있습니다.",
-    "I verify that the keys match": "열쇠가 맞는지 인증합니다",
     "Unable to restore session": "세션을 복구할 수 없음",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "이전에 최근 버전의 Riot을 썼다면, 세션이 이 버전과 맞지 않을 것입니다. 창을 닫고 최근 버전으로 돌아가세요.",
+    "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을 썼다면, 세션이 이 버전과 맞지 않을 것입니다. 창을 닫고 최근 버전으로 돌아가세요.",
     "Unknown Address": "알 수 없는 주소",
-    "Unblacklist": "블랙리스트 제외",
-    "Blacklist": "블랙리스트 등록",
-    "Unverify": "인증 취소",
-    "Verify...": "인증하기...",
     "ex. @bob:example.com": "예: @bob:example.com",
     "Add User": "사용자 추가",
     "Please check your email to continue registration.": "등록하려면 이메일을 확인해주세요.",
@@ -405,7 +364,6 @@
     "Error decrypting video": "영상 복호화 중 오류",
     "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?": "%(integrationsUrl)s에서 쓸 수 있도록 계정을 인증하려고 다른 사이트로 이동하고 있습니다. 계속하겠습니까?",
-    "Removed or unknown message type": "감췄거나 알 수 없는 메시지 유형",
     "URL Previews": "URL 미리보기",
     "Drop file here to upload": "업로드할 파일을 여기에 놓으세요",
     " (unsupported)": " (지원하지 않음)",
@@ -423,18 +381,13 @@
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "이건 <span></span> 홈서버에서 계정 이름이 됩니다, 혹은 <a>다른 서버</a>를 고를 수도 있습니다.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Matrix 계정을 이미 갖고 있다면, <a>로그인</a>할 수 있습니다.",
     "Your browser does not support the required cryptography extensions": "필요한 암호화 확장 기능을 브라우저가 지원하지 않습니다",
-    "Not a valid Riot keyfile": "올바른 Riot 열쇠 파일이 아닙니다",
+    "Not a valid %(brand)s keyfile": "올바른 %(brand)s 열쇠 파일이 아닙니다",
     "Authentication check failed: incorrect password?": "인증 확인 실패: 비밀번호를 틀리셨나요?",
     "Do you want to set an email address?": "이메일 주소를 설정하시겠어요?",
     "This will allow you to reset your password and receive notifications.": "이렇게 하면 비밀번호를 다시 설정하고 알림을 받을 수 있습니다.",
     "Skip": "건너뛰기",
-    "Start verification": "인증 시작",
-    "Share without verifying": "인증하지 않고 공유",
-    "Ignore request": "요청 무시하기",
-    "Encryption key request": "암호화 키 요청",
     "Edit": "편집",
     "Fetching third party location failed": "제 3자 위치를 가져오지 못함",
-    "A new version of Riot is available.": "Riot의 새 버전을 사용할 수 있습니다.",
     "All notifications are currently disabled for all targets.": "현재 모든 알림이 모든 대상에 대해 꺼져있습니다.",
     "Uploading report": "신고 업로드 중",
     "Sunday": "일요일",
@@ -452,8 +405,6 @@
     "Waiting for response from server": "서버에서 응답을 기다리는 중",
     "Leave": "떠나기",
     "Advanced notification settings": "고급 알림 설정",
-    "delete the alias.": "별칭을 삭제합니다.",
-    "To return to your account in future you need to <u>set a password</u>": "나중에 계정으로 돌아가려면 <u>비밀번호를 설정</u>해야 함",
     "Forget": "지우기",
     "World readable": "모두가 읽을 수 있음",
     "You cannot delete this image. (%(code)s)": "이 사진을 삭제할 수 없습니다. (%(code)s)",
@@ -479,7 +430,6 @@
     "Noisy": "소리",
     "Files": "파일",
     "Collecting app version information": "앱 버전 정보를 수집하는 중",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "방 별칭 %(alias)s을(를) 삭제하고 목록에서 %(name)s 방을 제거하겠습니까?",
     "Enable notifications for this account": "이 계정의 알림 사용하기",
     "Messages containing <span>keywords</span>": "<span>키워드</span>가 적힌 메시지",
     "Room not found": "방을 찾을 수 없음",
@@ -487,7 +437,7 @@
     "Enter keywords separated by a comma:": "키워드를 쉼표로 구분해 입력해주세요:",
     "Search…": "찾기…",
     "Remove %(name)s from the directory?": "목록에서 %(name)s 방을 제거하겠습니까?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot은 많은 고급 브라우저 기능을 사용합니다. 일부는 현재 브라우저에서 쓸 수 없거나 실험 상태입니다.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s은 많은 고급 브라우저 기능을 사용합니다. 일부는 현재 브라우저에서 쓸 수 없거나 실험 상태입니다.",
     "Developer Tools": "개발자 도구",
     "Unnamed room": "이름 없는 방",
     "Remove from Directory": "목록에서 제거",
@@ -523,20 +473,19 @@
     "Invite to this room": "이 방에 초대",
     "You cannot delete this message. (%(code)s)": "이 메시지를 삭제할 수 없습니다. (%(code)s)",
     "Thursday": "목요일",
-    "I understand the risks and wish to continue": "위험을 인지하고 계속하고 싶습니다",
+    "I understand the risks and wish to continue": "위험하다는 것을 이해했으며 계속하고 싶습니다",
     "Back": "돌아가기",
     "Failed to change settings": "설정 변경 실패",
     "Show message in desktop notification": "컴퓨터 알림에서 내용 보이기",
     "Unhide Preview": "미리 보기를 숨기지 않기",
     "Unable to join network": "네트워크에 들어갈 수 없음",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Riot이 아닌 다른 클라이언트에서 설정했을지도 모릅니다. Riot에서 바꿀 수는 없지만, 여전히 적용되어 있습니다",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "죄송합니다. 쓰고 계신 브라우저에서는 Riot를 사용할 수 <b>없습니다</b>.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "죄송합니다. 쓰고 계신 브라우저에서는 %(brand)s를 사용할 수 <b>없습니다</b>.",
     "Uploaded on %(date)s by %(user)s": "%(user)s님이 %(date)s에 업로드함",
     "Messages in group chats": "그룹 대화 메시지",
     "Yesterday": "어제",
     "Error encountered (%(errorDetail)s).": "오류가 일어났습니다 (%(errorDetail)s).",
     "Low Priority": "중요하지 않음",
-    "Riot does not know how to join a room on this network": "Riot이 이 네트워크에서 방에 참가하는 방법을 모름",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s이 이 네트워크에서 방에 참가하는 방법을 모름",
     "Set Password": "비밀번호 설정",
     "Off": "끄기",
     "Mentions only": "언급한 것만",
@@ -551,7 +500,6 @@
     "Unable to fetch notification target list": "알림 대상 목록을 가져올 수 없음",
     "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...": "업데이트를 확인하는 중...",
-    "There are advanced notifications which are not shown here": "여기에는 보이지 않는 고급 알림이 있습니다",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s님이 표시 이름을 %(displayName)s(으)로 바꿨습니다.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s가 방의 고정된 메시지를 바꿨습니다.",
     "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s이 이름을 %(count)s번 바꿨습니다",
@@ -562,7 +510,7 @@
     "%(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님이 아바타를 바꿨습니다",
-    "Data from an older version of Riot 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.": "이전 버전 Riot의 데이터가 감지됬습니다. 이 때문에 이전 버전에서 종단간 암호화가 작동하지 않을 수 있습니다. 이전 버전을 사용하면서 최근에 교환한 종단간 암호화 메시지를 이 버전에서는 복호화할 수 없습니다. 이 버전에서 메시지를 교환할 수 없을 수도 있습니다. 문제가 발생하면 로그아웃한 후 다시 로그인하세요. 메시지 기록을 유지하려면 키를 내보낸 후 다시 가져오세요.",
+    "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의 데이터가 감지됬습니다. 이 때문에 이전 버전에서 종단간 암호화가 작동하지 않을 수 있습니다. 이전 버전을 사용하면서 최근에 교환한 종단간 암호화 메시지를 이 버전에서는 복호화할 수 없습니다. 이 버전에서 메시지를 교환할 수 없을 수도 있습니다. 문제가 발생하면 로그아웃한 후 다시 로그인하세요. 메시지 기록을 유지하려면 키를 내보낸 후 다시 가져오세요.",
     "This event could not be displayed": "이 이벤트를 표시할 수 없음",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s(%(userName)s)님이 %(dateTime)s에 확인함",
     "Banned by %(displayName)s": "%(displayName)s님에 의해 출입 금지됨",
@@ -575,25 +523,18 @@
     "Showing flair for these communities:": "이 커뮤니티에 재능을 공개 중:",
     "This room is not showing flair for any communities": "이 방은 모든 커뮤니티에 재능을 공개하지 않음",
     "The platform you're on": "당신이 사용 중인 플랫폼",
-    "The version of Riot.im": "Riot.im 버전",
+    "The version of %(brand)s": "%(brand)s의 버전",
     "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": "Rich Text Editor의 Richtext mode를 사용하고 있는지 여부",
     "Your homeserver's URL": "당신의 홈서버 URL",
-    "Your identity server's URL": "당신의 ID 서버 URL",
     "e.g. %(exampleValue)s": "예시: %(exampleValue)s",
     "Every page you use in the app": "앱에서 이용하는 모든 페이지",
     "e.g. <CurrentPageURL>": "예시: <CurrentPageURL>",
-    "Your User Agent": "사용자 에이전트",
     "Your device resolution": "기기 해상도",
-    "The information being sent to us to help make Riot.im better includes:": "Riot.im을 발전시키기 위해 저희에게 보내는 정보는 다음을 포함합니다:",
+    "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.": "이 페이지에서 방, 사용자, 혹은 그룹 ID와 같은 식별 가능한 정보를 포함하는 부분이 있는 데이터는 서버에 보내지기 전에 제거됩니다.",
     "Call Failed": "전화 실패",
-    "Review Devices": "기기 검증하기",
-    "Call Anyway": "무시하고 걸기",
-    "Answer Anyway": "무시하고 받기",
-    "Call": "전화하기",
-    "Answer": "받기",
     "Call in Progress": "전화 거는 중",
     "A call is already in progress!": "이미 전화가 진행 중입니다!",
     "PM": "오후",
@@ -606,7 +547,6 @@
     "Which rooms would you like to add to this community?": "어떤 방을 이 커뮤니티에 추가하고 싶으세요?",
     "Show these rooms to non-members on the community page and room list?": "이 방을 커뮤니티 페이지와 방 목록에 있는 구성원이 아닌 사람들에게 공개할까요?",
     "Add rooms to the community": "커뮤니티에 방 추가하기",
-    "Room name or alias": "방 이름 또는 별칭",
     "Add to community": "커뮤니티에 추가하기",
     "Failed to invite the following users to %(groupId)s:": "다음 사용자를 %(groupId)s에 초대하지 못했습니다:",
     "Failed to invite users to community": "사용자를 커뮤니티에 초대하지 못했습니다",
@@ -628,8 +568,6 @@
     "%(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 위젯",
-    "Message removed by %(userId)s": "%(userId)s님에 의해 감춰진 메시지",
-    "Message removed": "메시지 감춰짐",
     "Remove from community": "커뮤니티에서 제거",
     "Remove this user from community?": "이 사용자를 커뮤니티에서 제거하겠습니까?",
     "Failed to remove user from community": "사용자를 커뮤니티에서 제거에 실패함",
@@ -677,11 +615,8 @@
     "Loading...": "로딩 중...",
     "Unpin Message": "메시지 고정 풀기",
     "No pinned messages.": "고정된 메시지가 없습니다.",
-    "Send a message (unencrypted)…": "(암호화 안 된) 메시지를 보내세요…",
     "Send an encrypted message…": "암호화된 메시지를 보내세요…",
     "Send an encrypted reply…": "암호화된 메시지를 보내세요…",
-    "Send a reply (unencrypted)…": "(암호화 안 된) 답장을 보내세요…",
-    "User Options": "사용자 옵션",
     "Share Link to User": "사용자에게 링크 공유",
     "Invite": "초대",
     "Mention": "언급",
@@ -748,7 +683,7 @@
     "Filter results": "필터 결과",
     "Filter community rooms": "커뮤니티 방 찾기",
     "Clear filter": "필터 지우기",
-    "Did you know: you can use communities to filter your Riot.im experience!": "그거 아세요: 커뮤니티로 Riot.im에서의 경험을 분류할 수 있어요!",
+    "Did you know: you can use communities to filter your %(brand)s experience!": "그거 아세요: 커뮤니티로 %(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.": "필터를 사용하려면, 커뮤니티 아바타를 화면 왼쪽의 필터 패널로 드래그하세요. 언제든지 필터 패널에 있는 아바타를 클릭해 커뮤니티와 관련된 방과 사람들만 볼 수 있습니다.",
     "Muted Users": "음소거된 사용자",
     "Delete Widget": "위젯 삭제",
@@ -759,7 +694,6 @@
     "Failed to remove the room from the summary of %(groupId)s": "%(groupId)s의 요약에서 방을 제거하는데 실패함",
     "Failed to remove a user from the summary of %(groupId)s": "%(groupId)s의 요약에 사용자를 제거하는데 실패함",
     "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>",
-    "Yes, I want to help!": "네, 돕고 싶어요!",
     "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를 통해 버그를 신고한다면, 디버그 로그가 문제를 해결하는데 도움을 줍니다. 디버그 로그에는 사용자 이름과 방문했던 방이나 그룹의 ID와 별칭, 그리고 다른 사용자의 사용자 이름이 포함됩니다. 대화 내용은 포함되지 않습니다.",
     "Delete widget": "위젯 삭제",
     "Minimize apps": "앱 최소화",
@@ -777,11 +711,8 @@
     "You must specify an event type!": "이벤트 종류를 지정해야 합니다!",
     "Send Custom Event": "맞춤 이벤트 보내기",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "응답한 이벤트를 불러오지 못했습니다, 존재하지 않거나 볼 수 있는 권한이 없습니다.",
-    "Light theme": "밝은 테마",
-    "Dark theme": "어두운 테마",
     "A text message has been sent to %(msisdn)s": "%(msisdn)s님에게 문자 메시지를 보냈습니다",
     "Something went wrong when trying to get your communities.": "커뮤니티를 받는 중 잘못되었습니다.",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "<UsageDataLink>익명의 이용자 데이터</UsageDataLink>를 보내 Riot.im을 개선하도록 도와주세요. 이 과정에서 쿠키를 사용합니다.",
     "Allow": "허용",
     "Visible to everyone": "모두에게 보여짐",
     "Only visible to community members": "커뮤니티 구성원에게만 보여짐",
@@ -876,8 +807,6 @@
     "Add users to the community summary": "커뮤니티 요약에 사용자 추가",
     "Who would you like to add to this summary?": "이 요약에 누구를 추가하겠습니까?",
     "Link to most recent message": "가장 최근 메시지로 연결",
-    "Registration Required": "계정 등록 필요",
-    "You need to register to do this. Would you like to register now?": "계정을 등록해야합니다. 지금 계정을 만드시겠습니까?",
     "This homeserver has hit its Monthly Active User limit.": "이 홈서버가 월 간 활성 사용자 수 한도를 초과했습니다.",
     "Please <a>contact your service administrator</a> to continue using the service.": "서비스를 계속 사용하려면 <a>서비스 관리자에게 연락</a>해주세요.",
     "Unable to connect to Homeserver. Retrying...": "홈서버에 연결할 수 없습니다. 다시 시도하는 중...",
@@ -890,14 +819,12 @@
     "Only room administrators will see this warning": "방 관리자만이 이 경고를 볼 수 있음",
     "This room is a continuation of another conversation.": "이 방은 다른 대화방의 연장선입니다.",
     "Click here to see older messages.": "여길 눌러 오래된 메시지를 보세요.",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "<UsageDataLink>익명의 이용자 데이터</UsageDataLink>를 보내 Riot.im을 개선하도록 도와주세요. 이 과정에서 쿠키를 사용합니다 (우리의 <PolicyLink>쿠키 정책</PolicyLink>을 살펴보세요).",
-    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "이 홈서버는 월 간 활성 사용자 수 한도를 초과했기 때문에 <b>일부 사용자는 로그인할 수 없습니다</b>.",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s이 %(count)s번 떠나고 다시 참가했습니다",
     "<a>In reply to</a> <pill>": "<a>관련 대화</a> <pill>",
     "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> 이후 이용자들은 불완전한 대화 목록을 볼 수 있을 겁니다)",
     "Explore Account Data": "계정 정보 탐색",
-    "Updating Riot": "Riot 업데이트 중",
+    "Updating %(brand)s": "%(brand)s 업데이트 중",
     "Upgrade this room to version %(version)s": "이 방을 %(version)s 버전으로 업그레이드",
     "Upgrade Room Version": "방 버전 업그레이드",
     "Create a new room with the same name, description and avatar": "이름, 설명, 아바타가 같은 새 방 만들기",
@@ -920,7 +847,6 @@
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "전화가 안정적으로 작동하도록 TURN 서버를 설정하려면 당신의 홈서버 (<code>%(homeserverDomain)s</code>) 관리자에게 물어보세요 .",
     "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를 사용해보세요",
-    "A conference call could not be started because the integrations server is not available": "통합 서버를 사용할 수 없기 때문에 회의 전화를 시작할 수 없습니다",
     "Replying With Files": "파일과 함께 답장하기",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "현재는 파일과 함께 답장할 수 없습니다. 답장 없이 파일을 업로드하는 것은 어떤가요?",
     "The file '%(fileName)s' failed to upload.": "'%(fileName)s' 파일 업로드에 실패했습니다.",
@@ -960,11 +886,6 @@
     "%(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에 대한 재능을 비활성화했습니다.",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s님이 이 방에서 %(oldGroups)s에 대한 재능을 비활성화하고 %(newGroups)s에 대한 재능을 활성화했습니다.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s님이 이 방의 주소로 %(addedAddresses)s을(를) 추가했습니다.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s님이 이 방의 주소로 %(addedAddresses)s을(를) 추가했습니다.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s님이 이 방의 주소인 %(removedAddresses)s을(를) 제거했습니다.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s님이 이 방의 주소인 %(removedAddresses)s을(를) 제거했습니다.",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s님이 이 방의 주소인 %(removedAddresses)s을(를) 제거하고 %(addedAddresses)s을(를) 추가했습니다.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s님이 이 방의 메인 주소를 %(address)s(으)로 설정했습니다.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s님이 이 방의 메인 주소를 제거했습니다.",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "방에 들어오라고 %(senderName)s님이 %(targetDisplayName)s님에게 보낸 초대를 취소했습니다.",
@@ -974,8 +895,8 @@
     "%(names)s and %(lastPerson)s are typing …": "%(names)s님과 %(lastPerson)s님이 적고 있습니다 …",
     "Cannot reach homeserver": "홈서버에 연결할 수 없습니다",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "인터넷 연결이 안정적인지 확인하세요, 또는 서버 관리자에게 연락하세요",
-    "Your Riot is misconfigured": "Riot이 잘못 설정됨",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Riot 관리자에게 <a>당신의 설정</a>에 잘못되거나 중복된 항목이 있는지 확인하도록 요청하세요.",
+    "Your %(brand)s is misconfigured": "%(brand)s이 잘못 설정됨",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "%(brand)s 관리자에게 <a>당신의 설정</a>에 잘못되거나 중복된 항목이 있는지 확인하도록 요청하세요.",
     "Cannot reach identity server": "ID 서버에 연결할 수 없습니다",
     "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.": "등록할 수 있지만 ID 서버가 다시 온라인 상태가 될 때까지 일부 기능을 사용할 수 없습니다. 이 경고가 계속 표시되면, 설정을 확인하거나 서버 관리자에게 연락하세요.",
     "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.": "비밀번호를 다시 설정할 수 있지만 ID 서버가 다시 온라인 상태가 될 때까지 일부 기능을 사용할 수 없습니다. 이 경고가 계속 표시되면, 설정을 확인하거나 서버 관리자에게 연락하세요.",
@@ -1106,8 +1027,6 @@
     "Allow Peer-to-Peer for 1:1 calls": "1:1 전화를 위해 P2P 허용",
     "Prompt before sending invites to potentially invalid matrix IDs": "잠재적으로 올바르지 않은 Matrix ID로 초대를 보내기 전에 확인",
     "Show developer tools": "개발 도구 보이기",
-    "Order rooms in the room list by most important first instead of most recent": "가장 최근에서 가장 중요한 순으로 방 목록에서 방을 정렬",
-    "Show recently visited rooms above the room list": "최근 방문한 방 순으로 방 목록에 보이기",
     "Show hidden events in timeline": "타임라인에서 숨겨진 이벤트 보이기",
     "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 주소가 공유됨)",
@@ -1175,9 +1094,9 @@
     "Deactivate account": "계정 비활성화",
     "Legal": "법적",
     "Credits": "크레딧",
-    "For help with using Riot, click <a>here</a>.": "Riot응 사용하다가 도움이 필요하다면, <a>여기</a>를 클릭하세요.",
-    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "Riot을 사용하다가 도움이 필요하다면, <a>여기</a>를 클릭하거나, 아래 버튼을 사용해 우리의 봇과 대화를 시작하세요.",
-    "Chat with Riot Bot": "Riot 봇과 대화",
+    "For help with using %(brand)s, click <a>here</a>.": "%(brand)s응 사용하다가 도움이 필요하다면, <a>여기</a>를 클릭하세요.",
+    "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>를 클릭하거나, 아래 버튼을 사용해 우리의 봇과 대화를 시작하세요.",
+    "Chat with %(brand)s Bot": "%(brand)s 봇과 대화",
     "Help & About": "도움 & 정보",
     "Bug reporting": "버그 신고하기",
     "FAQ": "자주 묻는 질문 (FAQ)",
@@ -1234,7 +1153,6 @@
     "Select the roles required to change various parts of the room": "방의 여러 부분을 변경하는 데 필요한 규칙을 선택",
     "Enable encryption?": "암호화를 켜겠습니까?",
     "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>",
-    "To link to this room, please add an alias.": "이 방에 연결하려면, 별칭을 추가해주세요.",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "기록을 읽을 수 있는 사람의 변경 사항은 이 방에서 오직 이후 메시지부터 적용됩니다. 존재하는 기록의 가시성은 변하지 않습니다.",
     "Encryption": "암호화",
     "Once enabled, encryption cannot be disabled.": "일단 켜면, 암호화는 끌 수 없습니다.",
@@ -1297,10 +1215,6 @@
     "Invited by %(sender)s": "%(sender)s님에게 초대받음",
     "Error updating main address": "기본 주소 업데이트 중 오류",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "방의 기본 주소를 업데이트하는 중 오류가 발생했습니다. 서버가 허용하지 않거나 일시적인 오류 발생일 수 있습니다.",
-    "Error creating alias": "별칭 만드는 중 오류",
-    "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "별칭을 만드는 중 오류가 발생했습니다. 서버가 허용하지 않거나 일시적인 오류 발생일 수 있습니다.",
-    "Error removing alias": "별칭 삭제 중 오류",
-    "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "별칭을 삭제하는 중 오류가 발생했습니다. 더 이상 존재하지 않거나 일시적인 오류 발생일 수 있습니다.",
     "Main address": "기본 주소",
     "Error updating flair": "재능 업데이트 중 오류",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "재능을 업데이트하는 중 오류가 발생했습니다. 서버가 허용하지 않거나 일시적인 오류 발생일 수 있습니다.",
@@ -1312,8 +1226,6 @@
     "Edited at %(date)s. Click to view edits.": "%(date)s에 편집함. 클릭해서 편집 보기.",
     "edited": "편집됨",
     "Failed to load group members": "그룹 구성원을 불러오는 데 실패함",
-    "Please <a>contact your service administrator</a> to get this limit increased.": "한도를 높이려면 <a>서비스 관리자와 연락</a>해주세요.",
-    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "이 홈서버는 리소스 한도를 초과했기 때문에 <b>일부 사용자는 로그인할 수 없습니다</b>.",
     "Maximize apps": "앱 최대화",
     "Join": "참가",
     "Yes": "네",
@@ -1347,28 +1259,19 @@
     "Unable to load commit detail: %(msg)s": "커밋 세부 정보를 불러올 수 없음: %(msg)s",
     "Removing…": "제거 중…",
     "Clear all data": "모든 데이터 지우기",
-    "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 Riot to do this": "대화 기록을 잃지 않으려면, 로그아웃하기 전에 방 키를 내보내야 합니다. 이 작업을 수행하려면 최신 버전의 Riot으로 가야 합니다",
-    "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ": "이전에 %(host)s에서 Riot의 최신 버전을 사용했습니다. 종단간 암호화로 이 버전을 다시 사용하려면, 로그아웃한 후 다시 로그인하세요. ",
+    "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으로 가야 합니다",
     "Incompatible Database": "호환하지 않는 데이터베이스",
     "Continue With Encryption Disabled": "암호화를 끈 채 계속하기",
     "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에서 메시지 가시성은 이메일과 유사합니다. 메시지를 지우면 보낸 메시지는 신규 또는 등록하지 않은 사용자와 공유되지 않습니다, 하지만 이미 메시지에 접근한 등록한 사용자는 그 사본에 여전히 접근할 수 있습니다.",
-    "Use Legacy Verification (for older clients)": "옛날 인증 방식 사용 (오래된 클라이언트 용)",
-    "Verify by comparing a short text string.": "짧은 문장을 비교하는 것으로 인증하기.",
-    "Begin Verifying": "인증 시작",
-    "Waiting for partner to accept...": "상대방이 수락하기를 기다리는 중...",
-    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "아무것도 안 나타나나요? 아직 모든 클라이언트가 상호작용 인증을 지원하지 않습니다. <button>옛날 인증 방식을 사용하세요</button>.",
-    "Waiting for %(userId)s to confirm...": "%(userId)s님이 확인하기를 기다리는 중...",
-    "Use two-way text verification": "양방향 문자 인증 사용",
     "Explore Room State": "방 상태 탐색",
     "View Servers in Room": "방에 있는 서버 보기",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "이 사용자를 신뢰할 수 있도록 인증합니다. 종단간 암호화 메시지를 사용할 때 사용자를 신뢰하면 안심이 듭니다.",
     "Waiting for partner to confirm...": "상대방이 확인하기를 기다리는 중...",
     "Incoming Verification Request": "수신 확인 요청",
-    "You've previously used Riot 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, Riot needs to resync your account.": "이전에 구성원의 불러오기 지연이 켜진 %(host)s에서 Riot을 사용했습니다. 이 버전에서 불러오기 지연은 꺼집니다. 로컬 캐시가 이 두 설정 간에 호환되지 않으므로, Riot은 계정을 다시 동기화 해야 합니다.",
-    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "다른 버전의 Riot이 다른 탭에서 열려있다면, 같은 호스트에서 불러오기 지연이 동시에 켜지고 꺼지면서 오류가 발생할 수 있으니 닫아주세요.",
+    "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.": "이전에 구성원의 불러오기 지연이 켜진 %(host)s에서 %(brand)s을 사용했습니다. 이 버전에서 불러오기 지연은 꺼집니다. 로컬 캐시가 이 두 설정 간에 호환되지 않으므로, %(brand)s은 계정을 다시 동기화 해야 합니다.",
     "Incompatible local cache": "호환하지 않는 로컬 캐시",
     "Clear cache and resync": "캐시를 지우고 다시 동기화",
-    "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Riot은 이제 필요할 때만 다른 사용자에 대한 정보를 불러와 메모리를 3배에서 5배 덜 잡아먹습니다. 서버와 다시 동기화하는 동안 기다려주세요!",
+    "%(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배 덜 잡아먹습니다. 서버와 다시 동기화하는 동안 기다려주세요!",
     "I don't want my encrypted messages": "저는 제 암호화된 메시지를 원하지 않아요",
     "Manually export keys": "수동으로 키 내보내기",
     "You'll lose access to your encrypted messages": "암호화된 메시지에 접근할 수 없게 됩니다",
@@ -1416,20 +1319,12 @@
     "Remember my selection for this widget": "이 위젯에 대해 내 선택 기억하기",
     "Deny": "거부",
     "Unable to load backup status": "백업 상태 불러올 수 없음",
-    "Recovery Key Mismatch": "복구 키가 맞지 않음",
-    "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "이 키로 백업을 복호화할 수 없음: 맞는 복구 키를 입력해서 인증해주세요.",
-    "Incorrect Recovery Passphrase": "맞지 않은 복구 암호",
-    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "이 암호로 백업을 복호화할 수 없음: 맞는 암호를 입력해서 입증해주세요.",
     "Unable to restore backup": "백업을 복구할 수 없음",
     "No backup found!": "백업을 찾을 수 없습니다!",
-    "Backup Restored": "백업 복구됨",
     "Failed to decrypt %(failedCount)s sessions!": "%(failedCount)s개의 세션 복호화에 실패했습니다!",
-    "Restored %(sessionCount)s session keys": "%(sessionCount)s개의 세션 키 복구됨",
-    "Enter Recovery Passphrase": "복구 암호 입력",
     "<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>할 수 있음",
-    "Enter Recovery Key": "복구 키 입력",
     "This looks like a valid recovery key!": "올바른 복구 키입니다!",
     "Not a valid recovery key": "올바르지 않은 복구 키",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "복구 키를 입력해서 보안 메시지 기록에 접근하고 보안 메시지 설정하기.",
@@ -1443,7 +1338,6 @@
     "Set a new status...": "새 상태를 설정...",
     "Hide": "숨기기",
     "This homeserver would like to make sure you are not a robot.": "이 홈서버는 당신이 로봇이 아닌지 확인하고 싶어합니다.",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "맞춤 서버 설정을 사용해 다른 홈서버 URL을 지정함으로써 다른 Matrix 서버에 로그인할 수 있습니다. 이를 통해 다른 홈서버의 기존 Matrix 계정으로 이 앱을 사용할 수 있습니다.",
     "Please review and accept all of the homeserver's policies": "모든 홈서버의 정책을 검토하고 수락해주세요",
     "Please review and accept the policies of this homeserver:": "이 홈서버의 정책을 검토하고 수락해주세요:",
     "Unable to validate homeserver/identity server": "홈서버/ID서버를 확인할 수 없음",
@@ -1493,8 +1387,8 @@
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "당신은 이 커뮤니티의 관리자입니다. 다른 관리자의 초대없이는 이 커뮤니티에 다시 참가할 수 없습니다.",
     "Want more than a community? <a>Get your own server</a>": "한 개 이상의 커뮤니티가 필요한가요? <a>자체 서버를 얻으세요</a>",
     "This homeserver does not support communities": "이 홈서버는 커뮤니티를 지원하지 않습니다",
-    "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot이 홈서버에서 프로토콜 얻기에 실패했습니다. 홈서버가 제 3자 네트워크를 지원하기에 너무 오래된 것 같습니다.",
-    "Riot failed to get the public room list.": "Riot이 공개 방 목록을 가져오는데 실패했습니다.",
+    "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s이 홈서버에서 프로토콜 얻기에 실패했습니다. 홈서버가 제 3자 네트워크를 지원하기에 너무 오래된 것 같습니다.",
+    "%(brand)s failed to get the public room list.": "%(brand)s이 공개 방 목록을 가져오는데 실패했습니다.",
     "The homeserver may be unavailable or overloaded.": "홈서버를 이용할 수 없거나 과부화된 상태입니다.",
     "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>해주세요.",
     "Add room": "방 추가",
@@ -1541,34 +1435,18 @@
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "계정에 로그인할 수 없습니다. 자세한 정보는 홈서버 관리자에게 연락하세요.",
     "You're signed out": "로그아웃됬습니다",
     "Clear personal data": "개인 정보 지우기",
-    "Great! This passphrase looks strong enough.": "멋져요! 이 암호는 충분히 강합니다.",
-    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "우리의 서버에 암호화된 키의 사본을 저장합니다. 보안을 유지하기 위해 백업을 암호로 보호하세요.",
     "For maximum security, this should be different from your account password.": "보안을 최대화하려면, 암호는 계정 비밀번호와 달라야 할 것입니다.",
-    "Enter a passphrase...": "암호를 입력하세요...",
-    "Set up with a Recovery Key": "복구 키로 설정",
     "That matches!": "맞습니다!",
     "That doesn't match.": "맞지 않습니다.",
     "Go back to set it again.": "돌아가서 다시 설정하기.",
-    "Please enter your passphrase a second time to confirm.": "확인하기 위해 비밀번호를 다시 입력해주세요.",
-    "Repeat your passphrase...": "암호를 다시 입력하세요...",
-    "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "안전망처럼, 복구 암호를 잊어버렸다면 복구 키를 사용해 암호화된 메시지 기록을 복구할 수 있습니다.",
-    "As a safety net, you can use it to restore your encrypted message history.": "안전망처럼, 복구 암호를 사용해 암호화된 메시지 기록을 복구할 수 있습니다.",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "복구 키는 안전망과 같습니다 - 복구 암호를 잊어버렸다면 복구 키를 사용해 암호화된 메시지에 접근할 수 있습니다.",
-    "Your Recovery Key": "당신의 복구 키",
-    "Copy to clipboard": "클립보드로 복사",
     "Download": "다운로드",
     "<b>Print it</b> and store it somewhere safe": "<b>인쇄</b>한 후 안전한 장소에 보관",
     "<b>Save it</b> on a USB key or backup drive": "USB 키나 백업 드라이브에 <b>저장</b>",
     "<b>Copy it</b> to your personal cloud storage": "개인 클라우드 저장소에 <b>복사</b>",
     "Your keys are being backed up (the first backup could take a few minutes).": "키를 백업했습니다 (처음 백업에는 시간이 걸릴 수 있습니다).",
     "Set up Secure Message Recovery": "보안 메시지 복구 설정",
-    "Secure your backup with a passphrase": "암호로 백업 보호",
-    "Confirm your passphrase": "암호 확인",
-    "Recovery key": "복구 키",
-    "Keep it safe": "안전하게 유지하세요",
     "Starting backup...": "백업 시작 중...",
     "Success!": "성공!",
-    "Create Key Backup": "키 백업 만들기",
     "Unable to create key backup": "키 백업을 만들 수 없음",
     "Retry": "다시 시도",
     "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "보안 메시지 복구를 설정하지 않으면, 로그아웃할 때 보안 메시지 기록을 잃게 됩니다.",
@@ -1591,10 +1469,10 @@
     "Sends a message as plain text, without interpreting it as markdown": "일반 문자로 메시지를 보냅니다, 마크다운으로 해석하지 않습니다",
     "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)가 반환됬습니다. 이 정보를 방 관리자에게 전달할 수 있습니다.",
     "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "당신의 계정과 관계없는 %(email)s님으로 %(roomName)s으로의 초대를 보냈습니다",
-    "Link this email with your account in Settings to receive invites directly in Riot.": "설정에서 이 이메일을 계정에 연결하면 Riot에서 직접 초대를 받을 수 있습니다.",
+    "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": "%(roomName)s으로의 초대가 %(email)s(으)로 보내졌습니다",
-    "Use an identity server in Settings to receive invites directly in Riot.": "설정에서 ID 서버를 사용해 Riot에서 직접 초대를 받을 수 있습니다.",
-    "Share this email in Settings to receive invites directly in Riot.": "설정에서 이 이메일을 공유해서 Riot에서 직접 초대를 받을 수 있습니다.",
+    "Use an identity server in Settings to receive invites directly in %(brand)s.": "설정에서 ID 서버를 사용해 %(brand)s에서 직접 초대를 받을 수 있습니다.",
+    "Share this email in Settings to receive invites directly in %(brand)s.": "설정에서 이 이메일을 공유해서 %(brand)s에서 직접 초대를 받을 수 있습니다.",
     "Error changing power level": "권한 등급 변경 중 오류",
     "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "사용자의 권한 등급을 변경하는 중 오류가 발생했습니다. 변경할 수 있는 권한이 있는 지 확인한 후 다시 시도하세요.",
     "Bold": "굵게",
@@ -1636,13 +1514,8 @@
     "Read Marker lifetime (ms)": "이전 대화 경계선 표시 시간 (ms)",
     "Read Marker off-screen lifetime (ms)": "이전 대화 경계선 사라지는 시간 (ms)",
     "Changes the avatar of the current room": "현재 방의 아바타 변경하기",
-    "Room alias": "방 별칭",
     "e.g. my-room": "예: my-room",
-    "Please provide a room alias": "방 별칭을 제공해주세요",
-    "This alias is available to use": "이 별칭은 사용할 수 있습니다",
-    "This alias is already in use": "이 별칭은 이미 사용 중입니다",
     "Please enter a name for the room": "방 이름을 입력해주세요",
-    "Set a room alias to easily share your room with other people.": "다른 사람들과 방을 쉽게 공유할 수 있도록 방 별칭을 설정하세요.",
     "This room is private, and can only be joined by invitation.": "이 방은 개인입니다, 오직 초대로만 참가할 수 있습니다.",
     "Create a public room": "공개 방 만들기",
     "Create a private room": "개인 방 만들기",
@@ -1725,7 +1598,6 @@
     "Error adding ignored user/server": "무시한 사용자/서버 추가 중 오류",
     "Something went wrong. Please try again or view your console for hints.": "무언가 잘못되었습니다. 다시 시도하거나 콘솔을 통해 원인을 알아봐주세요.",
     "Error subscribing to list": "목록으로 구독하는 중 오류",
-    "Please verify the room ID or alias and try again.": "방 ID나 별칭을 확인한 후 다시 시도해주세요.",
     "Error removing ignored user/server": "무시한 사용자/서버를 지우는 중 오류",
     "Error unsubscribing from list": "목록에서 구독 해제 중 오류",
     "Please try again or view your console for hints.": "다시 시도하거나 콘솔을 통해 원인을 알아봐주세요.",
@@ -1740,7 +1612,7 @@
     "View rules": "규칙 보기",
     "You are currently subscribed to:": "현재 구독 중임:",
     "⚠ These settings are meant for advanced users.": "⚠ 이 설정은 고급 사용자를 위한 것입니다.",
-    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "무시하고 싶은 사용자와 서버를 여기에 추가하세요. 별표(*)를 사용해서 Riot이 이름과 문자를 맞춰볼 수 있습니다. 예를 들어, <code>@bot:*</code>이라면 모든 서버에서 'bot'이라는 문자를 가진 이름의 모든 사용자를 무시합니다.",
+    "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>이라면 모든 서버에서 'bot'이라는 문자를 가진 이름의 모든 사용자를 무시합니다.",
     "Custom (%(level)s)": "맞춤 (%(level)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.": "차단당하는 사람은 규칙에 따라 차단 목록을 통해 무시됩니다. 차단 목록을 구독하면 그 목록에서 차단당한 사용자/서버를 당신으로부터 감추게됩니다.",
     "Personal ban list": "개인 차단 목록",
@@ -1750,7 +1622,6 @@
     "Subscribed lists": "구독 목록",
     "Subscribing to a ban list will cause you to join it!": "차단 목록을 구독하면 차단 목록에 참여하게 됩니다!",
     "If this isn't what you want, please use a different tool to ignore users.": "이것을 원한 것이 아니라면, 사용자를 무시하는 다른 도구를 사용해주세요.",
-    "Room ID or alias of ban list": "방 ID 또는 차단 목록의 별칭",
     "Subscribe": "구독",
     "Trusted": "신뢰함",
     "Not trusted": "신뢰하지 않음",
@@ -1765,33 +1636,27 @@
     "Your avatar URL": "당신의 아바타 URL",
     "Your user ID": "당신의 사용자 ID",
     "Your theme": "당신의 테마",
-    "Riot URL": "Riot URL",
+    "%(brand)s URL": "%(brand)s URL",
     "Room ID": "방 ID",
     "Widget ID": "위젯 ID",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "이 위젯을 사용하면 <helpcon /> %(widgetDomain)s & 통합 관리자와 데이터를 공유합니다.",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "이 위젯을 사용하면 <helpIcon /> %(widgetDomain)s와(과) 데이터를 공유합니다.",
     "Widget added by": "위젯을 추가했습니다",
     "This widget may use cookies.": "이 위젯은 쿠키를 사용합니다.",
-    "Enable local event indexing and E2EE search (requires restart)": "로컬 이벤트 인덱싱 및 종단간 암호화 켜기 (다시 시작해야 합니다)",
     "Decline (%(counter)s)": "거절 (%(counter)s)",
     "Connecting to integration manager...": "통합 관리자로 연결 중...",
     "Cannot connect to integration manager": "통합 관리자에 연결할 수 없음",
     "The integration manager is offline or it cannot reach your homeserver.": "통합 관리자가 오프라인이거나 당신의 홈서버에서 접근할 수 없습니다.",
-    "The version of Riot": "Riot의 버전",
-    "Whether you're using Riot on a device where touch is the primary input mechanism": "터치가 기본 입력 방식인 기기에서 Riot을 사용하는지 여부",
-    "Whether you're using Riot as an installed Progressive Web App": "Riot을 설치형 프로그레시브 웹 앱으로 사용하는지 여부",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "터치가 기본 입력 방식인 기기에서 %(brand)s을 사용하는지 여부",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "%(brand)s을 설치형 프로그레시브 웹 앱으로 사용하는지 여부",
     "Your user agent": "사용자 에이전트",
-    "The information being sent to us to help make Riot better includes:": "Riot을 개선하기 위해 당사에 전송되는 정보에는 다음과 같은 것들이 포함됩니다:",
-    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "이 방에는 알 수 없는 세션들이 있습니다: 검증 없이 진행하면 누군가 당신의 전화를 도청할 수도 있습니다.",
     "If you cancel now, you won't complete verifying the other user.": "지금 취소하면 다른 사용자 확인이 완료될 수 없습니다.",
     "If you cancel now, you won't complete verifying your other session.": "지금 취소하면 당신의 다른 세션을 검증할 수 없습니다.",
-    "If you cancel now, you won't complete your secret storage operation.": "지금 취소하면 보안 저장 작업을 완료할 수 없습니다.",
     "Cancel entering passphrase?": "암호 입력을 취소하시겠습니까?",
     "Setting up keys": "키 설정",
     "Verify this session": "이 세션 검증",
     "Encryption upgrade available": "암호화 업그레이드 가능",
     "Set up encryption": "암호화 설정",
-    "Unverified session": "검증되지 않은 세션",
     "Error upgrading room": "방 업그레이드 오류",
     "Double check that your server supports the room version chosen and try again.": "서버가 선택한 방 버전을 지원하는지 확인한 뒤에 다시 시도해주세요.",
     "Verifies a user, session, and pubkey tuple": "사용자, 세션, 공개키 튜플을 검증합니다",
@@ -1799,5 +1664,7 @@
     "Session already verified!": "이미 검증된 세션입니다!",
     "WARNING: Session already verified, but keys do NOT MATCH!": "경고: 이미 검증된 세션이지만 키가 일치하지 않습니다!",
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "경고: 키 검증 실패! 제공된 키인 \"%(fingerprint)s\"가 사용자 %(userId)s와 %(deviceId)s 세션의 서명 키인 \"%(fprint)s\"와 일치하지 않습니다. 이는 통신이 탈취되고 있는 중일 수도 있다는 뜻입니다!",
-    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "사용자 %(userId)s의 세션 %(deviceId)s에서 받은 서명 키와 당신이 제공한 서명 키가 일치합니다. 세션이 검증되었습니다."
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "사용자 %(userId)s의 세션 %(deviceId)s에서 받은 서명 키와 당신이 제공한 서명 키가 일치합니다. 세션이 검증되었습니다.",
+    "Show more": "더 보기",
+    "Changing password will currently reset any end-to-end encryption keys on all sessions, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "비밀번호를 변경한다면 방의 암호화 키를 내보낸 후 다시 가져오지 않는 이상 모든 종단간 암호화 키는 초기화 될 것이고, 암호화된 대화 내역은 읽을 수 없게 될 것입니다. 이 문제는 추후에 개선될 것입니다."
 }
diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index 2652433075..9bdbb7a6f7 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -3,19 +3,17 @@
     "This phone number is already in use": "Šis telefono numeris jau naudojamas",
     "Failed to verify email address: make sure you clicked the link in the email": "Nepavyko patvirtinti el. pašto adreso: įsitikinkite, kad paspaudėte nuorodą el. laiške",
     "The platform you're on": "Jūsų naudojama platforma",
-    "The version of Riot.im": "Riot.im versija",
+    "The version of %(brand)s": "%(brand)s versija",
     "Your language of choice": "Jūsų pasirinkta kalba",
     "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": "Nepriklausomai nuo to ar jūs naudojate Raiškiojo Teksto Redaktoriaus Raiškiojo Teksto režimą",
+    "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",
-    "Your identity server's URL": "Jūsų tapatybės serverio URL",
     "Analytics": "Statistika",
-    "The information being sent to us to help make Riot.im better includes:": "Informacija, siunčiama mums, kad padėtų tobulinti Riot.im, apima:",
+    "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",
-    "A new version of Riot is available.": "Yra prieinama nauja Riot versija.",
-    "I understand the risks and wish to continue": "Aš suprantu riziką ir noriu tęsti",
+    "I understand the risks and wish to continue": "Suprantu šią riziką ir noriu tęsti",
     "Send Account Data": "Siųsti paskyros duomenis",
-    "Advanced notification settings": "Sudėtingesni pranešimų nustatymai",
+    "Advanced notification settings": "Išplėstiniai pranešimų nustatymai",
     "Uploading report": "Išsiunčiama ataskaita",
     "Sunday": "Sekmadienis",
     "Guests can join": "Svečiai gali prisijungti",
@@ -36,28 +34,26 @@
     "Send Custom Event": "Siųsti pasirinktinį įvykį",
     "All notifications are currently disabled for all targets.": "Šiuo metu visi pranešimai visiems objektams yra išjungti.",
     "Operation failed": "Operacija nepavyko",
-    "delete the alias.": "ištrinti slapyvardį.",
-    "To return to your account in future you need to <u>set a password</u>": "Ateityje, norėdami grįžti prie savo paskyros turite <u>nusistatyti slaptažodį</u>",
     "Forget": "Pamiršti",
     "World readable": "Visiems skaitomas",
     "Mute": "Nutildyti",
-    "You cannot delete this image. (%(code)s)": "Jūs negalite ištrinti šio paveikslėlio. (%(code)s)",
+    "You cannot delete this image. (%(code)s)": "Jūs negalite ištrinti šio vaizdo. (%(code)s)",
     "Cancel Sending": "Atšaukti siuntimą",
     "Warning": "Įspėjimas",
     "This Room": "Šis pokalbių kambarys",
     "Resend": "Siųsti iš naujo",
     "Room not found": "Kambarys nerastas",
     "Downloading update...": "Atsiunčiamas atnaujinimas...",
-    "Messages in one-to-one chats": "Žinutės asmeniniuose pokalbiuose",
+    "Messages in one-to-one chats": "Žinutės privačiuose pokalbiuose",
     "Unavailable": "Neprieinamas",
-    "Error saving email notification preferences": "Klaida, įrašant pranešimų el. paštu nuostatas",
+    "Error saving email notification preferences": "Klaida išsaugant pranešimų el. paštu 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": "Svarbūs",
+    "Favourite": "Favoritai",
     "All Rooms": "Visi pokalbių kambariai",
     "Explore Room State": "Peržiūrėti kambario būseną",
     "Source URL": "Šaltinio URL adresas",
@@ -65,28 +61,27 @@
     "Cancel": "Atšaukti",
     "Filter results": "Išfiltruoti rezultatus",
     "Members": "Nariai",
-    "No update available.": "Nėra prieinamų atnaujinimų.",
+    "No update available.": "Nėra galimų atnaujinimų.",
     "Noisy": "Triukšmingas",
     "Collecting app version information": "Renkama programėlės versijos informacija",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Ar ištrinti kambarį %(alias)s ir %(name)s kambario pavadinimą iš katalogo?",
     "Keywords": "Raktažodžiai",
     "Unpin Message": "Atsegti žinutę",
     "Enable notifications for this account": "Įjungti pranešimus šiai paskyrai",
-    "Remove": "Šalinti",
+    "Remove": "Pašalinti",
     "Invite to this community": "Pakviesti į šią bendruomenę",
     "Messages containing <span>keywords</span>": "Žinutės, kuriose yra <span>raktažodžiai</span>",
-    "When I'm invited to a room": "Kai aš esu pakviestas į pokalbių kambarį",
+    "When I'm invited to a room": "Kai mane pakviečia į kambarį",
     "Tuesday": "Antradienis",
     "Enter keywords separated by a comma:": "Įveskite kableliais atskirtus raktažodžius:",
     "Search…": "Paieška…",
     "You have successfully set a password and an email address!": "Jūs sėkmingai įrašėte slaptažodį ir el. pašto adresą!",
     "Remove %(name)s from the directory?": "Ar ištrinti %(name)s iš katalogo?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot naudoja daug išplėstinių naršyklės funkcionalumų, kai kurie iš jų yra neprieinami ar eksperimentinei Jūsų naršyklėje.",
+    "%(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",
     "Explore Account Data": "Peržiūrėti paskyros duomenis",
-    "Remove from Directory": "Š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.",
@@ -103,7 +98,7 @@
     "Search": "Ieškoti",
     "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 pašalinti pokalbių kambario %(errCode)s",
+    "Failed to forget room %(errCode)s": "Nepavyko pamiršti kambario %(errCode)s",
     "What's New": "Kas naujo",
     "Wednesday": "Trečiadienis",
     "Send": "Siųsti",
@@ -111,8 +106,8 @@
     "Send logs": "Siųsti žurnalus",
     "All messages": "Visos žinutės",
     "unknown error code": "nežinomas klaidos kodas",
-    "Call invitation": "Pakvietimas skambinant",
-    "Messages containing my display name": "Žinutės, kuriose paminėtas mano vardas",
+    "Call invitation": "Skambučio pakvietimas",
+    "Messages containing my display name": "Žinutės, kuriose yra mano rodomas vardas",
     "State Key": "Būklės raktas",
     "Failed to send custom event.": "Nepavyko išsiųsti pasirinktinio įvykio.",
     "What's new?": "Kas naujo?",
@@ -131,31 +126,30 @@
     "Reply": "Atsakyti",
     "Show message in desktop notification": "Rodyti žinutes darbalaukio pranešimuose",
     "Reject": "Atmesti",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Jūs turbūt juos sukonfigūravote kitoje programėlėje nei Riot. Negalite jų koreguoti Riot programėlėje, bet jie vistiek yra taikomi",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Atleiskite, jūsų naršyklė <b>negali</b> paleisti Riot.",
-    "Quote": "Citata",
+    "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",
     "Yesterday": "Vakar",
     "Error encountered (%(errorDetail)s).": "Susidurta su klaida (%(errorDetail)s).",
-    "Low Priority": "Nesvarbūs",
-    "Riot does not know how to join a room on this network": "Riot nežino kaip prisijungti prie kambario šiame tinkle",
+    "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.": "Įrašant pranešimų el. paštu nuostatas, įvyko klaida.",
+    "An error occurred whilst saving your email notification preferences.": "Išsaugant pranešimų el. paštu nuostatas, įvyko klaida.",
     "Unable to join network": "Nepavyko prisijungti prie tinklo",
     "Register": "Registruotis",
     "Off": "Išjungta",
     "Edit": "Koreguoti",
     "Mentions only": "Tik paminėjimai",
-    "remove %(name)s from the directory.": "šalinti %(name)s iš katalogo.",
+    "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 pranešimus el. paštu",
+    "Enable email notifications": "Įjungti el. pašto pranešimus",
     "Event Type": "Įvykio tipas",
     "No rooms to show": "Nėra kambarių rodymui",
     "Add rooms to this community": "Įtraukti kambarius į šią bendruomenę",
     "Pin Message": "Prisegti žinutę",
     "Failed to change settings": "Nepavyko pakeisti nustatymų",
-    "Leave": "Atsijungti",
+    "Leave": "Išeiti",
     "View Community": "Peržiūrėti bendruomenes",
     "Developer Tools": "Programuotojo įrankiai",
     "Unhide Preview": "Rodyti paržiūrą",
@@ -164,19 +158,13 @@
     "Thank you!": "Ačiū!",
     "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!": "Naudojant šią naršyklę aplikacija gali atrodyti ir reaguoti neteisingai. Kai kurios arba visos funkcijos gali neveikti. Jei vis tiek norite pabandyti gali tęsti, tačiau iškilusios problemos yra jūsų pačių reikalas!",
     "Checking for an update...": "Tikrinama ar yra atnaujinimų...",
-    "There are advanced notifications which are not shown here": "Yra išplėstinių pranešimų, kurie nėra čia rodomi",
     "e.g. %(exampleValue)s": "pvz., %(exampleValue)s",
     "e.g. <CurrentPageURL>": "pvz., <CurrentPageURL>",
     "Your device resolution": "Jūsų įrenginio raiška",
     "Call Failed": "Skambutis nepavyko",
-    "Call Anyway": "Vis tiek skambinti",
-    "Answer Anyway": "Vis tiek atsiliepti",
-    "Call": "Skambinti",
-    "Answer": "Atsiliepti",
     "Unable to capture screen": "Nepavyko nufotografuoti ekrano",
     "You are already in a call.": "Jūs jau dalyvaujate skambutyje.",
     "VoIP is unsupported": "VoIP yra nepalaikoma",
-    "Could not connect to the integration server": "Nepavyko prisijungti prie integracijos serverio",
     "Permission Required": "Reikalingas leidimas",
     "Upload Failed": "Įkėlimas nepavyko",
     "Sun": "Sek",
@@ -214,12 +202,11 @@
     "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:",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot neturi leidimo siųsti jums pranešimus - patikrinkite savo naršyklės nustatymus",
-    "Riot was not given permission to send notifications - please try again": "Riot nebuvo suteiktas leidimas siųsti pranešimus - bandykite dar kartą",
-    "Unable to enable Notifications": "Nepavyko įjungti Pranešimus",
+    "%(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",
     "Admin": "Administratorius",
-    "Start a chat": "Pradėti pokalbį",
     "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ę.",
@@ -239,24 +226,23 @@
     "Reason": "Priežastis",
     "%(targetName)s accepted an invitation.": "%(targetName)s priėmė pakvietimą.",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s pakvietė %(targetName)s.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s pakeitė savo vardą į %(displayName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s nustatė savo vardą į %(displayName)s.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s pašalino savo vardą (%(oldDisplayName)s).",
+    "%(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ą.",
     "%(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.",
-    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s išsiuntė paveikslą.",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s išsiuntė vaizdą.",
     "Someone": "Kažkas",
     "%(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į.",
-    "Send anyway": "Vis tiek siųsti",
     "Unnamed Room": "Bevardis kambarys",
-    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Rodyti laiko žymas 12 valandų formatu (pvz., 2:30pm)",
-    "Always show message timestamps": "Visada rodyti žinučių laiko žymas",
+    "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",
     "Decline": "Atmesti",
@@ -275,44 +261,37 @@
     "Current password": "Dabartinis slaptažodis",
     "Password": "Slaptažodis",
     "New Password": "Naujas slaptažodis",
-    "Device ID": "Įrenginio ID",
     "Failed to set display name": "Nepavyko nustatyti rodomo vardo",
-    "Disable Notifications": "Išjungti pranešimus",
-    "Enable Notifications": "Įjungti pranešimus",
     "Cannot add any more widgets": "Nepavyksta pridėti daugiau valdiklių",
     "Add a widget": "Pridėti valdiklį",
     "Drop File Here": "Vilkite failą čia",
     "Drop file here to upload": "Norėdami įkelti, vilkite failą čia",
     " (unsupported)": " (nepalaikoma)",
-    "%(senderName)s sent an image": "%(senderName)s išsiuntė paveikslą",
+    "%(senderName)s sent an image": "%(senderName)s išsiuntė vaizdą",
     "%(senderName)s sent a video": "%(senderName)s išsiuntė vaizdo įrašą",
     "%(senderName)s uploaded a file": "%(senderName)s įkėlė failą",
-    "Options": "Parametrai",
+    "Options": "Parinktys",
     "Key request sent.": "Rakto užklausa išsiųsta.",
-    "device id: ": "įrenginio id: ",
     "Failed to mute user": "Nepavyko nutildyti naudotoją",
     "Are you sure?": "Ar tikrai?",
     "Ignore": "Ignoruoti",
     "Invite": "Pakviesti",
-    "User Options": "Naudotojo parametrai",
     "Admin Tools": "Administratoriaus įrankiai",
     "Attachment": "Priedas",
     "Voice call": "Balso skambutis",
     "Video call": "Vaizdo skambutis",
     "Upload file": "Įkelti failą",
     "Send an encrypted reply…": "Siųsti šifruotą atsakymą…",
-    "Send a reply (unencrypted)…": "Siųsti atsakymą (nešifruotą)…",
     "Send an encrypted message…": "Siųsti šifruotą žinutę…",
-    "Send a message (unencrypted)…": "Siųsti žinutę (nešifruotą)…",
     "Server error": "Serverio klaida",
     "Command error": "Komandos klaida",
     "Loading...": "Įkeliama...",
     "Pinned Messages": "Prisegtos žinutės",
     "Unknown": "Nežinoma",
-    "Save": "Įrašyti",
+    "Save": "Išsaugoti",
     "(~%(count)s results)|other": "(~%(count)s rezultatų(-ai))",
     "(~%(count)s results)|one": "(~%(count)s rezultatas)",
-    "Upload avatar": "Įkelti avatarą",
+    "Upload avatar": "Įkelti pseudoportretą",
     "Settings": "Nustatymai",
     "Community Invites": "Bendruomenės pakvietimai",
     "%(roomName)s does not exist.": "%(roomName)s neegzistuoja.",
@@ -324,11 +303,9 @@
     "Anyone who knows the room's link, including guests": "Bet kas, žinantis kambario nuorodą, įskaitant svečius",
     "Anyone": "Bet kas",
     "Permissions": "Leidimai",
-    "Advanced": "Sudėtingesni nustatymai",
+    "Advanced": "Išplėstiniai",
     "Add a topic": "Pridėti temą",
-    "Local addresses for this room:": "Vietiniai šio kambario adresai:",
     "This room has no local addresses": "Šis kambarys neturi jokių vietinių adresų",
-    "New address (e.g. #foo:%(localDomain)s)": "Naujas adresas (pvz., #betkoks:%(localDomain)s)",
     "Invalid community ID": "Neteisingas bendruomenės ID",
     "'%(groupId)s' is not a valid community ID": "\"%(groupId)s\" nėra teisingas bendruomenės ID",
     "New community ID (e.g. +foo:%(localDomain)s)": "Naujas bendruomenės ID (pvz., +betkoks:%(localDomain)s)",
@@ -337,13 +314,10 @@
     "Error decrypting attachment": "Klaida iššifruojant priedą",
     "Decrypt %(text)s": "Iššifruoti %(text)s",
     "Download %(text)s": "Atsisiųsti %(text)s",
-    "Error decrypting image": "Klaida iššifruojant paveikslą",
+    "Error decrypting image": "Klaida iššifruojant vaizdą",
     "Error decrypting video": "Klaida iššifruojant vaizdo įrašą",
     "Copied!": "Nukopijuota!",
     "Failed to copy": "Nepavyko nukopijuoti",
-    "Message removed by %(userId)s": "Žinutę pašalino %(userId)s",
-    "Message removed": "Žinutė pašalinta",
-    "To continue, please enter your password.": "Norėdami tęsti, įveskite savo slaptažodį.",
     "An email has been sent to %(emailAddress)s": "El. laiškas buvo išsiųstas į %(emailAddress)s",
     "Please check your email to continue registration.": "Norėdami tęsti registraciją, patikrinkite savo el. paštą.",
     "A text message has been sent to %(msisdn)s": "Tekstinė žinutė buvo išsiųsta į %(msisdn)s",
@@ -353,34 +327,31 @@
     "The phone number field must not be blank.": "Telefono numerio laukas negali būti tuščias.",
     "The password field must not be blank.": "Slaptažodžio laukas negali būti tuščias.",
     "Email address": "El. pašto adresas",
-    "Remove from community": "Šalinti iš bendruomenės",
-    "Remove this user from community?": "Šalinti šį naudotoją iš bendruomenės?",
-    "Failed to remove user from community": "Nepavyko pašalinti naudotoją iš bendruomenės",
+    "Remove from community": "Pašalinti iš bendruomenės",
+    "Remove this user from community?": "Pašalinti šį vartotoją iš bendruomenės?",
+    "Failed to remove user from community": "Nepavyko pašalinti vartotojo iš bendruomenės",
     "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Ar tikrai norite pašalinti \"%(roomName)s\" iš %(groupId)s?",
-    "Failed to remove room from community": "Nepavyko pašalinti kambarį iš bendruomenės",
+    "Failed to remove room from community": "Nepavyko pašalinti kambario iš bendruomenės",
     "Failed to remove '%(roomName)s' from %(groupId)s": "Nepavyko pašalinti \"%(roomName)s\" iš %(groupId)s",
     "Something went wrong!": "Kažkas nutiko!",
     "Visibility in Room List": "Matomumas kambarių sąraše",
     "Visible to everyone": "Matomas visiems",
-    "Yes, I want to help!": "Taip, aš noriu padėti!",
     "Unknown Address": "Nežinomas adresas",
     "Allow": "Leisti",
     "Delete Widget": "Ištrinti valdiklį",
     "Delete widget": "Ištrinti valdiklį",
-    "Failed to remove widget": "Nepavyko pašalinti valdiklį",
-    "Scroll to bottom of page": "Slinkti į puslapio apačią",
+    "Failed to remove widget": "Nepavyko pašalinti valdiklio",
     "%(count)s of your messages have not been sent.|other": "Kai kurios iš jūsų žinučių nebuvo išsiųstos.",
     "%(count)s of your messages have not been sent.|one": "Jūsų žinutė nebuvo išsiųsta.",
     "Connectivity to the server has been lost.": "Jungiamumas su šiuo serveriu buvo prarastas.",
     "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?": "Atrodo, kad jūs įkelinėjate failus, ar tikrai norite išeiti?",
-    "You seem to be in a call, are you sure you want to quit?": "Atrodo, kad dalyvaujate skambutyje, ar tikrai norite išeiti?",
+    "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 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 :(",
     "No more results": "Daugiau nėra jokių rezultatų",
-    "Unknown room %(roomId)s": "Nežinomas kambarys %(roomId)s",
     "Room": "Kambarys",
     "Failed to reject invite": "Nepavyko atmesti pakvietimo",
     "Fill screen": "Užpildyti ekraną",
@@ -392,14 +363,12 @@
     "Uploading %(filename)s and %(count)s others|other": "Įkeliamas %(filename)s ir dar %(count)s failai",
     "Uploading %(filename)s and %(count)s others|zero": "Įkeliamas %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Įkeliamas %(filename)s ir dar %(count)s failas",
-    "Light theme": "Šviesi tema",
-    "Dark theme": "Tamsi tema",
     "Success": "Pavyko",
-    "Unable to remove contact information": "Nepavyko pašalinti kontaktinę informaciją",
+    "Unable to remove contact information": "Nepavyko pašalinti kontaktinės informacijos",
     "<not supported>": "<nepalaikoma>",
     "Check for update": "Tikrinti, ar yra atnaujinimų",
     "Reject all %(invitedRooms)s invites": "Atmesti visus %(invitedRooms)s pakvietimus",
-    "You may need to manually permit Riot to access your microphone/webcam": "Jums gali tekti rankiniu būdu leisti Riot prieigą prie savo mikrofono/kameros",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "Jums gali tekti rankiniu būdu duoti leidimą %(brand)s prieigai prie mikrofono/kameros",
     "No Audio Outputs detected": "Neaptikta jokių garso išvesčių",
     "No Microphones detected": "Neaptikta jokių mikrofonų",
     "No Webcams detected": "Neaptikta jokių kamerų",
@@ -411,32 +380,23 @@
     "Profile": "Profilis",
     "Account": "Paskyra",
     "click to reveal": "spustelėkite, norėdami atskleisti",
-    "riot-web version:": "riot-web versija:",
+    "%(brand)s version:": "%(brand)s versija:",
     "olm version:": "olm versija:",
     "Failed to send email": "Nepavyko išsiųsti el. laiško",
     "The email address linked to your account must be entered.": "Privalo būti įvestas su jūsų paskyra susietas el. pašto adresas.",
     "A new password must be entered.": "Privalo būti įvestas naujas slaptažodis.",
     "New passwords must match each other.": "Nauji slaptažodžiai privalo sutapti.",
     "I have verified my email address": "Aš patvirtinau savo el. pašto adresą",
-    "Return to login screen": "Grįžti į prisijungimo ekraną",
-    "Send Reset Email": "Siųsti atstatymo el. laišką",
+    "Return to login screen": "Grįžti į prisijungimą",
+    "Send Reset Email": "Siųsti naujo slaptažodžio nustatymo el. laišką",
     "Incorrect username and/or password.": "Neteisingas vartotojo vardas ir/arba slaptažodis.",
-    "Please note you are logging into the %(hs)s server, not matrix.org.": "Turėkite omenyje, kad jūs prisijungiate prie %(hs)s serverio, o ne matrix.org.",
-    "Failed to fetch avatar URL": "Nepavyko gauti avataro URL",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Atkreipkite dėmesį, kad jūs jungiatės prie %(hs)s serverio, o ne matrix.org.",
+    "Failed to fetch avatar URL": "Nepavyko gauti pseudoportreto URL",
     "Commands": "Komandos",
     "Results from DuckDuckGo": "Rezultatai iš DuckDuckGo",
     "Notify the whole room": "Pranešti visam kambariui",
     "Users": "Naudotojai",
-    "unknown device": "nežinomas įrenginys",
-    "Ed25519 fingerprint": "Ed25519 kontrolinis kodas",
-    "User ID": "Naudotojo ID",
-    "Curve25519 identity key": "Curve25519 tapatybės raktas",
-    "none": "nėra",
-    "Algorithm": "Algoritmas",
-    "Decryption error": "Iššifravimo klaida",
     "Session ID": "Seanso ID",
-    "End-to-end encryption information": "Ištisinio šifravimo informacija",
-    "Event information": "Įvykio informacija",
     "Passphrases must match": "Slaptafrazės privalo sutapti",
     "Passphrase must not be empty": "Slaptafrazė negali būti tuščia",
     "Export room keys": "Eksportuoti kambario raktus",
@@ -447,14 +407,10 @@
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Eksportavimo failas bus apsaugotas slaptafraze. Norėdami iššifruoti failą, čia turėtumėte įvesti slaptafrazę.",
     "File to import": "Failas, kurį importuoti",
     "Import": "Importuoti",
-    "Your User Agent": "Jūsų vartotojo agentas",
-    "Review Devices": "Peržiūrėti įrenginius",
     "You do not have permission to start a conference call in this room": "Jūs neturite leidimo šiame kambaryje pradėti konferencinį pokalbį",
-    "Room name or alias": "Kambario pavadinimas ar slapyvardis",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Neatrodo, kad jūsų el. pašto adresas šiame serveryje būtų susietas su Matrix ID.",
     "Missing room_id in request": "Užklausoje trūksta room_id",
     "Missing user_id in request": "Užklausoje trūksta user_id",
-    "Unrecognised room alias:": "Neatpažintas kambario slapyvardis:",
     "VoIP conference started.": "VoIP konferencija pradėta.",
     "VoIP conference finished.": "VoIP konferencija užbaigta.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s pašalino kambario pavadinimą.",
@@ -463,7 +419,6 @@
     "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s pašalino %(widgetName)s valdiklį",
     "Failure to create room": "Nepavyko sukurti kambarį",
     "Server may be unavailable, overloaded, or you hit a bug.": "Serveris gali būti neprieinamas, per daug apkrautas, arba susidūrėte su klaida.",
-    "Use compact timeline layout": "Naudoti kompaktišką laiko juostos išdėstymą",
     "Autoplay GIFs and videos": "Automatiškai atkurti GIF ir vaizdo įrašus",
     "This event could not be displayed": "Nepavyko parodyti šio įvykio",
     "Kick": "Išmesti",
@@ -474,7 +429,6 @@
     "Unban this user?": "Atblokuoti šį naudotoją?",
     "Ban this user?": "Užblokuoti šį naudotoją?",
     "Failed to ban user": "Nepavyko užblokuoti naudotoją",
-    "Failed to toggle moderator status": "Nepavyko perjungti moderatoriaus būseną",
     "Invited": "Pakviestas",
     "Filter room members": "Filtruoti kambario dalyvius",
     "Server unavailable, overloaded, or something else went wrong.": "Serveris neprieinamas, perkrautas arba nutiko kažkas kito.",
@@ -496,7 +450,7 @@
     "%(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ų",
-    "Not a valid Riot keyfile": "Negaliojantis Riot rakto failas",
+    "Not a valid %(brand)s keyfile": "Negaliojantis %(brand)s rakto failas",
     "Authentication check failed: incorrect password?": "Autentifikavimo patikra nepavyko: neteisingas slaptažodis?",
     "Send analytics data": "Siųsti analitinius duomenis",
     "Incoming voice call from %(name)s": "Įeinantis balso skambutis nuo %(name)s",
@@ -506,7 +460,6 @@
     "Authentication": "Tapatybės nustatymas",
     "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į",
-    "Make Moderator": "Padaryti moderatoriumi",
     "Hangup": "Padėti ragelį",
     "No pinned messages.": "Nėra jokių prisegtų žinučių.",
     "Online for %(duration)s": "Prisijungęs %(duration)s",
@@ -523,14 +476,13 @@
     "%(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.",
-    "Enable inline URL previews by default": "Įjungti tiesiogines URL nuorodų peržiūras pagal numatymą",
+    "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 pagal numatymą dalyviams šiame kambaryje",
+    "Enable URL previews by default for participants in this room": "Įjungti URL nuorodų peržiūras kaip numatytasias šiame kambaryje esantiems dalyviams",
     "Confirm password": "Patvirtinkite slaptažodį",
     "Demote yourself?": "Pažeminti save?",
     "Demote": "Pažeminti",
-    "Share Link to User": "Dalintis nuoroda į naudotoją",
-    "Direct chats": "Privatūs pokalbiai",
+    "Share Link to User": "Dalintis nuoroda į vartotoją",
     "The conversation continues here.": "Pokalbis tęsiasi čia.",
     "Jump to message": "Pereiti prie žinutės",
     "Favourites": "Mėgstami",
@@ -538,25 +490,24 @@
     "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",
-    "Remote addresses for this room:": "Nuotoliniai šio kambario adresai:",
-    "You have <a>enabled</a> URL previews by default.": "Jūs esate <a>įjungę</a> URL nuorodų peržiūras pagal numatymą.",
-    "You have <a>disabled</a> URL previews by default.": "Jūs esate <a>išjungę</a> URL nuorodų peržiūras pagal numatymą.",
-    "URL previews are enabled by default for participants in this room.": "URL nuorodų peržiūros yra įjungtos pagal numatymą šio kambario dalyviams.",
-    "URL previews are disabled by default for participants in this room.": "URL nuorodų peržiūros yra išjungtos pagal numatymą šio kambario dalyviams.",
+    "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.",
     "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.",
     "Token incorrect": "Neteisingas prieigos raktas",
     "Sign in with": "Prisijungti naudojant",
     "Sign in": "Prisijungti",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Jeigu nenurodysite savo el. pašto adreso, negalėsite atstatyti savo slaptažodį. Ar esate tikri?",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Jeigu nenurodysite savo el. pašto adreso, negalėsite iš naujo nustatyti savo slaptažodžio. Ar esate tikri?",
     "Please <a>contact your service administrator</a> to continue using the service.": "Norėdami toliau naudotis šia paslauga, <a>susisiekite su savo paslaugos administratoriumi</a>.",
     "Create new room": "Sukurti naują kambarį",
     "No results": "Jokių rezultatų",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s pasikeitė vardą",
-    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s pasikeitė avatarą",
-    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s pasikeitė avatarą",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s pasikeitė pseudoportretą",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s pasikeitė pseudoportretą",
     "collapse": "suskleisti",
     "expand": "išskleisti",
     "Room directory": "Kambarių katalogas",
@@ -581,7 +532,6 @@
     "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.",
-    "Ignore request": "Nepaisyti užklausos",
     "Failed to upgrade room": "Nepavyko atnaujinti kambarį",
     "The room upgrade could not be completed": "Nepavyko užbaigti kambario naujinimo",
     "Sign out": "Atsijungti",
@@ -591,16 +541,14 @@
     "Invalid Email Address": "Neteisingas el. pašto adresas",
     "You cannot place VoIP calls in this browser.": "Negalite inicijuoti VoIP skambučių šioje naršyklėje.",
     "You cannot place a call with yourself.": "Negalite skambinti patys sau.",
-    "Registration Required": "Reikalinga registracija",
-    "You need to register to do this. Would you like to register now?": "Norėdami tai atlikti, turite užsiregistruoti. Ar norėtumėte užsiregistruoti dabar?",
     "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 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": "Palaikomuose valdikliuose įjungti valdiklių ekrano kopijas",
-    "Export E2E room keys": "Eksportuoti E2E kambario raktus",
+    "Enable widget screenshots on supported widgets": "Įjungti valdiklių ekrano kopijas palaikomuose valdikliuose",
+    "Export E2E room keys": "Eksportuoti E2E kambarių raktus",
     "Last seen": "Paskutinį kartą matytas",
     "Unignore": "Nebeignoruoti",
     "and %(count)s others...|other": "ir %(count)s kitų...",
@@ -611,23 +559,14 @@
     "System Alerts": "Sistemos įspėjimai",
     "Failed to unban": "Nepavyko atblokuoti",
     "not specified": "nenurodyta",
-    "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.": "Šifruotuose kambariuose, tokiuose kaip šis, URL nuorodų peržiūra pagal numatymą yra išjungta, kad būtų užtikrinta, jog jūsų namų serveris (kuriame yra generuojamos peržiūros) negalės rinkti informacijos apie šiame kambaryje matomas nuorodas.",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s pakeitė %(roomName)s avatarą",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s pašalino kambario avatarą.",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s pakeitė kambario avatarą į <img/>",
-    "Removed or unknown message type": "Žinutė pašalinta arba yra nežinomo tipo",
+    "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.": "Šifruotuose kambariuose, tokiuose kaip šis, URL nuorodų peržiūros pagal numatymą yra išjungtos, kad būtų užtikrinta, jog jūsų serveris (kur yra generuojamos peržiūros) negali rinkti informacijos apie jūsų šiame kambaryje peržiūrėtas nuorodas.",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s pakeitė kambario %(roomName)s pseudoportretą",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s pašalino kambario pseudoportretą.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s pakeitė kambario pseudoportretą į <img/>",
     "Filter community members": "Filtruoti bendruomenės dalyvius",
     "Removing a room from the community will also remove it from the community page.": "Pašalinus kambarį iš bendruomenės, taip pat pašalins jį iš bendruomenės puslapio.",
     "Filter community rooms": "Filtruoti bendruomenės kambarius",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Padėkite patobulinti Riot.im, siųsdami <UsageDataLink>anoniminius naudojimosi duomenis</UsageDataLink>. Tai panaudos slapuką (žiūrėkite mūsų <PolicyLink>Slapukų politiką</PolicyLink>).",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Padėkite patobulinti Riot.im, siųsdami <UsageDataLink>anoniminius naudojimosi duomenis</UsageDataLink>. Tai panaudos slapuką.",
-    "Please <a>contact your service administrator</a> to get this limit increased.": "Norėdami padidinti šį limitą, <a>susisiekite su savo paslaugų administratoriumi</a>.",
-    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "Šis namų serveris pasiekė savo mėnesinį aktyvių naudotojų limitą, taigi, <b>kai kurie naudotojai negalės prisijungti</b>.",
-    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Šis namų serveris viršijo vieno iš savo išteklių limitą, taigi, <b>kai kurie naudotojai negalės prisijungti</b>.",
-    "An error ocurred whilst trying to remove the widget from the room": "Įvyko klaida, bandant pašalinti valdiklį iš kambario",
-    "Blacklist": "Blokuoti",
-    "Unblacklist": "Atblokuoti",
-    "Verify...": "Patvirtinti...",
+    "An error ocurred whilst trying to remove the widget from the room": "Bandant pašalinti valdiklį iš kambario įvyko klaida",
     "Communities": "Bendruomenės",
     "Home": "Pradžia",
     "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s išėjo %(count)s kartų(-us)",
@@ -636,30 +575,24 @@
     "%(oneUser)sleft %(count)s times|one": "%(oneUser)s išėjo",
     "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s pasikeitė vardus",
     "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s pasikeitė vardą %(count)s kartų(-us)",
-    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s pasikeitė avatarą %(count)s kartų(-us)",
-    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s pasikeitė avatarą %(count)s kartų(-us)",
+    "%(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",
     "A call is already in progress!": "Skambutis jau vyksta!",
-    "Default": "Numatytasis",
+    "Default": "Numatytas",
     "Restricted": "Apribotas",
     "Moderator": "Moderatorius",
     "Ignores a user, hiding their messages from you": "Ignoruoja vartotoją, slepiant nuo jūsų jo žinutes",
     "Stops ignoring a user, showing their messages going forward": "Sustabdo vartotojo ignoravimą, rodant jums jo tolimesnes žinutes",
-    "Revoke Moderator": "Panaikinti moderatorių",
     "Invites": "Pakvietimai",
     "Historical": "Istoriniai",
     "Every page you use in the app": "Kiekvienas puslapis, kurį jūs naudojate programoje",
     "Call Timeout": "Skambučio laikas baigėsi",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s pridėjo %(addedAddresses)s, kaip šio kambario adresus.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s pridėjo %(addedAddresses)s, kaip šio kambario adresą.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s pašalino %(removedAddresses)s, kaip šio kambario adresus.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s pašalino %(removedAddresses)s, kaip šio kambario adresą.",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s pridėjo %(addedAddresses)s ir pašalino %(removedAddresses)s, kaip šio kambario adresus.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s nustatė pagrindinį šio kambario adresą į %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s pašalino pagrindinį šio kambario adresą.",
     "Disinvite": "Atšaukti pakvietimą",
-    "Disinvite this user?": "Atšaukti pakvietimą šiam naudotojui?",
+    "Disinvite this user?": "Atšaukti pakvietimą šiam vartotojui?",
     "Unknown for %(duration)s": "Nežinoma jau %(duration)s",
     "Unable to load! Check your network connectivity and try again.": "Nepavyko įkelti! Patikrinkite savo tinklo ryšį ir bandykite dar kartą.",
     "%(targetName)s joined the room.": "%(targetName)s prisijungė prie kambario.",
@@ -697,22 +630,21 @@
     "Algorithm: ": "Algoritmas: ",
     "Don't ask again": "Daugiau nebeklausti",
     "Set up": "Nustatyti",
-    "Publish this room to the public in %(domain)s's room directory?": "Paskelbti šį kambarį į viešąjį %(domain)s kambarių katalogą?",
+    "Publish this room to the public in %(domain)s's room directory?": "Paskelbti šį kambarį viešai %(domain)s kambarių kataloge?",
     "Start authentication": "Pradėti tapatybės nustatymą",
     "Failed to load group members": "Nepavyko įkelti grupės dalyvių",
-    "Manage Integrations": "Tvarkyti integracijas",
+    "Manage Integrations": "Valdyti integracijas",
     "Matrix Room ID": "Matrix kambario ID",
     "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": "Pasyvinti paskyrą",
-    "I verify that the keys match": "Aš patvirtinu, kad raktai sutampa",
+    "Deactivate Account": "Deaktyvuoti paskyrą",
     "Incompatible local cache": "Nesuderinamas vietinis podėlis",
-    "Updating Riot": "Atnaujinama Riot",
+    "Updating %(brand)s": "Atnaujinama %(brand)s",
     "This doesn't appear to be a valid email address": "Tai nepanašu į teisingą el. pašto adresą",
     "Unable to add email address": "Nepavyko pridėti el. pašto adreso",
     "Unable to verify email address.": "Nepavyko patvirtinti el. pašto adreso.",
-    "This will allow you to reset your password and receive notifications.": "Tai jums leis atstatyti savo slaptažodį ir gauti pranešimus.",
+    "This will allow you to reset your password and receive notifications.": "Tai jums leis iš naujo nustatyti slaptažodį ir gauti pranešimus.",
     "Skip": "Praleisti",
     "Username not available": "Vartotojo vardas negalimas",
     "Username invalid: %(errMessage)s": "Neteisingas vartotojo vardas: %(errMessage)s",
@@ -723,9 +655,8 @@
     "If you already have a Matrix account you can <a>log in</a> instead.": "Jeigu jau turite Matrix paskyrą, tuomet vietoj to, galite <a>prisijungti</a>.",
     "Unable to restore backup": "Nepavyko atkurti atsarginės kopijos",
     "No backup found!": "Nerasta jokios atsarginės kopijos!",
-    "Backup Restored": "Atsarginė kopija atkurta",
     "Failed to decrypt %(failedCount)s sessions!": "Nepavyko iššifruoti %(failedCount)s seansų!",
-    "Next": "Kitas",
+    "Next": "Toliau",
     "Private Chat": "Privatus pokalbis",
     "Public Chat": "Viešas pokalbis",
     "There are no visible files in this room": "Šiame kambaryje nėra matomų failų",
@@ -740,31 +671,27 @@
     "Your Communities": "Jūsų bendruomenės",
     "Create a new community": "Sukurti naują bendruomenę",
     "You have no visible notifications": "Jūs neturite matomų pranešimų",
-    "Failed to perform homeserver discovery": "Nepavyko atlikti namų serverio aptikimo",
+    "Failed to perform homeserver discovery": "Nepavyko atlikti serverio radimo",
     "Error: Problem communicating with the given homeserver.": "Klaida: Problemos susisiekiant su nurodytu namų serveriu.",
     "This server does not support authentication with a phone number.": "Šis serveris nepalaiko tapatybės nustatymo telefono numeriu.",
-    "Great! This passphrase looks strong enough.": "Puiku! Ši slapta frazė atrodo pakankamai stipri.",
-    "Your Recovery Key": "Jūsų atkūrimo raktas",
-    "Copy to clipboard": "Kopijuoti į iškarpinę",
     "Download": "Atsisiųsti",
     "Retry": "Bandyti dar kartą",
     "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)": "Nepriklausomai nuo to ar jūs prisijungę (mes neįrašome jūsų vartotojo vardo)",
-    "Chat with Riot Bot": "Kalbėtis su Riot Botu",
+    "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",
     "Explore rooms": "Žvalgyti kambarius",
-    "Your Riot is misconfigured": "Jūsų Riot yra neteisingai sukonfigūruotas",
+    "Your %(brand)s is misconfigured": "Jūsų %(brand)s yra neteisingai sukonfigūruotas",
     "Sign in to your Matrix account on %(serverName)s": "Prisijunkite prie savo Matrix paskyros %(serverName)s serveryje",
     "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)": "Nepriklausomai nuo to ar jūs naudojate 'duonos trupinių' funkciją (avatarai 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.": "Kur šis puslapis įtraukia identifikuojamą informaciją, kaip kambarys, vartotojas ar grupės ID, tie duomenys yra pašalinami prieš siunčiant į serverį.",
+    "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",
     "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",
-    "A conference call could not be started because the integrations server is not available": "Konferencinio skambučio nebuvo galima pradėti, nes nėra integracijų serverio",
     "Call in Progress": "Vykstantis skambutis",
     "A call is currently being placed!": "Šiuo metu skambinama!",
     "Replying With Files": "Atsakyti su failais",
@@ -775,7 +702,7 @@
     "Invite new community members": "Pakviesti naujus bendruomenės narius",
     "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 prieiti numatytąjį tapatybės serverį <server />, kad patvirtinti el. pašto adresą arba telefono numerį, bet serveris neturi jokių paslaugos 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.",
     "Trust": "Pasitikėti",
     "Failed to invite users to the room:": "Nepavyko pakviesti vartotojų į kambarį:",
@@ -790,16 +717,15 @@
     "You do not have the required permissions to use this command.": "Jūs neturite reikalingų leidimų naudoti šią komandą.",
     "<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>Įspėjimas</b>: Kambario atnaujinimas <i>automatiškai nemigruos kambario dalyvių į naują kambario versiją.</i> Mes paskelbsime nuorodą į naują kambarį senojoje kambario versijoje - kambario dalyviai turės ją paspausti, norėdami prisijungti prie naujo kambario.",
     "Changes your display nickname in the current room only": "Pakeičia jūsų rodomą slapyvardį tik esamame kambaryje",
-    "Changes the avatar of the current room": "Pakeičia esamo kambario avatarą",
-    "Changes your avatar in this current room only": "Pakeičia jūsų avatarą tik esamame kambaryje",
-    "Changes your avatar in all rooms": "Pakeičia jūsų avatarą visuose kambariuose",
+    "Changes the avatar of the current room": "Pakeičia esamo kambario pseudoportretą",
+    "Changes your avatar in this current room only": "Pakeičia jūsų pseudoportretą tik esamame kambaryje",
+    "Changes your avatar in all rooms": "Pakeičia jūsų pseudoportretą visuose kambariuose",
     "Gets or sets the room topic": "Gauna arba nustato kambario temą",
     "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 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.",
-    "Joins room with given alias": "Prisijungia prie kambario su nurodytu slapyvardžiu",
     "Unbans user with given ID": "Atblokuoja vartotoją su nurodytu id",
     "Ignored user": "Ignoruojamas vartotojas",
     "Unignored user": "Nebeignoruojamas vartotojas",
@@ -831,15 +757,15 @@
     "%(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 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 iš %(fromPowerLevel)s į %(toPowerLevel)s",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s pakeitė %(powerLevelDiffText)s galios lygį.",
+    "%(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 …|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",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Įsitikinkite, kad jūsų interneto ryšys yra stabilus, arba susisiekite su serverio administratoriumi",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Paprašykite savo Riot administratoriaus patikrinti ar <a>jūsų konfigūracijoje</a> nėra neteisingų arba pasikartojančių įrašų.",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Paprašykite savo %(brand)s administratoriaus patikrinti ar <a>jūsų konfigūracijoje</a> nėra neteisingų arba pasikartojančių įrašų.",
     "Cannot reach identity server": "Tapatybės serveris nepasiekiamas",
     "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.": "Jūs galite registruotis, 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 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.",
@@ -874,7 +800,7 @@
     "Do you want to chat with %(user)s?": "Ar jūs norite kalbėtis su %(user)s?",
     "<userName/> wants to chat": "<userName/> nori kalbėtis",
     "Start chatting": "Pradėti kalbėtis",
-    "Do you want to join %(roomName)s?": "Ar jūs norite prisijungti prie %(roomName)s?",
+    "Do you want to join %(roomName)s?": "Ar jūs norite prisijungti prie %(roomName)s kanalo?",
     "<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?",
@@ -896,18 +822,16 @@
     "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 prie jo vėl prisijungti be pakvietimo.",
-    "Are you sure you want to leave the room '%(roomName)s'?": "Ar tikrai norite palikti kambarį %(roomName)s?",
+    "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.",
+    "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į.",
-    "Riot failed to get the public room list.": "Riot nepavyko gauti viešų kambarių sąrašą.",
+    "%(brand)s failed to get the public room list.": "%(brand)s nepavyko gauti viešų kambarių sąrašo.",
     "General failure": "Bendras triktis",
     "Messages containing my username": "Žinutės, kuriose yra mano vartotojo vardas",
     "Set a new account password...": "Nustatyti naują paskyros slaptažodį...",
-    "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.": "Jei jūs pateikėte klaidą per GitHub, derinimo žurnalai (debug logs) gali padėti mums surasti problemą. Derinimo žurnaluose yra programos naudojimo duomenys, įskaitant jūsų vartotojo vardą, ID ar kitus kambarių arba grupių, kuriuose jūs lankėtės, pavadinimus ir kitų vartotojų vardus. Juose nėra žinučių.",
+    "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.": "Jei jūs pateikėte pranešimą apie klaidą per GitHub, derinimo žurnalai (debug logs) gali padėti mums surasti problemą. Derinimo žurnaluose yra programos naudojimo duomenys, įskaitant jūsų vartotojo vardą, ID ar kitus kambarių arba grupių, kuriuose jūs lankėtės, pavadinimus ir kitų vartotojų vardus. Juose nėra žinučių.",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (galia %(powerLevelNumber)s)",
     "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.": "Derinimo žurnaluose yra programos naudojimo duomenys, įskaitant jūsų vartotojo vardą, ID ar kitus kambarių arba grupių, kuriuose jūs lankėtės, pavadinimus ir kitų vartotojų vardus. Juose nėra žinučių.",
-    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Jei jūs negalite kažkieno surasti, paklauskite jų vartotojo vardo, pasidalinkite savo vartotojo vardu (%(userId)s) arba <a>profilio nuoroda</a>.",
-    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Jei jūs negalite kažkieno surasti, paklauskite jų vartotojo vardo (pvz.: @vartotojas:serveris.lt) arba <a>pasidalinkite šiuo kambariu</a>.",
     "A username can only contain lower case letters, numbers and '=_-./'": "Vartotojo vardą gali sudaryti tik mažosios raidės, skaičiai ir '=_-./'",
     "The username field must not be blank.": "Vartotojo vardo laukelis negali būti tuščias.",
     "Username": "Vartotojo vardas",
@@ -916,16 +840,16 @@
     "Confirm": "Patvirtinti",
     "Create your Matrix account on %(serverName)s": "Sukurkite savo Matrix paskyrą %(serverName)s serveryje",
     "Create your Matrix account on <underlinedServerName />": "Sukurkite savo Matrix paskyrą <underlinedServerName /> serveryje",
-    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Nustatykite el. paštą paskyros susigrąžinimui. Naudokite el. paštą ar tel. nr. norėdami pasirinktinai būti aptinkami esamų kontaktų.",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Nustatykite el. paštą paskyros susigrąžinimui. Naudokite el. paštą norėdami pasirinktinai būti aptinkami esamų kontaktų.",
+    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Nustatykite el. paštą paskyros susigrąžinimui. Naudokite el. paštą ar telefoną, jei norite, kad esami kontaktai galėtų jus rasti.",
+    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Nustatykite el. paštą paskyros susigrąžinimui. Naudokite el. paštą, jei norite, kad esami kontaktai galėtų jus rasti.",
     "Sign in instead": "Prisijungti",
-    "A verification email will be sent to your inbox to confirm setting your new password.": "Patvirtinimo laiškas bus išsiųstas į jūsų pašto dėžutę tam, kad patvirtintumėte naujo slaptažodžio nustatymą.",
+    "A verification email will be sent to your inbox to confirm setting your new password.": "Tam, kad patvirtinti jūsų naujo slaptažodžio nustatymą, į jūsų pašto dėžutę bus išsiųstas patvirtinimo laiškas.",
     "Set a new password": "Nustatykite naują slaptažodį",
     "Create account": "Sukurti paskyrą",
     "Create your account": "Sukurkite savo paskyrą",
     "Change identity server": "Pakeisti tapatybės serverį",
     "Change": "Keisti",
-    "Change room avatar": "Keisti kambario avatarą",
+    "Change room avatar": "Keisti kambario pseudoportretą",
     "Change room name": "Keisti kambario pavadinimą",
     "Change main address for the room": "Keisti pagrindinį kambario adresą",
     "Change history visibility": "Keisti istorijos matomumą",
@@ -939,12 +863,12 @@
     "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.": "Ar tikrai norite pašalinti (ištrinti) šį įvykį? Atkreipkite dėmesį į tai, kad jei jūs ištrinsite kambario pavadinimo arba temos keitimo įvykį, tai gali atšaukti patį pakeitimą.",
     "We recommend you change your password and recovery key in Settings immediately": "Mes rekomenduojame nedelsiant Nustatymuose pasikeisti jūsų slaptažodį ir atgavimo raktą",
     "Email (optional)": "El. paštas (neprivaloma)",
-    "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.": "Jei jūs nenustatėte naujo paskyros atgavimo metodo, tada gali būti, kad užpuolikas bando patekti į jūsų paskyrą. Nedelsiant Nustatymuose pakeiskite savo paskyros slaptažodį ir nustatykite naują paskyros atgavimo metodą.",
-    "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.": "Jei jūs nepašalinote paskyros atgavimo metodo, tada gali būti, kad užpuolikas bando patekti į jūsų paskyrą. Nedelsiant Nustatymuose pakeiskite savo paskyros slaptažodį ir nustatykite naują paskyros atgavimo metodą.",
+    "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.": "Jei jūs nenustatėte naujo paskyros atgavimo metodo, gali būti, kad užpuolikas bando patekti į jūsų paskyrą. Nedelsiant nustatymuose pakeiskite savo paskyros slaptažodį ir nustatykite naują atgavimo metodą.",
+    "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.": "Jei jūs nepašalinote paskyros atgavimo metodo, gali būti, kad užpuolikas bando patekti į jūsų paskyrą. Nedelsiant nustatymuose pakeiskite savo paskyros slaptažodį ir nustatykite naują atgavimo metodą.",
     "Help & About": "Pagalba ir Apie",
     "Direct Messages": "Privačios žinutės",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Nustatykite adresus šiam kambariui, kad vartotojai galėtų surasti šį kambarį per jūsų serverį (%(localDomain)s)",
-    "Direct message": "Privati žinutė",
+    "Direct message": "Siųsti tiesioginę žinutę",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s prisijungė %(count)s kartų(-us)",
     "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s prisijungė",
     "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s prisijungė %(count)s kartų(-us)",
@@ -957,10 +881,10 @@
     "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s išėjo ir vėl prisijungė",
     "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s išėjo ir vėl prisijungė %(count)s kartų(-us)",
     "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s išėjo ir vėl prisijungė",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s atmetė jų kvietimus %(count)s kartų(-us)",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s atmetė jų kvietimus",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s atmetė jų kvietimą %(count)s kartų(-us)",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s atmetė jų kvietimą",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s atmetė pakvietimus %(count)s kartų(-us)",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s atmetė pakvietimus",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s atmetė pakvietimą %(count)s kartų(-us)",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s atmetė pakvietimą",
     "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s atšaukė savo pakvietimus %(count)s kartų(-us)",
     "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s atšaukė savo pakvietimus",
     "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s atšaukė savo pakvietimą %(count)s kartų(-us)",
@@ -990,7 +914,7 @@
     "Custom level": "Pritaikytas lygis",
     "Can't find this server or its room list": "Negalime rasti šio serverio arba jo kambarių sąrašo",
     "Matrix rooms": "Matrix kambariai",
-    "Recently Direct Messaged": "Neseniai siųsta privati žinutė",
+    "Recently Direct Messaged": "Neseniai tiesiogiai susirašyta",
     "Command Help": "Komandų pagalba",
     "Help": "Pagalba",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Sukurkite bendruomenę, kad kartu sugrupuotumėte vartotojus ir kambarius! Sukurkite pagrindinį puslapį, kad pažymėtumėte savo vietą Matrix visatoje.",
@@ -1002,7 +926,7 @@
     "Failed to set direct chat tag": "Nepavyko nustatyti privataus pokalbio žymos",
     "Navigation": "Navigacija",
     "Calls": "Skambučiai",
-    "Room List": "Kambarių sąrašas",
+    "Room List": "Kambarių Sąrašas",
     "Autocomplete": "Autorašymas",
     "Alt": "Alt",
     "Alt Gr": "Alt Gr",
@@ -1013,18 +937,17 @@
     "If you cancel now, you won't complete verifying your other session.": "Jei atšauksite dabar, neužbaigsite kito seanso patvirtinimo.",
     "Verify this session": "Patvirtinti šį seansą",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s pakeitė kambario pavadinimą iš %(oldRoomName)s į %(newRoomName)s.",
-    "Show display name changes": "Rodyti vardo pakeitimus",
+    "Show display name changes": "Rodyti rodomo vardo pakeitimus",
     "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 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 su \"end-to-end\" š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 jų neprarastumėte.",
-    "Start using Key Backup": "Pradėti naudoti Atsarginę Raktų Kopiją",
+    "Public Name": "Viešas pavadinimas",
+    "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ą",
     "Display Name": "Rodomas Vardas",
-    "Please verify the room ID or alias and try again.": "Prašome patikrinti kambario ID arba slapyvardį ir bandyti dar kartą.",
     "Room %(name)s": "Kambarys %(name)s",
-    "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Atnaujinimas išjungs dabartinę kambario instanciją ir sukurs atnaujintą kambarį tuo pačiu vardu.",
+    "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Atnaujinimas išjungs dabartinę kambario instanciją ir sukurs atnaujintą kambarį tuo pačiu pavadinimu.",
     "Other published addresses:": "Kiti paskelbti adresai:",
     "No other published addresses yet, add one below": "Kol kas nėra kitų paskelbtų adresų, pridėkite vieną žemiau",
     "Room Name": "Kambario Pavadinimas",
@@ -1037,41 +960,672 @@
     "%(name)s wants to verify": "%(name)s nori patvirtinti",
     "Your display name": "Jūsų rodomas vardas",
     "Rotate Left": "Pasukti Kairėn",
-    "Room alias": "Kambario slapyvardis",
     "e.g. my-room": "pvz.: mano-kambarys",
-    "Please provide a room alias": "Įveskite kambario slapyvardį",
     "Enter a server name": "Įveskite serverio pavadinimą",
     "Enter the name of a new server you want to explore.": "Įveskite naujo, norimo žvalgyti serverio pavadinimą.",
     "Server name": "Serverio pavadinimas",
     "Please enter a name for the room": "Įveskite kambario pavadinimą",
-    "Set a room alias to easily share your room with other people.": "Nustatykite kambario slapyvardį, kad galėtumėte nesunkiai pasidalinti juo su kitais.",
     "This room is private, and can only be joined by invitation.": "Šis kambarys yra privatus, prie jo prisijungti galima tik su pakvietimu.",
     "Create a private room": "Sukurti privatų kambarį",
     "Name": "Pavadinimas",
     "Topic (optional)": "Tema (nebūtina)",
-    "Hide advanced": "Paslėpti sudėtingesnius nustatymus",
-    "Show advanced": "Rodyti sudėtingesnius nustatymus",
+    "Hide advanced": "Paslėpti išplėstinius",
+    "Show advanced": "Rodyti išplėstinius",
     "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Neleisti kitų matrix serverių vartotojams prisijungti prie šio kambario (Šis nustatymas negali būti vėliau pakeistas!)",
     "Session name": "Seanso pavadinimas",
     "Session key": "Seanso raktas",
     "I don't want my encrypted messages": "Man nereikalingos užšifruotos žinutės",
     "You'll lose access to your encrypted messages": "Jūs prarasite prieigą prie savo užšifruotų žinučių",
     "New session": "Naujas seansas",
-    "Enter secret storage passphrase": "Įveskite slaptos saugyklos slaptafrazę",
-    "Enter recovery passphrase": "Įveskite atstatymo slaptafrazę",
+    "Enter recovery passphrase": "Įveskite atgavimo slaptafrazę",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Įspėjimas</b>: atsarginę raktų kopiją sukurkite tik iš patikimo kompiuterio.",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Įspėjimas</b>: Atsarginę raktų kopiją sukurkite tik iš patikimo kompiuterio.",
     "Server Name": "Serverio Pavadinimas",
     "Other servers": "Kiti serveriai",
     "Add room": "Sukurti kambarį",
-    "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.": "Slaptažodžio keitimas ištrins visų jūsų seansų šifravimo raktus, todėl nebebus galima perskaityti užšifruotos pokalbių istorijos. Nustatykite Raktų Atsarginę Kopiją arba eksportuokite savo kambarių raktus iš kito seanso prieš atstatydami slaptažodį.",
+    "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.": "Slaptažodžio keitimas iš naujo nustatys visų jūsų seansų šifravimo raktus, todėl užšifruota pokalbių istorija taps neperskaitoma. Sukurkite atsarginę raktų kopiją arba eksportuokite savo kambarių raktus iš kito seanso prieš iš naujo nustatydami slaptažodį.",
     "Set a display name:": "Nustatyti rodomą vardą:",
-    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Apsaugokite savo šifravimo raktus slaptafraze. Maksimaliam saugumui užtikrinti ji turi skirtis nuo jūsų paskyros slaptažodžio:",
-    "Enter a passphrase": "Įveskite slaptafrazę",
-    "Enter your passphrase a second time to confirm it.": "Įveskite slaptafrazę antrą kartą, kad ją patvirtintumėte.",
-    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "Mes saugosime užšifruotą jūsų raktų kopiją mūsų serveryje. Apsaugokite savo atsarginę kopiją slaptafraze, kad ji būtų saugi.",
     "For maximum security, this should be different from your account password.": "Maksimaliam saugumui užtikrinti ji turi skirtis nuo jūsų paskyros slaptažodžio.",
-    "Enter a passphrase...": "Įveskite slaptafrazę...",
-    "Please enter your passphrase a second time to confirm.": "Įveskite slaptafrazę antrą kartą, kad ją patvirtintumėte.",
-    "Secure your backup with a passphrase": "Apsaugokite savo atsarginę kopiją slaptafraze"
+    "Set up encryption": "Nustatyti šifravimą",
+    "COPY": "Kopijuoti",
+    "Enter recovery key": "Įveskite atgavimo raktą",
+    "Keep going...": "Tęskite...",
+    "Syncing...": "Sinchronizuojama...",
+    "Signing In...": "Prijungiama...",
+    "If you've joined lots of rooms, this might take a while": "Jei esate prisijungę prie daug kambarių, tai gali užtrukti",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "Neužbaigus saugumo šiame seanse, jis neturės prieigos prie šifruotų žinučių.",
+    "Enter a recovery passphrase": "Įveskite atgavimo slaptafrazę",
+    "Set up with a recovery key": "Nustatyti su atgavimo raktu",
+    "Enter your recovery passphrase a second time to confirm it.": "Įveskite atgavimo slaptafrazę antrą kartą, kad ją patvirtintumėte.",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Jūsų atgavimo raktas yra atsarginė saugumo priemonė - jūs galite jį naudoti prieigos prie jūsų šifruotų žinučių atkūrimui, jei pamiršite savo atgavimo slaptafrazę.",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Laikykite šio rakto kopiją saugioje vietoje, pavyzdžiui slaptažodžių tvarkyklėje arba seife.",
+    "Your recovery key": "Jūsų atgavimo raktas",
+    "Copy": "Kopijuoti",
+    "Make a copy of your recovery key": "Padaryti atgavimo rakto kopiją",
+    "Please enter your recovery passphrase a second time to confirm.": "Įveskite atgavimo slaptafrazę antrą kartą, kad patvirtintumėte.",
+    "Later": "Vėliau",
+    "Verify yourself & others to keep your chats safe": "Patvirtinkite save ir kitus, kad jūsų pokalbiai būtų saugūs",
+    "Go back": "Grįžti",
+    "This room is end-to-end encrypted": "Šis kambarys visapusiškai užšifruotas",
+    "Send a message…": "Siųsti žinutę…",
+    "Never lose encrypted messages": "Niekada nepraraskite šifruotų žinučių",
+    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Žinutės šiame kambaryje yra apsaugotos visapusiu šifravimu. Tik jūs ir gavėjas(-ai) turite raktus šioms žinutėms perskaityti.",
+    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Saugiai sukurkite jūsų raktų atsarginę kopiją, kad išvengtumėte jų praradimo. <a>Sužinoti daugiau.</a>",
+    "Not now": "Ne dabar",
+    "Don't ask me again": "Daugiau neklausti",
+    "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.",
+    "Confirm Removal": "Patvirtinkite pašalinimą",
+    "Manually export keys": "Eksportuoti raktus rankiniu būdu",
+    "Send a Direct Message": "Siųsti tiesioginę žinutę",
+    "Go Back": "Grįžti",
+    "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.",
+    "Email addresses": "El. pašto adresai",
+    "Account management": "Paskyros valdymas",
+    "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ą.",
+    "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",
+    "Homeserver URL does not appear to be a valid Matrix homeserver": "Serverio adresas neatrodo esantis tinkamas Matrix serveris",
+    "This homeserver does not support login using email address.": "Šis serveris nepalaiko prisijungimo naudojant el. pašto adresą.",
+    "Setting up keys": "Raktų nustatymas",
+    "Review where you’re logged in": "Peržiūrėkite kur esate prisijungę",
+    "Verify all your sessions to ensure your account & messages are safe": "Patvirtinkite visus savo seansus, kad užtikrintumėte savo paskyros ir žinučių saugumą",
+    "Review": "Peržiūrėti",
+    "Message deleted": "Žinutė ištrinta",
+    "Message deleted by %(name)s": "Žinutė, ištrinta %(name)s",
+    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Jei pamiršote savo atgavimo slaptafrazę jūs galite <button1>naudoti savo atgavimo raktą</button1> arba <button2>nustatyti naujas atgavimo parinktis</button2>",
+    "Confirm your identity by entering your account password below.": "Patvirtinkite savo tapatybę žemiau įvesdami savo paskyros slaptažodį.",
+    "Use an email address to recover your account": "Naudokite el. pašto adresą, kad prireikus galėtumėte atgauti paskyrą",
+    "Passwords don't match": "Slaptažodžiai nesutampa",
+    "Use lowercase letters, numbers, dashes and underscores only": "Naudokite tik mažąsias raides, brūkšnelius ir pabraukimus",
+    "Great! This recovery passphrase looks strong enough.": "Puiku! Ši atgavimo slaptafrazė atrodo pakankamai stipri.",
+    "That matches!": "Tai sutampa!",
+    "That doesn't match.": "Tai nesutampa.",
+    "Confirm your recovery passphrase": "Patvirtinti atgavimo slaptafrazę",
+    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Jūsų atgavimo raktas buvo <b>nukopijuotas į jūsų iškarpinę</b>, jūs galite:",
+    "Your recovery key is in your <b>Downloads</b> folder.": "Jūsų atgavimo raktas yra <b>Parsisiuntimų</b> kataloge.",
+    "<b>Print it</b> and store it somewhere safe": "<b>Atsispausdinti jį</b> ir laikyti saugioje vietoje",
+    "<b>Save it</b> on a USB key or backup drive": "<b>Išsaugoti jį</b> USB rakte arba atsarginių kopijų diske",
+    "<b>Copy it</b> to your personal cloud storage": "<b>Nukopijuoti jį</b> į savo asmeninę debesų saugyklą",
+    "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.": "Pakeitus slaptažodį šiuo metu, visuose seansuose bus iš naujo nustatyti visapusio šifravimo raktai, tad šifruotų pokalbių istorija taps neperskaitoma, nebent jūs eksportuosite savo kambarių raktus ir po to importuosite juos atgal. Ateityje ši funkcija bus pataisyta.",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Jūsų slaptažodis buvo sėkmingai pakeistas. Jūs kituose seansuose negausite pranešimų, kol iš naujo prie jų neprisijungsite",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "El. laiškas buvo išsiųstas į %(emailAddress)s. Kai paspausite jame esančią nuorodą, tada spauskite žemiau.",
+    "Your password has been reset.": "Jūsų slaptažodis buvo iš naujo nustatytas.",
+    "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 buvote atjungtas iš visų seansų ir toliau nebegausite pranešimų. Tam, kad vėl įjungtumėte pranešimus, iš naujo prisijunkite kiekviename įrenginyje.",
+    "Show more": "Rodyti daugiau",
+    "<a>Log in</a> to your new account.": "<a>Prisijunkite</a> prie naujos paskyros.",
+    "Registration Successful": "Registracija sėkminga",
+    "Welcome to %(appName)s": "Sveiki prisijungę į %(appName)s",
+    "Liberate your communication": "Išlaisvinkite savo bendravimą",
+    "Explore Public Rooms": "Žvalgyti viešus kambarius",
+    "Create a Group Chat": "Sukurti grupės pokalbį",
+    "New login. Was this you?": "Naujas prisijungimas. Ar tai jūs?",
+    "%(senderName)s placed a voice call.": "%(senderName)s pradėjo balso skambutį.",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s pradėjo vaizdo skambutį. (nepalaikoma šios naršyklės)",
+    "%(senderName)s placed a video call.": "%(senderName)s pradėjo vaizdo skambutį.",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s pradėjo vaizdo skambutį. (nepalaikoma šios naršyklės)",
+    "Verify your other session using one of the options below.": "Patvirtinkite savo kitą seansą naudodami vieną iš žemiau esančių parinkčių.",
+    "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.",
+    "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ą",
+    "Delete sessions|other": "Ištrinti seansus",
+    "Delete sessions|one": "Ištrinti seansą",
+    "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",
+    "Flair": "Ženkliukai",
+    "Access Token:": "Prieigos talonas:",
+    "Preferences": "Nuostatos",
+    "Cryptography": "Kriptografija",
+    "Security & Privacy": "Saugumas ir Privatumas",
+    "Voice & Video": "Garsas ir Vaizdas",
+    "Enable room encryption": "Įjungti kambario šifravimą",
+    "Enable encryption?": "Įjungti šifravimą?",
+    "Encryption": "Šifravimas",
+    "Once enabled, encryption cannot be disabled.": "Įjungus šifravimą jo nebus galima išjungti.",
+    "Who can access this room?": "Kas turi prieigą prie šio kambario?",
+    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Prisijungti kaip <voiceText>balsas</voiceText> arba <videoText>vaizdas</videoText>.",
+    "Deactivate user?": "Deaktyvuoti vartotoją?",
+    "Deactivate user": "Deaktyvuoti vartotoją",
+    "Failed to deactivate user": "Nepavyko deaktyvuoti vartotojo",
+    "Try again later, or ask a room admin to check if you have access.": "Pabandykite vėliau arba paprašykite kambario administratoriaus patikrinti, ar turite prieigą.",
+    "%(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>.": "Bandant patekti į kambarį buvo gauta klaida: %(errcode)s. Jei manote, kad matote šį pranešimą per klaidą, prašome <issueLink>apie ją pranešti</issueLink>.",
+    "Error updating flair": "Klaida atnaujinant ženkliuką",
+    "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Įvyko klaida atnaujinant ženkliukus šiam kambariui. Serveris gali jų neleisti arba įvyko laikina klaida.",
+    "Showing flair for these communities:": "Ženkliukai rodomi šioms bendruomenėms:",
+    "This room is not showing flair for any communities": "Šis kambarys nerodo ženkliukų jokioms bendruomenėms",
+    "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ą",
+    "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",
+    "%(count)s sessions|other": "%(count)s seansai(-ų)",
+    "Hide sessions": "Slėpti seansus",
+    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> kambaryje %(roomName)s",
+    "Security": "Saugumas",
+    "Verify by scanning": "Patvirtinti nuskaitant",
+    "Verify all users in a room to ensure it's secure.": "Patvirtinkite visus vartotojus kambaryje, kad užtikrintumėte jo saugumą.",
+    "You cancelled verification on your other session.": "Jūs atšaukėte patvirtinimą kitame savo seanse.",
+    "%(displayName)s cancelled verification.": "%(displayName)s atšaukė patvirtinimą.",
+    "You cancelled verification.": "Jūs atšaukėte patvirtinimą.",
+    "Verification cancelled": "Patvirtinimas atšauktas",
+    "Encryption enabled": "Šifravimas įjungtas",
+    "Encryption not enabled": "Šifravimas neįjungtas",
+    "Display your community flair in rooms configured to show it.": "Rodyti savo bendruomenės ženkliukus kambariuose, kuriuose nustatytas jų rodymas.",
+    "You're not currently a member of any communities.": "Jūs šiuo metu nesate jokios bendruomenės narys.",
+    "More options": "Daugiau parinkčių",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "Ar tikrai norite pašalinti <b>%(serverName)s</b>",
+    "Enable end-to-end encryption": "Įjungti visapusį šifravimą",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "Jūs negalėsite vėliau to išjungti. Tiltai ir dauguma bot'ų dar nėra palaikomi.",
+    "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ų:",
+    "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.",
+    "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.": "Tam, kad būtų išvengta pasikartojančių problemų, pirmiausia <existingIssuesLink>peržiūrėkite esamas problemas</existingIssuesLink> (ir pridėkite +1) arba, jei nerandate, <newIssueLink>sukurkite naują svarstomą problemą</newIssueLink>.",
+    "Report bugs & give feedback": "Pranešti apie klaidas ir palikti atsiliepimą",
+    "Report Content to Your Homeserver Administrator": "Pranešti apie turinį serverio administratoriui",
+    "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.": "Pranešant apie šią netinkamą žinutę, serverio administratoriui bus nusiųstas unikalus 'įvykio ID'. Jei žinutės šiame kambaryje yra šifruotos, serverio administratorius negalės perskaityti žinutės teksto ar peržiūrėti failų arba paveikslėlių.",
+    "Send report": "Siųsti pranešimą",
+    "Verify other session": "Patvirtinti kitą seansą",
+    "Are you sure you want to reject the invitation?": "Ar tikrai norite atmesti pakvietimą?",
+    "Share Permalink": "Dalintis nuoroda",
+    "Report Content": "Pranešti",
+    "Nice, strong password!": "Puiku, stiprus slaptažodis!",
+    "Old cryptography data detected": "Aptikti seni kriptografijos duomenys",
+    "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ų.",
+    "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",
+    "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 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",
+    "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",
+    "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)",
+    "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.",
+    "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.",
+    "Invalid theme schema.": "Klaidinga temos schema.",
+    "Error downloading theme information.": "Klaida parsisiunčiant temos informaciją.",
+    "Theme added!": "Tema pridėta!",
+    "Custom theme URL": "Pasirinktinės temos URL",
+    "Add theme": "Pridėti temą",
+    "Theme": "Tema",
+    "Phone numbers": "Telefono numeriai",
+    "Language and region": "Kalba ir regionas",
+    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Sutikite su tapatybės serverio (%(serverName)s) paslaugų teikimo sąlygomis, kad leistumėte kitiems rasti jus pagal el. pašto adresą ar telefono numerį.",
+    "Discovery": "Radimas",
+    "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.",
+    "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.",
+    "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į",
+    "Invalid homeserver discovery response": "Klaidingas serverio radimo atsakas",
+    "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",
+    "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",
+    "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 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ą.",
+    "Got It": "Supratau",
+    "Verify this session by completing one of the following:": "Patvirtinkite šį seansą atlikdami vieną iš šių veiksmų:",
+    "Scan this unique code": "Nuskaitykite šį unikalų kodą",
+    "Compare unique emoji": "Palyginkite unikalius jaustukus",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Palyginkite unikalų jaustukų rinkinį, jei neturite fotoaparato nei viename įrenginyje",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Patvirtinkite, kad žemiau esantys jaustukai yra rodomi abiejuose seansuose, ta pačia tvarka:",
+    "Waiting for %(displayName)s to verify…": "Laukiama kol %(displayName)s patvirtins…",
+    "Cancelling…": "Atšaukiama…",
+    "They match": "Jie sutampa",
+    "They don't match": "Jie nesutampa",
+    "Dog": "Šuo",
+    "Cat": "Katė",
+    "Lion": "Liūtas",
+    "Horse": "Arklys",
+    "Unicorn": "Vienaragis",
+    "Pig": "Kiaulė",
+    "Elephant": "Dramblys",
+    "Rabbit": "Triušis",
+    "Panda": "Panda",
+    "Rooster": "Gaidys",
+    "Penguin": "Pingvinas",
+    "Turtle": "Vėžlys",
+    "Fish": "Žuvis",
+    "Octopus": "Aštunkojis",
+    "Butterfly": "Drugelis",
+    "Flower": "Gėlė",
+    "Tree": "Medis",
+    "Cactus": "Kaktusas",
+    "Mushroom": "Grybas",
+    "Globe": "Gaublys",
+    "Moon": "Mėnulis",
+    "Cloud": "Debesis",
+    "Fire": "Ugnis",
+    "Banana": "Bananas",
+    "Apple": "Obuolys",
+    "Strawberry": "Braškė",
+    "Corn": "Kukurūzas",
+    "Pizza": "Pica",
+    "Cake": "Tortas",
+    "Heart": "Širdis",
+    "Smiley": "Šypsenėlė",
+    "Robot": "Robotas",
+    "Hat": "Skrybėlė",
+    "Glasses": "Akiniai",
+    "Spanner": "Veržliaraktis",
+    "Santa": "Santa",
+    "Thumbs up": "Liuks",
+    "Umbrella": "Skėtis",
+    "Hourglass": "Smėlio laikrodis",
+    "Clock": "Laikrodis",
+    "Gift": "Dovana",
+    "Light bulb": "Lemputė",
+    "Book": "Knyga",
+    "Pencil": "Pieštukas",
+    "Paperclip": "Sąvaržėlė",
+    "Scissors": "Žirklės",
+    "Lock": "Spyna",
+    "Key": "Raktas",
+    "Hammer": "Plaktukas",
+    "Telephone": "Telefonas",
+    "Flag": "Vėliava",
+    "Train": "Traukinys",
+    "Bicycle": "Dviratis",
+    "Aeroplane": "Lėktuvas",
+    "Rocket": "Raketa",
+    "Trophy": "Trofėjus",
+    "Ball": "Kamuolys",
+    "Guitar": "Gitara",
+    "Trumpet": "Trimitas",
+    "Bell": "Varpas",
+    "Anchor": "Inkaras",
+    "Headphones": "Ausinės",
+    "Folder": "Aplankas",
+    "Pin": "Smeigtukas",
+    "Other users may not trust it": "Kiti vartotojai gali nepasitikėti",
+    "Upgrade": "Atnaujinti",
+    "From %(deviceName)s (%(deviceId)s)": "Iš %(deviceName)s (%(deviceId)s)",
+    "Decline (%(counter)s)": "Atsisakyti (%(counter)s)",
+    "Accept <policyLink /> to continue:": "Sutikite su <policyLink />, kad tęstumėte:",
+    "Upload": "Įkelti",
+    "Your homeserver does not support cross-signing.": "Jūsų serveris nepalaiko kryžminio pasirašymo.",
+    "Cross-signing and secret storage are enabled.": "Kryžminis pasirašymas ir slapta saugykla yra įjungti.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Jūsų paskyra slaptoje saugykloje turi kryžminio pasirašymo tapatybę, bet šis seansas dar ja nepasitiki.",
+    "Cross-signing and secret storage are not yet set up.": "Kryžminis pasirašymas ir slapta saugykla dar nėra nustatyti.",
+    "Reset cross-signing and secret storage": "Iš naujo nustatyti kryžminį pasirašymą ir slaptą saugyklą",
+    "Bootstrap cross-signing and secret storage": "Prikabinti kryžminį pasirašymą ir slaptą saugyklą",
+    "Cross-signing public keys:": "Kryžminio pasirašymo vieši raktai:",
+    "Cross-signing private keys:": "Kryžminio pasirašymo privatūs raktai:",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Individualiai patikrinkite kiekvieną vartotojo naudojamą seansą, kad pažymėtumėte jį kaip patikimą, nepasitikint kryžminiu pasirašymu patvirtintais įrenginiais.",
+    "Enable": "Įjungti",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "Atsarginė kopija turi <validity>galiojantį</validity> <verify>patvirtinto</verify> seanso <device></device> parašą",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "Atsarginė kopija turi <validity>galiojantį</validity> <verify>nepatvirtinto</verify> seanso <device></device> parašą",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "Atsarginė kopija turi <validity>negaliojantį</validity> <verify>patvirtinto</verify> seanso <device></device> parašą",
+    "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ą",
+    "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",
+    "Cross-signing": "Kryžminis pasirašymas",
+    "Error changing power level requirement": "Klaida keičiant galios lygio reikalavimą",
+    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Keičiant kambario galios lygio reikalavimus įvyko klaida. Įsitikinkite, kad turite tam leidimą ir bandykite dar kartą.",
+    "Error changing power level": "Klaida keičiant galios lygį",
+    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Keičiant vartotojo galios lygį įvyko klaida. Įsitikinkite, kad turite tam leidimą ir bandykite dar kartą.",
+    "Default role": "Numatytoji rolė",
+    "This user has not verified all of their sessions.": "Šis vartotojas nepatvirtino visų savo seansų.",
+    "You have not verified this user.": "Jūs nepatvirtinote šio vartotojo.",
+    "You have verified this user. This user has verified all of their sessions.": "Jūs patvirtinote šį vartotoją. Šis vartotojas patvirtino visus savo seansus.",
+    "Everyone in this room is verified": "Visi šiame kambaryje yra patvirtinti",
+    "Encrypted by a deleted session": "Užšifruota ištrinto seanso",
+    "Use an identity server in Settings to receive invites directly in %(brand)s.": "Nustatymuose naudokite tapatybės serverį, kad gautumėte pakvietimus tiesiai į %(brand)s.",
+    "%(count)s verified sessions|one": "1 patvirtintas seansas",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Jei nuskaityti aukščiau esančio kodo negalite, patvirtinkite palygindami unikalius jaustukus.",
+    "You've successfully verified your device!": "Jūs sėkmingai patvirtinote savo įrenginį!",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Jūs sėkmingai patvirtinote %(deviceName)s (%(deviceId)s)!",
+    "You've successfully verified %(displayName)s!": "Jūs sėkmingai patvirtinote %(displayName)s!",
+    "Verified": "Patvirtinta",
+    "Got it": "Supratau",
+    "Start verification again from the notification.": "Pradėkite patvirtinimą iš naujo pranešime.",
+    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Norėdami pakviesti nurodydami el. paštą, naudokite tapatybės serverį. <default>Naudokite numatytajį (%(defaultIdentityServerName)s)</default> arba tvarkykite <settings>Nustatymuose</settings>.",
+    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Norėdami pakviesti nurodydami el. paštą, naudokite tapatybės serverį. Tvarkykite <settings>Nustatymuose</settings>.",
+    "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.",
+    "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",
+    "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>.": "Neįmanoma prisijungti prie serverio per HTTP, kai naršyklės juostoje yra HTTPS URL. Naudokite HTTPS arba <a>įjunkite nesaugias rašmenas</a>.",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Jūsų naujas seansas buvo patvirtintas. Jis turi prieigą prie jūsų šifruotų žinučių ir kiti vartotojai matys jį kaip patikimą.",
+    "Your new session is now verified. Other users will see it as trusted.": "Jūsų naujas seansas dabar yra patvirtintas. Kiti vartotojai matys jį kaip patikimą.",
+    "If you don't want to set this up now, you can later in Settings.": "Jei jūs dabar nenorite to nustatyti, galite padaryti tai vėliau Nustatymuose.",
+    "Done": "Atlikta",
+    "No media permissions": "Nėra medijos leidimų",
+    "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.": "Seansas, kurį jūs bandote patvirtinti, nepalaiko QR kodo nuskaitymo arba jaustukų patvirtinimo, kuriuos palaiko %(brand)s. Bandykite su kitu klientu.",
+    "Almost there! Is your other session showing the same shield?": "Beveik atlikta! Ar jūsų kitas seansas rodo tokį patį skydą?",
+    "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",
+    "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",
+    "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",
+    "Show rooms with unread notifications first": "Pirmiausia rodyti kambarius su neperskaitytais pranešimais",
+    "Show shortcuts to recently viewed rooms above the room list": "Rodyti neseniai peržiūrėtų kambarių nuorodas virš kambarių sąrašo",
+    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Leisti atsarginį skambučių pagalbos serverį turn.matrix.org, kai jūsų serveris to neteikia (jūsų IP adresas bus bendrintas pokalbio metu)",
+    "Show previews/thumbnails for images": "Rodyti vaizdų peržiūras/miniatiūras",
+    "IRC display name width": "IRC rodomo vardo plotis",
+    "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.",
+    "⚠ 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",
+    "Composer": "Rašymas",
+    "Autocomplete delay (ms)": "Automatinio užbaigimo vėlinimas (ms)",
+    "Read Marker lifetime (ms)": "Skaitymo žymeklio veikimo laikas (ms)",
+    "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 emoji": "Patvirtinti naudojant jaustukus",
+    "Compare emoji": "Palyginkite jaustukus",
+    "Show image": "Rodyti vaizdą",
+    "Your avatar URL": "Jūsų pseudoportreto URL",
+    "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.": "Jei yra papildomo konteksto, kuris padėtų analizuojant šią problemą, tokio kaip ką jūs darėte tuo metu, kambarių ID, vartotojų ID ir t.t., įtraukite tuos dalykus čia.",
+    "Create a new room with the same name, description and avatar": "Sukurti naują kambarį su tuo pačiu pavadinimu, aprašymu ir pseudoportretu",
+    "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Kambario atnaujinimas yra sudėtingas veiksmas ir paprastai rekomenduojamas, kai kambarys nestabilus dėl klaidų, trūkstamų funkcijų ar saugos spragų.",
+    "To help us prevent this in future, please <a>send us logs</a>.": "Norėdami padėti mums išvengti to ateityje, <a>atsiųskite mums žurnalus</a>.",
+    "Failed to upload image": "Nepavyko įkelti vaizdo",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Pakeitimai atlikti jūsų bendruomenės <bold1>pavadinimui</bold1> ir <bold2>pseudoportretui</bold2> iki 30 minučių gali būti nematomi kitų vartotojų.",
+    "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.": "Norėdami nustatyti filtrą, vilkite bendruomenės pseudoportretą į filtrų skydelį, esantį kairėje ekrano pusėje. Jūs bet kada galite paspausti ant pseudoportreto filtrų skydelyje, kad pamatytumėte tik su ta bendruomene susijusius kambarius ir žmones.",
+    "Upload an avatar:": "Įkelti pseudoportretą:",
+    "Emoji": "Jaustukai",
+    "Emoji Autocomplete": "Jaustukų automatinis užbaigimas",
+    "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.": "Eksportuotas failas leis visiems, kurie gali jį perskaityti, iššifruoti visas užšifruotas žinutes, kurias jūs galite matyti, todėl turėtumėte būti atsargūs, kad jis būtų saugus. Tam padėti, jūs turėtumėte žemiau įvesti slaptafrazę, kuri bus naudojama eksportuotų duomenų užšifravimui. Duomenis bus galima importuoti tik naudojant tą pačią slaptafrazę.",
+    "Jump to start/end of the composer": "Peršokti į rašymo pradžią/pabaigą",
+    "Navigate composer history": "Naršyti rašymo istoriją",
+    "Navigate up/down in the room list": "Naršyti aukštyn/žemyn kambarių saraše",
+    "Select room from the room list": "Pasirinkti kambarį iš kambarių sąrašo",
+    "Collapse room list section": "Sutraukti kambarių sąrašo skyrių",
+    "Expand room list section": "Išplėsti kambarių sąrašo skyrių",
+    "Clear room list filter field": "Išvalyti kambarių sąrašo filtro lauką",
+    "Community IDs cannot be empty.": "Bendruomenių ID negali būti tušti.",
+    "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.",
+    "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ą",
+    "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.",
+    "If you cancel now, you won't complete your operation.": "Jei atšauksite dabar, jūs neužbaigsite savo operacijos.",
+    "Cancel entering passphrase?": "Atšaukti slaptafrazės įvedimą?",
+    "Room name or address": "Kambario pavadinimas arba adresas",
+    "%(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ą",
+    "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.",
+    "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.",
+    "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.",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Teksto žinutė buvo išsiųsta numeriu +%(msisdn)s. Įveskite joje esantį patvirtinimo kodą.",
+    "Low priority": "Žemo prioriteto",
+    "New published address (e.g. #alias:server)": "Naujas paskelbtas adresas (pvz.: #pavadinimas:server)",
+    "Waiting for %(displayName)s to accept…": "Laukiama kol %(displayName)s sutiks…",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Jūsų žinutės yra apsaugotos ir tik jūs ir gavėjas turite unikalius raktus joms atrakinti.",
+    "This client does not support end-to-end encryption.": "Šis klientas nepalaiko visapusio šifravimo.",
+    "Start verification again from their profile.": "Pradėkite patvirtinimą iš naujo jų profilyje.",
+    "The encryption used by this room isn't supported.": "Šiame kambaryje naudojamas šifravimas nėra palaikomas.",
+    "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.",
+    "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>.",
+    "Sign out and remove encryption keys?": "Atsijungti ir pašalinti šifravimo raktus?",
+    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Tai bus jūsų paskyros pavadinimas <span></span> serveryje, arba jūs galite pasirinkti <a>kitą serverį</a>.",
+    "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.": "Valdiklis, esantis %(widgetUrl)s nori patvirtinti jūsų tapatybę. Jei tai leisite, valdiklis galės patvirtinti jūsų vartotojo ID, bet neatliks veiksmų kaip jūs.",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "Ištrinti kambario adresą %(alias)s ir pašalinti %(name)s iš katalogo?",
+    "delete the address.": "ištrinti adresą.",
+    "Preview": "Peržiūrėti",
+    "View": "Žiūrėti",
+    "Confirm encryption setup": "Patvirtinti šifravimo sąranką",
+    "Click the button below to confirm setting up encryption.": "Paspauskite mygtuką žemiau, kad patvirtintumėte šifravimo nustatymą.",
+    "Restore your key backup to upgrade your encryption": "Atkurkite savo atsarginę raktų kopiją, kad atnaujintumėte šifravimą",
+    "Upgrade your encryption": "Atnaujinkite savo šifravimą",
+    "Failed to set topic": "Nepavyko nustatyti temos",
+    "Show typing notifications": "Rodyti spausdinimo pranešimus",
+    "Show hidden events in timeline": "Rodyti paslėptus įvykius laiko juostoje",
+    "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",
+    "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",
+    "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",
+    "Timeline": "Laiko juosta",
+    "Key backup": "Atsarginė raktų kopija",
+    "Where you’re logged in": "Kur esate prisijungę",
+    "A session's public name is visible to people you communicate with": "Seanso viešas pavadinimas yra matomas žmonėms su kuriais jūs bendraujate",
+    "Try scrolling up in the timeline to see if there are any earlier ones.": "Pabandykite slinkti aukštyn laiko juostoje, kad sužinotumėte, ar yra ankstesnių.",
+    "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>": "Tai visam laikui padarys jūsų paskyrą nebetinkama naudoti. Jūs nebegalėsite prisijungti ir niekas nebegalės iš naujo užregistruoti to pačio vartotojo ID. Jūsų paskyra išeis iš visų kambarių, kuriuose ji dalyvauja ir pašalins jūsų paskyros detales iš jūsų tapatybės serverio. <b>Šis veiksmas neatšaukiamas.</b>",
+    "Unable to validate homeserver/identity server": "Neįmanoma patvirtinti serverio/tapatybės serverio",
+    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Nėra sukonfigūruota jokio tapatybės serverio, tad jūs negalite pridėti el. pašto adreso, tam, kad galėtumėte iš naujo nustatyti savo slaptažodį ateityje.",
+    "Enter your custom identity server URL <a>What does this mean?</a>": "Įveskite savo pasirinktinio tapatybės serverio URL <a>Ką tai reiškia?</a>",
+    "Identity Server URL": "Tapatybės serverio URL",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Bandyta įkelti konkrečią vietą šio kambario laiko juostoje, bet jūs neturite leidimo peržiūrėti tos žinutės.",
+    "Failed to load timeline position": "Nepavyko įkelti laiko juostos pozicijos",
+    "Your Matrix account on %(serverName)s": "Jūsų Matrix paskyra %(serverName)s serveryje",
+    "Your Matrix account on <underlinedServerName />": "Jūsų Matrix paskyra <underlinedServerName /> serveryje",
+    "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",
+    "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.",
+    "Manually verify all remote sessions": "Rankiniu būdu patvirtinti visus nuotolinius seansus",
+    "well formed": "gerai suformuotas",
+    "unexpected type": "netikėto tipo",
+    "in memory": "atmintyje",
+    "not found": "nerasta",
+    "in secret storage": "slaptoje saugykloje",
+    "Self signing private key:": "Savarankiško pasirašymo privatus raktas:",
+    "cached locally": "lokaliame podėlyje",
+    "not found locally": "lokaliai nerasta",
+    "User signing private key:": "Vartotojo pasirašymo privatus raktas:",
+    "Secret storage public key:": "Slaptos saugyklos viešas raktas:",
+    "in account data": "paskyros duomenyse",
+    "Homeserver feature support:": "Serverio funkcijų palaikymas:",
+    "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",
+    "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",
+    "Backup has a <validity>valid</validity> signature from this session": "Atsarginė kopija turi <validity>galiojantį</validity> šio seanso parašą",
+    "Backup has an <validity>invalid</validity> signature from this session": "Atsarginė kopija turi <validity>negaliojantį</validity> šio seanso parašą",
+    "This backup is trusted because it has been restored on this session": "Ši atsarginė kopija yra patikima, nes buvo atkurta šiame seanse",
+    "Message search": "Žinučių paieška",
+    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Šio seanso duomenų išvalymas yra negrįžtamas. Šifruotos žinutės bus prarastos, nebent buvo sukurta jų raktų atsarginė kopija.",
+    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Trūksta kai kurių seanso duomenų, įskaitant šifruotų žinučių raktus. Atsijunkite ir prisijunkite, kad tai išspręstumėte, atkurdami raktus iš atsarginės kopijos.",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Nepavyko pasiekti slaptos saugyklos. Patikrinkite, ar įvedėte teisingą atgavimo slaptafrazę.",
+    "Restoring keys from backup": "Raktų atkūrimas iš atsarginės kopijos",
+    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Atsarginės kopijos nepavyko iššifruoti naudojant šį atgavimo raktą: patikrinkite, ar įvedėte teisingą atgavimo raktą.",
+    "Unable to query secret storage status": "Slaptos saugyklos būsenos užklausa neįmanoma",
+    "Unable to set up secret storage": "Neįmanoma nustatyti slaptos saugyklos",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Užšifruotą jūsų raktų kopiją saugosime savo serveryje. Apsaugokite savo atsarginę kopiją naudodami atgavimo slaptafrazę.",
+    "Your keys are being backed up (the first backup could take a few minutes).": "Kuriama jūsų raktų atsarginė kopija (pirmas atsarginės kopijos sukūrimas gali užtrukti kelias minutes).",
+    "Create key backup": "Sukurti atsarginę raktų kopiją",
+    "Unable to create key backup": "Nepavyko sukurti atsarginės raktų kopijos",
+    "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",
+    "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ę.",
+    "Click the button below to confirm deleting these sessions.|other": "Paspauskite žemiau esantį mygtuką, kad patvirtintumėte šių seansų ištrynimą.",
+    "Click the button below to confirm deleting these sessions.|one": "Paspauskite žemiau esantį mygtuką, kad patvirtintumėte šio seanso ištrynimą.",
+    "Connecting to integration manager...": "Jungiamasi prie integracijų tvarkytuvo...",
+    "Cannot connect to integration manager": "Neįmanoma prisijungti prie integracijų tvarkytuvo",
+    "The integration manager is offline or it cannot reach your homeserver.": "Integracijų tvarkytuvas yra išjungtas arba negali pasiekti jūsų serverio.",
+    "Disconnect": "Atsijungti",
+    "Disconnect anyway": "Vis tiek atsijungti",
+    "Credits": "Padėka",
+    "For help with using %(brand)s, click <a>here</a>.": "Norėdami gauti pagalbos naudojant %(brand)s, paspauskite <a>čia</a>.",
+    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "Norėdami gauti pagalbos naudojant %(brand)s, paspauskite <a>čia</a> arba pradėkite pokalbį su mūsų botu pasinaudoję žemiau esančiu mygtuku.",
+    "Bug reporting": "Pranešti apie klaidą",
+    "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",
+    "Versions": "Versijos",
+    "Homeserver is": "Serveris yra",
+    "Import E2E room keys": "Importuoti E2E 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ą.",
+    "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",
+    "Failed to connect to integration manager": "Nepavyko prisijungti prie integracijų tvarkytuvo",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Naudojimasis šiuo valdikliu gali pasidalinti duomenimis <helpIcon /> su %(widgetDomain)s ir jūsų integracijų tvarkytuvu.",
+    "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Prašome <newIssueLink>sukurti naują problemą</newIssueLink> GitHub'e, kad mes galėtume ištirti šią klaidą.",
+    "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Pasakyite mums kas nutiko, arba, dar geriau, sukurkite GitHub problemą su jos apibūdinimu.",
+    "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Prieš pateikiant žurnalus jūs turite <a>sukurti GitHub problemą</a>, kad apibūdintumėte savo problemą.",
+    "GitHub issue": "GitHub problema",
+    "Notes": "Pastabos",
+    "Integrations are disabled": "Integracijos yra išjungtos",
+    "Integrations not allowed": "Integracijos neleidžiamos",
+    "Integration Manager": "Integracijų tvarkytuvas",
+    "This looks like a valid recovery key!": "Tai panašu į galiojantį atgavimo raktą!",
+    "Not a valid recovery key": "Negaliojantis atgavimo raktas",
+    "Recovery key mismatch": "Atgavimo rakto neatitikimas",
+    "Incorrect recovery passphrase": "Neteisinga atgavimo slaptafrazė",
+    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Nepavyko iššifruoti atsarginės kopijos naudojant šią atgavimo slaptafrazę: patikrinkite, ar įvedėte teisingą atgavimo slaptafrazę.",
+    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Prieikite prie savo saugių žinučių istorijos ir nustatykite saugių žinučių siuntimą, įvesdami atgavimo slaptafrazę.",
+    "Access your secure message history and set up secure messaging by entering your recovery key.": "Prieikite prie savo saugių žinučių istorijos ir nustatykite saugių žinučių siuntimą, įvesdami atgavimo raktą.",
+    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Jei pamiršote savo atgavimo raktą, galite <button>nustatyti naujas atgavimo parinktis</button>",
+    "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.": "Susigrąžinkite prieigą prie savo paskyros ir atgaukite šifravimo raktus, saugomus šiame seanse. Be jų jūs negalėsite perskaityti visų savo saugių žinučių bet kuriame seanse.",
+    "Restore": "Atkurti",
+    "Use a different passphrase?": "Naudoti kitą slaptafrazę?",
+    "Repeat your recovery passphrase...": "Pakartokite savo atgavimo slaptafrazę...",
+    "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.": "Nenustatę saugių žinučių atgavimo, negalėsite atkurti užšifruotų žinučių istorijos, jei atsijungsite ar naudosite kitą seansą.",
+    "Set up Secure Message Recovery": "Nustatyti saugių žinučių atgavimą",
+    "Secure your backup with a recovery passphrase": "Apsaugokite savo atsarginę kopiją atgavimo slaptafraze",
+    "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Nenustatę saugių žinučių atgavimo, atsijungdami jūs prarasite savo saugių žinučių istoriją.",
+    "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",
+    "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ą",
+    "Toggle Italics": "Perjungti kursyvą",
+    "Toggle Quote": "Perjungti citatą",
+    "New line": "Nauja eilutė",
+    "Navigate recent messages to edit": "Naršyti naujausius pranešimus redagavimui",
+    "Cancel replying to a message": "Atšaukti atsakymą į žinutę",
+    "Toggle microphone mute": "Perjungti mikrofono nutildymą",
+    "Toggle video on/off": "Perjungti vaizdo įjungimą/išjungimą",
+    "Dismiss read marker and jump to bottom": "Atsisakyti skaitymo žymeklio ir nušokti į apačią",
+    "Jump to oldest unread message": "Nušokti iki seniausios neperskaitytos žinutės",
+    "Upload a file": "Įkelti failą",
+    "Jump to room search": "Nušokti į kambarių paiešką",
+    "Previous/next unread room or DM": "Ankstesnis/sekantis neperskaitytas kambarys arba tiesioginė žinutė",
+    "Previous/next room or DM": "Ankstesnis/sekantis kambarys arba tiesioginė žinutė",
+    "Toggle the top left menu": "Perjungti viršutinį kairės pusės meniu",
+    "Close dialog or context menu": "Uždaryti dialogą arba kontekstinį meniu",
+    "Activate selected button": "Aktyvuoti pasirinktą mygtuką",
+    "Toggle right panel": "Perjungti dešinį skydelį",
+    "Toggle this dialog": "Perjungti šį dialogą",
+    "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ę"
 }
diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index 03777f4870..6369ffed82 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -12,15 +12,13 @@
     "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 Riot to access your microphone/webcam": "Tev varētu būt nepieciešams manuāli atļaut Riot pieslēgties tavam mikrofonam/webkamerai",
+    "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",
     "Default Device": "Noklusējuma ierīce",
     "Microphone": "Mikrofons",
     "Camera": "Kamera",
     "Advanced": "Papildus",
-    "Algorithm": "Algoritms",
     "Always show message timestamps": "Vienmēr rādīt ziņojumu laika zīmogu",
     "Authentication": "Autentifikācija",
-    "Alias (optional)": "Aizstājējvārds (neobligāts)",
     "%(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.",
@@ -37,7 +35,6 @@
     "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)",
-    "Blacklisted": "Melnajā sarakstā iekļautie",
     "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>.",
@@ -48,7 +45,6 @@
     "%(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)",
-    "Claimed Ed25519 fingerprint key": "Ed25519 pieprasītā nospieduma (fingerprint) atslēga",
     "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",
@@ -60,40 +56,29 @@
     "Commands": "Komandas",
     "Confirm password": "Apstiprini paroli",
     "Continue": "Turpināt",
-    "Could not connect to the integration server": "Neizdevās savienoties ar Integrācijas serveri",
     "Create Room": "Izveidot istabu",
     "Cryptography": "Kriptogrāfija",
     "Current password": "Pašreizējā parole",
-    "Curve25519 identity key": "Curve25519 identifikācijas atslēga",
     "Custom": "Pielāgots",
     "Custom level": "Īpašais līmenis",
     "/ddg is not a command": "/ddg nav komanda",
     "Deactivate Account": "Deaktivēt kontu",
     "Decline": "Noraidīt",
     "Decrypt %(text)s": "Atšifrēt %(text)s",
-    "Decryption error": "Atšifrēšanas kļūda",
     "Deops user with given id": "Atceļ operatora statusu lietotājam ar norādīto Id",
     "Default": "Noklusējuma",
-    "Device ID": "Ierīces Id",
-    "device id: ": "ierīces id: ",
-    "Direct chats": "Tiešie čati",
-    "Disable Notifications": "Izslēgt paziņojumus",
     "Disinvite": "Atsaukt",
     "Displays action": "Parāda darbību",
     "Download %(text)s": "Lejupielādēt tekstu: %(text)s",
     "Drop File Here": "Ievelc failu šeit",
-    "Ed25519 fingerprint": "Ed25519 nospiedums (fingerprint), zīmju virkne",
     "Email": "Epasts",
     "Email address": "Epasta adrese",
     "Emoji": "Emocīši (emoji)",
-    "Enable Notifications": "Ieslēgt paziņojumus",
     "%(senderName)s ended the call.": "%(senderName)s beidza zvanu.",
-    "End-to-end encryption information": "\"End-to-End\" (ierīce-ierīce) šifrēšanas informācija",
     "Enter passphrase": "Ievadi paroles frāzi",
     "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.",
-    "Event information": "Notikuma informācija",
     "Existing Call": "Pašreizējā saruna (zvans)",
     "Export": "Eksportēt",
     "Export E2E room keys": "Eksportēt E2E istabas atslēgas",
@@ -114,7 +99,6 @@
     "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 toggle moderator status": "Neizdevās nomainīt moderatora statusu",
     "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 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ņā",
@@ -150,7 +134,6 @@
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Pievienoties kā <voiceText>AUDIO</voiceText> vai <videoText>VIDEO</videoText>.",
     "Join Room": "Pievienoties istabai",
     "%(targetName)s joined the room.": "%(targetName)s pievienojās istabai.",
-    "Joins room with given alias": "Pievienojas istabai ar minēto aliasi (pseidonīmu)",
     "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)",
@@ -159,7 +142,6 @@
     "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.",
-    "Local addresses for this room:": "Šīs istabas lokālās adreses:",
     "Logout": "Izrakstīties",
     "Low priority": "Zemas prioritātes",
     "%(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.",
@@ -173,15 +155,12 @@
     "Moderator": "Moderators",
     "Mute": "Noklusināt (izslēgt skaņu)",
     "Name": "Vārds",
-    "New address (e.g. #foo:%(localDomain)s)": "Jaunā adrese (piemēram #kautkas:%(localDomain)s)",
     "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.",
-    "none": "neviens",
     "not specified": "nav noteikts",
     "Notifications": "Paziņojumi",
     "(not supported by this browser)": "(netiek atbalstīts šajā pārlūkā)",
     "<not supported>": "<netiek atbalstīts>",
-    "NOT verified": "NAV verificēts",
     "No display name": "Nav publiski redzamā vārda",
     "No more results": "Nav tālāko rezultātu",
     "No results": "Nav rezultātu",
@@ -200,20 +179,18 @@
     "Profile": "Profils",
     "Public Chat": "Publiskais čats",
     "Reason": "Iemesls",
-    "Revoke Moderator": "Atcelt moderatoru",
     "Register": "Reģistrēties",
     "%(targetName)s rejected the invitation.": "%(targetName)s noraidīja uzaicinājumu.",
     "Reject invitation": "Noraidīt uzaicinājumu",
-    "Remote addresses for this room:": "Attālinātā adrese šai istabai:",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s dzēsa attēlojamo/redzamo vārdu (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s dzēsa profila attēlu.",
     "Remove": "Dzēst",
     "%(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",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot nav atļauts nosūtīt Tev paziņojumus. Lūdzu pārbaudi sava pārlūka iestatījumus",
-    "Riot was not given permission to send notifications - please try again": "Riot nav piešķirta atļauja nosūtīt paziņojumus. Lūdzu mēģini vēlreiz",
-    "riot-web version:": "Riot-web versija:",
+    "%(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 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",
     "You have no visible notifications": "Tev nav redzamo paziņojumu",
     "This will allow you to reset your password and receive notifications.": "Tas atļaus Tev atiestatīt paroli un saņemt paziņojumus.",
@@ -226,7 +203,6 @@
     "%(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.",
-    "Unknown room %(roomId)s": "Nezināma istaba %(roomId)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",
@@ -249,11 +225,9 @@
     "Room Colour": "Istabas krāsa",
     "Rooms": "Istabas",
     "Save": "Saglabāt",
-    "Scroll to bottom of page": "Aizritināt uz lapas apakšu",
     "Search": "Meklēt",
     "Search failed": "Meklēšana neizdevās",
     "Searches DuckDuckGo for results": "Meklēšanai izmanto DuckDuckGo",
-    "Send anyway": "Nosūtīt jebkurā gadījumā",
     "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 :(",
@@ -267,7 +241,6 @@
     "Sign out": "Izrakstīties",
     "%(count)s of your messages have not been sent.|other": "Dažas no tavām ziņām netika nosūtītas.",
     "Someone": "Kāds",
-    "Start a chat": "Sākt čatu",
     "Start authentication": "Sākt autentifikāciju",
     "Submit": "Iesniegt",
     "Success": "Izdevās",
@@ -290,9 +263,7 @@
     "Unable to verify email address.": "Nav iespējams apstiprināt epasta adresi.",
     "Unban": "Atbanot/atcelt pieejas liegumu",
     "Unable to capture screen": "Neizdevās uzņemt ekrānattēlu",
-    "unencrypted": "nešifrēts",
     "unknown caller": "nezināms zvanītājs",
-    "unknown device": "nezināma ierīce",
     "unknown error code": "nezināms kļūdas kods",
     "Unmute": "Ieslēgt skaņu",
     "Unnamed Room": "Istaba bez nosaukuma",
@@ -301,20 +272,14 @@
     "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> .",
-    "Unrecognised room alias:": "Neatpazīta istabas aliase:",
     "Upload avatar": "Augšuplā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:",
     "Usage": "Lietojums",
-    "Use compact timeline layout": "Izmanto kompaktu laikpaziņojumu skatu",
-    "User ID": "Lietotāja Id",
     "Users": "Lietotāji",
     "Verification Pending": "Gaida verifikāciju",
-    "Verification": "Verifikācija",
-    "verified": "verificēts",
     "Verified key": "Verificēta atslēga",
-    "Start verification": "Sākt verifikāciju",
     "Video call": "VIDEO zvans",
     "Voice call": "AUDIO zvans",
     "VoIP conference finished.": "VoIP konference beidzās.",
@@ -359,7 +324,6 @@
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s nomainīja istabas avataru uz <img/>",
     "Upload an avatar:": "Augšuplādē avataru (profila attēlu):",
     "This server does not support authentication with a phone number.": "Šis serveris neatbalsta autentifikāciju pēc telefona numura.",
-    "Make Moderator": "Piešķirt moderatora statusu",
     "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.",
@@ -372,7 +336,7 @@
     "Start automatically after system login": "Startēt pie ierīces ielādes",
     "Analytics": "Analītika",
     "Options": "Opcijas/iestatījumi",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot ievāc anonīmus analītikas datus, lai varētu uzlabot aplikācijas darbību.",
+    "%(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",
     "Export room keys": "Eksportēt istabas atslēgas",
@@ -389,15 +353,9 @@
     "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",
-    "To continue, please enter your password.": "Lai turpinātu, ievadi savu paroli.",
-    "I verify that the keys match": "Es apstiprinu, ka atslēgas sakrīt",
     "Unable to restore session": "Nav iespējams atjaunot sesiju",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Ja Tu iepriekš izmantoji jaunāku Riot 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 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ā.",
     "Unknown Address": "Nezināma adrese",
-    "Unblacklist": "Atbloķēšanas saraksts",
-    "Blacklist": "Melnais saraksts",
-    "Unverify": "Atverificēt",
-    "Verify...": "Verificē...",
     "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.",
@@ -409,7 +367,6 @@
     "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",
-    "Removed or unknown message type": "Dzēsts vai nezināms ziņas tips",
     "URL Previews": "URL priekšskats",
     "Drop file here to upload": "Ievelc failu šeit lai augšuplādētu",
     " (unsupported)": " (netiek atbalstīts)",
@@ -423,13 +380,10 @@
     "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",
-    "Not a valid Riot keyfile": "Nederīgs Riot atslēgfails",
+    "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?",
     "Skip": "Izlaist",
-    "Share without verifying": "Kopīgot bez verificēšanas",
-    "Ignore request": "Ignorēt pieprasījumu",
-    "Encryption key request": "Šifrēšanas atslēgas pieprasījums",
     "Add a widget": "Pievienot vidžetu",
     "Allow": "Atļaut",
     "and %(count)s others...|other": "un vēl %(count)s citi...",
@@ -464,20 +418,14 @@
     "Unnamed room": "Nenosaukta istaba",
     "Guests can join": "Var pievienoties viesi",
     "The platform you're on": "Izmantotā operētājsistēma",
-    "The version of Riot.im": "Riot.im versija",
+    "The version of %(brand)s": "%(brand)s versija",
     "Your language of choice": "Izvēlētā valoda",
     "Which officially provided instance you are using, if any": "Kuru oficiāli izlaisto versiju izmantojat (ja to darat)",
     "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",
-    "Your identity server's URL": "Tava Identitātes servera URL adrese",
-    "The information being sent to us to help make Riot.im better includes:": "Informācija, kura mums tiek nosūtīta, lai ļautu padarīt Riot.im labāku, ietver:",
+    "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.",
     "Call Failed": "Zvans neizdevās",
-    "Review Devices": "Ierīču pārskats",
-    "Call Anyway": "Vienalga zvanīt",
-    "Answer Anyway": "Vienalga atbildēt",
-    "Call": "Zvans",
-    "Answer": "Atbildēt",
     "%(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?",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Brīdinājums: ikviens, kurš tiek pievienots kopienai būs publiski redzams visiem, kuri zin kopienas Id",
@@ -486,7 +434,6 @@
     "Which rooms would you like to add to this community?": "Kuras istabas vēlies pievienot šai kopienai?",
     "Show these rooms to non-members on the community page and room list?": "Vai ne-biedriem rādīt kopienas lapā un istabu sarakstā šīs istabas?",
     "Add rooms to the community": "Istabu pievienošana kopienai",
-    "Room name or alias": "Istabas nosaukums vai aliase",
     "Add to community": "Pievienot kopienai",
     "Failed to invite the following users to %(groupId)s:": "Neizdevās uzaicināt sekojošus lietotājus grupā %(groupId)s:",
     "Failed to invite users to community": "Neizdevās uzaicināt lietotājus komūnā",
@@ -518,11 +465,8 @@
     "Jump to read receipt": "Pāriet uz izlasīšanas apstiprinājumu",
     "Mention": "Pieminējums/atsauce",
     "Invite": "Uzaicināt",
-    "User Options": "Lietotāja uzstādījumi/opcijas",
     "Send an encrypted reply…": "sūtīt šifrētu atbildi…",
-    "Send a reply (unencrypted)…": "sūtīt NEšifrētu atbildi…",
     "Send an encrypted message…": "rakstīt ziņu (šifrētu)…",
-    "Send a message (unencrypted)…": "rakstīt ziņu (NEšifrētu)…",
     "Jump to message": "Pāriet uz ziņu",
     "No pinned messages.": "Nav piekabinātu ziņu.",
     "Loading...": "Ielāde...",
@@ -556,8 +500,6 @@
     "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.",
     "Copied!": "Nokopēts!",
     "Failed to copy": "Nokopēt neizdevās",
-    "Message removed by %(userId)s": "Ziņu dzēsis %(userId)s",
-    "Message removed": "Ziņa dzēsta",
     "An email has been sent to %(emailAddress)s": "Vēstule tika nosūtīta uz %(emailAddress)s",
     "A text message has been sent to %(msisdn)s": "Teksta ziņa tika nosūtīta uz %(msisdn)s",
     "Remove from community": "Izdzēst no kopienas",
@@ -651,19 +593,16 @@
     "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.",
     "Old cryptography data detected": "Tika uzieti novecojuši šifrēšanas dati",
-    "Data from an older version of Riot 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 Riot 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.",
+    "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.",
     "%(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>?",
-    "Light theme": "Gaiša ādiņa",
-    "Dark theme": "Tumša ādiņa",
     "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.",
     "Learn more about how we use analytics.": "Sīkāk par to, kā tiek izmantota analītika.",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Epasts ir nosūtīts uz %(emailAddress)s. Izmanto epastā nosūtīto tīmekļa saiti un tad noklikšķini zemāk.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Lūdzu ņem vērā, ka Tu pieraksties %(hs)s serverī, nevis matrix.org serverī.",
-    "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 piedāvā šis Riot klients.",
     "Ignores a user, hiding their messages from you": "Ignorē lietotāju, Tev nerādot viņa sūtītās ziņas",
     "Stops ignoring a user, showing their messages going forward": "Atceļ lietotāja ignorēšanu, rādot viņa turpmāk sūtītās ziņas",
     "Notify the whole room": "Paziņot visai istabai",
@@ -700,7 +639,7 @@
     "Long Description (HTML)": "Garais apraksts (HTML)",
     "Community %(groupId)s not found": "Kopiena %(groupId)s nav atrasta",
     "Your Communities": "Tavas kopienas",
-    "Did you know: you can use communities to filter your Riot.im experience!": "Vai zināji: Tu vari izmantot kopienas, lai filtrētu (atlasītu) savu Riot.im pieredzi!",
+    "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",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "Tagad<resendText>visas atkārtoti sūtīt</resendText> vai <cancelText>visas atcelt</cancelText>. Tu vari atzīmēt arī individuālas ziņas, kuras atkārtoti sūtīt vai atcelt.",
@@ -710,7 +649,6 @@
     "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",
     "Fetching third party location failed": "Neizdevās iegūt trešās puses atrašanās vietu",
-    "A new version of Riot is available.": "Pieejama jauna Riot versija.",
     "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",
@@ -727,8 +665,6 @@
     "Send Custom Event": "Sūtīt individuālu notikumu",
     "Advanced notification settings": "Paziņojumu papildus iestatījumi",
     "Failed to send logs: ": "Neizdevās nosūtīt logfailus: ",
-    "delete the alias.": "dzēst aliasi/aizstājējvārdu.",
-    "To return to your account in future you need to <u>set a password</u>": "Lai nākotnē atgrieztos savā kontā, nepieciešams <u>iestatīt paroli</u>",
     "Forget": "Aizmirst",
     "You cannot delete this image. (%(code)s)": "Šo attēlu nevar izdzēst  (%(code)s)",
     "Cancel Sending": "Atcelt sūtīšanu",
@@ -754,7 +690,6 @@
     "Resend": "Nosūtīt atkārtoti",
     "Files": "Faili",
     "Collecting app version information": "Tiek iegūta programmas versijas informācija",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Dzēst istabas aliasi/aizstājējvārdu %(alias)s un dzēst %(name)s no kataloga?",
     "Keywords": "Atslēgvārdi",
     "Enable notifications for this account": "Iespējot paziņojumus šim kontam",
     "Invite to this community": "Uzaicināt šajā kopienā",
@@ -765,7 +700,7 @@
     "Search…": "Meklēju…",
     "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?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot 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ā.",
+    "%(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ā.",
     "Event sent!": "Notikums nosūtīts!",
     "Preparing to send logs": "Gatavojos nosūtīt atutošanas logfailus",
     "Explore Account Data": "Aplūkot konta datus",
@@ -811,8 +746,7 @@
     "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.": "Atutošanas logfaili satur programmas datus, ieskaitot 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.",
     "Unhide Preview": "Rādīt priekšskatījumu",
     "Unable to join network": "Nav iespējams pievienoties tīklam",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Droši vien Tu konfigurēji tās kādā citā Matrix klientā, nevis Riot. Nav iespējams tos pārkonfigurēt ar Riot, bet tie joprojām tiek izmantoti",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Atvaino, diemžēl tavs tīmekļa pārlūks <b>nespēj</b> darbināt Riot.",
+    "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",
@@ -821,7 +755,7 @@
     "Unable to fetch notification target list": "Neizdevās iegūt paziņojumu mērķu sarakstu",
     "Set Password": "Iestatīt paroli",
     "Off": "izslēgts",
-    "Riot does not know how to join a room on this network": "Riot nezin kā pievienoties šajā tīklā esošajai istabai",
+    "%(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",
@@ -836,7 +770,6 @@
     "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...",
-    "There are advanced notifications which are not shown here": "Pastāv papildus paziņojumi, kuri šeit netiek rādīti",
     "e.g. %(exampleValue)s": "piemēram %(exampleValue)s",
     "e.g. <CurrentPageURL>": "piemēram <CurrentPageURL>",
     "Your device resolution": "Tavas iekārtas izšķirtspēja",
@@ -844,8 +777,6 @@
     "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ē",
-    "Your User Agent": "Jūsu lietotāja aģents",
-    "A conference call could not be started because the integrations server is not available": "Konferences zvanu nevarēja sākt, jo integrācijas serveris nav pieejams",
     "Call in Progress": "Notiek zvans",
     "A call is currently being placed!": "Pašlaik notiek saruna!",
     "A call is already in progress!": "Zvans jau notiek!",
@@ -853,7 +784,7 @@
     "You do not have permission to start a conference call in this room": "Šajā istabā nav atļaujas sākt konferences zvanu",
     "Replying With Files": "Atbildot ar failiem",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Šobrīd nav iespējams atbildēt ar failu. Vai vēlaties augšupielādēt šo failu, neatbildot?",
-    "Your Riot is misconfigured": "Jūsu Riot ir nepareizi konfigurēts",
+    "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ēļ"
diff --git a/src/i18n/strings/ml.json b/src/i18n/strings/ml.json
index f181e0d65a..23740fefda 100644
--- a/src/i18n/strings/ml.json
+++ b/src/i18n/strings/ml.json
@@ -23,7 +23,6 @@
     "Microphone": "മൈക്രോഫോൺ",
     "Camera": "ക്യാമറ",
     "Fetching third party location failed": "തേഡ് പാര്‍ട്ടി ലൊക്കേഷന്‍ ഫെച്ച് ചെയ്യാന്‍ കഴിഞ്ഞില്ല",
-    "A new version of Riot is available.": "റയട്ടിന്റെ ഒരു പുതിയ പതിപ്പ് ലഭ്യമാണ്.",
     "All notifications are currently disabled for all targets.": "അറിയിപ്പുകളെല്ലാം നിര്‍ത്തിയിരിയ്ക്കുന്നു.",
     "Uploading report": "റിപ്പോര്‍ട്ട് അപ്ലോഡ് ചെയ്യുന്നു",
     "Sunday": "ഞായര്‍",
@@ -41,8 +40,6 @@
     "Waiting for response from server": "സെര്‍വറില്‍ നിന്നുള്ള പ്രതികരണത്തിന് കാക്കുന്നു",
     "Leave": "വിടവാങ്ങുക",
     "Advanced notification settings": "അറിയപ്പുകളുടെ സങ്കീര്‍ണമായ സജ്ജീകരണങ്ങള്‍",
-    "delete the alias.": "ഏലിയാസ് നീക്കം ചെയ്യുക.",
-    "To return to your account in future you need to <u>set a password</u>": "വീണ്ടും ഈ അക്കൌണ്ട് ഉപയോഗിക്കണമെങ്കില്‍ <u>ഒരു രഹസ്യവാക്ക് സെറ്റ് ചെയ്യുക</u>",
     "Forget": "മറക്കുക",
     "World readable": "ആർക്കും വായിക്കാവുന്നത്",
     "You cannot delete this image. (%(code)s)": "നിങ്ങള്‍ക്ക് ഈ ചിത്രം നീക്കം ചെയ്യാനാകില്ല. (%(code)s)",
@@ -67,7 +64,6 @@
     "Resend": "വീണ്ടും അയയ്ക്കുക",
     "Files": "ഫയലുകള്‍",
     "Collecting app version information": "ആപ്പ് പതിപ്പു വിവരങ്ങള്‍ ശേഖരിക്കുന്നു",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "റൂം ഏലിയാസ് %(alias)s നീക്കം ചെയ്യുകയും %(name)s കള്‍ ഡയറക്ടറിയില്‍ നിന്നും നീക്കം ചെയ്യുകയും ചെയ്യുക ?",
     "Keywords": "കീവേഡുകള്‍",
     "Enable notifications for this account": "ഈ അക്കൌണ്ടില്‍ നോട്ടിഫിക്കേഷനുകള്‍ ഇനേബിള്‍ ചെയ്യുക",
     "Messages containing <span>keywords</span>": "<span>കീവേഡുകള്‍</span>അടങ്ങിയ സന്ദേശങ്ങള്‍ക്ക്",
@@ -76,7 +72,6 @@
     "Enter keywords separated by a comma:": "കീവേഡുകളെ കോമ കൊണ്ട് വേര്‍ത്തിരിച്ച് ടൈപ്പ് ചെയ്യുക :",
     "I understand the risks and wish to continue": "കുഴപ്പമാകാന്‍ സാധ്യതയുണ്ടെന്നെനിയ്ക്കു് മനസ്സിലായി, എന്നാലും മുന്നോട്ട് പോകുക",
     "Remove %(name)s from the directory?": "%(name)s കള്‍ ഡയറക്റ്ററിയില്‍ നിന്നും മാറ്റണോ ?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "റയട്ട് നൂതന ബ്രൌസര്‍ ഫീച്ചറുകള്‍ ഉപയോഗിക്കുന്നു. നിങ്ങളുടെ ബ്രൌസറില്‍ അവയില്‍ പലതും ഇല്ല / പൂര്‍ണ്ണമല്ല .",
     "Unnamed room": "പേരില്ലാത്ത റൂം",
     "All messages (noisy)": "എല്ലാ സന്ദേശങ്ങളും (ഉച്ചത്തിൽ)",
     "Saturday": "ശനി",
@@ -114,8 +109,6 @@
     "Back": "തിരികെ",
     "Unhide Preview": "പ്രിവ്യു കാണിക്കുക",
     "Unable to join network": "നെറ്റ്‍വര്‍ക്കില്‍ ജോയിന്‍ ചെയ്യാന്‍ കഴിയില്ല",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "ഇവ റയട്ടല്ലാതെ മറ്റൊരു ക്ലയന്റില്‍ വച്ച് കോണ്‍ഫിഗര്‍ ചെയ്തതാകാം. റയട്ടില്‍ അവ ലഭിക്കില്ല, എങ്കിലും അവ നിലവിലുണ്ട്",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "ക്ഷമിക്കണം, നിങ്ങളുടെ ബ്രൌസര്‍ റയട്ട് പ്രവര്‍ത്തിപ്പിക്കാന്‍ <b>പര്യാപ്തമല്ല</b>.",
     "Uploaded on %(date)s by %(user)s": "%(date)s ല്‍ %(user)s അപ്ലോഡ് ചെയ്തത്",
     "Messages in group chats": "ഗ്രൂപ്പ് ചാറ്റുകളിലെ സന്ദേശങ്ങള്‍ക്ക്",
     "Yesterday": "ഇന്നലെ",
@@ -125,7 +118,6 @@
     "Set Password": "രഹസ്യവാക്ക് സജ്ജീകരിക്കുക",
     "remove %(name)s from the directory.": "%(name)s ഡയറക്റ്ററിയില്‍ നിന്ന് നീക്കം ചെയ്യുക.",
     "Off": "ഓഫ്",
-    "Riot does not know how to join a room on this network": "ഈ നെറ്റ്‍വര്‍ക്കിലെ ഒരു റൂമില്‍ എങ്ങനെ അംഗമാകാമെന്ന് റയട്ടിന് അറിയില്ല",
     "Mentions only": "മെന്‍ഷനുകള്‍ മാത്രം",
     "Failed to remove tag %(tagName)s from room": "റൂമില്‍ നിന്നും %(tagName)s ടാഗ് നീക്കം ചെയ്യുവാന്‍ സാധിച്ചില്ല",
     "You can now return to your account after signing out, and sign in on other devices.": "നിങ്ങള്‍ക്ക് ഇപ്പോള്‍ സൈന്‍ ഔട്ട് ചെയ്ത ശേഷവും നിങ്ങളുടെ അക്കൌണ്ടിലേക്ക് തിരികെ വരാം, അതു പോലെ മറ്റ് ഡിവൈസുകളില്‍ സൈന്‍ ഇന്‍ ചെയ്യുകയുമാവാം.",
@@ -135,6 +127,5 @@
     "Failed to change settings": "സജ്ജീകരണങ്ങള്‍ മാറ്റുന്നവാന്‍ സാധിച്ചില്ല",
     "View Source": "സോഴ്സ് കാണുക",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "നിങ്ങളുടെ ഇപ്പോളത്തെ ബ്രൌസര്‍ റയട്ട് പ്രവര്‍ത്തിപ്പിക്കാന്‍ പൂര്‍ണമായും പര്യാപത്മല്ല. പല ഫീച്ചറുകളും പ്രവര്‍ത്തിക്കാതെയിരിക്കാം. ഈ ബ്രൌസര്‍ തന്നെ ഉപയോഗിക്കണമെങ്കില്‍ മുന്നോട്ട് പോകാം. പക്ഷേ നിങ്ങള്‍ നേരിടുന്ന പ്രശ്നങ്ങള്‍ നിങ്ങളുടെ ഉത്തരവാദിത്തത്തില്‍ ആയിരിക്കും!",
-    "Checking for an update...": "അപ്ഡേറ്റ് ഉണ്ടോ എന്ന് തിരയുന്നു...",
-    "There are advanced notifications which are not shown here": "ഇവിടെ കാണിക്കാത്ത നൂതന നോട്ടിഫിക്കേഷനുകള്‍ ഉണ്ട്"
+    "Checking for an update...": "അപ്ഡേറ്റ് ഉണ്ടോ എന്ന് തിരയുന്നു..."
 }
diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index da3b56ccc5..f0c9827c06 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -4,7 +4,7 @@
     "This phone number is already in use": "Dette mobilnummeret er allerede i bruk",
     "Failed to verify email address: make sure you clicked the link in the email": "Klarte ikke verifisere e-postadressen: dobbelsjekk at du trykket på lenken i e-posten",
     "The platform you're on": "Platformen du befinner deg på",
-    "The version of Riot.im": "Versjonen av Riot.im",
+    "The version of %(brand)s": "%(brand)s-versjonen",
     "Your language of choice": "Ditt valgte språk",
     "Your homeserver's URL": "Din hjemmetjeners URL",
     "Fetching third party location failed": "Kunne ikke hente tredjeparts lokalisering",
@@ -16,14 +16,13 @@
     "Failed to set direct chat tag": "Kunne ikke angi direkte chat-tagg",
     "Today": "I dag",
     "Files": "Filer",
-    "You are not receiving desktop notifications": "Du mottar ikke skrivebords varsler",
+    "You are not receiving desktop notifications": "Du mottar ikke skrivebordsvarsler",
     "Friday": "Fredag",
     "Notifications": "Varsler",
     "Unable to fetch notification target list": "Kunne ikke hente varsel-mål liste",
     "On": "På",
     "Leave": "Forlat",
     "All notifications are currently disabled for all targets.": "Alle varsler er deaktivert for alle mottakere.",
-    "delete the alias.": "Slett aliaset.",
     "Forget": "Glem",
     "World readable": "Lesbar for alle",
     "You cannot delete this image. (%(code)s)": "Du kan ikke slette dette bildet. (%(code)s)",
@@ -40,7 +39,6 @@
     "Failed to add tag %(tagName)s to room": "Kunne ikke legge til tagg %(tagName)s til rom",
     "Members": "Medlemmer",
     "Noisy": "Bråkete",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Slett rom alias %(alias)s og fjern %(name)s fra katalogen?",
     "Enable notifications for this account": "Aktiver varsler for denne konto",
     "Messages containing <span>keywords</span>": "Meldinger som inneholder <span>nøkkelord</span>",
     "When I'm invited to a room": "Når jeg blir invitert til et rom",
@@ -48,7 +46,7 @@
     "Enter keywords separated by a comma:": "Angi nøkkelord adskilt med komma:",
     "I understand the risks and wish to continue": "Jeg forstår risikoen og ønsker å fortsette",
     "Remove %(name)s from the directory?": "Fjern %(name)s fra katalogen?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot benytter mange avanserte nettleserfunksjoner, og noen av disse er ikke tilgjengelige eller er eksperimentelle på din nåværende nettleser.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s benytter mange avanserte nettleserfunksjoner, og noen av disse er ikke tilgjengelige eller er eksperimentelle på din nåværende nettleser.",
     "Unnamed room": "Rom uten navn",
     "All messages (noisy)": "Alle meldinger (høy)",
     "Direct Chat": "Direkte Chat",
@@ -78,12 +76,12 @@
     "Thursday": "Torsdag",
     "All messages": "Alle meldinger",
     "Unable to join network": "Kunne ikke bli med i nettverket",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Beklager, din nettleser er <b>ikke</b> i stand til å kjøre Riot.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Beklager, din nettleser er <b>ikke</b> i stand til å kjøre %(brand)s.",
     "Uploaded on %(date)s by %(user)s": "Lastet opp den %(date)s av %(user)s",
     "Messages in group chats": "Meldinger i gruppesamtaler",
     "Yesterday": "I går",
     "Low Priority": "Lav Prioritet",
-    "Riot does not know how to join a room on this network": "Riot vet ikke hvordan man kan komme inn på et rom på dette nettverket",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s vet ikke hvordan man kan komme inn på et rom på dette nettverket",
     "An error occurred whilst saving your email notification preferences.": "En feil oppsto i forbindelse med lagring av epost varsel innstillinger.",
     "remove %(name)s from the directory.": "fjern %(name)s fra katalogen.",
     "Off": "Av",
@@ -97,26 +95,18 @@
     "Custom Server Options": "Server-instillinger",
     "Quote": "Sitat",
     "Saturday": "Lørdag",
-    "There are advanced notifications which are not shown here": "Det er avanserte varsler som ikke vises her",
     "Dismiss": "Avvis",
     "Whether or not you're logged in (we don't record your username)": "Om du er logget inn eller ikke (vi lagrer ikke brukernavnet ditt)",
     "Which officially provided instance you are using, if any": "Hvilken offisielle leverte instans som du bruker, hvis noen",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Om du bruker rik-tekstmodus i rik-tekstfeltet",
-    "Your identity server's URL": "Din identitetstjeners URL",
     "e.g. %(exampleValue)s": "f.eks. %(exampleValue)s",
     "Every page you use in the app": "Alle sider du bruker i appen",
     "e.g. <CurrentPageURL>": "f.eks. <CurrentPageURL>",
-    "Your User Agent": "Din brukeragent",
     "Your device resolution": "Din enhets skjermoppløsing",
     "Analytics": "Statistikk",
-    "The information being sent to us to help make Riot.im better includes:": "Informasjonen som blir sendt til oss for å hjelpe oss med å lage Riot.im bedre inkluderer:",
+    "The information being sent to us to help make %(brand)s better includes:": "Informasjonen som blir sendt til oss for å hjelpe oss med å lage %(brand)s bedre inkluderer:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Hvor denne siden inkluderer identifiserende informasjon, sånn som navnet på rommet, brukeren, og gruppe ID, men denne informasjonen blir fjernet før den blir sendt til tjeneren.",
     "Call Failed": "Oppringning mislyktes",
-    "Review Devices": "Se over enheter",
-    "Call Anyway": "Ring likevel",
-    "Answer Anyway": "Svar likevel",
-    "Call": "Ring",
-    "Answer": "Svar",
     "Call Timeout": "Oppringningen be tidsavbrutt",
     "The remote side failed to pick up": "Den andre svarte ikke",
     "Unable to capture screen": "Klarte ikke ta opp skjermen",
@@ -125,7 +115,6 @@
     "VoIP is unsupported": "VoIP er ikke støttet",
     "You cannot place VoIP calls in this browser.": "Du kan ikke ringe via VoIP i denne nettleseren.",
     "You cannot place a call with yourself.": "Du kan ikke ringe deg selv.",
-    "Could not connect to the integration server": "Kunne ikke kople til integrasjons-tjeneren",
     "Call in Progress": "Samtale pågår",
     "A call is currently being placed!": "En samtale holder allerede på å starte",
     "A call is already in progress!": "En samtale er allerede i gang!",
@@ -135,7 +124,6 @@
     "Upload Failed": "Opplasting feilet",
     "Failure to create room": "Klarte ikke å opprette rommet",
     "Server may be unavailable, overloaded, or you hit a bug.": "Tjeneren kan være utilgjengelig, overbelastet, eller du fant en feil.",
-    "Send anyway": "Send likevel",
     "Send": "Send",
     "Sun": "Søn",
     "Mon": "Man",
@@ -169,7 +157,6 @@
     "Which rooms would you like to add to this community?": "Hvilke rom vil du legge til i dette samfunnet?",
     "Show these rooms to non-members on the community page and room list?": "Vis disse rommene til ikke-medlemmer på samfunn-siden og i rom-listen?",
     "Add rooms to the community": "Legg til rom i samfunnet",
-    "Room name or alias": "Rom-navn eller alias",
     "Add to community": "Legg til i samfunn",
     "Failed to invite the following users to %(groupId)s:": "Klarte ikke invitere disse brukerne til %(groupId)s:",
     "Failed to invite users to community": "Klarte ikke å invitere brukere til samfunnet",
@@ -177,19 +164,16 @@
     "Failed to add the following rooms to %(groupId)s:": "Klarte ikke å legge til de følgende rommene til %(groupId)s:",
     "Unnamed Room": "Navnløst rom",
     "Unable to load! Check your network connectivity and try again.": "Klarte ikke laste! Sjekk nettverstilkoblingen din og prøv igjen.",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot har ikke tillatelse til å sende deg varsler - vennligst sjekk nettleserinnstillingene",
-    "Riot was not given permission to send notifications - please try again": "Riot fikk ikke tillatelse til å sende deg varsler - vennligst prøv igjen",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s har ikke tillatelse til å sende deg varsler - vennligst sjekk nettleserinnstillingene",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s fikk ikke tillatelse til å sende deg varsler - vennligst prøv igjen",
     "Unable to enable Notifications": "Klarte ikke slå på Varslinger",
     "This email address was not found": "Denne e-post adressen ble ikke funnet",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "E-post adressen din ser ikke ut til å være koplet til en Matrix-ID på denne hjemmetjeneren.",
-    "Registration Required": "Registrering påkrevd",
-    "You need to register to do this. Would you like to register now?": "Du må registrere deg for å gjøre dette. Vil du registrere deg nå?",
     "Register": "Registrer",
     "Default": "Standard",
     "Restricted": "Begrenset",
     "Moderator": "Moderator",
     "Admin": "Admin",
-    "Start a chat": "Start en samtale",
     "Operation failed": "Operasjon mislyktes",
     "Failed to invite": "Klarte ikke invitere",
     "Failed to invite users to the room:": "Klarte ikke invitere brukere til rommet:",
@@ -212,7 +196,7 @@
     "To use it, just wait for autocomplete results to load and tab through them.": "For å bruke dette, bare vent til autofullfør-resultatene laster, og tab deg gjennom dem.",
     "Upgrades a room to a new version": "Oppgraderer et rom til en ny versjon",
     "Changes your display nickname": "Endrer visningsnavnet ditt",
-    "Chat with Riot Bot": "Chat med Riot Bot",
+    "Chat with %(brand)s Bot": "Chat med %(brand)s Bot",
     "Changes your display nickname in the current room only": "Endrer visningsnavnet ditt kun i det nåværende rommet",
     "Changes your avatar in this current room only": "Endrer avataren din kun i det nåværende rommet",
     "Call failed due to misconfigured server": "Oppringingen feilet på grunn av feil-konfigurert tjener",
@@ -220,7 +204,6 @@
     "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.": "Alternativt kan du prøve å bruke felles tjeneren <code>turn.matrix.org</code>, men dette vil ikke bli like stabilt. I tillegg vil din IP adresse bli delt med denne tjeneren. Dette kan du endre i Innstillinger.",
     "Try using turn.matrix.org": "Prøv å bruke turn.matrix.org",
     "OK": "OK",
-    "A conference call could not be started because the integrations server is not available": "En konferansesamtale kunne ikke startes fordi integrasjons-tjeneren er ikke tilgjengelig",
     "Replying With Files": "Sender svar som fil",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Det er ikke mulig å svare med en fil akkurat nå. Ønsker du å laste opp denne filen uten å svare?",
     "Continue": "Fortsett",
@@ -239,9 +222,7 @@
     "This room has no topic.": "Dette rommet har ingen overskrift.",
     "Sets the room name": "Setter rommets navn",
     "Invites user with given id to current room": "Inviterer brukeren med gitt id til dette rommet",
-    "Joins room with given alias": "Går inn i rommet med gitt alias",
     "Leave room": "Forlat rommet",
-    "Unrecognised room alias:": "Ukjent rom alias:",
     "Kicks user with given id": "Sparker ut bruker med gitt id",
     "Bans user with given id": "Nekter tilgang til bruker med gitt id",
     "Unbans user with given ID": "Gir tilbake tilgang til bruker med gitt ID",
@@ -268,8 +249,7 @@
     "%(targetName)s accepted an invitation.": "%(targetName)s aksepterte en invitasjon.",
     "Add Email Address": "Legg til E-postadresse",
     "Add Phone Number": "Legg til telefonnummer",
-    "The version of Riot": "Riot-versjonen",
-    "Whether you're using Riot on a device where touch is the primary input mechanism": "Hvorvidt du bruker Riot på en enhet som primært mottar inndata gjennom touchskjerm",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Hvorvidt du bruker %(brand)s på en enhet som primært mottar inndata gjennom touchskjerm",
     "Your user agent": "Brukeragenten din",
     "Cancel": "Avbryt",
     "Trust": "Stol på",
@@ -279,8 +259,6 @@
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sendte et bilde.",
     "Someone": "Noen",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s sendte en invitasjon til %(targetDisplayName)s om å bli med i rommet.",
-    "Light theme": "Lyst tema",
-    "Dark theme": "Mørkt tema",
     "Done": "Fullført",
     "%(displayName)s is typing …": "%(displayName)s skriver …",
     "%(names)s and %(count)s others are typing …|other": "%(names)s og %(count)s andre skriver …",
@@ -364,7 +342,6 @@
     "Composer": "Komposør",
     "Timeline": "Tidslinje",
     "Security & Privacy": "Sikkerhet og personvern",
-    "Sessions": "Økter",
     "Camera": "Kamera",
     "Reset": "Nullstill",
     "Browse": "Bla",
@@ -396,7 +373,6 @@
     "Send an encrypted reply…": "Send et kryptert svar …",
     "Send an encrypted message…": "Send en kryptert beskjed …",
     "Send a message…": "Send en melding …",
-    "Send a message (unencrypted)…": "Send en melding (ukryptert) …",
     "Bold": "Fet",
     "Italics": "Kursiv",
     "Strikethrough": "Gjennomstreking",
@@ -419,7 +395,7 @@
     "Security": "Sikkerhet",
     "Got it": "Jeg forstår",
     "Reply": "Svar",
-    "Edit": "Rediger ",
+    "Edit": "Rediger",
     "Attachment": "Vedlegg",
     "Download %(text)s": "Last ned %(text)s",
     "Show all": "Vis alt",
@@ -441,7 +417,6 @@
     "Quick Reactions": "Hurtigreaksjoner",
     "Cancel search": "Avbryt søket",
     "More options": "Flere alternativer",
-    "Blacklist": "Svarteliste",
     "Join": "Bli med",
     "Yes": "Ja",
     "No": "Nei",
@@ -530,10 +505,6 @@
     "Commands": "Kommandoer",
     "Emoji": "Emoji",
     "Users": "Brukere",
-    "verified": "bekreftet",
-    "User ID": "Brukerens ID",
-    "none": "ingen",
-    "Algorithm": "Algoritme",
     "Export": "Eksporter",
     "Import": "Importer",
     "Restore": "Gjenopprett",
@@ -543,10 +514,8 @@
     "Success!": "Suksess!",
     "Set up": "Sett opp",
     "Disable": "Slå av",
-    "Review Sessions": "Gå gjennom økter",
     "Identity server has no terms of service": "Identitetstjeneren har ingen brukervilkår",
     "Enable Emoji suggestions while typing": "Skru på emoji-forslag mens du skriver",
-    "Use compact timeline layout": "Bruk det kompakte tidslinjeoppsettet",
     "Show a placeholder for removed messages": "Vis en stattholder for fjernede meldinger",
     "Show join/leave messages (invites/kicks/bans unaffected)": "Vis meldinger om innvielser/forlatinger (ekskl. invitasjoner/sparkinger/bannlysninger)",
     "Show avatar changes": "Vis avatarendringer",
@@ -640,7 +609,7 @@
     "Check for update": "Let etter oppdateringer",
     "Help & About": "Hjelp/Om",
     "Bug reporting": "Feilrapportering",
-    "riot-web version:": "'riot-web'-versjon:",
+    "%(brand)s version:": "'%(brand)s'-versjon:",
     "olm version:": "olm-versjon:",
     "click to reveal": "klikk for å avsløre",
     "Ignored/Blocked": "Ignorert/Blokkert",
@@ -699,7 +668,6 @@
     " (unsupported)": " (ikke støttet)",
     "Edit message": "Rediger meldingen",
     "Unencrypted": "Ukryptert",
-    "device id: ": "enhets-id: ",
     "Disinvite": "Trekk tilbake invitasjon",
     "Kick": "Spark ut",
     "Deactivate user?": "Vil du deaktivere brukeren?",
@@ -747,12 +715,11 @@
     "Declining …": "Avslår …",
     "edited": "redigert",
     "You're not currently a member of any communities.": "Du er ikke medlem av noen samfunn for øyeblikket.",
-    "Yes, I want to help!": "Ja, jeg vil hjelpe til!",
     "What's new?": "Hva er nytt?",
     "Set Password": "Bestem passord",
     "Your user ID": "Din bruker-ID",
     "Your theme": "Ditt tema",
-    "Riot URL": "Riot-URL",
+    "%(brand)s URL": "%(brand)s-URL",
     "Room ID": "Rom-ID",
     "Widget ID": "Modul-ID",
     "Delete Widget": "Slett modul",
@@ -783,7 +750,7 @@
     "Create Room": "Opprett et rom",
     "Session ID": "Økt-ID",
     "Session key": "Øktnøkkel",
-    "Updating Riot": "Oppdaterer Riot",
+    "Updating %(brand)s": "Oppdaterer %(brand)s",
     "Message edits": "Meldingsredigeringer",
     "This wasn't me": "Det var ikke meg",
     "Send report": "Send inn rapport",
@@ -793,7 +760,6 @@
     "Upload Error": "Opplastingsfeil",
     "Verification Request": "Verifiseringsforespørsel",
     "No backup found!": "Ingen sikkerhetskopier ble funnet!",
-    "Backup restored": "Sikkerhetskopien ble gjenopprettet",
     "Update status": "Oppdater statusen",
     "Country Dropdown": "Nedfallsmeny over land",
     "Server Name": "Tjenernavn",
@@ -820,9 +786,7 @@
     "Search failed": "Søket mislyktes",
     "No more results": "Ingen flere resultater",
     "Fill screen": "Fyll skjermen",
-    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
     "Your profile": "Din profil",
-    "Waiting…": "Venter …",
     "Session verified": "Økten er verifisert",
     "Sign in instead": "Logg inn i stedet",
     "I have verified my email address": "Jeg har verifisert E-postadressen min",
@@ -832,11 +796,6 @@
     "You're signed out": "Du er logget av",
     "Results from DuckDuckGo": "Resultater fra DuckDuckGo",
     "DuckDuckGo Results": "DuckDuckGo-resultater",
-    "unknown device": "ukjent enhet",
-    "Device ID": "Enhets-ID",
-    "Verification": "Verifisering",
-    "unencrypted": "ukryptert",
-    "Event information": "Hendelsesinformasjon",
     "File to import": "Filen som skal importeres",
     "Your recovery key": "Din gjenopprettingsnøkkel",
     "Upgrade your encryption": "Oppgrader krypteringen din",
@@ -885,7 +844,7 @@
     "Identity Server (%(server)s)": "Identitetstjener (%(server)s)",
     "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Hvis du ikke ønsker å bruke <server /> til å oppdage og bli oppdaget av eksisterende kontakter som du kjenner, skriv inn en annen identitetstjener nedenfor.",
     "Enter a new identity server": "Skriv inn en ny identitetstjener",
-    "For help with using Riot, click <a>here</a>.": "For å få hjelp til å bruke Riot, klikk <a>her</a>.",
+    "For help with using %(brand)s, click <a>here</a>.": "For å få hjelp til å bruke %(brand)s, klikk <a>her</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.": "Dersom du har sendt inn en feilrapport på GitHub, kan avlusingsloggbøker hjelpe oss med å finne frem til problemet. Avlusingsloggbøker inneholder programbruksdata inkl. ditt brukernavn, ID-ene eller aliasene til rommene eller gruppene du har besøkt, og brukernavnene til andre brukere. De inneholder ikke noen meldinger.",
     "Submit debug logs": "Send inn avlusingsloggbøker",
     "Clear cache and reload": "Tøm mellomlageret og last inn siden på nytt",
@@ -895,7 +854,7 @@
     "Identity Server is": "Identitetstjeneren er",
     "Access Token:": "Tilgangssjetong:",
     "Import E2E room keys": "Importer E2E-romnøkler",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot samler inn anonyme statistikker for å hjelpe oss med å forbedre programmet.",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s samler inn anonyme statistikker for å hjelpe oss med å forbedre programmet.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privatlivet er viktig for oss, så vi samler ikke inn noe personlig eller identifiserbar data for våre analyser.",
     "Internal room ID:": "Intern rom-ID:",
     "Change room avatar": "Endre rommets avatar",
@@ -919,10 +878,8 @@
     "Who can read history?": "Hvem kan lese historikken?",
     "Scroll to most recent messages": "Hopp bort til de nyeste meldingene",
     "Share Link to User": "Del en lenke til brukeren",
-    "User Options": "Brukerinnstillinger",
     "Filter room members": "Filtrer rommets medlemmer",
     "Send a reply…": "Send et svar …",
-    "Send a reply (unencrypted)…": "Send et svar (ukryptert) …",
     "Code block": "Kodefelt",
     "Replying": "Svarer på",
     "Room %(name)s": "Rom %(name)s",
@@ -955,7 +912,6 @@
     "Encryption enabled": "Kryptering er skrudd på",
     "Encryption not enabled": "Kryptering er ikke skrudd på",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s endret rommets avatar til <img/>",
-    "Message removed": "Meldingen ble fjernet",
     "Something went wrong!": "Noe gikk galt!",
     "Visible to everyone": "Synlig for alle",
     "Checking for an update...": "Leter etter en oppdatering …",
@@ -966,8 +922,6 @@
     "Your avatar URL": "Din avatars URL",
     "Widget added by": "Modulen ble lagt til av",
     "Create new room": "Opprett et nytt rom",
-    "Unverify": "Av-verifiser",
-    "Verify...": "Verifiser …",
     "Language Dropdown": "Språk-nedfallsmeny",
     "Manage Integrations": "Behandle integreringer",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
@@ -984,8 +938,6 @@
     "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s endret avatarene sine",
     "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s endret avataren sin",
     "Custom level": "Tilpasset nivå",
-    "Room alias": "Rom-alias",
-    "Please provide a room alias": "Vennligst skriv inn et rom-alias",
     "And %(count)s more...|other": "Og %(count)s til...",
     "Remove server": "Fjern tjeneren",
     "Matrix": "Matrix",
@@ -995,8 +947,7 @@
     "Send logs": "Send loggbøker",
     "Create Community": "Opprett et samfunn",
     "Please enter a name for the room": "Vennligst skriv inn et navn for rommet",
-    "Set a room alias to easily share your room with other people.": "Velg et rom-alias for å dele rommet ditt enkelt med andre.",
-    "This room is private, and can only be joined by invitation.": "Dette rommet er privat, og man kan kun bli med etter invitasjon",
+    "This room is private, and can only be joined by invitation.": "Dette rommet er privat, og man kan kun bli med etter invitasjon.",
     "Create a public room": "Opprett et offentlig rom",
     "Create a private room": "Opprett et privat rom",
     "Topic (optional)": "Tema (valgfritt)",
@@ -1047,7 +998,6 @@
     "Registration Successful": "Registreringen var vellykket",
     "Create your account": "Opprett kontoen din",
     "Forgotten your password?": "Har du glemt passordet ditt?",
-    "Blacklisted": "Svartelistet",
     "Export room keys": "Eksporter romnøkler",
     "Import room keys": "Importer romnøkler",
     "Go to Settings": "Gå til Innstillinger",
@@ -1080,9 +1030,6 @@
     "They match": "De samsvarer",
     "They don't match": "De samsvarer ikke",
     "in memory": "i minnet",
-    "outdated": "utdatert",
-    "Disable Notifications": "Skru av varsler",
-    "Enable Notifications": "Skru på varsler",
     "Delete Backup": "Slett sikkerhetskopien",
     "Restore from Backup": "Gjenopprett fra sikkerhetskopi",
     "Remove %(email)s?": "Vil du fjerne %(email)s?",
@@ -1125,18 +1072,340 @@
     "was unbanned %(count)s times|one": "fikk bannlysningen sin opphevet",
     "Clear all data": "Tøm alle data",
     "Verify session": "Verifiser økten",
-    "Start verification": "Begynn verifisering",
     "Upload completed": "Opplasting fullført",
     "Unable to upload": "Mislyktes i å laste opp",
     "Username not available": "Brukernavnet er utilgjengelig",
     "Username available": "Brukernavnet er tilgjengelig",
-    "Unknown sessions": "Ukjente økter",
-    "Alias (optional)": "Alias (valgfritt)",
     "Remove for everyone": "Fjern for alle",
     "Remove for me": "Fjern for meg",
     "Syncing...": "Synkroniserer ...",
     "Signing In...": "Logger inn …",
-    "NOT verified": "IKKE verifisert",
     "Calls": "Samtaler",
-    "Room List": "Romliste"
+    "Room List": "Romliste",
+    "Never send encrypted messages to unverified sessions from this session": "Aldri send krypterte meldinger til uverifiserte økter fra denne økten",
+    "Verify yourself & others to keep your chats safe": "Verifiser deg selv og andre for å holde samtalene dine trygge",
+    "Cross-signing and secret storage are enabled.": "Kryssignering og hemmelig lagring er skrudd på.",
+    "Cross-signing and secret storage are not yet set up.": "Kryssignering og hemmelig lagring er ikke satt enda.",
+    "Reset cross-signing and secret storage": "Tilbakestill kryssignering og hemmelig lagring",
+    "Bootstrap cross-signing and secret storage": "Iverksett kryssignering og hemmelig lagring",
+    "Cross-signing public keys:": "Offentlige nøkler for kryssignering:",
+    "Cross-signing private keys:": "Private nøkler for kryssignering:",
+    "Self signing private key:": "Selvsignert privat nøkkel:",
+    "User signing private key:": "Brukersignert privat nøkkel:",
+    "Session backup key:": "Øktsikkerhetskopieringsnøkkel:",
+    "Secret storage public key:": "Offentlig nøkkel for hemmelig lagring:",
+    "Homeserver feature support:": "Hjemmetjener-funksjonsstøtte:",
+    "Read Marker lifetime (ms)": "Lesemarkørens visningstid (ms)",
+    "Read Marker off-screen lifetime (ms)": "Lesemarkørens visningstid utenfor skjermen (ms)",
+    "Cross-signing": "Kryssignering",
+    "Where you’re logged in": "Der du er pålogget",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Behandle navnene til samt logge av dine økter nedenfor eller <a>verifiser dem i brukerprofilen din</a>.",
+    "Learn more about how we use analytics.": "Lær mer om hvordan vi bruker statistikker.",
+    "Showing flair for these communities:": "Viser merkeskilt for disse samfunnene:",
+    "URL previews are enabled by default for participants in this room.": "URL-forhåndsvisninger er skrudd på som standard for deltakerene i dette rommet.",
+    "URL previews are disabled by default for participants in this room.": "URL-forhåndsvisninger er skrudd av som standard for deltakerene i dette rommet.",
+    "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.": "I krypterte rom som denne, er URL-forhåndsvisninger skrudd av som standard for å sikre at hjemmetjeneren din (der forhåndsvisningene blir generert) ikke kan samle inn informasjon om lenkene som du ser i dette rommet.",
+    "Confirm adding email": "Bekreft tillegging av E-postadresse",
+    "Confirm adding phone number": "Bekreft tillegging av telefonnummer",
+    "Setting up keys": "Setter opp nøkler",
+    "Review where you’re logged in": "Gå gjennom der du er pålogget",
+    "New login. Was this you?": "En ny pålogging. Var det deg?",
+    "Sign In or Create Account": "Logg inn eller lag en konto",
+    "Use an identity server": "Bruk en identitetstjener",
+    "Command failed": "Kommandoen mislyktes",
+    "Could not find user in room": "Klarte ikke å finne brukeren i rommet",
+    "Session already verified!": "Økten er allerede verifisert!",
+    "Displays information about a user": "Viser informasjon om en bruker",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s bannlyste %(targetName)s.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s endret visningsnavnet sitt til %(displayName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s satte visningsnavnet sitt til %(displayName)s.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s fjernet visningsnavnet sitt (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s fjernet profilbildet sitt.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s endret profilbildet sitt.",
+    "%(senderName)s made no change.": "%(senderName)s gjorde ingen endringer.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s avslo invitasjonen.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s trakk tilbake invitasjonen til %(targetName)s.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s sparket ut %(targetName)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s endret temaet til «%(topic)s».",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s fjernet rommets navn.",
+    "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s oppgraderte dette rommet.",
+    "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s gjorde rommet offentlig for alle som kjenner til denne lenken.",
+    "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s har tillatt gjester å bli med i rommet.",
+    "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s har hindret gjester fra å bli med i rommet.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s fjernet hovedadressen til dette rommet.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s endret adressene til dette rommet.",
+    "%(senderName)s answered the call.": "%(senderName)s svarte på oppringingen.",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s gikk fra %(fromPowerLevel)s til %(toPowerLevel)s",
+    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s-modulen ble endret på av %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s-modulen ble lagt til av %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s-modulen ble fjernet av %(senderName)s",
+    "Your %(brand)s is misconfigured": "Ditt %(brand)s-oppsett er feiloppsatt",
+    "a few seconds from now": "om noen sekunder fra nå",
+    "about a minute from now": "rundt et minutt fra nå",
+    "%(num)s minutes from now": "%(num)s minutter fra nå",
+    "about an hour from now": "rundt en time fra nå",
+    "%(num)s hours from now": "%(num)s timer fra nå",
+    "about a day from now": "rundt en dag fra nå",
+    "%(num)s days from now": "%(num)s dager fra nå",
+    "Not a valid %(brand)s keyfile": "Ikke en gyldig %(brand)s-nøkkelfil",
+    "Unrecognised address": "Adressen ble ikke gjenkjent",
+    "Unknown server error": "Ukjent tjenerfeil",
+    "Recent years are easy to guess": "Nylige år er lette å gjette",
+    "Dates are often easy to guess": "Datoer er ofte lette å gjette",
+    "This is a top-10 common password": "Dette er et topp-10 vanlig passord",
+    "This is a top-100 common password": "Dette er et topp-100 vanlig passord",
+    "Message Pinning": "Meldingsklistring",
+    "Aeroplane": "Fly",
+    "Verify all your sessions to ensure your account & messages are safe": "Verifiser alle øktene dine for å sikre at kontoen og meldingene dine er trygge",
+    "From %(deviceName)s (%(deviceId)s)": "Fra %(deviceName)s (%(deviceId)s)",
+    "Decline (%(counter)s)": "Avslå (%(counter)s)",
+    "Upload new:": "Last opp ny:",
+    "No display name": "Ingen visningsnavn",
+    "New passwords don't match": "De nye passordene samsvarer ikke",
+    "Passwords can't be empty": "Passord kan ikke være tomme",
+    "Do you want to set an email address?": "Vil du velge en E-postadresse?",
+    "unexpected type": "uventet type",
+    "Delete sessions|other": "Slett økter",
+    "Delete sessions|one": "Slett økten",
+    "Clear notifications": "Tøm varsler",
+    "Disconnect anyway": "Koble fra likevel",
+    "You have not ignored anyone.": "Du har ikke ignorert noen.",
+    "You are not subscribed to any lists": "Du er ikke abonnert på noen lister",
+    "Uploaded sound": "Lastet opp lyd",
+    "Notify everyone": "Varsle alle",
+    "Muted Users": "Dempede brukere",
+    "Incorrect verification code": "Ugyldig verifiseringskode",
+    "Unable to add email address": "Klarte ikke å legge til E-postadressen",
+    "Invite only": "Kun ved invitasjon",
+    "Close preview": "Lukk forhåndsvisning",
+    "Failed to kick": "Mislyktes i å sparke ut",
+    "Unban this user?": "Vil du oppheve bannlysingen av denne brukeren?",
+    "Ban this user?": "Vil du bannlyse denne brukeren?",
+    "Demote yourself?": "Vil du degradere deg selv?",
+    "Demote": "Degrader",
+    "and %(count)s others...|other": "og %(count)s andre …",
+    "and %(count)s others...|one": "og én annen …",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (styrkenivå %(powerLevelNumber)s)",
+    "Hangup": "Legg på røret",
+    "The conversation continues here.": "Samtalen fortsetter her.",
+    "Jump to message": "Hopp til meldingen",
+    "System Alerts": "Systemvarsler",
+    "Rejecting invite …": "Avslår invitasjonen …",
+    "You were kicked from %(roomName)s by %(memberName)s": "Du ble sparket ut fra %(roomName)s av %(memberName)s",
+    "Reason: %(reason)s": "Årsak: %(reason)s",
+    "You were banned from %(roomName)s by %(memberName)s": "Du ble bannlyst fra %(roomName)s av %(memberName)s",
+    "Do you want to chat with %(user)s?": "Vil du prate med %(user)s?",
+    "Do you want to join %(roomName)s?": "Vil du bli med i %(roomName)s?",
+    "Reject & Ignore user": "Avslå og ignorer brukeren",
+    "This room has already been upgraded.": "Dette rommet har allerede blitt oppgradert.",
+    "Unknown Command": "Ukjent kommando",
+    "Revoke invite": "Trekk tilbake invitasjonen",
+    "Invited by %(sender)s": "Invitert av %(sender)s",
+    "Mark all as read": "Merk alle som lest",
+    "Other published addresses:": "Andre publiserte adresser:",
+    "Invalid community ID": "Ugyldig samfunns-ID",
+    "Waiting for %(displayName)s to accept…": "Venter på at %(displayName)s skal akseptere …",
+    "Your homeserver": "Hjemmetjeneren din",
+    "%(count)s verified sessions|other": "%(count)s verifiserte økter",
+    "Hide verified sessions": "Skjul verifiserte økter",
+    "Remove from community": "Fjern fra samfunnet",
+    "Error decrypting audio": "Feil under dekryptering av lyd",
+    "Decrypt %(text)s": "Dekrypter %(text)s",
+    "You verified %(name)s": "Du verifiserte %(name)s",
+    "were kicked %(count)s times|other": "ble sparket ut %(count)s ganger",
+    "was kicked %(count)s times|other": "ble sparket ut %(count)s ganger",
+    "Some characters not allowed": "Noen tegn er ikke tillatt",
+    "You have entered an invalid address.": "Du har skrevet inn en ugyldig adresse.",
+    "Invite anyway": "Inviter likevel",
+    "Enable end-to-end encryption": "Aktiver start-til-mål-kryptering",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "Du kan ikke skru dette av senere. Broer og mange botter vil ikke fungere enda.",
+    "View Servers in Room": "Vis tjenerne i rommet",
+    "a key signature": "en nøkkelsignatur",
+    "Send Logs": "Send loggbøker",
+    "Command Help": "Kommandohjelp",
+    "Share Permalink": "Del en permalenke",
+    "Who can join this community?": "Hvem kan bli med i dette samfunnet?",
+    "Long Description (HTML)": "Lang beskrivelse (HTML)",
+    "Welcome to %(appName)s": "Velkommen til %(appName)s",
+    "Send a Direct Message": "Send en direktemelding",
+    "Failed to leave room": "Mislyktes i å forlate rommet",
+    "Connectivity to the server has been lost.": "Tilkoblingen til tjeneren er nede.",
+    "Click to unmute video": "Klikk for å høre videoen",
+    "Click to mute video": "Klikk for å dempe videoen",
+    "Click to unmute audio": "Klikk for å høre lyden",
+    "Click to mute audio": "Klikk for å dempe lyden",
+    "Uploading %(filename)s and %(count)s others|zero": "Laster opp %(filename)s",
+    "Could not load user profile": "Klarte ikke å laste inn brukerprofilen",
+    "Verify this login": "Verifiser denne påloggingen",
+    "A new password must be entered.": "Et nytt passord må bli skrevet inn.",
+    "New passwords must match each other.": "De nye passordene må samsvare med hverandre.",
+    "This account has been deactivated.": "Denne kontoen har blitt deaktivert.",
+    "Incorrect username and/or password.": "Feil brukernavn og/eller passord.",
+    "Set a display name:": "Velg et visningsnavn:",
+    "Continue with previous account": "Fortsett med tidligere konto",
+    "Clear personal data": "Tøm personlige data",
+    "Passphrases must match": "Passfrasene må samsvare",
+    "Passphrase must not be empty": "Passfrasen kan ikke være tom",
+    "Confirm passphrase": "Bekreft passfrasen",
+    "Great! This recovery passphrase looks strong enough.": "Strålende! Denne gjenopprettingspassfrasen ser solid nok ut.",
+    "Enter a recovery passphrase": "Skriv inn en gjenopprettingspassfrase",
+    "Set up with a recovery key": "Sett det opp med en gjenopprettingsnøkkel",
+    "That matches!": "Det samsvarer!",
+    "That doesn't match.": "Det samsvarer ikke.",
+    "Go back to set it again.": "Gå tilbake for å velge på nytt.",
+    "Enter your recovery passphrase a second time to confirm it.": "Skriv inn gjenopprettingspassfrasen din en andre gang for å bekrefte den.",
+    "Confirm your recovery passphrase": "Bekreft gjenopprettingspassfrasen din",
+    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your recovery passphrase.": "Gjenopprettingsnøkkelen din er et sikkerhetsnett - du kan bruke den til å gjenopprette tilgangen til dine krypterte meldinger dersom du glemmer gjenopprettingspassfrasen din.",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Ha en kopi av den på et trygt sted, f.eks. en passordbehandler eller til og med i en safe.",
+    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Gjenopprettingsnøkkelen din har blitt <b>kopiert til utklippstavlen din</b>, lim den inn i:",
+    "Your recovery key is in your <b>Downloads</b> folder.": "Gjenopprettingsnøkkelen din er i <b>Nedlastinger</b>-mappen din.",
+    "<b>Print it</b> and store it somewhere safe": "<b>Skriv den ut</b> og lagre den på et sikkert sted",
+    "<b>Save it</b> on a USB key or backup drive": "<b>Lagre den</b> på en USB-pinne eller backup-harddisk",
+    "<b>Copy it</b> to your personal cloud storage": "<b>Kopier den</b> til din personlige skylagring",
+    "Make a copy of your recovery key": "Lag en kopi av gjenopprettingsnøkkelen din",
+    "Please enter your recovery passphrase a second time to confirm.": "Skriv inn gjenopprettingspassfrasen din en andre gang for å bekrefte.",
+    "Repeat your recovery passphrase...": "Gjenta gjenopprettingspassfrasen din …",
+    "Other users may not trust it": "Andre brukere kan kanskje mistro den",
+    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reagerte med %(content)s</reactedWith>",
+    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith> reagerte med %(shortName)s</reactedWith>",
+    "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s kan ikke forhåndsvises. Vil du bli med i den?",
+    "Messages in this room are end-to-end encrypted.": "Meldinger i dette rommet er start-til-slutt-kryptert.",
+    "Messages in this room are not end-to-end encrypted.": "Meldinger i dette rommet er ikke start-til-slutt-kryptert.",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Meldinger i dette rommet er start-til-slutt-kryptert. Lær mer og verifiser denne brukeren i brukerprofilen deres.",
+    "Use a different passphrase?": "Vil du bruke en annen passfrase?",
+    "Emoji picker": "Emojivelger",
+    "Jump to read receipt": "Hopp til lesekvitteringen",
+    "Mention": "Nevn",
+    "Community Name": "Samfunnets navn",
+    "Dismiss read marker and jump to bottom": "Avføy lesekvitteringen og hopp ned til bunnen",
+    "If you cancel now, you won't complete verifying your other session.": "Hvis du avbryter nå, vil du ikke ha fullført verifiseringen av den andre økten din.",
+    "Room name or address": "Rommets navn eller adresse",
+    "Light": "Lys",
+    "Dark": "Mørk",
+    "Verify your other session using one of the options below.": "Verifiser den andre økten din med en av metodene nedenfor.",
+    "User %(user_id)s does not exist": "Brukeren %(user_id)s eksisterer ikke",
+    "Use a few words, avoid common phrases": "Bruk noen få ord, unngå vanlig fraser",
+    "I want to help": "Jeg vil hjelpe til",
+    "Ok": "OK",
+    "Set password": "Bestem passord",
+    "Encryption upgrade available": "Krypteringsoppdatering tilgjengelig",
+    "Verify the new login accessing your account: %(name)s": "Verifiser den nye påloggingen som vil ha tilgang til kontoen din: %(name)s",
+    "Restart": "Start på nytt",
+    "Font scaling": "Skrifttypeskalering",
+    "Font size": "Skriftstørrelse",
+    "You've successfully verified this user.": "Du har vellykket verifisert denne brukeren.",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Venter på at den andre økten din, %(deviceName)s (%(deviceId)s), skal verifisere …",
+    "Waiting for your other session to verify…": "Venter på at den andre økten din skal verifisere …",
+    "Santa": "Julenisse",
+    "Delete %(count)s sessions|other": "Slett %(count)s økter",
+    "Delete %(count)s sessions|one": "Slett %(count)s økt",
+    "Backup version: ": "Sikkerhetskopiversjon: ",
+    "wait and try again later": "vent og prøv igjen senere",
+    "Size must be a number": "Størrelsen må være et nummer",
+    "Customise your appearance": "Tilpass utseendet du bruker",
+    "Labs": "Laboratoriet",
+    "eg: @bot:* or example.org": "f.eks.: @bot:* eller example.org",
+    "To link to this room, please add an address.": "For å lenke til dette rommet, vennligst legg til en adresse.",
+    "Remove %(phone)s?": "Vil du fjerne %(phone)s?",
+    "Online for %(duration)s": "På nett i %(duration)s",
+    "Favourites": "Favoritter",
+    "Create room": "Opprett et rom",
+    "People": "Folk",
+    "Sort by": "Sorter etter",
+    "Activity": "Aktivitet",
+    "A-Z": "A-Å",
+    "Unread rooms": "Uleste rom",
+    "Always show first": "Alltid vis først",
+    "Show": "Vis",
+    "Message preview": "Meldingsforhåndsvisning",
+    "Leave Room": "Forlat rommet",
+    "This room has no local addresses": "Dette rommet har ikke noen lokale adresser",
+    "Waiting for you to accept on your other session…": "Venter på at du aksepterer på den andre økten din …",
+    "Remove recent messages by %(user)s": "Fjern nylige meldinger fra %(user)s",
+    "Remove %(count)s messages|other": "Slett %(count)s meldinger",
+    "Remove %(count)s messages|one": "Slett 1 melding",
+    "Almost there! Is your other session showing the same shield?": "Nesten fremme! Viser den andre økten din det samme skjoldet?",
+    "You've successfully verified your device!": "Du har vellykket verifisert enheten din!",
+    "You've successfully verified %(deviceName)s (%(deviceId)s)!": "Du har vellykket verifisert %(deviceName)s (%(deviceId)s)!",
+    "You've successfully verified %(displayName)s!": "Du har vellykket verifisert %(displayName)s!",
+    "You cancelled verification on your other session.": "Du avbrøt verifiseringen på den andre økten din.",
+    "You sent a verification request": "Du sendte en verifiseringsforespørsel",
+    "Error decrypting video": "Feil under dekryptering av video",
+    "Message deleted": "Meldingen ble slettet",
+    "Message deleted by %(name)s": "Meldingen ble slettet av %(name)s",
+    "Click here to see older messages.": "Klikk for å se eldre meldinger.",
+    "Add an Integration": "Legg til en integrering",
+    "Can't load this message": "Klarte ikke å laste inn denne meldingen",
+    "Categories": "Kategorier",
+    "Popout widget": "Utsprettsmodul",
+    "QR Code": "QR-kode",
+    "Room address": "Rommets adresse",
+    "This address is available to use": "Denne adressen er allerede i bruk",
+    "ex. @bob:example.com": "f.eks. @bob:example.com",
+    "Failed to send logs: ": "Mislyktes i å sende loggbøker: ",
+    "Incompatible Database": "Inkompatibel database",
+    "Event Content": "Hendelsesinnhold",
+    "Verification Requests": "Verifiseringsforespørsler",
+    "Integrations are disabled": "Integreringer er skrudd av",
+    "Integrations not allowed": "Integreringer er ikke tillatt",
+    "Confirm to continue": "Bekreft for å fortsette",
+    "Clear cache and resync": "Tøm mellomlageret og synkroniser på nytt",
+    "Manually export keys": "Eksporter nøkler manuelt",
+    "Use this session to verify your new one, granting it access to encrypted messages:": "Bruk denne økten til å verifisere din nye økt, som vil gi den tilgang til krypterte meldinger:",
+    "If you didn’t sign in to this session, your account may be compromised.": "Dersom det ikke var du som logget deg på økten, kan kontoen din ha blitt kompromittert.",
+    "Automatically invite users": "Inviter brukere automatisk",
+    "Verification Pending": "Avventer verifisering",
+    "Username invalid: %(errMessage)s": "Brukernavnet er ugyldig: %(errMessage)s",
+    "An error occurred: %(error_string)s": "En feil oppstod: %(error_string)s",
+    "Share Room": "Del rommet",
+    "Share User": "Del brukeren",
+    "Upload %(count)s other files|other": "Last opp %(count)s andre filer",
+    "Upload %(count)s other files|one": "Last opp %(count)s annen fil",
+    "Appearance": "Utseende",
+    "Verify other session": "Verifiser en annen økt",
+    "Keys restored": "Nøklene ble gjenopprettet",
+    "Address (optional)": "Adresse (valgfritt)",
+    "Reject invitation": "Avslå invitasjonen",
+    "Resend edit": "Send redigeringen på nytt",
+    "Resend removal": "Send slettingen på nytt",
+    "Start authentication": "Begynn autentisering",
+    "The email field must not be blank.": "E-postfeltet kan ikke stå tomt.",
+    "The username field must not be blank.": "Brukernavnfeltet kan ikke stå tomt.",
+    "The phone number field must not be blank.": "Telefonnummerfeltet kan ikke stå tomt.",
+    "The password field must not be blank.": "Passordfeltet kan ikke stå tomt.",
+    "Couldn't load page": "Klarte ikke å laste inn siden",
+    "Add to summary": "Legg til i oppsummeringen",
+    "Unable to accept invite": "Klarte ikke å akseptere invitasjonen",
+    "Unable to join community": "Klarte ikke å bli med i samfunnet",
+    "Unable to leave community": "Klarte ikke å forlate samfunnet",
+    "You are an administrator of this community": "Du er en administrator i dette samfunnet",
+    "You are a member of this community": "Du er et medlem av dette samfunnet",
+    "Failed to load %(groupId)s": "Klarte ikke å laste inn %(groupId)s",
+    "Liberate your communication": "Frigjør kommunikasjonen din",
+    "Explore Public Rooms": "Utforsk offentlige rom",
+    "Create a Group Chat": "Opprett en gruppechat",
+    "Review terms and conditions": "Gå gjennom betingelser og vilkår",
+    "delete the address.": "slette adressen.",
+    "%(count)s of your messages have not been sent.|one": "Meldingen din ble ikke sendt.",
+    "Jump to first invite.": "Hopp til den første invitasjonen.",
+    "You seem to be uploading files, are you sure you want to quit?": "Du ser til å laste opp filer, er du sikker på at du vil avslutte?",
+    "Switch to light mode": "Bytt til lys modus",
+    "Switch to dark mode": "Bytt til mørk modus",
+    "Switch theme": "Bytt tema",
+    "All settings": "Alle innstillinger",
+    "Feedback": "Tilbakemelding",
+    "Emoji Autocomplete": "Auto-fullfør emojier",
+    "Confirm encryption setup": "Bekreft krypteringsoppsett",
+    "Create key backup": "Opprett nøkkelsikkerhetskopi",
+    "Set up Secure Messages": "Sett opp sikre meldinger",
+    "Toggle Bold": "Veksle fet",
+    "Toggle Italics": "Veksle kursiv",
+    "Toggle Quote": "Veksle siteringsformat",
+    "Upload a file": "Last opp en fil",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Bekreft at emotene nedenfor vises på begge økter, i samme rekkefølge:",
+    "Not sure of your password? <a>Set a new one</a>": "Er du usikker på passordet ditt? <a>Velg et nytt et</a>",
+    "Sign in to your Matrix account on %(serverName)s": "Logg inn på Matrix-kontoen din på %(serverName)s",
+    "Sign in to your Matrix account on <underlinedServerName />": "Logg inn på Matrix-kontoen din på <underlinedServerName />",
+    "If you've joined lots of rooms, this might take a while": "Hvis du har blitt med i mange rom, kan dette ta en stund",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Den nye økten din er nå verifisert. Den har tilgang til dine krypterte meldinger, og andre brukere vil se at den blir stolt på."
 }
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 95a49bce8c..bb0fb5def6 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -5,7 +5,6 @@
     "Access Token:": "Toegangstoken:",
     "Admin": "Beheerder",
     "Advanced": "Geavanceerd",
-    "Algorithm": "Algoritme",
     "Always show message timestamps": "Altijd tijdstempels van berichten tonen",
     "Authentication": "Authenticatie",
     "%(items)s and %(lastItem)s": "%(items)s en %(lastItem)s",
@@ -24,7 +23,6 @@
     "Ban": "Verbannen",
     "Banned users": "Verbannen gebruikers",
     "Bans user with given id": "Verbant de gebruiker met de gegeven ID",
-    "Blacklisted": "Geblokkeerd",
     "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>.",
     "Change Password": "Wachtwoord veranderen",
@@ -43,9 +41,8 @@
     "Commands": "Opdrachten",
     "Confirm password": "Bevestig wachtwoord",
     "Continue": "Doorgaan",
-    "Could not connect to the integration server": "Verbinding met de integratieserver is mislukt",
     "Cancel": "Annuleren",
-    "Accept": "Aanvaarden",
+    "Accept": "Aannemen",
     "Active call (%(roomName)s)": "Actieve oproep (%(roomName)s)",
     "Add": "Toevoegen",
     "Add a topic": "Voeg een onderwerp toe",
@@ -53,11 +50,10 @@
     "No Microphones detected": "Geen microfoons gevonden",
     "No Webcams detected": "Geen webcams gevonden",
     "No media permissions": "Geen mediatoestemmingen",
-    "You may need to manually permit Riot to access your microphone/webcam": "U moet Riot wellicht handmatig toestaan uw microfoon/webcam te gebruiken",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "U moet %(brand)s wellicht handmatig toestaan uw microfoon/webcam te gebruiken",
     "Default Device": "Standaardapparaat",
     "Microphone": "Microfoon",
     "Camera": "Camera",
-    "Alias (optional)": "Bijnaam (optioneel)",
     "Anyone": "Iedereen",
     "Are you sure you want to leave the room '%(roomName)s'?": "Weet u zeker dat u het gesprek ‘%(roomName)s’ wilt verlaten?",
     "Close": "Sluiten",
@@ -81,11 +77,9 @@
     "Failed to change password. Is your password correct?": "Wijzigen van wachtwoord is mislukt. Is uw wachtwoord juist?",
     "Moderator": "Moderator",
     "Name": "Naam",
-    "none": "geen",
     "not specified": "niet opgegeven",
     "(not supported by this browser)": "(niet ondersteund door deze browser)",
     "<not supported>": "<niet ondersteund>",
-    "NOT verified": "NIET geverifieerd",
     "No display name": "Geen weergavenaam",
     "No more results": "Geen resultaten meer",
     "No results": "Geen resultaten",
@@ -100,12 +94,9 @@
     "Profile": "Profiel",
     "Public Chat": "Openbaar gesprek",
     "Reason": "Reden",
-    "Revoke Moderator": "Moderator degraderen",
     "Register": "Registreren",
     "%(targetName)s rejected the invitation.": "%(targetName)s heeft de uitnodiging geweigerd.",
     "Reject invitation": "Uitnodiging weigeren",
-    "Remote addresses for this room:": "Externe adressen voor dit gesprek:",
-    "Start a chat": "Gesprek beginnen",
     "Start authentication": "Authenticatie starten",
     "Submit": "Bevestigen",
     "Success": "Klaar",
@@ -138,36 +129,25 @@
     "Current password": "Huidig wachtwoord",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s heeft de gespreksnaam verwijderd.",
     "Create Room": "Gesprek aanmaken",
-    "Curve25519 identity key": "Curve25519-identiteitssleutel",
     "/ddg is not a command": "/ddg is geen opdracht",
-    "Deactivate Account": "Account deactiveren",
+    "Deactivate Account": "Account sluiten",
     "Decline": "Weigeren",
     "Decrypt %(text)s": "%(text)s ontsleutelen",
-    "Decryption error": "Ontsleutelingsfout",
-    "Device ID": "Apparaats-ID",
-    "device id: ": "apparaats-ID: ",
-    "Direct chats": "Tweegesprekken",
-    "Disable Notifications": "Meldingen uitschakelen",
     "Disinvite": "Uitnodiging intrekken",
     "Download %(text)s": "%(text)s downloaden",
     "Drop File Here": "Versleep het bestand naar hier",
-    "Ed25519 fingerprint": "Ed25519-vingerafdruk",
     "Email": "E-mailadres",
     "Email address": "E-mailadres",
-    "Claimed Ed25519 fingerprint key": "Geclaimde Ed25519-vingerafdrukssleutel",
     "Custom": "Aangepast",
     "Custom level": "Aangepast niveau",
     "Deops user with given id": "Ontmachtigt gebruiker met de gegeven ID",
     "Default": "Standaard",
     "Displays action": "Toont actie",
     "Emoji": "Emoticons",
-    "Enable Notifications": "Meldingen inschakelen",
     "%(senderName)s ended the call.": "%(senderName)s heeft opgehangen.",
-    "End-to-end encryption information": "Info over eind-tot-eind-versleuteling",
     "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.",
-    "Event information": "Gebeurtenisinformatie",
     "Existing Call": "Bestaande oproep",
     "Export": "Wegschrijven",
     "Export E2E room keys": "E2E-gesprekssleutels wegschrijven",
@@ -183,7 +163,6 @@
     "Failed to send email": "Versturen van e-mail is mislukt",
     "Failed to send request.": "Versturen van verzoek is mislukt.",
     "Failed to set display name": "Instellen van weergavenaam is mislukt",
-    "Failed to toggle moderator status": "Aanpassen van moderatorstatus is mislukt",
     "Failed to unban": "Ontbannen mislukt",
     "Failed to upload profile picture!": "Uploaden van profielfoto is mislukt!",
     "Failed to verify email address: make sure you clicked the link in the email": "Kan het e-mailadres niet verifiëren: zorg ervoor dat u de koppeling in de e-mail heeft aangeklikt",
@@ -218,13 +197,11 @@
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Deelnemen met <voiceText>spraak</voiceText> of <videoText>video</videoText>.",
     "Join Room": "Gesprek toetreden",
     "%(targetName)s joined the room.": "%(targetName)s is tot het gesprek toegetreden.",
-    "Joins room with given alias": "Neemt met de gegeven bijnaam aan het gesprek deel",
     "Jump to first unread message.": "Spring naar het eerste ongelezen bericht.",
     "Labs": "Experimenteel",
     "Last seen": "Laatst gezien",
     "Leave room": "Gesprek verlaten",
     "%(targetName)s left the room.": "%(targetName)s heeft het gesprek verlaten.",
-    "Local addresses for this room:": "Lokale adressen voor dit gesprek:",
     "Logout": "Afmelden",
     "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.",
@@ -235,7 +212,6 @@
     "Manage Integrations": "Integraties beheren",
     "Missing room_id in request": "room_id ontbreekt in verzoek",
     "Missing user_id in request": "user_id ontbreekt in verzoek",
-    "New address (e.g. #foo:%(localDomain)s)": "Nieuw adres (bv. #foo:%(localDomain)s)",
     "New passwords don't match": "Nieuwe wachtwoorden komen niet overeen",
     "New passwords must match each other.": "Nieuwe wachtwoorden moeten overeenkomen.",
     "Only people who have been invited": "Alleen personen die zijn uitgenodigd",
@@ -247,20 +223,18 @@
     "%(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",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot heeft geen toestemming om u meldingen te versturen - controleer uw browserinstellingen",
-    "Riot was not given permission to send notifications - please try again": "Riot kreeg geen toestemming om u meldingen te sturen - probeer het opnieuw",
-    "riot-web version:": "riot-web-versie:",
+    "%(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:",
     "Room %(roomId)s not visible": "Gesprek %(roomId)s is niet zichtbaar",
     "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",
     "Save": "Opslaan",
-    "Scroll to bottom of page": "Scroll naar de onderkant van de pagina",
     "Search failed": "Zoeken mislukt",
     "Searches DuckDuckGo for results": "Zoekt op DuckDuckGo voor resultaten",
     "Seen by %(userName)s at %(dateTime)s": "Gezien door %(userName)s om %(dateTime)s",
-    "Send anyway": "Alsnog versturen",
     "Send Reset Email": "E-mail voor opnieuw instellen versturen",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s heeft een afbeelding gestuurd.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s heeft %(targetDisplayName)s in het gesprek uitgenodigd.",
@@ -283,7 +257,7 @@
     "The phone number entered looks invalid": "Het ingevoerde telefoonnummer ziet er ongeldig uit",
     "This email address is already in use": "Dit e-mailadres is al in gebruik",
     "This email address was not found": "Dit e-mailadres is niet gevonden",
-    "The email address linked to your account must be entered.": "Het e-mailadres dat met uw account verbonden is moet ingevoerd worden.",
+    "The email address linked to your account must be entered.": "Het aan uw account gekoppelde e-mailadres dient ingevoerd worden.",
     "The remote side failed to pick up": "De andere kant heeft niet opgenomen",
     "This room has no local addresses": "Dit gesprek heeft geen lokale adressen",
     "This room is not recognised.": "Dit gesprek wordt niet herkend.",
@@ -301,13 +275,9 @@
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s heeft %(targetName)s ontbannen.",
     "Unable to capture screen": "Kan geen schermafdruk maken",
     "Unable to enable Notifications": "Kan meldingen niet inschakelen",
-    "unencrypted": "onversleuteld",
     "unknown caller": "onbekende beller",
-    "unknown device": "onbekend apparaat",
-    "Unknown room %(roomId)s": "Onbekend gesprek %(roomId)s",
     "Unmute": "Niet dempen",
     "Unnamed Room": "Naamloos gesprek",
-    "Unrecognised room alias:": "Onbekende gespreksbijnaam:",
     "Uploading %(filename)s and %(count)s others|zero": "%(filename)s wordt geüpload",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s en %(count)s ander worden geüpload",
     "Uploading %(filename)s and %(count)s others|other": "%(filename)s en %(count)s andere worden geüpload",
@@ -316,14 +286,10 @@
     "Upload file": "Bestand uploaden",
     "Upload new:": "Upload er een nieuwe:",
     "Usage": "Gebruik",
-    "Use compact timeline layout": "Compacte tijdlijnindeling gebruiken",
-    "User ID": "Gebruikers-ID",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (macht %(powerLevelNumber)s)",
     "Username invalid: %(errMessage)s": "Ongeldige gebruikersnaam: %(errMessage)s",
     "Users": "Gebruikers",
     "Verification Pending": "Verificatie in afwachting",
-    "Verification": "Verificatie",
-    "verified": "geverifieerd",
     "Verified key": "Geverifieerde sleutel",
     "Video call": "Video-oproep",
     "Voice call": "Spraakoproep",
@@ -350,10 +316,9 @@
     "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 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 kunt deze veranderingen niet ongedaan maken aangezien u de gebruiker tot hetzelfde niveau als uzelf promoveert.",
+    "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.",
     "This server does not support authentication with a phone number.": "Deze server biedt geen ondersteuning voor authenticatie met een telefoonnummer.",
     "An error occurred: %(error_string)s": "Er is een fout opgetreden: %(error_string)s",
-    "Make Moderator": "Benoemen tot moderator",
     "There are no visible files in this room": "Er zijn geen zichtbare bestanden in dit gesprek",
     "Room": "Gesprek",
     "Connectivity to the server has been lost.": "De verbinding met de server is verbroken.",
@@ -366,7 +331,7 @@
     "Start automatically after system login": "Automatisch starten na systeemaanmelding",
     "Analytics": "Statistische gegevens",
     "Options": "Opties",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot verzamelt anonieme analysegegevens die het mogelijk maken de toepassing te verbeteren.",
+    "%(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.",
     "Passphrases must match": "Wachtwoorden moeten overeenkomen",
     "Passphrase must not be empty": "Wachtwoord mag niet leeg zijn",
     "Export room keys": "Gesprekssleutels wegschrijven",
@@ -378,22 +343,16 @@
     "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-uitnodigingen weigeren",
+    "Reject all %(invitedRooms)s invites": "Alle %(invitedRooms)s de uitnodigingen weigeren",
     "Failed to invite": "Uitnodigen is mislukt",
     "Failed to invite the following users to the %(roomName)s room:": "Kon de volgende gebruikers niet uitnodigen voor gesprek %(roomName)s:",
     "Confirm Removal": "Verwijdering bevestigen",
-    "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.": "Weet u zeker dat u deze gebeurtenis wilt verwijderen? Wees u er wel van bewust dat als u een gespreksnaam of onderwerpswijziging verwijdert, u de verandering mogelijk ongedaan maakt.",
+    "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.": "Weet u zeker dat u deze gebeurtenis wilt verwijderen? Besef wel dat het verwijderen van een van een gespreksnaams- of onderwerpswijziging die wijziging mogelijk teniet doet.",
     "Unknown error": "Onbekende fout",
     "Incorrect password": "Onjuist wachtwoord",
-    "To continue, please enter your password.": "Voer uw wachtwoord in om verder te gaan.",
-    "Blacklist": "Blokkeren",
-    "Unblacklist": "Deblokkeren",
-    "I verify that the keys match": "Ik verklaar dat de sleutels overeenkomen",
     "Unable to restore session": "Sessieherstel lukt niet",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Als u reeds een recentere versie van Riot heeft gebruikt is uw sessie mogelijk onverenigbaar met deze versie. Sluit dit venster en ga terug naar die recentere versie.",
+    "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.": "Als u reeds een recentere versie van %(brand)s heeft gebruikt is uw sessie mogelijk onverenigbaar met deze versie. Sluit dit venster en ga terug naar die recentere versie.",
     "Unknown Address": "Onbekend adres",
-    "Unverify": "Ontverifiëren",
-    "Verify...": "Verifiëren…",
     "ex. @bob:example.com": "bv. @jan:voorbeeld.com",
     "Add User": "Gebruiker toevoegen",
     "Please check your email to continue registration.": "Bekijk uw e-mail om verder te gaan met de registratie.",
@@ -405,7 +364,6 @@
     "Error decrypting video": "Fout bij het ontsleutelen van de video",
     "Add an Integration": "Voeg een integratie toe",
     "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?": "U wordt zo dadelijk naar een derdepartijwebsite gebracht zodat u de account kunt legitimeren voor gebruik met %(integrationsUrl)s. Wilt u doorgaan?",
-    "Removed or unknown message type": "Verwijderd of onbekend berichttype",
     "URL Previews": "URL-voorvertoningen",
     "Drop file here to upload": "Versleep het bestand naar hier om het te uploaden",
     " (unsupported)": " (niet ondersteund)",
@@ -423,15 +381,11 @@
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Dit zal uw accountnaam worden op de <span></span>-thuisserver, of u kunt een <a>andere server</a> kiezen.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Als u al een Matrix-account heeft, kunt u zich meteen <a>aanmelden</a>.",
     "Your browser does not support the required cryptography extensions": "Uw browser ondersteunt de benodigde cryptografie-extensies niet",
-    "Not a valid Riot keyfile": "Geen geldig Riot-sleutelbestand",
+    "Not a valid %(brand)s keyfile": "Geen geldig %(brand)s-sleutelbestand",
     "Authentication check failed: incorrect password?": "Aanmeldingscontrole mislukt: onjuist wachtwoord?",
     "Do you want to set an email address?": "Wilt u een e-mailadres instellen?",
     "This will allow you to reset your password and receive notifications.": "Zo kunt u een nieuw wachtwoord instellen en meldingen ontvangen.",
     "Skip": "Overslaan",
-    "Start verification": "Verificatie starten",
-    "Share without verifying": "Delen zonder verificatie",
-    "Ignore request": "Verzoek negeren",
-    "Encryption key request": "Verzoek voor versleutelingssleutel",
     "Define the power level of a user": "Bepaal het machtsniveau van een gebruiker",
     "Add a widget": "Widget toevoegen",
     "Allow": "Toestaan",
@@ -461,21 +415,15 @@
     "Unpin Message": "Bericht losmaken",
     "Add rooms to this community": "Voeg gesprekken toe aan deze gemeenschap",
     "Call Failed": "Oproep mislukt",
-    "Call": "Bellen",
-    "Answer": "Beantwoorden",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Let op: elke persoon die u toevoegt aan een gemeenschap zal publiek zichtbaar zijn voor iedereen die de gemeenschaps-ID kent",
     "Invite new community members": "Nodig nieuwe gemeenschapsleden uit",
     "Which rooms would you like to add to this community?": "Welke gesprekken wilt u toevoegen aan deze gemeenschap?",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Widgets verwijderen geldt voor alle deelnemers aan dit gesprek. Weet u zeker dat u deze widget wilt verwijderen?",
     "Delete Widget": "Widget verwijderen",
-    "Review Devices": "Apparaten nakijken",
-    "Call Anyway": "Toch bellen",
-    "Answer Anyway": "Toch beantwoorden",
     "Who would you like to add to this community?": "Wie wilt u toevoegen aan deze gemeenschap?",
     "Invite to Community": "Uitnodigen tot gemeenschap",
     "Show these rooms to non-members on the community page and room list?": "Deze gesprekken tonen aan niet-leden op de gemeenschapspagina en gesprekslijst?",
     "Add rooms to the community": "Voeg gesprekken toe aan de gemeenschap",
-    "Room name or alias": "Gespreks(bij)naam",
     "Add to community": "Toevoegen aan gemeenschap",
     "Failed to invite the following users to %(groupId)s:": "Uitnodigen van volgende gebruikers tot %(groupId)s is mislukt:",
     "Failed to invite users to community": "Uitnodigen van gebruikers tot de gemeenschap is mislukt",
@@ -501,17 +449,14 @@
     "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.": "U kunt deze actie niet ongedaan maken omdat u zichzelf degradeert. Als u de laatste bevoorrechte gebruiker in het gesprek bent, is het onmogelijk deze rechten terug te krijgen.",
+    "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",
     "Mention": "Vermelden",
     "Invite": "Uitnodigen",
-    "User Options": "Gebruikersopties",
     "Send an encrypted reply…": "Verstuur een versleuteld antwoord…",
-    "Send a reply (unencrypted)…": "Verstuur een antwoord (onversleuteld)…",
     "Send an encrypted message…": "Verstuur een versleuteld bericht…",
-    "Send a message (unencrypted)…": "Verstuur een bericht (onversleuteld)…",
     "Jump to message": "Naar bericht springen",
     "No pinned messages.": "Geen vastgeprikte berichten.",
     "Loading...": "Bezig met laden…",
@@ -526,7 +471,7 @@
     "Unknown for %(duration)s": "Onbekend voor %(duration)s",
     "Unknown": "Onbekend",
     "Replying": "Aan het beantwoorden",
-    "No rooms to show": "Geen gesprekken om weer te geven",
+    "No rooms to show": "Geen weer te geven gesprekken",
     "Unnamed room": "Naamloos gesprek",
     "World readable": "Leesbaar voor iedereen",
     "Guests can join": "Gasten kunnen toetreden",
@@ -543,8 +488,6 @@
     "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.",
-    "Message removed by %(userId)s": "Bericht verwijderd door %(userId)s",
-    "Message removed": "Bericht verwijderd",
     "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",
@@ -584,11 +527,11 @@
     "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s zijn weggegaan en weer toegetreden",
     "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s is %(count)s keer weggegaan en weer toegetreden",
     "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s is weggegaan en weer toegetreden",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s hebben hun uitnodigingen %(count)s keer afgewezen",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s hebben hun uitnodigingen afgewezen",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s hebben hun uitnodigingen %(count)s maal afgeslagen",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s hebben hun uitnodigingen afgeslagen",
     "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s heeft de uitnodiging %(count)s maal geweigerd",
     "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s heeft de uitnodiging geweigerd",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "De uitnodigingen van %(severalUsers)s zijn %(count)s keer ingetrokken",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s hebben hun uitnodigingen %(count)s maal ingetrokken",
     "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "De uitnodigingen van %(severalUsers)s zijn ingetrokken",
     "%(oneUser)shad their invitation withdrawn %(count)s times|other": "De uitnodiging van %(oneUser)s is %(count)s keer ingetrokken",
     "%(oneUser)shad their invitation withdrawn %(count)s times|one": "De uitnodiging van %(oneUser)s is ingetrokken",
@@ -648,7 +591,7 @@
     "Failed to remove a user from the summary of %(groupId)s": "Verwijderen van gebruiker uit het overzicht van %(groupId)s is mislukt",
     "The user '%(displayName)s' could not be removed from the summary.": "De gebruiker ‘%(displayName)s’ kon niet uit het overzicht verwijderd worden.",
     "Failed to update community": "Bijwerken van gemeenschap is mislukt",
-    "Unable to accept invite": "Kan de uitnodiging niet aanvaarden",
+    "Unable to accept invite": "Kan de uitnodiging niet aannemen",
     "Unable to reject invite": "Kan de uitnodiging niet weigeren",
     "Leave Community": "Gemeenschap verlaten",
     "Leave %(groupName)s?": "%(groupName)s verlaten?",
@@ -664,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 Riot 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 Riot 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, meld u dan opnieuw aan.  Schrijf uw sleutels weg en lees ze weer in 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",
@@ -674,8 +617,6 @@
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Bericht opnieuw versturen</resendText> of <cancelText>bericht annuleren</cancelText>.",
     "Warning": "Let op",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Er is niemand anders hier! Wilt u <inviteText>anderen uitnodigen</inviteText> of <nowarnText>de waarschuwing over het lege gesprek stoppen</nowarnText>?",
-    "Light theme": "Licht thema",
-    "Dark theme": "Donker thema",
     "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.",
@@ -685,21 +626,20 @@
     "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",
     "Room Notification": "Groepsgespreksmelding",
-    "The information being sent to us to help make Riot.im better includes:": "De naar ons verstuurde informatie om Riot.im te verbeteren behelst:",
+    "The information being sent to us to help make %(brand)s better includes:": "De informatie die naar ons wordt verstuurd om %(brand)s te verbeteren bevat:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Waar deze pagina identificeerbare informatie bevat, zoals een gespreks-, gebruikers- of groeps-ID, zullen deze gegevens verwijderd worden voordat ze naar de server gestuurd worden.",
     "The platform you're on": "Het platform dat u gebruikt",
-    "The version of Riot.im": "De versie van Riot.im",
+    "The version of %(brand)s": "De versie van %(brand)s",
     "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 identity server's URL": "De URL van uw identiteitsserver",
     "<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.",
     "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 Riot.im experience!": "Wist u dat: u gemeenschappen kunt gebruiken om uw Riot.im-beleving te filteren!",
+    "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!",
     "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",
@@ -722,7 +662,6 @@
     "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",
-    "A new version of Riot is available.": "Er is een nieuwe versie van Riot beschikbaar.",
     "I understand the risks and wish to continue": "Ik begrijp de risico’s en wil graag verdergaan",
     "Send Account Data": "Accountgegevens versturen",
     "All notifications are currently disabled for all targets.": "Alle meldingen voor alle bestemmingen zijn momenteel uitgeschakeld.",
@@ -740,8 +679,6 @@
     "Waiting for response from server": "Wachten op antwoord van de server",
     "Send Custom Event": "Aangepaste gebeurtenis versturen",
     "Advanced notification settings": "Geavanceerde meldingsinstellingen",
-    "delete the alias.": "verwijder de bijnaam.",
-    "To return to your account in future you need to <u>set a password</u>": "Tenzij u <u>een wachtwoord instelt</u> zult u uw account niet meer kunnen benaderen",
     "Forget": "Vergeten",
     "You cannot delete this image. (%(code)s)": "U kunt deze afbeelding niet verwijderen. (%(code)s)",
     "Cancel Sending": "Versturen annuleren",
@@ -766,7 +703,6 @@
     "No update available.": "Geen update beschikbaar.",
     "Noisy": "Lawaaierig",
     "Collecting app version information": "App-versieinformatie wordt verzameld",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "De bijnaam %(alias)s verwijderen en %(name)s uit de catalogus verwijderen?",
     "Keywords": "Trefwoorden",
     "Enable notifications for this account": "Meldingen inschakelen voor deze account",
     "Invite to this community": "Uitnodigen in deze gemeenschap",
@@ -777,7 +713,7 @@
     "Search…": "Zoeken…",
     "You have successfully set a password and an email address!": "U heeft een wachtwoord en e-mailadres ingesteld!",
     "Remove %(name)s from the directory?": "%(name)s uit de catalogus verwijderen?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot gebruikt veel geavanceerde browserfuncties, waarvan enkele niet (of slechts experimenteel) in uw browser beschikbaar zijn.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s gebruikt veel geavanceerde browserfuncties, waarvan enkele niet (of slechts experimenteel) in uw browser beschikbaar zijn.",
     "Developer Tools": "Ontwikkelgereedschap",
     "Explore Account Data": "Accountgegevens verkennen",
     "Remove from Directory": "Verwijderen uit catalogus",
@@ -817,8 +753,7 @@
     "Show message in desktop notification": "Bericht tonen in bureaubladmelding",
     "Unhide Preview": "Voorvertoning weergeven",
     "Unable to join network": "Kon niet toetreden tot dit netwerk",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "U heeft ze mogelijk ingesteld in een andere cliënt dan Riot. U kunt ze niet aanpassen in Riot, maar ze zijn wel actief",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Sorry, uw browser werkt <b>niet</b> met Riot.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Sorry, uw browser werkt <b>niet</b> met %(brand)s.",
     "Uploaded on %(date)s by %(user)s": "Geüpload door %(user)s op %(date)s",
     "Messages in group chats": "Berichten in groepsgesprekken",
     "Yesterday": "Gisteren",
@@ -827,10 +762,10 @@
     "Unable to fetch notification target list": "Kan de bestemmingslijst voor meldingen niet ophalen",
     "Set Password": "Wachtwoord instellen",
     "Off": "Uit",
-    "Riot does not know how to join a room on this network": "Riot weet niet hoe het moet deelnemen aan een gesprek op dit netwerk",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s weet niet hoe het moet deelnemen aan een gesprek op dit netwerk",
     "Mentions only": "Alleen vermeldingen",
     "Wednesday": "Woensdag",
-    "You can now return to your account after signing out, and sign in on other devices.": "U kunt nu terugkeren naar uw account nadat u zich heeft afgemeld, en u aanmelden op andere apparaten.",
+    "You can now return to your account after signing out, and sign in on other devices.": "Na afmelding kunt u terugkeren tot uw account, en u op andere apparaten aanmelden.",
     "Enable email notifications": "E-mailmeldingen inschakelen",
     "Event Type": "Gebeurtenistype",
     "Download this file": "Dit bestand downloaden",
@@ -843,7 +778,6 @@
     "Thank you!": "Bedankt!",
     "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!": "Met uw huidige browser kan de toepassing er volledig onjuist uitzien. Tevens is het mogelijk dat niet alle functies naar behoren werken. U kunt doorgaan als u het toch wilt proberen, maar bij problemen bent u volledig op uzelf aangewezen!",
     "Checking for an update...": "Bezig met controleren op updates…",
-    "There are advanced notifications which are not shown here": "Er zijn geavanceerde meldingen die hier niet getoond worden",
     "Logs sent": "Logboeken verstuurd",
     "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.": "Foutopsporingslogboeken bevatten gebruiksgegevens over de toepassing, inclusief uw gebruikersnaam, de ID’s of bijnamen van de gesprekken en groepen die u heeft bezocht, evenals de gebruikersnamen van andere gebruikers. Ze bevatten geen berichten.",
     "Failed to send logs: ": "Versturen van logboeken mislukt: ",
@@ -851,22 +785,18 @@
     "e.g. %(exampleValue)s": "bv. %(exampleValue)s",
     "Every page you use in the app": "Iedere bladzijde die u in de toepassing gebruikt",
     "e.g. <CurrentPageURL>": "bv. <CurrentPageURL>",
-    "Your User Agent": "Uw gebruikersagent",
     "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",
     "Enable widget screenshots on supported widgets": "Widget-schermafbeeldingen inschakelen op ondersteunde widgets",
     "Muted Users": "Gedempte gebruikers",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Help Riot.im te verbeteren door <UsageDataLink>anonieme gebruiksgegevens</UsageDataLink> te versturen. Dit zal een cookie gebruiken (bekijk hiervoor ons <PolicyLink>cookiebeleid</PolicyLink>).",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Help Riot.im te verbeteren door <UsageDataLink>anonieme gebruiksgegevens</UsageDataLink> te versturen. Dit zal een cookie gebruiken.",
-    "Yes, I want to help!": "Ja, ik wil helpen!",
     "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 deze deelneemt verlaten, en worden de accountgegevens verwijderd van de identiteitsserver. <b>Deze actie 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 deactiveren van uw account <b>zal er standaard niet voor zorgen dat de berichten die u heeft verstuurd vergeten worden.</b> Als u wilt dat wij de berichten vergeten, vinkt u het vakje hieronder aan.",
+    "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>",
+    "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 alle berichten die ik heb verstuurd wanneer mijn account gedeactiveerd is (<b>Let op:</b> dit zal er voor zorgen dat toekomstige gebruikers een onvolledig beeld krijgen van gesprekken)",
+    "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)",
     "To continue, please enter your password:": "Voer uw wachtwoord in om verder te gaan:",
     "Clear Storage and Sign Out": "Opslag wissen en afmelden",
     "Send Logs": "Logboek versturen",
@@ -877,7 +807,7 @@
     "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.",
     "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 lezen en aanvaarden.",
+    "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.",
     "Review terms and conditions": "Gebruiksvoorwaarden lezen",
     "Call in Progress": "Lopend gesprek",
     "A call is currently being placed!": "Er wordt al een oproep gemaakt!",
@@ -910,8 +840,6 @@
     "Audio Output": "Geluidsuitgang",
     "Ignored users": "Genegeerde gebruikers",
     "Bulk options": "Bulkopties",
-    "Registration Required": "Registratie vereist",
-    "You need to register to do this. Would you like to register now?": "Hiervoor dient u zich te registreren. Wilt u dat nu doen?",
     "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)",
@@ -934,11 +862,6 @@
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s heeft badges voor %(groups)s in dit gesprek ingeschakeld.",
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s heeft badges voor %(groups)s in dit gesprek uitgeschakeld.",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s heeft badges in dit gesprek voor %(newGroups)s in-, en voor %(oldGroups)s uitgeschakeld.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s heeft de adressen %(addedAddresses)s aan dit gesprek toegekend.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s heeft %(addedAddresses)s als gespreksadres toegevoegd.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s heeft het gespreksadres %(removedAddresses)s verwijderd.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s heeft de gespreksadressen %(removedAddresses)s verwijderd.",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s heeft de gespreksadressen %(addedAddresses)s toegevoegd, en %(removedAddresses)s verwijderd.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s heeft %(address)s als hoofdadres voor dit gesprek ingesteld.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s heeft het hoofdadres voor dit gesprek verwijderd.",
     "%(displayName)s is typing …": "%(displayName)s is aan het typen…",
@@ -952,7 +875,7 @@
     "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’",
-    "The user must be unbanned before they can be invited.": "De gebruiker kan niet uitgenodigd worden voordat diens ban ongedaan is gemaakt.",
+    "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",
     "No need for symbols, digits, or uppercase letters": "Hoofdletters, cijfers of speciale tekens hoeven niet, mogen wel",
@@ -989,7 +912,7 @@
     "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 join/leave messages (invites/kicks/bans unaffected)": "Berichten over deelnamen en verlatingen tonen (dit heeft geen effect op uitnodigingen, berispingen of verbanningen)",
+    "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",
@@ -1001,7 +924,6 @@
     "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",
     "Show developer tools": "Ontwikkelgereedschap tonen",
-    "Order rooms in the room list by most important first instead of most recent": "Gesprekken in de gesprekkenlijst sorteren op belang in plaats van laatste gebruik",
     "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",
@@ -1091,7 +1013,7 @@
     "All keys backed up": "Alle sleutels zijn geback-upt",
     "Backup version: ": "Back-upversie: ",
     "Algorithm: ": "Algoritme: ",
-    "Chat with Riot Bot": "Met Riot-robot chatten",
+    "Chat with %(brand)s Bot": "Met %(brand)s-robot chatten",
     "Forces the current outbound group session in an encrypted room to be discarded": "Dwingt tot verwerping van de huidige uitwaartse groepssessie in een versleuteld gesprek",
     "Start using Key Backup": "Begin sleutelback-up te gebruiken",
     "Add an email address to configure email notifications": "Voeg een e-mailadres toe om e-mailmeldingen in te stellen",
@@ -1107,12 +1029,12 @@
     "Language and region": "Taal en regio",
     "Theme": "Thema",
     "Account management": "Accountbeheer",
-    "Deactivating your account is a permanent action - be careful!": "Het deactiveren van uw account kan niet ongedaan gemaakt worden - wees voorzichtig!",
+    "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",
-    "For help with using Riot, click <a>here</a>.": "Klik <a>hier</a> voor hulp bij het gebruiken van Riot.",
-    "For help with using Riot, 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 Riot, of begin een gesprek met onze robot met de knop hieronder.",
+    "For help with using %(brand)s, click <a>here</a>.": "Klik <a>hier</a> voor hulp bij het gebruiken van %(brand)s.",
+    "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",
@@ -1122,7 +1044,7 @@
     "Timeline": "Tijdslijn",
     "Room list": "Gesprekslijst",
     "Autocomplete delay (ms)": "Vertraging voor automatisch aanvullen (ms)",
-    "Accept all %(invitedRooms)s invites": "Alle %(invitedRooms)s-uitnodigingen aanvaarden",
+    "Accept all %(invitedRooms)s invites": "Alle %(invitedRooms)s de uitnodigingen aannemen",
     "Key backup": "Sleutelback-up",
     "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.",
@@ -1155,7 +1077,6 @@
     "Select the roles required to change various parts of the room": "Selecteer de rollen vereist 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>",
-    "To link to this room, please add an alias.": "Voeg een bijnaam toe om naar dit gesprek te verwijzen.",
     "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.",
     "Encryption": "Versleuteling",
     "Once enabled, encryption cannot be disabled.": "Eenmaal ingeschakeld kan versleuteling niet meer worden uitgeschakeld.",
@@ -1171,10 +1092,6 @@
     "Add some now": "Voeg er nu een paar toe",
     "Error updating main address": "Fout bij bijwerken van hoofdadres",
     "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.",
-    "Error creating alias": "Fout bij aanmaken van bijnaam",
-    "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "Er is een fout opgetreden bij het aanmaken van die bijnaam. Dit wordt mogelijk niet toegestaan door de server, of er is een tijdelijk probleem opgetreden.",
-    "Error removing alias": "Fout bij verwijderen van bijnaam",
-    "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "Er is een fout opgetreden bij het verwijderen van die bijnaam. Mogelijk bestaat die niet meer, of er is een tijdelijke fout 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.",
@@ -1184,9 +1101,6 @@
     "This room is a continuation of another conversation.": "Dit gesprek is een voortzetting van een ander gesprek.",
     "Click here to see older messages.": "Klik hier om oudere berichten te bekijken.",
     "Failed to load group members": "Laden van groepsleden is mislukt",
-    "Please <a>contact your service administrator</a> to get this limit increased.": "Gelieve <a>contact op te nemen met uw dienstbeheerder</a> om deze limiet te verhogen.",
-    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "Deze thuisserver heeft zijn limiet voor maandelijks actieve gebruikers bereikt, waardoor <b>sommige gebruikers zich niet zullen kunnen aanmelden</b>.",
-    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Deze thuisserver heeft één van zijn systeembronlimieten overschreden, waardoor <b>sommige gebruikers zich niet zullen kunnen aanmelden</b>.",
     "Join": "Deelnemen",
     "Power level": "Machtsniveau",
     "That doesn't look like a valid email address": "Dit is geen geldig e-mailadres",
@@ -1196,26 +1110,18 @@
     "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>.",
     "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 Riot to do this": "Schrijf om uw gespreksgeschiedenis niet te verliezen vóór het afmelden uw gesprekssleutels weg. Dat moet vanuit de nieuwere versie van Riot",
-    "You've previously used a newer version of Riot on %(host)s. 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 Riot op %(host)s gebruikt. Om deze versie opnieuw met eind-tot-eind-versleuteling te gebruiken, zult u zich moeten afmelden en opnieuw aanmelden. ",
+    "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",
     "Incompatible Database": "Incompatibele database",
     "Continue With Encryption Disabled": "Verdergaan met versleuteling uitgeschakeld",
-    "Use Legacy Verification (for older clients)": "Verouderde verificatie gebruiken (voor oudere cliënten)",
-    "Verify by comparing a short text string.": "Verifieer door een korte tekenreeks te vergelijken.",
-    "Begin Verifying": "Verificatie beginnen",
-    "Waiting for partner to accept...": "Aan het wachten op partner…",
-    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Verschijnt er niets? Nog niet alle cliënten bieden ondersteuning voor interactieve verificatie. <button>Gebruik verouderde verificatie</button>.",
-    "Waiting for %(userId)s to confirm...": "Wachten op bevestiging van %(userId)s…",
-    "Use two-way text verification": "Tweerichtingstekstverificatie gebruiken",
     "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.",
     "Waiting for partner to confirm...": "Wachten op bevestiging van partner…",
     "Incoming Verification Request": "Inkomend verificatieverzoek",
-    "You've previously used Riot 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, Riot needs to resync your account.": "U heeft voorheen Riot op %(host)s gebruikt met lui laden van leden ingeschakeld. In deze versie is lui laden uitgeschakeld. Omdat de lokale cache niet compatibel is tussen deze twee instellingen, moet Riot uw account opnieuw synchroniseren.",
-    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Indien de andere versie van Riot nog open staat in een ander tabblad kunt u dat beter sluiten, want het geeft problemen als Riot op dezelfde host gelijktijdig met lui laden ingeschakeld en uitgeschakeld draait.",
+    "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.": "U heeft voorheen %(brand)s op %(host)s gebruikt met lui laden van leden ingeschakeld. In deze versie is lui laden uitgeschakeld. De lokale cache is niet compatibel tussen deze twee instellingen, zodat %(brand)s uw account moet hersynchroniseren.",
+    "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.": "Indien de andere versie van %(brand)s nog open staat in een ander tabblad kunt u dat beter sluiten, want het geeft problemen als %(brand)s op dezelfde host gelijktijdig met lui laden ingeschakeld en uitgeschakeld draait.",
     "Incompatible local cache": "Incompatibele lokale cache",
     "Clear cache and resync": "Cache wissen en hersynchroniseren",
-    "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Riot verbruikt nu 3-5x minder geheugen, door informatie over andere gebruikers enkel te laden wanneer nodig. Even geduld, we hersynchroniseren met de server!",
-    "Updating Riot": "Riot wordt bijgewerkt",
+    "%(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 verbruikt nu 3-5x minder geheugen, door informatie over andere gebruikers enkel te laden wanneer nodig. Even geduld, we hersynchroniseren met de server!",
+    "Updating %(brand)s": "%(brand)s wordt bijgewerkt",
     "I don't want my encrypted messages": "Ik wil mijn versleutelde berichten niet",
     "Manually export keys": "Sleutels handmatig wegschrijven",
     "You'll lose access to your encrypted messages": "U zult de toegang tot uw versleutelde berichten verliezen",
@@ -1236,21 +1142,13 @@
     "A username can only contain lower case letters, numbers and '=_-./'": "Een gebruikersnaam mag enkel kleine letters, cijfers en ‘=_-./’ bevatten",
     "Checking...": "Bezig met controleren…",
     "Unable to load backup status": "Kan back-upstatus niet laden",
-    "Recovery Key Mismatch": "Herstelsleutel komt niet overeen",
-    "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "De back-up kon met deze sleutel niet ontsleuteld worden: controleer of u de juiste herstelsleutel heeft ingevoerd.",
-    "Incorrect Recovery Passphrase": "Onjuist herstelwachtwoord",
-    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "De back-up kon met dit wachtwoord niet ontsleuteld worden: controleer of u het juiste herstelwachtwoord heeft ingevoerd.",
     "Unable to restore backup": "Kan back-up niet terugzetten",
     "No backup found!": "Geen back-up gevonden!",
-    "Backup Restored": "Back-up hersteld",
     "Failed to decrypt %(failedCount)s sessions!": "Ontsleutelen van %(failedCount)s sessies is mislukt!",
-    "Restored %(sessionCount)s session keys": "%(sessionCount)s sessiesleutels hersteld",
-    "Enter Recovery Passphrase": "Voer het herstelwachtwoord in",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Let op</b>: stel sleutelback-up enkel in op een vertrouwde computer.",
     "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Verkrijg toegang tot uw beveiligde berichtgeschiedenis en stel beveiligd chatten in door uw herstelwachtwoord in te voeren.",
     "Next": "Volgende",
     "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Als u uw herstelwachtwoord vergeten bent, kunt u <button1>uw herstelsleutel gebruiken</button1> of <button2>nieuwe herstelopties instellen</button2>",
-    "Enter Recovery Key": "Voer de herstelsleutel in",
     "This looks like a valid recovery key!": "Dit is een geldige herstelsleutel!",
     "Not a valid recovery key": "Geen geldige herstelsleutel",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Verkrijg toegang tot uw beveiligde berichtgeschiedenis en stel beveiligd chatten in door uw herstelsleutel in te voeren.",
@@ -1261,18 +1159,17 @@
     "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.",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "U kunt de aangepaste serveropties gebruiken om u aan te melden bij andere Matrix-servers, door een andere thuisserver-URL op te geven. Dit biedt u de mogelijkheid om deze toepassing te gebruiken met een bestaande Matrix-account op een andere thuisserver.",
-    "Please review and accept all of the homeserver's policies": "Gelieve het beleid van de thuisserver te doornemen en aanvaarden",
-    "Please review and accept the policies of this homeserver:": "Gelieve het beleid van deze thuisserver te doornemen en aanvaarden:",
+    "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:",
     "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",
     "The username field must not be blank.": "Het gebruikersnaamveld mag niet leeg zijn.",
     "Username": "Gebruikersnaam",
-    "Not sure of your password? <a>Set a new one</a>": "Onzeker over uw wachtwoord? <a>Stel er een nieuw in</a>",
+    "Not sure of your password? <a>Set a new one</a>": "Onzeker over uw wachtwoord? <a>Stel een nieuw in</a>",
     "Sign in to your Matrix account on %(serverName)s": "Aanmelden met uw Matrix-account op %(serverName)s",
     "Change": "Wijzigen",
-    "Create your Matrix account on %(serverName)s": "Maak uw Matrix-account aan op %(serverName)s",
+    "Create your Matrix account on %(serverName)s": "Maak uw Matrix-account op %(serverName)s aan",
     "Email (optional)": "E-mailadres (optioneel)",
     "Phone (optional)": "Telefoonnummer (optioneel)",
     "Confirm": "Bevestigen",
@@ -1310,35 +1207,19 @@
     "Registration has been disabled on this homeserver.": "Registratie is uitgeschakeld op deze thuisserver.",
     "Unable to query for supported registration methods.": "Kan ondersteunde registratiemethoden niet opvragen.",
     "Create your account": "Maak uw account aan",
-    "Great! This passphrase looks strong enough.": "Top! Dit wachtwoord ziet er sterk genoeg uit.",
     "Keep going...": "Doe verder…",
-    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "We bewaren een versleutelde kopie van uw sleutels op onze server. Bescherm uw back-up met een wachtwoord om deze veilig te houden.",
     "For maximum security, this should be different from your account password.": "Voor maximale veiligheid zou dit moeten verschillen van uw accountwachtwoord.",
-    "Enter a passphrase...": "Voer een wachtwoord in…",
-    "Set up with a Recovery Key": "Instellen met herstelsleutel",
     "That matches!": "Dat komt overeen!",
     "That doesn't match.": "Dat komt niet overeen.",
     "Go back to set it again.": "Ga terug om het opnieuw in te stellen.",
-    "Please enter your passphrase a second time to confirm.": "Voer uw wachtwoord nogmaals in om te bevestigen.",
-    "Repeat your passphrase...": "Herhaal uw wachtwoord…",
-    "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Als veiligheidsnet kunt u dit gebruiken om uw versleutelde berichtgeschiedenis te herstellen indien u uw herstelwachtwoord zou vergeten.",
-    "As a safety net, you can use it to restore your encrypted message history.": "Als veiligheidsnet kunt u het gebruiken om uw versleutelde berichtgeschiedenis te herstellen.",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Uw herstelsleutel is een veiligheidsnet - u kunt hem gebruiken om de toegang tot uw versleutelde berichten te herstellen indien u uw wachtwoord zou vergeten.",
-    "Your Recovery Key": "Uw herstelsleutel",
-    "Copy to clipboard": "Kopiëren naar klembord",
     "Download": "Downloaden",
     "<b>Print it</b> and store it somewhere safe": "<b>Druk hem af</b> en bewaar hem op een veilige plaats",
     "<b>Save it</b> on a USB key or backup drive": "<b>Sla hem op</b> op een USB-stick of een back-upschijf",
     "<b>Copy it</b> to your personal cloud storage": "<b>Kopieer hem</b> naar uw persoonlijke cloudopslag",
     "Your keys are being backed up (the first backup could take a few minutes).": "Er wordt een back-up van uw sleutels gemaakt (de eerste back-up kan enkele minuten duren).",
     "Set up Secure Message Recovery": "Veilig berichtherstel instellen",
-    "Secure your backup with a passphrase": "Beveilig uw back-up met een wachtwoord",
-    "Confirm your passphrase": "Bevestig uw wachtwoord",
-    "Recovery key": "Herstelsleutel",
-    "Keep it safe": "Bewaar hem op een veilige plaats",
     "Starting backup...": "Back-up wordt gestart…",
     "Success!": "Klaar!",
-    "Create Key Backup": "Sleutelback-up aanmaken",
     "Unable to create key backup": "Kan sleutelback-up niet aanmaken",
     "Retry": "Opnieuw proberen",
     "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Zonder veilig berichtherstel in te stellen, zult u uw versleutelde berichtgeschiedenis verliezen wanneer u zich afmeldt.",
@@ -1356,7 +1237,7 @@
     "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 voor %(targetDisplayName)s om 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.",
     "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.",
@@ -1369,14 +1250,14 @@
     "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",
-    "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot kon de protocollijst niet ophalen van de thuisserver. Mogelijk is de thuisserver te oud om derdepartijnetwerken te ondersteunen.",
-    "Riot failed to get the public room list.": "Riot kon de lijst met openbare gesprekken niet verkrijgen.",
+    "%(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 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.",
     "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",
     "Replying With Files": "Beantwoorden met bestanden",
-    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Momenteel is het niet mogelijk om met een bestand te antwoorden. Wilt u dit bestand uploaden zonder te antwoorden?",
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Het is momenteel niet mogelijk met een bestand te antwoorden. Wilt u dit bestand uploaden zonder te antwoorden?",
     "The file '%(fileName)s' failed to upload.": "Het bestand ‘%(fileName)s’ kon niet geüpload worden.",
     "Rotate counter-clockwise": "Tegen de klok in draaien",
     "Rotate clockwise": "Met de klok mee draaien",
@@ -1398,7 +1279,6 @@
     "Upload %(count)s other files|one": "%(count)s overig bestand versturen",
     "Cancel All": "Alles annuleren",
     "Upload Error": "Fout bij versturen van bestand",
-    "A conference call could not be started because the integrations server is not available": "Daar de integratieserver onbereikbaar is kon het groepsaudiogesprek niet gestart worden",
     "The server does not support the room version specified.": "De server ondersteunt deze versie van gesprekken niet.",
     "Name or Matrix ID": "Naam of Matrix-ID",
     "Changes your avatar in this current room only": "Verandert uw avatar enkel in het huidige gesprek",
@@ -1444,7 +1324,7 @@
     "Edit message": "Bericht bewerken",
     "View Servers in Room": "Servers in gesprek bekijken",
     "Unable to validate homeserver/identity server": "Kan thuis-/identiteitsserver niet valideren",
-    "Sign in to your Matrix account on <underlinedServerName />": "Meld u aan met uw Matrix-account op <underlinedServerName />",
+    "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)",
     "Doesn't look like a valid email address": "Dit lijkt geen geldig e-mailadres",
@@ -1457,7 +1337,7 @@
     "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",
-    "Create your Matrix account on <underlinedServerName />": "Maak uw Matrix-account aan op <underlinedServerName />",
+    "Create your Matrix account on <underlinedServerName />": "Maak uw Matrix-account op <underlinedServerName /> aan",
     "Add room": "Gesprek toevoegen",
     "Your profile": "Uw profiel",
     "Your Matrix account on <underlinedServerName />": "Uw Matrix-account op <underlinedServerName />",
@@ -1467,7 +1347,6 @@
     "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",
-    "Show recently visited rooms above the room list": "Recent bezochte gesprekken bovenaan de gesprekslijst weergeven",
     "Uploaded sound": "Geüpload-geluid",
     "Sounds": "Geluiden",
     "Notification sound": "Meldingsgeluid",
@@ -1476,8 +1355,8 @@
     "Browse": "Bladeren",
     "Cannot reach homeserver": "Kan thuisserver 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 Riot is misconfigured": "Uw Riot is onjuist geconfigureerd",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Vraag uw Riot-beheerder om <a>uw configuratie</a> na te kijken op onjuiste of duplicate items.",
+    "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.",
     "Unexpected error resolving identity server configuration": "Onverwachte fout bij het oplossen van de identiteitsserverconfiguratie",
     "Use lowercase letters, numbers, dashes and underscores only": "Gebruik enkel letters, cijfers, streepjes en underscores",
     "Cannot reach identity server": "Kan identiteitsserver niet bereiken",
@@ -1485,7 +1364,7 @@
     "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 <a>u aanmelden</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>.",
     "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).",
@@ -1509,7 +1388,7 @@
     "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": "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 opnieuw toegang te verkrijgen tot uw account.",
+    "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?",
     "You're signed out": "U bent afgemeld",
     "Clear personal data": "Persoonlijke gegevens wissen",
@@ -1521,9 +1400,9 @@
     "Terms of Service": "Gebruiksvoorwaarden",
     "Service": "Dienst",
     "Summary": "Samenvatting",
-    "Sign in and regain access to your account.": "Meld u aan en verkrijg opnieuw 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 contact op met de beheerder van uw thuisserver voor meer informatie.",
-    "This account has been deactivated.": "Deze account is gedeactiveerd.",
+    "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.",
+    "This account has been deactivated.": "Deze account is gesloten.",
     "Messages": "Berichten",
     "Actions": "Acties",
     "Displays list of commands with usages and descriptions": "Toont een lijst van beschikbare opdrachten, met hun gebruiken en beschrijvingen",
@@ -1539,7 +1418,7 @@
     "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.": "De verbinding met uw identiteitsserver verbreken zal ertoe leiden dat u niet door andere gebruikers gevonden zal kunnen worden, en dat u anderen niet via e-mail of telefoon zal kunnen uitnodigen.",
     "Integration Manager": "Integratiebeheerder",
     "Discovery": "Ontdekking",
-    "Deactivate account": "Account deactiveren",
+    "Deactivate account": "Account sluiten",
     "Always show the window menu bar": "De venstermenubalk altijd tonen",
     "Unable to revoke sharing for email address": "Kan delen voor dit e-mailadres niet intrekken",
     "Unable to share email address": "Kan e-mailadres niet delen",
@@ -1554,7 +1433,7 @@
     "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 de beheerder van uw thuisserver (<code>%(homeserverDomain)s</code>) om 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 thuisserverbeheerder (<code>%(homeserverDomain)s</code>) een TURN-server te configureren teneinde oproepen betrouwbaar te doen werken.",
     "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)",
@@ -1572,8 +1451,8 @@
     "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Gebruik een identiteitsserver om uit te nodigen via e-mail. Klik op ‘Doorgaan’ om de standaardidentiteitsserver (%(defaultIdentityServerName)s) te gebruiken, of beheer de server in de instellingen.",
     "Use an identity server to invite by email. Manage in Settings.": "Gebruik een identiteitsserver om uit te nodigen via e-mail. Beheer de server in de instellingen.",
     "Multiple integration managers": "Meerdere integratiebeheerders",
-    "Send read receipts for messages (requires compatible homeserver to disable)": "Verstuur leesbevestigingen voor berichten (vereist compatibele thuisserver om uit te schakelen)",
-    "Accept <policyLink /> to continue:": "Aanvaard <policyLink /> om verder te gaan:",
+    "Send read receipts for messages (requires compatible homeserver to disable)": "Verstuur leesbevestigingen voor berichten (uitschakelen vereist een compatibele thuisserver)",
+    "Accept <policyLink /> to continue:": "Aanvaard <policyLink /> om door te gaan:",
     "ID": "ID",
     "Public Name": "Openbare naam",
     "Change identity server": "Identiteitsserver wisselen",
@@ -1599,11 +1478,11 @@
     "No recent messages by %(user)s found": "Geen recente berichten door %(user)s gevonden",
     "Try scrolling up in the timeline to see if there are any earlier ones.": "Probeer omhoog te scrollen in de tijdslijn om te kijken of er eerdere zijn.",
     "Remove recent messages by %(user)s": "Recente berichten door %(user)s verwijderen",
-    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "U staat op het punt %(count)s berichten door %(user)s te verwijderen. Dit kan niet ongedaan worden gemaakt. Wilt u doorgaan?",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "U staat op het punt %(count)s berichten door %(user)s te verwijderen. Dit is onherroepelijk. Wilt u doorgaan?",
     "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 kan niet ongedaan worden gemaakt. 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 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?",
     "Deactivate user": "Gebruiker deactiveren",
     "Remove recent messages": "Recente berichten verwijderen",
     "Bold": "Vet",
@@ -1611,11 +1490,11 @@
     "Strikethrough": "Doorstreept",
     "Code block": "Codeblok",
     "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Er is een fout opgetreden (%(errcode)s) bij het valideren van uw uitnodiging. U kunt deze informatie doorgeven aan een gespreksbeheerder.",
-    "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Deze uitnodiging tot %(roomName)s was verstuurd naar %(email)s, wat niet aan uw account gekoppeld is",
-    "Link this email with your account in Settings to receive invites directly in Riot.": "Koppel dit e-mailadres aan uw account in de instellingen om uitnodigingen automatisch te ontvangen in Riot.",
+    "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Deze uitnodiging tot %(roomName)s was verstuurd naar %(email)s, dat niet aan uw account gekoppeld is",
+    "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Koppel in de instellingen dit e-mailadres aan uw account om uitnodigingen direct in %(brand)s te ontvangen.",
     "This invite to %(roomName)s was sent to %(email)s": "Deze uitnodiging tot %(roomName)s was verstuurd naar %(email)s",
-    "Use an identity server in Settings to receive invites directly in Riot.": "Gebruik een identiteitsserver in de instellingen om uitnodigingen automatisch te ontvangen in Riot.",
-    "Share this email in Settings to receive invites directly in Riot.": "Deel dit e-mailadres in de instellingen om uitnodigingen automatisch te ontvangen in Riot.",
+    "Use an identity server in Settings to receive invites directly in %(brand)s.": "Gebruik in de instellingen een identiteitsserver om uitnodigingen direct in %(brand)s te ontvangen.",
+    "Share this email in Settings to receive invites directly in %(brand)s.": "Deel in de instellingen dit e-mailadres om uitnodigingen direct in %(brand)s te ontvangen.",
     "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.",
@@ -1623,8 +1502,8 @@
     "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.",
     "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 in voor accountherstel. Gebruik optioneel een e-mailadres of telefoonnummer om vindbaar te zijn voor bestaande contacten.",
-    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Stel een e-mailadres in voor accountherstel. Gebruik optioneel een e-mailadres om vindbaar te zijn voor bestaande contacten.",
+    "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.",
+    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Stel een e-mailadres voor accountherstel in.  Gebruik eventueel een e-mailadres om vindbaar te zijn voor bestaande contacten.",
     "Enter your custom homeserver URL <a>What does this mean?</a>": "Voer uw aangepaste thuisserver-URL in <a>Wat betekent dit?</a>",
     "Enter your custom identity server URL <a>What does this mean?</a>": "Voer uw aangepaste identiteitsserver-URL in <a>Wat betekent dit?</a>",
     "Explore": "Ontdekken",
@@ -1638,21 +1517,16 @@
     "Explore rooms": "Gesprekken ontdekken",
     "Show previews/thumbnails for images": "Toon voorbeelden voor afbeeldingen",
     "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 kan niet ongedaan gemaakt worden. Wilt u doorgaan?",
+    "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",
     "%(count)s unread messages including mentions.|other": "%(count)s ongelezen berichten, inclusief vermeldingen.",
     "%(count)s unread messages.|other": "%(count)s ongelezen berichten.",
     "Unread mentions.": "Ongelezen vermeldingen.",
     "Show image": "Afbeelding tonen",
     "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "<newIssueLink>Maak een nieuw rapport aan</newIssueLink> op GitHub opdat we dit probleem kunnen onderzoeken.",
-    "Room alias": "Gespreksbijnaam",
     "e.g. my-room": "bv. mijn-gesprek",
-    "Please provide a room alias": "Geef een gespreksbijnaam op",
-    "This alias is available to use": "Deze bijnaam is beschikbaar",
-    "This alias is already in use": "Deze bijnaam is al in gebruik",
     "Close dialog": "Dialoog sluiten",
     "Please enter a name for the room": "Geef een naam voor het gesprek op",
-    "Set a room alias to easily share your room with other people.": "Stel een gespreksbijnaam in om het gesprek eenvoudig met anderen te delen.",
     "This room is private, and can only be joined by invitation.": "Dit gesprek is privé, en kan enkel op uitnodiging betreden worden.",
     "Create a public room": "Maak een openbaar gesprek aan",
     "Create a private room": "Maak een privégesprek aan",
@@ -1674,15 +1548,13 @@
     "Your email address hasn't been verified yet": "Uw e-mailadres is nog niet geverifieerd",
     "Click the link in the email you received to verify and then click continue again.": "Open de koppeling in de ontvangen verificatie-e-mail, en klik dan op ‘Doorgaan’.",
     "%(creator)s created and configured the room.": "Gesprek gestart en ingesteld door %(creator)s.",
-    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Dit gesprek bevat onbekende sessies. Tenzij u die verifieert zou iemand u kunnen afluisteren.",
     "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?",
     "Help": "Hulp",
     "Set up encryption": "Versleuteling instellen",
-    "Unverified session": "Ongeverifieerde sessie",
-    "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 toegang tot de standaardidentiteitsserver <server /> om een e-mailadres of telefoonnummer te valideren, maar die server heeft geen gebruiksvoorwaarden.",
+    "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.",
     "Trust": "Vertrouwen",
     "Custom (%(level)s)": "Aangepast (%(level)s)",
     "Error upgrading room": "Bijwerken van gesprek mislukt",
@@ -1693,9 +1565,6 @@
     "WARNING: Session already verified, but keys do NOT MATCH!": "PAS OP: de sessie is al geverifieerd, maar de sleutels komen NIET OVEREEN!",
     "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!": "PAS OP: sleutelverificatie MISLUKT! De combinatie %(userId)s + sessie %(deviceId)s is ondertekend met ‘%(fprint)s’ - maar de opgegeven sleutel is ‘%(fingerprint)s’.  Wellicht worden uw berichten onderschept!",
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "De door u verschafte en de van %(userId)ss sessie %(deviceId)s verkregen sleutels komen overeen. De sessie is daarmee geverifieerd.",
-    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s heeft %(addedAddresses)s en %(count)s andere adressen aan dit gesprek toegevoegd",
-    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s heeft dit gesprek ontdaan van %(removedAddresses)s en %(count)s andere adressen",
-    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s heeft dit gesprek ontdaan van %(countRemoved)s adressen, en er %(countAdded)s toegevoegd",
     "%(senderName)s placed a voice call.": "%(senderName)s probeert u te bellen.",
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s poogt u te bellen, maar uw browser ondersteunt dat niet",
     "%(senderName)s placed a video call.": "%(senderName)s doet een video-oproep.",
@@ -1734,21 +1603,14 @@
     "%(num)s days from now": "over %(num)s dagen",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
     "Try out new ways to ignore people (experimental)": "Nieuwe manieren om mensen te negeren uitproberen (nog in ontwikkeling)",
-    "Show a presence dot next to DMs in the room list": "Toon aanwezigheid bij tweegesprekken in de gesprekkenlijst",
-    "Enable cross-signing to verify per-user instead of per-session (in development)": "Gebruik gebruikersverificatie in plaats van sessieverificatie (nog in ontwikkeling)",
-    "Enable local event indexing and E2EE search (requires restart)": "Indexeer gebeurtenissen lokaal en maak zo E2EE-zoeken mogelijk (vergt een herstart)",
     "Show info about bridges in room settings": "Toon bruginformatie in gespreksinstellingen",
-    "Show padlocks on invite only rooms": "Toon hangsloten op besloten gesprekken",
     "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",
-    "Keep secret storage passphrase in memory for this session": "Onthoud in deze sessie het wachtwoord voor sleutelopslag",
     "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!",
-    "Confirm the emoji below are displayed on both devices, in the same order:": "Bevestig dat beide apparaten dezelfde emoji’s in dezelfde volgorde tonen:",
-    "Verify this device by confirming the following number appears on its screen.": "Verifieer dit apparaat door te bevestigen dat het scherm het volgende getal toont.",
     "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",
@@ -1768,21 +1630,17 @@
     "Show less": "Minder tonen",
     "Show more": "Meer tonen",
     "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.",
-    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Geef hier te negeren gebruikers en servers in. Asterisken staan voor willekeurige tekenreeksen; zo leidt <code>@bot:*</code> tot het negeren van  alle gebruikers die ‘bot’ heten op alle servers.",
     "in memory": "in het geheugen",
     "not found": "niet gevonden",
     "Your homeserver does not support session management.": "Uw thuisserver 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",
-    "The version of Riot": "De versie van Riot",
-    "Whether you're using Riot on a device where touch is the primary input mechanism": "Of u Riot op een apparaat gebruikt waarop een aanraakscherm de voornaamste invoermethode is",
-    "Whether you're using Riot as an installed Progressive Web App": "Of u Riot gebruikt als een geïnstalleerde Progressive-Web-App",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Of u %(brand)s op een apparaat gebruikt waarop een aanraakscherm de voornaamste invoermethode is",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Of u %(brand)s gebruikt als een geïnstalleerde Progressive-Web-App",
     "Your user agent": "Uw gebruikersagent",
-    "The information being sent to us to help make Riot better includes:": "De informatie die naar ons wordt verstuurd om Riot te verbeteren bevat:",
     "If you cancel now, you won't complete verifying the other user.": "Als u nu annuleert zult u de andere gebruiker niet verifiëren.",
     "If you cancel now, you won't complete verifying your other session.": "Als u nu annuleert zult u uw andere sessie niet verifiëren.",
-    "If you cancel now, you won't complete your secret storage operation.": "Als u nu annuleert zal de sleutelopslag worden afgebroken.",
     "Cancel entering passphrase?": "Wachtwoordinvoer annuleren?",
     "Show typing notifications": "Typmeldingen weergeven",
     "Verify this session by completing one of the following:": "Verifieer deze sessie door een van het volgende te doen:",
@@ -1791,7 +1649,7 @@
     "Compare unique emoji": "Vergelijk unieke emoji",
     "Compare a unique set of emoji if you don't have a camera on either device": "Vergelijk een unieke lijst met emoji als geen van beide apparaten een camera heeft",
     "Start": "Start",
-    "Securely cache encrypted messages locally for them to appear in search results.": "Sla versleutelde berichten beveiligd op om ze weer te geven in zoekresultaten.",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Sla versleutelde berichten veilig lokaal op om ze doorzoekbaar te maken.",
     "Enable": "Inschakelen",
     "Connecting to integration manager...": "Verbinding maken met de integratiebeheerder…",
     "Cannot connect to integration manager": "Kan geen verbinding maken met de integratiebeheerder",
@@ -1803,7 +1661,6 @@
     "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.",
     "Error subscribing to list": "Fout bij het abonneren op de lijst",
-    "Please verify the room ID or alias and try again.": "Controleer de gespreks-ID of -(bij)naam en probeer het opnieuw.",
     "Error removing ignored user/server": "Fout bij het verwijderen van genegeerde gebruiker/server",
     "Error unsubscribing from list": "Fout bij het opzeggen van een abonnement op de lijst",
     "Please try again or view your console for hints.": "Probeer het opnieuw of bekijk de console voor meer informatie.",
@@ -1823,7 +1680,6 @@
     "Subscribed lists": "Abonnementen op lijsten",
     "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.",
-    "Room ID or alias of ban list": "Gespreks-ID of (bij)naam van banlijst",
     "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",
@@ -1842,7 +1698,6 @@
     "Session ID:": "Sessie-ID:",
     "Session key:": "Sessiesleutel:",
     "Message search": "Berichten zoeken",
-    "Sessions": "Sessies",
     "A session's public name is visible to people you communicate with": "De publieke naam van een sessie is zichtbaar voor de mensen waarmee u communiceert",
     "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Dit gesprek wordt overbrugd naar de volgende platformen. <a>Lees meer</a>",
     "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Dit gesprek wordt niet overbrugd naar andere platformen. <a>Lees meer.</a>",
@@ -1853,10 +1708,6 @@
     "Someone is using an unknown session": "Iemand gebruikt een onbekende sessie",
     "This room is end-to-end encrypted": "Dit gesprek is eind-tot-eind-versleuteld",
     "Everyone in this room is verified": "Iedereen in dit gesprek is geverifieerd",
-    "Some sessions for this user are not trusted": "Sommige sessies van deze gebruiker zijn niet vertrouwd",
-    "All sessions for this user are trusted": "Alle sessies van deze gebruiker zijn vertrouwd",
-    "Some sessions in this encrypted room are not trusted": "Sommige sessies in dit versleutelde gesprek zijn niet vertrouwd",
-    "All sessions in this encrypted room are trusted": "Alle sessies in dit versleutelde gesprek zijn vertrouwd",
     "Mod": "Mod",
     "rooms.": "gesprekken.",
     "Recent rooms": "Actuele gesprekken",
@@ -1864,7 +1715,7 @@
     "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.",
-    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Uw account heeft een identiteit voor kruiselings ondertekenen in de sleutelopslag, maar deze is nog niet vertrouwd door de huidige sessie.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Uw account heeft een identiteit voor kruiselings ondertekenen in de sleutelopslag, maar die wordt nog niet vertrouwd door de huidige sessie.",
     "Cross-signing and secret storage are not yet set up.": "Kruiselings ondertekenen en sleutelopslag zijn nog niet ingesteld.",
     "Bootstrap cross-signing and secret storage": "Kruiselings ondertekenen en sleutelopslag instellen",
     "Reset cross-signing and secret storage": "Kruiselings ondertekenen en sleutelopslag opnieuw instellen",
@@ -1873,7 +1724,7 @@
     "in secret storage": "in de sleutelopslag",
     "Secret storage public key:": "Sleutelopslag publieke sleutel:",
     "in account data": "in accountinformatie",
-    "Securely cache encrypted messages locally for them to appear in search results, using ": "Sla versleutelde berichten beveiligd op om ze weer te geven in de zoekresultaten, door gebruik te maken van ",
+    "Securely cache encrypted messages locally for them to appear in search results, using ": "Sla versleutelde berichten veilig lokaal op opdat ze doorzocht kunnen worden, middels ",
     " to store messages from ": " om berichten op te slaan van ",
     "Manage": "Beheren",
     "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Verbind deze sessie met de sleutelback-up voordat u zich afmeldt. Dit voorkomt dat u sleutels verliest die alleen op deze sessie voorkomen.",
@@ -1898,17 +1749,15 @@
     "Homeserver feature support:": "Functies ondersteund door thuisserver:",
     "exists": "bestaat",
     "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 er een nieuwe aan om verder te gaan.",
+    "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",
     "Displays information about a user": "Geeft informatie weer over een gebruiker",
     "Order rooms by name": "Gesprekken sorteren op naam",
     "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…",
-    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Riot beschikt niet over alle onderdelen die nodig zijn om versleutelde berichten veilig in het lokale cachegeheugen te bewaren. Als u deze functie wilt uittesten, kunt u een aangepaste versie van Riot Desktop compileren, waarbij <nativeLink>de zoekonderdelen toegevoegd zijn</nativeLink>.",
-    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot kan versleutelde berichten niet veilig bewaren in het lokale cachegeheugen wanneer het uitgevoerd wordt in een webbrowser. Gebruik <riotLink>Riot Desktop</riotLink> om versleutelde berichten in de zoekresultaten te laten verschijnen.",
+    "%(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.",
-    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Er is een back-upsleutel opgeslagen in de geheime opslag, maar deze functie is niet ingeschakeld voor deze sessie. Schakel kruiselings ondertekenen in in de experimentele instellingen om de sleutelback-upstatus te wijzigen.",
     "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",
     "Your key share request has been sent - please check your other sessions for key share requests.": "Uw sleuteldeelverzoek is verstuurd - controleer de sleuteldeelverzoeken op uw andere sessies.",
@@ -1922,7 +1771,6 @@
     "Invite only": "Enkel op uitnodiging",
     "Close preview": "Voorbeeld sluiten",
     "Failed to deactivate user": "Deactiveren van gebruiker is mislukt",
-    "No sessions with registered encryption keys": "Geen sessies met geregistreerde versleutelingssleutels",
     "Send a reply…": "Verstuur een antwoord…",
     "Send a message…": "Verstuur een bericht…",
     "Room %(name)s": "Gesprek %(name)s",
@@ -1938,7 +1786,7 @@
     "Send as message": "Versturen als bericht",
     "Failed to connect to integration manager": "Verbinding met integratiebeheerder is mislukt",
     "Waiting for %(displayName)s to accept…": "Wachten tot %(displayName)s aanvaardt…",
-    "Accepting…": "Aanvaarden…",
+    "Accepting…": "Toestaan…",
     "Start Verification": "Verificatie beginnen",
     "Messages in this room are end-to-end encrypted.": "De berichten in dit gesprek worden eind-tot-eind-versleuteld.",
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Uw berichten zijn beveiligd, en enkel de ontvanger en u hebben de unieke sleutels om ze te ontsleutelen.",
@@ -1952,9 +1800,8 @@
     "Yours, or the other users’ session": "De sessie van uzelf of de andere gebruiker",
     "Not Trusted": "Niet vertrouwd",
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s%(userId)s heeft zich aangemeld bij een nieuwe sessie zonder deze te verifiëren:",
-    "Ask this user to verify their session, or manually verify it below.": "Vraag deze gebruiker om zijn/haar sessie te verifiëren, of verifieer deze hieronder handmatig.",
+    "Ask this user to verify their session, or manually verify it below.": "Vraag deze gebruiker haar/zijn sessie te verifiëren, of verifieer die hieronder handmatig.",
     "Done": "Klaar",
-    "Manually Verify": "Handmatig verifiëren",
     "Trusted": "Vertrouwd",
     "Not trusted": "Niet vertrouwd",
     "%(count)s verified sessions|other": "%(count)s geverifieerde sessies",
@@ -1968,7 +1815,7 @@
     "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.",
     "Security": "Beveiliging",
-    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "De sessie die u probeert te verifiëren biedt geen ondersteuning voor de door Riot ondersteunde verificatiemethodes, nl. het scannen van QR-codes of het vergelijken van emoji. Probeer met een andere cliënt te verifiëren.",
+    "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.": "De sessie die u probeert te verifiëren biedt geen ondersteuning voor de door %(brand)s ondersteunde verificatiemethodes, nl. het scannen van QR-codes of het vergelijken van emoji. Probeer met een andere cliënt te verifiëren.",
     "Verify by scanning": "Verifiëren met scan",
     "Ask %(displayName)s to scan your code:": "Vraag %(displayName)s om uw code te scannen:",
     "Verify by emoji": "Verifiëren met emoji",
@@ -1976,9 +1823,6 @@
     "Verify by comparing unique emoji.": "Verifieer door unieke emoji te vergelijken.",
     "You've successfully verified %(displayName)s!": "U heeft %(displayName)s geverifieerd!",
     "Got it": "Ik snap het",
-    "Verification timed out. Start verification again from their profile.": "De verificatie is verlopen. Begin het verificatieproces opnieuw via het profiel van de gebruiker.",
-    "%(displayName)s cancelled verification. Start verification again from their profile.": "%(displayName)s heeft de verificatie geannuleerd. Begin het verificatieproces opnieuw via het profiel van de gebruiker.",
-    "You cancelled verification. Start verification again from their profile.": "U heeft de verificatie geannuleerd. Begin het verificatieproces opnieuw via het profiel van de gebruiker.",
     "Encryption enabled": "Versleuteling ingeschakeld",
     "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "De berichten in dit gesprek worden eind-tot-eind-versleuteld. Kom hier meer over te weten en verifieer de gebruiker via zijn/haar gebruikersprofiel.",
     "Encryption not enabled": "Versleuteling niet ingeschakeld",
@@ -1995,14 +1839,14 @@
     "You cancelled": "U heeft geannuleerd",
     "%(name)s declined": "%(name)s heeft geweigerd",
     "%(name)s cancelled": "%(name)s heeft geannuleerd",
-    "Accepting …": "Aanvaarden…",
+    "Accepting …": "Toestaan…",
     "Declining …": "Weigeren…",
     "%(name)s wants to verify": "%(name)s wil verifiëren",
     "You sent a verification request": "U heeft een verificatieverzoek verstuurd",
     "Reactions": "Reacties",
     "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> heeft gereageerd met %(content)s</reactedWith>",
     "Frequently Used": "Vaak gebruikt",
-    "Smileys & People": "Smileys en personen",
+    "Smileys & People": "Emoticons en personen",
     "Animals & Nature": "Dieren en natuur",
     "Food & Drink": "Eten en drinken",
     "Activities": "Activiteiten",
@@ -2017,7 +1861,7 @@
     "Your avatar URL": "De URL van uw profielfoto",
     "Your user ID": "Uw gebruikers-ID",
     "Your theme": "Uw thema",
-    "Riot URL": "Riot-URL",
+    "%(brand)s URL": "%(brand)s-URL",
     "Room ID": "Gespreks-ID",
     "Widget ID": "Widget-ID",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Deze widget gebruiken deelt mogelijk gegevens <helpIcon /> met %(widgetDomain)s en uw integratiebeheerder.",
@@ -2028,16 +1872,13 @@
     "More options": "Meer opties",
     "Language Dropdown": "Taalselectie",
     "Destroy cross-signing keys?": "Sleutels voor kruiselings ondertekenen verwijderen?",
-    "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 kan niet ongedaan gemaakt worden. 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.",
+    "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 kan niet ongedaan gemaakt worden. 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 hun sleutels heeft.",
     "Verify session": "Sessie verifiëren",
-    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Controleer of de sleutel in de gebruikersinstellingen op het apparaat overeenkomt met onderstaande sleutel om te verifiëren dat de sessie vertrouwd kan worden:",
-    "To verify that this session can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this session matches the key below:": "Neem contact op met de eigenaar op een andere manier (bv. onder vier ogen of met een telefoongesprek) en vraag of de sleutel in zijn/haar gebruikersinstellingen overeenkomt met onderstaande sleutel om te verifiëren dat de sessie vertrouwd kan worden:",
     "Session name": "Sessienaam",
     "Session key": "Sessiesleutel",
-    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "Als hij overeenkomt, klik dan op de knop ‘Verifiëren’. Zo niet is het mogelijk dat iemand deze sessie onderschept, en wilt u waarschijnlijk op de knop ‘Blokkeren’ klikken.",
     "Verification Requests": "Verificatieverzoeken",
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Deze gebruiker verifiëren zal de sessie als vertrouwd markeren voor u en voor hem/haar.",
     "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.",
@@ -2045,7 +1886,7 @@
     "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.",
     "Integrations not allowed": "Integraties niet toegestaan",
-    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Uw Riot laat u geen integratiebeheerder gebruiken om dit te doen. Neem contact op met een beheerder.",
+    "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.",
     "Something went wrong trying to invite the users.": "Er is een fout opgetreden bij het uitnodigen van de gebruikers.",
@@ -2055,46 +1896,26 @@
     "Recent Conversations": "Recente gesprekken",
     "Suggestions": "Suggesties",
     "Recently Direct Messaged": "Recente tweegesprekken",
-    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Als u iemand niet kunt vinden, vraag dan zijn/haar gebruikersnaam, deel uw eigen gebruikersnaam (%(userId)s) of <a>profielkoppeling</a>.",
     "Go": "Start",
-    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Als u iemand niet kunt vinden, vraag dan zijn/haar gebruikersnaam (bv. @user:server.com) of <a>deel dit gesprek</a>.",
-    "You added a new session '%(displayName)s', which is requesting encryption keys.": "U heeft een nieuwe sessie ‘%(displayName)s’ toegevoegd, die om versleutelingssleutels vraagt.",
-    "Your unverified session '%(displayName)s' is requesting encryption keys.": "Uw ongeverifieerde sessie ‘%(displayName)s’ vraagt om versleutelingssleutels.",
-    "Loading session info...": "Sessie-info wordt geladen…",
-    "Your account is not secure": "Uw account is niet veilig",
+    "Your account is not secure": "Uw account is onveilig",
     "Your password": "Uw wachtwoord",
     "This session, or the other session": "Deze sessie, of de andere sessie",
     "The internet connection either session is using": "De internetverbinding gebruikt door een van de sessies",
     "We recommend you change your password and recovery key in Settings immediately": "We raden u aan onmiddellijk uw wachtwoord en herstelsleutel te wijzigen in de instellingen",
     "New session": "Nieuwe sessie",
     "Use this session to verify your new one, granting it access to encrypted messages:": "Gebruik deze sessie om uw nieuwe sessie te verifiëren, waardoor deze laatste toegang verkrijgt tot versleutelde berichten:",
-    "If you didn’t sign in to this session, your account may be compromised.": "Als u zich niet heeft aangemeld bij deze sessie, is uw account mogelijk gecompromitteerd.",
+    "If you didn’t sign in to this session, your account may be compromised.": "Als u zich niet heeft aangemeld bij deze sessie, is uw account wellicht geschonden.",
     "This wasn't me": "Dat was ik niet",
     "Automatically invite users": "Gebruikers automatisch uitnodigen",
     "Upgrade private room": "Privégesprek bijwerken",
     "Upgrade public room": "Openbaar gesprek bijwerken",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Het bijwerken van een gesprek is een gevorderde actie en wordt meestal aanbevolen wanneer een gesprek onstabiel is door fouten, ontbrekende functies of problemen met de beveiliging.",
-    "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Dit heeft meestal enkel een invloed op de manier waarop het gesprek door de server verwerkt wordt. Als u problemen met uw Riot ondervindt, <a>dien dan een foutmelding in</a>.",
+    "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>.": "Dit heeft meestal enkel een invloed op de manier waarop het gesprek door de server verwerkt wordt. Als u problemen met uw %(brand)s ondervindt, <a>dien dan een foutmelding in</a>.",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "U werkt dit gesprek bij van <oldVersion /> naar <newVersion />.",
-    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Dit biedt u de mogelijkheid om terug te keren naar uw account nadat u zich heeft afgemeld, en om u aan te melden bij andere sessies.",
-    "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "U blokkeert momenteel niet-geverifieerde sessies; om berichten te sturen naar deze sessies moet u ze verifiëren.",
-    "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "We raden u aan om het verificatieproces voor elke sessie te doorlopen om te bevestigen dat ze aan hun rechtmatige eigenaar toebehoren, maar u kunt het bericht ook opnieuw versturen zonder verificatie indien u dit wenst.",
-    "Room contains unknown sessions": "Gesprek bevat onbekende sessies",
-    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "‘%(RoomName)s’ bevat sessies die u nog niet eerder gezien heeft.",
-    "Unknown sessions": "Onbekende sessies",
+    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Daardoor kunt u na afmelding terugkeren tot uw account, en u bij andere sessies aanmelden.",
     "Verification Request": "Verificatieverzoek",
-    "Enter secret storage passphrase": "Voer het wachtwoord voor de geheime opslag in",
-    "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Kan geen toegang verkrijgen tot geheime opslag. Controleer of u het juiste wachtwoord heeft ingevoerd.",
-    "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Let op</b>: open de geheime opslag enkel op een computer die u vertrouwt.",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "Verkrijg de toegang tot uw beveiligde berichtgeschiedenis en uw identiteit voor kruiselings ondertekenen voor het verifiëren van andere sessies door uw wachtwoord in te voeren.",
-    "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Als u uw wachtwoord vergeten bent, kunt u <button1>uw herstelsleutel gebruiken</button1> of <button2>nieuwe herstelopties instellen</button2>.",
-    "Enter secret storage recovery key": "Voer de herstelsleutel voor de geheime opslag in",
-    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Kan geen toegang verkrijgen tot geheime opslag. Controleer of u de juiste herstelsleutel heeft ingevoerd.",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Verkrijg de toegang tot uw beveiligde berichtgeschiedenis en uw identiteit voor kruiselings ondertekenen voor het verifiëren van andere sessies door uw herstelsleutel in te voeren.",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "Als u uw herstelsleutel vergeten bent, kunt u <button>nieuwe herstelopties instellen</button>.",
     "Recovery key mismatch": "Herstelsleutel komt niet overeen",
     "Incorrect recovery passphrase": "Onjuist herstelwachtwoord",
-    "Backup restored": "Back-up teruggezet",
     "Enter recovery passphrase": "Voer het herstelwachtwoord in",
     "Enter recovery key": "Voer de herstelsleutel in",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Let op</b>: stel sleutelback-up enkel in op een vertrouwde computer.",
@@ -2108,13 +1929,8 @@
     "Country Dropdown": "Landselectie",
     "Confirm your identity by entering your account password below.": "Bevestig uw identiteit door hieronder uw accountwachtwoord in te voeren.",
     "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Er is geen identiteitsserver geconfigureerd, dus u kunt geen e-mailadres toevoegen om in de toekomst een nieuw wachtwoord in te stellen.",
-    "Message not sent due to unknown sessions being present": "Bericht niet verstuurd, er zijn onbekende sessies aanwezig",
-    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Sessies tonen</showSessionsText>, <sendAnywayText>toch versturen</sendAnywayText> of <cancelText>annuleren</cancelText>.",
     "Jump to first unread room.": "Ga naar het eerste ongelezen gesprek.",
     "Jump to first invite.": "Ga naar de eerste uitnodiging.",
-    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
-    "Complete security": "Vervolledig de beveiliging",
-    "Verify this session to grant it access to encrypted messages.": "Verifieer deze sessie om toegang te verkrijgen tot uw versleutelde berichten.",
     "Session verified": "Sessie geverifieerd",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Uw nieuwe sessie is nu geverifieerd. Ze heeft nu toegang tot uw versleutelde berichten, en de sessie zal voor andere gebruikers als vertrouwd gemarkeerd worden.",
     "Your new session is now verified. Other users will see it as trusted.": "Uw nieuwe sessie is nu geverifieerd. Ze zal voor andere gebruikers als vertrouwd gemarkeerd worden.",
@@ -2122,31 +1938,23 @@
     "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.",
-    "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.": "Verkrijg opnieuw de toegang tot uw account en herstel de versleutelingssleutels die in deze sessie opgeslagen zijn. Hierzonder zult u niet al uw beveiligde berichten in al uw sessies kunnen lezen.",
-    "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 (versleutelingssleutels inbegrepen) worden 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.",
+    "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",
     "DuckDuckGo Results": "DuckDuckGo-resultaten",
-    "Sender session information": "Sessie-informatie van afzender",
     "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",
     "Restore": "Herstellen",
     "You'll need to authenticate with the server to confirm the upgrade.": "U zult zich moeten aanmelden bij de server om het bijwerken te bevestigen.",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Werk deze sessie bij om er andere sessies mee te verifiëren, waardoor deze ook de toegang verkrijgen tot uw versleutelde berichten en voor andere gebruikers als vertrouwd gemarkeerd worden.",
-    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Stel versleuteling in voor deze sessie om er andere sessies mee te verifiëren, waardoor deze ook de toegang verkrijgen tot uw versleutelde berichten en voor andere gebruikers als vertrouwd gemarkeerd worden.",
-    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Beveilig uw versleutelingssleutels met een wachtwoord. Voor een optimale beveiliging moet dit verschillen van uw accountwachtwoord:",
-    "Enter a passphrase": "Voer een wachtwoord in",
-    "Back up my encryption keys, securing them with the same passphrase": "Maak een back-up van mijn versleutelingssleutels, en beveilig ze met hetzelfde wachtwoord",
     "Set up with a recovery key": "Instellen met een herstelsleutel",
-    "Enter your passphrase a second time to confirm it.": "Voer uw wachtwoord nogmaals in ter bevestiging.",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Bewaar een kopie op een veilige plaats, zoals in een wachtwoordbeheerder of een kluis.",
     "Your recovery key": "Uw herstelsleutel",
     "Copy": "Kopiëren",
     "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Uw herstelsleutel is <b>gekopieerd naar uw klembord</b>, plak hem en:",
     "Your recovery key is in your <b>Downloads</b> folder.": "Uw herstelsleutel bevindt zich in uw <b>Downloads</b>-map.",
-    "You can now verify your other devices, and other users to keep your chats safe.": "U kunt nu uw andere apparaten evenals andere gebruikers verifiëren om uw gesprekken te beveiligen.",
     "Upgrade your encryption": "Werk uw versleuteling bij",
     "Make a copy of your recovery key": "Maak een kopie van uw herstelsleutel",
-    "You're done!": "Klaar!",
     "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.",
     "Create key backup": "Sleutelback-up aanmaken",
@@ -2154,16 +1962,69 @@
     "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.",
     "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.": "Als u dit per ongeluk heeft gedaan, kunt u beveiligde berichten op deze sessie instellen, waarmee de berichtgeschiedenis van deze sessie opnieuw zal versleuteld worden aan de hand van een nieuwe herstelmethode.",
     "Disable": "Uitschakelen",
-    "Not currently downloading messages for any room.": "Er worden momenteel geen berichten gedownload.",
-    "Downloading mesages for %(currentRoom)s.": "Er worden berichten gedownload voor %(currentRoom)s.",
-    "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot bewaart versleutelde berichten veilig in het lokale cachegeheugen om ze in uw zoekresultaten te laten verschijnen:",
+    "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s bewaart versleutelde berichten veilig in het lokale cachegeheugen om ze in uw zoekresultaten te laten verschijnen:",
     "Space used:": "Gebruikte ruimte:",
     "Indexed messages:": "Geïndexeerde berichten:",
-    "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s van %(totalRooms)s",
     "Message downloading sleep time(ms)": "Wachttijd voor downloaden van berichten (ms)",
     "Mark all as read": "Alles markeren als gelezen",
     "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.",
-    "Currently indexing: %(currentRoom)s.": "Wordt geïndexeerd: %(currentRoom)s.",
-    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s van %(totalRooms)s"
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s van %(totalRooms)s",
+    "Where you’re logged in": "Waar u aangemeld 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",
+    "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 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?",
+    "%(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",
+    "Command failed": "Opdracht mislukt",
+    "Could not find user in room": "Kon die deelnemer aan het gesprek niet vinden",
+    "Please supply a widget URL or embed code": "Gelieve een widgetURL of in te bedden code te geven",
+    "Send a bug report with logs": "Rapporteer een fout, met foutopsporingslogboek bijgesloten",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s heeft het gesprek %(oldRoomName)s hernoemd tot %(newRoomName)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s heeft dit gesprek de nevenadressen %(addresses)s toegekend.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s heeft dit gesprek het nevenadres %(addresses)s toegekend.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s heeft de nevenadressen %(addresses)s voor dit gesprek geschrapt.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s heeft het nevenadres %(addresses)s voor dit gesprek geschrapt.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s heeft de nevenadressen voor dit gesprek gewijzigd.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s heeft hoofd- en nevenadressen voor dit gesprek gewijzigd.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s heeft de adressen voor dit gesprek gewijzigd.",
+    "You signed in to a new session without verifying it:": "U heeft zich bij een nog niet geverifieerde sessie aangemeld:",
+    "Verify your other session using one of the options below.": "Verifieer uw andere sessie op een van onderstaande wijzen.",
+    "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",
+    "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.",
+    "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>.",
+    "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.",
+    "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",
+    "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."
 }
diff --git a/src/i18n/strings/nn.json b/src/i18n/strings/nn.json
index a3418a174d..52cbfc75e1 100644
--- a/src/i18n/strings/nn.json
+++ b/src/i18n/strings/nn.json
@@ -1,21 +1,15 @@
 {
     "This phone number is already in use": "Dette telefonnummeret er allereie i bruk",
-    "The version of Riot.im": "Utgåva av Riot.im",
+    "The version of %(brand)s": "Gjeldande versjon av %(brand)s",
     "Your homeserver's URL": "Heimtenaren din si nettadresse",
     "Your device resolution": "Eininga di sin oppløysing",
-    "The information being sent to us to help make Riot.im better includes:": "Informasjonen som vert send til oss for å gjera Riot.im betre er mellom anna:",
+    "The information being sent to us to help make %(brand)s better includes:": "Informasjon sendt til oss for å forbetre %(brand)s inkluderar:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Der denne sida inneheld gjenkjenneleg informasjon, slik som ein rom-, brukar- eller gruppeID, vert denne informasjonen sletta før han sendast til tenar.",
     "Call Failed": "Oppringjing Mislukkast",
-    "Review Devices": "Sjå Over Einingar",
-    "Call Anyway": "Ring Likevel",
-    "Answer Anyway": "Svar Likevel",
-    "Call": "Ring",
-    "Answer": "Svar",
     "You are already in a call.": "Du er allereie i ei samtale.",
     "VoIP is unsupported": "VoIP er ikkje støtta",
-    "You cannot place VoIP calls in this browser.": "Du kan ikkje utføre med anrop med VoIP i denne nettlesaren.",
+    "You cannot place VoIP calls in this browser.": "Du kan ikkje utføra samtalar med VoIP i denne nettlesaren.",
     "You cannot place a call with yourself.": "Du kan ikkje samtala med deg sjølv.",
-    "Could not connect to the integration server": "Kunne ikkje kopla til integreringstenaren",
     "Call in Progress": "Ei Samtale er i Gang",
     "A call is currently being placed!": "Ei samtale held allereie på å starta!",
     "A call is already in progress!": "Ei samtale er i gang allereie!",
@@ -54,14 +48,13 @@
     "Which rooms would you like to add to this community?": "Kva rom vil du leggja til i dette fellesskapet?",
     "Show these rooms to non-members on the community page and room list?": "Vis desse romma til ikkje-medlem på fellesskapssida og romkatalogen?",
     "Add rooms to the community": "Legg til rom i fellesskapet",
-    "Room name or alias": "Romnamn eller alias",
     "Add to community": "Legg til i fellesskapet",
     "Failed to invite the following users to %(groupId)s:": "Fekk ikkje til å invitera følgjande brukarar i %(groupId)s:",
     "Failed to invite users to community": "Fekk ikkje til å invitera brukarar til fellesskapet.",
     "Failed to invite users to %(groupId)s": "Fekk ikkje til å invitera brukarar til %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Fekk ikkje til å invitera følgjande rom til %(groupId)s:",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot har ikkje lov til å senda deg varsel - sjekk nettlesarinnstillingane dine",
-    "Riot was not given permission to send notifications - please try again": "Riot fekk ikkje tillating til å senda varsel - ver venleg og prøv igjen",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s har ikkje lov til å senda deg varsel - sjekk nettlesarinnstillingane dine",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s fekk ikkje tillating til å senda varsel - ver venleg og prøv igjen",
     "Unable to enable Notifications": "Klarte ikkje å skru på Varsel",
     "This email address was not found": "Denne epostadressa var ikkje funnen",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Epostadressa di ser ikkje ut til å vera tilknytta ein Matrix-ID på denne heimtenaren.",
@@ -69,7 +62,6 @@
     "Restricted": "Avgrensa",
     "Moderator": "Moderator",
     "Admin": "Administrator",
-    "Start a chat": "Start ein samtale",
     "Operation failed": "Handling mislukkast",
     "Failed to invite": "Fekk ikkje til å invitera",
     "Failed to invite the following users to the %(roomName)s room:": "Fekk ikkje til å invitera følgjande brukarar til %(roomName)s:",
@@ -92,9 +84,7 @@
     "/ddg is not a command": "/ddg er ikkje ein kommando",
     "Changes your display nickname": "Forandrar kallenamnet ditt",
     "Invites user with given id to current room": "Inviter brukarar med fylgjande ID inn i gjeldande rom",
-    "Joins room with given alias": "Gjeng inn i eit rom med det gjevne aliaset",
     "Leave room": "Forlat rommet",
-    "Unrecognised room alias:": "Ukjend romalias:",
     "Kicks user with given id": "Sparkar brukarar med gjeven ID",
     "Bans user with given id": "Stengjer brukarar med den gjevne IDen ute",
     "Ignores a user, hiding their messages from you": "Overser ein brukar, slik at meldingane deira ikkje synast for deg",
@@ -107,18 +97,14 @@
     "This email address is already in use": "Denne e-postadressa er allereie i bruk",
     "The platform you're on": "Platformen du er på",
     "Failed to verify email address: make sure you clicked the link in the email": "Fekk ikkje til å stadfesta e-postadressa: sjå til at du klikka på den rette lenkja i e-posten",
-    "Your identity server's URL": "Din identitetstenar si nettadresse",
     "Every page you use in the app": "Alle sider du brukar i programmet",
     "e.g. <CurrentPageURL>": "t.d. <CurrentPageURL>",
-    "Your User Agent": "Din Brukaragent",
     "Analytics": "Statistikk",
     "Unable to capture screen": "Klarte ikkje ta opp skjermen",
     "Existing Call": "Samtale er i gang",
     "To use it, just wait for autocomplete results to load and tab through them.": "For å bruka den, vent på at resultata fyller seg ut og tab gjennom dei.",
     "Deops user with given id": "AvOPar brukarar med den gjevne IDen",
     "Opens the Developer Tools dialog": "Opnar Utviklarverktøy-tekstboksen",
-    "Unverify": "Fjern verifikasjon",
-    "Verify...": "Godkjenn...",
     "Which officially provided instance you are using, if any": "Kva offisielt gjevne instanse du brukar, viss nokon",
     "The remote side failed to pick up": "Den andre sida tok ikkje røret",
     "Verified key": "Godkjend nøkkel",
@@ -167,22 +153,18 @@
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s-widget lagt til av %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s widget fjerna av %(senderName)s",
     "Failure to create room": "Klarte ikkje å laga rommet",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Serveren er kanskje utilgjengeleg, overlasta elles så traff du ein bug.",
-    "Send anyway": "Send likevel",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Tenaren er kanskje utilgjengeleg, overlasta elles så traff du ein bug.",
     "Send": "Send",
     "Unnamed Room": "Rom utan namn",
     "Your browser does not support the required cryptography extensions": "Nettlesaren din støttar ikkje dei naudsynte kryptografiske utvidingane",
-    "Not a valid Riot keyfile": "Ikkje ei gyldig Riot-nykelfil",
+    "Not a valid %(brand)s keyfile": "Ikkje ei gyldig %(brand)s-nykelfil",
     "Authentication check failed: incorrect password?": "Authentiseringsforsøk mislukkast: feil passord?",
     "Failed to join room": "Fekk ikkje til å gå inn i rom",
     "Message Pinning": "Meldingsfesting",
-    "Use compact timeline layout": "Bruk kompakt utforming for historikk",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Vis tidspunkt i 12-timarsform (t.d. 2:30pm)",
     "Always show message timestamps": "Vis alltid meldingstidspunkt",
     "Autoplay GIFs and videos": "Spel av GIFar og videoar med ein gong",
     "Always show encryption icons": "Vis alltid krypteringsikon",
-    "Disable Notifications": "Skru Varsel av",
-    "Enable Notifications": "Skru Varsel på",
     "Automatically replace plain text Emoji": "Erstatt Emojiar i klartekst av seg sjølv",
     "Mirror local video feed": "Spegl den lokale videofeeden",
     "Send analytics data": "Send statistikkdata",
@@ -222,11 +204,10 @@
     "Do you want to set an email address?": "Vil du setja ei epostadresse?",
     "Current password": "Gjeldande passord",
     "Password": "Passord",
-    "New Password": "Nytt Passord",
+    "New Password": "Nytt passord",
     "Confirm password": "Stadfest passord",
-    "Change Password": "Endra Passord",
+    "Change Password": "Endra passord",
     "Authentication": "Authentisering",
-    "Device ID": "EiningsID",
     "Last seen": "Sist sedd",
     "Failed to set display name": "Fekk ikkje til å setja visningsnamn",
     "Error saving email notification preferences": "Klarte ikkje å lagra varslingsinnstillingar for e-post",
@@ -247,7 +228,6 @@
     "Unable to fetch notification target list": "Klarte ikkje å henta varselmållista",
     "Notification targets": "Varselmål",
     "Advanced notification settings": "Avanserte varslingsinnstillingar",
-    "There are advanced notifications which are not shown here": "Det finst avanserte varslingar som ikkje er synlege her",
     "Show message in desktop notification": "Vis meldinga i eit skriverbordsvarsel",
     "Off": "Av",
     "On": "På",
@@ -266,8 +246,6 @@
     "Options": "Innstillingar",
     "Key request sent.": "Nykelforespurnad er send.",
     "Please select the destination room for this message": "Vel kva rom som skal få denne meldinga",
-    "Blacklisted": "Svartelista",
-    "device id: ": "einingsID: ",
     "Disinvite": "Fjern invitasjon",
     "Kick": "Spark ut",
     "Disinvite this user?": "Fjern invitasjonen for denne brukaren?",
@@ -282,7 +260,6 @@
     "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 kan ikkje gjera om på denne endringa sidan du senkar tilgangsnivået ditt. Viss du er den siste privilegerte brukaren i rommet vil det bli umogleg å få tilbake tilgangsrettane.",
     "Demote": "Degrader",
     "Failed to mute user": "Fekk ikkje til å dempe brukaren",
-    "Failed to toggle moderator status": "Fekk ikkje til å skifte moderatorstatus",
     "Failed to change power level": "Fekk ikkje til å endra tilgangsnivået",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Du kan ikkje angre denne endringa, fordi brukaren du forfremmar vil få same tilgangsnivå som du har no.",
     "Are you sure?": "Er du sikker?",
@@ -292,12 +269,8 @@
     "Invite": "Inviter",
     "Enable inline URL previews by default": "Skru URL-førehandsvising i tekstfeltet på",
     "Share Link to User": "Del ei lenke til brukaren",
-    "User Options": "Brukarinnstillingar",
-    "Direct chats": "Direktesamtalar",
     "Unmute": "Fjern demping",
     "Mute": "Demp",
-    "Revoke Moderator": "Fjern Moderatorrettigheit",
-    "Make Moderator": "Gjer til Moderator",
     "Admin Tools": "Administratorverktøy",
     "and %(count)s others...|other": "og %(count)s andre...",
     "and %(count)s others...|one": "og ein annan...",
@@ -305,13 +278,11 @@
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (tilgangsnivå %(powerLevelNumber)s)",
     "Attachment": "Vedlegg",
     "Hangup": "Legg på",
-    "Voice call": "Taleanrop",
+    "Voice call": "Talesamtale",
     "Video call": "Videosamtale",
     "Upload file": "Last opp fil",
     "Send an encrypted reply…": "Send eit kryptert svar…",
-    "Send a reply (unencrypted)…": "Send eit svar (ukryptert)…",
     "Send an encrypted message…": "Send ei kryptert melding…",
-    "Send a message (unencrypted)…": "Send ei melding (ukryptert)…",
     "You do not have permission to post to this room": "Du har ikkje lov til å senda meldingar i dette rommet",
     "Server error": "Noko gjekk gale med tenaren",
     "Server unavailable, overloaded, or something else went wrong.": "Tenar utilgjengeleg, overlasta eller har eit anna problem.",
@@ -340,7 +311,7 @@
     "No rooms to show": "Ingen rom å visa",
     "Unnamed room": "Rom utan namn",
     "Guests can join": "Gjester kan bli med",
-    "Save": "Lagre",
+    "Save": "Lagra",
     "(~%(count)s results)|other": "(~%(count)s resultat)",
     "(~%(count)s results)|one": "(~%(count)s resultat)",
     "Join Room": "Bli med i rom",
@@ -351,7 +322,7 @@
     "Share room": "Del rom",
     "Community Invites": "Fellesskapsinvitasjonar",
     "Invites": "Invitasjonar",
-    "Favourites": "Favorittar",
+    "Favourites": "Yndlingar",
     "Rooms": "Rom",
     "Low priority": "Låg prioritet",
     "System Alerts": "Systemvarsel",
@@ -374,7 +345,7 @@
     "Only people who have been invited": "Berre dei som har vorte inviterte",
     "Anyone who knows the room's link, apart from guests": "Dei som kjenner lenkja til rommet, sett vekk frå gjester",
     "Anyone who knows the room's link, including guests": "Dei som kjenner lenkja til rommet, gjester òg",
-    "Publish this room to the public in %(domain)s's room directory?": "Gjer dette rommet offentleg i %(domain)s sitt romkatalog?",
+    "Publish this room to the public in %(domain)s's room directory?": "Gjer dette rommet offentleg i %(domain)s sin romkatalog?",
     "Who can read history?": "Kven kan lesa historia?",
     "Anyone": "Kven som helst",
     "Members only (since the point in time of selecting this option)": "Berre medlemmar (frå då denne innstillinga vart skrudd på)",
@@ -393,10 +364,7 @@
     "Show Stickers": "Vis klistremerker",
     "Jump to first unread message.": "Hopp til den fyrste uleste meldinga.",
     "Close": "Lukk",
-    "Remote addresses for this room:": "Fjernadresser for dette rommet:",
-    "Local addresses for this room:": "Lokaladresser for dette rommet:",
     "This room has no local addresses": "Dette rommet har ingen lokale adresser",
-    "New address (e.g. #foo:%(localDomain)s)": "Ny adresse (t.d. #foo:%(localDomain)s)",
     "Invalid community ID": "Ugyldig fellesskaps-ID",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' er ikkje ein gyldig fellesskaps-ID",
     "Flair": "Etikett",
@@ -430,11 +398,7 @@
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s endra romavataren til <img/>",
     "Copied!": "Kopiert!",
     "Failed to copy": "Noko gjekk gale med kopieringa",
-    "Removed or unknown message type": "Fjerna eller ukjend meldingssort",
-    "Message removed by %(userId)s": "Meldinga vart fjerna av %(userId)s",
-    "Message removed": "Meldinga vart fjerna",
     "Dismiss": "Avvis",
-    "To continue, please enter your password.": "For å gå fram, ver venleg og skriv passordet ditt inn.",
     "An email has been sent to %(emailAddress)s": "En epost vart send til %(emailAddress)s",
     "Please check your email to continue registration.": "Ver venleg og sjekk eposten din for å gå vidare med påmeldinga.",
     "A text message has been sent to %(msisdn)s": "Ei tekstmelding vart send til %(msisdn)s",
@@ -468,14 +432,11 @@
     "Something went wrong when trying to get your communities.": "Noko gjekk gale under innlasting av fellesskapa du er med i.",
     "Display your community flair in rooms configured to show it.": "Vis fellesskaps-etiketten din i rom som er stilt inn til å visa det.",
     "You're not currently a member of any communities.": "Du er for tida ikkje medlem i nokon fellesskap.",
-    "Yes, I want to help!": "Ja, eg vil vera til nytte!",
     "You are not receiving desktop notifications": "Du fær ikkje skrivebordsvarsel",
     "Enable them now": "Skru dei på no",
     "What's New": "Kva er nytt",
     "Update": "Oppdatering",
     "What's new?": "Kva er nytt?",
-    "A new version of Riot is available.": "Ein ny versjon av Riot er tilgjengeleg.",
-    "To return to your account in future you need to <u>set a password</u>": "For å gå tilbake til brukaren din i framtida må du <u>setja eit passord</u>",
     "Set Password": "Set Passord",
     "Error encountered (%(errorDetail)s).": "Noko gjekk gale (%(errorDetail)s).",
     "Checking for an update...": "Ser etter oppdateringar...",
@@ -491,8 +452,6 @@
     "An error ocurred whilst trying to remove the widget from the room": "Noko gjekk gale med fjerninga av widgeten frå rommet",
     "Edit": "Gjer om",
     "Create new room": "Lag nytt rom",
-    "Unblacklist": "Fjern frå svartelista",
-    "Blacklist": "Legg til i svartelista",
     "No results": "Ingen resultat",
     "Communities": "Fellesskap",
     "Home": "Heim",
@@ -594,7 +553,6 @@
     "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.": "Meldingssynlegheit på Matrix liknar på epost. At vi gløymer meldingane dine tyder at meldingar du har send ikkje vil verta delt med nye, ikkje-innmeldte brukarar, men brukare som er meldt på som allereie har tilgang til desse meldingane vil fortsatt kunne sjå kopien deira.",
     "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)": "Ver venleg og gløym alle meldingane eg har send når brukaren min vert avliven (<b>Åtvaring:</b> dette gjer at framtidige brukarar ikkje fær eit fullstendig oversyn av samtalene)",
     "To continue, please enter your password:": "For å gå fram, ver venleg og skriv passordet ditt inn:",
-    "I verify that the keys match": "Eg stadfestar at nyklane samsvarar",
     "Back": "Attende",
     "Event sent!": "Hending send!",
     "Event Type": "Hendingsort",
@@ -605,17 +563,13 @@
     "Toolbox": "Verktøykasse",
     "Developer Tools": "Utviklarverktøy",
     "An error has occurred.": "Noko gjekk gale.",
-    "Start verification": "Start verifikasjon",
-    "Share without verifying": "Del utan å godkjenna",
-    "Ignore request": "Ignorer førespurnad",
-    "Encryption key request": "Krypteringsnykel-førespurnad",
     "Sign out": "Logg ut",
     "Clear Storage and Sign Out": "Tøm Lager og Logg Ut",
     "Send Logs": "Send Loggar",
     "Refresh": "Hent fram på nytt",
     "Unable to restore session": "Kunne ikkje henta øykta fram att",
     "We encountered an error trying to restore your previous session.": "Noko gjekk gale med framhentinga av den førre øykta di.",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Viss du har tidligare brukt ein nyare versjon av Riot, kan økts-data vere inkompatibel med denne versjonen. Lukk dette vindauget og bytt til ein nyare versjon.",
+    "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.": "Viss du har tidligare brukt ein nyare versjon av %(brand)s, kan økts-data vere inkompatibel med denne versjonen. Lukk dette vindauget og bytt til ein nyare versjon.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Det kan henda at å tømma nettlesarlageret rettar opp i det, men det loggar deg ut og kan gjera den krypterte pratehistoria uleseleg.",
     "Invalid Email Address": "Ugangbar Epostadresse",
     "This doesn't appear to be a valid email address": "Det ser ikkje ut til at epostadressa er gangbar",
@@ -648,7 +602,6 @@
     "COPY": "KOPIER",
     "Private Chat": "Lukka Samtale",
     "Public Chat": "Offentleg Samtale",
-    "Alias (optional)": "Alias (valfritt)",
     "Reject invitation": "Sei nei til innbyding",
     "Are you sure you want to reject the invitation?": "Er du sikker på at du vil seia nei til innbydinga?",
     "Unable to reject invite": "Klarte ikkje å seia nei til innbydinga",
@@ -674,8 +627,8 @@
     "Low Priority": "Lågrett",
     "Direct Chat": "Direktesamtale",
     "View Community": "Sjå Fellesskap",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Beklagar, nettlesaren din klarer <b>ikkje</b> å køyra Riot.",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot brukar mange avanserte nettlesarfunksjonar, og nokre av dei er ikkje tilgjengelege eller under utprøving i nettlesaren din.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Beklagar, nettlesaren din klarer <b>ikkje</b> å køyra %(brand)s.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s brukar mange avanserte nettlesarfunksjonar, og nokre av dei er ikkje tilgjengelege eller under utprøving i nettlesaren din.",
     "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!": "Med denne nettlesaren, er det mogleg at synet og kjensla av applikasjonen er fullstendig gale, og nokre eller alle funksjonar verkar kanskje ikkje. Viss du vil prøva likevel kan du gå fram, men då du må sjølv handtera alle vanskar du møter på!",
     "I understand the risks and wish to continue": "Eg forstår farane og vil gå fram",
     "Name": "Namn",
@@ -733,7 +686,7 @@
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "For å framleis bruka %(homeserverDomain)s sin heimtenar må du sjå over og seia deg einig i våre Vilkår og Føresetnader.",
     "Review terms and conditions": "Sjå over Vilkår og Føresetnader",
     "Old cryptography data detected": "Gamal kryptografidata vart oppdagen",
-    "Data from an older version of Riot 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 frå ein eldre versjon av Riot er oppdaga. Dette kan ha gjort at ende-til-ende kryptering feilar i den eldre versjonen. Krypterte meldingar som er utveksla med den gamle versjonen er kanskje ikkje dekrypterbare i denne versjonen. Dette kan forårsake at meldingar utveksla mot denne versjonen vil feile. Opplever du problem med dette, kan du logge inn og ut igjen. For å behalde meldingshistorikk, eksporter og importer nøklane dine på nytt.",
+    "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 frå ein eldre versjon av %(brand)s er oppdaga. Dette kan ha gjort at ende-til-ende kryptering feilar i den eldre versjonen. Krypterte meldingar som er utveksla med den gamle versjonen er kanskje ikkje dekrypterbare i denne versjonen. Dette kan forårsake at meldingar utveksla mot denne versjonen vil feile. Opplever du problem med dette, kan du logge inn og ut igjen. For å behalde meldingshistorikk, eksporter og importer nøklane dine på nytt.",
     "Logout": "Logg ut",
     "Your Communities": "Dine fellesskap",
     "Error whilst fetching joined communities": "Noko gjekk gale under innlasting av fellesskapa du med er i",
@@ -745,31 +698,27 @@
     "Notifications": "Varsel",
     "Invite to this community": "Inviter til dette fellesskapet",
     "The server may be unavailable or overloaded": "Tenaren er kanskje utilgjengeleg eller overlasta",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Slette rommaliaset %(alias)s og fjern %(name)s frå romkatalogen?",
     "Remove %(name)s from the directory?": "Fjern %(name)s frå romkatalogen?",
     "Remove from Directory": "Fjern frå romkatalog",
     "remove %(name)s from the directory.": "fjern %(name)s frå romkatalogen.",
-    "delete the alias.": "slett aliaset.",
     "Unable to join network": "Klarte ikkje å bli med i nettverket",
-    "Riot does not know how to join a room on this network": "Riot veit ikkje korleis den kan bli med i rom på dette nettverket",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s veit ikkje korleis den kan bli med i rom på dette nettverket",
     "Room not found": "Fann ikkje rommet",
     "Couldn't find a matching Matrix room": "Kunne ikkje finna eit samsvarande Matrix-rom",
     "Fetching third party location failed": "Noko gjekk gale under henting av tredjepartslokasjon",
-    "Scroll to bottom of page": "Blad til botnen",
     "You can't send any messages until you review and agree to <consentLink>our terms and conditions</consentLink>.": "Du kan ikkje senda meldingar før du les over og godkjenner våre <consentLink>bruksvilkår</consentLink>.",
     "%(count)s of your messages have not been sent.|other": "Nokre av meldingane dine vart ikkje sende.",
     "%(count)s of your messages have not been sent.|one": "Meldinga di vart ikkje send.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Send alle på nytt</resendText> eller <cancelText>avbryt alle</cancelText>. Du kan og markere enkelte meldingar for å sende på nytt eller avbryte.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Send melding på nytt</resendText> eller <cancelText>avbryt</cancelText>.",
     "Connectivity to the server has been lost.": "Tilkoplinga til tenaren vart tapt.",
-    "Sent messages will be stored until your connection has returned.": "Sendte meldingar vil blir lagra lokalt fram til nettverket er oppe igjen.",
+    "Sent messages will be stored until your connection has returned.": "Sende meldingar vil lagrast lokalt fram til nettverket er oppe att.",
     "Active call": "Pågåande samtale",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Det er ingen andre her! Vil du <inviteText>invitera andre</inviteText> eller <nowarnText>skru av varselet om det tomme rommet?</nowarnText>?",
     "You seem to be uploading files, are you sure you want to quit?": "Det ser ut til at du lastar opp filer, er du sikker på at du vil avslutte?",
     "You seem to be in a call, are you sure you want to quit?": "Det ser ut til at du er i ein samtale, er du sikker på at du vil avslutte?",
     "Search failed": "Søket feila",
     "No more results": "Ingen fleire resultat",
-    "Unknown room %(roomId)s": "Ukjend rom %(roomId)s",
     "Room": "Rom",
     "Failed to reject invite": "Fekk ikkje til å avstå invitasjonen",
     "Fill screen": "Fyll skjermen",
@@ -783,15 +732,13 @@
     "Uploading %(filename)s and %(count)s others|other": "Lastar opp %(filename)s og %(count)s andre",
     "Uploading %(filename)s and %(count)s others|zero": "Lastar opp %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Lastar opp %(filename)s og %(count)s andre",
-    "Light theme": "Lyst tema",
-    "Dark theme": "Mørkt tema",
     "Success": "Suksess",
     "Unable to remove contact information": "Klarte ikkje å fjerna kontaktinfo",
     "<not supported>": "<ikkje støtta>",
     "Import E2E room keys": "Hent E2E-romnøklar inn",
     "Cryptography": "Kryptografi",
     "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.": "Viss du har rapportert inn feil via GitHub, kan feil-loggar hjelpa oss med å finna problemet. Feil-loggar inneheld data om applikasjonsbruk som; brukarnamn, ID-ar, alias på rom eller grupper du har besøkt og brukarnamn for andre brukarar.  Loggane inneheld ikkje meldingar.",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot samlar anonym statistikk inn slik at ein kan forbetre applikasjonen.",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s samlar anonym statistikk inn slik at ein kan forbetre applikasjonen.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Personvern er viktig for oss, så vi samlar ikkje personlege eller identifiserbare data for statistikken vår.",
     "Learn more about how we use analytics.": "Finn ut meir om korleis vi brukar statistikk.",
     "Labs": "Labben",
@@ -799,7 +746,7 @@
     "Reject all %(invitedRooms)s invites": "Kanseller alle invitasjonar frå %(invitedRooms)s",
     "Start automatically after system login": "Start automagisk etter systeminnlogging",
     "No media permissions": "Ingen mediatilgang",
-    "You may need to manually permit Riot to access your microphone/webcam": "Det kan henda at du må gje Riot tilgang til mikrofonen/nettkameraet for hand",
+    "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",
     "No Microphones detected": "Ingen opptakseiningar funne",
     "No Webcams detected": "Ingen Nettkamera funne",
@@ -812,7 +759,7 @@
     "click to reveal": "klikk for å visa",
     "Homeserver is": "Heimtenaren er",
     "Identity Server is": "Identitetstenaren er",
-    "riot-web version:": "riot-web versjon:",
+    "%(brand)s version:": "%(brand)s versjon:",
     "olm version:": "olm versjon:",
     "Failed to send email": "Fekk ikkje til å senda eposten",
     "The email address linked to your account must be entered.": "Du må skriva epostadressa som er tilknytta brukaren din inn.",
@@ -825,8 +772,8 @@
     "Incorrect username and/or password.": "Feil brukarnamn og/eller passord.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Merk deg at du loggar inn på %(hs)s-tenaren, ikkje matrix.org.",
     "The phone number entered looks invalid": "Det innskrivne telefonnummeret virkar å vere ugyldig",
-    "Error: Problem communicating with the given homeserver.": "Feil: Det gjekk ikkje an å kommunisere med den spesifiserte heimeserveren.",
-    "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 ikkje koble til heimeserveren via HTTP fordi URL-adressa i nettlesaren er HTTPS. Bruk HTTPS, eller <a>aktiver usikre skript</a>.",
+    "Error: Problem communicating with the given homeserver.": "Feil: Det gjekk ikkje an å kommunisera med den spesifiserte heimetenaren.",
+    "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 ikkje kobla til heimetenaren via HTTP fordi URL-adressa i nettlesaren er HTTPS. Bruk HTTPS, eller <a>aktiver usikre skript</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.": "Kan ikkje kopla til heimtenaren - ver venleg og sjekk tilkoplinga di, og sjå til at <a>heimtenaren din sitt CCL-sertifikat</a> er stolt på og at ein nettlesartillegg ikkje hindrar førespurnader.",
     "Failed to fetch avatar URL": "Klarte ikkje å henta avatar-URLen",
     "Set a display name:": "Set eit visningsnamn:",
@@ -838,20 +785,7 @@
     "Notify the whole room": "Varsle heile rommet",
     "Room Notification": "Romvarsel",
     "Users": "Brukarar",
-    "unknown device": "ukjend eining",
-    "NOT verified": "IKKJE godkjend",
-    "verified": "godkjend",
-    "Verification": "Verifikasjon",
-    "Ed25519 fingerprint": "Ed25519-fingeravtrykk",
-    "User ID": "Brukar-ID",
-    "Curve25519 identity key": "Curve25519-identitetsnøkkel",
-    "none": "ingen",
-    "Algorithm": "Algoritme",
-    "unencrypted": "ikkje-kryptert",
-    "Decryption error": "Noko gjekk gale med dekrypteringa",
     "Session ID": "Økt-ID",
-    "End-to-end encryption information": "Ende-til-ende-krypteringsinfo",
-    "Event information": "Hendingsinfo",
     "Passphrases must match": "Passfrasane må vere identiske",
     "Passphrase must not be empty": "Passfrasefeltet kan ikkje stå tomt",
     "Enter passphrase": "Skriv inn passfrase",
@@ -860,7 +794,6 @@
     "Call Timeout": "Tidsavbrot i Samtala",
     "Enable automatic language detection for syntax highlighting": "Skru automatisk måloppdaging på for syntax-understreking",
     "Export E2E room keys": "Hent E2E-romnøklar ut",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Det kan henda at du stilte dei inn på ein annan klient enn Riot. Du kan ikkje stilla på dei i Riot men dei gjeld framleis",
     "Jump to read receipt": "Hopp til lesen-lappen",
     "Filter room members": "Filtrer rommedlemmar",
     "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.": "Når nokon legg ein URL med i meldinga si, kan ei URL-førehandsvising visast for å gje meir info om lenkja slik som tittelen, skildringa, og eit bilete frå nettsida.",
@@ -869,8 +802,6 @@
     "Filter community members": "Filtrer fellesskapssmedlemmar",
     "Custom Server Options": "Tilpassa tenar-innstillingar",
     "Filter community rooms": "Filtrer rom i fellesskapet",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Hjelp oss å forbetra Riot.im ved å senda <UsageDataLink>anonym brukardata</UsageDataLink>. Dette brukar informasjonskapslar (les gjerne vår <PolicyLink>Cookie-policy</PolicyLink>).",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Hjelp oss å forbetra Riot.im ved å senda <UsageDataLink>anonym brukardata</UsageDataLink>. Dette brukar informasjonskapslar (cookies).",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Om du brukar Riktekst-innstillinga på Riktekstfeltet",
     "This room is not accessible by remote Matrix servers": "Rommet er ikkje tilgjengeleg for andre Matrix-heimtenarar",
     "Add an Integration": "Legg tillegg til",
@@ -886,7 +817,7 @@
     "Filter results": "Filtrer resultat",
     "Custom": "Sjølvsett",
     "Failed to set Direct Message status of room": "Fekk ikkje til å setja Direktemelding-tilstanden til rommet",
-    "Did you know: you can use communities to filter your Riot.im experience!": "Visste du at: du kan bruka fellesskap for å filtrera Riot.im-opplevinga di!",
+    "Did you know: you can use communities to filter your %(brand)s experience!": "Visste du at: du kan bruka fellesskap for å filtrera %(brand)s-opplevinga di!",
     "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.": "For å setja opp eit filter, dra ein fellesskapsavatar bort til filterpanelet til venstre på skjermen. Du kan klikka på ein avatar i filterpanelet når som helst for å sjå berre romma og folka tilknytta det fellesskapet.",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Lag eit fellesskap for å føra saman brukarar og rom! Lag ei tilpassa heimeside for å markere din del av Matrix-universet.",
     "Unable to look up room ID from server": "Klarte ikkje å henta rom-ID frå tenaren",
@@ -894,8 +825,7 @@
     "Clear filter": "Tøm filter",
     "Profile": "Brukar",
     "Access Token:": "Tilgangs-token:",
-    "This homeserver doesn't offer any login flows which are supported by this client.": "Heimeserveren tilbyr ingen påloggingsmetodar som er støtta av denne klienten.",
-    "Claimed Ed25519 fingerprint key": "Gjorde krav på Ed25519-fingeravtrykksnøkkel",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Heimetenaren tilbyr ingen innloggingsmetodar som er støtta av denne klienten.",
     "Export room keys": "Eksporter romnøklar",
     "Export": "Eksporter",
     "Import room keys": "Importer romnøklar",
@@ -915,11 +845,11 @@
     "Whether or not you're logged in (we don't record your username)": "Uansett om du er innlogga eller ikkje (så lagrar vi ikkje brukarnamnet ditt)",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Fila %(fileName)s er større enn heimetenaren si grense for opplastningar",
     "Unable to load! Check your network connectivity and try again.": "Klarte ikkje lasta! Sjå på nettilkoplinga di og prøv igjen.",
-    "Your Riot is misconfigured": "Riot-klienten din er feilkonfiguert",
+    "Your %(brand)s is misconfigured": "%(brand)s-klienten din er sett opp feil",
     "Sign In": "Logg inn",
     "Explore rooms": "Utforsk romma",
-    "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.": "Meldingen din vart ikkje sent for denne heimeserveren har nådd grensa for maksimalt aktive brukarar pr. månad. Kontakt <a>systemadministratoren</a> for å kunne vidare nytte denne tenesten.",
-    "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.": "Denne meldingen vart ikkje sendt fordi heimeserveren har nådd grensa for tilgjengelege systemressursar. Kontakt <a>systemadministratoren</a> for å vidare nytte denne tenesten.",
+    "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.": "Meldinga di vart ikkje send, for denne heimetenaren har nådd grensa for maksimalt aktive brukarar pr. månad. Kontakt <a>systemadministratoren</a> for å vidare nytte denne tenesta.",
+    "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.": "Denne meldingen vart ikkje send fordi heimetenaren har nådd grensa for tilgjengelege systemressursar. Kontakt <a>systemadministratoren</a> for å vidare nytta denne tenesta.",
     "Add room": "Legg til rom",
     "You have %(count)s unread notifications in a prior version of this room.|other": "Du har %(count)s uleste varslingar i ein tidligare versjon av dette rommet.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Du har %(count)s ulest varsel i ein tidligare versjon av dette rommet.",
@@ -928,26 +858,26 @@
     "Could not load user profile": "Klarde ikkje å laste brukarprofilen",
     "Your Matrix account on %(serverName)s": "Din Matrix-konto på %(serverName)s",
     "Your Matrix account on <underlinedServerName />": "Din Matrix-konto på <underlinedServerName />",
-    "No identity server is configured: add one in server settings to reset your password.": "Ingen identitetsserver er konfigurert: legg til ein i innstillingane for å nullstille passordet ditt.",
+    "No identity server is configured: add one in server settings to reset your password.": "Ingen identitetstenar er satt opp: legg til ein i innstillingane for å nullstille passordet ditt.",
     "Sign in instead": "Logg inn istaden",
     "A verification email will be sent to your inbox to confirm setting your new password.": "For å stadfeste tilbakestilling av passordet, vil ein e-post vil bli sendt til din innboks.",
     "Your password has been reset.": "Passodet ditt vart nullstilt.",
     "Set a new password": "Sett nytt passord",
-    "Invalid homeserver discovery response": "Ugyldig svar frå heimeserveren (discovery response)",
-    "Failed to get autodiscovery configuration from server": "Kladte ikkje å hente automatisk oppsett frå server",
-    "Invalid base_url for m.homeserver": "Ugyldig base_url for m.homeserver",
-    "Homeserver URL does not appear to be a valid Matrix homeserver": "URL-adressa virkar ikkje til å vere ein gyldig Matrix-heimeserver",
-    "Invalid identity server discovery response": "Ugyldig svar frå identitetsserveren (discovery response)",
-    "Invalid base_url for m.identity_server": "Ugyldig base_url for m.identity_server",
-    "Identity server URL does not appear to be a valid identity server": "URL-adressa virkar ikkje til å vere ein gyldig identitetsserver",
+    "Invalid homeserver discovery response": "Feil svar frå heimetenaren (discovery response)",
+    "Failed to get autodiscovery configuration from server": "Klarde ikkje å hente automatisk oppsett frå tenaren",
+    "Invalid base_url for m.homeserver": "Feil base_url for m.homeserver",
+    "Homeserver URL does not appear to be a valid Matrix homeserver": "URL-adressa virkar ikkje til å vere ein gyldig Matrix-heimetenar",
+    "Invalid identity server discovery response": "Feil svar frå identitetstenaren (discovery response)",
+    "Invalid base_url for m.identity_server": "Feil base_url for m.identity_server",
+    "Identity server URL does not appear to be a valid identity server": "URL-adressa virkar ikkje til å vere ein gyldig identitetstenar",
     "General failure": "Generell feil",
-    "This homeserver does not support login using email address.": "Denne heimeserveren støttar ikkje innloggingar med e-postadresser.",
-    "Please <a>contact your service administrator</a> to continue using this service.": "<a>Kontakt din systemadministrator</a> for å vidare å bruke tenesta.",
+    "This homeserver does not support login using email address.": "Denne heimetenaren støttar ikkje innloggingar med e-postadresser.",
+    "Please <a>contact your service administrator</a> to continue using this service.": "<a>Kontakt din systemadministrator</a> for å vidare bruka tenesta.",
     "This account has been deactivated.": "Denne kontoen har blitt deaktivert.",
-    "Failed to perform homeserver discovery": "Fekk ikkje til å utforske heimeserveren",
+    "Failed to perform homeserver discovery": "Fekk ikkje til å utforska heimetenaren",
     "Sign in with single sign-on": "Logg på med Single-Sign-On",
     "Create account": "Lag konto",
-    "Registration has been disabled on this homeserver.": "Registrering er deaktivert på denne heimeserveren.",
+    "Registration has been disabled on this homeserver.": "Registrering er skrudd av for denne heimetenaren.",
     "Unable to query for supported registration methods.": "Klarte ikkje å spørre etter støtta registreringsmetodar.",
     "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Kontoen din %(newAccountId)s er no registrert, men du er frå tidligare logga på med ein annan konto (%(loggedInUserId)s).",
     "Continue with previous account": "Fortsett med tidligare konto",
@@ -955,7 +885,7 @@
     "You can now close this window or <a>log in</a> to your new account.": "Du kan lukke dette vindauget eller<a>logge inn</a> med din nye konto.",
     "Registration Successful": "Registrering fullført",
     "Create your account": "Lag din konto",
-    "Failed to re-authenticate due to a homeserver problem": "Fekk ikkje til å re-authentisere grunna ein feil på heimeserveren",
+    "Failed to re-authenticate due to a homeserver problem": "Fekk ikkje til å re-authentisere grunna ein feil på heimetenaren",
     "Failed to re-authenticate": "Fekk ikkje til å re-autentisere",
     "Enter your password to sign in and regain access to your account.": "Skriv inn ditt passord for å logge på og ta tilbake tilgang til kontoen din.",
     "Forgotten your password?": "Gløymt passord ?",
@@ -963,34 +893,18 @@
     "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Du har ikkje muligheit til å logge på kontoen din. Kontakt systemadministratoren for meir informasjon.",
     "You're signed out": "Du er no avlogga",
     "Clear personal data": "Fjern personlege data",
-    "Great! This passphrase looks strong enough.": "Flott! Denne passfrasen virkar til å vere sterk nok.",
-    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "Vi vil lagre ein kryptert kopi av nøklane dine på vår server. Vern sikkerheitskopien din med ein passfrase.",
     "For maximum security, this should be different from your account password.": "For maksimal sikkerheit, bør dette vere noko anna enn kontopassordet ditt.",
-    "Enter a passphrase...": "Skriv inn ein passfrase...",
-    "Set up with a Recovery Key": "Sett opp med ein gjenopprettingsnøkkel",
     "That matches!": "Dette stemmer!",
     "That doesn't match.": "Dette stemmer ikkje.",
     "Go back to set it again.": "Gå tilbake for å sette den på nytt.",
-    "Please enter your passphrase a second time to confirm.": "Skriv inn passfrasen din ein gong til for å stadfeste.",
-    "Repeat your passphrase...": "Gjenta din passfrase...",
-    "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Som eit sikkerheitsnett, kan du bruke den til å gjenopprette den krypterte meldingshistorikken i tilfelle du gløymer gjennopprettingsnøkkelen.",
-    "As a safety net, you can use it to restore your encrypted message history.": "Som eit sikkerheitsnett, kan du bruke den til å gjenopprette den krypterte meldingshistorikken.",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Gjennopprettingsnøkkelen eit sikkerheitsnett, kan du bruke den til å gjenopprette den krypterte meldingshistorikken i tilfelle du gløymer passfrasen.",
-    "Your Recovery Key": "Gjenopprettingsnøkkelen din",
-    "Copy to clipboard": "Kopier til utklippstavle",
     "Download": "Last ned",
     "<b>Print it</b> and store it somewhere safe": "<b>Skriv ut</b> og ta vare på den på ein trygg stad",
-    "<b>Save it</b> on a USB key or backup drive": "<b>Lagre</b> til ein USB-pinne eller sikkerheitskopidisk",
+    "<b>Save it</b> on a USB key or backup drive": "<b>Lagra</b> til ein USB-pinne eller sikkerheitskopidisk",
     "<b>Copy it</b> to your personal cloud storage": "<b>Kopier den</b> til personleg skylagring",
     "Your keys are being backed up (the first backup could take a few minutes).": "Nøklane dine blir sikkerheitskopiert (den første kopieringa kan ta nokre minutt).",
     "Set up Secure Message Recovery": "Sett opp sikker gjenoppretting for meldingar",
-    "Secure your backup with a passphrase": "Gjer sikkerheitskopien trygg med ein passfrase",
-    "Confirm your passphrase": "Stadfest passfrasen din",
-    "Recovery key": "Gjenopprettingsnøkkel",
-    "Keep it safe": "Lagre den trygt",
     "Starting backup...": "Startar sikkerheitskopiering...",
     "Success!": "Suksess!",
-    "Create Key Backup": "Lag sikkerheitskopi av nøkkel",
     "Unable to create key backup": "Klarte ikkje å lage sikkerheitskopi av nøkkelen",
     "Retry": "Prøv om att",
     "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Utan å sette opp sikker gjenoppretting for meldingar (Secure Message Recovery) vil meldingshistorikken gå tapt når du loggar av.",
@@ -1007,17 +921,14 @@
     "Add Email Address": "Legg til e-postadresse",
     "Add Phone Number": "Legg til telefonnummer",
     "Call failed due to misconfigured server": "Kallet gjekk gale fordi tenaren er oppsatt feil",
-    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Spør administratoren for din heimetenar<code>%(homeserverDomain)s</code> om å setje opp ein \"TURN-server\" slik at heimetenaren svarar korrekt.",
+    "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Spør administratoren for din heimetenar<code>%(homeserverDomain)s</code> om å setje opp ein \"TURN-server\" slik at talesamtalar fungerer på rett måte.",
     "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.": "Alternativt, kan du prøva å nytta den offentlege tenaren på <code>turn.matrix.org</code>, men det kan vera mindre stabilt og IP-adressa di vil bli delt med den tenaren. Du kan og endra på det under Innstillingar.",
     "Try using turn.matrix.org": "Prøv med å nytta turn.matrix.org",
-    "A conference call could not be started because the integrations server is not available": "Ein konferansesamtale kunne ikkje starta fordi integrasjons-tenaren er utilgjengeleg",
     "Replying With Files": "Send svar med filer",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Nett no er det ikkje mogleg å senda svar med ei fil. Vil du lasta opp denne fila utan å senda svaret?",
     "The file '%(fileName)s' failed to upload.": "Fila '%(fileName)s' vart ikkje lasta opp.",
-    "The server does not support the room version specified.": "Serveren støttar ikkje den spesifikke versjonen av rommet.",
+    "The server does not support the room version specified.": "Tenaren støttar ikkje den spesifikke versjonen av rommet.",
     "Name or Matrix ID": "Namn eller Matrix ID",
-    "Registration Required": "Registrering er obligatorisk",
-    "You need to register to do this. Would you like to register now?": "Du må registrera for å gjera dette. Ynskjer du å registrera no?",
     "Failed to invite users to the room:": "Fekk ikkje til å invitera brukarar til rommet:",
     "Messages": "Meldingar",
     "Actions": "Handlingar",
@@ -1046,29 +957,24 @@
     "Displays list of commands with usages and descriptions": "Viser ei liste over kommandoar med bruksområde og skildringar",
     "%(senderName)s made no change.": "%(senderName)s utførde ingen endring.",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s oppgraderte dette rommet.",
-    "The version of Riot": "Gjeldande versjon av Riot",
-    "Whether you're using Riot on a device where touch is the primary input mechanism": "Om du brukar Riot på ein innretning som er satt opp for touch-skjerm",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Om du brukar %(brand)s på ein innretning som er satt opp for touch-skjerm",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Om du nyttar funksjonen 'breadcrumbs' (avatarane over romkatalogen)",
-    "Whether you're using Riot as an installed Progressive Web App": "Om din Riot er installert som ein webapplikasjon (Progressive Web App)",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Om din %(brand)s er installert som ein webapplikasjon (Progressive Web App)",
     "Your user agent": "Din nettlesar (User-Agent)",
-    "The information being sent to us to help make Riot better includes:": "Informasjon sendt til oss for å forbetre Riot inkluderar:",
-    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Det er ukjende økter i dette rommet: om går vidare utan å verifisere dei, kan andre avlytte samtalen.",
     "If you cancel now, you won't complete verifying the other user.": "Om du avbryter no, vil dette stoppe verifikasjonsprosessen for den andre brukaren.",
     "If you cancel now, you won't complete verifying your other session.": "Om du avbryter no, vil dette stoppe verifikasjonsprosessen for den andre økta.",
-    "If you cancel now, you won't complete your secret storage operation.": "Om du avbryter no, vil dette stoppe opprettinga av det hemmelege lageret.",
     "Cancel entering passphrase?": "Avbryte inntasting av passfrase ?",
     "Setting up keys": "Setter opp nøklar",
     "Verify this session": "Stadfest denne økta",
     "Encryption upgrade available": "Kryptering kan oppgraderast",
     "Set up encryption": "Sett opp kryptering",
-    "Unverified session": "Uverifisert sesjon",
-    "Identity server has no terms of service": "Identitetsserveren manglar bruksvilkår",
-    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Denne handlinga krev kommunikasjon mot <server />(standard identitetsserver) for å verifisere e-post eller telefonnummer, men serveren manglar bruksvilkår.",
-    "Only continue if you trust the owner of the server.": "Gå vidare så lenge du har tillit til eigar av serveren.",
+    "Identity server has no terms of service": "Identitetstenaren manglar bruksvilkår",
+    "This action requires accessing the default identity server <server /> to validate an email address or phone number, but the server does not have any terms of service.": "Denne handlinga krev kommunikasjon mot <server />(standard identitetstenar) for å verifisere e-post eller telefonnummer, men tenaren manglar bruksvilkår.",
+    "Only continue if you trust the owner of the server.": "Gå vidare så lenge du har tillit til eigar av tenaren.",
     "Trust": "Tillat",
     "Custom (%(level)s)": "Tilpassa (%(level)s)",
     "Error upgrading room": "Feil ved oppgradering av rom",
-    "Double check that your server supports the room version chosen and try again.": "Sjekk at server støttar romversjon, og prøv på nytt.",
+    "Double check that your server supports the room version chosen and try again.": "Sjekk at tenar støttar denne romversjonen, og prøv på nytt.",
     "Verifies a user, session, and pubkey tuple": "Verifiser brukar, økt eller public-key objekt (pubkey tuple)",
     "Unknown (user, session) pair:": "Ukjent (brukar,økt) par:",
     "Session already verified!": "Sesjon er tidligare verifisert!",
@@ -1084,40 +990,31 @@
     "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s satte etikett for %(groups)s i dette rommet.",
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s deaktiverte etikettar for %(groups)s i dette rommet.",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s har aktivert etikettar for %(newGroups)s, og deaktivert etikettar for %(oldGroups)s i dette rommet.",
-    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s la til %(addedAddresses)s og %(count)s andre adresser i dette rommet",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s la til %(addedAddresses)s som adresser for dette rommet.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s la til %(addedAddresses)s som adresse for dette rommet.",
-    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s fjerna %(removedAddresses)s og %(count)s andre som adresse for dette rommet",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s fjerna %(removedAddresses)s som adresser for dette rommet.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s fjerna %(removedAddresses)s som adresse for dette rommet.",
-    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s fjerna %(countRemoved)s og la til %(countAdded)s adresser for dette rommet",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s la til %(addedAddresses)s og tok vekk %(removedAddresses)s som adresser for dette rommet.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s satte standardadressa for dette rommet til %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s fjerna standardadressa for dette rommet.",
-    "%(senderName)s placed a voice call.": "%(senderName)s starta eit taleanrop.",
-    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s starta eit taleanrop. (ikkje støtta av denne nettlesaren)",
+    "%(senderName)s placed a voice call.": "%(senderName)s starta ein talesamtale.",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s starta ein talesamtale. (ikkje støtta av denne nettlesaren)",
     "%(senderName)s placed a video call.": "%(senderName)s starta ein videosamtale.",
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s starta ein videosamtale. (ikkje støtta av denne nettlesaren)",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s trekte tilbake invitasjonen for at %(targetDisplayName)s kan bli medlem i rommet.",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Du er administrator for dette fellesskapet. Du kan ikkje melde deg inn igjen utan at du har invitasjon frå ein annan administrator.",
-    "Want more than a community? <a>Get your own server</a>": "Treng du meir enn eit fellesskap?  <a>Skaff din eigen server</a>",
+    "Want more than a community? <a>Get your own server</a>": "Treng du meir enn eit fellesskap?  <a>Skaff din eigen tenar</a>",
     "Sign In or Create Account": "Logg inn eller opprett konto",
     "Create Account": "Opprett konto",
     "Sends the given emote coloured as a rainbow": "Sendar emojien med regnbogefargar",
     "You do not have permission to invite people to this room.": "Du har ikkje lov til å invitera andre til dette rommet.",
     "The user must be unbanned before they can be invited.": "Blokkeringa av brukaren må fjernast før dei kan bli inviterte.",
-    "Show padlocks on invite only rooms": "Vis hengelås på lukka rom (invite-only)",
     "Show join/leave messages (invites/kicks/bans unaffected)": "Vis bli-med/forlat meldingar (ekskluderer invitasjonar/utkasting/blokkeringar)",
     "Prompt before sending invites to potentially invalid matrix IDs": "Spør før utsending av invitasjonar til potensielle ugyldige Matrix-IDar",
     "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.": "Ved å fjerne koplinga mot din identitetstenar, vil ikkje brukaren din bli oppdaga av andre brukarar, og du kan heller ikkje invitera andre med e-post eller telefonnummer.",
-    "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.": "Å bruke ein identitetstenar er frivillig. Om du vel å ikkje bruke dette, vil ikkje brukaren din bli oppdaga av andre brukarar, og du kan ikkje invitera andre med e-post eller telefonnummer.",
+    "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.": "Å bruka ein identitetstenar er frivillig. Om du vel å ikkje bruka dette, vil ikkje brukaren din bli oppdaga av andre brukarar, og du kan ikkje invitera andre med e-post eller telefonnummer.",
     "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Passordet ditt vart endra. Du vil ikkje motta push-varslingar på andre økter, før etter til at du har logga inn på nytt der",
     "Error downloading theme information.": "Feil under nedlasting av temainformasjon.",
     "Theme added!": "Tema lagt til!",
     "Email addresses": "E-postadresser",
     "Phone numbers": "Telefonnummer",
     "Set a new account password...": "Lag nytt kontopassord...",
-    "Help & About": "Hjelp & Om",
+    "Help & About": "Hjelp og om",
     "Bug reporting": "Feilrapportering",
     "Accept all %(invitedRooms)s invites": "Aksepter alle invitasjonar frå %(invitedRooms)s",
     "Security & Privacy": "Sikkerheit og personvern",
@@ -1139,7 +1036,6 @@
     "Deactivate user?": "Deaktivere brukar?",
     "Deactivate user": "Deaktiver brukar",
     "Failed to deactivate user": "Fekk ikkje til å deaktivere brukaren",
-    "No sessions with registered encryption keys": "Ingen økter med registrerte krypteringsnøklar",
     "Remove recent messages": "Fjern nyare meldingar",
     "Send a reply…": "Send eit svar…",
     "Send a message…": "Send melding…",
@@ -1151,7 +1047,7 @@
     "Code block": "Kodeblokk",
     "Room %(name)s": "Rom %(name)s",
     "Recent rooms": "Siste rom",
-    "Direct Messages": "Direktemeldingar",
+    "Direct Messages": "Folk",
     "Joining room …": "Blir med i rommet…",
     "Loading …": "Lastar…",
     "Rejecting invite …": "Avviser invitasjon…",
@@ -1170,10 +1066,10 @@
     "You can still join it because this is a public room.": "Du kan fortsatt bli med fordi dette er eit offentleg rom.",
     "Join the discussion": "Bli med i diskusjonen",
     "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Invitasjonen til %(roomName)s vart sendt til %(email)s, som ikkje er tilknytta din konto",
-    "Link this email with your account in Settings to receive invites directly in Riot.": "Knytt denne e-posten opp til kontoen din under Innstillingar, for å direkte ta i mot invitasjonar i Riot.",
+    "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Knytt denne e-posten opp til kontoen din under Innstillingar, for å direkte ta i mot invitasjonar i %(brand)s.",
     "This invite to %(roomName)s was sent to %(email)s": "Denne invitasjonen for %(roomName)s vart sendt til %(email)s",
-    "Use an identity server in Settings to receive invites directly in Riot.": "Bruk ein identitetstenar under Innstillingar, for å direkte ta i mot invitasjonar i Riot.",
-    "Share this email in Settings to receive invites directly in Riot.": "Del denne e-postadresa i Innstillingar, for å direkte ta i mot invitasjonar i Riot.",
+    "Use an identity server in Settings to receive invites directly in %(brand)s.": "Bruk ein identitetstenar under Innstillingar, for å direkte ta i mot invitasjonar i %(brand)s.",
+    "Share this email in Settings to receive invites directly in %(brand)s.": "Del denne e-postadresa i Innstillingar, for å direkte ta i mot invitasjonar i %(brand)s.",
     "Do you want to chat with %(user)s?": "Ynskjer du å chatte med %(user)s?",
     "<userName/> wants to chat": "<userName/> vil chatte med deg",
     "Start chatting": "Start chatting",
@@ -1183,7 +1079,7 @@
     "You're previewing %(roomName)s. Want to join it?": "Du førehandsviser %(roomName)s. Ynskjer du å bli med ?",
     "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s kan ikkje førehandsvisast. Ynskjer du å bli med ?",
     "This room doesn't exist. Are you sure you're at the right place?": "Dette rommet eksisterar ikkje. Er du sikker på at du er på rett plass?",
-    "Try again later, or ask a room admin to check if you have access.": "Prøv igjen seinare, eller spør ein rom-administrator om du har tilgang.",
+    "Try again later, or ask a room admin to check if you have access.": "Prøv om att seinare, eller spør ein rom-administrator om du har tilgang.",
     "Never lose encrypted messages": "Aldri la krypterte meldingar gå tapt",
     "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Meldingane i rommet er sikra med ende-til-ende kryptering. Berre du og mottakarane har krypteringsnøklane for desse meldingane.",
     "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Kopier nøklane dine for å unngå i miste dei. <a>Les meir.</a>",
@@ -1193,45 +1089,39 @@
     "%(count)s unread messages.|one": "1 ulesen melding.",
     "Unread messages.": "Uleste meldingar.",
     "Unknown Command": "Ukjend kommando",
-    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Du kan bruke <code>/help</code> for å liste kommandoar. Meinte du å sende dette som ein melding ?",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Du kan bruka <code>/help</code> for å lista tilgjengelege kommandoar. Meinte du å senda dette som ein melding ?",
     "Hint: Begin your message with <code>//</code> to start it with a slash.": "Hint: Start meldinga med <code>//</code> for å starte den med skråstrek.",
     "Send as message": "Send som melding",
     "Failed to revoke invite": "Fekk ikkje til å trekke invitasjonen",
-    "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Fekk ikkje til å trekke invitasjonen. Det kan ha oppstått eit midlertidig problem på serveren, eller så har ikkje du tilstrekkelege rettigheiter for å trekke invitasjonen.",
+    "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Fekk ikkje til å ta attende invitasjonen. Det kan ha oppstått ein mellombels feil på tenaren, eller så har ikkje du tilstrekkelege rettar for å ta attende invitasjonen.",
     "Revoke invite": "Trekk invitasjon",
     "Invited by %(sender)s": "Invitert av %(sender)s",
     "Mark all as read": "Merk alle som lesne",
     "Error updating main address": "Feil under oppdatering av hovedadresse",
-    "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Det skjedde ein feil under oppdatering av hovedadressa for rommet. Det kan hende at dette er midlertidig, eller at det ikkje er tillate på serveren.",
-    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Feil under oppdatering av sekundæradresse. Det kan hende at dette er midlertidig, eller at det ikkje er tillate på serveren.",
-    "Error creating alias": "Feil under oppretting av alias",
-    "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "Det skjedde ein feil under oppretting av dette aliaset. Det kan hende at dette er midlertidig, eller at det ikkje er tillate på serveren.",
-    "You don't have permission to delete the alias.": "Du har ikkje lov å slette aliaset.",
-    "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "Det skjedde ein feil under fjerning av aliaset. Det kan hende at dette er midlertidig, eller at det ikkje eksisterar lengre.",
-    "Error removing alias": "Feil ved fjerning av alias",
+    "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Det skjedde ein feil under oppdatering av hovudadressa for rommet. Det kan hende at dette er ein mellombels feil, eller at det ikkje er tillate på tenaren.",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Feil under oppdatering av alternativ adresse. Det kan hende at dette er mellombels, eller at det ikkje er tillate på tenaren.",
     "Main address": "Hovudadresse",
     "Local address": "Lokal adresse",
     "Published Addresses": "Publisert adresse",
-    "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.": "Publiserte adresser kan bli brukt av alle uansett server for å bli med i rommet. For å publisere ei adresse, må den vere sett som ei lokal adresse fyrst.",
+    "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.": "Publiserte adresser kan bli brukt av alle uansett tenar for å bli med i rommet. For å publisera ei adresse, må den vere sett som ei lokal adresse fyrst.",
     "Other published addresses:": "Andre publiserte adresser:",
     "No other published addresses yet, add one below": "Ingen publiserte adresser til no, legg til ei under",
-    "New published address (e.g. #alias:server)": "Ny publisert adresse  (t.d. #alias:server)",
+    "New published address (e.g. #alias:server)": "Ny publisert adresse  (t.d. #alias:tenar)",
     "Local Addresses": "Lokale adresser",
-    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Sett adresse for dette rommet, slik at brukarar kan finne rommet på din heimeserver (%(localDomain)s)",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Sett adresse for dette rommet, slik at brukarar kan finne rommet på din heimetenar (%(localDomain)s)",
     "Error updating flair": "Oppdatering av etikett gjekk gale",
-    "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Feil under oppdatering av etikett for dette rommet. Dette kan vere deaktivert på server , eller så oppstod det ein feil.",
+    "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Feil under oppdatering av etikett for dette rommet. Dette kan vere deaktivert på tenaren, eller så oppstod det ein feil.",
     "Room Name": "Romnamn",
     "Room Topic": "Romemne",
     "Room avatar": "Rom-avatar",
     "Power level": "Tilgangsnivå",
-    "Voice & Video": "Tale & Video",
-    "Show a presence dot next to DMs in the room list": "Vis ein status-dot ved sida av DM-ar i romkatalogen",
+    "Voice & Video": "Tale og video",
     "Show info about bridges in room settings": "Vis info om bruer under rominnstillingar",
     "Show display name changes": "Vis endringar for visningsnamn",
     "Match system theme": "Følg systemtema",
     "Show shortcuts to recently viewed rooms above the room list": "Vis snarvegar til sist synte rom over romkatalogen",
     "Show hidden events in timeline": "Vis skjulte hendelsar i historikken",
-    "This is your list of users/servers you have blocked - don't leave the room!": "Dette er di liste over brukarar/serverar du har blokkert - ikkje forlat rommet!",
+    "This is your list of users/servers you have blocked - don't leave the room!": "Dette er di liste over brukarar/tenarar du har blokkert - ikkje forlat rommet!",
     "Upload": "Last opp",
     "Show less": "Vis mindre",
     "Show more": "Vis meir",
@@ -1270,12 +1160,11 @@
     "Select the roles required to change various parts of the room": "Juster roller som er påkrevd for å endre ulike deler av rommet",
     "Once enabled, encryption cannot be disabled.": "Etter aktivering, kan ikkje kryptering bli deaktivert.",
     "Your display name": "Ditt visningsnamn",
-    "Can't find this server or its room list": "Klarde ikkje å finne serveren eller romkatalogen til den",
+    "Can't find this server or its room list": "Klarde ikkje å finna tenaren eller romkatalogen til den",
     "Upload completed": "Opplasting fullført",
     "Cancelled signature upload": "Kansellerte opplasting av signatur",
-    "Unabled to upload": "Klarte ikkje å laste opp",
     "Room Settings - %(roomName)s": "Rominnstillingar - %(roomName)s",
-    "Riot failed to get the public room list.": "Riot fekk ikkje til å hente offentleg romkatalog.",
+    "%(brand)s failed to get the public room list.": "%(brand)s fekk ikkje til å hente offentleg romkatalog.",
     "Room List": "Romkatalog",
     "Navigate up/down in the room list": "Naviger opp/ned i romkatalogen",
     "Select room from the room list": "Vel rom frå romkatalogen",
@@ -1290,7 +1179,7 @@
     "Enable Emoji suggestions while typing": "Aktiver Emoji-forslag under skriving",
     "Show a placeholder for removed messages": "Vis ein plassholdar for sletta meldingar",
     "Show avatar changes": "Vis avatar-endringar",
-    "Show read receipts sent by other users": "Vis lest-rapportar sendt av andre brukarar",
+    "Show read receipts sent by other users": "Vis lese-rapportar sendt av andre brukarar",
     "Enable big emoji in chat": "Aktiver store emolji-ar i samtalen",
     "Send typing notifications": "Kringkast \"skriv...\"-status til andre",
     "Show typing notifications": "Vis \"skriv...\"-status frå andre",
@@ -1311,8 +1200,8 @@
     "Add theme": "Legg til tema",
     "Theme": "Tema",
     "Credits": "Bidragsytarar",
-    "For help with using Riot, click <a>here</a>.": "For hjelp med å bruke Riot, klikk <a>her</a>.",
-    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "For hjelp med å bruke Riot, klikk <a>her</a>, eller start ein samtale med vår bot ved å bruke knappen under.",
+    "For help with using %(brand)s, click <a>here</a>.": "For hjelp med å bruka %(brand)s, klikk <a>her</a>.",
+    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "For hjelp med å bruka %(brand)s, klikk <a>her</a>, eller start ein samtale med vår bot ved å bruke knappen under.",
     "Clear cache and reload": "Tøm buffer og last inn på nytt",
     "Composer": "Teksteditor",
     "Upgrade this room to the recommended room version": "Oppgrader dette rommet til anbefalt romversjon",
@@ -1321,66 +1210,126 @@
     "Jump to start/end of the composer": "Hopp til start/slutt av teksteditoren",
     "Navigate composer history": "Naviger historikk for teksteditor",
     "Use Single Sign On to continue": "Bruk Single-sign-on for å fortsette",
-    "Confirm adding this email address by using Single Sign On to prove your identity.": "Stadfest at du legger til denne e-postadressa, ved å bruke Single-sign-on for å bevise identiteten din.",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Stadfest at du legger til denne e-postadressa, ved å bruka Single-sign-on for å stadfeste identiteten din.",
     "Single Sign On": "Single-sign-on",
-    "Review Sessions": "Sjå gjennom økter",
     "Capitalization doesn't help very much": "Store bokstavar hjelp dessverre lite",
     "Predictable substitutions like '@' instead of 'a' don't help very much": "Forutsigbare teiknbytte som '@' istaden for 'a' hjelp dessverre lite",
     "Try out new ways to ignore people (experimental)": "Prøv ut nye måtar å ignorere folk på (eksperimentelt)",
-    "Keep secret storage passphrase in memory for this session": "Hald passfrase for hemmeleg lager i systemminnet for denne økta",
     "Cross-signing and secret storage are enabled.": "Krysssignering og hemmeleg lager er aktivert.",
     "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Kontoen din har ein kryss-signert identitet det hemmelege lageret, økta di stolar ikkje på denne enno.",
-    "Cross-signing and secret storage are not yet set up.": "Krysssignering og hemmeleg lager er endå ikkje konfiguert.",
+    "Cross-signing and secret storage are not yet set up.": "Krysssignering og hemmeleg lager er endå ikkje sett opp.",
     "Reset cross-signing and secret storage": "Tilbakestill krysssignering og hemmeleg lager",
     "Bootstrap cross-signing and secret storage": "Førebur krysssignering og hemmeleg lager",
     "in secret storage": "i hemmeleg lager",
     "Secret storage public key:": "Public-nøkkel for hemmeleg lager:",
-    "Secret Storage key format:": "Nøkkel-format for hemmeleg lager:",
     "Keyboard Shortcuts": "Tastatursnarvegar",
     "Ignored users": "Ignorerte brukarar",
-    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Legg til brukarar og serverar du vil ignorera her. Bruk stjerne/wildcard (*) for at markere eitkvart teikn. Til dømes, <code>@bot*</code> vil ignorere alle brukarar med namn 'bot' på uansett server.",
-    "Server or user ID to ignore": "Server eller brukar-ID for å ignorere",
+    "Server or user ID to ignore": "Tenar eller brukar-ID for å ignorere",
     "If this isn't what you want, please use a different tool to ignore users.": "Om det ikkje var dette du ville, bruk eit anna verktøy til å ignorera brukarar.",
-    "Enter the name of a new server you want to explore.": "Skriv inn namn på ny server du ynskjer å utforske.",
+    "Enter the name of a new server you want to explore.": "Skriv inn namn på ny tenar du ynskjer å utforske.",
     "Matrix rooms": "Matrix-rom",
     "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.": "Om du har meir info rundt korleis problemet oppstod, som kva du prøvde å gjere på det tidspunktet, brukar-IDar m.m ,inkluder gjerne den informasjonen her.",
     "Topic (optional)": "Emne (valfritt)",
     "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.": "For å unngå duplikate feilrapportar, sjekk <existingIssuesLink>eksisterande innmeldte feil</existingIssuesLink> fyrst (og legg på ein +1) eller <newIssueLink>meld inn ny feil</newIssueLink> viss du ikkje finn den der.",
     "Command Help": "Kommandohjelp",
     "To help us prevent this in future, please <a>send us logs</a>.": "For å bistå med å forhindre dette i framtida, gjerne <a>send oss loggar</a>.",
-    "Enter secret storage passphrase": "Skriv inn passfrase for hemmeleg lager",
-    "Unable to access secret storage. Please verify that you entered the correct passphrase.": "Tilgang til hemmeleg lager vart feila. Sjekk at du har skrive inn korrekt passfrase.",
-    "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Åtvaring</b>: Du bør berre nytte hemmeleg lager frå ei sikker,personleg datamaskin.",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "Skriv inn passfrasen din for å få tilgang til sikker samtalehistorikk og identiet nytta ved krysssignering for å verifisere andre økter.",
-    "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Om du har gløymt passfrasen din kan du <button1>bruke gjennopprettingsnøkkel</button1> eller <button2>opprette nye gjenopprettingsalternativ</button2>.",
-    "Enter secret storage recovery key": "Skriv inn gjenopprettingsnøkkel for hemmeleg lagring",
-    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "Fekk ikkje tilgang til hemmeleg lager. Sjekk at du skreiv inn korrekt gjenopprettingsnøkkel.",
     "Incorrect recovery passphrase": "Feil gjenopprettingspassfrase",
-    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "Fekk ikkje til å dekryptere sikkerheitkopien med denne passfrasen: sjekk at du har skrive inn korrekt gjenopprettingspassfrase.",
     "Enter recovery passphrase": "Skriv inn gjennopprettingspassfrase",
     "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Få tilgang til sikker meldingshistorikk og sett opp sikker meldingsutveksling, ved å skrive inn gjennopprettingspassfrasen.",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Har du gløymt gjennopprettingspassfrasen kan du <button1>bruke gjennopprettingsnøkkel</button1> eller <button2>sette opp nye gjennopprettingsval</button2>",
+    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Har du gløymt gjennopprettingspassfrasen kan du <button1>bruka ein gjennopprettingsnøkkel</button1> eller <button2>setta opp nye gjennopprettingsval</button2>",
     "Help": "Hjelp",
     "Explore": "Utforsk",
     "%(creator)s created and configured the room.": "%(creator)s oppretta og konfiguerte dette rommet.",
-    "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot klarde ikkje å hente protokolllister frå heimeserveren. Det kan hende at serveren er for gammal til å støtte tredjeparts-nettverk",
-    "The homeserver may be unavailable or overloaded.": "Heimeserveren kan vere overlasta eller utilgjengeleg.",
+    "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s klarde ikkje å hente protokolllister frå heimetenaren. Det kan hende at tenaren er for gammal til å støtte tredjeparts-nettverk",
+    "The homeserver may be unavailable or overloaded.": "Heimetenaren kan vere overlasta eller utilgjengeleg.",
     "Preview": "Førehandsvis",
     "View": "Vis",
     "Find a room…": "Finn eit rom…",
     "Find a room… (e.g. %(exampleRoom)s)": "Finn eit rom... (t.d. %(exampleRoom)s)",
     "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Om du ikkje kan finne rommet du ser etter, spør etter ein invitasjon eller <a>opprett eit nytt rom</a>.",
-    "Message not sent due to unknown sessions being present": "Meldinga vart ikkje sendt fordi ukjende økter er tilstades",
-    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Vis økter</showSessionsText>, <sendAnywayText>send likevel</sendAnywayText> eller<cancelText>avbryt</cancelText>.",
     "Jump to first unread room.": "Hopp til fyrste uleste rom.",
     "Jump to first invite.": "Hopp til fyrste invitasjon.",
-    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "Har du ikkje tilgang til ein, <button>bruk gjennopprettingsnøkkel eller passfrase.</button>",
-    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Hald krypteringsnøkklane dine sikre med ein passfrase. For maksimal sikkerheit bør denne vere forskjellig frå kontopassordet ditt:",
-    "Enter a passphrase": "Skriv inn ein passfrase",
-    "Back up my encryption keys, securing them with the same passphrase": "Sikkerheitskopier mine krypteringsnøklar, sikre dei med same passfrase",
-    "Enter your passphrase a second time to confirm it.": "Stadfest passfrasen ved å skrive den inn ein gong til.",
     "Unable to set up secret storage": "Oppsett av hemmeleg lager feila",
     "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Denne økta har oppdaga at gjenopprettingspassfrasen og nøkkelen for sikre meldingar vart fjerna.",
     "Toggle microphone mute": "Slå av/på demping av mikrofon",
-    "Confirm": "Stadfest"
+    "Confirm": "Stadfest",
+    "Confirm adding email": "Stadfest at du ynskjer å legga til e-postadressa",
+    "Click the button below to confirm adding this email address.": "Trykk på knappen under for å stadfesta at du ynskjer å legga til denne e-postadressa.",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Stadfest dette telefonnummeret for å bruka Single-sign-on for å bevisa din identitet.",
+    "Confirm adding phone number": "Stadfest dette telefonnummeret",
+    "Click the button below to confirm adding this phone number.": "Trykk på knappen nedanfor for å legge til dette telefonnummeret.",
+    "Room name or address": "Romnamn eller adresse",
+    "%(name)s is requesting verification": "%(name)s spør etter verifikasjon",
+    "Use your account or create a new one to continue.": "Bruk kontoen din eller opprett ein ny for å halda fram.",
+    "Sends a message as html, without interpreting it as markdown": "Sender melding som HTML, utan å tolka den som markdown",
+    "Failed to set topic": "Fekk ikkje til å setta emne",
+    "Joins room with given address": "Legg saman rom med spesifisert adresse",
+    "Unrecognised room address:": "Rom-adressa vart ikkje kjend att:",
+    "Command failed": "Kommandoen feila",
+    "Could not find user in room": "Klarde ikkje å finna brukaren i rommet",
+    "Please supply a widget URL or embed code": "Oppgje ein widget-URL eller innebygd kode",
+    "Displays information about a user": "Viser informasjon om ein brukar",
+    "Send a bug report with logs": "Send ein feilrapport med loggar",
+    "Opens chat with the given user": "Opna ein samtale med den spesifiserte brukaren",
+    "Sends a message to the given user": "Send ein melding til den spesifiserte brukaren",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s endra romnamnet frå %(oldRoomName)s til %(newRoomName)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s la til dei alternative adressene %(addresses)s for dette rommet.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s la til ei alternativ adresse %(addresses)s for dette rommet.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s tok vekk dei alternative adressene %(addresses)s for dette rommet.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s tok vekk den alternative adressa %(addresses)s for dette rommet.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s endre den alternative adressa for dette rommet.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s endra hovud- og alternativ-adressene for dette rommet.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s endre adressene for dette rommet.",
+    "Review where you’re logged in": "Sjå over kvar du er logga inn",
+    "Later": "Seinare",
+    "Allow Peer-to-Peer for 1:1 calls": "Tillat peer-to-peer (P2P) for ein-til-ein samtalar",
+    "Never send encrypted messages to unverified sessions from this session": "Aldri send krypterte meldingar til ikkje-verifiserte sesjonar frå denne sesjonen",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Aldri send krypterte meldingar i dette rommet til ikkje-verifiserte sesjonar frå denne sesjonen",
+    "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Tillat å bruka assistansetenaren turn.matrix.org for talesamtalar viss heimetenaren din ikkje tilbyr dette (IP-adressa di vil bli delt under talesamtalen)",
+    "Enable message search in encrypted rooms": "Aktiver søk etter meldingar i krypterte rom",
+    "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Sikre meldingar med denne brukaren er ende-til-ende krypterte og kan ikkje lesast av tredjepart.",
+    "Public Name": "Offentleg namn",
+    "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Er du sikker? Alle dine krypterte meldingar vil gå tapt viss nøklane dine ikkje er sikkerheitskopierte.",
+    "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Krypterte meldingar er sikra med ende-til-ende kryptering. Berre du og mottakar(ane) har nøklane for å lese desse meldingane.",
+    "wait and try again later": "vent og prøv om att seinare",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "For å rapportere eit Matrix-relatert sikkerheitsproblem, les Matrix.org sin <a>Security Disclosure Policy</a>.",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Tenaradministratoren din har deaktivert ende-til-ende kryptering som standard i direktemeldingar og private rom.",
+    "Where you’re logged in": "Stader du er innlogga",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Handter namn på eller logg ut av sesjonane dine nedanfor eller <a>verifiser dei under brukarprofilen din</a>.",
+    "A session's public name is visible to people you communicate with": "Ein sesjon sitt offentlege namn, er synleg for andre du kommuniserar med",
+    "Reset": "Nullstill",
+    "Set a new custom sound": "Set ein ny tilpassa lyd",
+    "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>": "Når kryptering er aktivert for eit rom, kan ein ikkje deaktivere det. Meldingar som blir sende i eit kryptert rom kan ikkje bli lesne av tenaren, men berre av deltakarane i rommet. Aktivering av kryptering kan hindre mange botar og bruer frå å fungera på rett måte. <a>Les meir om kryptering her.</a>",
+    "Encrypted": "Kryptert",
+    "This room is end-to-end encrypted": "Dette rommet er ende-til-ende kryptert",
+    "Encrypted by an unverified session": "Kryptert av ein ikkje-verifisert sesjon",
+    "Encrypted by a deleted session": "Kryptert av ein sletta sesjon",
+    "Create room": "Lag rom",
+    "Messages in this room are end-to-end encrypted.": "Meldingar i dette rommet er ende-til-ende kryptert.",
+    "Messages in this room are not end-to-end encrypted.": "Meldingar i dette rommet er ikkje ende-til-ende kryptert.",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "Når du nyttar krypterte rom er meldingane din sikra. Berre du og mottakaren har unike nøklar som kan gjere meldingane lesbare.",
+    "This client does not support end-to-end encryption.": "Denne klienten støttar ikkje ende-til-ende kryptering.",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "Når du nyttar krypterte rom, verifiser alle brukarar for å vere trygg på at det er sikkert.",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Meldingar i dette rommet er ende-til-ende krypterte. Meir om dette, samt verifisering av denne brukaren finn du under deira brukarprofil.",
+    "Join": "Bli med",
+    "Remove server": "Ta vekk tenar",
+    "Matrix": "Matrix",
+    "Add a new server": "Legg til ein ny tenar",
+    "Add a new server...": "Legg til ein ny tenar",
+    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Tømming av data frå denne sesjonen er permanent. Krypterte meldingar vil gå tapt med mindre krypteringsnøklane har blitt sikkerheitskopierte.",
+    "This room is private, and can only be joined by invitation.": "Dette rommet er privat, brukarar kan berre bli med viss dei har ein invitasjon",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "Du kan ikkje skru av dette seinare. Bruer og dei fleste botar vil ikkje fungere enno.",
+    "Enable end-to-end encryption": "Skru på ende-til-ende kryptering",
+    "Create a private room": "Lag eit privat rom",
+    "Make this room public": "Gjer dette rommet offentleg",
+    "Hide advanced": "Gøym avanserte alternativ",
+    "Show advanced": "Vis avanserte alternativ",
+    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Utesteng brukarar på andre Matrix heimetenarar frå å koma inn i rommet (Dette kan endrast seinare!)",
+    "I don't want my encrypted messages": "Eg treng ikkje mine krypterte meldingar",
+    "You'll lose access to your encrypted messages": "Du vil miste tilgangen til dine krypterte meldingar",
+    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Ingen identitetstenar er konfiguert, så i framtida kan ikkje legge til ei e-postadresse for å nullstille passordet.",
+    "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"
 }
diff --git a/src/i18n/strings/oc.json b/src/i18n/strings/oc.json
index e62d44f51d..124439a802 100644
--- a/src/i18n/strings/oc.json
+++ b/src/i18n/strings/oc.json
@@ -2,10 +2,8 @@
     "Add Email Address": "Ajustar una adreça electronica",
     "Add Phone Number": "Ajustar un numèro de telefòn",
     "The platform you're on": "La plataforma ont sètz",
-    "The version of Riot": "La version de Riot",
+    "The version of %(brand)s": "La version de %(brand)s",
     "Your language of choice": "La lenga que volètz",
-    "User Options": "Opcions utilizaire",
-    "Start a chat": "Començar una discussion",
     "Unmute": "Restablir lo son",
     "Mute": "Copar lo son",
     "Admin Tools": "Aisinas d’administrator",
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 7cf8a256c8..1343405781 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -1,6 +1,4 @@
 {
-    "Ignore request": "Zignoruj żądanie",
-    "Start verification": "Rozpocznij weryfikację",
     "Skip": "Pomiń",
     "This will allow you to reset your password and receive notifications.": "To pozwoli Ci zresetować Twoje hasło i otrzymać powiadomienia.",
     "Your browser does not support the required cryptography extensions": "Twoja przeglądarka nie wspiera wymaganych rozszerzeń kryptograficznych",
@@ -8,9 +6,7 @@
     "Username not available": "Nazwa użytkownika niedostępna",
     "Username available": "Nazwa użytkownika dostępna",
     "Add User": "Dodaj użytkownika",
-    "Verify...": "Zweryfikuj...",
     "Unknown Address": "Nieznany adres",
-    "To continue, please enter your password.": "Aby kontynuować, proszę wprowadzić swoje hasło.",
     "Incorrect password": "Nieprawidłowe hasło",
     "Unknown error": "Nieznany błąd",
     "Options": "Opcje",
@@ -42,7 +38,6 @@
     "Who can read history?": "Kto może czytać historię?",
     "Warning!": "Uwaga!",
     "Users": "Użytkownicy",
-    "User ID": "ID użytkownika",
     "Usage": "Użycie",
     "Upload file": "Prześlij plik",
     "Unban": "Odbanuj",
@@ -51,7 +46,6 @@
     "Add": "Dodaj",
     "Microphone": "Mikrofon",
     "Camera": "Kamera",
-    "Algorithm": "Algorytm",
     "Are you sure?": "Czy jesteś pewien?",
     "Attachment": "Załącznik",
     "Banned users": "Zbanowani użytkownicy",
@@ -87,12 +81,11 @@
     "No Microphones detected": "Nie wykryto żadnego mikrofonu",
     "No Webcams detected": "Nie wykryto żadnej kamerki internetowej",
     "No media permissions": "Brak uprawnień do mediów",
-    "You may need to manually permit Riot to access your microphone/webcam": "Możliwe, że będziesz musiał ręcznie pozwolić Riotowi na dostęp do twojego mikrofonu/kamerki internetowej",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "Możliwe, że będziesz musiał ręcznie pozwolić %(brand)sowi na dostęp do twojego mikrofonu/kamerki internetowej",
     "Default Device": "Urządzenie domyślne",
     "Advanced": "Zaawansowane",
     "Always show message timestamps": "Zawsze pokazuj znaczniki czasu wiadomości",
     "Authentication": "Uwierzytelnienie",
-    "Alias (optional)": "Alias (opcjonalnie)",
     "%(items)s and %(lastItem)s": "%(items)s i %(lastItem)s",
     "A new password must be entered.": "Musisz wprowadzić nowe hasło.",
     "%(senderName)s answered the call.": "%(senderName)s odebrał połączenie.",
@@ -106,7 +99,6 @@
     "%(senderName)s banned %(targetName)s.": "%(senderName)s zbanował(a) %(targetName)s.",
     "Ban": "Zbanuj",
     "Bans user with given id": "Blokuje użytkownika o podanym ID",
-    "Blacklisted": "Umieszczono na czarnej liście",
     "Add a widget": "Dodaj widżet",
     "Allow": "Pozwól",
     "and %(count)s others...|other": "i %(count)s innych...",
@@ -121,7 +113,6 @@
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s usunął(-ęła) nazwę pokoju.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s zmienił(a) temat na \"%(topic)s\".",
     "Changes your display nickname": "Zmienia Twój wyświetlany pseudonim",
-    "Claimed Ed25519 fingerprint key": "Zażądano odcisk klucza Ed25519",
     "Click here to fix": "Kliknij tutaj, aby naprawić",
     "Click to mute audio": "Kliknij, aby wyciszyć dźwięk",
     "Click to mute video": "Kliknij, aby wyłączyć obraz",
@@ -130,39 +121,28 @@
     "Click to unmute audio": "Kliknij, aby włączyć dźwięk",
     "Command error": "Błąd polecenia",
     "Commands": "Polecenia",
-    "Could not connect to the integration server": "Nie można połączyć się z serwerem integracji",
-    "Curve25519 identity key": "Klucz tożsamości Curve25519",
     "Custom": "Własny",
     "Custom level": "Własny poziom",
     "/ddg is not a command": "/ddg nie jest poleceniem",
     "Deactivate Account": "Dezaktywuj konto",
     "Decline": "Odrzuć",
     "Decrypt %(text)s": "Odszyfruj %(text)s",
-    "Decryption error": "Błąd odszyfrowywania",
     "Delete widget": "Usuń widżet",
     "Default": "Domyślny",
     "Define the power level of a user": "Określ poziom uprawnień użytkownika",
-    "Device ID": "Identyfikator urządzenia",
-    "device id: ": "identyfikator urządzenia: ",
-    "Direct chats": "Rozmowy bezpośrednie",
-    "Disable Notifications": "Wyłącz powiadomienia",
     "Disinvite": "Anuluj zaproszenie",
     "Displays action": "Wyświetla akcję",
     "Download %(text)s": "Pobierz %(text)s",
     "Drop File Here": "Upuść plik tutaj",
-    "Ed25519 fingerprint": "Odcisk Ed25519",
     "Edit": "Edytuj",
     "Email": "E-mail",
     "Email address": "Adres e-mail",
     "Emoji": "Emoji",
     "Enable automatic language detection for syntax highlighting": "Włącz automatyczne rozpoznawanie języka dla podświetlania składni",
-    "Enable Notifications": "Włącz powiadomienia",
-    "%(senderName)s ended the call.": "%(senderName)s zakończył połączenie.",
-    "End-to-end encryption information": "Informacje o szyfrowaniu end-to-end",
+    "%(senderName)s ended the call.": "%(senderName)s zakończył(a) połączenie.",
     "Enter passphrase": "Wpisz frazę",
     "Error decrypting attachment": "Błąd odszyfrowywania załącznika",
     "Error: Problem communicating with the given homeserver.": "Błąd: wystąpił problem podczas komunikacji z podanym serwerem.",
-    "Event information": "Informacje zdarzenia",
     "Existing Call": "Istniejące połączenie",
     "Export": "Eksport",
     "Export E2E room keys": "Eksportuj klucze E2E pokojów",
@@ -179,7 +159,6 @@
     "Failed to send email": "Nie udało się wysłać wiadomości e-mail",
     "Failed to send request.": "Nie udało się wysłać żądania.",
     "Failed to set display name": "Nie udało się ustawić wyświetlanej nazwy",
-    "Failed to toggle moderator status": "Nie udało się przełączyć na stan moderatora",
     "Failed to unban": "Nie udało się odbanować",
     "Failed to upload profile picture!": "Nie udało się wgrać zdjęcia profilowego!",
     "Failed to verify email address: make sure you clicked the link in the email": "Nie udało się zweryfikować adresu e-mail: upewnij się że kliknąłeś w link w e-mailu",
@@ -214,7 +193,6 @@
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Dołącz <voiceText>głosowo</voiceText> lub przez <videoText>wideo</videoText>.",
     "Join Room": "Dołącz do pokoju",
     "%(targetName)s joined the room.": "%(targetName)s dołączył(a) do pokoju.",
-    "Joins room with given alias": "Dołącz do pokoju o podanym aliasie",
     "Jump to first unread message.": "Przeskocz do pierwszej nieprzeczytanej wiadomości.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s wyrzucił %(targetName)s.",
     "Kick": "Wyrzuć",
@@ -224,29 +202,25 @@
     "Leave room": "Opuść pokój",
     "%(targetName)s left the room.": "%(targetName)s opuścił(a) pokój.",
     "Publish this room to the public in %(domain)s's room directory?": "Czy opublikować ten pokój dla ogółu w spisie pokojów domeny %(domain)s?",
-    "Local addresses for this room:": "Lokalne adresy dla tego pokoju:",
     "Logout": "Wyloguj",
     "Low priority": "Niski priorytet",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s uczynił(a) przyszłą historię pokoju widoczną dla wszyscy członkowie pokoju, od momentu ich zaproszenia.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s uczynił(a) przyszłą historię pokoju widoczną dla wszyscy członkowie pokoju, od momentu ich dołączenia.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s uczynił(a) przyszłą historię pokoju widoczną dla wszyscy członkowie pokoju.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s uczynił przyszłą historię pokoju widoczną dla kazdego.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s uczynił przyszłą historię pokoju widoczną dla nieznany (%(visibility)s).",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s uczynił(a) przyszłą historię pokoju widoczną dla każdego.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s uczynił(a) przyszłą historię pokoju widoczną dla nieznany (%(visibility)s).",
     "Manage Integrations": "Zarządzaj integracjami",
     "Missing room_id in request": "Brakujące room_id w żądaniu",
     "Missing user_id in request": "Brakujące user_id w żądaniu",
     "Moderator": "Moderator",
     "Name": "Nazwa",
-    "New address (e.g. #foo:%(localDomain)s)": "Nowy adres (np. #foo:%(localDomain)s)",
     "New passwords don't match": "Nowe hasła nie zgadzają się",
     "New passwords must match each other.": "Nowe hasła muszą się zgadzać.",
-    "none": "żaden",
     "not specified": "nieokreślony",
     "(not supported by this browser)": "(niewspierany przez tę przeglądarkę)",
     "<not supported>": "<niewspierany>",
     "AM": "AM",
     "PM": "PM",
-    "NOT verified": "NIEzweryfikowany",
     "No display name": "Brak nazwy ekranowej",
     "No more results": "Nie ma więcej wyników",
     "No results": "Brak wyników",
@@ -264,34 +238,30 @@
     "Profile": "Profil",
     "Public Chat": "Rozmowa publiczna",
     "Reason": "Powód",
-    "Revoke Moderator": "Usuń prawa moderatorskie",
     "Register": "Rejestracja",
     "%(targetName)s rejected the invitation.": "%(targetName)s odrzucił zaproszenie.",
     "Reject invitation": "Odrzuć zaproszenie",
-    "Remote addresses for this room:": "Adresy zdalne dla tego pokoju:",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s usunął(-ęła) swoją wyświetlaną nazwę (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s usunął(-ęła) swoje zdjęcie profilowe.",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s zażądał(a) grupowego połączenia głosowego VoIP.",
     "Results from DuckDuckGo": "Wyniki z DuckDuckGo",
     "Return to login screen": "Wróć do ekranu logowania",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot nie ma uprawnień, by wysyłać Ci powiadomienia - sprawdź ustawienia swojej przeglądarki",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s nie ma uprawnień, by wysyłać Ci powiadomienia - sprawdź ustawienia swojej przeglądarki",
     "Historical": "Historyczne",
-    "Riot was not given permission to send notifications - please try again": "Riot nie otrzymał uprawnień do wysyłania powiadomień - spróbuj ponownie",
-    "riot-web version:": "wersja riot-web:",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s nie otrzymał uprawnień do wysyłania powiadomień - spróbuj ponownie",
+    "%(brand)s version:": "wersja %(brand)s:",
     "Room %(roomId)s not visible": "Pokój %(roomId)s nie jest widoczny",
     "Room Colour": "Kolor pokoju",
     "%(roomName)s does not exist.": "%(roomName)s nie istnieje.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s nie jest dostępny w tym momencie.",
     "Rooms": "Pokoje",
     "Save": "Zapisz",
-    "Scroll to bottom of page": "Przewiń do końca strony",
     "Search failed": "Wyszukiwanie nie powiodło się",
     "Searches DuckDuckGo for results": "Używa DuckDuckGo dla wyników",
     "Seen by %(userName)s at %(dateTime)s": "Widziane przez %(userName)s o %(dateTime)s",
-    "Send anyway": "Wyślij mimo to",
     "Send Reset Email": "Wyślij e-mail resetujący hasło",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s wysłał obraz.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s wysłał zaproszenie do %(targetDisplayName)s do dołączenia do pokoju.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s wysłał(a) zaproszenie do %(targetDisplayName)s do dołączenia do pokoju.",
     "Server error": "Błąd serwera",
     "Server may be unavailable, overloaded, or search timed out :(": "Serwer może być niedostępny, przeciążony, lub upłynął czas wyszukiwania :(",
     "Server may be unavailable, overloaded, or you hit a bug.": "Serwer może być niedostępny, przeciążony, lub trafiłeś na błąd.",
@@ -305,7 +275,6 @@
     "Sign out": "Wyloguj",
     "%(count)s of your messages have not been sent.|other": "Niektóre z twoich wiadomości nie zostały wysłane.",
     "Someone": "Ktoś",
-    "Start a chat": "Rozpocznij chat",
     "Start authentication": "Rozpocznij uwierzytelnienie",
     "Submit": "Wyślij",
     "Success": "Sukces",
@@ -331,11 +300,8 @@
     "Unable to enable Notifications": "Nie można włączyć powiadomień",
     "To use it, just wait for autocomplete results to load and tab through them.": "Żeby tego użyć, należy poczekać na załadowanie się autouzupełnienia i naciskać przycisk \"Tab\", by wybierać.",
     "unknown caller": "nieznany dzwoniący",
-    "unknown device": "nieznane urządzenie",
-    "Unknown room %(roomId)s": "Nieznany pokój %(roomId)s",
     "Unmute": "Wyłącz wyciszenie",
     "Unnamed Room": "Pokój bez nazwy",
-    "Unrecognised room alias:": "Nierozpoznany alias pokoju:",
     "Uploading %(filename)s and %(count)s others|zero": "Przesyłanie %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Przesyłanie %(filename)s oraz %(count)s innych",
     "Uploading %(filename)s and %(count)s others|other": "Przesyłanie %(filename)s oraz %(count)s innych",
@@ -345,8 +311,6 @@
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (moc uprawnień administratorskich %(powerLevelNumber)s)",
     "Username invalid: %(errMessage)s": "Niepoprawna nazwa użytkownika: %(errMessage)s",
     "Verification Pending": "Oczekuje weryfikacji",
-    "Verification": "Weryfikacja",
-    "verified": "zweryfikowany",
     "Verified key": "Zweryfikowany klucz",
     "Video call": "Rozmowa wideo",
     "Voice call": "Rozmowa głosowa",
@@ -363,7 +327,7 @@
     "You do not have permission to do that in this room.": "Nie masz pozwolenia na wykonanie tej akcji w tym pokoju.",
     "You cannot place a call with yourself.": "Nie możesz wykonać połączenia do siebie.",
     "You cannot place VoIP calls in this browser.": "Nie możesz przeprowadzić rozmowy głosowej VoIP w tej przeglądarce.",
-    "You do not have permission to post to this room": "Nie jesteś uprawniony do pisania w tym pokoju",
+    "You do not have permission to post to this room": "Nie masz uprawnień do pisania w tym pokoju",
     "You have <a>disabled</a> URL previews by default.": "Masz domyślnie <a>wyłączone</a> podglądy linków.",
     "You have no visible notifications": "Nie masz widocznych powiadomień",
     "You must <a>register</a> to use this functionality": "Musisz się <a>zarejestrować</a> aby móc używać tej funkcji",
@@ -381,14 +345,12 @@
     "Offline": "Niedostępny(-a)",
     "Add an Integration": "Dodaj integrację",
     "Token incorrect": "Niepoprawny token",
-    "unencrypted": "niezaszyfrowany",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Nie będziesz mógł cofnąć tej zmiany, ponieważ nadajesz użytkownikowi uprawnienia administratorskie równe Twoim.",
     "%(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",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
     "Upload an avatar:": "Prześlij awatar:",
     "An error occurred: %(error_string)s": "Wystąpił błąd: %(error_string)s",
-    "Make Moderator": "Nadaj uprawnienia moderatora",
     "Sent messages will be stored until your connection has returned.": "Wysłane wiadomości będą przechowywane aż do momentu odzyskania połączenia.",
     "(~%(count)s results)|one": "(~%(count)s wynik)",
     "(~%(count)s results)|other": "(~%(count)s wyników)",
@@ -411,13 +373,11 @@
     "Failed to invite the following users to the %(roomName)s room:": "Wysłanie zaproszenia do następujących użytkowników do pokoju %(roomName)s nie powiodło się:",
     "Confirm Removal": "Potwierdź usunięcie",
     "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.": "Jesteś pewien że chcesz usunąć to wydarzenie? Pamiętaj, że jeśli usuniesz nazwę pokoju lub aktualizację tematu pokoju, zmiana może zostać cofnięta.",
-    "I verify that the keys match": "Upewnię się, że klucze się zgadzają",
     "Unable to restore session": "Przywrócenie sesji jest niemożliwe",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Jeśli wcześniej używałeś/aś nowszej wersji Riot, Twoja sesja może być niekompatybilna z tą wersją. Zamknij to okno i powróć do nowszej wersji.",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot zbiera anonimowe dane analityczne, aby umożliwić nam rozwijanie aplikacji.",
+    "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.": "Jeśli wcześniej używałeś/aś nowszej wersji %(brand)s, Twoja sesja może być niekompatybilna z tą wersją. Zamknij to okno i powróć do nowszej wersji.",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s zbiera anonimowe dane analityczne, aby umożliwić nam rozwijanie aplikacji.",
     "ex. @bob:example.com": "np. @jan:example.com",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Nastąpiła próba załadowania danego punktu w historii tego pokoju, lecz nie masz uprawnień, by zobaczyć określoną wiadomość.",
-    "Use compact timeline layout": "Użyj kompaktowego stylu linii czasu",
     "You have <a>enabled</a> URL previews by default.": "Masz domyślnie <a>włączone</a> podglądy linków.",
     "Please check your email to continue registration.": "Sprawdź swój e-mail, aby kontynuować rejestrację.",
     "Please enter the code it contains:": "Wpisz kod, który jest tam zawarty:",
@@ -425,7 +385,6 @@
     "Error decrypting audio": "Błąd deszyfrowania audio",
     "Error decrypting image": "Błąd deszyfrowania obrazu",
     "Error decrypting video": "Błąd deszyfrowania wideo",
-    "Removed or unknown message type": "Usunięto lub nieznany typ wiadomości",
     "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źć.",
     "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)",
@@ -436,18 +395,13 @@
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s zmienił(a) awatar %(roomName)s",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "To będzie twoja nazwa konta na <span></span> serwerze domowym; możesz też wybrać <a>inny serwer</a>.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Jeśli już posiadasz konto Matrix możesz się <a>zalogować</a>.",
-    "Not a valid Riot keyfile": "Niepoprawny plik klucza Riot",
+    "Not a valid %(brand)s keyfile": "Niepoprawny plik klucza %(brand)s",
     "Authentication check failed: incorrect password?": "Próba autentykacji nieudana: nieprawidłowe hasło?",
     "Do you want to set an email address?": "Czy chcesz ustawić adres e-mail?",
-    "Share without verifying": "Udostępnij bez weryfikacji",
-    "Encryption key request": "Żądanie klucza szyfrującego",
     "Example": "Przykład",
     "Drop file here to upload": "Upuść plik tutaj, aby go przesłać",
     "Automatically replace plain text Emoji": "Automatycznie zastępuj tekstowe emotikony",
     "Failed to upload image": "Przesyłanie obrazka nie powiodło się",
-    "Unblacklist": "Usuń z czarnej listy",
-    "Blacklist": "Dodaj do czarnej listy",
-    "Unverify": "Usuń weryfikację",
     "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?": "Za chwilę zostaniesz przekierowany/a na zewnętrzną stronę w celu powiązania Twojego konta z %(integrationsUrl)s. Czy chcesz kontynuować?",
     "URL Previews": "Podglądy linków",
     "Ongoing conference call%(supportedText)s.": "Połączenie grupowe %(supportedText)s w toku.",
@@ -460,18 +414,13 @@
     "Add rooms to this community": "Dodaj pokoje do tej społeczności",
     "Invite to Community": "Zaproś do Społeczności",
     "Which rooms would you like to add to this community?": "Które pokoje chcesz dodać do tej społeczności?",
-    "Room name or alias": "Nazwa pokoju lub alias",
     "Add to community": "Dodaj do społeczności",
-    "Call": "Zadzwoń",
     "Submit debug logs": "Wyślij dzienniki błędów",
-    "The version of Riot.im": "Wersja Riot.im",
+    "The version of %(brand)s": "Wersja %(brand)sa",
     "Your language of choice": "Twój wybrany język",
     "Your homeserver's URL": "Adres URL Twojego serwera domowego",
-    "Your identity server's URL": "Adres URL Twojego Serwera Tożsamości",
-    "The information being sent to us to help make Riot.im better includes:": "Informacje przesyłane do nas, by poprawić Riot.im zawierają:",
+    "The information being sent to us to help make %(brand)s better includes:": "Informacje przesyłane do nas w celu poprawy jakości %(brand)sa zawierają:",
     "The platform you're on": "Platforma na której jesteś",
-    "Answer": "Odbierz",
-    "Review Devices": "Przegląd urządzeń",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Uwaga: każda osoba dodana do Społeczności będzie publicznie widoczna dla każdego, go zna identyfikator społeczności",
     "Invite new community members": "Zaproś nowych członków Społeczności",
@@ -504,11 +453,8 @@
     "Ignore": "Ignoruj",
     "Mention": "Wspomnij",
     "Invite": "Zaproś",
-    "User Options": "Opcje Użytkownika",
     "Send an encrypted reply…": "Wyślij zaszyfrowaną odpowiedź…",
-    "Send a reply (unencrypted)…": "Wyślij odpowiedź (nieszyfrowaną)…",
     "Send an encrypted message…": "Wyślij zaszyfrowaną wiadomość…",
-    "Send a message (unencrypted)…": "Wyślij wiadomość (niezaszyfrowaną)…",
     "Jump to message": "Skocz do wiadomości",
     "No pinned messages.": "Brak przypiętych wiadomości.",
     "Loading...": "Ładowanie...",
@@ -523,7 +469,6 @@
     "Unnamed room": "Pokój bez nazwy",
     "Guests can join": "Goście mogą dołączyć",
     "Fetching third party location failed": "Pobranie lokalizacji zewnętrznej nie powiodło się",
-    "A new version of Riot is available.": "Dostępna jest nowa wersja Riot.",
     "Send Account Data": "Wyślij dane konta",
     "All notifications are currently disabled for all targets.": "Wszystkie powiadomienia są obecnie wyłączone dla wszystkich celów.",
     "Uploading report": "Raport wysyłania",
@@ -543,8 +488,6 @@
     "Send Custom Event": "Wyślij niestandardowe wydarzenie",
     "Advanced notification settings": "Zaawansowane ustawienia powiadomień",
     "Failed to send logs: ": "Niepowodzenie wysyłki zapisu rozmów ",
-    "delete the alias.": "usunąć alias.",
-    "To return to your account in future you need to <u>set a password</u>": "Aby wrócić do swojego konta w przyszłości musisz <u> ustawić hasło </u>",
     "Forget": "Zapomnij",
     "World readable": "Całkowicie publiczne",
     "You cannot delete this image. (%(code)s)": "Nie możesz usunąć tego obrazka. (%(code)s)",
@@ -571,7 +514,6 @@
     "Noisy": "Głośny",
     "Files": "Pliki",
     "Collecting app version information": "Zbieranie informacji o wersji aplikacji",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Usuń alias %(alias)s i usuń %(name)s z katalogu?",
     "Keywords": "Słowa kluczowe",
     "Enable notifications for this account": "Włącz powiadomienia na tym koncie",
     "Invite to this community": "Zaproś do tej społeczności",
@@ -582,7 +524,7 @@
     "Forward Message": "Przekaż wiadomość",
     "You have successfully set a password and an email address!": "Z powodzeniem ustawiono hasło i adres e-mail dla Twojego konta!",
     "Remove %(name)s from the directory?": "Usunąć %(name)s z katalogu?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot używa wiele zaawansowanych technologii, które nie są dostępne lub są w fazie testów w Twojej przeglądarce.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s używa wiele zaawansowanych technologii, które nie są dostępne lub są w fazie testów w Twojej przeglądarce.",
     "Developer Tools": "Narzędzia programistyczne",
     "Preparing to send logs": "Przygotowywanie do wysłania zapisu rozmów",
     "Remember, you can always set an email address in user settings if you change your mind.": "Pamiętaj, że zawsze możesz zmienić swój e-mail lub hasło w panelu ustawień użytkownika.",
@@ -629,8 +571,7 @@
     "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.": "Dziennik błędów zawiera dane użytkowania aplikacji, w tym: twoją nazwę użytkownika, numery ID, aliasy pokojów i grup które odwiedzałeś i loginy innych użytkowników. Nie zawiera wiadomości.",
     "Unhide Preview": "Odkryj podgląd",
     "Unable to join network": "Nie można dołączyć do sieci",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Możliwe, że skofigurowałeś je w innym kliencie, niż Riot. Nie możesz ich zmieniać w Riot, ale nadal mają zastosowanie",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Przepraszamy, Twoja przeglądarka <b>nie jest w stanie</b> uruchomić Riot.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Przepraszamy, Twoja przeglądarka <b>nie jest w stanie</b> uruchomić %(brand)s.",
     "Uploaded on %(date)s by %(user)s": "Wysłano %(date)s przez %(user)s",
     "Messages in group chats": "Wiadomości w czatach grupowych",
     "Yesterday": "Wczoraj",
@@ -639,7 +580,7 @@
     "Unable to fetch notification target list": "Nie można pobrać listy docelowej dla powiadomień",
     "Set Password": "Ustaw hasło",
     "Off": "Wyłącz",
-    "Riot does not know how to join a room on this network": "Riot nie wie, jak dołączyć do pokoju w tej sieci",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s nie wie, jak dołączyć do pokoju w tej sieci",
     "Mentions only": "Tylko, gdy wymienieni",
     "Failed to remove tag %(tagName)s from room": "Nie udało się usunąć tagu %(tagName)s z pokoju",
     "You can now return to your account after signing out, and sign in on other devices.": "Teraz możesz powrócić do swojego konta na innych urządzeniach po wylogowaniu i ponownym zalogowaniu się.",
@@ -655,7 +596,6 @@
     "Thank you!": "Dziękujemy!",
     "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!": "Z Twoją obecną przeglądarką, wygląd oraz wrażenia z używania aplikacji mogą być niepoprawne, a niektóre funkcje wcale nie działać. Kontynuuj jeśli chcesz spróbować, jednak trudno będzie pomóc w przypadku błędów, które mogą nastąpić!",
     "Checking for an update...": "Sprawdzanie aktualizacji...",
-    "There are advanced notifications which are not shown here": "Masz zaawansowane powiadomienia, nie pokazane tutaj",
     "e.g. %(exampleValue)s": "np. %(exampleValue)s",
     "Always show encryption icons": "Zawsze wyświetlaj ikony szyfrowania",
     "Send analytics data": "Wysyłaj dane analityczne",
@@ -668,14 +608,9 @@
     "Members only (since they joined)": "Tylko członkowie (od kiedy dołączyli)",
     "Copied!": "Skopiowano!",
     "Failed to copy": "Kopiowanie nieudane",
-    "Message removed by %(userId)s": "Wiadomość usunięta przez %(userId)s",
-    "Message removed": "Wiadomość usunięta",
     "An email has been sent to %(emailAddress)s": "E-mail został wysłany do %(emailAddress)s",
     "A text message has been sent to %(msisdn)s": "Wysłano wiadomość tekstową do %(msisdn)s",
     "Code": "Kod",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Pomóż nam ulepszyć Riot.im wysyłając <UsageDataLink>anonimowe dane analityczne</UsageDataLink>. Spowoduje to użycie pliku cookie (zobacz naszą <PolicyLink>Politykę plików cookie</PolicyLink>).",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Pomóż nam ulepszyć Riot.im wysyłając <UsageDataLink>anonimowe dane analityczne</UsageDataLink>. Spowoduje to użycie pliku cookie.",
-    "Yes, I want to help!": "Tak, chcę pomóc!",
     "Delete Widget": "Usuń widżet",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Usunięcie widżetu usuwa go dla wszystkich użytkowników w tym pokoju. Czy na pewno chcesz usunąć ten widżet?",
     "Communities": "Społeczności",
@@ -691,7 +626,6 @@
     "Which officially provided instance you are using, if any": "Jakiej oficjalnej instancji używasz, jeżeli w ogóle",
     "Every page you use in the app": "Każda strona, której używasz w aplikacji",
     "e.g. <CurrentPageURL>": "np. <CurrentPageURL>",
-    "Your User Agent": "Identyfikator Twojej przeglądarki (User Agent)",
     "Your device resolution": "Twoja rozdzielczość ekranu",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Dane identyfikujące, takie jak: pokój, identyfikator użytkownika lub grupy, są usuwane przed wysłaniem na serwer.",
     "Who would you like to add to this community?": "Kogo chcesz dodać do tej społeczności?",
@@ -800,9 +734,9 @@
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Aby kontynuować używanie serwera domowego %(homeserverDomain)s musisz przejrzeć i zaakceptować nasze warunki użytkowania.",
     "Review terms and conditions": "Przejrzyj warunki użytkowania",
     "Old cryptography data detected": "Wykryto stare dane kryptograficzne",
-    "Data from an older version of Riot 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.": "Dane ze starszej wersji Riot zostały wykryte. Spowoduje to błędne działanie kryptografii typu end-to-end w starszej wersji. Wiadomości szyfrowane end-to-end wymieniane ostatnio podczas korzystania ze starszej wersji mogą być niemożliwe do odszyfrowywane w tej wersji. Może to również spowodować niepowodzenie wiadomości wymienianych z tą wersją. Jeśli wystąpią problemy, wyloguj się i zaloguj ponownie. Aby zachować historię wiadomości, wyeksportuj i ponownie zaimportuj klucze.",
+    "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.": "Dane ze starszej wersji %(brand)s zostały wykryte. Spowoduje to błędne działanie kryptografii typu end-to-end w starszej wersji. Wiadomości szyfrowane end-to-end wymieniane ostatnio podczas korzystania ze starszej wersji mogą być niemożliwe do odszyfrowywane w tej wersji. Może to również spowodować niepowodzenie wiadomości wymienianych z tą wersją. Jeśli wystąpią problemy, wyloguj się i zaloguj ponownie. Aby zachować historię wiadomości, wyeksportuj i ponownie zaimportuj klucze.",
     "Your Communities": "Twoje Społeczności",
-    "Did you know: you can use communities to filter your Riot.im experience!": "Czy wiesz, że: możesz używać Społeczności do filtrowania swoich doświadczeń z Riot.im!",
+    "Did you know: you can use communities to filter your %(brand)s experience!": "Czy wiesz, że: możesz używać Społeczności do filtrowania swoich doświadczeń z %(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.": "Aby ustawić filtr, przeciągnij awatar Społeczności do panelu filtra po lewej stronie ekranu. Możesz kliknąć awatar w panelu filtra w dowolnym momencie, aby zobaczyć tylko pokoje i osoby powiązane z tą społecznością.",
     "Error whilst fetching joined communities": "Błąd podczas pobierania dołączonych społeczności",
     "Create a new community": "Utwórz nową Społeczność",
@@ -810,8 +744,6 @@
     "%(count)s of your messages have not been sent.|one": "Twoja wiadomość nie została wysłana.",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Nikogo tu nie ma! Czy chcesz <inviteText>zaprosić inne osoby</inviteText> lub <nowarnText>przestać ostrzegać o pustym pokoju</nowarnText>?",
     "Clear filter": "Wyczyść filtr",
-    "Light theme": "Jasny motyw",
-    "Dark theme": "Ciemny motyw",
     "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.": "Jeśli zgłosiłeś błąd za pośrednictwem GitHuba, dzienniki błędów mogą nam pomóc wyśledzić problem. Dzienniki błędów zawierają dane o użytkowaniu aplikacji, w tym nazwę użytkownika, identyfikatory lub aliasy odwiedzonych pomieszczeń lub grup oraz nazwy użytkowników innych użytkowników. Nie zawierają wiadomości.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Prywatność jest dla nas ważna, dlatego nie gromadzimy żadnych danych osobowych ani danych identyfikujących w naszych analizach.",
     "Learn more about how we use analytics.": "Dowiedz się więcej co analizujemy.",
@@ -822,12 +754,10 @@
     "This homeserver doesn't offer any login flows which are supported by this client.": "Ten serwer domowy nie oferuje żadnych trybów logowania wspieranych przez Twojego klienta.",
     "Notify the whole room": "Powiadom cały pokój",
     "Room Notification": "Powiadomienia pokoju",
-    "Call Anyway": "Zadzwoń mimo to",
-    "Answer Anyway": "Odpowiedz mimo to",
     "Demote yourself?": "Zdegradować siebie?",
     "Demote": "Zdegraduj",
     "Hide Stickers": "Ukryj Naklejki",
-    "Show Stickers": "Pokaż Naklejki",
+    "Show Stickers": "Pokaż naklejki",
     "The email field must not be blank.": "Pole e-mail nie może być puste.",
     "The phone number field must not be blank.": "Pole numeru telefonu nie może być puste.",
     "The password field must not be blank.": "Pole hasła nie może być puste.",
@@ -844,18 +774,11 @@
     "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",
     "Call in Progress": "Łączenie w toku",
     "Permission Required": "Wymagane Uprawnienia",
-    "Registration Required": "Wymagana Rejestracja",
-    "You need to register to do this. Would you like to register now?": "Musisz się zarejestrować, aby to zrobić. Czy chcesz się teraz zarejestrować?",
     "A call is currently being placed!": "W tej chwili trwa rozmowa!",
     "A call is already in progress!": "Połączenie już trwa!",
     "You do not have permission to start a conference call in this room": "Nie posiadasz uprawnień do rozpoczęcia rozmowy grupowej w tym pokoju",
     "Unignored user": "Nieignorowany użytkownik",
     "Forces the current outbound group session in an encrypted room to be discarded": "Wymusza odrzucenie bieżącej sesji grupy wychodzącej w zaszyfrowanym pokoju",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s dodał(a) %(addedAddresses)s jako adres tego pokoju.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s dodał(a) %(addedAddresses)s jako adres tego pokoju.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s usunął(-ęła) %(removedAddresses)s jako adres tego pokoju.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s usunął(-ęła) %(removedAddresses)s jako adres tego pokoju.",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s dodał %(addedAddresses)s i %(removedAddresses)s usunął adresy z tego pokoju.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s ustawił(a) główny adres dla tego pokoju na %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s usunął(-ęła) główny adres tego pokoju.",
     "This homeserver has hit its Monthly Active User limit.": "Ten serwer osiągnął miesięczny limit aktywnego użytkownika.",
@@ -875,21 +798,19 @@
     "Stickerpack": "Pakiet naklejek",
     "This room is a continuation of another conversation.": "Ten pokój jest kontynuacją innej rozmowy.",
     "Click here to see older messages.": "Kliknij tutaj, aby zobaczyć starsze wiadomości.",
-    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "Ten serwer osiągnął miesięczny limit aktywnych użytkowników, więc <b>niektórzy użytkownicy nie będą mogli się zalogować</b>.",
-    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Ten serwer przekroczył jeden z limitów, więc <b>niektórzy użytkownicy nie będą mogli się zalogować</b>.",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s dołączyli(-ły) %(count)s razy",
     "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s dołączył(a) %(count)s razy",
     "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s dołączył(a)",
     "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s wyszli(-ły)",
     "were invited %(count)s times|one": "zostali(-ły) zaproszeni(-one)",
     "Show developer tools": "Pokaż narzędzia deweloperskie",
-    "Updating Riot": "Aktualizowanie Riot",
+    "Updating %(brand)s": "Aktualizowanie %(brand)s",
     "Please <a>contact your service administrator</a> to continue using this service.": "Proszę, <a>skontaktuj się z administratorem</a> aby korzystać dalej z funkcji.",
     "Only room administrators will see this warning": "Tylko administratorzy pokojów widzą to ostrzeżenie",
     "Open Devtools": "Otwórz narzędzia deweloperskie",
     "Clear cache and resync": "Wyczyść pamięć podręczną i zsynchronizuj ponownie",
-    "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Riot używa teraz 3-5x mniej pamięci, ładując informacje o innych użytkownikach tylko wtedy, gdy jest to konieczne. Poczekaj, aż ponownie zsynchronizujemy się z serwerem!",
-    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Jeśli inna wersja Riot jest nadal otwarta w innej zakładce, proszę zamknij ją, ponieważ używanie Riot na tym samym komputerze z włączonym i wyłączonym jednocześnie leniwym ładowaniem będzie powodować problemy.",
+    "%(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 używa teraz 3-5x mniej pamięci, ładując informacje o innych użytkownikach tylko wtedy, gdy jest to konieczne. Poczekaj, aż ponownie zsynchronizujemy się z serwerem!",
+    "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.": "Jeśli inna wersja %(brand)s jest nadal otwarta w innej zakładce, proszę zamknij ją, ponieważ używanie %(brand)s na tym samym komputerze z włączonym i wyłączonym jednocześnie leniwym ładowaniem będzie powodować problemy.",
     "And %(count)s more...|other": "I %(count)s więcej…",
     "Delete Backup": "Usuń Kopię Zapasową",
     "Unable to load! Check your network connectivity and try again.": "Nie można załadować! Sprawdź połączenie sieciowe i spróbuj ponownie.",
@@ -915,7 +836,7 @@
     "Common names and surnames are easy to guess": "Popularne imiona i nazwiska są łatwe do odgadnięcia",
     "You do not have permission to invite people to this room.": "Nie masz uprawnień do zapraszania ludzi do tego pokoju.",
     "User %(user_id)s does not exist": "Użytkownik %(user_id)s nie istnieje",
-    "Unknown server error": "Nieznany bład serwera",
+    "Unknown server error": "Nieznany błąd serwera",
     "%(oneUser)sleft %(count)s times|one": "%(oneUser)swyszedł(-ła)",
     "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)sdołączył(a) i wyszedł(-ła) %(count)s razy",
     "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)sdołączył(a) i wyszedł(-ła)",
@@ -930,7 +851,7 @@
     "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)szmienił(a) swój awatar %(count)s razy",
     "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)szmienił(a) swój awatar",
     "%(items)s and %(count)s others|other": "%(items)s i %(count)s innych",
-    "%(items)s and %(count)s others|one": "%(items)s i jeden inny",
+    "%(items)s and %(count)s others|one": "%(items)s i jedna inna osoba",
     "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)szmieniło swój awatar",
     "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)szmieniło swój awatar %(count)s razy",
     "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)szmienił(a) swoją nazwę",
@@ -956,19 +877,13 @@
     "Capitalization doesn't help very much": "Kapitalizacja nie pomaga bardzo",
     "This is a top-10 common password": "To jest 10 najpopularniejszych haseł",
     "This is a top-100 common password": "To jest 100 najpopularniejszych haseł",
-    "Enter Recovery Key": "Wprowadź Klucz Odzyskiwania",
     "This looks like a valid recovery key!": "To wygląda na prawidłowy klucz odzyskiwania!",
     "Not a valid recovery key": "Nieprawidłowy klucz odzyskiwania",
     "If you don't want to set this up now, you can later in Settings.": "Jeśli nie chcesz tego teraz ustawiać, możesz to zrobić później w Ustawieniach.",
     "Retry": "Ponów",
-    "Create Key Backup": "Stwórz kopię zapasową klucza",
     "Unable to create key backup": "Nie można utworzyć kopii zapasowej klucza",
     "Download": "Pobierz",
-    "Copy to clipboard": "Skopiuj do schowka",
-    "Your Recovery Key": "Twój Klucz Odzyskiwania",
-    "Enter a passphrase...": "Wprowadź hasło…",
     "Next": "Następny",
-    "Backup Restored": "Przywrócono Kopię Zapasową",
     "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",
@@ -1090,9 +1005,6 @@
     "Room Name": "Nazwa pokoju",
     "Room Topic": "Temat pokoju",
     "Power level": "Poziom uprawnień",
-    "Verify by comparing a short text string.": "Weryfikuj, porównując krótki ciąg tekstu.",
-    "Begin Verifying": "Rozpocznij weryfikację",
-    "Waiting for partner to accept...": "Czekanie, aż partner zaakceptuje…",
     "Room Settings - %(roomName)s": "Ustawienia pokoju - %(roomName)s",
     "Doesn't look like a valid phone number": "To nie wygląda na poprawny numer telefonu",
     "Globe": "Ziemia",
@@ -1102,7 +1014,7 @@
     "Gift": "Prezent",
     "Hammer": "Młotek",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Grupuj i filtruj pokoje według niestandardowych znaczników (odśwież, aby zastosować zmiany)",
-    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Poprzedza ¯\\_(ツ)_/¯ do wiadomości tekstowej",
+    "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Dodaje ¯\\_(ツ)_/¯ na początku wiadomości tekstowej",
     "Upgrades a room to a new version": "Aktualizuje pokój do nowej wersji",
     "Changes your display nickname in the current room only": "Zmienia Twój wyświetlany pseudonim tylko dla bieżącego pokoju",
     "Sets the room name": "Ustawia nazwę pokoju",
@@ -1127,7 +1039,6 @@
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "W tej chwili odpowiadanie plikiem nie jest możliwe. Czy chcesz przesłać ten plik bez odpowiadania?",
     "Help & About": "Pomoc i o aplikacji",
     "<b>Save it</b> on a USB key or backup drive": "<b>Zapisz</b> w pamięci USB lub na dysku kopii zapasowej",
-    "Show recently visited rooms above the room list": "Pokaż ostatnio odwiedzone pokoje nad listą pokoi",
     "General": "Ogólne",
     "Sounds": "Dźwięki",
     "Notification sound": "Dźwięk powiadomień",
@@ -1140,10 +1051,9 @@
     "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)",
     "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",
-    "A conference call could not be started because the integrations server is not available": "Połączenie konferencyjne nie może zostać rozpoczęte ponieważ serwer integracji jest niedostępny",
     "The file '%(fileName)s' failed to upload.": "Nie udało się przesłać pliku '%(fileName)s'.",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Plik '%(fileName)s' przekracza limit rozmiaru dla tego serwera głównego",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Poproś swojego administratora Riot by sprawdzić <a>Twoją konfigurację</a> względem niewłaściwych lub zduplikowanych elementów.",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Poproś swojego administratora %(brand)s by sprawdzić <a>Twoją konfigurację</a> względem niewłaściwych lub zduplikowanych elementów.",
     "Cannot reach identity server": "Nie można połączyć się z serwerem tożsamości",
     "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.": "Możesz się zarejestrować, lecz niektóre funkcje nie będą dostępne dopóki Serwer Tożsamości nie będzie znów online. Jeśli ciągle widzisz to ostrzeżenie, sprawdź swoją konfigurację lub skontaktuj się z administratorem serwera.",
     "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.": "Możesz zresetować hasło, lecz niektóre funkcje nie będą dostępne dopóki Serwer Tożsamości nie będzie znów online. Jeśli ciągle widzisz to ostrzeżenie, sprawdź swoją konfigurację lub skontaktuj się z administratorem serwera.",
@@ -1175,11 +1085,11 @@
     "%(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.",
-    "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s odwołał zaproszednie dla %(targetDisplayName)s aby dołączył do pokoju.",
+    "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s odwołał(a) zaproszenie dla %(targetDisplayName)s aby dołączył do pokoju.",
     "%(names)s and %(count)s others are typing …|one": "%(names)s i jedna osoba pisze…",
     "Cannot reach homeserver": "Błąd połączenia z serwerem domowym",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Upewnij się, że posiadasz stabilne połączenie internetowe lub skontaktuj się z administratorem serwera",
-    "Your Riot is misconfigured": "Twój Riot jest źle skonfigurowany",
+    "Your %(brand)s is misconfigured": "Twój %(brand)s jest źle skonfigurowany",
     "Unexpected error resolving homeserver configuration": "Nieoczekiwany błąd przy ustalaniu konfiguracji serwera domowego",
     "Unexpected error resolving identity server configuration": "Nieoczekiwany błąd przy ustalaniu konfiguracji serwera tożsamości",
     "User %(userId)s is already in the room": "Użytkownik %(userId)s jest już w pokoju",
@@ -1200,7 +1110,6 @@
     "Enable Community Filter Panel": "Aktywuj Panel Filtrów Społeczności",
     "Allow Peer-to-Peer for 1:1 calls": "Pozwól na połączenia 1:1 w technologii Peer-to-Peer",
     "Prompt before sending invites to potentially invalid matrix IDs": "Powiadamiaj przed wysłaniem zaproszenia do potencjalnie nieprawidłowych ID matrix",
-    "Order rooms in the room list by most important first instead of most recent": "Kolejkuj pokoje na liście pokojów od najważniejszych niż od najnowszych",
     "Show hidden events in timeline": "Pokaż ukryte wydarzenia na linii czasowej",
     "Low bandwidth mode": "Tryb wolnej przepustowości",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Pozwól na awaryjny serwer wspomagania połączeń turn.matrix.org, gdy Twój serwer domowy takiego nie oferuje (Twój adres IP będzie udostępniony podczas połączenia)",
@@ -1254,9 +1163,9 @@
     "Deactivate account": "Dezaktywuj konto",
     "Legal": "Warunki prawne",
     "Credits": "Podziękowania",
-    "For help with using Riot, click <a>here</a>.": "Aby uzyskać pomoc w używaniu Riot, naciśnij <a>tutaj</a>.",
-    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "Aby uzyskać pomoc w używaniu Riot, naciśnij <a>tutaj</a> lub uruchom rozmowę z naszym botem, za pomocą odnośnika poniżej.",
-    "Chat with Riot Bot": "Rozmowa z Botem Riota",
+    "For help with using %(brand)s, click <a>here</a>.": "Aby uzyskać pomoc w używaniu %(brand)s, naciśnij <a>tutaj</a>.",
+    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "Aby uzyskać pomoc w używaniu %(brand)s, naciśnij <a>tutaj</a> lub uruchom rozmowę z naszym botem, za pomocą odnośnika poniżej.",
+    "Chat with %(brand)s Bot": "Rozmowa z Botem %(brand)sa",
     "FAQ": "Najczęściej zadawane pytania",
     "Always show the window menu bar": "Zawsze pokazuj pasek menu okna",
     "Add Email Address": "Dodaj adres e-mail",
@@ -1290,7 +1199,6 @@
     "Do not use an identity server": "Nie używaj serwera tożsamości",
     "Clear cache and reload": "Wyczyść pamięć podręczną i przeładuj",
     "Something went wrong. Please try again or view your console for hints.": "Coś poszło nie tak. Spróbuj ponownie lub sprawdź konsolę przeglądarki dla wskazówek.",
-    "Please verify the room ID or alias and try again.": "Zweryfikuj poprawność ID pokoju lub nazwy zastępczej i spróbuj ponownie.",
     "Please try again or view your console for hints.": "Spróbuj ponownie lub sprawdź konsolę przeglądarki dla wskazówek.",
     "Personal ban list": "Osobista lista zablokowanych",
     "Server or user ID to ignore": "ID serwera lub użytkownika do zignorowania",
@@ -1321,9 +1229,9 @@
     "Try to join anyway": "Spróbuj dołączyć mimo tego",
     "You can still join it because this is a public room.": "Możesz mimo to dołączyć, gdyż pokój jest publiczny.",
     "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "To zaproszenie do %(roomName)s zostało wysłane na adres %(email)s, który nie jest przypisany do Twojego konta",
-    "Link this email with your account in Settings to receive invites directly in Riot.": "Połącz ten adres e-mail z Twoim kontem w Ustawieniach, aby otrzymywać zaproszenia bezpośrednio w Riot.",
+    "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Połącz ten adres e-mail z Twoim kontem w Ustawieniach, aby otrzymywać zaproszenia bezpośrednio w %(brand)s.",
     "This invite to %(roomName)s was sent to %(email)s": "To zaproszenie do %(roomName)s zostało wysłane do %(email)s",
-    "Use an identity server in Settings to receive invites directly in Riot.": "Użyj serwera tożsamości w Ustawieniach, aby otrzymywać zaproszenia bezpośrednio w Riot.",
+    "Use an identity server in Settings to receive invites directly in %(brand)s.": "Użyj serwera tożsamości w Ustawieniach, aby otrzymywać zaproszenia bezpośrednio w %(brand)s.",
     "Do you want to chat with %(user)s?": "Czy chcesz rozmawiać z %(user)s?",
     "Do you want to join %(roomName)s?": "Czy chcesz dołączyć do %(roomName)s?",
     "<userName/> invited you": "<userName/> zaprosił(a) CIę",
@@ -1346,12 +1254,8 @@
     "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)snie wykonał(a) zmian %(count)s razy",
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)snie wykonał(a) zmian",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Nie zdołano wczytać zdarzenia, na które odpowiedziano, może ono nie istnieć lub nie masz uprawnienia, by je zobaczyć.",
-    "Room alias": "Nazwa zastępcza pokoju",
     "e.g. my-room": "np. mój-pokój",
     "Some characters not allowed": "Niektóre znaki niedozwolone",
-    "Please provide a room alias": "Proszę podać nazwę zastępczą pokoju",
-    "This alias is available to use": "Ta nazwa zastępcza jest dostępna do użycia",
-    "This alias is already in use": "Ta nazwa zastępcza jest już w użyciu",
     "Report bugs & give feedback": "Zgłoś błędy & sugestie",
     "Filter rooms…": "Filtruj pokoje…",
     "Find a room…": "Znajdź pokój…",
@@ -1372,7 +1276,6 @@
     "Never send encrypted messages to unverified sessions from this session": "Nigdy nie wysyłaj zaszyfrowanych wiadomości do niezweryfikowanych sesji z tej sesji",
     "Enable desktop notifications for this session": "Włącz powiadomienia na pulpicie dla tej sesji",
     "Enable audible notifications for this session": "Włącz powiadomienia dźwiękowe dla tej sesji",
-    "Sessions": "Sesje",
     "Direct Messages": "Wiadomości bezpośrednie",
     "Create Account": "Utwórz konto",
     "Sign In": "Zaloguj się",
@@ -1417,10 +1320,9 @@
     "Confirm": "Potwierdź",
     "Sign In or Create Account": "Zaloguj się lub utwórz konto",
     "Use your account or create a new one to continue.": "Użyj konta lub utwórz nowe, aby kontynuować.",
-    "No sessions with registered encryption keys": "Brak sesji z zarejestrowanymi kluczami szyfrującymi",
     "No": "Nie",
     "Yes": "Tak",
-    "React": "Zareaguj",
+    "React": "Dodaj reakcję",
     "Edited at %(date)s. Click to view edits.": "Edytowano w %(date)s. Kliknij, aby zobaczyć zmiany.",
     "Frequently Used": "Często używane",
     "Smileys & People": "Buźki i osoby",
@@ -1442,7 +1344,6 @@
     "Server name": "Nazwa serwera",
     "Add a new server...": "Dodaj nowy serwer…",
     "Please enter a name for the room": "Proszę podać nazwę pokoju",
-    "Set a room alias to easily share your room with other people.": "Ustaw alias pokoju, aby łatwo udostępniać swój pokój innym osobom.",
     "This room is private, and can only be joined by invitation.": "Ten pokój jest prywatny i można do niego dołączyć tylko za zaproszeniem.",
     "Enable end-to-end encryption": "Włącz szyfrowanie end-to-end",
     "Create a public room": "Utwórz publiczny pokój",
@@ -1568,7 +1469,6 @@
     "Reject & Ignore user": "Odrzuć i zignoruj użytkownika",
     "Show image": "Pokaż obraz",
     "Verify session": "Zweryfikuj sesję",
-    "Loading session info...": "Ładowanie informacji o sesji…",
     "Upload completed": "Przesyłanie zakończone",
     "Message edits": "Edycje wiadomości",
     "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Jeśli napotkasz jakieś błędy lub masz opinię, którą chcesz się podzielić, daj nam znać na GitHubie.",
@@ -1578,15 +1478,58 @@
     "Send a Direct Message": "Wyślij wiadomość bezpośrednią",
     "Explore Public Rooms": "Przeglądaj publiczne pokoje",
     "Create a Group Chat": "Utwórz czat grupowy",
-    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
     "<a>Log in</a> to your new account.": "<a>Zaloguj się</a> do nowego konta.",
     "Registration Successful": "Pomyślnie zarejestrowano",
     "DuckDuckGo Results": "Wyniki z DuckDuckGo",
     "Enter your account password to confirm the upgrade:": "Wprowadź hasło do konta, aby potwierdzić aktualizację:",
-    "You're done!": "Jesteś gotów!",
     "Autocomplete": "Autouzupełnienie",
     "Toggle Bold": "Przełącz pogrubienie",
     "Toggle Italics": "Przełącz kursywę",
     "Toggle Quote": "Przełącz cytowanie",
-    "Cancel autocomplete": "Anuluj autouzupełnienie"
+    "Cancel autocomplete": "Anuluj autouzupełnienie",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Zainstaluj <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, lub <safariLink>Safari</safariLink> w celu zapewnienia najlepszego działania.",
+    "Confirm adding email": "Potwierdź dodanie e-maila",
+    "Click the button below to confirm adding this email address.": "Naciśnij przycisk poniżej aby zatwierdzić dodawanie adresu e-mail.",
+    "Confirm adding phone number": "Potwierdź dodanie numeru telefonu",
+    "Click the button below to confirm adding this phone number.": "Naciśnij przycisk poniżej aby potwierdzić dodanie tego numeru telefonu.",
+    "Your user agent": "Twój user agent",
+    "Sends a message as html, without interpreting it as markdown": "Wysyła wiadomość w formacie html, bez interpretowania jej jako markdown",
+    "Error upgrading room": "Błąd podczas aktualizacji pokoju",
+    "Double check that your server supports the room version chosen and try again.": "Sprawdź ponownie czy Twój serwer wspiera wybraną wersję pokoju i spróbuj ponownie.",
+    "Could not find user in room": "Nie znaleziono użytkownika w pokoju",
+    "Session already verified!": "Sesja już zweryfikowana!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "OSTRZEŻENIE: Sesja już zweryfikowana, ale klucze do siebie NIE PASUJĄ!",
+    "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!": "OSTRZEŻENIE: WERYFIKACJA KLUCZY NIE POWIODŁA SIĘ! Klucz podpisujący dla %(userId)s oraz sesji %(deviceId)s to \"%(fprint)s\", nie pasuje on do podanego klucza \"%(fingerprint)s\". To może oznaczać że Twoja komunikacja jest przechwytywana!",
+    "Displays information about a user": "Pokazuje informacje na temat użytkownika",
+    "Send a bug report with logs": "Wyślij raport błędu z logami",
+    "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ść.",
+    "Learn More": "Dowiedz się więcej",
+    "Light": "Jasny",
+    "Dark": "Ciemny",
+    "Font size": "Rozmiar czcionki",
+    "People": "Ludzie",
+    "Appearance": "Wygląd",
+    "Show rooms with unread messages first": "Pokazuj najpierw pokoje z nieprzeczytanymi wiadomościami",
+    "Show previews of messages": "Pokazuj podglądy wiadomości",
+    "Sort by": "Sortuj według",
+    "Activity": "Aktywności",
+    "A-Z": "A-Z",
+    "Notification options": "Opcje powiadomień",
+    "Leave Room": "Opuść pokój",
+    "Favourited": "Ulubiony",
+    "This room is public": "Ten pokój jest publiczny",
+    "Unknown Command": "Nieznane polecenie",
+    "Unrecognised command: %(commandText)s": "Nieznane polecenie: %(commandText)s",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Możesz użyć <code>/help</code> aby wyświetlić listę dostępnych poleceń. Czy chciałeś(-aś) wysłać to jako wiadomość?",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "Wskazówka: Rozpocznij swoją wiadomość od <code>//</code>, aby rozpocząć ją ukośnikiem.",
+    "Send as message": "Wyślij jako wiadomość",
+    "Remove %(count)s messages|other": "Usuń %(count)s wiadomości",
+    "Remove %(count)s messages|one": "Usuń 1 wiadomość",
+    "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"
 }
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 6c64a10696..f72edc150d 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -2,7 +2,6 @@
     "Account": "Conta",
     "Admin": "Administrador",
     "Advanced": "Avançado",
-    "Algorithm": "Algoritmo",
     "New passwords don't match": "As novas senhas não conferem",
     "A new password must be entered.": "Uma nova senha precisa ser informada.",
     "Anyone who knows the room's link, apart from guests": "Qualquer pessoa que tenha o link da sala, exceto visitantes",
@@ -10,30 +9,21 @@
     "Are you sure you want to reject the invitation?": "Você tem certeza que deseja rejeitar este convite?",
     "Banned users": "Usuárias/os banidas/os",
     "Bans user with given id": "Banir usuários com o identificador informado",
-    "Blacklisted": "Bloqueado",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s mudou o tópico para \"%(topic)s\".",
     "Changes your display nickname": "Troca o seu apelido",
-    "Claimed Ed25519 fingerprint key": "Chave reivindicada da Impressão Digital Ed25519",
     "Click here to fix": "Clique aqui para resolver isso",
     "Commands": "Comandos",
     "Confirm password": "Confirme a nova senha",
     "Continue": "Continuar",
-    "Could not connect to the integration server": "Não foi possível conectar ao servidor de integrações",
     "Create Room": "Criar Sala",
     "Cryptography": "Criptografia",
     "Current password": "Senha atual",
-    "Curve25519 identity key": "Chave de Indetificação Curve25519",
     "Deactivate Account": "Desativar conta",
-    "Decryption error": "Erro de descriptografia",
     "Default": "Padrão",
     "Deops user with given id": "Retirar função de moderador do usuário com o identificador informado",
-    "Device ID": "Identificador do dispositivo",
     "Displays action": "Visualizar atividades",
-    "Ed25519 fingerprint": "Impressão Digital Ed25519",
     "Emoji": "Emoji",
-    "End-to-end encryption information": "Informação criptografada ponta-a-ponta",
     "Error": "Erro",
-    "Event information": "Informação do evento",
     "Export E2E room keys": "Exportar chaves ponta-a-ponta da sala",
     "Failed to change password. Is your password correct?": "Falha ao alterar a palavra-passe. A sua palavra-passe está correta?",
     "Failed to leave room": "Falha ao tentar deixar a sala",
@@ -55,7 +45,6 @@
     "Invites": "Convidar",
     "Invites user with given id to current room": "Convidar usuários com um dado identificador para esta sala",
     "Sign in with": "Quero entrar",
-    "Joins room with given alias": "Entra na sala com o nome informado",
     "Kicks user with given id": "Remove usuário com o identificador informado",
     "Labs": "Laboratório",
     "Leave room": "Sair da sala",
@@ -65,10 +54,8 @@
     "Moderator": "Moderador/a",
     "Name": "Nome",
     "New passwords must match each other.": "As novas senhas informadas precisam ser idênticas.",
-    "none": "nenhum",
     "Notifications": "Notificações",
     "<not supported>": "<não suportado>",
-    "NOT verified": "NÃO verificado",
     "No users have specific privileges in this room": "Nenhum/a usuário/a possui privilégios específicos nesta sala",
     "Only people who have been invited": "Apenas pessoas que tenham sido convidadas",
     "Password": "Senha",
@@ -83,7 +70,6 @@
     "Return to login screen": "Retornar à tela de login",
     "Room Colour": "Cores da sala",
     "Rooms": "Salas",
-    "Scroll to bottom of page": "Ir para o fim da página",
     "Searches DuckDuckGo for results": "Buscar por resultados no buscador DuckDuckGo",
     "Send Reset Email": "Enviar email 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.",
@@ -93,7 +79,6 @@
     "Sign in": "Entrar",
     "Sign out": "Sair",
     "Someone": "Alguém",
-    "Start a chat": "Começar uma conversa",
     "Success": "Sucesso",
     "The email address linked to your account must be entered.": "O endereço de email relacionado a sua conta precisa ser informado.",
     "This doesn't appear to be a valid email address": "Este não aparenta ser um endereço de email válido",
@@ -102,16 +87,11 @@
     "Unable to remove contact information": "Não foi possível remover informação de contato",
     "Unable to verify email address.": "Não foi possível verificar o endereço de email.",
     "Unban": "Desfazer banimento",
-    "unencrypted": "não criptografado",
-    "unknown device": "dispositivo desconhecido",
     "unknown error code": "código de erro desconhecido",
     "Upload avatar": "Enviar icone de perfil de usuário",
     "Upload file": "Enviar arquivo",
-    "User ID": "Identificador de Usuário",
     "Users": "Usuários",
     "Verification Pending": "Verificação pendente",
-    "Verification": "Verificação",
-    "verified": "verificado",
     "Video call": "Chamada de vídeo",
     "Voice call": "Chamada de voz",
     "VoIP conference finished.": "Conferência VoIP encerrada.",
@@ -176,8 +156,8 @@
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removeu o seu nome público (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s removeu sua imagem de perfil.",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s está solicitando uma conferência de voz.",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot não tem permissões para enviar notificações a você - por favor, verifique as configurações do seu navegador",
-    "Riot was not given permission to send notifications - please try again": "Riot não tem permissões para enviar notificações a você - por favor, tente novamente",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s não tem permissões para enviar notificações a você - por favor, verifique as configurações do seu navegador",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s não tem permissões para enviar notificações a você - por favor, tente novamente",
     "Room %(roomId)s not visible": "A sala %(roomId)s não está visível",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s enviou uma imagem.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s enviou um convite para %(targetDisplayName)s entrar na sala.",
@@ -226,7 +206,6 @@
     "Click to unmute audio": "Clique para retirar áudio do mudo",
     "Command error": "Erro de comando",
     "Decrypt %(text)s": "Descriptografar %(text)s",
-    "Direct chats": "Conversas pessoais",
     "Disinvite": "Desconvidar",
     "Download %(text)s": "Baixar %(text)s",
     "Failed to ban user": "Não foi possível banir o/a usuário/a",
@@ -237,19 +216,15 @@
     "Failed to mute user": "Não foi possível remover notificações da/do usuária/o",
     "Failed to reject invite": "Não foi possível rejeitar o convite",
     "Failed to set display name": "Houve falha ao definir o nome público",
-    "Failed to toggle moderator status": "Houve falha ao alterar o status de moderador/a",
     "Fill screen": "Tela cheia",
     "Incorrect verification code": "Código de verificação incorreto",
     "Join Room": "Ingressar na sala",
     "Jump to first unread message.": "Ir diretamente para a primeira das mensagens não lidas.",
     "Kick": "Remover",
-    "Local addresses for this room:": "Endereço local desta sala:",
-    "New address (e.g. #foo:%(localDomain)s)": "Novo endereço (p.ex: #algo:%(localDomain)s)",
     "not specified": "não especificado",
     "No more results": "Não há mais resultados",
     "No results": "Sem resultados",
     "OK": "OK",
-    "Revoke Moderator": "Retirar status de moderador",
     "Search": "Pesquisar",
     "Search failed": "Busca falhou",
     "Server error": "Erro no servidor",
@@ -260,11 +235,9 @@
     "This room has no local addresses": "Esta sala não tem endereços locais",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Tentei carregar um ponto específico na linha do tempo desta sala, mas parece que você não tem permissões para ver a mensagem em questão.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Tentei carregar um ponto específico na linha do tempo desta sala, mas não o encontrei.",
-    "Unknown room %(roomId)s": "A sala %(roomId)s é desconhecida",
     "You seem to be in a call, are you sure you want to quit?": "Parece que você está em uma chamada. Tem certeza que quer sair?",
     "You seem to be uploading files, are you sure you want to quit?": "Parece que você está enviando arquivos. Tem certeza que quer sair?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Você não poderá desfazer esta mudança, pois estará dando a este(a) usuário(a) o mesmo nível de permissões que você.",
-    "Make Moderator": "Tornar moderador(a)",
     "Room": "Sala",
     "Cancel": "Cancelar",
     "Ban": "Banir",
@@ -279,7 +252,7 @@
     "Mute": "Silenciar",
     "olm version:": "versão do olm:",
     "Operation failed": "A operação falhou",
-    "riot-web version:": "versão do riot-web:",
+    "%(brand)s version:": "versão do %(brand)s:",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Mostrar os horários em formato de 12h (p.ex: 2:30pm)",
     "Unmute": "Tirar do mudo",
     "Warning!": "Atenção!",
@@ -287,7 +260,7 @@
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s apagou o nome da sala.",
     "Analytics": "Análise",
     "Options": "Opções",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot coleta informações anônimas de uso para nos permitir melhorar o sistema.",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s coleta informações anônimas de uso para nos permitir melhorar o sistema.",
     "Passphrases must match": "As senhas têm que ser iguais",
     "Passphrase must not be empty": "A senha não pode estar vazia",
     "Export room keys": "Exportar chaves de sala",
@@ -305,15 +278,9 @@
     "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.": "Você tem certeza que quer apagar este evento? Note que se você apaga o nome de uma sala ou uma mudança de tópico, esta ação não poderá ser desfeita.",
     "Unknown error": "Erro desconhecido",
     "Incorrect password": "Senha incorreta",
-    "To continue, please enter your password.": "Para continuar, por favor insira a sua senha.",
-    "I verify that the keys match": "Eu confirmo que as chaves são iguais",
     "Unable to restore session": "Não foi possível restaurar a sessão",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Se você já usou antes uma versão mais recente do Riot, a sua sessão pode ser incompatível com esta versão. Feche esta janela e tente abrir com a versão mais recente.",
+    "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.": "Se você já usou antes uma versão mais recente do %(brand)s, a sua sessão pode ser incompatível com esta versão. Feche esta janela e tente abrir com a versão mais recente.",
     "Unknown Address": "Endereço desconhecido",
-    "Unblacklist": "Tirar da lista de bloqueados",
-    "Blacklist": "Colocar na lista de bloqueados",
-    "Unverify": "Des-verificar",
-    "Verify...": "Verificar...",
     "ex. @bob:example.com": "p.ex: @joao:exemplo.com",
     "Add User": "Adicionar usuária(o)",
     "Custom Server Options": "Opções para Servidor Personalizado",
@@ -327,7 +294,6 @@
     "Error decrypting image": "Erro ao descriptografar a imagem",
     "Error decrypting video": "Erro ao descriptografar o vídeo",
     "Add an Integration": "Adicionar uma integração",
-    "Removed or unknown message type": "Mensagem removida ou de tipo desconhecido",
     "URL Previews": "Pré-visualização de links",
     "Drop file here to upload": "Arraste um arquivo aqui para enviar",
     " (unsupported)": " (não suportado)",
@@ -344,8 +310,6 @@
     "Incorrect username and/or password.": "Nome de usuária(o) e/ou senha incorreto.",
     "Invited": "Convidada(o)",
     "Results from DuckDuckGo": "Resultados de DuckDuckGo",
-    "Unrecognised room alias:": "Apelido de sala não reconhecido:",
-    "Use compact timeline layout": "Usar o layout de linha do tempo compacta",
     "Verified key": "Chave verificada",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removeu a imagem da sala.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s alterou a imagem da sala %(roomName)s",
@@ -353,7 +317,7 @@
     "No Microphones detected": "Não foi detetado nenhum microfone",
     "No Webcams detected": "Não foi detetada nenhuma Webcam",
     "No media permissions": "Não há permissões para o uso de vídeo/áudio no seu navegador",
-    "You may need to manually permit Riot to access your microphone/webcam": "Você talvez precise autorizar manualmente que o Riot acesse seu microfone e webcam",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "Você talvez precise autorizar manualmente que o %(brand)s acesse seu microfone e webcam",
     "Default Device": "Dispositivo padrão",
     "Microphone": "Microfone",
     "Camera": "Câmera de vídeo",
@@ -361,13 +325,10 @@
     "Anyone": "Qualquer pessoa",
     "Are you sure you want to leave the room '%(roomName)s'?": "Você tem certeza que deseja sair da sala '%(roomName)s'?",
     "Custom level": "Nível personalizado",
-    "device id: ": "id do dispositivo: ",
     "Register": "Registre-se",
-    "Remote addresses for this room:": "Endereços remotos para esta sala:",
     "Save": "Salvar",
     "You have <a>disabled</a> URL previews by default.": "Você <a>desabilitou</a> pré-visualizações de links por padrão.",
     "You have <a>enabled</a> URL previews by default.": "Você <a>habilitou</a> pré-visualizações de links por padrão.",
-    "Send anyway": "Enviar de qualquer maneira",
     "This room": "Esta sala",
     "Create new room": "Criar nova sala",
     "No display name": "Sem nome público de usuária(o)",
@@ -380,7 +341,6 @@
     "Uploading %(filename)s and %(count)s others|zero": "Enviando o arquivo %(filename)s",
     "Admin Tools": "Ferramentas de administração",
     "Incoming video call from %(name)s": "Chamada de vídeo de %(name)s recebida",
-    "Alias (optional)": "Apelido (opcional)",
     "Active call (%(roomName)s)": "Chamada ativa (%(roomName)s)",
     "Error: Problem communicating with the given homeserver.": "Erro: problema de comunicação com o Servidor de Base fornecido.",
     "Failed to upload profile picture!": "Falha ao enviar a imagem de perfil!",
@@ -391,7 +351,6 @@
     "Drop File Here": "Arraste o arquivo aqui",
     "Seen by %(userName)s at %(dateTime)s": "Visto por %(userName)s em %(dateTime)s",
     "%(roomName)s does not exist.": "%(roomName)s não existe.",
-    "Enable Notifications": "Habilitar notificações",
     "Username not available": "Nome de usuária(o) indisponível",
     "(~%(count)s results)|other": "(~%(count)s resultados)",
     "unknown caller": "a pessoa que está chamando é desconhecida",
@@ -399,7 +358,6 @@
     "(~%(count)s results)|one": "(~%(count)s resultado)",
     "New Password": "Nova senha",
     "Username invalid: %(errMessage)s": "Nome de usuária(o) inválido: %(errMessage)s",
-    "Disable Notifications": "Desabilitar notificações",
     "Incoming voice call from %(name)s": "Chamada de voz de %(name)s recebida",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Se você já tem uma conta Matrix, pode também fazer <a>login</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.": "Não foi possível conectar ao Servidor de Base. Por favor, confira sua conectividade à internet, garanta que o <a>certificado SSL do Servidor de Base</a> é confiável, e que uma extensão do navegador não esteja bloqueando as requisições de rede.",
@@ -440,15 +398,11 @@
     "Failed to copy": "Falha ao copiar",
     "Check for update": "Procurar atualizações",
     "Your browser does not support the required cryptography extensions": "O seu browser não suporta as extensões de criptografia necessárias",
-    "Not a valid Riot keyfile": "Não é um ficheiro de chaves Riot válido",
+    "Not a valid %(brand)s keyfile": "Não é um ficheiro de chaves %(brand)s válido",
     "Authentication check failed: incorrect password?": "Erro de autenticação: palavra-passe incorreta?",
     "Do you want to set an email address?": "Deseja definir um endereço de e-mail?",
     "This will allow you to reset your password and receive notifications.": "Isto irá permitir-lhe redefinir a sua palavra-passe e receber notificações.",
     "Skip": "Saltar",
-    "Start verification": "Iniciar verificação",
-    "Share without verifying": "Partilhar sem verificar",
-    "Ignore request": "Ignorar pedido",
-    "Encryption key request": "Pedido de chave de encriptação",
     "Example": "Exemplo",
     "Create": "Criar",
     "Featured Rooms:": "Salas em destaque:",
@@ -459,7 +413,6 @@
     "%(widgetName)s widget removed by %(senderName)s": "Widget %(widgetName)s removido por %(senderName)s",
     "%(widgetName)s widget modified by %(senderName)s": "Widget %(widgetName)s modificado por %(senderName)s",
     "Ignore": "Ignorar",
-    "User Options": "Opções de Utilizador",
     "Ignored user": "Utilizador ignorado",
     "Description": "Descrição",
     "Leave": "Sair",
@@ -474,9 +427,7 @@
     "Stops ignoring a user, showing their messages going forward": "Deixa de ignorar um utilizador, mostrando as suas mensagens daqui para a frente",
     "Ignores a user, hiding their messages from you": "Ignora um utilizador, deixando de mostrar as mensagens dele",
     "Banned by %(displayName)s": "Banido por %(displayName)s",
-    "Message removed by %(userId)s": "Mensagem removida por %(userId)s",
     "Fetching third party location failed": "Falha ao obter localização de terceiros",
-    "A new version of Riot is available.": "Uma nova versão do Riot está disponível.",
     "I understand the risks and wish to continue": "Entendo os riscos e pretendo continuar",
     "Advanced notification settings": "Configurações avançadas de notificação",
     "Uploading report": "A enviar o relatório",
@@ -496,8 +447,6 @@
     "Uploaded on %(date)s by %(user)s": "Enviada em %(date)s por %(user)s",
     "Send Custom Event": "Enviar evento personalizado",
     "All notifications are currently disabled for all targets.": "Todas as notificações estão atualmente desativadas para todos os casos.",
-    "delete the alias.": "apagar o apelido da sala.",
-    "To return to your account in future you need to <u>set a password</u>": "Para voltar à sua conta no futuro, necessita de <u>definir uma palavra-passe</u>",
     "Forget": "Esquecer",
     "World readable": "Público",
     "You cannot delete this image. (%(code)s)": "Não pode apagar esta imagem. (%(code)s)",
@@ -525,7 +474,6 @@
     "Noisy": "Barulhento",
     "Files": "Ficheiros",
     "Collecting app version information": "A recolher informação da versão da app",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Apagar o apelido %(alias)s da sala e remover %(name)s da lista pública?",
     "Keywords": "Palavras-chave",
     "Enable notifications for this account": "Ativar notificações para esta conta",
     "Messages containing <span>keywords</span>": "Mensagens contendo <span>palavras-chave</span>",
@@ -534,7 +482,7 @@
     "Enter keywords separated by a comma:": "Insira palavras-chave separadas por vírgula:",
     "Search…": "Pesquisar…",
     "Remove %(name)s from the directory?": "Remover %(name)s da lista pública de salas?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "O Riot usa muitas funcionalidades avançadas do navegador, algumas das quais não estão disponíveis ou ainda são experimentais no seu navegador atual.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "O %(brand)s usa muitas funcionalidades avançadas do navegador, algumas das quais não estão disponíveis ou ainda são experimentais no seu navegador atual.",
     "Developer Tools": "Ferramentas de desenvolvedor",
     "Unnamed room": "Sala sem nome",
     "Remove from Directory": "Remover da lista pública de salas",
@@ -573,8 +521,7 @@
     "Back": "Voltar",
     "Unhide Preview": "Mostrar a pré-visualização novamente",
     "Unable to join network": "Não foi possível juntar-se à rede",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Pode ter configurado num outro cliente sem ser o Riot. Não pode ajustá-las no Riot, mas ainda assim elas aplicam-se",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Desculpe, o seu navegador <b>não</b> é capaz de executar o Riot.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Desculpe, o seu navegador <b>não</b> é capaz de executar o %(brand)s.",
     "Messages in group chats": "Mensagens em salas",
     "Yesterday": "Ontem",
     "Error encountered (%(errorDetail)s).": "Erro encontrado (%(errorDetail)s).",
@@ -582,7 +529,7 @@
     "Unable to fetch notification target list": "Não foi possível obter a lista de alvos de notificação",
     "Set Password": "Definir palavra-passe",
     "Off": "Desativado",
-    "Riot does not know how to join a room on this network": "O Riot não sabe como entrar numa sala nesta rede",
+    "%(brand)s does not know how to join a room on this network": "O %(brand)s não sabe como entrar numa sala nesta rede",
     "Mentions only": "Apenas menções",
     "Failed to remove tag %(tagName)s from room": "Não foi possível remover a marcação %(tagName)s desta sala",
     "Wednesday": "Quarta-feira",
@@ -599,37 +546,28 @@
     "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!": "Com o seu navegador atual, a aparência e sensação de uso da aplicação podem estar completamente incorretas, e algumas das funcionalidades poderão não funcionar. Se quiser tentar de qualquer maneira pode continuar, mas  está por sua conta com algum problema que possa encontrar!",
     "Checking for an update...": "A procurar uma atualização...",
-    "There are advanced notifications which are not shown here": "Existem notificações avançadas que não são exibidas aqui",
     "Add Email Address": "Adicione adresso de e-mail",
     "Add Phone Number": "Adicione número de telefone",
     "The platform you're on": "A plataforma em que se encontra",
-    "The version of Riot.im": "A versão do RIOT.im",
+    "The version of %(brand)s": "A versão do %(brand)s",
     "Whether or not you're logged in (we don't record your username)": "Tenha ou não, iniciado sessão (não iremos guardar o seu nome de utilizador)",
     "Your language of choice": "O seu idioma que escolheu",
     "Which officially provided instance you are using, if any": "Qual instância oficial está utilizando, se for o caso",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Se está a usar o modo de texto enriquecido do editor de texto enriquecido",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Se usa a funcionalidade 'breadcrumbs' (avatares em cima da lista de salas",
     "Your homeserver's URL": "O URL do seu servidor de início",
-    "Your identity server's URL": "O URL do seu servidor de identidade",
     "e.g. %(exampleValue)s": "ex. %(exampleValue)s",
     "Every page you use in the app": "Todas as páginas que usa na aplicação",
     "e.g. <CurrentPageURL>": "ex. <CurrentPageURL>",
-    "Your User Agent": "O seu Agente de Utilizador",
     "Your device resolution": "A resolução do seu dispositivo",
-    "The information being sent to us to help make Riot.im better includes:": "As informações que estão sendo enviadas para ajudar a melhorar o Riot.im incluem:",
+    "The information being sent to us to help make %(brand)s better includes:": "As informações que estão sendo enviadas para ajudar a melhorar o %(brand)s incluem:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Quando esta página contém informação de que permitam a sua identificação, como uma sala, ID de utilizador ou de grupo, estes dados são removidos antes de serem enviados ao servidor.",
     "Call Failed": "A chamada falhou",
-    "Review Devices": "Rever dispositivos",
-    "Call Anyway": "Ligar na mesma",
-    "Answer Anyway": "Responder na mesma",
-    "Call": "Ligar",
-    "Answer": "Responder",
     "Call failed due to misconfigured server": "Chamada falhada devido a um erro de configuração do servidor",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Peça ao administrador do seu servidor inicial (<code>%(homeserverDomain)s</code>) de configurar um servidor TURN para que as chamadas funcionem fiavelmente.",
     "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, pode tentar usar o servidor público em <code>turn.matrix.org</code>, mas não será tão fiável e partilhará o seu IP com esse servidor. Também pode gerir isso nas definições.",
     "Try using turn.matrix.org": "Tente utilizar turn.matrix.org",
-    "The version of Riot": "A versão do Riot",
-    "Whether you're using Riot on a device where touch is the primary input mechanism": "Quer esteja a usar o Riot num dispositivo onde o touch é o mecanismo de entrada primário",
-    "Whether you're using Riot as an installed Progressive Web App": "Quer esteja a usar o Riot como uma Progressive Web App (PWA)",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Quer esteja a usar o %(brand)s num dispositivo onde o touch é o mecanismo de entrada primário",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Quer esteja a usar o %(brand)s como uma Progressive Web App (PWA)",
     "Your user agent": "O seu user agent"
 }
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 97245ef025..4ed4ca1175 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -2,44 +2,34 @@
     "Account": "Conta",
     "Admin": "Administrador/a",
     "Advanced": "Avançado",
-    "Algorithm": "Algoritmo",
     "New passwords don't match": "As novas senhas não conferem",
-    "A new password must be entered.": "Uma nova senha precisa ser informada.",
+    "A new password must be entered.": "Uma nova senha precisa ser inserida.",
     "Anyone who knows the room's link, apart from guests": "Qualquer pessoa que tenha o link da sala, exceto visitantes",
     "Anyone who knows the room's link, including guests": "Qualquer pessoa que tenha o link da sala, incluindo visitantes",
-    "Are you sure you want to reject the invitation?": "Você tem certeza que deseja rejeitar este convite?",
-    "Banned users": "Usuárias/os banidas/os",
-    "Bans user with given id": "Banir usuários com o identificador informado",
-    "Blacklisted": "Bloqueado",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s mudou o tópico para \"%(topic)s\".",
-    "Changes your display nickname": "Troca o seu apelido",
-    "Claimed Ed25519 fingerprint key": "Chave reivindicada da Impressão Digital Ed25519",
+    "Are you sure you want to reject the invitation?": "Tem certeza de que deseja recusar o convite?",
+    "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",
     "Click here to fix": "Clique aqui para resolver isso",
     "Commands": "Comandos",
     "Confirm password": "Confirme a nova senha",
     "Continue": "Continuar",
-    "Could not connect to the integration server": "Não foi possível conectar ao servidor de integrações",
     "Create Room": "Criar Sala",
     "Cryptography": "Criptografia",
     "Current password": "Senha atual",
-    "Curve25519 identity key": "Chave de Indetificação Curve25519",
-    "Deactivate Account": "Desativar conta",
-    "Decryption error": "Erro de descriptografia",
+    "Deactivate Account": "Desativar minha conta",
     "Default": "Padrão",
     "Deops user with given id": "Retirar função de moderador do usuário com o identificador informado",
-    "Device ID": "Identificador do dispositivo",
     "Displays action": "Visualizar atividades",
-    "Ed25519 fingerprint": "Impressão Digital Ed25519",
     "Emoji": "Emoji",
-    "End-to-end encryption information": "Informação criptografada ponta-a-ponta",
     "Error": "Erro",
-    "Event information": "Informação do evento",
     "Export E2E room keys": "Exportar chaves ponta-a-ponta da sala",
-    "Failed to change password. Is your password correct?": "Não foi possível mudar a senha. A sua senha está correta?",
+    "Failed to change password. Is your password correct?": "Não foi possível alterar a senha. A sua senha está correta?",
     "Failed to leave room": "Falha ao tentar deixar a sala",
-    "Failed to reject invitation": "Falha ao tentar rejeitar convite",
-    "Failed to unban": "Não foi possível desfazer o banimento",
-    "Favourite": "Favorito",
+    "Failed to reject invitation": "Falha ao tentar recusar o convite",
+    "Failed to unban": "Não foi possível remover o banimento",
+    "Favourite": "Favoritar",
     "Favourites": "Favoritos",
     "Filter room members": "Filtrar integrantes da sala",
     "Forget room": "Esquecer sala",
@@ -49,14 +39,13 @@
     "Historical": "Histórico",
     "Homeserver is": "Servidor padrão é",
     "Identity Server is": "O servidor de identificação é",
-    "I have verified my email address": "Eu verifiquei o meu endereço de email",
+    "I have verified my email address": "Eu verifiquei o meu endereço de e-mail",
     "Import E2E room keys": "Importar chave de criptografia ponta-a-ponta (E2E) da sala",
-    "Invalid Email Address": "Endereço de email inválido",
+    "Invalid Email Address": "Endereço de e-mail inválido",
     "Invites": "Convidar",
-    "Invites user with given id to current room": "Convidar usuários com um dado identificador para esta sala",
-    "Sign in with": "Quero entrar",
-    "Joins room with given alias": "Entra na sala com o nome informado",
-    "Kicks user with given id": "Remove usuário com o identificador informado",
+    "Invites user with given id to current room": "Convida o usuário com o ID especificado para esta sala",
+    "Sign in with": "Entrar com",
+    "Kicks user with given id": "Remover o usuário com o ID informado",
     "Labs": "Laboratório",
     "Leave room": "Sair da sala",
     "Logout": "Sair",
@@ -65,27 +54,24 @@
     "Moderator": "Moderador/a",
     "Name": "Nome",
     "New passwords must match each other.": "As novas senhas informadas precisam ser idênticas.",
-    "none": "nenhum",
     "Notifications": "Notificações",
     "<not supported>": "<não suportado>",
-    "NOT verified": "NÃO verificado",
-    "No users have specific privileges in this room": "Nenhum/a usuário/a possui privilégios específicos nesta sala",
+    "No users have specific privileges in this room": "Nenhum usuário possui privilégios específicos nesta sala",
     "Only people who have been invited": "Apenas pessoas que tenham sido convidadas",
     "Password": "Senha",
     "Passwords can't be empty": "As senhas não podem estar em branco",
     "Permissions": "Permissões",
     "Phone": "Telefone",
-    "Please check your email and click on the link it contains. Once this is done, click continue.": "Por favor verifique seu email e clique no link enviado. Quando finalizar este processo, clique para continuar.",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Por favor, verifique o seu e-mail e clique no link enviado. Feito isso, clique em continuar.",
     "Privileged Users": "Usuárias/os privilegiadas/os",
     "Profile": "Perfil",
-    "Reject invitation": "Rejeitar convite",
-    "Remove": "Remover",
+    "Reject invitation": "Recusar o convite",
+    "Remove": "Apagar",
     "Return to login screen": "Retornar à tela de login",
     "Room Colour": "Cores da sala",
     "Rooms": "Salas",
-    "Scroll to bottom of page": "Ir para o fim da página",
     "Searches DuckDuckGo for results": "Buscar por resultados no buscador DuckDuckGo",
-    "Send Reset Email": "Enviar email para redefinição de senha",
+    "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",
     "Settings": "Configurações",
@@ -93,29 +79,23 @@
     "Sign in": "Entrar",
     "Sign out": "Sair",
     "Someone": "Alguém",
-    "Start a chat": "Começar uma conversa",
     "Success": "Sucesso",
-    "The email address linked to your account must be entered.": "O endereço de email relacionado a sua conta precisa ser informado.",
-    "This doesn't appear to be a valid email address": "Este não aparenta ser um endereço de email válido",
+    "The email address linked to your account must be entered.": "O e-mail vinculado à sua conta precisa ser informado.",
+    "This doesn't appear to be a valid email address": "Este não aparenta ser um endereço de e-mail válido",
     "This room is not accessible by remote Matrix servers": "Esta sala não é acessível para servidores Matrix remotos",
-    "Unable to add email address": "Não foi possível adicionar endereço de email",
+    "Unable to add email address": "Não foi possível adicionar um endereço de e-mail",
     "Unable to remove contact information": "Não foi possível remover informação de contato",
-    "Unable to verify email address.": "Não foi possível verificar o endereço de email.",
-    "Unban": "Desfazer banimento",
-    "unencrypted": "não criptografado",
-    "unknown device": "dispositivo desconhecido",
+    "Unable to verify email address.": "Não foi possível verificar o endereço de e-mail.",
+    "Unban": "Remover banimento",
     "unknown error code": "código de erro desconhecido",
-    "Upload avatar": "Enviar uma imagem de perfil",
+    "Upload avatar": "Enviar uma foto de perfil",
     "Upload file": "Enviar arquivo",
-    "User ID": "Identificador de Usuário",
     "Users": "Usuários",
     "Verification Pending": "Verificação pendente",
-    "Verification": "Verificação",
-    "verified": "verificado",
     "Video call": "Chamada de vídeo",
     "Voice call": "Chamada de voz",
-    "VoIP conference finished.": "Conferência VoIP encerrada.",
-    "VoIP conference started.": "Conferência VoIP iniciada.",
+    "VoIP conference finished.": "Chamada em grupo encerrada.",
+    "VoIP conference started.": "Chamada em grupo iniciada.",
     "Who can access this room?": "Quem pode acessar esta sala?",
     "Who can read history?": "Quem pode ler o histórico da sala?",
     "You do not have permission to post to this room": "Você não tem permissão de postar nesta sala",
@@ -143,19 +123,19 @@
     "%(weekDayName)s %(time)s": "%(weekDayName)s às %(time)s",
     "%(targetName)s accepted an invitation.": "%(targetName)s aceitou um convite.",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s aceitou o convite para %(displayName)s.",
-    "%(senderName)s answered the call.": "%(senderName)s atendeu à chamada.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s removeu %(targetName)s da sala.",
+    "%(senderName)s answered the call.": "%(senderName)s aceitou a chamada.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s baniu %(targetName)s.",
     "Call Timeout": "Tempo esgotado. Chamada encerrada",
-    "%(senderName)s changed their profile picture.": "%(senderName)s alterou sua imagem de perfil.",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s alterou o nível de permissões de %(powerLevelDiffText)s.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s alterou a foto de perfil.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s alterou o nível de permissão de %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s alterou o nome da sala para %(roomName)s.",
     "click to reveal": "clique para ver",
     "/ddg is not a command": "/ddg não é um comando",
-    "%(senderName)s ended the call.": "%(senderName)s finalizou a chamada.",
+    "%(senderName)s ended the call.": "%(senderName)s encerrou a chamada.",
     "Existing Call": "Chamada em andamento",
-    "Failed to send email": "Não foi possível enviar email",
+    "Failed to send email": "Não foi possível enviar e-mail",
     "Failed to send request.": "Não foi possível mandar requisição.",
-    "Failed to verify email address: make sure you clicked the link in the email": "Não foi possível verificar o endereço de email: verifique se você realmente clicou no link que está no seu email",
+    "Failed to verify email address: make sure you clicked the link in the email": "Falha ao verificar o endereço de e-mail: certifique-se de clicar no link do e-mail",
     "Failure to create room": "Não foi possível criar a sala",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s para %(toPowerLevel)s",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s convidou %(targetName)s.",
@@ -170,86 +150,81 @@
     "Missing room_id in request": "Faltou o id da sala na requisição",
     "Missing user_id in request": "Faltou o id de usuário na requisição",
     "(not supported by this browser)": "(não é compatível com este navegador)",
-    "Power level must be positive integer.": "O nível de permissões tem que ser um número inteiro e positivo.",
+    "Power level must be positive integer.": "O nível de permissão precisa ser um número inteiro e positivo.",
     "Reason": "Razão",
     "%(targetName)s rejected the invitation.": "%(targetName)s recusou o convite.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removeu o seu nome público (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s removeu sua imagem de perfil.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s está solicitando uma conferência de voz.",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot não tem permissões para enviar notificações a você - por favor, verifique as configurações do seu navegador",
-    "Riot was not given permission to send notifications - please try again": "Riot não tem permissões para enviar notificações a você - por favor, tente novamente",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removeu o nome e sobrenome (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s removeu a foto de perfil.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s deseja iniciar uma chamada em grupo.",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s não tem permissão para lhe enviar notificações - verifique as configurações do seu navegador",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s não tem permissão para lhe enviar notificações - tente novamente",
     "Room %(roomId)s not visible": "A sala %(roomId)s não está visível",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s enviou uma imagem.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s enviou um convite para %(targetDisplayName)s entrar na sala.",
-    "%(senderName)s set a profile picture.": "%(senderName)s definiu uma imagem de perfil.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s definiu seu nome público para %(displayName)s.",
-    "This email address is already in use": "Este endereço de email já está sendo usado",
-    "This email address was not found": "Este endereço de email não foi encontrado",
-    "The remote side failed to pick up": "Houve alguma falha que não permitiu a outra pessoa atender à chamada",
+    "%(senderName)s set a profile picture.": "%(senderName)s definiu uma foto de perfil.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s definiu o nome e sobrenome para %(displayName)s.",
+    "This email address is already in use": "Este endereço de e-mail já está em uso",
+    "This email address was not found": "Este endereço de e-mail não foi encontrado",
+    "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á sendo usado",
-    "To use it, just wait for autocomplete results to load and tab through them.": "Para usar esta funcionalidade, espere o carregamento dos resultados de autocompletar e então escolha entre as opções.",
-    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s desfez o banimento de %(targetName)s.",
+    "To use it, just wait for autocomplete results to load and tab through them.": "Para usar esta funcionalidade, aguarde o carregamento dos resultados de autocompletar e então escolha entre 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",
     "Upload Failed": "O envio falhou",
     "Usage": "Uso",
-    "VoIP is unsupported": "Chamada de voz não permitida",
+    "VoIP is unsupported": "Chamadas de voz não são suportadas",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s desfez o convite a %(targetName)s.",
     "You are already in a call.": "Você já está em uma chamada.",
-    "You cannot place a call with yourself.": "Você não pode iniciar uma chamada.",
-    "You cannot place VoIP calls in this browser.": "Você não pode fazer chamadas de voz neste navegador.",
-    "You need to be able to invite users to do that.": "Para fazer isso, você tem que ter permissão para convidar outras pessoas.",
-    "You need to be logged in.": "Você tem que estar logado.",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "O seu endereço de email não parece estar associado a uma conta de usuária/o Matrix neste servidor.",
-    "Set a display name:": "Defina um nome público para você:",
-    "Upload an avatar:": "Envie uma imagem de perfil para identificar você:",
+    "You cannot place a call with yourself.": "Você não pode iniciar uma chamada consigo mesmo.",
+    "You cannot place VoIP calls in this browser.": "Chamadas de voz não são suportadas neste navegador.",
+    "You need to be able to invite users to do that.": "Para fazer isso, precisa ter permissão para convidar outras pessoas.",
+    "You need to be logged in.": "Você precisa estar logado.",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "O seu endereço de e-mail não parece estar associado a uma conta de usuária/o Matrix neste servidor.",
+    "Set a display name:": "Defina um nome e sobrenome:",
+    "Upload an avatar:": "Enviar uma foto de perfil:",
     "This server does not support authentication with a phone number.": "Este servidor não permite a autenticação através de números de telefone.",
     "An error occurred: %(error_string)s": "Um erro ocorreu: %(error_string)s",
     "There are no visible files in this room": "Não há arquivos públicos nesta sala",
     "Connectivity to the server has been lost.": "A conexão com o servidor foi perdida. Verifique sua conexão de internet.",
     "Sent messages will be stored until your connection has returned.": "Imagens enviadas ficarão armazenadas até que sua conexão seja reestabelecida.",
-    "Active call": "Chamada ativa",
+    "Active call": "Chamada em andamento",
     "Failed to forget room %(errCode)s": "Falhou ao esquecer a sala %(errCode)s",
     "%(items)s and %(lastItem)s": "%(items)s e %(lastItem)s",
     "and %(count)s others...|one": "e um outro...",
     "and %(count)s others...|other": "e %(count)s outros...",
     "Are you sure?": "Você tem certeza?",
     "Attachment": "Anexo",
-    "Autoplay GIFs and videos": "Reproduzir automaticamente GIFs e videos",
+    "Autoplay GIFs and videos": "Reproduzir GIFs e vídeos automaticamente",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s de %(monthName)s de %(fullYear)s às %(time)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>.": "Não consigo conectar ao servidor padrão através de HTTP quando uma URL HTTPS está na barra de endereços do seu navegador. Use HTTPS ou então <a>habilite scripts não seguros no seu navegador</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>.": "Uma conexão com o servidor local via HTTP não pode ser estabelecida se a barra de endereços do navegador contiver um endereço HTTPS. Use HTTPS ou, em vez disso, permita ao navegador executar <a>scripts não seguros</a>.",
     "Change Password": "Alterar senha",
     "Click to mute audio": "Clique para colocar o áudio no mudo",
-    "Click to mute video": "Clique para desabilitar imagens de vídeo",
-    "Click to unmute video": "Clique para voltar a mostrar imagens de vídeo",
+    "Click to mute video": "Clique para desativar o som do vídeo",
+    "Click to unmute video": "Clique para ativar o som do vídeo",
     "Click to unmute audio": "Clique para retirar áudio do mudo",
     "Command error": "Erro de comando",
     "Decrypt %(text)s": "Descriptografar %(text)s",
-    "Direct chats": "Conversas pessoais",
     "Disinvite": "Desconvidar",
     "Download %(text)s": "Baixar %(text)s",
-    "Failed to ban user": "Não foi possível banir o/a usuário/a",
-    "Failed to change power level": "Não foi possível mudar o nível de permissões",
+    "Failed to ban user": "Não foi possível banir o usuário",
+    "Failed to change power level": "Não foi possível alterar o nível de permissão",
     "Failed to join room": "Não foi possível ingressar na sala",
-    "Failed to kick": "Não foi possível remover usuária/o",
+    "Failed to kick": "Não foi possível remover o usuário",
     "Failed to load timeline position": "Não foi possível carregar a posição na linha do tempo",
     "Failed to mute user": "Não foi possível remover notificações da/do usuária/o",
-    "Failed to reject invite": "Não foi possível rejeitar o convite",
-    "Failed to set display name": "Houve falha ao definir o nome público",
-    "Failed to toggle moderator status": "Houve falha ao alterar o status de moderador/a",
+    "Failed to reject invite": "Não foi possível recusar o convite",
+    "Failed to set display name": "Falha ao definir o nome e sobrenome",
     "Fill screen": "Tela cheia",
     "Incorrect verification code": "Código de verificação incorreto",
     "Join Room": "Ingressar na sala",
     "Jump to first unread message.": "Ir diretamente para a primeira das mensagens não lidas.",
-    "Kick": "Remover",
-    "Local addresses for this room:": "Endereço local desta sala:",
-    "New address (e.g. #foo:%(localDomain)s)": "Novo endereço (p.ex: #algo:%(localDomain)s)",
+    "Kick": "Remover da sala",
     "not specified": "não especificado",
     "No more results": "Não há mais resultados",
-    "No results": "Sem resultados",
+    "No results": "Nenhum resultado",
     "OK": "Ok",
-    "Revoke Moderator": "Retirar status de moderador",
     "Search": "Buscar",
     "Search failed": "Busca falhou",
     "Server error": "Erro no servidor",
@@ -260,26 +235,24 @@
     "This room has no local addresses": "Esta sala não tem endereços locais",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Tentei carregar um ponto específico na linha do tempo desta sala, mas parece que você não tem permissões para ver a mensagem em questão.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Tentei carregar um ponto específico na linha do tempo desta sala, mas não o encontrei.",
-    "Unknown room %(roomId)s": "A sala %(roomId)s é desconhecida",
     "You seem to be in a call, are you sure you want to quit?": "Parece que você está em uma chamada. Tem certeza que quer sair?",
     "You seem to be uploading files, are you sure you want to quit?": "Parece que você está enviando arquivos. Tem certeza que quer sair?",
-    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Você não poderá desfazer esta mudança, pois estará dando a este(a) usuário(a) o mesmo nível de permissões que você.",
-    "Make Moderator": "Tornar moderador(a)",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Você não poderá desfazer essa alteração, pois está promovendo o usuário ao mesmo nível de permissão que você.",
     "Room": "Sala",
     "Cancel": "Cancelar",
-    "Ban": "Banir",
+    "Ban": "Banir da sala",
     "Access Token:": "Token de acesso:",
     "Always show message timestamps": "Sempre mostrar as datas das mensagens",
     "Authentication": "Autenticação",
     "An error has occurred.": "Ocorreu um erro.",
-    "Email": "Email",
-    "Email address": "Endereço de email",
+    "Email": "E-mail",
+    "Email address": "Endereço de e-mail",
     "Error decrypting attachment": "Erro ao descriptografar o anexo",
     "Invalid file%(extra)s": "Arquivo inválido %(extra)s",
     "Mute": "Mudo",
     "olm version:": "versão do olm:",
     "Operation failed": "A operação falhou",
-    "riot-web version:": "versão do riot-web:",
+    "%(brand)s version:": "versão do %(brand)s:",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Mostrar os horários em formato de 12h (p.ex: 2:30pm)",
     "Unmute": "Tirar do mudo",
     "Warning!": "Atenção!",
@@ -287,9 +260,9 @@
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s apagou o nome da sala.",
     "Analytics": "Análise",
     "Options": "Opções",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot coleta informações anônimas de uso para nos permitir melhorar o sistema.",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s coleta informações anônimas de uso para nos permitir melhorar o sistema.",
     "Passphrases must match": "As senhas têm que ser iguais",
-    "Passphrase must not be empty": "A senha não pode estar vazia",
+    "Passphrase must not be empty": "A frase não pode estar em branco",
     "Export room keys": "Exportar chaves de sala",
     "Enter passphrase": "Entre com a senha",
     "Confirm passphrase": "Confirme a senha",
@@ -298,27 +271,21 @@
     "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 processo permite que você exporte as chaves para mensagens que você recebeu em salas criptografadas para um arquivo local. Você poderá então importar o arquivo para outro cliente Matrix no futuro, de modo que este cliente também poderá descriptografar suas mensagens.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "O arquivo exportado será protegido com uma senha. Você deverá inserir a senha aqui para poder descriptografar o arquivo futuramente.",
     "You must join the room to see its files": "Você precisa ingressar na sala para ver seus arquivos",
-    "Reject all %(invitedRooms)s invites": "Rejeitar todos os %(invitedRooms)s convites",
+    "Reject all %(invitedRooms)s invites": "Recusar todos os %(invitedRooms)s convites",
     "Failed to invite": "Falha ao enviar o convite",
     "Failed to invite the following users to the %(roomName)s room:": "Falha ao convidar as(os) seguintes usuárias(os) para a sala %(roomName)s:",
     "Confirm Removal": "Confirmar a remoção",
-    "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.": "Você tem certeza que quer apagar este evento? Note que se você apaga o nome de uma sala ou uma mudança de tópico, esta ação não poderá ser desfeita.",
+    "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.": "Tem certeza de que deseja apagar este evento? Observe que, se você apagar a alteração do nome ou descrição de uma sala, isso reverterá a alteração.",
     "Unknown error": "Erro desconhecido",
     "Incorrect password": "Senha incorreta",
-    "To continue, please enter your password.": "Para continuar, por favor insira a sua senha.",
-    "I verify that the keys match": "Eu confirmo que as chaves são iguais",
     "Unable to restore session": "Não foi possível restaurar a sessão",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Se você já usou antes uma versão mais recente do Riot, a sua sessão pode ser incompatível com esta versão. Feche esta janela e tente abrir com a versão mais recente.",
+    "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.": "Se você já usou antes uma versão mais recente do %(brand)s, a sua sessão pode ser incompatível com esta versão. Feche esta janela e tente abrir com a versão mais recente.",
     "Unknown Address": "Endereço desconhecido",
-    "Unblacklist": "Tirar da lista de bloqueados",
-    "Blacklist": "Colocar na lista de bloqueados",
-    "Unverify": "Des-verificar",
-    "Verify...": "Verificar...",
     "ex. @bob:example.com": "p.ex: @joao:exemplo.com",
     "Add User": "Adicionar usuária(o)",
     "Custom Server Options": "Opções para Servidor Personalizado",
     "Dismiss": "Descartar",
-    "Please check your email to continue registration.": "Por favor, verifique o seu e-mail para continuar o processo de registro.",
+    "Please check your email to continue registration.": "Por favor, verifique o seu e-mail para continuar a inscrição.",
     "Token incorrect": "Token incorreto",
     "Please enter the code it contains:": "Por favor, entre com o código que está na mensagem:",
     "powered by Matrix": "oferecido por Matrix",
@@ -327,89 +294,80 @@
     "Error decrypting image": "Erro ao descriptografar a imagem",
     "Error decrypting video": "Erro ao descriptografar o vídeo",
     "Add an Integration": "Adicionar uma integração",
-    "Removed or unknown message type": "Mensagem removida ou de tipo desconhecido",
     "URL Previews": "Pré-visualização de links",
     "Drop file here to upload": "Arraste um arquivo aqui para enviar",
     " (unsupported)": " (não suportado)",
-    "Ongoing conference call%(supportedText)s.": "Conferência%(supportedText)s em andamento.",
+    "Ongoing conference call%(supportedText)s.": "Chamada em grupo em andamento%(supportedText)s.",
     "Online": "Conectada/o",
     "Idle": "Ocioso",
-    "Offline": "Offline",
+    "Offline": "Desconectado",
     "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",
-    "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?": "Você será levado agora a um site de terceiros para poder autenticar a sua conta para uso com o serviço %(integrationsUrl)s. Você quer continuar?",
+    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Você será redirecionado para um site de terceiros para poder autenticar a sua conta, tendo em vista usar o serviço %(integrationsUrl)s. Deseja prosseguir?",
     "Export": "Exportar",
     "Import": "Importar",
-    "Incorrect username and/or password.": "Nome de usuária(o) e/ou senha incorreto.",
+    "Incorrect username and/or password.": "Nome de usuário e/ou senha incorreto.",
     "Invited": "Convidada(o)",
     "Results from DuckDuckGo": "Resultados de DuckDuckGo",
-    "Unrecognised room alias:": "Apelido de sala não reconhecido:",
-    "Use compact timeline layout": "Usar o layout de linha do tempo compacta",
     "Verified key": "Chave verificada",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removeu a imagem da sala.",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s alterou a imagem da sala %(roomName)s",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s alterou a imagem da sala para <img/>",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removeu a foto da sala.",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s alterou a foto da sala %(roomName)s",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s alterou a foto da sala para <img/>",
     "No Microphones detected": "Não foi detectado nenhum microfone",
-    "No Webcams detected": "Não foi detectada nenhuma Webcam",
+    "No Webcams detected": "Nenhuma câmera detectada",
     "No media permissions": "Não há permissões de uso de vídeo/áudio no seu navegador",
-    "You may need to manually permit Riot to access your microphone/webcam": "Você talvez precise autorizar manualmente que o Riot acesse seu microfone e webcam",
-    "Default Device": "Dispositivo padrão",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "Pode ser necessário permitir manualmente ao %(brand)s acessar seu microfone ou sua câmera",
+    "Default Device": "Aparelho padrão",
     "Microphone": "Microfone",
-    "Camera": "Câmera de vídeo",
-    "Add a topic": "Adicionar um tópico",
+    "Camera": "Câmera",
+    "Add a topic": "Adicionar uma descrição",
     "Anyone": "Qualquer pessoa",
-    "Are you sure you want to leave the room '%(roomName)s'?": "Você tem certeza que deseja sair da sala '%(roomName)s'?",
+    "Are you sure you want to leave the room '%(roomName)s'?": "Tem certeza de que deseja sair da sala '%(roomName)s'?",
     "Custom level": "Nível personalizado",
-    "device id: ": "id do dispositivo: ",
     "Register": "Registre-se",
-    "Remote addresses for this room:": "Endereços remotos para esta sala:",
     "Save": "Salvar",
-    "You have <a>disabled</a> URL previews by default.": "Você <a>desabilitou</a> pré-visualizações de links por padrão.",
-    "You have <a>enabled</a> URL previews by default.": "Você <a>habilitou</a> pré-visualizações de links por padrão.",
+    "You have <a>disabled</a> URL previews by default.": "Você <a>desativou</a> pré-visualizações de links por padrão.",
+    "You have <a>enabled</a> URL previews by default.": "Você <a>ativou</a> pré-visualizações de links por padrão.",
     "Add": "Adicionar",
     "Error: Problem communicating with the given homeserver.": "Erro: problema de comunicação com o Servidor de Base fornecido.",
-    "Failed to fetch avatar URL": "Falha ao obter a URL da imagem de perfil",
+    "Failed to fetch avatar URL": "Falha ao obter o link da foto de perfil",
     "Home": "Início",
     "The phone number entered looks invalid": "O número de telefone inserido parece ser inválido",
     "Uploading %(filename)s and %(count)s others|zero": "Enviando o arquivo %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Enviando o arquivo %(filename)s e %(count)s outros arquivos",
     "Uploading %(filename)s and %(count)s others|other": "Enviando o arquivo %(filename)s e %(count)s outros arquivos",
-    "Username invalid: %(errMessage)s": "Nome de usuária(o) inválido: %(errMessage)s",
+    "Username invalid: %(errMessage)s": "Nome de usuário inválido: %(errMessage)s",
     "You must <a>register</a> to use this functionality": "Você deve <a>se registrar</a> para poder usar esta funcionalidade",
     "Create new room": "Criar nova sala",
     "Room directory": "Lista pública de salas",
     "Start chat": "Iniciar conversa",
     "New Password": "Nova senha",
-    "Username available": "Nome de usuária(o) disponível",
-    "Username not available": "Nome de usuária(o) indisponível",
-    "Something went wrong!": "Algo deu errado!",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Este será seu nome de conta no Servidor de Base <span></span>, ou então você pode escolher um <a>servidor diferente</a>.",
+    "Username available": "Nome de usuário disponível",
+    "Username not available": "Nome de usuário indisponível",
+    "Something went wrong!": "Não foi possível carregar!",
+    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Esse será o nome da sua conta no <span></span>servidor principal, ou então você pode escolher um <a>servidor diferente</a>.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Se você já tem uma conta Matrix, pode também fazer <a>login</a>.",
     "Accept": "Aceitar",
     "Active call (%(roomName)s)": "Chamada ativa (%(roomName)s)",
     "Admin Tools": "Ferramentas de administração",
-    "Alias (optional)": "Apelido (opcional)",
     "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.": "Não foi possível conectar ao Servidor de Base. Por favor, confira sua conectividade à internet, garanta que o <a>certificado SSL do Servidor de Base</a> é confiável, e que uma extensão do navegador não esteja bloqueando as requisições de rede.",
     "Close": "Fechar",
     "Custom": "Personalizado",
     "Decline": "Recusar",
-    "Disable Notifications": "Desabilitar notificações",
     "Drop File Here": "Arraste o arquivo aqui",
-    "Enable Notifications": "Habilitar notificações",
-    "Failed to upload profile picture!": "Falha ao enviar a imagem de perfil!",
+    "Failed to upload profile picture!": "Falha ao enviar a foto de perfil!",
     "Incoming call from %(name)s": "Recebendo chamada de %(name)s",
     "Incoming video call from %(name)s": "Recebendo chamada de vídeo de %(name)s",
     "Incoming voice call from %(name)s": "Recebendo chamada de voz de %(name)s",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Participar por <voiceText>voz</voiceText> ou por <videoText>vídeo</videoText>.",
-    "Last seen": "Último uso",
-    "No display name": "Sem nome público de usuária(o)",
+    "Last seen": "Visto por último às",
+    "No display name": "Nenhum nome e sobrenome",
     "Private Chat": "Conversa privada",
     "Public Chat": "Conversa pública",
     "%(roomName)s does not exist.": "%(roomName)s não existe.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s não está acessível neste momento.",
-    "Seen by %(userName)s at %(dateTime)s": "Visto por %(userName)s em %(dateTime)s",
-    "Send anyway": "Enviar de qualquer maneira",
+    "Seen by %(userName)s at %(dateTime)s": "Lida por %(userName)s em %(dateTime)s",
     "Start authentication": "Iniciar autenticação",
     "This room": "Esta sala",
     "unknown caller": "a pessoa que está chamando é desconhecida",
@@ -422,45 +380,35 @@
     "(no answer)": "(sem resposta)",
     "(unknown failure: %(reason)s)": "(falha desconhecida: %(reason)s)",
     "Your browser does not support the required cryptography extensions": "O seu navegador não suporta as extensões de criptografia necessárias",
-    "Not a valid Riot keyfile": "Não é um arquivo de chaves Riot válido",
+    "Not a valid %(brand)s keyfile": "Não é um arquivo de chaves %(brand)s válido",
     "Authentication check failed: incorrect password?": "Falha ao checar a autenticação: senha incorreta?",
     "Do you want to set an email address?": "Você deseja definir um endereço de e-mail?",
     "This will allow you to reset your password and receive notifications.": "Isso permitirá que você redefina sua senha e receba notificações.",
     "Skip": "Pular",
-    "Start verification": "Iniciar a verificação",
-    "Share without verifying": "Compartilhar sem verificar",
-    "Ignore request": "Ignorar o pedido",
-    "Encryption key request": "Solicitação de chave de criptografia",
     "Invite to Community": "Convidar à comunidade",
     "Restricted": "Restrito",
     "Add to community": "Adicionar à comunidade",
     "Add rooms to the community": "Adicionar salas à comunidade",
     "Failed to invite users to community": "Falha ao convidar os usuários à comunidade",
-    "Failed to invite users to %(groupId)s": "Falha ao convidar os usuários para %(groupId)s",
+    "Failed to invite users to %(groupId)s": "Falha ao convidar usuários para %(groupId)s",
     "Failed to invite the following users to %(groupId)s:": "Falha ao convidar os seguintes usuários para %(groupId)s:",
-    "Failed to add the following rooms to %(groupId)s:": "Falha ao adicionar as seguintes salas para %(groupId)s:",
+    "Failed to add the following rooms to %(groupId)s:": "Falha ao adicionar as seguintes salas em %(groupId)s:",
     "You are not in this room.": "Você não está nesta sala.",
     "You do not have permission to do that in this room.": "Você não tem permissão para fazer isto nesta sala.",
-    "Ignored user": "Usuário ignorado",
-    "You are no longer ignoring %(userId)s": "Você parou de ignorar %(userId)s",
+    "Ignored user": "Usuário bloqueado",
+    "You are no longer ignoring %(userId)s": "Você não está mais bloqueando %(userId)s",
     "Edit": "Editar",
     "Unpin Message": "Desafixar Mensagem",
     "Add rooms to this community": "Adicionar salas na comunidade",
-    "The version of Riot.im": "A Versão do Riot.im",
+    "The version of %(brand)s": "A versão do %(brand)s",
     "The platform you're on": "A plataforma que você está usando",
     "Your language of choice": "O idioma que você selecionou",
     "Which officially provided instance you are using, if any": "Qual instância oficial você está usando, se for o caso",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Se você está usando o editor de texto visual",
-    "Your homeserver's URL": "A URL do seu Servidor de Base (homeserver)",
-    "Your identity server's URL": "A URL do seu servidor de identidade",
-    "The information being sent to us to help make Riot.im better includes:": "As informações que estão sendo enviadas para ajudar a melhorar o Riot.im incluem:",
-    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Quando esta página tem informação de identificação, como uma sala, ID de usuária/o ou de grupo, estes dados são removidos antes de serem enviados ao servidor.",
+    "Your homeserver's URL": "O endereço do seu servidor local",
+    "The information being sent to us to help make %(brand)s better includes:": "As informações que estão sendo enviadas para ajudar a melhorar o %(brand)s incluem:",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Quando esta página inclui informações identificáveis, como uma sala, ID de usuário ou de comunidade, estes dados são removidos antes de serem enviados ao servidor.",
     "Call Failed": "A chamada falhou",
-    "Review Devices": "Revisar dispositivos",
-    "Call Anyway": "Ligar assim mesmo",
-    "Answer Anyway": "Responder assim mesmo",
-    "Call": "Ligar",
-    "Answer": "Responder",
     "PM": "PM",
     "AM": "AM",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s de %(monthName)s de%(fullYear)s",
@@ -469,12 +417,11 @@
     "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 integrantes na página da comunidade e na lista de salas?",
-    "Room name or alias": "Nome da sala ou apelido",
     "Unable to create widget.": "Não foi possível criar o widget.",
-    "You are now ignoring %(userId)s": "Você está agora ignorando %(userId)s",
-    "Unignored user": "Usuária/o não está sendo mais ignorada/o",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s alterou o seu nome público para %(displayName)s.",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s alterou as mensagens fixas da sala.",
+    "You are now ignoring %(userId)s": "Agora você está bloqueando %(userId)s",
+    "Unignored user": "Usuário desbloqueado",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s alterou o nome e sobrenome para %(displayName)s.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s alterou as mensagens fixadas da sala.",
     "%(widgetName)s widget modified by %(senderName)s": "O widget %(widgetName)s foi modificado por %(senderName)s",
     "%(widgetName)s widget added by %(senderName)s": "O widget %(widgetName)s foi criado por %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "O widget %(widgetName)s foi removido por %(senderName)s",
@@ -485,7 +432,7 @@
     "Mirror local video feed": "Espelhar o feed de vídeo local",
     "Enable inline URL previews by default": "Ativar, por padrão, a visualização de resumo de links",
     "Enable URL previews for this room (only affects you)": "Ativar, para esta sala, a visualização de links (só afeta você)",
-    "Enable URL previews by default for participants in this room": "Ativar, para todas/os as/os integrantes desta sala, a visualização de links",
+    "Enable URL previews by default for participants in this room": "Ativar, para todos os integrantes desta sala, a visualização de links",
     "Cannot add any more widgets": "Não é possível adicionar novos widgets",
     "The maximum permitted number of widgets have already been added to this room.": "O número máximo de widgets permitidos já foi atingido nesta sala.",
     "Add a widget": "Adicionar um widget",
@@ -493,20 +440,17 @@
     "%(senderName)s sent a video": "%(senderName)s enviou um vídeo",
     "%(senderName)s uploaded a file": "%(senderName)s enviou um arquivo",
     "Disinvite this user?": "Desconvidar esta/e usuária/o?",
-    "Kick this user?": "Excluir esta/e usuária/o?",
-    "Unban this user?": "Desfazer o banimento desta/e usuária/o?",
-    "Ban this user?": "Banir esta/e usuária/o?",
-    "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.": "Você não poderá desfazer esta alteração, já que está baixando suas próprias permissões. Se você for a última pessoa nesta sala, será impossível recuperar as permissões atuais.",
-    "Unignore": "Não ignorar mais",
-    "Ignore": "Ignorar",
+    "Kick this user?": "Remover este usuário?",
+    "Unban this user?": "Remover o banimento deste usuário?",
+    "Ban this user?": "Banir este usuário?",
+    "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.": "Você não poderá desfazer essa alteração, já que está rebaixando sua própria permissão. Se você for a última pessoa nesta sala, será impossível recuperar a permissão atual.",
+    "Unignore": "Desbloquear",
+    "Ignore": "Bloquear",
     "Jump to read receipt": "Ir para a confirmação de leitura",
     "Mention": "Mencionar",
     "Invite": "Convidar",
-    "User Options": "Opções de usuária/o",
     "Send an encrypted reply…": "Enviar uma resposta criptografada…",
-    "Send a reply (unencrypted)…": "Enviar uma resposta (não criptografada)…",
     "Send an encrypted message…": "Enviar mensagem criptografada…",
-    "Send a message (unencrypted)…": "Enviar mensagem (não criptografada)…",
     "Jump to message": "Pular para mensagem",
     "No pinned messages.": "Não há mensagens fixas.",
     "Loading...": "Carregando...",
@@ -517,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": "Offline há %(duration)s",
+    "Offline for %(duration)s": "Desconectado há %(duration)s",
     "Unknown for %(duration)s": "Status desconhecido há %(duration)s",
     "Unknown": "Desconhecido",
     "Replying": "Respondendo",
@@ -526,24 +470,22 @@
     "World readable": "Aberto publicamente à leitura",
     "Guests can join": "Convidadas/os podem entrar",
     "Community Invites": "Convites a comunidades",
-    "Banned by %(displayName)s": "Banida/o por %(displayName)s",
+    "Banned by %(displayName)s": "Banido por %(displayName)s",
     "Publish this room to the public in %(domain)s's room directory?": "Quer publicar esta sala na lista pública de salas em %(domain)s's?",
     "Members only (since the point in time of selecting this option)": "Apenas integrantes (a partir do momento em que esta opção for selecionada)",
     "Members only (since they were invited)": "Apenas integrantes (desde que foram convidadas/os)",
     "Members only (since they joined)": "Apenas integrantes (desde que entraram na sala)",
     "Invalid community ID": "ID de comunidade inválido",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' não é um ID de comunidade válido",
-    "Flair": "Insígnia",
-    "Showing flair for these communities:": "Esta sala mostrará insígnias para as seguintes comunidades:",
-    "This room is not showing flair for any communities": "Esta sala não está mostrando fairs para nenhuma comunidade",
+    "Flair": "Ícone",
+    "Showing flair for these communities:": "Esta sala mostra ícones das seguintes comunidades:",
+    "This room is not showing flair for any communities": "Esta sala não mostra ícones de alguma comunidade",
     "New community ID (e.g. +foo:%(localDomain)s)": "Novo ID de comunidade (p.ex: +foo:%(localDomain)s)",
     "URL previews are enabled by default for participants in this room.": "Pré-visualizações de links estão ativadas por padrão para participantes desta sala.",
     "URL previews are disabled by default for participants in this room.": "Pré-visualizações de links estão desativadas por padrão para participantes desta sala.",
     "Copied!": "Copiado!",
     "Failed to copy": "Não foi possível copiar",
-    "Message removed by %(userId)s": "Mensagem removida por %(userId)s",
-    "Message removed": "Mensagem removida",
-    "An email has been sent to %(emailAddress)s": "Um email foi enviado para %(emailAddress)s",
+    "An email has been sent to %(emailAddress)s": "Um e-mail foi enviado para %(emailAddress)s",
     "A text message has been sent to %(msisdn)s": "Uma mensagem de texto foi enviada para %(msisdn)s",
     "Remove from community": "Remover da comunidade",
     "Disinvite this user from community?": "Desconvidar esta pessoa da comunidade?",
@@ -551,23 +493,23 @@
     "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",
-    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Tem certeza que quer remover a sala '%(roomName)s' do grupo %(groupId)s?",
+    "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",
-    "Failed to remove '%(roomName)s' from %(groupId)s": "Não foi possível remover a sala '%(roomName)s' do grupo %(groupId)s",
-    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "A visibilidade da sala '%(roomName)s' do grupo %(groupId)s não pôde ser atualizada.",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "Não foi possível remover a sala '%(roomName)s' da comunidade %(groupId)s",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "A visibilidade da sala '%(roomName)s' na comunidade %(groupId)s não pôde ser atualizada.",
     "Visibility in Room List": "Visibilidade na lista de salas",
-    "Visible to everyone": "Visível para todo mundo",
+    "Visible to everyone": "Visível para todos",
     "Only visible to community members": "Apenas visível para integrantes da comunidade",
     "Filter community rooms": "Filtrar salas da comunidade",
-    "Something went wrong when trying to get your communities.": "Algo deu errado quando estava carregando suas comunidades.",
-    "Display your community flair in rooms configured to show it.": "Mostrar a insígnia de sua comunidade em salas configuradas para isso.",
+    "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.": "Atualmente você não é integrante de nenhuma comunidade.",
     "Allow": "Permitir",
     "Delete Widget": "Apagar widget",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Remover um widget o remove para todas as pessoas desta sala. Tem certeza que quer remover este widget?",
     "Delete widget": "Remover widget",
-    "Minimize apps": "Minimizar apps",
+    "Minimize apps": "Minimizar app",
     "Communities": "Comunidades",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s entraram %(count)s vezes",
@@ -586,38 +528,38 @@
     "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s saíram e entraram",
     "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s saiu e entrou %(count)s vezes",
     "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s saiu e entrou",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s rejeitaram seus convites %(count)s vezes",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s rejeitaram seus convites",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s rejeitou seu convite %(count)s vezes",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s rejeitou seu convite",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s tiveram seus convites retirados %(count)s vezes",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s tiveram seus convites retirados",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s teve seus convites removidos %(count)s vezes",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s teve seu convite removido",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s recusaram os convites %(count)s vezes",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s recusaram os convites",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s recusou o convite %(count)s vezes",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s recusou o convite",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s tiveram os convites retirados %(count)s vezes",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s tiveram os convites retirados",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s teve os convites removidos %(count)s vezes",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s teve o convite removido",
     "were invited %(count)s times|other": "foram convidadas/os %(count)s vezes",
     "were invited %(count)s times|one": "foram convidadas/os",
     "was invited %(count)s times|other": "foi convidada/o %(count)s vezes",
     "was invited %(count)s times|one": "foi convidada/o",
-    "were banned %(count)s times|other": "foram banidas/os %(count)s vezes",
-    "were banned %(count)s times|one": "foram banidas/os",
-    "was banned %(count)s times|other": "foi banida/o %(count)s vezes",
-    "was banned %(count)s times|one": "foi banida/o",
-    "were unbanned %(count)s times|other": "tiveram seu banimento desfeito %(count)s vezes",
-    "were unbanned %(count)s times|one": "tiveram seu banimento desfeito",
-    "was unbanned %(count)s times|other": "teve seu banimento desfeito %(count)s vezes",
-    "was unbanned %(count)s times|one": "teve seu banimento desfeito",
-    "were kicked %(count)s times|other": "foram chutados %(count)s vezes",
-    "were kicked %(count)s times|one": "foram excluídas/os",
-    "was kicked %(count)s times|other": "foi excluída/o %(count)s vezes",
-    "was kicked %(count)s times|one": "foi excluída/o",
-    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s alteraram o seu nome %(count)s vezes",
-    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s alteraram o seu nome",
-    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s alterou o seu nome %(count)s vezes",
-    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s alterou o seu nome",
-    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s alteraram a sua imagem de perfil %(count)s vezes",
-    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s alteraram a sua imagem de perfil",
-    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s alterou a sua imagem de perfil %(count)s vezes",
-    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s alterou a sua imagem de perfil",
+    "were banned %(count)s times|other": "foram banidos %(count)s vezes",
+    "were banned %(count)s times|one": "foram banidos",
+    "was banned %(count)s times|other": "foi banido %(count)s vezes",
+    "was banned %(count)s times|one": "foi banido",
+    "were unbanned %(count)s times|other": "tiveram o banimento removido %(count)s vezes",
+    "were unbanned %(count)s times|one": "tiveram o banimento removido",
+    "was unbanned %(count)s times|other": "teve o banimento removido %(count)s vezes",
+    "was unbanned %(count)s times|one": "teve o banimento removido",
+    "were kicked %(count)s times|other": "foram removidos %(count)s vezes",
+    "were kicked %(count)s times|one": "foram removidos",
+    "was kicked %(count)s times|other": "foi removido %(count)s vezes",
+    "was kicked %(count)s times|one": "foi removido",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s alteraram o nome e sobrenome %(count)s vezes",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s alteraram o nome e sobrenome",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s alterou o nome e sobrenome %(count)s vezes",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s alterou o nome e sobrenome",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s alteraram as fotos de perfil %(count)s vezes",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s alteraram as fotos de perfil",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s alterou a foto de perfil %(count)s vezes",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s alterou a foto de perfil",
     "%(items)s and %(count)s others|other": "%(items)s e %(count)s outras",
     "%(items)s and %(count)s others|one": "%(items)s e uma outra",
     "collapse": "recolher",
@@ -631,14 +573,14 @@
     "You have entered an invalid address.": "Você entrou com um endereço inválido.",
     "Community IDs cannot be empty.": "IDs de comunidades não podem estar em branco.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "IDs de comunidade podem apenas ter os seguintes caracteres: a-z, 0-9, ou '=_-./'",
-    "Something went wrong whilst creating your community": "Algo deu errado ao criar sua comunidade",
+    "Something went wrong whilst creating your community": "Não foi possível criar sua comunidade. Por favor, tente novamente",
     "Create Community": "Criar comunidade",
     "Community Name": "Nome da comunidade",
     "Example": "Exemplo",
     "Community ID": "ID da comunidade",
     "example": "exemplo",
     "Create": "Criar",
-    "To get started, please pick a username!": "Para começar, escolha um nome de usuária/o!",
+    "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 integrantes ou partilhe <a href=\"foo\">links</a> importantes.\n</p>\n<p>\n    Você pode até mesmo usar tags 'img' do 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?",
@@ -656,12 +598,12 @@
     "Failed to upload image": "O envio da imagem falhou",
     "Failed to update community": "A atualização da comunidade falhou",
     "Unable to accept invite": "Não foi possível aceitar o convite",
-    "Unable to reject invite": "Não foi possível rejeitar o convite",
+    "Unable to reject invite": "Não foi possível recusar o convite",
     "Leave Community": "Deixar a comunidade",
     "Leave %(groupName)s?": "Quer sair da comunidade %(groupName)s?",
     "Leave": "Sair",
     "Community Settings": "Configurações 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 são exibidas para as/os integrantes da comunidade na página da comunidade. Integrantes da comunidade podem entrar nas salas ao clicar nas mesmas.",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Essas salas são exibidas para os membros da comunidade na página da comunidade. Os membros da comunidade entram nas salas clicando nelas.",
     "Featured Rooms:": "Salas em destaque:",
     "Featured Users:": "Pessoas em destaque:",
     "%(inviter)s has invited you to join this community": "%(inviter)s convidou você para entrar nesta comunidade",
@@ -674,7 +616,6 @@
     "Failed to load %(groupId)s": "Não foi possível carregar a comunidade %(groupId)s",
     "This room is not public. You will not be able to rejoin without an invite.": "Esta sala não é pública. Você não poderá voltar sem ser convidada/o.",
     "Old cryptography data detected": "Dados de criptografia antigos foram detectados",
-    "Data from an older version of Riot 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.": "Dados de uma versão anterior do Riot foram detectados. Isso fará com que a criptografia ponta-a-ponta não funcione na versão anterior. Mensagens criptografadas ponta-a-ponta que foram trocadas recentemente usando a versão antiga do Riot talvez não possam ser decriptografadas nesta versão. Isso também pode fazer com que mensagens trocadas com esta versão falhem. Se você tiver problemas desta natureza, faça logout e entre novamente. Para manter o histórico de mensagens, exporte e reimporte suas chaves de criptografia.",
     "Your Communities": "Suas comunidades",
     "Error whilst fetching joined communities": "Erro baixando comunidades das quais você faz parte",
     "Create a new community": "Criar nova comunidade",
@@ -685,83 +626,77 @@
     "Warning": "Atenção",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Não há mais ninguém aqui! Você deseja <inviteText>convidar outras pessoas</inviteText> ou <nowarnText>remover este alerta sobre a sala vazia</nowarnText>?",
     "Clear filter": "Remover filtro",
-    "Light theme": "Tema claro",
-    "Dark theme": "Tema escuro",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "A privacidade é importante para nós, portanto nós não coletamos nenhum dado pessoa ou identificável para nossas estatísticas.",
     "Learn more about how we use analytics.": "Saiba mais sobre como nós usamos os dados estatísticos.",
     "Check for update": "Verificar atualizações",
-    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Um email foi enviado para %(emailAddress)s. Quando você tiver seguido o link que está nesta mensagem, clique abaixo.",
+    "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": "Ignora um(a) usuário(a), ocultando suas mensagens de você",
-    "Stops ignoring a user, showing their messages going forward": "Deixa de ignorar um(a) usuário(a), exibindo suas mensagens daqui para frente",
+    "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",
     "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",
     "Failed to remove tag %(tagName)s from room": "Falha ao remover a tag %(tagName)s da sala",
     "Failed to add tag %(tagName)s to room": "Falha ao adicionar a tag %(tagName)s para a sala",
-    "Did you know: you can use communities to filter your Riot.im experience!": "Você sabia? Você pode usar as comunidades para filtrar a sua experiência no Riot!",
-    "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 criar um filtro, arraste a imagem de uma comunidade sobre o painel de filtros na extrema esquerda da sua tela. Você pode clicar na imagem de uma comunidade no painel de filtros a qualquer momento para ver apenas as salas e pessoas associadas com esta comunidade.",
+    "Did you know: you can use communities to filter your %(brand)s experience!": "Você sabia? Você pode usar as comunidades para filtrar a sua experiência no %(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 criar um filtro, arraste a foto de uma comunidade sobre o painel de filtros na extrema esquerda da sua tela. Você pode clicar na foto de uma comunidade no painel de filtros a qualquer momento para ver apenas as salas e pessoas associadas com esta comunidade.",
     "Key request sent.": "Requisição de chave enviada.",
-    "Fetching third party location failed": "Falha ao acessar localização de terceiros",
-    "A new version of Riot is available.": "Uma nova versão do Riot está disponível.",
+    "Fetching third party location failed": "Falha ao acessar a localização de terceiros",
     "I understand the risks and wish to continue": "Entendo os riscos e desejo continuar",
     "Send Account Data": "Enviar Dados da Conta",
     "Advanced notification settings": "Configurações avançadas de notificação",
     "Uploading report": "Enviando o relatório",
     "Sunday": "Domingo",
-    "Notification targets": "Alvos de notificação",
+    "Notification targets": "Aparelhos notificados",
     "Today": "Hoje",
-    "You are not receiving desktop notifications": "Você não está recebendo notificações desktop",
-    "Friday": "Sexta",
+    "You are not receiving desktop notifications": "Você não está recebendo notificações na área de trabalho",
+    "Friday": "Sexta-feira",
     "Update": "Atualizar",
     "What's New": "Novidades",
     "On": "Ativado",
-    "Changelog": "Histórico de alterações",
-    "Waiting for response from server": "Esperando por resposta do servidor",
+    "Changelog": "Registro de alterações",
+    "Waiting for response from server": "Aguardando a resposta do servidor",
     "Uploaded on %(date)s by %(user)s": "Enviada em %(date)s por %(user)s",
     "Send Custom Event": "Enviar Evento Customizado",
-    "All notifications are currently disabled for all targets.": "Todas as notificações estão atualmente desabilitadas para todos os casos.",
-    "delete the alias.": "apagar o apelido da sala.",
-    "To return to your account in future you need to <u>set a password</u>": "Para poder, futuramente, retornar à sua conta, você precisa <u>definir uma senha</u>",
+    "All notifications are currently disabled for all targets.": "Todas as notificações estão desativadas para todos os casos.",
     "Forget": "Esquecer",
     "You cannot delete this image. (%(code)s)": "Você não pode apagar esta imagem. (%(code)s)",
     "Cancel Sending": "Cancelar o envio",
     "This Room": "Esta sala",
     "Resend": "Reenviar",
-    "Error saving email notification preferences": "Erro ao salvar as preferências de notificação por email",
-    "Messages containing my display name": "Mensagens contendo meu nome público",
+    "Error saving email notification preferences": "Erro ao salvar a configuração de notificações por e-mail",
+    "Messages containing my display name": "Mensagens contendo meu nome e sobrenome",
     "Messages in one-to-one chats": "Mensagens em conversas pessoais",
     "Unavailable": "Indisponível",
-    "View Decrypted Source": "Ver a fonte descriptografada",
+    "View Decrypted Source": "Ver código-fonte descriptografado",
     "Failed to update keywords": "Falha ao alterar as palavras-chave",
     "remove %(name)s from the directory.": "remover %(name)s da lista pública de salas.",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Notificações sobre as seguintes palavras-chave seguem regras que não podem ser exibidas aqui:",
     "Please set a password!": "Por favor, defina uma senha!",
     "You have successfully set a password!": "Você definiu sua senha com sucesso!",
-    "An error occurred whilst saving your email notification preferences.": "Um erro ocorreu enquanto o sistema estava salvando suas preferências de notificação por email.",
+    "An error occurred whilst saving your email notification preferences.": "Ocorreu um erro ao salvar sua configuração de notificações por e-mail.",
     "Explore Room State": "Explorar Estado da Sala",
-    "Source URL": "URL fonte",
+    "Source URL": "Link do código-fonte",
     "Messages sent by bot": "Mensagens enviadas por bots",
     "Filter results": "Filtrar resultados",
     "Members": "Membros",
-    "No update available.": "Não há atualizações disponíveis.",
-    "Noisy": "Barulhento",
+    "No update available.": "Nenhuma atualização disponível.",
+    "Noisy": "Ativado com som",
     "Files": "Arquivos",
     "Collecting app version information": "Coletando informação sobre a versão do app",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Apagar o apelido %(alias)s da sala e remover %(name)s da lista pública?",
     "Keywords": "Palavras-chave",
-    "Enable notifications for this account": "Ativar notificações para esta conta",
+    "Enable notifications for this account": "Receba notificações de novas mensagens",
     "Invite to this community": "Convidar para essa comunidade",
     "Messages containing <span>keywords</span>": "Mensagens contendo <span>palavras-chave</span>",
     "Room not found": "Sala não encontrada",
-    "Tuesday": "Terça",
+    "Tuesday": "Terça-feira",
     "Enter keywords separated by a comma:": "Coloque cada palavras-chave separada por vírgula:",
     "Search…": "Buscar…",
     "You have successfully set a password and an email address!": "Você definiu uma senha e um endereço de e-mail com sucesso!",
     "Remove %(name)s from the directory?": "Remover %(name)s da lista pública de salas?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "O Riot usa muitas funcionalidades avançadas do navegador, algumas das quais não estão disponíveis ou ainda são experimentais no seu navegador atual.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "O %(brand)s usa muitas funcionalidades avançadas do navegador, algumas das quais não estão disponíveis ou ainda são experimentais no seu navegador atual.",
     "Developer Tools": "Ferramentas do desenvolvedor",
     "Explore Account Data": "Explorar Dados da Conta",
     "Remove from Directory": "Remover da lista pública de salas",
@@ -769,18 +704,18 @@
     "Remember, you can always set an email address in user settings if you change your mind.": "Lembre-se: você pode sempre definir um endereço de e-mail nas configurações de usuário, se mudar de ideia.",
     "Direct Chat": "Conversa pessoal",
     "The server may be unavailable or overloaded": "O servidor pode estar inacessível ou sobrecarregado",
-    "Reject": "Rejeitar",
-    "Failed to set Direct Message status of room": "Falha em definir a mensagem de status da sala",
-    "Monday": "Segunda",
-    "All messages (noisy)": "Todas as mensagens (alto)",
-    "Enable them now": "Habilitar agora",
+    "Reject": "Recusar",
+    "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",
     "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",
-    "All messages": "Todas as mensagens",
+    "All messages": "Todas as mensagens novas",
     "Call invitation": "Convite para chamada",
     "Downloading update...": "Baixando atualização...",
     "State Key": "Chave do Estado",
@@ -788,71 +723,61 @@
     "What's new?": "O que há de novidades?",
     "Notify me for anything else": "Notificar-me sobre qualquer outro evento",
     "When I'm invited to a room": "Quando sou convidada(o) a uma sala",
-    "Can't update user notification settings": "Não é possível atualizar as preferências de notificação",
+    "Can't update user notification settings": "Não foi possível atualizar a configuração das notificações",
     "Notify for all other messages/rooms": "Notificar para todas as outras mensagens e salas",
     "Unable to look up room ID from server": "Não foi possível buscar identificação da sala no servidor",
     "Couldn't find a matching Matrix room": "Não foi possível encontrar uma sala correspondente no servidor Matrix",
     "All Rooms": "Todas as salas",
     "You cannot delete this message. (%(code)s)": "Você não pode apagar esta mensagem. (%(code)s)",
-    "Thursday": "Quinta",
+    "Thursday": "Quinta-feira",
     "Forward Message": "Encaminhar",
     "Back": "Voltar",
     "Reply": "Responder",
-    "Show message in desktop notification": "Mostrar mensagens na notificação",
+    "Show message in desktop notification": "Mostrar a mensagem na notificação da área de trabalho",
     "Unhide Preview": "Mostrar a pré-visualização",
     "Unable to join network": "Não foi possível conectar na rede",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Você pode te-las configurado em outro cliente além do Riot. Você não pode ajustá-las no Riot, mas ainda assim elas se aplicam aqui",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Perdão. O seu navegador <b>não</b> é capaz de rodar o Riot.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Perdão. O seu navegador <b>não</b> é capaz de rodar o %(brand)s.",
     "Messages in group chats": "Mensagens em salas",
     "Yesterday": "Ontem",
     "Error encountered (%(errorDetail)s).": "Erro encontrado (%(errorDetail)s).",
     "Low Priority": "Baixa prioridade",
-    "Unable to fetch notification target list": "Não foi possível obter a lista de alvos de notificação",
+    "Unable to fetch notification target list": "Não foi possível obter a lista de aparelhos notificados",
     "Set Password": "Definir senha",
     "Off": "Desativado",
-    "Riot does not know how to join a room on this network": "O sistema não sabe como entrar na sala desta rede",
     "Mentions only": "Apenas menções",
-    "Wednesday": "Quarta",
-    "You can now return to your account after signing out, and sign in on other devices.": "Você pode retornar agora para a sua conta depois de fazer logout, e então fazer login em outros dispositivos.",
-    "Enable email notifications": "Ativar notificações por email",
+    "Wednesday": "Quarta-feira",
+    "You can now return to your account after signing out, and sign in on other devices.": "Agora você pode retornar à sua conta depois de sair, e fazer login em outros aparelhos.",
+    "Enable email notifications": "Ativar notificações por e-mail",
     "Event Type": "Tipo do Evento",
     "Download this file": "Baixar este arquivo",
     "Pin Message": "Fixar Mensagem",
-    "Failed to change settings": "Falhou ao mudar as preferências",
+    "Failed to change settings": "Falha ao alterar as configurações",
     "View Community": "Ver a comunidade",
     "Event sent!": "Evento enviado!",
-    "View Source": "Ver a fonte",
+    "View Source": "Ver código-fonte",
     "Event Content": "Conteúdo do Evento",
     "Thank you!": "Obrigado!",
     "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!": "Com o seu navegador atual, a aparência e sensação de uso da aplicação podem estar completamente incorretas, e algumas das funcionalidades poderão não funcionar. Se você quiser tentar de qualquer maneira, pode continuar, mas aí vai ter que se virar sozinho(a) com os problemas que porventura encontrar!",
     "Checking for an update...": "Verificando se há atualizações...",
-    "There are advanced notifications which are not shown here": "Existem opções avançadas que não são exibidas aqui",
     "Every page you use in the app": "Toda a página que você usa no aplicativo",
-    "e.g. <CurrentPageURL>": "ex. <CurrentPageURL>",
-    "Your User Agent": "Seu Agente de Usuário",
-    "Your device resolution": "Sua resolução de dispositivo",
+    "e.g. <CurrentPageURL>": "por exemplo: <CurrentPageURL>",
+    "Your device resolution": "A resolução do seu aparelho",
     "Call in Progress": "Chamada em andamento",
-    "A call is currently being placed!": "Uma chamada está sendo feita atualmente!",
+    "A call is currently being placed!": "Uma chamada já está em andamento!",
     "A call is already in progress!": "Uma chamada já está em andamento!",
     "Permission Required": "Permissão Exigida",
-    "You do not have permission to start a conference call in this room": "Você não tem permissão para iniciar uma chamada de conferência nesta sala",
+    "You do not have permission to start a conference call in this room": "Você não tem permissão para iniciar uma chamada em grupo nesta sala",
     "Unable to load! Check your network connectivity and try again.": "Incapaz de carregar! Verifique sua conectividade de rede e tente novamente.",
-    "Registration Required": "Registro requerido",
-    "You need to register to do this. Would you like to register now?": "Você precisa se registrar para fazer isso. Você gostaria de se registrar agora?",
     "Failed to invite users to the room:": "Não foi possível convidar usuários para a sala:",
     "Missing roomId.": "RoomId ausente.",
     "Opens the Developer Tools dialog": "Abre a caixa de diálogo Ferramentas do desenvolvedor",
-    "Forces the current outbound group session in an encrypted room to be discarded": "Força a atual sessão de grupo de saída em uma sala criptografada a ser descartada",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s adicionado %(addedAddresses)s como endereço para esta sala.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s adicionado %(addedAddresses)s como um endereço para esta sala.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s removido %(removedAddresses)s como endereços para esta sala.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s removido %(removedAddresses)s como um endereço para esta sala.",
+    "Forces the current outbound group session in an encrypted room to be discarded": "Força a atual sessão da comunidade em uma sala criptografada a ser descartada",
     "e.g. %(exampleValue)s": "ex. %(exampleValue)s",
-    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s definiu o endereço principal desta sala para %(address)s.",
-    "%(senderName)s removed the main address for this room.": "%(senderName)s removeu o endereço principal para esta sala.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s definiu o endereço principal desta sala como %(address)s.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s removeu o endereço principal desta sala.",
     "This homeserver has hit its Monthly Active User limit.": "Este homeserver atingiu seu limite de usuário ativo mensal.",
-    "This homeserver has exceeded one of its resource limits.": "Este homeserver ultrapassou um dos seus limites de recursos.",
+    "This homeserver has exceeded one of its resource limits.": "Este servidor local ultrapassou um dos seus limites de recursos.",
     "Please <a>contact your service administrator</a> to continue using the service.": "Por favor, <a>entre em contato com o seu administrador de serviços</a> para continuar usando o serviço.",
     "Unable to connect to Homeserver. Retrying...": "Não é possível conectar-se ao Homeserver. Tentando novamente ...",
     "You do not have permission to invite people to this room.": "Você não tem permissão para convidar pessoas para esta sala.",
@@ -874,14 +799,13 @@
     "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Repetições como \"abcabcabc\" são apenas um pouco mais difíceis de adivinhar que \"abc\"",
     "Sequences like abc or 6543 are easy to guess": "Sequências como abc ou 6543 são fáceis de adivinhar",
     "Recent years are easy to guess": "Os últimos anos são fáceis de adivinhar",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s adicionou %(addedAddresses)s e removeu %(removedAddresses)s como endereços para esta sala.",
     "Dates are often easy to guess": "As datas costumam ser fáceis de adivinhar",
     "This is a top-10 common password": "Esta é uma das top-10 senhas mais comuns",
     "This is a top-100 common password": "Esta é uma das top-100 senhas mais comuns",
     "This is a very common password": "Isto é uma senha muito comum",
     "This is similar to a commonly used password": "Isto é similar a uma senha muito comum",
     "A word by itself is easy to guess": "Uma palavra por si só é fácil de adivinhar",
-    "Names and surnames by themselves are easy to guess": "Nomes e sobrenomes sozinhos são fáceis de adivinhar",
+    "Names and surnames by themselves are easy to guess": "Nomes e sobrenomes por si só são fáceis de adivinhar",
     "Common names and surnames are easy to guess": "Nomes e sobrenomes comuns são fáceis de adivinhar",
     "Straight rows of keys are easy to guess": "Linhas retas de teclas são fáceis de adivinhar",
     "Short keyboard patterns are easy to guess": "Padrões de teclado curtos são fáceis de adivinhar",
@@ -890,96 +814,89 @@
     "Please contact your homeserver administrator.": "Por favor, entre em contato com o administrador do seu homeserver.",
     "Custom user status messages": "Mensagens de status de usuário personalizadas",
     "Always show encryption icons": "Mostrar sempre ícones de criptografia",
-    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Mostrar um lembrete para ativar o Secure Message Recovery em salas criptografadas",
+    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Mostrar um lembrete para ativar a recuperação de mensagens seguras em salas criptografadas",
     "Send analytics data": "Enviar dados analíticos",
     "Enable widget screenshots on supported widgets": "Ativar capturas de tela do widget em widgets suportados",
     "Show developer tools": "Mostrar ferramentas de desenvolvedor",
     "Messages containing @room": "Mensagens contendo @room",
     "Encrypted messages in one-to-one chats": "Mensagens criptografadas em bate-papos individuais",
-    "Encrypted messages in group chats": "Mensagens criptografadas em bate-papos de grupo",
+    "Encrypted messages in group chats": "Mensagens criptografadas em conversas em grupo",
     "Delete Backup": "Deletar Backup",
     "Unable to load key backup status": "Não é possível carregar o status da chave de backup",
     "Backup version: ": "Versão do Backup: ",
     "Algorithm: ": "Algoritmo: ",
-    "This event could not be displayed": "O evento não pôde ser exibido",
+    "This event could not be displayed": "Este evento não pôde ser exibido",
     "Use a longer keyboard pattern with more turns": "Use um padrão de teclas em diferentes direções e sentido",
-    "Share Link to User": "Compartilhar Link com Usuário",
+    "Share Link to User": "Compartilhar este usuário",
     "This room has been replaced and is no longer active.": "Esta sala foi substituída e não está mais ativa.",
     "The conversation continues here.": "A conversa continua aqui.",
-    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Visto por %(displayName)s (%(userName)s) em %(dateTime)s",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Lida por %(displayName)s (%(userName)s) em %(dateTime)s",
     "Share room": "Compartilhar sala",
-    "System Alerts": "Alertas do Sistema",
-    "Don't ask again": "Não pergunte novamente",
+    "System Alerts": "Alertas do sistema",
+    "Don't ask again": "Não perguntar novamente",
     "Set up": "Configurar",
     "Muted Users": "Usuários silenciados",
     "Open Devtools": "Abrir as Ferramentas de Desenvolvimento",
-    "Only room administrators will see this warning": "Somente administradores de sala verão esse aviso",
-    "You don't currently have any stickerpacks enabled": "Atualmente, você não tem nenhum stickerpacks ativado",
+    "Only room administrators will see this warning": "Somente administradores de sala verão esse alerta",
+    "You don't currently have any stickerpacks enabled": "No momento, você não tem pacotes de figurinhas ativados",
     "Demote": "Reduzir privilégio",
     "Demote yourself?": "Reduzir seu próprio privilégio?",
     "Add some now": "Adicione alguns agora",
-    "Stickerpack": "Stickerpack",
-    "Hide Stickers": "Esconder Stickers",
-    "Show Stickers": "Mostrar Stickers",
-    "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.": "Em salas criptografadas, como esta, as visualizações de URL são desabilitadas por padrão para garantir que o seu homeserver (onde as visualizações são geradas) não possa coletar informações sobre os links que você vê nesta sala.",
-    "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.": "Quando alguém coloca um URL em sua mensagem, uma visualização de URL pode ser exibida para fornecer mais informações sobre esse link, como o título, a descrição e uma imagem do site.",
+    "Stickerpack": "Pacote de figurinhas",
+    "Hide Stickers": "Esconder figurinhas",
+    "Show Stickers": "Enviar figurinhas",
+    "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.": "Em salas criptografadas, como esta, as pré-visualizações de links estão desativadas por padrão para garantir que o seu servidor local (onde as visualizações são geradas) não possa coletar informações sobre os links que você vê nesta sala.",
+    "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.": "Quando alguém inclui um link em uma mensagem, a pré-visualização do link pode ser exibida para fornecer mais informações sobre esse link, como o título, a descrição e uma imagem do site.",
     "This room is a continuation of another conversation.": "Esta sala é uma continuação de outra conversa.",
     "Click here to see older messages.": "Clique aqui para ver as mensagens mais antigas.",
     "Please review and accept all of the homeserver's policies": "Por favor, revise e aceite todas as políticas do homeserver",
-    "Please review and accept the policies of this homeserver:": "Por favor, revise e aceite as políticas deste homeserver:",
+    "Please review and accept the policies of this homeserver:": "Por favor, revise e aceite as políticas deste servidor local:",
     "Code": "Código",
-    "The email field must not be blank.": "O campo de email não pode estar em branco.",
+    "The email field must not be blank.": "O campo de e-mail não pode estar em branco.",
     "The phone number field must not be blank.": "O campo do número de telefone não pode estar em branco.",
     "The password field must not be blank.": "O campo da senha não pode ficar em branco.",
-    "Failed to load group members": "Falha ao carregar membros do grupo",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Por favor, ajude a melhorar o Riot.im enviando <UsageDataLink>dados de uso anônimo</UsageDataLink>. Isso usará um cookie (consulte nossa <PolicyLink>Política de cookies</PolicyLink>).",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Por favor, ajude a melhorar o Riot.im enviando <UsageDataLink>dados de uso anônimo</UsageDataLink>. Isto irá usar um cookie.",
-    "Yes, I want to help!": "Sim, quero ajudar!",
-    "Please <a>contact your service administrator</a> to get this limit increased.": "Por favor, <a>entre em contato com o administrador do serviço</a> para aumentar esse limite.",
-    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "Este homeserver atingiu seu limite de usuário ativo mensal, então <b>alguns usuários não poderão efetuar login</ b>.",
-    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Este homeserver excedeu um dos seus limites de recursos, de modo que <b>alguns usuários não poderão efetuar login</ b>.",
+    "Failed to load group members": "Falha ao carregar membros da comunidade",
     "Failed to remove widget": "Falha ao remover o widget",
     "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": "Isso não parece ser um endereço de e-mail válido",
+    "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: ",
+    "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 grupos 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 uma questão no GitHub</a> para descrever seu problema.",
+    "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.",
     "Unable to load commit detail: %(msg)s": "Não é possível carregar os detalhes do commit: %(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 Riot to do this": "Para evitar perder seu histórico de bate-papo, você deve exportar as chaves do seu quarto antes de fazer logout. Você precisará voltar para a versão mais recente do Riot para fazer isso",
-    "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ": "Você já usou uma versão mais recente do Riot em %(host)s. Para usar essa versão novamente com criptografia de ponta a ponta, você precisará sair e voltar novamente. ",
+    "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ê deve exportar as chaves da sua sala antes de se desconectar. Para fazer isso, você precisará retornar na 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.",
-    "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 da mensagem 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 a suas cópias.",
-    "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, esqueça todas as mensagens que enviei quando minha conta for desativada (<b>Aviso:</ b> isso fará com que futuros usuários vejam uma visão 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 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:",
     "Incompatible local cache": "Cache local incompatível",
     "Clear cache and resync": "Limpar cache e ressincronizar",
-    "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Riot agora usa 3-5x menos memória, pois carrega informação sobre outros usuários apenas quando necessário. Por favor, aguarde enquanto ressincronizamos com o servidor!",
-    "Updating Riot": "Atualizando Riot",
+    "%(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 agora usa 3-5x menos memória, pois carrega informação sobre outros usuários apenas quando for necessário. Por favor, aguarde enquanto ressincronizamos com o servidor!",
+    "Updating %(brand)s": "Atualizando %(brand)s",
     "Failed to upgrade room": "Falha ao atualizar a sala",
     "The room upgrade could not be completed": "A atualização da sala não pode ser completada",
     "Upgrade this room to version %(version)s": "Atualize essa sala para versão %(version)s",
     "Upgrade Room Version": "Atualize a Versão da Sala",
-    "Create a new room with the same name, description and avatar": "Criar uma nova sala com o mesmo nome, descrição e avatar",
+    "Create a new room with the same name, description and avatar": "Criar uma nova sala com o mesmo nome, descrição e foto",
     "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Impedir usuários de conversar na versão antiga da sala e postar uma mensagem aconselhando os usuários a migrarem para a nova sala",
     "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 Riot 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, Riot needs to resync your account.": "Você já usou o Riot em %(host)s com o carregamento Lazy de membros ativado. Nesta versão, o carregamento Lazy está desativado. Como o cache local não é compatível entre essas duas configurações, a Riot precisa ressincronizar sua conta.",
-    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Se a outra versão do Riot ainda estiver aberta em outra aba, por favor, feche-a pois usar o Riot no mesmo host com o carregamento Lazy ativado e desativado simultaneamente 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.": "Você já usou o %(brand)s em %(host)s com o carregamento Lazy de membros ativado. Nesta versão, o carregamento Lazy está desativado. Como o cache local não é compatível entre essas duas configurações, a %(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",
     "Clear Storage and Sign Out": "Limpar armazenamento e sair",
-    "Refresh": "Atualizar",
+    "Refresh": "Recarregar",
     "We encountered an error trying to restore your previous session.": "Encontramos um erro ao tentar restaurar sua sessão anterior.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Limpar o armazenamento do seu navegador pode resolver o problema, mas você será deslogado e isso fará que qualquer histórico de bate-papo criptografado fique ilegível.",
     "Checking...": "Checando...",
     "Share Room": "Compartilhar Sala",
     "Link to most recent message": "Link para a mensagem mais recente",
-    "Share User": "Compartilhar Usuário",
+    "Share User": "Compartilhar usuário",
     "Share Community": "Compartilhar Comunidade",
     "Share Room Message": "Compartilhar Mensagem da Sala",
     "Link to selected message": "Link para a mensagem selecionada",
@@ -987,122 +904,107 @@
     "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",
     "No backup found!": "Nenhum backup encontrado!",
-    "Backup Restored": "Backup restaurado",
     "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",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Se você esqueceu sua frase secreata de recuperação, você pode <button1>usar sua chave de recuperação</ button1> ou <button2>configurar novas opções de recuperação</ button2>",
-    "Enter Recovery Key": "Digite a chave de recuperação",
+    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Se você esqueceu sua frase secreta de recuperação, você pode <button1>usar sua chave de recuperação</button1> ou <button2>configurar novas opções de recuperação</button2>",
     "This looks like a valid recovery key!": "Isso parece uma chave de recuperação válida!",
     "Not a valid recovery key": "Não é uma chave de recuperação válida",
     "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 relatos de problemas",
+    "Send Logs": "Enviar registros",
     "Failed to decrypt %(failedCount)s sessions!": "Falha ao descriptografar as sessões de %(failedCount)s!",
-    "Restored %(sessionCount)s session keys": "Chaves de sessão %(sessionCount)s restauradas",
-    "Enter Recovery Passphrase": "Digite a frase secreta de recuperação",
     "Set a new status...": "Definir um novo status ...",
     "Collapse Reply Thread": "Recolher grupo de respostas",
     "Clear status": "Limpar status",
     "Unable to join community": "Não é possível participar da comunidade",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Você é um administrador dessa comunidade. Você não poderá se reingressar sem um convite de outro administrador.",
     "Unable to leave community": "Não é possível sair da comunidade",
-    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Alterações feitas à sua comunidade <bold1>nome</ bold1> e <bold2>avatar</ bold2> podem não ser vistas por outros usuários por até 30 minutos.",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Alterações no <bold1>nome</bold1> e na <bold2>foto</bold2> da sua comunidade demoram até 30 minutos para serem vistas por todos os usuários.",
     "Join this community": "Junte-se a esta comunidade",
     "Leave this community": "Deixe esta comunidade",
     "Who can join this community?": "Quem pode participar desta comunidade?",
     "Everyone": "Todos",
-    "Can't leave Server Notices room": "Não é possível sair da sala Notificações do servidor",
+    "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.",
     "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 homeserver 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 logs de depuração podem nos ajudar a rastrear o problema. Os logs de depuração contêm dados de uso do aplicativo, incluindo seu nome de usuário, os IDs ou aliases das salas ou grupos que você visitou e os nomes de usuários de outros usuários. Eles não contêm mensagens.",
+    "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 logs de depuração podem nos ajudar a rastrear o problema. Os logs 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.",
     "Legal": "Legal",
-    "No Audio Outputs detected": "Nenhuma saída de áudio detectada",
-    "Audio Output": "Saída de áudio",
+    "No Audio Outputs detected": "Nenhuma caixa de som detectada",
+    "Audio Output": "Caixa de som",
     "Invalid homeserver discovery response": "Resposta de descoberta de homeserver inválida",
     "Invalid identity server discovery response": "Resposta de descoberta do servidor de identidade inválida",
     "General failure": "Falha geral",
     "Please <a>contact your service administrator</a> to continue using this service.": "Por favor, <a>entre em contato com o seu administrador de serviços</a> para continuar usando este serviço.",
     "Failed to perform homeserver discovery": "Falha ao executar a descoberta do homeserver",
     "Sign in with single sign-on": "Entre com o logon único",
-    "Great! This passphrase looks strong enough.": "Ótimo! Esta frase secreta parece forte o suficiente.",
-    "Enter a passphrase...": "Digite uma frase secreta ...",
     "That matches!": "Isto corresponde!",
     "That doesn't match.": "Isto não corresponde.",
-    "Go back to set it again.": "Volte e configure novamente.",
-    "Repeat your passphrase...": "Repita sua frase se recuperação...",
-    "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Como uma rede de segurança, você pode usá-la para restaurar seu histórico de mensagens criptografadas se esquecer sua frase secreta de recuperação.",
-    "As a safety net, you can use it to restore your encrypted message history.": "Como uma rede de segurança, você pode usá-la para restaurar seu histórico de mensagens criptografadas.",
-    "Your Recovery Key": "Sua chave de recuperação",
-    "Copy to clipboard": "Copiar para área de transferência",
+    "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",
     "Set up Secure Message Recovery": "Configurar Recuperação Segura de Mensagens",
-    "Keep it safe": "Mantenha isto seguro",
-    "Create Key Backup": "Criar backup de chave",
     "Unable to create key backup": "Não é possível criar backup de 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 em Configurações.",
+    "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.",
     "Set up Secure Messages": "Configurar mensagens seguras",
     "Go to Settings": "Ir para as configurações",
     "Unrecognised address": "Endereço não reconhecido",
     "User %(user_id)s may or may not exist": "Usuário %(user_id)s pode existir ou não",
     "The following users may not exist": "Os seguintes usuários podem não existir",
-    "Waiting for %(userId)s to confirm...": "Aguardando que %(userId)s confirme...",
     "Prompt before sending invites to potentially invalid matrix IDs": "Avisar antes de enviar convites para IDs da Matrix potencialmente inválidas",
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Não é possível encontrar perfis para os IDs da Matrix listados abaixo - você gostaria de convidá-los mesmo assim?",
     "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": "Obtém ou define o tópico da sala",
-    "This room has no topic.": "Esta sala não tem assunto.",
+    "Gets or sets the room topic": "Consultar ou definir 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",
-    "Group & filter rooms by custom tags (refresh to apply changes)": "Agrupar e filtrar salas por tags personalizadas (atualize para aplicar as alterações)",
+    "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 emoticons ao digitar",
+    "Enable Emoji suggestions while typing": "Ativar sugestões de emojis ao digitar",
     "Show a placeholder for removed messages": "Mostrar um marcador para as mensagens removidas",
-    "Show join/leave messages (invites/kicks/bans unaffected)": "Mostrar mensagens de entrar/sair  (convites/chutes/banimentos não afetados)",
-    "Show avatar changes": "Mostrar alterações de avatar",
+    "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 seu apelido de exibição apenas na sala atual",
+    "Changes your display nickname in the current room only": "Altera o seu nome e sobrenome apenas na sala atual",
     "%(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.",
     "%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s alterou a regra de entrada para %(rule)s",
     "%(senderDisplayName)s has allowed guests to join the room.": "%(senderDisplayName)s permitiu que os convidados entrem na sala.",
     "%(senderDisplayName)s has prevented guests from joining the room.": "%(senderDisplayName)s impediu que os convidados entrassem na sala.",
-    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s mudou o perfil de acesso do convidado para %(rule)s",
-    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s habilitou insígnias para %(groups)s nesta sala.",
-    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s desabilitou insígnias para %(groups)s nesta sala.",
-    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s habilitou insígnias para %(newGroups)s e desabilitou insígnias para %(oldGroups)s nesta sala.",
+    "%(senderDisplayName)s changed guest access to %(rule)s": "%(senderDisplayName)s alterou a permissão de acesso de convidados para %(rule)s",
+    "%(senderDisplayName)s enabled flair for %(groups)s in this room.": "%(senderDisplayName)s ativou o ícone de %(groups)s nesta sala.",
+    "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s desativou o ícone de %(groups)s nesta sala.",
+    "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s ativou o ícone de %(newGroups)s e desativou o ícone de %(oldGroups)s nesta sala.",
     "%(displayName)s is typing …": "%(displayName)s está digitando…",
     "%(names)s and %(count)s others are typing …|other": "%(names)s e %(count)s outras pessoas estão digitando…",
     "%(names)s and %(count)s others are typing …|one": "%(names)s e outro está digitando …",
     "%(names)s and %(lastPerson)s are typing …": "%(names)s e %(lastPerson)s estão digitando …",
     "Show read receipts sent by other users": "Mostrar confirmações de leitura enviadas por outros usuários",
-    "Show avatars in user and room mentions": "Mostrar avatares em menções de usuários e salas",
-    "Enable big emoji in chat": "Ativar emoticons grandes no bate-papo",
+    "Show avatars in user and room mentions": "Mostrar fotos de perfil em menções de usuários e de salas",
+    "Enable big emoji in chat": "Ativar emojis grandes no bate-papo",
     "Send typing notifications": "Enviar notificações de digitação",
-    "Enable Community Filter Panel": "Ativar painel de filtro da comunidade",
+    "Enable Community Filter Panel": "Ativar o painel de comunidades",
     "Allow Peer-to-Peer for 1:1 calls": "Permitir Peer-to-Peer para chamadas 1:1",
-    "Order rooms in the room list by most important first instead of most recent": "Ordene as salas na lista pela primeira mais importante, em vez da mais recente",
     "Messages containing my username": "Mensagens contendo meu nome de usuário",
-    "The other party cancelled the verification.": "A outra parte cancelou a verificação.",
+    "The other party cancelled the verification.": "Seu contato cancelou a verificação.",
     "Verified!": "Verificado!",
     "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.": "Mensagens seguras com este usuário são criptografadas de ponta a ponta e não podem ser lidas por terceiros.",
-    "Got It": "Entendi",
+    "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.": "Não é possível encontrar um método de confirmação suportado.",
     "Dog": "Cachorro",
     "Cat": "Gato",
@@ -1134,18 +1036,18 @@
     "Pizza": "Pizza",
     "Cake": "Bolo",
     "Heart": "Coração",
-    "Smiley": "Smiley",
+    "Smiley": "Sorriso",
     "Robot": "Robô",
     "Hat": "Chapéu",
     "Glasses": "Óculos",
-    "Spanner": "Chave",
+    "Spanner": "Chave inglesa",
     "Santa": "Papai-noel",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Adiciona  ¯ \\ _ (ツ) _ / ¯ no início de uma mensagem de texto simples",
     "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 usuário não deve estar banido para poder ser convidado.",
-    "Show display name changes": "Mostrar alterações no nome de exibição",
-    "Verify this user by confirming the following emoji appear on their screen.": "Verifique este usuário confirmando o emoticon a seguir exibido em sua tela.",
-    "Verify this user by confirming the following number appears on their screen.": "Confirme este usuário confirmando se o número a seguir aparece na tela.",
+    "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",
+    "Verify this user by confirming the following emoji appear on their screen.": "Verifique este usuário confirmando os emojis a seguir exibidos na tela dele.",
+    "Verify this user by confirming the following number appears on their screen.": "Confirme este usuário confirmando se o número a seguir aparece na tela dele.",
     "Thumbs up": "Joinha",
     "Umbrella": "Guarda-chuva",
     "Hourglass": "Ampulheta",
@@ -1155,7 +1057,7 @@
     "Book": "Livro",
     "Pencil": "Lápis",
     "Paperclip": "Clipe de papel",
-    "Scissors": "Tesouras",
+    "Scissors": "Tesoura",
     "Key": "Chave",
     "Hammer": "Martelo",
     "Telephone": "Telefone",
@@ -1166,7 +1068,7 @@
     "Rocket": "Foguete",
     "Trophy": "Troféu",
     "Ball": "Bola",
-    "Guitar": "Violão",
+    "Guitar": "Guitarra",
     "Trumpet": "Trombeta",
     "Bell": "Sino",
     "Anchor": "Âncora",
@@ -1178,7 +1080,7 @@
     "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.",
-    "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "As mensagens criptografadas são protegidas com criptografia de ponta a ponta. Somente você e o(s) destinatário(s) têm as chaves para ler essas mensagens.",
+    "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",
     "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...",
@@ -1188,7 +1090,7 @@
     "Unable to verify phone number.": "Não é possível verificar o número de telefone.",
     "Verification code": "Código de verificação",
     "Phone Number": "Número de telefone",
-    "Profile picture": "Foto de Perfil",
+    "Profile picture": "Foto de perfil",
     "<a>Upgrade</a> to your own domain": "<a>Atualize</a> para seu próprio domínio",
     "Set a new account password...": "Definir uma nova senha da conta...",
     "Email addresses": "Endereços de e-mail",
@@ -1199,9 +1101,9 @@
     "Deactivating your account is a permanent action - be careful!": "Desativar sua conta é uma ação permanente - tenha cuidado!",
     "General": "Geral",
     "Credits": "Créditos",
-    "For help with using Riot, click <a>here</a>.": "Para ajuda com o uso do Riot, clique <a>aqui</a>.",
-    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "Para obter ajuda com o uso do Riot, clique <a>aqui</a> ou inicie um bate-papo com nosso bot usando o botão abaixo.",
-    "Chat with Riot Bot": "Converse com o bot do Riot",
+    "For help with using %(brand)s, click <a>here</a>.": "Para ajuda com o uso do %(brand)s, clique <a>aqui</a>.",
+    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "Para obter ajuda com o uso do %(brand)s, clique <a>aqui</a> ou inicie um bate-papo com nosso bot usando o botão abaixo.",
+    "Chat with %(brand)s Bot": "Converse com o bot do %(brand)s",
     "Help & About": "Ajuda & Sobre",
     "Bug reporting": "Relato de Erros",
     "FAQ": "FAQ",
@@ -1211,7 +1113,7 @@
     "Timeline": "Linha do Tempo",
     "Room list": "Lista de Salas",
     "Autocomplete delay (ms)": "Atraso no preenchimento automático (ms)",
-    "Ignored users": "Usuários ignorados",
+    "Ignored users": "Usuários bloqueados",
     "Bulk options": "Opções em massa",
     "Accept all %(invitedRooms)s invites": "Aceite todos os convites de %(invitedRooms)s",
     "Key backup": "Backup da chave",
@@ -1225,14 +1127,1156 @@
     "Room version:": "Versão da sala:",
     "Developer options": "Opções de desenvolvedor",
     "Room Addresses": "Endereços da sala",
-    "Change room avatar": "Alterar avatar da sala",
-    "Change room name": "Alterar nome da sala",
+    "Change room avatar": "Alterar a foto da sala",
+    "Change room name": "Alterar o nome da sala",
     "Change main address for the room": "Alterar o endereço principal da sala",
     "Change history visibility": "Alterar a visibilidade do histórico",
     "Change permissions": "Alterar permissões",
-    "Change topic": "Alterar o tópico",
+    "Change topic": "Alterar a descrição",
     "Modify widgets": "Modificar widgets",
     "Default role": "Papel padrão",
     "Send messages": "Enviar mensagens",
-    "Invite users": "Convidar usuários"
+    "Invite users": "Convidar usuários",
+    "Use Single Sign On to continue": "Use \"Single Sign On\" para continuar",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Confirme a inclusão deste endereço de e-mail usando o Single Sign On para comprovar sua identidade.",
+    "Single Sign On": "Autenticação Única",
+    "Confirm adding email": "Confirmar a inclusão de e-mail",
+    "Click the button below to confirm adding this email address.": "Clique no botão abaixo para confirmar a adição deste endereço de e-mail.",
+    "Confirm": "Confirmar",
+    "Add Email Address": "Adicionar endereço de e-mail",
+    "Confirm adding phone number": "Confirmar adição de número de telefone",
+    "Add Phone Number": "Adicionar número de telefone",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Se estiver usando %(brand)s em um aparelho onde touch é o mecanismo primário de entrada de dados",
+    "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Se você está usando ou não o recurso 'breadcrumbs' (fotos acima da lista de salas)",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Se estiver usando %(brand)s como uma Progressive Web App (PWA)",
+    "Your user agent": "Seu agente de usuária(o)",
+    "Call failed due to misconfigured server": "A chamada falhou por conta de má configuração no 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, peça ao administrador do seu servidor (<code>%(homeserverDomain)s</code>) para configurar um servidor TURN, de modo que as chamadas funcionem de maneira estável.",
+    "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, você pode tentar usar o servidor público em <code>turn.matrix.org</code>. No entanto, ele não é tão confiável e compartilhará o seu IP com esse servidor. Você também pode configurar isso nas Configurações.",
+    "Try using turn.matrix.org": "Tente utilizar turn.matrix.org",
+    "Replying With Files": "Responder com arquivos",
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Momentaneamente, não é possível responder com um arquivo. Você quer fazer o envio deste arquivo sem responder a mensagem?",
+    "The file '%(fileName)s' failed to upload.": "O envio do arquivo '%(fileName)s' falhou.",
+    "The server does not support the room version specified.": "O servidor não suporta a versão da sala especificada.",
+    "Cancel entering passphrase?": "Cancelar a introdução da frase de senha?",
+    "Are you sure you want to cancel entering passphrase?": "Tem certeza que quer cancelar a introdução da frase de senha?",
+    "Go Back": "Voltar",
+    "Setting up keys": "Configurar chaves",
+    "Name or Matrix ID": "Nome ou ID Matrix",
+    "Room name or address": "Nome ou endereço da sala",
+    "Identity server has no terms of service": "O servidor de identidade não tem termos de serviço",
+    "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.": "Esta ação requer acesso ao servidor de identidade padrão <server /> para poder validar um endereço de e-mail ou número de telefone, mas este servidor não tem nenhum termo de uso.",
+    "Only continue if you trust the owner of the server.": "Continue apenas se você confia em quem possui este servidor.",
+    "Trust": "Confiança",
+    "%(name)s is requesting verification": "%(name)s está solicitando verificação",
+    "Use your account to sign in to the latest version": "Use sua conta para logar na última versão",
+    "We’re excited to announce Riot is now Element": "Estamos muito felizes em anunciar que Riot agora é Element",
+    "Riot is now Element!": "Riot agora é Element!",
+    "Learn More": "Saiba mais",
+    "Sign In or Create Account": "Faça login ou crie uma conta",
+    "Use your account or create a new one to continue.": "Use sua conta ou crie uma nova para continuar.",
+    "Create Account": "Criar conta",
+    "Sign In": "Entrar",
+    "Custom (%(level)s)": "Personalizado (%(level)s)",
+    "Messages": "Mensagens",
+    "Actions": "Ações",
+    "Other": "Outros",
+    "Sends a message as plain text, without interpreting it as markdown": "Envia uma mensagem como texto puro, sem interpretá-la como markdown",
+    "Sends a message as html, without interpreting it as markdown": "Envia uma mensagem como HTML, sem interpretá-la como markdown",
+    "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 mais uma ver 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 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",
+    "Use an identity server": "Usar um servidor de identidade",
+    "Use an identity server to invite by email. Manage in Settings.": "Use um servidor de identidade para convidar pessoas por e-mail. Gerencie nas Configurações.",
+    "Joins room with given address": "Entra em uma sala com o endereço fornecido",
+    "Unrecognised room address:": "Endereço de sala não reconhecido:",
+    "Unbans user with given ID": "Remove o banimento do usuário com o ID indicado",
+    "Command failed": "O comando falhou",
+    "Could not find user in room": "Não encontrei este(a) usuário(a) na sala",
+    "Adds a custom widget by URL to the room": "Adiciona um widget personalizado na sala por meio de um link",
+    "Please supply a widget URL or embed code": "Forneça o link de um widget ou de um código de incorporação",
+    "Please supply a https:// or http:// widget URL": "Forneça o link de um widget com https:// ou http://",
+    "You cannot modify widgets in this room.": "Você não pode modificar widgets nesta sala.",
+    "Verifies a user, session, and pubkey tuple": "Verifica um(a) usuário(a), e a tupla de chave pública",
+    "Unknown (user, session) pair:": "Par (usuária(o), sessão) desconhecido:",
+    "Session already verified!": "Sessão já verificada!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "ATENÇÃO: Sessão já verificada, mas as chaves NÃO SE CORRESPONDEM!",
+    "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 VERIFICAÇÃ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  da(do) usuária(o) %(userId)s. Esta sessão foi marcada como verificada.",
+    "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",
+    "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",
+    "%(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.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s adicionou o endereço alternativo %(addresses)s desta sala.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s removeu os endereços alternativos %(addresses)s desta sala.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s removeu o endereço alternativo %(addresses)s desta sala.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s alterou os endereços alternativos desta sala.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s alterou os endereços principal e alternativos desta sala.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s alterou os endereços desta sala.",
+    "%(senderName)s placed a voice call.": "%(senderName)s iniciou uma chamada de voz.",
+    "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s iniciou uma chamada de voz. (não suportada por este navegador)",
+    "%(senderName)s placed a video call.": "%(senderName)s iniciou uma chamada de vídeo.",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s iniciou uma chamada de vídeo. (não suportada por este navegador)",
+    "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s cancelou o convite para %(targetDisplayName)s entrar na sala.",
+    "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s removeu a regra que bane usuários que correspondem a %(glob)s",
+    "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s removeu a regra que bane salas que correspondem a %(glob)s",
+    "%(senderName)s removed the rule banning servers matching %(glob)s": "%(senderName)s removeu a regra que bane servidores que correspondem a %(glob)s",
+    "%(senderName)s removed a ban rule matching %(glob)s": "%(senderName)s removeu uma regra de banimento correspondendo a %(glob)s",
+    "%(senderName)s updated an invalid ban rule": "%(senderName)s atualizou uma regra de banimento inválida",
+    "%(senderName)s updated the rule banning users matching %(glob)s for %(reason)s": "%(senderName)s atualizou a regra de banimento de usuários correspondendo a %(glob)s devido à %(reason)s",
+    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s atualizou a regra que bane salas que correspondem a %(glob)s devido à %(reason)s",
+    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s atualizou a regra que bane servidores que correspondem a %(glob)s devido à %(reason)s",
+    "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s atualizou uma regra de banimento correspondendo a %(glob)s devido à %(reason)s",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s criou uma regra que bane usuários que correspondem a %(glob)s devido à %(reason)s",
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s criou uma regra que bane salas que correspondem a %(glob)s devido à %(reason)s",
+    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s criou uma regra que bane servidores que correspondem a %(glob)s devido à %(reason)s",
+    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s criou uma regra de banimento correspondendo a %(glob)s devido à %(reason)s",
+    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s alterou uma regra que bania usuários que correspondiam a %(oldGlob)s para corresponder a %(newGlob)s devido à %(reason)s",
+    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s alterou uma regra que bania salas que correspondiam a %(oldGlob)s para corresponder a %(newGlob)s devido à %(reason)s",
+    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s alterou uma regra que bania servidores que correspondiam a %(oldGlob)s para corresponder a %(newGlob)s devido à %(reason)s",
+    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s alterou uma regra que bania o que correspondia a %(oldGlob)s para corresponder a %(newGlob)s devido à %(reason)s",
+    "Light": "Claro",
+    "Dark": "Escuro",
+    "You signed in to a new session without verifying it:": "Você entrou em uma nova sessão sem verificá-la:",
+    "Verify your other session using one of the options below.": "Verifique suas outras sessões usando uma das opções abaixo.",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) entrou em uma nova sessão sem verificá-la:",
+    "Ask this user to verify their session, or manually verify it below.": "Peça a este usuário para verificar a sessão, ou verifique manualmente abaixo.",
+    "Not Trusted": "Não confiável",
+    "Manually Verify by Text": "Verifique manualmente por texto",
+    "Interactively verify by Emoji": "Verifiquem interativamente por emojis",
+    "Done": "Pronto",
+    "Cannot reach homeserver": "Não consigo acessar o servidor",
+    "Ensure you have a stable internet connection, or get in touch with the server admin": "Verifique se está com uma conexão de internet estável, ou entre em contato com os administradores do servidor",
+    "Your %(brand)s is misconfigured": "O %(brand)s está mal configurado",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Peça aos administradores do %(brand)s que verifique <a>suas configurações</a> por entradas incorretas ou duplicadas.",
+    "Cannot reach identity server": "Não consigo acessar o servidor de identidade",
+    "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.": "Você pode se registrar, mas algumas funcionalidades não estarão disponíveis até que o servidor de identidade esteja de volta online. Se você continuar vendo este alerta, verifique sua configuração ou entre em contato com um dos administradores do servidor.",
+    "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.": "Você pode trocar sua senha, mas algumas das funcionalidades não estarão mais disponíveis até que o servidor de identidade esteja de volta ao ar. Se você seguir vendo este alerta, verifique suas configurações ou entre em contato com um dos administradores do servidor.",
+    "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.": "Você pode fazer login, mas algumas funcionalidades estarão indisponíveis até que o servidor de identidade estiver de volta. Se você continuar vendo este alerta, verifique suas configurações ou entre em contato com os administradores do servidor.",
+    "No homeserver URL provided": "Nenhum endereço fornecido do servidor local",
+    "Unexpected error resolving homeserver configuration": "Erro inesperado buscando a configuração do servidor",
+    "Unexpected error resolving identity server configuration": "Erro inesperado buscando a configuração do servidor de identidade",
+    "The message you are trying to send is too large.": "A mensagem que você está tentando enviar é muito grande.",
+    "a few seconds ago": "há alguns segundos",
+    "about a minute ago": "há aproximadamente um minuto",
+    "%(num)s minutes ago": "há %(num)s minutos",
+    "about an hour ago": "há aproximadamente uma hora",
+    "%(num)s hours ago": "há %(num)s horas",
+    "about a day ago": "há aproximadamente um dia",
+    "%(num)s days ago": "há %(num)s dias",
+    "a few seconds from now": "dentro de alguns segundos",
+    "about a minute from now": "dentro de aproximadamente um minuto",
+    "%(num)s minutes from now": "dentro de %(num)s minutos",
+    "about an hour from now": "dentro de aproximadamente uma hora",
+    "%(num)s hours from now": "dentro de %(num)s horas",
+    "about a day from now": "dentro de aproximadamente um dia",
+    "%(num)s days from now": "dentro de %(num)s dias",
+    "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
+    "The user's homeserver does not support the version of the room.": "O servidor desta(e) usuária(o) não suporta a versão desta sala.",
+    "Help us improve %(brand)s": "Ajude-nos a melhorar %(brand)s",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Envie <UsageDataLink>dados anônimos de uso</UsageDataLink> que nos ajudam a melhorar o %(brand)s. Isso necessitará do uso de um <PolicyLink>cookie</PolicyLink>.",
+    "I want to help": "Quero ajudar",
+    "Review where you’re logged in": "Revisar onde você está logada(o)",
+    "Verify all your sessions to ensure your account & messages are safe": "Verifique todas as suas sessões para garantir que sua conta e mensagens estão seguras",
+    "Review": "Revisar",
+    "Later": "Mais tarde",
+    "Your homeserver has exceeded its user limit.": "Seu servidor ultrapassou seu limite de usuárias(os).",
+    "Your homeserver has exceeded one of its resource limits.": "Seu servidor local excedeu um de seus limites de recursos.",
+    "Contact your <a>server admin</a>.": "Entre em contato com sua(seu) <a>administrador(a) do servidor</a>.",
+    "Ok": "Ok",
+    "Set password": "Definir senha",
+    "To return to your account in future you need to set a password": "Para retornar à sua conta no futuro, você precisa definir uma senha",
+    "Set up encryption": "Configurar a criptografia",
+    "Encryption upgrade available": "Atualização de criptografia disponível",
+    "Verify this session": "Verificar esta sessão",
+    "Upgrade": "Atualizar",
+    "Verify": "Verificar",
+    "Verify yourself & others to keep your chats safe": "Verifique a sua conta e as dos seus contatos, para manter suas conversas seguras",
+    "Other users may not trust it": "Outras(os) usuárias(os) podem não confiar nela",
+    "New login. Was this you?": "Novo login. Foi você?",
+    "Verify the new login accessing your account: %(name)s": "Verifique o novo login na sua conta: %(name)s",
+    "Restart": "Reiniciar",
+    "Upgrade your %(brand)s": "Atualize o seu %(brand)s",
+    "A new version of %(brand)s is available!": "Uma nova versão do %(brand)s está disponível!",
+    "Guest": "Convidada(o)",
+    "You joined the call": "Você entrou na chamada",
+    "%(senderName)s joined the call": "%(senderName)s entrou na chamada",
+    "Call in progress": "Chamada em andamento",
+    "You left the call": "Você saiu da chamada",
+    "%(senderName)s left the call": "%(senderName)s saiu da chamada",
+    "Call ended": "Chamada encerrada",
+    "You started a call": "Você iniciou uma chamada",
+    "%(senderName)s started a call": "%(senderName)s iniciou uma chamada",
+    "Waiting for answer": "Aguardando a resposta",
+    "%(senderName)s is calling": "%(senderName)s está chamando",
+    "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
+    "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
+    "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
+    "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
+    "New spinner design": "Novo design do spinner",
+    "Multiple integration managers": "Múltiplos gestores de integrações",
+    "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",
+    "Font size": "Tamanho da fonte",
+    "Use custom size": "Usar tamanho personalizado",
+    "Use a more compact ‘Modern’ layout": "Usar um layout mais compacto 'Moderno'",
+    "Show typing notifications": "Mostrar notificações de digitação",
+    "Match system theme": "Se adaptar ao tema do sistema",
+    "Use a system font": "Usar uma fonte do sistema",
+    "System font name": "Nome da fonte do sistema",
+    "Never send encrypted messages to unverified sessions from this session": "Nunca envie mensagens criptografadas para sessões não verificadas desta sessão",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Nunca envie mensagens criptografadas para sessões não verificadas nesta sala, desta sessão",
+    "Order rooms by name": "Ordenar salas por nome",
+    "Show rooms with unread notifications first": "Mostrar primeiro as salas com notificações não lidas",
+    "Show shortcuts to recently viewed rooms above the room list": "Mostrar atalhos para salas recentemente visualizadas acima da lista de salas",
+    "Show hidden events in timeline": "Mostrar eventos ocultos na timeline",
+    "Low bandwidth mode": "Modo de baixo uso de dados",
+    "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 a assistência do servidor de chamadas reserva turn.matrix.org quando seu servidor não oferecer este serviço (seu endereço IP será transmitido quando você ligar)",
+    "Send read receipts for messages (requires compatible homeserver to disable)": "Enviar confirmação de leitura para mensagens (necessita um servidor compatível para desativar)",
+    "Show previews/thumbnails for images": "Mostrar miniaturas e resumos para imagens",
+    "Enable message search in encrypted rooms": "Ativar busca de mensagens em salas criptografadas",
+    "How fast should messages be downloaded.": "Com qual rapidez as mensagens devem ser baixadas.",
+    "Manually verify all remote sessions": "Verificar manualmente todas as sessões remotas",
+    "IRC display name width": "Largura do nome e sobrenome nas mensagens",
+    "Enable experimental, compact IRC style layout": "Ativar o layout compacto experimental nas mensagens",
+    "When rooms are upgraded": "Quando salas são atualizadas",
+    "My Ban List": "Minha lista de banidos",
+    "This is your list of users/servers you have blocked - don't leave the room!": "Esta é a sua lista de usuárias(os)/servidores que você bloqueou - não saia da sala!",
+    "Unknown caller": "Pessoa desconhecida ligando",
+    "Incoming voice call": "Recebendo chamada de voz",
+    "Incoming video call": "Recebendo chamada de vídeo",
+    "Incoming call": "Recebendo chamada",
+    "Verify this session by completing one of the following:": "Verifique esta sessão completando um dos seguintes:",
+    "Scan this unique code": "Escaneie este código único",
+    "or": "ou",
+    "Compare unique emoji": "Comparar emojis únicos",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Compare um conjunto único de emojis se você não tem uma câmera em nenhum dos dois aparelhos",
+    "Start": "Iniciar",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Confirme que os emojis abaixo estão sendo exibidos nas duas sessões, na mesma ordem:",
+    "Verify this session by confirming the following number appears on its screen.": "Verifique esta sessão confirmando que o seguinte número aparece na sua tela.",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Aguardando a outra sessão, %(deviceName)s (%(deviceId)s), verificar…",
+    "Waiting for your other session to verify…": "Aguardando a outra sessão verificar…",
+    "Waiting for %(displayName)s to verify…": "Aguardando %(displayName)s verificar…",
+    "Cancelling…": "Cancelando…",
+    "They match": "São coincidentes",
+    "They don't match": "Elas não são correspondentes",
+    "To be secure, do this in person or use a trusted way to communicate.": "Para sua segurança, faça isso pessoalmente ou use uma forma confiável de comunicação.",
+    "Lock": "Cadeado",
+    "From %(deviceName)s (%(deviceId)s)": "De %(deviceName)s (%(deviceId)s)",
+    "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 />.",
+    "Workspace: %(networkName)s": "Espaço de trabalho: %(networkName)s",
+    "Channel: %(channelName)s": "Canal: %(channelName)s",
+    "Show less": "Mostrar menos",
+    "Show more": "Mostrar mais",
+    "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.": "Ao mudar a senha, você apagará todas as chaves de criptografia de ponta a ponta existentes em todas as sessões, fazendo com que o histórico de conversas criptografadas fique ilegível, a não ser que você exporte as salas das chaves criptografadas antes de mudar a senha e então as importe novamente depois. No futuro, isso será melhorado.",
+    "Your homeserver does not support cross-signing.": "Seu servidor não suporta a autoverificação.",
+    "Cross-signing and secret storage are enabled.": "A autoverificação e o armazenamento secreto estão ativados.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Sua conta tem uma identidade autoverificada em armazenamento secreto, mas ainda não é considerada confiável por esta sessão.",
+    "Cross-signing and secret storage are not yet set up.": "A autoverificação e o armazenamento seguro ainda não foram configurados.",
+    "Reset cross-signing and secret storage": "Refazer a autoverificação e o armazenamento secreto",
+    "Bootstrap cross-signing and secret storage": "Fazer a autoverificação e o armazenamento secreto",
+    "well formed": "bem formado",
+    "unexpected type": "tipo inesperado",
+    "Cross-signing public keys:": "Chaves públicas de autoverificação:",
+    "in memory": "na memória",
+    "not found": "não encontradas",
+    "Cross-signing private keys:": "Chaves privadas de autoverificação:",
+    "in secret storage": "em armazenamento secreto",
+    "Self signing private key:": "Chave privada auto-assinada:",
+    "cached locally": "armazenado localmente",
+    "not found locally": "não encontrado localmente",
+    "User signing private key:": "Chave privada de assinatura da(do) usuária(o):",
+    "Session backup key:": "Chave de cópia (backup) da sessão:",
+    "Secret storage public key:": "Chave pública do armazenamento secreto:",
+    "in account data": "nos dados de conta",
+    "Homeserver feature support:": "Funcionalidades suportadas pelo servidor:",
+    "exists": "existe",
+    "Your homeserver does not support session management.": "Seu servidor não suporta gerenciamento de sessões.",
+    "Unable to load session list": "Não foi possível carregar a lista de sessões",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Confirme o apagamento destas sessões usando Single Sign On para comprovar sua identidade.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Confirme o apagamento desta sessão usando Single Sign On para comprovar sua identidade.",
+    "Confirm deleting these sessions": "Confirme o apagamento destas sessões",
+    "Click the button below to confirm deleting these sessions.|other": "Clique no botão abaixo para confirmar o apagamento destas sessões.",
+    "Click the button below to confirm deleting these sessions.|one": "Clique no botão abaixo para confirmar o apagamento desta sessão.",
+    "Delete sessions|other": "Apagar sessões",
+    "Delete sessions|one": "Apagar sessão",
+    "Delete %(count)s sessions|other": "Apagar %(count)s sessões",
+    "Delete %(count)s sessions|one": "Apagar %(count)s sessão",
+    "ID": "ID",
+    "Public Name": "Nome público",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Verificar individualmente cada sessão usada por um usuário para marcá-la como confiável, em vez de confiar em aparelhos autoverificados.",
+    "Securely cache encrypted messages locally for them to appear in search results, using ": "Armazene mensagens criptografadas localmente para que elas apareçam nas buscas, usando· ",
+    " to store messages from ": " para armazenar mensagens de ",
+    "rooms.": "salas.",
+    "Manage": "Gerenciar",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Armazene mensagens criptografadas de forma segura localmente para que possam aparecer nos resultados das buscas.",
+    "Enable": "Ativar",
+    "%(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 não está com alguns dos componentes necessários para armazenar com segurança mensagens criptografadas localmente. Se você quer fazer testes com esta funcionalidade, construa uma versão Desktop do %(brand)s com <nativeLink>componentes de busca ativos</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 não consegue armazenar de forma segura as mensagens criptografadas localmente enquanto funciona em um navegador web. Use <desktopLink>%(brand)s Desktop</desktopLink> para que 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",
+    "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(a) 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>verificada</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 verificada</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>verificada</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 verificada</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 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",
+    "Please verify the room ID or address and try again.": "Por favor, verifique o ID ou endereço da sala e tente novamente.",
+    "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.": "É possível bloquear pessoas através de listas de banimento que contêm regras sobre quem banir de salas. Colocar alguém na lista de banimento significa que as pessoas ou servidores bloqueados pela lista não serão visualizados por você.",
+    "Session key:": "Chave da sessão:",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "O administrador do servidor desativou a criptografia de ponta a ponta por padrão em salas privadas e em conversas.",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Gerencie os nomes de suas sessões e saia das mesmas abaixo ou <a>verifique-as no seu Perfil de Usuário</a>.",
+    "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>",
+    "Encryption": "Criptografia",
+    "Once enabled, encryption cannot be disabled.": "Uma vez ativada, a criptografia não poderá ser desativada.",
+    "Encrypted": "Criptografada",
+    "Click the link in the email you received to verify and then click continue again.": "Clique no link no e-mail que você recebeu para verificar e então clique novamente em continuar.",
+    "Verify the link in your inbox": "Verifique o link na sua caixa de e-mails",
+    "This room is end-to-end encrypted": "Esta sala é criptografada de ponta a ponta",
+    "Your key share request has been sent - please check your other sessions for key share requests.": "Sua solicitação de compartilhamento de chaves foi enviada - por favor, verifique a existência de solicitações de compartilhamento de chaves em suas outras sessões .",
+    "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.": "Solicitações de compartilhamento de chaves são enviadas para suas outras sessões automaticamente. Se você recusou ou ignorou a solicitação de compartilhamento de chaves em suas outras sessões, clique aqui para solicitar as chaves para esta sessão novamente.",
+    "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Se suas outras sessões não possuem a chave para esta mensagem, você não será capaz de descriptografá-la.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Solicitar novamente as chaves de criptografia</requestLink> das suas outras sessões.",
+    "This message cannot be decrypted": "Esta mensagem não pode ser descriptografada",
+    "Encrypted by an unverified session": "Criptografada por uma sessão não verificada",
+    "Unencrypted": "Descriptografada",
+    "Encrypted by a deleted session": "Criptografada por uma sessão já apagada",
+    "The authenticity of this encrypted message can't be guaranteed on this device.": "A autenticidade desta mensagem criptografada não pode ser garantida neste aparelho.",
+    "People": "Pessoas",
+    "Create room": "Criar sala",
+    "Start chatting": "Começar a conversa",
+    "Try again later, or ask a room admin to check if you have access.": "Tente novamente mais tarde, ou peça a um(a) administrador(a) da sala para verificar se você tem acesso.",
+    "Never lose encrypted messages": "Nunca perca mensagens criptografadas",
+    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "As mensagens nesta sala estão protegidas com a criptografia de ponta a ponta. Apenas você e a(s) demais pessoa(s) desta sala têm a chave para ler estas mensagens.",
+    "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Atualizar esta sala irá fechar a instância atual da sala e criar uma sala atualizada com o mesmo nome.",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "Dica: Inicie sua mensagem com <code>//</code> para iniciar com uma barra.",
+    "Start Verification": "Iniciar verificação",
+    "Messages in this room are end-to-end encrypted.": "As mensagens nesta sala estão criptografadas de ponta a ponta.",
+    "Messages in this room are not end-to-end encrypted.": "As mensagens nesta sala não estão criptografadas de ponta a ponta.",
+    "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "Em salas criptografadas, suas mensagens estão seguras e apenas você e a pessoa que a recebe têm as chaves únicas que permitem a sua leitura.",
+    "Verify User": "Verificar usuária(o)",
+    "For extra security, verify this user by checking a one-time code on both of your devices.": "Para maior segurança, verifique esta(e) usuária(o) verificando um código único em ambos aparelhos.",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "Você apagará para todos as %(count)s mensagens de %(user)s na sala. Isso não pode ser desfeito. Deseja continuar?",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "Você está a ponto de remover 1 mensagem de %(user)s. Isso não poderá ser desfeito. Quer continuar?",
+    "This client does not support end-to-end encryption.": "A sua versão do aplicativo não suporta a criptografia de ponta a ponta.",
+    "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.": "A sessão que você está tentando verificar não permite escanear QR code ou verificação via emojis, que é o que %(brand)s permite. Tente um cliente diferente.",
+    "Verify by scanning": "Verificar através de QR Code",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Se você não consegue escanear o código acima, verifique comparando os emojis únicos.",
+    "Verify by comparing unique emoji.": "Verificar comparando emoji único.",
+    "Verify by emoji": "Verificar por emoji",
+    "Verify all users in a room to ensure it's secure.": "Verificar todas(os) as(os) usuárias(os) em uma sala para se certificar que ela é segura.",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "Em salas criptografadas, verificar todas(os) as(os) usuárias(os) para garantir que elas são seguras.",
+    "Start verification again from the notification.": "Iniciar verificação novamente, após a notificação.",
+    "Start verification again from their profile.": "Iniciar a verificação novamente a partir do perfil deste usuário.",
+    "Encryption enabled": "Criptografia ativada",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "As mensagens nesta sala estão criptografadas de ponta a ponta. Lembre-se de verificar este usuário no perfil dele/dela.",
+    "Encryption not enabled": "Criptografia desativada",
+    "The encryption used by this room isn't supported.": "A criptografia usada nesta sala não é suportada.",
+    "%(name)s wants to verify": "%(name)s deseja verificar",
+    "Smileys & People": "Sorrisos e pessoas",
+    "Widgets do not use message encryption.": "Widgets não usam criptografia de mensagens.",
+    "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "Por favor, <newIssueLink>crie um novo bilhete de erro</newIssueLink> no GitHub para que possamos investigar esta falha.",
+    "Enter the name of a new server you want to explore.": "Digite o nome do novo servidor que você deseja explorar.",
+    "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.",
+    "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",
+    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Impedir usuários de outros servidores na rede Matrix de entrarem nesta sala (Essa configuração não pode ser alterada posteriormente!)",
+    "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.": "Você já usou uma versão mais recente do %(brand)s nesta sessão. Para usar esta versão novamente com a criptografia de ponta a ponta, você terá que se desconectar e entrar novamente.",
+    "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifique este usuário para torná-lo confiável. Confiar nos usuários fornece segurança adicional ao trocar mensagens criptografadas de ponta a ponta.",
+    "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 aparelho para torná-lo confiável. Confiar neste aparelho fornecerá segurança adicional para você e aos outros ao trocarem mensagens criptografadas de ponta a ponta.",
+    "We couldn't create your DM. Please check the users you want to invite and try again.": "Não conseguimos criar sua mensagem direta. Por favor, verifique as(os) usuárias(os) que você quer convidar e tente novamente.",
+    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Comece uma conversa com alguém usando o seu respectivo nome e sobrenome, nome de usuário (por exemplo: <userId/>) ou endereço de e-mail.",
+    "a new master key signature": "uma nova chave mestra de assinatura",
+    "a new cross-signing key signature": "uma nova chave de autoverificação",
+    "a key signature": "uma assinatura de chave",
+    "I don't want my encrypted messages": "Não quero minhas mensagens criptografadas",
+    "You'll lose access to your encrypted messages": "Você perderá acesso às suas mensagens criptografadas",
+    "Session key": "Chave da sessão",
+    "Verify session": "Verificar sessão",
+    "We recommend you change your password and recovery key in Settings immediately": "Nós recomendamos que você altere imediatamente sua senha e chave de recuperação nas Configurações",
+    "Use this session to verify your new one, granting it access to encrypted messages:": "Use esta sessão para verificar a sua nova sessão, dando a ela acesso às mensagens criptografadas:",
+    "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>.": "Você já está logada(o) e pode começar a usar à vontade, mas você também pode buscar pelas últimas versões do app em todas as plataformas em <a>element.io/get-started</a>.",
+    "Go to Element": "Ir a Element",
+    "We’re excited to announce Riot is now Element!": "Estamos muito felizes de anunciar que agora Riot é Element!",
+    "Learn more at <a>element.io/previously-riot</a>": "Saiba mais em <a>element.io/previously-riot</a>",
+    "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.",
+    "Verify other session": "Verificar outra sessão",
+    "A widget would like to verify your identity": "Um Widget quer verificar 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 verificar sua identidade. Permitindo isso, o widget poderá verificar sua ID de usuário, mas não poderá realizar nenhuma ação em seu nome.",
+    "Wrong Recovery Key": "Chave de recuperação errada",
+    "Invalid Recovery Key": "Chave de recuperação inválida",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Não foi possível acessar o armazenamento secreto. Por favor, verifique que você entrou com a frase de recuperação correta.",
+    "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Entre com sua Frase de Segurança ou <button>use sua Chave de Segurança</button> para continuar.",
+    "Security Key": "Chave de Segurança",
+    "Use your Security Key to continue.": "Use sua Chave de Segurança para continuar.",
+    "Recovery key mismatch": "A chave de segurança não corresponde à correta",
+    "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ê entrou com 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ê entrou com 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.",
+    "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.",
+    "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",
+    "Liberate your communication": "Liberte sua comunicação",
+    "Send a Direct Message": "Enviar uma mensagem",
+    "Explore Public Rooms": "Explore as salas públicas",
+    "Create a Group Chat": "Criar um chat de grupo",
+    "Explore rooms": "Explorar salas",
+    "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.": "Detectamos uma versão mais antiga do %(brand)s. Isso fará com que a criptografia de ponta a ponta não funcione corretamente. As mensagens criptografadas de ponta a ponta trocadas recentemente, enquanto você usava a versão mais antiga, talvez não sejam descriptografáveis na nova versão. Isso também poderá fazer com que as mensagens trocadas nesta sessão falhem na mais atual. Se você tiver problemas, desconecte-se e entre novamente. Para manter o histórico de mensagens, exporte e reimporte suas chaves.",
+    "%(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": "Verificar 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.",
+    "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",
+    "Use Recovery Key": "Use a chave de recuperação",
+    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Confirme sua identidade através da verificação deste login em qualquer uma de suas outras sessões, garantindo a elas acesso a mensagens criptografadas.",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Sua nova sessão está agora verificada. Ela tem acesso às suas mensagens criptografadas, e outras(os) usuárias(os) poderão ver esta sessão como confiável.",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "Sem completar os procedimentos de segurança nesta sessão, você não terá acesso a mensagens criptografadas.",
+    "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 acesso à sua conta e restaure as chaves de criptografia armazenadas nesta sessão. Sem elas, você não conseguirá ler todas as suas mensagens seguras em nenhuma sessão.",
+    "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.",
+    "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",
+    "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 verifique outras sessões, dando a elas acesso às mensagens criptografadas e marcando-as como confiáveis para as(os) demais usuárias(os).",
+    "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.",
+    "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",
+    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Sua chave de recuperação foi <b>copiada para sua área de transferência</b>. Cole-a em:",
+    "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",
+    "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 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 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 em resultados das buscas:",
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s de %(totalRooms)s",
+    "Jump to start/end of the composer": "Pule para o início/fim do compositor",
+    "Click the button below to confirm adding this phone number.": "Clique no botão abaixo para confirmar a adição deste número de telefone.",
+    "Clear notifications": "Limpar notificações",
+    "There are advanced notifications which are not shown here.": "Existem notificações avançadas que não são mostradas aqui.",
+    "Enable desktop notifications for this session": "Ativar notificações na área de trabalho nesta sessão",
+    "Mentions & Keywords": "Apenas @menções e palavras-chave",
+    "Notification options": "Alterar notificações",
+    "Leave Room": "Sair da sala",
+    "Forget Room": "Esquecer Sala",
+    "Favourited": "Favoritado",
+    "You cancelled verifying %(name)s": "Você cancelou a verificação do %(name)s",
+    "You accepted": "Você aceitou",
+    "%(name)s accepted": "%(name)s aceitou",
+    "You declined": "Você recusou",
+    "You cancelled": "Você cancelou",
+    "%(name)s declined": "%(name)s recusou",
+    "%(name)s cancelled": "%(name)s cancelou",
+    "Accepting …": "Aceitando…",
+    "Declining …": "Recusando…",
+    "You sent a verification request": "Você enviou uma solicitação de verificação",
+    "Show all": "Mostrar tudo",
+    "Reactions": "Reações",
+    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> reagiu com %(content)s</reactedWith>",
+    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>reagiu com %(shortName)s</reactedWith>",
+    "Message deleted": "Mensagem apagada",
+    "Message deleted by %(name)s": "Mensagem apagada por %(name)s",
+    "Message deleted on %(date)s": "Mensagem apagada em %(date)s",
+    "Edited at %(date)s": "Editado em %(date)s",
+    "Click to view edits": "Clicar para ver edições",
+    "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",
+    "Frequently Used": "Mais usados",
+    "Animals & Nature": "Animais e natureza",
+    "Food & Drink": "Comidas e bebidas",
+    "Activities": "Atividades",
+    "Travel & Places": "Viagem e lugares",
+    "Objects": "Objetos",
+    "Symbols": "Símbolos",
+    "Flags": "Bandeiras",
+    "Categories": "Categorias",
+    "Quick Reactions": "Reações rápidas",
+    "Cancel search": "Cancelar busca",
+    "Any of the following data may be shared:": "Qualquer um dos seguintes dados pode ser compartilhado:",
+    "Your theme": "Seu tema",
+    "Room ID": "ID da sala",
+    "Widget ID": "ID do widget",
+    "Widget added by": "Widget adicionado por",
+    "This widget may use cookies.": "Este widget pode usar cookies.",
+    "Maximize apps": "Maximizar app",
+    "More options": "Mais opções",
+    "Join": "Entrar",
+    "Rotate Left": "Girar para a esquerda",
+    "Rotate counter-clockwise": "Girar no sentido anti-horário",
+    "Rotate Right": "Girar para a direita",
+    "Rotate clockwise": "Girar no sentido horário",
+    "Language Dropdown": "Menu suspenso de idiomas",
+    "QR Code": "Código QR",
+    "Room address": "Endereço da sala",
+    "e.g. my-room": "por exemplo: minha-sala",
+    "Some characters not allowed": "Alguns caracteres não são permitidos",
+    "This address is available to use": "Este endereço está disponível para uso",
+    "This address is already in use": "Este endereço já está em uso",
+    "Enter a server name": "Digite um nome de servidor",
+    "Can't find this server or its room list": "Não foi possível encontrar este servidor ou sua lista de salas",
+    "All rooms": "Todas as salas",
+    "Your server": "Seu servidor",
+    "Remove server": "Remover servidor",
+    "Matrix": "Matrix",
+    "Add a new server": "Adicionar um novo servidor",
+    "Server name": "Nome do servidor",
+    "Add a new server...": "Adicionar um novo servidor...",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Lembrete: seu navegador não é compatível; portanto, sua experiência pode ser imprevisível.",
+    "Notes": "Notas",
+    "Removing…": "Removendo…",
+    "Clear all data in this session?": "Limpar todos os dados nesta sessão?",
+    "Clear all data": "Limpar todos os dados",
+    "Please enter a name for the room": "Digite um nome para a sala",
+    "This room is private, and can only be joined by invitation.": "Esta sala é privada, e só pode ser acessada por convite.",
+    "Make this room public": "Tornar pública esta sala",
+    "Hide advanced": "Esconder configurações avançadas",
+    "Show advanced": "Mostrar configurações avançadas",
+    "Are you sure you want to deactivate your account? This is irreversible.": "Tem certeza de que deseja desativar sua conta? Isso é irreversível.",
+    "Confirm account deactivation": "Confirmar desativação da conta",
+    "Server did not return valid authentication information.": "O servidor não retornou informações de autenticação válidas.",
+    "View Servers in Room": "Ver Servidores na Sala",
+    "Verification Requests": "Solicitações de verificação",
+    "Integrations are disabled": "As integrações estão desativadas",
+    "Integrations not allowed": "As integrações não estão permitidas",
+    "End": "Fim",
+    "List options": "Opções da Lista",
+    "Jump to first unread room.": "Ir para a primeira sala não lida.",
+    "Jump to first invite.": "Ir para o primeiro convite.",
+    "Add room": "Adicionar sala",
+    "Show %(count)s more|other": "Mostrar %(count)s a mais",
+    "Show %(count)s more|one": "Mostrar %(count)s a mais",
+    "Use default": "Usar o padrão",
+    "Room options": "Opções da Sala",
+    "%(count)s unread messages including mentions.|other": "%(count)s mensagens não lidas, incluindo menções.",
+    "%(count)s unread messages including mentions.|one": "1 menção não lida.",
+    "%(count)s unread messages.|other": "%(count)s mensagens não lidas.",
+    "%(count)s unread messages.|one": "1 mensagem não lida.",
+    "Unread messages.": "Mensagens não lidas.",
+    "This room is public": "Esta sala é pública",
+    "Away": "Ausente",
+    "This room has already been upgraded.": "Esta sala já foi atualizada.",
+    "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Esta sala está executando a versão <roomVersion />, que este servidor marcou como <i>instável</i>.",
+    "Local address": "Endereço local",
+    "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)",
+    "Local Addresses": "Endereços locais",
+    "%(name)s cancelled verifying": "%(name)s cancelou a verificação",
+    "Your display name": "Seu nome e sobrenome",
+    "Your avatar URL": "Link da sua foto de perfil",
+    "Your user ID": "Sua ID de usuário",
+    "%(brand)s URL": "Link de %(brand)s",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Se você usar esse widget, os dados poderão ser compartilhados <helpIcon /> com %(widgetDomain)s & seu Gerenciador de Integrações.",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "Se você usar esse widget, os dados <helpIcon /> poderão ser compartilhados com %(widgetDomain)s.",
+    "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)s não fizeram alterações %(count)s vezes",
+    "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s não fizeram alterações",
+    "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s não fez alterações %(count)s vezes",
+    "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s não fez alterações",
+    "Power level": "Nível de permissão",
+    "Please provide a room address": "Digite um endereço para a sala",
+    "Looks good": "Muito bem",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "Tem certeza de que deseja remover <b>%(serverName)s</b>",
+    "%(networkName)s rooms": "Salas em %(networkName)s",
+    "Matrix rooms": "Salas em Matrix",
+    "Close dialog": "Fechar caixa de diálogo",
+    "GitHub issue": "Bilhete de erro no GitHub",
+    "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 houver um contexto adicional que ajude a analisar o problema, tal como o que você estava fazendo no momento, IDs de salas, IDs de usuários etc, inclua essas coisas aqui.",
+    "Topic (optional)": "Descrição (opcional)",
+    "There was a problem communicating with the server. Please try again.": "Ocorreu um problema na comunicação com o servidor. Por favor, tente novamente.",
+    "Server did not require any authentication": "O servidor não exigiu autenticação",
+    "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Se você verificar esse usuário, a sessão será marcada como confiável para você e para ele.",
+    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Verificar este aparelho o marcará como confiável, e os usuários que confirmaram com você também confiarão neste aparelho.",
+    "Keep going...": "Continue...",
+    "The username field must not be blank.": "O campo do nome de usuário não pode ficar em branco.",
+    "Username": "Nome de usuário",
+    "Use an email address to recover your account": "Use um endereço de e-mail para recuperar sua conta",
+    "Enter email address (required on this homeserver)": "Digite o endereço de e-mail (necessário neste servidor)",
+    "Doesn't look like a valid email address": "Este não parece ser um endereço de e-mail válido",
+    "Passwords don't match": "As senhas não correspondem",
+    "Other users can invite you to rooms using your contact details": "Outros usuários podem convidá-lo para salas usando seus detalhes de contato",
+    "Enter phone number (required on this homeserver)": "Digite o número de celular (necessário neste servidor)",
+    "Doesn't look like a valid phone number": "Este não parece ser um número de telefone válido",
+    "Use lowercase letters, numbers, dashes and underscores only": "Use apenas letras minúsculas, números, traços e sublinhados",
+    "Enter username": "Digite o nome de usuário",
+    "Email (optional)": "E-mail (opcional)",
+    "Phone (optional)": "Número de celular (opcional)",
+    "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Defina um e-mail para recuperação da conta. Opcionalmente, use e-mail ou número de celular para ser encontrado por seus contatos.",
+    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Você não pôde se conectar na sua conta. Entre em contato com o administrador do servidor para obter mais informações.",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Confirme a adição deste número de telefone usando o Login Único para provar sua identidade.",
+    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Use um servidor de identidade para convidar por e-mail. Clique em continuar para usar o servidor de identidade padrão (%(defaultIdentityServerName)s) ou gerencie nas Configurações.",
+    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Você pode ter configurado estas opções em um cliente que não seja %(brand)s. Você não pode ajustar essas opções no %(brand)s, mas elas ainda se aplicam.",
+    "Enable audible notifications for this session": "Ativar o som de notificações nesta sessão",
+    "Display Name": "Nome e sobrenome",
+    "Identity Server URL must be HTTPS": "O link do servidor de identidade deve começar com HTTPS",
+    "Not a valid Identity Server (status code %(code)s)": "Servidor de Identidade inválido (código de status %(code)s)",
+    "Could not connect to Identity Server": "Não foi possível conectar-se ao Servidor de Identidade",
+    "Checking server": "Verificando servidor",
+    "Change identity server": "Alterar o servidor de identidade",
+    "Disconnect from the identity server <current /> and connect to <new /> instead?": "Desconectar-se do servidor de identidade <current /> e conectar-se em <new /> em vez disso?",
+    "Terms of service not accepted or the identity server is invalid.": "Termos de serviço não aceitos ou o servidor de identidade é inválido.",
+    "The identity server you have chosen does not have any terms of service.": "O servidor de identidade que você escolheu não possui nenhum termo de serviço.",
+    "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:": "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 />",
+    "Disconnect anyway": "Desconectar de qualquer maneira",
+    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Você ainda está <b>compartilhando seus dados pessoais</b> no servidor de identidade <idserver />.",
+    "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Recomendamos que você remova seus endereços de e-mail e números de telefone do servidor de identidade antes de desconectar.",
+    "Go back": "Voltar",
+    "Identity Server (%(server)s)": "Servidor de identidade (%(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.": "No momento, você está usando <server></server> para descobrir e ser descoberto pelos contatos existentes que você conhece. Você pode alterar seu servidor de identidade abaixo.",
+    "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "Se você não quiser usar <server /> para descobrir e ser detectável pelos contatos existentes, digite outro servidor de identidade abaixo.",
+    "Identity Server": "Servidor de identidade",
+    "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "No momento, você não está usando um servidor de identidade. Para descobrir e ser descoberto pelos contatos existentes, adicione um abaixo.",
+    "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.": "Desconectar-se do servidor de identidade significa que você não poderá ser descoberto por outros usuários e não poderá convidar outras pessoas por e-mail ou número de celular.",
+    "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.": "Usar um servidor de identidade é opcional. Se você optar por não usar um servidor de identidade, não poderá ser descoberto por outros usuários e não poderá convidar outras pessoas por e-mail ou por número de celular.",
+    "Do not use an identity server": "Não usar um servidor de identidade",
+    "Enter a new identity server": "Digitar um novo servidor de identidade",
+    "Change": "Alterar",
+    "Manage integrations": "Gerenciar integrações",
+    "New version available. <a>Update now.</a>": "Nova versão disponível. <a>Atualize agora.</a>",
+    "Hey you. You're the best!": "Ei, você aí. Você é incrível!",
+    "Size must be a number": "O tamanho deve ser um número",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "O tamanho da fonte personalizada só pode estar entre %(min)s pt e %(max)s pt",
+    "Use between %(min)s pt and %(max)s pt": "Use entre %(min)s pt e %(max)s pt",
+    "Invalid theme schema.": "Esquema inválido de tema.",
+    "Error downloading theme information.": "Erro ao baixar as informações do tema.",
+    "Theme added!": "Tema adicionado!",
+    "Custom theme URL": "Link do tema personalizado",
+    "Add theme": "Adicionar tema",
+    "Message layout": "Aparência da mensagem",
+    "Compact": "Compacto",
+    "Modern": "Moderno",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Defina o nome de uma fonte instalada no seu sistema e %(brand)s tentará usá-la.",
+    "Customise your appearance": "Personalize sua aparência",
+    "Appearance Settings only affect this %(brand)s session.": "As Configurações de aparência afetam apenas esta sessão do %(brand)s.",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Sua senha foi alterada com sucesso. Você não receberá notificações pop-up em outras sessões até fazer login novamente nelas",
+    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Concorde com os Termos de Serviço do servidor de identidade (%(serverName)s), para que você possa ser descoberto por endereço de e-mail ou por número de celular.",
+    "Discovery": "Contatos",
+    "Deactivate account": "Desativar minha conta",
+    "Clear cache and reload": "Limpar cache e recarregar",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Para relatar um problema de segurança relacionado à tecnologia Matrix, leia a <a>Política de Divulgação de Segurança</a> da Matrix.org.",
+    "Always show the window menu bar": "Mostrar a barra de menu na janela",
+    "Show tray icon and minimize window to it on close": "Mostrar ícone na barra de tarefas, que permanece visível ao fechar a janela",
+    "Read Marker lifetime (ms)": "Duração do marcador de leitura (ms)",
+    "Read Marker off-screen lifetime (ms)": "Vida útil do marcador de leitura fora da tela (ms)",
+    "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",
+    "Emoji picker": "Enviar emoji",
+    "Room %(name)s": "Sala %(name)s",
+    "No recently visited rooms": "Não há salas visitadas recentemente",
+    "Custom Tag": "Etiqueta personalizada",
+    "Joining room …": "Entrando na sala…",
+    "Loading …": "Carregando…",
+    "Rejecting invite …": "Recusando o convite…",
+    "Join the conversation with an account": "Participar da conversa com uma conta",
+    "Sign Up": "Inscrever-se",
+    "Loading room preview": "Carregando visualização da sala",
+    "You were kicked from %(roomName)s by %(memberName)s": "Você foi removida(o) de %(roomName)s por %(memberName)s",
+    "Reason: %(reason)s": "Razão: %(reason)s",
+    "Forget this room": "Esquecer esta sala",
+    "Re-join": "Entrar novamente",
+    "You were banned from %(roomName)s by %(memberName)s": "Você foi banido de %(roomName)s por %(memberName)s",
+    "Something went wrong with your invite to %(roomName)s": "Ocorreu um erro no seu convite para %(roomName)s",
+    "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "Ocorreu um erro (%(errcode)s) ao validar seu convite. Você pode passar essas informações para um administrador da sala.",
+    "You can only join it with a working invite.": "Você só pode participar com um convite válido.",
+    "Try to join anyway": "Tentar entrar mesmo assim",
+    "You can still join it because this is a public room.": "Você ainda pode entrar, porque esta é uma sala pública.",
+    "Join the discussion": "Participar da discussão",
+    "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Este convite para %(roomName)s foi enviado para %(email)s, que não está associado à sua conta",
+    "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Vincule esse e-mail à sua conta em Configurações, para receber convites diretamente em %(brand)s.",
+    "This invite to %(roomName)s was sent to %(email)s": "Este convite para %(roomName)s foi enviado para %(email)s",
+    "Use an identity server in Settings to receive invites directly in %(brand)s.": "Use um servidor de identidade em Configurações para receber convites diretamente em %(brand)s.",
+    "Share this email in Settings to receive invites directly in %(brand)s.": "Compartilhe este e-mail em Configurações para receber convites diretamente em %(brand)s.",
+    "Do you want to chat with %(user)s?": "Deseja conversar com %(user)s?",
+    "<userName/> wants to chat": "<userName/> quer conversar",
+    "Do you want to join %(roomName)s?": "Deseja se juntar a %(roomName)s?",
+    "<userName/> invited you": "<userName/> convidou você",
+    "Reject & Ignore user": "Recusar e bloquear usuário",
+    "You're previewing %(roomName)s. Want to join it?": "Você está visualizando %(roomName)s. Deseja participar?",
+    "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s não pode ser visualizado. Deseja participar?",
+    "This room doesn't exist. Are you sure you're at the right place?": "Esta sala não existe. Tem certeza de que você está no lugar certo?",
+    "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Faça backup de suas chaves com segurança para evitar perdê-las. <a>Saiba mais.</a>",
+    "Not now": "Agora não",
+    "Don't ask me again": "Não pergunte novamente",
+    "Appearance": "Mostrar",
+    "Show rooms with unread messages first": "Salas não lidas primeiro",
+    "Show previews of messages": "Pré-visualizações de mensagens",
+    "Sort by": "Ordenar por",
+    "Activity": "Atividade recente",
+    "A-Z": "A-Z",
+    "Unknown Command": "Comando desconhecido",
+    "Unrecognised command: %(commandText)s": "Comando não reconhecido: %(commandText)s",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Você pode usar <code>/help</code> para listar os comandos disponíveis. Você quis enviar isso como uma mensagem?",
+    "Send as message": "Enviar como mensagem",
+    "Room Topic": "Descrição da sala",
+    "React": "Adicionar reação",
+    "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Se você encontrar algum erro ou tiver um comentário que gostaria de compartilhar, informe-nos no GitHub.",
+    "Resend %(unsentCount)s reaction(s)": "Reenviar %(unsentCount)s reações",
+    "Notification settings": "Configurar notificações",
+    "Want more than a community? <a>Get your own server</a>": "Quer mais do que uma comunidade? <a>Obtenha seu próprio servidor</a>",
+    "Switch to light mode": "Alternar para o modo claro",
+    "Switch to dark mode": "Alternar para o modo escuro",
+    "Security & privacy": "Segurança & privacidade",
+    "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",
+    "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.",
+    "Room List": "Lista de salas",
+    "Autocomplete": "Autocompletar",
+    "Alt": "Alt",
+    "Alt Gr": "Alt Gr",
+    "Shift": "Shift",
+    "Super": "Super",
+    "Ctrl": "Ctrl",
+    "Toggle Bold": "Negrito",
+    "Toggle Italics": "Itálico",
+    "Toggle Quote": "Citar",
+    "New line": "Nova linha",
+    "Navigate recent messages to edit": "Navegue pelas mensagens recentes para editar",
+    "Cancel replying to a message": "Cancelar resposta à mensagem",
+    "Toggle microphone mute": "Ativar/desativar som do microfone",
+    "Toggle video on/off": "Ativar/desativar o vídeo",
+    "Scroll up/down in the timeline": "Rolar para cima/baixo na linha do tempo",
+    "Dismiss read marker and jump to bottom": "Ignorar o marcador de leitura e ir para o final",
+    "Jump to oldest unread message": "Ir para a mensagem não lida mais antiga",
+    "Upload a file": "Enviar um arquivo",
+    "Jump to room search": "Ir para a pesquisa de salas",
+    "Navigate up/down in the room list": "Navegue para cima/baixo na lista de salas",
+    "Select room from the room list": "Selecionar sala da lista de salas",
+    "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.",
+    "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.",
+    "Keyboard Shortcuts": "Atalhos do teclado",
+    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Personalize sua experiência com os recursos experimentais. <a>Saiba mais</a>.",
+    "Ignored/Blocked": "Bloqueado",
+    "Error adding ignored user/server": "Erro ao adicionar usuário/servidor bloqueado",
+    "Something went wrong. Please try again or view your console for hints.": "Não foi possível carregar. Por favor, tente novamente ou veja seu console para obter dicas.",
+    "Error subscribing to list": "Erro ao inscrever-se na lista",
+    "Error removing ignored user/server": "Erro ao remover usuário/servidor bloqueado",
+    "Error unsubscribing from list": "Erro ao cancelar a inscrição da lista",
+    "Please try again or view your console for hints.": "Por favor, tente novamente ou veja seu console para obter dicas.",
+    "None": "Nenhuma",
+    "Server rules": "Regras do servidor",
+    "User rules": "Regras do usuário",
+    "You have not ignored anyone.": "Você não bloqueou ninguém.",
+    "You are currently ignoring:": "Você está bloqueando:",
+    "You are not subscribed to any lists": "Você não está inscrito em nenhuma lista",
+    "Unsubscribe": "Desinscrever-se",
+    "View rules": "Ver regras",
+    "You are currently subscribed to:": "No momento, você está inscrito em:",
+    "⚠ These settings are meant for advanced users.": "⚠ Essas configurações são destinadas a usuários avançados.",
+    "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.": "Adicione aqui os usuários e servidores que você deseja bloquear. Use asteriscos para fazer com que o %(brand)s corresponda a qualquer caractere. Por exemplo, <code>@bot:*</code> bloqueará todos os usuários em qualquer servidor que tenham 'bot' no nome.",
+    "Server or user ID to ignore": "Servidor ou ID de usuário para bloquear",
+    "Subscribe": "Inscrever-se",
+    "Session ID:": "ID da sessão:",
+    "Message search": "Pesquisa de mensagens",
+    "Where you’re logged in": "Onde você está conectado",
+    "Set a new custom sound": "Definir um novo som personalizado",
+    "Browse": "Buscar",
+    "Upgrade the room": "Atualizar a sala",
+    "Kick users": "Remover usuários",
+    "Ban users": "Banir usuários",
+    "Remove messages": "Apagar mensagens dos outros",
+    "Notify everyone": "Notificar todos",
+    "Your email address hasn't been verified yet": "Seu endereço de e-mail ainda não foi verificado",
+    "Revoke": "Revogar",
+    "Share": "Compartilhar",
+    "Unable to revoke sharing for phone number": "Não foi possível revogar o compartilhamento do número de celular",
+    "Unable to share phone number": "Não foi possível compartilhar o número de celular",
+    "Please enter verification code sent via text.": "Digite o código de verificação enviado por mensagem de texto.",
+    "Remove %(email)s?": "Remover %(email)s?",
+    "Remove %(phone)s?": "Remover %(phone)s?",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Digite o código de verificação enviado por mensagem de texto para +%(msisdn)s.",
+    "This user has not verified all of their sessions.": "Este usuário não verificou todas as próprias sessões.",
+    "You have not verified this user.": "Você não verificou este usuário.",
+    "You have verified this user. This user has verified all of their sessions.": "Você confirmou este usuário. Este usuário verificou todas as próprias sessões.",
+    "Someone is using an unknown session": "Alguém está usando uma sessão desconhecida",
+    "Everyone in this room is verified": "Todos nesta sala estão verificados",
+    "Edit message": "Editar mensagem",
+    "Mod": "Moderador",
+    "Scroll to most recent messages": "Ir para as mensagens mais recentes",
+    "Close preview": "Fechar a visualização",
+    "Send a reply…": "Enviar uma resposta…",
+    "Send a message…": "Digite uma mensagem…",
+    "Bold": "Negrito",
+    "Italics": "Itálico",
+    "Strikethrough": "Riscado",
+    "Code block": "Bloco de código",
+    "Failed to connect to integration manager": "Falha ao conectar-se ao gerenciador de integrações",
+    "Failed to revoke invite": "Falha ao revogar o convite",
+    "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Não foi possível revogar o convite. O servidor pode estar com um problema temporário ou você não tem permissões suficientes para revogar o convite.",
+    "Revoke invite": "Revogar o convite",
+    "Invited by %(sender)s": "Convidado por %(sender)s",
+    "Mark all as read": "Marcar tudo como lido",
+    "Error updating main address": "Erro ao atualizar o endereço principal",
+    "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Ocorreu um erro ao atualizar o endereço principal da sala. Isso pode não ser permitido pelo servidor ou houve um problema temporário.",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Ocorreu um erro ao atualizar o endereço alternativo da sala. Isso pode não ser permitido pelo servidor ou houve um problema temporário.",
+    "Error creating address": "Erro ao criar o endereço",
+    "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "Ocorreu um erro ao criar esse endereço. Isso pode não ser permitido pelo servidor ou houve um problema temporário.",
+    "You don't have permission to delete the address.": "Você não tem permissão para excluir este endereço.",
+    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Ocorreu um erro ao remover esse endereço. Ele pode não mais existir ou houve um problema temporário.",
+    "Error removing address": "Erro ao remover o endereço",
+    "Main address": "Endereço principal",
+    "Room Name": "Nome da sala",
+    "Room avatar": "Foto da sala",
+    "Waiting for you to accept on your other session…": "Aguardando sua confirmação na sua outra sessão…",
+    "Waiting for %(displayName)s to accept…": "Aguardando %(displayName)s aceitar…",
+    "Accepting…": "Aceitando…",
+    "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Suas mensagens são protegidas e somente você e o destinatário têm as chaves exclusivas para desbloqueá-las.",
+    "Your messages are not secure": "Suas mensagens não estão seguras",
+    "Your homeserver": "Seu servidor local",
+    "Trusted": "Confiável",
+    "Not trusted": "Não confiável",
+    "%(count)s verified sessions|other": "%(count)s sessões verificadas",
+    "%(count)s verified sessions|one": "1 sessão verificada",
+    "Hide verified sessions": "Esconder sessões verificadas",
+    "%(count)s sessions|other": "%(count)s sessões",
+    "%(count)s sessions|one": "%(count)s sessão",
+    "Hide sessions": "Esconder sessões",
+    "No recent messages by %(user)s found": "Nenhuma mensagem recente de %(user)s foi encontrada",
+    "Remove recent messages by %(user)s": "Apagar mensagens de %(user)s na sala",
+    "Remove %(count)s messages|other": "Apagar %(count)s mensagens para todos",
+    "Remove %(count)s messages|one": "Remover 1 mensagem",
+    "Remove recent messages": "Apagar mensagens desta pessoa na sala",
+    "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong> em %(roomName)s",
+    "Deactivate user?": "Desativar usuário?",
+    "Deactivate user": "Desativar usuário",
+    "Failed to deactivate user": "Falha ao desativar o usuário",
+    "Security": "Segurança",
+    "You've successfully verified your device!": "Você verificou o seu aparelho com êxito!",
+    "Verification timed out.": "O tempo de verificação se esgotou.",
+    "You cancelled verification on your other session.": "Você cancelou a verificação em sua outra sessão.",
+    "%(displayName)s cancelled verification.": "%(displayName)s cancelou a verificação.",
+    "You cancelled verification.": "Você cancelou a verificação.",
+    "Verification cancelled": "Verificação cancelada",
+    "Compare emoji": "Compare os emojis",
+    "Show image": "Mostrar imagem",
+    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Você bloqueou este usuário, portanto, a mensagem dele foi escondida. <a>Mostrar mesmo assim.</a>",
+    "You verified %(name)s": "Você verificou %(name)s",
+    "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Use um servidor de identidade para convidar por e-mail. <default>Use o padrão (%(defaultIdentityServerName)s)</default> ou um servidor personalizado em <settings>Configurações</settings>.",
+    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Use um servidor de identidade para convidar por e-mail. Gerencie o servidor em <settings>Configurações</settings>.",
+    "Destroy cross-signing keys?": "Destruir chaves autoverificadas?",
+    "Waiting for partner to confirm...": "Aguardando seu contato confirmar...",
+    "Enable 'Manage Integrations' in Settings to do this.": "Para fazer isso, ative 'Gerenciar Integrações' nas Configurações.",
+    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Seu %(brand)s não permite que você use o Gerenciador de Integrações para fazer isso. Entre em contato com um administrador.",
+    "Confirm to continue": "Confirme para continuar",
+    "Click the button below to confirm your identity.": "Clique no botão abaixo para confirmar sua identidade.",
+    "Failed to invite the following users to chat: %(csvUsers)s": "Falha ao convidar os seguintes usuários para a conversa: %(csvUsers)s",
+    "Something went wrong trying to invite the users.": "Ocorreu um erro ao tentar convidar os usuários.",
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "Não foi possível convidar esses usuários. Por favor, tente novamente.",
+    "Failed to find the following users": "Falha ao encontrar os seguintes usuários",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Os seguintes usuários não puderam ser convidados porque não existem ou são inválidos: %(csvNames)s",
+    "Recent Conversations": "Conversas recentes",
+    "Suggestions": "Sugestões",
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Convide alguém buscando o seu respectivo nome e sobrenome, nome de usuário (por exemplo: <userId/>), endereço de e-mail ou <a>compartilhe esta sala</a>.",
+    "Use your account to sign in to the latest version of the app at <a />": "Use sua conta para fazer login na versão mais recente do aplicativo em <a />",
+    "Report bugs & give feedback": "Relatar erros & enviar comentários",
+    "Room Settings - %(roomName)s": "Configurações da sala - %(roomName)s",
+    "Automatically invite users": "Convidar usuários automaticamente",
+    "Upgrade private room": "Atualizar a sala privada",
+    "Upgrade public room": "Atualizar a sala pública",
+    "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Atualizar uma sala é uma ação avançada e geralmente é recomendada quando uma sala está instável devido a erros, recursos ausentes ou vulnerabilidades de segurança.",
+    "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>.": "Isso geralmente afeta apenas como a sala é processada no servidor. Se você tiver problemas com o %(brand)s, <a>informe um erro</a>.",
+    "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>.",
+    "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",
+    "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",
+    "Summary": "Resumo",
+    "Document": "Documento",
+    "Upload files (%(current)s of %(total)s)": "Enviar arquivos (%(current)s de %(total)s)",
+    "Upload files": "Enviar arquivos",
+    "Upload all": "Enviar tudo",
+    "This file is <b>too large</b> to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Este arquivo é <b>muito grande</b> para ser enviado. O limite do tamanho de arquivos é %(limit)s, enquanto que o tamanho desse arquivo é %(sizeOfThisFile)s.",
+    "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Esses arquivos são <b>muito grandes</b> para serem enviados. O limite do tamanho de arquivos é %(limit)s.",
+    "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Alguns arquivos são <b>muito grandes</b> para serem enviados. O limite do tamanho de arquivos é %(limit)s.",
+    "Upload %(count)s other files|other": "Enviar %(count)s outros arquivos",
+    "Upload %(count)s other files|one": "Enviar %(count)s outros arquivos",
+    "Cancel All": "Cancelar tudo",
+    "Upload Error": "Erro no envio",
+    "Verification Request": "Solicitação de verificação",
+    "Remember my selection for this widget": "Lembrar minha escolha para este widget",
+    "Deny": "Rejeitar",
+    "Wrong file type": "Tipo errado de arquivo",
+    "Address (optional)": "Endereço (opcional)",
+    "Report Content": "Denunciar conteúdo",
+    "Update status": "Atualizar status",
+    "Set status": "Definir status",
+    "Hide": "Esconder",
+    "Help": "Ajuda",
+    "Remove for everyone": "Remover para todos",
+    "Remove for me": "Remover para mim",
+    "User Status": "Status do usuário",
+    "This homeserver would like to make sure you are not a robot.": "Este servidor local quer se certificar de que você não é um robô.",
+    "Confirm your identity by entering your account password below.": "Confirme sua identidade digitando sua senha abaixo.",
+    "Unable to validate homeserver/identity server": "Não foi possível validar seu servidor local/servidor de identidade",
+    "Server Name": "Nome do servidor",
+    "Enter password": "Digite a senha",
+    "Nice, strong password!": "Muito bem, uma senha forte!",
+    "Password is allowed, but unsafe": "Esta senha é permitida, mas não é segura",
+    "Not sure of your password? <a>Set a new one</a>": "Esqueceu sua senha? <a>Defina uma nova</a>",
+    "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Defina um e-mail para poder recuperar a conta. Este e-mail também pode ser usado para encontrar seus contatos.",
+    "Enter your custom homeserver URL <a>What does this mean?</a>": "Digite o endereço de um servidor local <a>O que isso significa?</a>",
+    "Homeserver URL": "Endereço do servidor local",
+    "Identity Server URL": "Endereço do servidor de identidade",
+    "Other servers": "Outros servidores",
+    "Free": "Gratuito",
+    "Find other public servers or use a custom server": "Encontre outros servidores públicos ou use um servidor personalizado",
+    "Sign in to your Matrix account on %(serverName)s": "Faça login com sua conta Matrix em %(serverName)s",
+    "Sign in to your Matrix account on <underlinedServerName />": "Faça login com sua conta Matrix em <underlinedServerName />",
+    "Sign in with SSO": "Faça login com SSO (Login Único)",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Por favor, instale o <chromeLink>Chrome</chromeLink>, o <firefoxLink>Firefox</firefoxLink> ou o <safariLink>Safari</safariLink> para obter a melhor experiência de uso.",
+    "Couldn't load page": "Não foi possível carregar a página",
+    "This homeserver does not support communities": "Este servidor local não suporta o recurso de comunidades",
+    "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s não conseguiu obter a lista de protocolos do servidor local. O servidor local pode ser muito antigo para suportar redes de terceiros.",
+    "%(brand)s failed to get the public room list.": "%(brand)s não conseguiu obter a lista de salas públicas.",
+    "The homeserver may be unavailable or overloaded.": "O servidor local pode estar indisponível ou sobrecarregado.",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "Excluir o endereço da sala %(alias)s e remover %(name)s da lista de salas?",
+    "delete the address.": "exclui o endereço.",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s não sabe como entrar em uma sala desta rede",
+    "View": "Ver",
+    "Find a room…": "Encontrar uma sala…",
+    "Find a room… (e.g. %(exampleRoom)s)": "Encontrar uma sala… (por exemplo: %(exampleRoom)s)",
+    "Search rooms": "Buscar salas",
+    "You have %(count)s unread notifications in a prior version of this room.|other": "Você tem %(count)s notificações não lidas em uma versão anterior desta sala.",
+    "You have %(count)s unread notifications in a prior version of this room.|one": "Você tem %(count)s notificações não lidas em uma versão anterior desta sala.",
+    "Feedback": "Fale conosco",
+    "User menu": "Menu do usuário",
+    "Could not load user profile": "Não foi possível carregar o perfil do usuário",
+    "Session verified": "Sessão verificada",
+    "Your Matrix account on %(serverName)s": "Sua conta Matrix em %(serverName)s",
+    "Your Matrix account on <underlinedServerName />": "Sua conta Matrix em <underlinedServerName />",
+    "No identity server is configured: add one in server settings to reset your password.": "Nenhum servidor de identidade está configurado: adicione um nas configurações do servidor para redefinir sua senha.",
+    "A verification email will be sent to your inbox to confirm setting your new password.": "Um e-mail de verificação será enviado para sua caixa de entrada para confirmar sua nova senha.",
+    "Your password has been reset.": "Sua senha foi alterada.",
+    "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.": "Você foi desconectado de todas as sessões e não receberá mais notificações. Para reativar as notificações, faça login novamente em cada aparelho.",
+    "Set a new password": "Digite uma nova senha",
+    "Invalid base_url for m.homeserver": "base_url inválido para m.homeserver",
+    "Invalid base_url for m.identity_server": "base_url inválido para m.identity_server",
+    "This account has been deactivated.": "Esta conta foi desativada.",
+    "Syncing...": "Sincronizando...",
+    "%(brand)s Web": "%(brand)s Web",
+    "Your new session is now verified. Other users will see it as trusted.": "Sua nova sessão agora está confirmada. Para outros usuários ela será vista como confiável.",
+    "Forgotten your password?": "Esqueceu sua senha?",
+    "Restore": "Restaurar",
+    "Copy": "Copiar",
+    "For maximum security, this should be different from your account password.": "Para segurança máxima, essa deve ser diferente da senha da sua conta.",
+    "Success!": "Pronto!",
+    "Disable": "Desativar",
+    "Space used:": "Espaço usado:",
+    "Navigation": "Navegação",
+    "Calls": "Chamadas",
+    "Esc": "Esc",
+    "Enter": "Enter",
+    "Change notification settings": "Alterar configuração de notificações",
+    "Your server isn't responding to some <a>requests</a>.": "Seu servidor não está respondendo a algumas <a>solicitações</a>.",
+    "Ban list rules - %(roomName)s": "Regras da lista de banidos - %(roomName)s",
+    "Personal ban list": "Lista pessoal de banidos",
+    "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.": "Sua lista pessoal de banidos contém todos os usuários/servidores dos quais você não deseja mais receber mensagens. Depois de bloquear o primeiro usuário/servidor, uma nova sala será exibida na sua lista de salas chamada 'Minha lista de banidos' - permaneça nesta sala para manter a lista de banidos em vigor.",
+    "Subscribing to a ban list will cause you to join it!": "Inscrever-se em uma lista de banidos significa participar dela!",
+    "If this isn't what you want, please use a different tool to ignore users.": "Se isso não for o que você deseja, use outra ferramenta para bloquear os usuários.",
+    "Room ID or address of ban list": "ID da sala ou endereço da lista de banidos",
+    "Uploaded sound": "Som enviado",
+    "Sounds": "Sons",
+    "Notification sound": "Som de notificação",
+    "Unable to revoke sharing for email address": "Não foi possível revogar o compartilhamento do endereço de e-mail",
+    "Unable to share email address": "Não foi possível compartilhar o endereço de e-mail",
+    "Direct message": "Enviar mensagem",
+    "Incoming Verification Request": "Recebendo solicitação de verificação",
+    "Recently Direct Messaged": "Conversas recentes",
+    "Direct Messages": "Conversas",
+    "Your account is not secure": "Sua conta não está segura",
+    "Server isn't responding": "O servidor não está respondendo",
+    "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "Seu servidor não está respondendo a algumas de suas solicitações. Abaixo estão alguns dos motivos mais prováveis.",
+    "The server (%(serverName)s) took too long to respond.": "O servidor (%(serverName)s) demorou muito para responder.",
+    "Your firewall or anti-virus is blocking the request.": "Seu firewall ou o antivírus está bloqueando a solicitação.",
+    "The server is offline.": "O servidor está fora do ar.",
+    "The server is not configured to indicate what the problem is (CORS).": "O servidor não está configurado para indicar qual é o problema (CORS).",
+    "Recent changes that have not yet been received": "Alterações recentes que ainda não foram recebidas",
+    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Isso permitirá que você retorne à sua conta depois de se desconectar e fazer login em outras sessões.",
+    "Missing session data": "Dados de sessão ausentes",
+    "Be found by phone or email": "Seja encontrada/o por número de celular ou por e-mail",
+    "Looks good!": "Muito bem!",
+    "Security Phrase": "Frase de segurança",
+    "Restoring keys from backup": "Restaurando chaves do backup",
+    "Fetching keys from server...": "Obtendo chaves do servidor...",
+    "%(completed)s of %(total)s keys restored": "%(completed)s de %(total)s chaves restauradas",
+    "Incorrect recovery passphrase": "Frase de recuperação incorreta",
+    "Keys restored": "Chaves restauradas",
+    "Successfully restored %(sessionCount)s keys": "%(sessionCount)s chaves foram restauradas com sucesso",
+    "Enter recovery passphrase": "Digite a senha de recuperação",
+    "Resend edit": "Reenviar edição",
+    "Resend removal": "Reenviar a exclusão",
+    "Share Permalink": "Compartilhar link",
+    "Reload": "Recarregar",
+    "Take picture": "Tirar uma foto",
+    "Country Dropdown": "Selecione o país",
+    "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.": "Você pode usar as opções personalizadas do servidor para entrar em outros servidores Matrix especificando um endereço de servidor local diferente. Isso permite que você use %(brand)s com uma conta Matrix existente em um servidor local diferente.",
+    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Nenhum servidor de identidade está configurado, portanto você não pode adicionar um endereço de e-mail para redefinir sua senha no futuro.",
+    "Enter your custom identity server URL <a>What does this mean?</a>": "Digite o endereço do servidor de identidade personalizado <a>O que isso significa?</a>",
+    "Join millions for free on the largest public server": "Junte-se a milhões de pessoas gratuitamente no maior servidor público",
+    "Premium": "Premium",
+    "Premium hosting for organisations <a>Learn more</a>": "Hospedagem premium para organizações <a>Saiba mais</a>",
+    "Self-verification request": "Solicitação de auto-verificação",
+    "Switch theme": "Escolha um tema",
+    "Signing In...": "Entrando...",
+    "<a>Log in</a> to your new account.": "<a>Entrar</a> em sua nova conta.",
+    "You can now close this window or <a>log in</a> to your new account.": "Agora você pode fechar esta janela ou <a>entrar</a> na sua nova conta.",
+    "Registration Successful": "Registro bem-sucedido",
+    "Notification Autocomplete": "Notificação do preenchimento automático",
+    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Alterações em quem pode ler o histórico de conversas aplica-se apenas para mensagens futuras nesta sala. A visibilidade do histórico existente não será alterada.",
+    "Ask %(displayName)s to scan your code:": "Peça para %(displayName)s escanear o seu código:",
+    "Almost there! Is %(displayName)s showing the same shield?": "Quase lá! Este escudo também aparece para %(displayName)s?",
+    "You've successfully verified %(displayName)s!": "Você verificou %(displayName)s com sucesso!",
+    "Confirm this user's session by comparing the following with their User Settings:": "Confirme a sessão deste usuário comparando o seguinte com as configurações deste usuário:",
+    "Report Content to Your Homeserver Administrator": "Denunciar conteúdo ao administrador do seu servidor principal",
+    "Cross-signing": "Autoverificação",
+    "Discovery options will appear once you have added an email above.": "As opções de descoberta aparecerão assim que você adicione um e-mail acima.",
+    "Error updating flair": "Falha ao atualizar o ícone",
+    "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Ocorreu um erro ao atualizar o ícone nesta sala. O servidor pode não permitir ou ocorreu um erro temporário.",
+    "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?": "Desativar este usuário irá desconectá-lo e impedi-lo de fazer o login novamente. Além disso, ele sairá de todas as salas em que estiver. Esta ação não pode ser revertida. Tem certeza de que deseja desativar este usuário?",
+    "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.": "Apagar chaves de autoverificação é permanente. Qualquer pessoa com quem você fez a verificação receberá alertas de segurança. Não é aconselhável fazer isso, a menos que você tenha perdido todos os aparelhos nos quais fez a autoverificação.",
+    "Clear cross-signing keys": "Limpar chaves autoverificadas",
+    "a device cross-signing signature": "um aparelho autoverificado",
+    "Homeserver URL does not appear to be a valid Matrix homeserver": "O endereço do servidor local não parece indicar um servidor local válido na Matrix",
+    "Identity server URL does not appear to be a valid identity server": "O endereço do servidor de identidade não parece indicar um servidor de identidade válido",
+    "This homeserver does not support login using email address.": "Este servidor local não suporta login usando endereço de e-mail.",
+    "or another cross-signing capable Matrix client": "ou outro cliente Matrix com capacidade de autoverificação",
+    "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "Quando há muitas mensagens, isso pode levar algum tempo. Por favor, não recarregue o seu cliente enquanto isso.",
+    "<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>Atenção</b>: ao atualizar uma sala, <i>os membros da sala não são migrados automaticamente para a versão atualizada da sala.</i> Publicaremos um link da nova sala na versão antiga da sala - os membros da sala terão que clicar neste link para entrar na nova sala.",
+    "Upgrade this room to the recommended room version": "Atualizar a versão desta sala",
+    "this room": "esta sala",
+    "View older messages in %(roomName)s.": "Ler mensagens antigas em %(roomName)s.",
+    "Error changing power level": "Erro ao alterar a permissão do usuário",
+    "Complete": "Concluir",
+    "Discovery options will appear once you have added a phone number above.": "As opções de descoberta aparecerão assim que você adicione um número de telefone acima.",
+    "No other published addresses yet, add one below": "Nenhum endereço publicado ainda, adicione um abaixo",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "Defina endereços para esta sala, de modo que os usuários possam encontrar esta sala em seu servidor local (%(localDomain)s)",
+    "One of the following may be compromised:": "Um dos seguintes pode estar comprometido:",
+    "The homeserver the user you’re verifying is connected to": "O servidor local no qual o usuário que você está verificando está conectado",
+    "Yours, or the other users’ internet connection": "A sua conexão de internet ou a dos outros usuários",
+    "Yours, or the other users’ session": "A sua sessão ou a dos outros usuários",
+    "Got it": "Ok, entendi",
+    "%(brand)s encountered an error during upload of:": "%(brand)s encontrou um erro durante o envio de:",
+    "Upload completed": "Envio concluído",
+    "Cancelled signature upload": "Envio cancelado da assinatura",
+    "Unable to upload": "Falha no envio",
+    "Signature upload success": "Envio bem-sucedido da assinatura",
+    "Signature upload failed": "O envio da assinatura falhou",
+    "Manually export keys": "Exportar chaves manualmente",
+    "Are you sure you want to sign out?": "Deseja mesmo sair?",
+    "Session name": "Nome da sessão",
+    "If they don't match, the security of your communication may be compromised.": "Se eles não corresponderem, a segurança da sua comunicação pode estar comprometida.",
+    "Your homeserver doesn't seem to support this feature.": "O seu servidor local não parece suportar este recurso.",
+    "Message edits": "Edições na mensagem",
+    "Your password": "Sua senha",
+    "This session, or the other session": "Esta sessão, ou a outra sessão",
+    "The internet connection either session is using": "A conexão de internet que cada sessão está usando",
+    "New session": "Nova sessão",
+    "If you didn’t sign in to this session, your account may be compromised.": "Se você não fez login nesta sessão, sua conta pode estar comprometida.",
+    "This wasn't me": "Não foi eu",
+    "Please fill why you're reporting.": "Por favor, descreva porque você está reportando.",
+    "Send report": "Enviar relatório",
+    "A browser extension is preventing the request.": "Uma extensão do navegador está impedindo a solicitação.",
+    "The server has denied your request.": "O servidor recusou a sua solicitação.",
+    "No files visible in this room": "Não há arquivos nesta sala",
+    "Attach files from chat or just drag and drop them anywhere in a room.": "Anexe arquivos na conversa, ou simplesmente arraste e solte arquivos em qualquer lugar na sala.",
+    "You have no visible notifications in this room.": "Não há notificações nesta sala.",
+    "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Sua nova conta (%(newAccountId)s) foi registrada, mas você já está conectado a uma conta diferente (%(loggedInUserId)s).",
+    "%(brand)s Desktop": "%(brand)s para Computador",
+    "%(brand)s iOS": "%(brand)s para iOS",
+    "%(brand)s Android": "%(brand)s para Android",
+    "Failed to re-authenticate due to a homeserver problem": "Falha em autenticar novamente devido à um problema no servidor local",
+    "Failed to re-authenticate": "Falha em autenticar novamente",
+    "Enter your password to sign in and regain access to your account.": "Digite sua senha para entrar e recuperar o acesso à sua conta.",
+    "Sign in and regain access to your account.": "Entre e recupere o acesso à sua conta.",
+    "Enter a Security Phrase": "Digite uma frase de segurança",
+    "Enter your account password to confirm the upgrade:": "Digite a senha da sua conta para confirmar a atualização:",
+    "You'll need to authenticate with the server to confirm the upgrade.": "Você precisará se autenticar no servidor para confirmar a atualização.",
+    "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.": "Digite uma frase de segurança que só você conheça, usada para proteger segredos em seu servidor.",
+    "Use a different passphrase?": "Usar uma frase secreta diferente?",
+    "Enter your recovery passphrase a second time to confirm it.": "Digite sua senha de recuperação uma segunda vez para confirmá-la.",
+    "Confirm your recovery passphrase": "Confirme a sua frase de recuperação"
 }
diff --git a/src/i18n/strings/ro.json b/src/i18n/strings/ro.json
index 6c3059399f..aa87d0a912 100644
--- a/src/i18n/strings/ro.json
+++ b/src/i18n/strings/ro.json
@@ -3,27 +3,20 @@
     "This phone number is already in use": "Acest număr de telefon este deja utilizat",
     "Failed to verify email address: make sure you clicked the link in the email": "Adresa de e-mail nu a putut fi verificată: asigurați-vă că ați făcut click pe linkul din e-mail",
     "The platform you're on": "Platforma pe care te afli",
-    "The version of Riot.im": "Versiunea Riot.im",
+    "The version of %(brand)s": "Versiunea %(brand)s",
     "Whether or not you're logged in (we don't record your username)": "Indiferent dacă sunteți conectat sau nu (nu vă înregistrați numele de utilizator)",
     "Your language of choice": "Alegeți limba",
     "Which officially provided instance you are using, if any": "Ce instanță ați furnizat oficial instanței pe care o utilizați, dacă este cazul",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Indiferent dacă utilizați sau nu modul Richtext mod din Rich Text Editor",
     "Your homeserver's URL": "Adresa URL a Serverului de bază",
-    "Your identity server's URL": "Adresa URL a serverului dvs. de identitate",
     "e.g. %(exampleValue)s": "ex %(exampleValue)s",
     "Every page you use in the app": "Fiecare pagină pe care o utilizați în aplicație",
     "e.g. <CurrentPageURL>": "ex. <CurrentPageURL>",
-    "Your User Agent": "Agentul dvs. de utilizator",
     "Your device resolution": "Rezoluția dispozitivului",
     "Analytics": "Analizarea",
-    "The information being sent to us to help make Riot.im better includes:": "Informațiile care ne sunt trimise pentru a ne ajuta să facem mai bine Riot.im includ:",
+    "The information being sent to us to help make %(brand)s better includes:": "Informațiile care ne sunt trimise pentru a ne ajuta să facem mai bine %(brand)s includ:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "În cazul în care această pagină include informații care pot fi identificate, cum ar fi o cameră, un utilizator sau un ID de grup, aceste date sunt eliminate înainte de a fi trimise la server.",
     "Call Failed": "Apel eșuat",
-    "Review Devices": "Examinați dispozitivele",
-    "Call Anyway": "Sună oricum",
-    "Answer Anyway": "Răspunsul Oricum",
-    "Call": "Sună",
-    "Answer": "Răspunde",
     "Call Timeout": "Durata apelurilor",
     "The remote side failed to pick up": "Partea de la distanță nu a reușit să se ridice",
     "Unable to capture screen": "Imposibil de captat ecran",
@@ -32,7 +25,6 @@
     "VoIP is unsupported": "VoIP nu este acceptat",
     "You cannot place VoIP calls in this browser.": "Nu puteți efectua apeluri VoIP în acest browser.",
     "You cannot place a call with yourself.": "Nu poți apela cu tine însuți.",
-    "Could not connect to the integration server": "Nu s-a putut conecta la serverul de integrare",
     "Call in Progress": "Apel în curs",
     "A call is currently being placed!": "Un apel este în curs de plasare!",
     "A call is already in progress!": "Un apel este deja în curs!",
@@ -42,7 +34,6 @@
     "Upload Failed": "Încărcarea eșuată",
     "Failure to create room": "Eșecul de a crea spațiu",
     "Server may be unavailable, overloaded, or you hit a bug.": "Serverul poate fi indisponibil, supraîncărcat sau ați lovit un bug.",
-    "Send anyway": "Trimite oricum",
     "Send": "Trimite",
     "Sun": "Dum",
     "Mon": "Lun",
@@ -76,7 +67,6 @@
     "Which rooms would you like to add to this community?": "Ce camere doriți să adăugați la această comunitate?",
     "Show these rooms to non-members on the community page and room list?": "Arătați aceste camere către ne-membri pe pagina de comunitate și lista de camere?",
     "Add rooms to the community": "Adăugați camere la comunitate",
-    "Room name or alias": "Numele camerei sau aliasul",
     "Add to community": "Adăugați la comunitate",
     "Failed to invite the following users to %(groupId)s:": "Nu a putut fi invitat următorii utilizatori %(groupId)s",
     "Failed to invite users to community": "Nu a fost posibilă invitarea utilizatorilor la comunitate",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 24fd434155..ed685cc6ce 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -2,37 +2,27 @@
     "Account": "Учётная запись",
     "Admin": "Администратор",
     "Advanced": "Подробности",
-    "Algorithm": "Алгоритм",
     "A new password must be entered.": "Введите новый пароль.",
     "Anyone who knows the room's link, apart from guests": "Все, у кого есть ссылка на эту комнату, кроме гостей",
     "Anyone who knows the room's link, including guests": "Все, у кого есть ссылка на эту комнату, включая гостей",
     "Are you sure you want to reject the invitation?": "Вы уверены что хотите отклонить приглашение?",
     "Banned users": "Заблокированные пользователи",
     "Bans user with given id": "Блокирует пользователя с заданным ID",
-    "Blacklisted": "В черном списке",
     "Changes your display nickname": "Изменяет ваш псевдоним",
-    "Claimed Ed25519 fingerprint key": "Требуемый ключ цифрового отпечатка Ed25519",
     "Click here to fix": "Нажмите здесь, чтобы исправить это",
     "Commands": "Команды",
     "Continue": "Продолжить",
-    "Could not connect to the integration server": "Не удалось подключиться к серверу интеграции",
     "Create Room": "Создать комнату",
     "Cryptography": "Криптография",
-    "Curve25519 identity key": "Ключ идентификации Curve25519",
     "Deactivate Account": "Деактивировать учётную запись",
-    "Decryption error": "Ошибка расшифровки",
     "Default": "По умолчанию",
     "Deops user with given id": "Снимает полномочия оператора с пользователя с заданным ID",
-    "Device ID": "ID устройства",
     "Displays action": "Отображение действий",
-    "Ed25519 fingerprint": "Ed25519 отпечаток",
     "Emoji": "Смайлы",
-    "End-to-end encryption information": "Сведения о сквозном шифровании",
     "Error": "Ошибка",
-    "Event information": "Информация о событии",
     "Export E2E room keys": "Экспорт ключей шифрования",
     "Failed to change password. Is your password correct?": "Не удалось сменить пароль. Вы правильно ввели текущий пароль?",
-    "Failed to leave room": "Не удалось выйти из комнаты",
+    "Failed to leave room": "Не удалось покинуть комнату",
     "Failed to reject invitation": "Не удалось отклонить приглашение",
     "Failed to send email": "Ошибка отправки email",
     "Failed to unban": "Не удалось разблокировать",
@@ -51,8 +41,7 @@
     "Invites": "Приглашения",
     "Invites user with given id to current room": "Приглашает пользователя с заданным ID в текущую комнату",
     "Sign in with": "Войти с помощью",
-    "Joins room with given alias": "Входит в комнату с заданным псевдонимом",
-    "Kicks user with given id": "Выкидывает пользователя с заданным ID",
+    "Kicks user with given id": "Выгоняет пользователя с заданным ID",
     "Labs": "Лаборатория",
     "Leave room": "Покинуть комнату",
     "Logout": "Выйти",
@@ -61,10 +50,8 @@
     "Moderator": "Модератор",
     "Name": "Имя",
     "New passwords must match each other.": "Новые пароли должны совпадать.",
-    "none": "никто",
     "Notifications": "Уведомления",
     "<not supported>": "<не поддерживается>",
-    "NOT verified": "НЕ проверено",
     "No users have specific privileges in this room": "Ни один пользователь не имеет особых прав в этой комнате",
     "Password": "Пароль",
     "Permissions": "Права доступа",
@@ -73,21 +60,15 @@
     "Return to login screen": "Вернуться к экрану входа",
     "Send Reset Email": "Отправить письмо со ссылкой для сброса пароля",
     "Settings": "Настройки",
-    "Start a chat": "Начать разговор",
     "Unable to add email address": "Не удается добавить email",
     "Unable to remove contact information": "Не удалось удалить контактную информацию",
     "Unable to verify email address.": "Не удалось проверить email.",
     "Unban": "Разблокировать",
-    "unencrypted": "без шифрования",
-    "unknown device": "неизвестное устройство",
     "unknown error code": "неизвестный код ошибки",
     "Upload avatar": "Загрузить аватар",
     "Upload file": "Отправить файл",
-    "User ID": "ID пользователя",
     "Users": "Пользователи",
     "Verification Pending": "В ожидании подтверждения",
-    "Verification": "Проверка",
-    "verified": "проверенный",
     "Video call": "Видеовызов",
     "Voice call": "Голосовой вызов",
     "VoIP conference finished.": "Конференц-звонок окончен.",
@@ -101,9 +82,9 @@
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s принял приглашение от %(displayName)s.",
     "Active call": "Активный вызов",
     "%(senderName)s answered the call.": "%(senderName)s ответил(а) на звонок.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s заблокировал(а) %(targetName)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\".",
@@ -115,10 +96,10 @@
     "Failure to create room": "Не удалось создать комнату",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "для %(userId)s с %(fromPowerLevel)s на %(toPowerLevel)s",
     "click to reveal": "нажмите для открытия",
-    "%(senderName)s invited %(targetName)s.": "%(senderName)s приглашает %(targetName)s.",
-    "%(targetName)s joined the room.": "%(targetName)s входит в комнату.",
+    "%(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.",
-    "%(targetName)s left the room.": "%(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 сделал(а) историю разговора видимой для всех собеседников с момента их входа в комнату.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s сделал(а) историю разговора видимой для всех собеседников.",
@@ -131,7 +112,7 @@
     "Sent messages will be stored until your connection has returned.": "Отправленные сообщения будут сохранены, пока соединение не восстановится.",
     "There are no visible files in this room": "В этой комнате нет видимых файлов",
     "Set a display name:": "Введите отображаемое имя:",
-    "This server does not support authentication with a phone number.": "Этот сервер не поддерживает аутентификацию с помощью номера телефона.",
+    "This server does not support authentication with a phone number.": "Этот сервер не поддерживает аутентификацию по номеру телефона.",
     "An error occurred: %(error_string)s": "Произошла ошибка: %(error_string)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
     "Upload an avatar:": "Загрузите аватар:",
@@ -178,7 +159,6 @@
     "Click to unmute video": "Щелкните, чтобы включить видео",
     "Click to unmute audio": "Щелкните, чтобы включить звук",
     "Decrypt %(text)s": "Расшифровать %(text)s",
-    "Direct chats": "Личные чаты",
     "Disinvite": "Отозвать приглашение",
     "Download %(text)s": "Скачать %(text)s",
     "Failed to ban user": "Не удалось заблокировать пользователя",
@@ -203,13 +183,10 @@
     "Failed to mute user": "Не удалось заглушить пользователя",
     "Failed to reject invite": "Не удалось отклонить приглашение",
     "Failed to set display name": "Не удалось задать отображаемое имя",
-    "Failed to toggle moderator status": "Не удалось переключить статус модератора",
     "Fill screen": "Заполнить экран",
     "Incorrect verification code": "Неверный код подтверждения",
     "Join Room": "Войти в комнату",
     "Kick": "Выгнать",
-    "Local addresses for this room:": "Адреса этой комнаты на вашем сервере:",
-    "New address (e.g. #foo:%(localDomain)s)": "Новый адрес (например, #чтонибудь:%(localDomain)s)",
     "New passwords don't match": "Новые пароли не совпадают",
     "not specified": "не задан",
     "No more results": "Больше никаких результатов",
@@ -217,22 +194,21 @@
     "OK": "OK",
     "Only people who have been invited": "Только приглашённые участники",
     "Passwords can't be empty": "Пароли не могут быть пустыми",
-    "Please check your email and click on the link it contains. Once this is done, click continue.": "Проверьте свою электронную почту и нажмите на содержащуюся ссылку. После этого нажмите кнопку Продолжить.",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Проверьте свою электронную почту и нажмите на ссылку в письме. После этого нажмите кнопку Продолжить.",
     "Power level must be positive integer.": "Уровень прав должен быть положительным целым числом.",
     "Profile": "Профиль",
     "Reason": "Причина",
     "%(targetName)s rejected the invitation.": "%(targetName)s отклонил(а) приглашение.",
     "Reject invitation": "Отклонить приглашение",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s удалил(а) свое отображаемое имя (%(oldDisplayName)s).",
-    "%(senderName)s removed their profile picture.": "%(senderName)s удалил(а) свой аватар.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s хочет начать конференц-звонок.",
-    "Riot does not have permission to send you notifications - please check your browser settings": "У Riot нет разрешения на отправку уведомлений — проверьте настройки браузера",
-    "Riot was not given permission to send notifications - please try again": "Riot не получил разрешение на отправку уведомлений, пожалуйста, попробуйте снова",
-    "riot-web version:": "версия riot-web:",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s удалил своё отображаемое имя (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s удалил свой аватар.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s запросил конференц-звонок.",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "У %(brand)s нет разрешения на отправку уведомлений — проверьте настройки браузера",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s не получил разрешение на отправку уведомлений, пожалуйста, попробуйте снова",
+    "%(brand)s version:": "версия %(brand)s:",
     "Room %(roomId)s not visible": "Комната %(roomId)s невидима",
     "Room Colour": "Цвет комнаты",
     "Rooms": "Комнаты",
-    "Scroll to bottom of page": "Перейти к нижней части страницы",
     "Search": "Поиск",
     "Search failed": "Поиск не удался",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s отправил(а) изображение.",
@@ -251,37 +227,33 @@
     "This room is not recognised.": "Эта комната не опознана.",
     "This doesn't appear to be a valid email address": "Похоже, это недействительный адрес email",
     "This phone number is already in use": "Этот номер телефона уже используется",
-    "Unknown room %(roomId)s": "Неизвестная комната %(roomId)s",
     "You seem to be uploading files, are you sure you want to quit?": "Похоже, вы отправляете файлы, вы уверены, что хотите выйти?",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s %(time)s",
-    "Make Moderator": "Сделать модератором",
     "Room": "Комната",
     "Cancel": "Отмена",
     "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>.",
-    "Dismiss": "Отклонить",
+    "Dismiss": "Закрыть",
     "Custom Server Options": "Параметры другого сервера",
     "Mute": "Приглушить",
     "Operation failed": "Сбой операции",
     "powered by Matrix": "основано на Matrix",
     "Add a topic": "Задать тему",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Отображать время в 12-часовом формате (напр. 2:30 ПП)",
-    "Use compact timeline layout": "Использовать компактный вид списка сообщений",
     "No Microphones detected": "Микрофоны не обнаружены",
     "Camera": "Камера",
     "Microphone": "Микрофон",
     "Start automatically after system login": "Автозапуск при входе в систему",
     "Analytics": "Аналитика",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot собирает анонимные данные, позволяющие нам улучшить приложение.",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s собирает анонимные данные, позволяющие нам улучшить приложение.",
     "Default Device": "Устройство по умолчанию",
     "No Webcams detected": "Веб-камера не обнаружена",
     "Guests cannot join this room even if explicitly invited.": "Посторонние не смогут войти в эту комнату, даже если они будут приглашены.",
     "No media permissions": "Нет разрешённых носителей",
-    "You may need to manually permit Riot to access your microphone/webcam": "Вам необходимо предоставить Riot доступ к микрофону или веб-камере вручную",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "Вам необходимо предоставить %(brand)s доступ к микрофону или веб-камере вручную",
     "Anyone": "Все",
     "Are you sure you want to leave the room '%(roomName)s'?": "Вы уверены, что хотите покинуть '%(roomName)s'?",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s удалил(а) имя комнаты.",
     "Custom level": "Специальные права",
-    "device id: ": "ID устройства: ",
     "Email address": "Email",
     "Error decrypting attachment": "Ошибка расшифровки вложения",
     "Export": "Экспорт",
@@ -291,25 +263,22 @@
     "Invited": "Приглашен",
     "Jump to first unread message.": "Перейти к первому непрочитанному сообщению.",
     "Privileged Users": "Привилегированные пользователи",
-    "Revoke Moderator": "Отозвать права модератора",
     "Register": "Зарегистрироваться",
-    "Remote addresses for this room:": "Адреса этой комнаты на других серверах:",
     "Results from DuckDuckGo": "Результаты от DuckDuckGo",
     "Save": "Сохранить",
-    "Searches DuckDuckGo for results": "Для поиска используется DuckDuckGo",
+    "Searches DuckDuckGo for results": "Поиск с помощью DuckDuckGo",
     "Server error": "Ошибка сервера",
     "Server may be unavailable, overloaded, or search timed out :(": "Сервер может быть недоступен, перегружен или поиск прекращен по тайм-ауту :(",
     "Server may be unavailable, overloaded, or you hit a bug.": "Возможно, сервер недоступен, перегружен или случилась ошибка.",
     "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 a profile picture.": "%(senderName)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.": "Попытка загрузить выбранный интервал истории чата этой комнаты не удалась, так как у вас нет разрешений на просмотр.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Попытка загрузить выбранный интервал истории чата этой комнаты не удалась, так как запрошенный элемент не найден.",
     "Unmute": "Вернуть право речи",
-    "Unrecognised room alias:": "Нераспознанный псевдоним комнаты:",
     "Verified key": "Ключ проверен",
     "You have <a>disabled</a> URL previews by default.": "Предпросмотр ссылок по умолчанию <a>выключен</a> для вас.",
     "You have <a>enabled</a> URL previews by default.": "Предпросмотр ссылок по умолчанию <a>включен</a> для вас.",
@@ -336,15 +305,9 @@
     "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.": "Вы действительно хотите удалить это событие? Обратите внимание, что если это смена названия комнаты или темы, то удаление отменит это изменение.",
     "Unknown error": "Неизвестная ошибка",
     "Incorrect password": "Неверный пароль",
-    "To continue, please enter your password.": "Чтобы продолжить, введите ваш пароль.",
-    "I verify that the keys match": "Я подтверждаю, что ключи совпадают",
     "Unable to restore session": "Восстановление сессии не удалось",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Если вы использовали более новую версию Riot, то ваша сессия может быть несовместима с текущей. Закройте это окно и вернитесь к использованию более новой версии.",
+    "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, то ваша сессия может быть несовместима с этой версией. Закройте это окно и вернитесь к более новой версии.",
     "Unknown Address": "Неизвестный адрес",
-    "Unblacklist": "Разблокировать",
-    "Blacklist": "Заблокировать",
-    "Unverify": "Отозвать доверие",
-    "Verify...": "Сверить ключи...",
     "ex. @bob:example.com": "например @bob:example.com",
     "Add User": "Добавить пользователя",
     "Please check your email to continue registration.": "Чтобы продолжить регистрацию, проверьте электронную почту.",
@@ -356,7 +319,6 @@
     "Error decrypting video": "Ошибка расшифровки видео",
     "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?": "Вы будете перенаправлены на внешний сайт, чтобы войти в свою учётную запись для использования с %(integrationsUrl)s. Продолжить?",
-    "Removed or unknown message type": "Сообщение удалено или имеет неизвестный тип",
     "URL Previews": "Предпросмотр содержимого ссылок",
     "Drop file here to upload": "Перетащите файл сюда для отправки",
     " (unsupported)": " (не поддерживается)",
@@ -385,15 +347,12 @@
     "Something went wrong!": "Что-то пошло не так!",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Это будет имя вашей учётной записи на  <span></span> домашнем сервере, либо вы можете выбрать <a>другой сервер</a>.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Если у вас уже есть учётная запись Matrix, вы можете <a>войти</a>.",
-    "Home": "Начало",
+    "Home": "Home",
     "Accept": "Принять",
     "Active call (%(roomName)s)": "Текущий вызов (%(roomName)s)",
     "Admin Tools": "Инструменты администратора",
-    "Alias (optional)": "Псевдоним (опционально)",
     "Close": "Закрыть",
-    "Disable Notifications": "Отключить уведомления",
     "Drop File Here": "Перетащите файл сюда",
-    "Enable Notifications": "Включить оповещения",
     "Failed to upload profile picture!": "Не удалось загрузить аватар!",
     "Incoming call from %(name)s": "Входящий вызов от %(name)s",
     "Incoming video call from %(name)s": "Входящий видеовызов от %(name)s",
@@ -411,7 +370,6 @@
     "%(roomName)s does not exist.": "%(roomName)s не существует.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s на данный момент недоступна.",
     "Seen by %(userName)s at %(dateTime)s": "Прочитано %(userName)s в %(dateTime)s",
-    "Send anyway": "Отправить в любом случае",
     "unknown caller": "неизвестный абонент",
     "Unnamed Room": "Комната без названия",
     "Upload new:": "Загрузить новый:",
@@ -421,16 +379,12 @@
     "(could not connect media)": "(сбой подключения)",
     "(no answer)": "(нет ответа)",
     "(unknown failure: %(reason)s)": "(неизвестная ошибка: %(reason)s)",
-    "Not a valid Riot keyfile": "Недействительный файл ключей Riot",
-    "Your browser does not support the required cryptography extensions": "Ваш браузер не поддерживает требуемые криптографические расширения",
+    "Not a valid %(brand)s keyfile": "Недействительный файл ключей %(brand)s",
+    "Your browser does not support the required cryptography extensions": "Ваш браузер не поддерживает необходимые криптографические расширения",
     "Authentication check failed: incorrect password?": "Ошибка аутентификации: возможно, неправильный пароль?",
     "Do you want to set an email address?": "Хотите указать email?",
     "This will allow you to reset your password and receive notifications.": "Это позволит при необходимости сбросить пароль и получать уведомления.",
     "Skip": "Пропустить",
-    "Start verification": "Начать проверку",
-    "Share without verifying": "Поделиться без проверки",
-    "Ignore request": "Игнорировать запрос",
-    "Encryption key request": "Запрос ключа шифрования",
     "Check for update": "Проверить наличие обновлений",
     "Add a widget": "Добавить виджет",
     "Allow": "Принять",
@@ -460,7 +414,6 @@
     "Failed to copy": "Не удалось скопировать",
     "Ignore": "Игнорировать",
     "Unignore": "Перестать игнорировать",
-    "User Options": "Действия",
     "You are now ignoring %(userId)s": "Теперь вы игнорируете %(userId)s",
     "You are no longer ignoring %(userId)s": "Вы больше не игнорируете %(userId)s",
     "Unignored user": "Пользователь убран из списка игнорирования",
@@ -468,7 +421,6 @@
     "Stops ignoring a user, showing their messages going forward": "Прекращает игнорирование пользователя, показывая их будущие сообщения",
     "Ignores a user, hiding their messages from you": "Игнорирует пользователя, скрывая сообщения от вас",
     "Banned by %(displayName)s": "Заблокирован(а) %(displayName)s",
-    "Message removed by %(userId)s": "Сообщение удалено %(userId)s",
     "Description": "Описание",
     "Unable to accept invite": "Невозможно принять приглашение",
     "Leave": "Покинуть",
@@ -486,7 +438,6 @@
     "Add to summary": "Добавить в сводку",
     "Failed to add the following users to the summary of %(groupId)s:": "Не удалось добавить следующих пользователей в сводку %(groupId)s:",
     "Which rooms would you like to add to this summary?": "Какие комнаты вы хотите добавить в эту сводку?",
-    "Room name or alias": "Название или псевдоним комнаты",
     "Pinned Messages": "Закреплённые сообщения",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s изменил(а) закреплённые в этой комнате сообщения.",
     "Failed to add the following rooms to the summary of %(groupId)s:": "Не удалось добавить следующие комнаты в сводку %(groupId)s:",
@@ -494,8 +445,6 @@
     "The room '%(roomName)s' could not be removed from the summary.": "Комнату '%(roomName)s' не удалось удалить из сводки.",
     "Failed to remove a user from the summary of %(groupId)s": "Не удалось удалить пользователя из сводки %(groupId)s",
     "The user '%(displayName)s' could not be removed from the summary.": "Пользователя '%(displayName)s' не удалось удалить из сводки.",
-    "Light theme": "Светлая тема",
-    "Dark theme": "Тёмная тема",
     "Unknown": "Неизвестно",
     "Failed to add the following rooms to %(groupId)s:": "Не удалось добавить эти комнаты в %(groupId)s:",
     "Matrix ID": "Matrix ID",
@@ -554,7 +503,6 @@
     "And %(count)s more...|other": "Еще %(count)s…",
     "Delete Widget": "Удалить виджет",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Удаление виджета действует для всех участников этой комнаты. Вы действительно хотите удалить этот виджет?",
-    "Message removed": "Сообщение удалено",
     "Mirror local video feed": "Зеркально отражать видео со своей камеры",
     "Invite": "Пригласить",
     "Mention": "Упомянуть",
@@ -654,18 +602,13 @@
     "Unknown for %(duration)s": "Неизвестно %(duration)s",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Здесь никого нет! Хотите <inviteText>пригласить кого-нибудь</inviteText> или <nowarnText>выключить предупреждение о пустой комнате</nowarnText>?",
     "Something went wrong when trying to get your communities.": "Что-то пошло не так при попытке получить список ваших сообществ.",
-    "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.": "Этот домашний сервер не предлагает ни один метод входа, поддерживаемый клиентом.",
     "Call Failed": "Звонок не удался",
-    "Review Devices": "Проверка устройств",
-    "Call Anyway": "Позвонить в любом случае",
-    "Answer Anyway": "Ответить в любом случае",
-    "Call": "Позвонить",
-    "Answer": "Ответить",
     "Send": "Отправить",
     "collapse": "свернуть",
     "expand": "развернуть",
     "Old cryptography data detected": "Обнаружены старые криптографические данные",
-    "Data from an older version of Riot 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.": "Обнаружены данные из более старой версии Riot. Это приведет к сбою криптографии в более ранней версии. В этой версии не могут быть расшифрованы сообщения, которые использовались недавно при использовании старой версии. Это также может привести к сбою обмена сообщениями с этой версией. Если возникают неполадки, выйдите и снова войдите в систему. Чтобы сохранить журнал сообщений, экспортируйте и повторно импортируйте ключи.",
+    "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. Это приведет к сбою криптографии в более ранней версии. В этой версии не могут быть расшифрованы сообщения, которые использовались недавно при использовании старой версии. Это также может привести к сбою обмена сообщениями с этой версией. Если возникают неполадки, выйдите и снова войдите в систему. Чтобы сохранить журнал сообщений, экспортируйте и повторно импортируйте ключи.",
     "Warning": "Внимание",
     "Showing flair for these communities:": "Комната принадлежит следующим сообществам:",
     "This room is not showing flair for any communities": "Эта комната не принадлежит каким-либо сообществам",
@@ -676,38 +619,35 @@
     "%(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> сообщение сейчас.",
     "Send an encrypted reply…": "Отправить зашифрованный ответ…",
-    "Send a reply (unencrypted)…": "Отправить ответ (нешифрованный)…",
     "Send an encrypted message…": "Отправить зашифрованное сообщение…",
-    "Send a message (unencrypted)…": "Отправить сообщение (нешифрованное)…",
     "Replying": "Отвечает",
     "Minimize apps": "Свернуть приложения",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Конфиденциальность важна для нас, поэтому мы не собираем никаких личных или идентифицирующих данных для нашей аналитики.",
     "Learn more about how we use analytics.": "Подробнее о том, как мы используем аналитику.",
-    "The information being sent to us to help make Riot.im better includes:": "Информация, отправляемая нам, чтобы помочь нам сделать Riot.im лучше, включает в себя:",
+    "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.": "Если на этой странице встречаются сведения личного характера, например имя комнаты, имя пользователя или группы, они удаляются перед отправкой на сервер.",
     "The platform you're on": "Используемая платформа",
-    "The version of Riot.im": "Версия Riot.im",
+    "The version of %(brand)s": "Версия %(brand)s",
     "Your language of choice": "Выбранный язык",
     "Your homeserver's URL": "URL-адрес сервера",
-    "Your identity server's URL": "URL-адрес сервера идентификации",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
     "Which officially provided instance you are using, if any": "Каким официально поддерживаемым клиентом вы пользуетесь (если пользуетесь)",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Используете ли вы режим Richtext в редакторе Rich Text Editor",
     "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.",
-    "Failed to set direct chat tag": "Не удалось установить тег прямого чата",
+    "%(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 в комнату",
     "Clear filter": "Очистить фильтр",
     "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 Riot.im experience!": "Знаете ли вы: вы можете использовать сообщества, чтобы фильтровать в Riot.im!",
+    "Did you know: you can use communities to filter your %(brand)s experience!": "Знаете ли вы: вы можете использовать сообщества, чтобы фильтровать в %(brand)s!",
     "Key request sent.": "Запрос ключа отправлен.",
     "Code": "Код",
     "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, журналы отладки могут помочь нам выявить проблему. Журналы отладки содержат данные об использовании приложения, включая ваше имя пользователя, идентификаторы или псевдонимы комнат или групп, которые вы посетили, а также имена других пользователей. Они не содержат сообщений.",
     "Submit debug logs": "Отправить отладочные журналы",
-    "Opens the Developer Tools dialog": "Открывает Инструменты разработчика",
+    "Opens the Developer Tools dialog": "Открывает инструменты разработчика",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Прочитано %(displayName)s (%(userName)s) в %(dateTime)s",
     "Unable to join community": "Не удалось присоединиться к сообществу",
     "Unable to leave community": "Не удалось покинуть сообщество",
@@ -720,7 +660,6 @@
     "Hide Stickers": "Скрыть стикеры",
     "Show Stickers": "Показать стикеры",
     "Fetching third party location failed": "Не удалось извлечь местоположение третьей стороны",
-    "A new version of Riot is available.": "Доступна новая версия Riot.",
     "I understand the risks and wish to continue": "Я понимаю риски и желаю продолжить",
     "Send Account Data": "Отправка данных учётной записи",
     "All notifications are currently disabled for all targets.": "Все оповещения для всех устройств отключены.",
@@ -740,8 +679,6 @@
     "Send Custom Event": "Отправить произвольное событие",
     "Advanced notification settings": "Дополнительные параметры уведомлений",
     "Failed to send logs: ": "Не удалось отправить журналы: ",
-    "delete the alias.": "удалить псевдоним.",
-    "To return to your account in future you need to <u>set a password</u>": "Чтобы вы могли использовать свою учётную запись позже, вам необходимо <u>задать пароль</u>",
     "Forget": "Забыть",
     "You cannot delete this image. (%(code)s)": "Вы не можете удалить это изображение. (%(code)s)",
     "Cancel Sending": "Отменить отправку",
@@ -767,7 +704,6 @@
     "No update available.": "Нет доступных обновлений.",
     "Resend": "Переотправить",
     "Collecting app version information": "Сбор информации о версии приложения",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Удалить псевдоним комнаты %(alias)s и удалить %(name)s из каталога?",
     "Keywords": "Ключевые слова",
     "Enable notifications for this account": "Включить уведомления для этой учётной записи",
     "Invite to this community": "Пригласить в это сообщество",
@@ -778,7 +714,7 @@
     "Search…": "Поиск…",
     "You have successfully set a password and an email address!": "Вы успешно установили пароль и email!",
     "Remove %(name)s from the directory?": "Удалить %(name)s из каталога?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot использует многие передовые возможности браузера, некоторые из которых недоступны или являются экспериментальным в вашем текущем браузере.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s использует многие передовые возможности браузера, некоторые из которых недоступны или являются экспериментальным в вашем текущем браузере.",
     "Developer Tools": "Инструменты разработчика",
     "Preparing to send logs": "Подготовка к отправке журналов",
     "Explore Account Data": "Просмотр данных учётной записи",
@@ -821,8 +757,7 @@
     "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.": "Журналы отладки содержат данные об использовании приложения, включая ваше имя пользователя, идентификаторы или псевдонимы комнат или групп, которые вы посетили, а также имена других пользователей. Они не содержат сообщений.",
     "Unhide Preview": "Показать предварительный просмотр",
     "Unable to join network": "Не удается подключиться к сети",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Возможно, вы настроили их не в Riot, а в другом Matrix-клиенте. Настроить их в Riot не удастся, но они будут продолжать работать и здесь",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "К сожалению, ваш браузер <b>не способен</b> запустить Riot.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "К сожалению, ваш браузер <b>не способен</b> запустить %(brand)s.",
     "Messages in group chats": "Сообщения в конференциях",
     "Yesterday": "Вчера",
     "Error encountered (%(errorDetail)s).": "Обнаружена ошибка (%(errorDetail)s).",
@@ -830,7 +765,7 @@
     "Unable to fetch notification target list": "Не удалось получить список устройств для уведомлений",
     "Set Password": "Задать пароль",
     "Off": "Выключить",
-    "Riot does not know how to join a room on this network": "Riot не знает, как присоединиться к комнате в этой сети",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s не знает, как присоединиться к комнате в этой сети",
     "Mentions only": "Только при упоминаниях",
     "Wednesday": "Среда",
     "You can now return to your account after signing out, and sign in on other devices.": "Теперь вы сможете вернуться к своей учётной записи после выхода и войти на других устройствах.",
@@ -846,19 +781,17 @@
     "Quote": "Цитата",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "В текущем браузере внешний вид приложения может быть полностью неверным, а некоторые или все функции могут не работать. Если вы хотите попробовать в любом случае, то можете продолжить, но с теми проблемами, с которыми вы можете столкнуться вам придется разбираться самостоятельно!",
     "Checking for an update...": "Проверка обновлений…",
-    "There are advanced notifications which are not shown here": "Существуют дополнительные уведомления, которые не показаны здесь",
     "Missing roomId.": "Отсутствует идентификатор комнаты.",
     "You don't currently have any stickerpacks enabled": "У вас нет стикеров",
     "Popout widget": "Всплывающий виджет",
     "Every page you use in the app": "Каждая страница, которую вы используете в приложении",
     "e.g. <CurrentPageURL>": "напр. <CurrentPageURL>",
-    "Your User Agent": "Ваш пользовательский агент",
     "Your device resolution": "Разрешение вашего устройства",
     "Always show encryption icons": "Всегда показывать значки шифрования",
     "Send Logs": "Отправить логи",
     "Clear Storage and Sign Out": "Очистить хранилище и выйти",
     "Refresh": "Обновить",
-    "We encountered an error trying to restore your previous session.": "Произошла ошибка при попытке восстановить предыдущий сеанс.",
+    "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.": "Очистка хранилища вашего браузера может устранить проблему, но при этом ваша сессия будет завершена, и зашифрованная история чата станет нечитаемой.",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Не удается загрузить событие, на которое был дан ответ. Либо оно не существует, либо у вас нет разрешения на его просмотр.",
     "Enable widget screenshots on supported widgets": "Включить скриншоты виджетов для поддерживаемых виджетов",
@@ -874,9 +807,6 @@
     "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:": "Чтобы продолжить, введите пароль:",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Пожалуйста, помогите улучшить Riot.im, отправляя <UsageDataLink>анонимные данные использования</UsageDataLink>. При этом будут использоваться cookie (ознакомьтесь с нашей<PolicyLink>Политикой cookie</PolicyLink>).",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Пожалуйста, помогите улучшить Riot.im, отправляя <UsageDataLink>анонимные данные использования</UsageDataLink>. При этом будут использоваться cookie.",
-    "Yes, I want to help!": "Да, я хочу помочь!",
     "Can't leave Server Notices room": "Невозможно покинуть комнату сервера уведомлений",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Эта комната используется для важных сообщений от сервера, поэтому вы не можете ее покинуть.",
     "No Audio Outputs detected": "Аудиовыход не обнаружен",
@@ -910,15 +840,12 @@
     "System Alerts": "Системные оповещения",
     "Only room administrators will see this warning": "Только администраторы комнат увидят это предупреждение",
     "Please <a>contact your service administrator</a> to continue using the service.": "Пожалуйста, <a>обратитесь к вашему администратору</a>, чтобы продолжить использование сервиса.",
-    "Please <a>contact your service administrator</a> to get this limit increased.": "Пожалуйста, <a>обратитесь к вашему администратору</a>, чтобы увеличить этот лимит.",
     "Upgrade Room Version": "Обновление версии комнаты",
     "Create a new room with the same name, description and avatar": "Создадим новую комнату с тем же именем, описанием и аватаром",
     "Update any local room aliases to point to the new room": "Обновим локальные псевдонимы комнат",
     "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Остановим общение пользователей в старой версии комнаты и опубликуем сообщение, в котором пользователям рекомендуется перейти в новую комнату",
     "Put a link back to the old room at the start of the new room so people can see old messages": "Разместим ссылку на старую комнату, чтобы люди могли видеть старые сообщения",
     "Please <a>contact your service administrator</a> to continue using this service.": "Пожалуйста, <a>обратитесь к вашему администратору</a>, чтобы продолжить использовать этот сервис.",
-    "Registration Required": "Требуется регистрация",
-    "You need to register to do this. Would you like to register now?": "Вам необходимо зарегистрироваться для этого действия. Вы хотели бы зарегистрировать сейчас?",
     "Whether or not you're logged in (we don't record your username)": "Независимо от того, вошли вы или нет (мы не записываем ваше имя пользователя)",
     "Unable to load! Check your network connectivity and try again.": "Не удалось загрузить! Проверьте подключение к сети и попробуйте снова.",
     "Failed to invite users to the room:": "Не удалось пригласить пользователей в комнату:",
@@ -926,11 +853,6 @@
     "Sets the room name": "Устанавливает название комнаты",
     "Forces the current outbound group session in an encrypted room to be discarded": "Принудительно отбрасывает текущую групповую сессию для отправки сообщений в зашифрованную комнату",
     "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s модернизировал эту комнату.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s добавил %(addedAddresses)s к списку адресов комнаты.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s добавил %(addedAddresses)s к списку адресов комнаты.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s удалил %(removedAddresses)s из списка адресов комнаты.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s удалил %(removedAddresses)s из списка адресов комнаты.",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s добавил %(addedAddresses)s и удалил %(removedAddresses)s из списка адресов комнаты.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s установил %(address)s в качестве главного адреса комнаты.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s удалил главный адрес комнаты.",
     "%(displayName)s is typing …": "%(displayName)s печатает…",
@@ -977,7 +899,7 @@
     "Render simple counters in room header": "Отображать простые счетчики в заголовке комнаты",
     "Enable Emoji suggestions while typing": "Включить предложения смайликов при наборе",
     "Show a placeholder for removed messages": "Показывать плашки вместо удалённых сообщений",
-    "Show join/leave messages (invites/kicks/bans unaffected)": "Показывать сообщения о вступлении | выходе (не влияет на приглашения, исключения и запреты)",
+    "Show join/leave messages (invites/kicks/bans unaffected)": "Показывать сообщения о входе/выходе (не влияет на приглашения, выгоны и баны)",
     "Show avatar changes": "Показывать изменения аватара",
     "Show display name changes": "Показывать изменения отображаемого имени",
     "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Напоминать включить Безопасное Восстановление Сообщений в зашифрованных комнатах",
@@ -1016,7 +938,7 @@
     "Theme": "Тема",
     "Account management": "Управление учётной записью",
     "Deactivating your account is a permanent action - be careful!": "Деактивация вашей учётной записи — это необратимое действие. Будьте осторожны!",
-    "Chat with Riot Bot": "Чат с ботом Riot",
+    "Chat with %(brand)s Bot": "Чат с ботом %(brand)s",
     "Help & About": "Помощь & О программе",
     "FAQ": "Часто задаваемые вопросы",
     "Versions": "Версии",
@@ -1040,8 +962,6 @@
     "This room is a continuation of another conversation.": "Эта комната является продолжением другого разговора.",
     "Click here to see older messages.": "Нажмите, чтобы увидеть старые сообщения.",
     "Failed to load group members": "Не удалось загрузить участников группы",
-    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "Из-за ежемесячного ограничения активных пользователей сервера <b>некоторые из пользователей не смогут войти в систему</b>.",
-    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Превышен один из ресурсных лимитов сервера, по этому <b>некоторые пользователи не смогут залогиниться</b>.",
     "Join": "Войти",
     "That doesn't look like a valid email address": "Это не похоже на адрес электронной почты",
     "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>, чтобы продолжить использование службы.",
@@ -1062,12 +982,9 @@
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Перед отправкой логов необходимо <a>создать GitHub issue</a>, для описания проблемы.",
     "Incompatible Database": "Несовместимая база данных",
     "Continue With Encryption Disabled": "Продолжить с отключенным шифрованием",
-    "Use Legacy Verification (for older clients)": "Использовать устаревшую верификацию (для старых клиентов)",
-    "Verify by comparing a short text string.": "Проверьте, сравнив короткую текстовую строку.",
-    "Begin Verifying": "Начать проверку",
     "Incoming Verification Request": "Входящий запрос о проверке",
     "Clear cache and resync": "Очистить кэш и выполнить повторную синхронизацию",
-    "Updating Riot": "Обновление Riot",
+    "Updating %(brand)s": "Обновление %(brand)s",
     "Report bugs & give feedback": "Сообщайте об ошибках и оставляйте отзывы",
     "Go back": "Назад",
     "Failed to upgrade room": "Не удалось обновить комнату",
@@ -1077,24 +994,18 @@
     "Unable to load backup status": "Невозможно загрузить статус резервной копии",
     "Unable to restore backup": "Невозможно восстановить резервную копию",
     "No backup found!": "Резервных копий не найдено!",
-    "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "Невозможно расшифровать резервную копию этим ключом: убедитесь, что вы ввели правильный ключ восстановления.",
-    "Backup Restored": "Резервная копия восстановлена",
-    "Enter Recovery Passphrase": "Введите парольную фразу восстановления",
     "Starting backup...": "Запуск резервного копирования...",
-    "Keep it safe": "Храните надёжно",
-    "Copy to clipboard": "Скопировать в буфер обмена",
     "Download": "Скачать",
-    "Your Recovery Key": "Ваш ключ восстановления",
     "Create your account": "Создать учётную запись",
     "Username": "Имя пользователя",
-    "Not sure of your password? <a>Set a new one</a>": "Не уверены в пароле? <a>Установите новый</a>",
+    "Not sure of your password? <a>Set a new one</a>": "Не помните пароль? <a>Установите новый</a>",
     "The username field must not be blank.": "Имя пользователя не должно быть пустым.",
     "Server Name": "Название сервера",
     "Your Modular server": "Ваш Модульный сервер",
     "Email (optional)": "Адрес электронной почты (не обязательно)",
     "Phone (optional)": "Телефон (не обязательно)",
     "Confirm": "Подтвердить",
-    "Other servers": "Другие сервера",
+    "Other servers": "Другие серверы",
     "Homeserver URL": "URL сервера",
     "Identity Server URL": "URL сервера идентификации",
     "Free": "Бесплатный",
@@ -1106,7 +1017,6 @@
     "A new recovery passphrase and key for Secure Messages have been detected.": "Обнаружена новая парольная фраза восстановления и ключ для безопасных сообщений.",
     "New Recovery Method": "Новый метод восстановления",
     "If you don't want to set this up now, you can later in Settings.": "Это можно сделать позже в настройках.",
-    "Create Key Backup": "Создать ключ резервного копирования",
     "Set up Secure Message Recovery": "Настройка безопасного восстановления сообщений",
     "<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-диске или на резервном диске",
@@ -1179,16 +1089,15 @@
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Добавляет смайл ¯\\_(ツ)_/¯ в начало сообщения",
     "Changes your display nickname in the current room only": "Изменяет ваш псевдоним только для текущей комнаты",
     "Gets or sets the room topic": "Читает или устанавливает тему комнаты",
-    "%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)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 made the room invite only.": "%(senderDisplayName)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 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\"",
     "User %(userId)s is already in the room": "Пользователь %(userId)s уже находится в комнате",
     "The user must be unbanned before they can be invited.": "Пользователь должен быть разблокирован прежде чем может быть приглашён.",
     "Allow Peer-to-Peer for 1:1 calls": "Разрешить прямое соединение (p2p) для прямых звонков (один на один)",
-    "Order rooms in the room list by most important first instead of most recent": "Сортировать список комнат по важности вместо активности",
     "Verify this user by confirming the following emoji appear on their screen.": "Проверьте собеседника, убедившись, что на его экране отображаются следующие символы (смайлы).",
     "Unable to find a supported verification method.": "Невозможно определить поддерживаемый метод верификации.",
     "Scissors": "Ножницы",
@@ -1205,8 +1114,8 @@
     "Missing media permissions, click the button below to request.": "Отсутствуют разрешения для доступа к камере/микрофону. Нажмите кнопку ниже, чтобы запросить их.",
     "Request media permissions": "Запросить доступ к медиа носителю",
     "Change room name": "Изменить название комнаты",
-    "For help with using Riot, click <a>here</a>.": "Для получения помощи по использованию Riot, нажмите <a>здесь</a>.",
-    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "Для получения помощи по использованию Riot, нажмите <a>здесь</a> или начните чат с нашим ботом с помощью кнопки ниже.",
+    "For help with using %(brand)s, click <a>here</a>.": "Для получения помощи по использованию %(brand)s, нажмите <a>здесь</a>.",
+    "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> или начните чат с нашим ботом с помощью кнопки ниже.",
     "Bug reporting": "Сообщить об ошибке",
     "Open Devtools": "Открыть инструменты разработчика",
     "Change room avatar": "Изменить аватар комнаты",
@@ -1227,20 +1136,19 @@
     "A username can only contain lower case letters, numbers and '=_-./'": "Имя пользователя может содержать только буквы нижнего регистра, цифры и знаки  '=_-./'",
     "Composer": "Редактор",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Используете ли вы функцию \"хлебные крошки\" (аватары над списком комнат) или нет",
-    "A conference call could not be started because the integrations server is not available": "Конференц-вызов не может быть запущен, так как сервер интеграции недоступен",
     "Replying With Files": "Ответ файлами",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "На данный момент не возможнo ответить с файлом. Хотите загрузить этот файл без ответа?",
     "The file '%(fileName)s' failed to upload.": "Файл '%(fileName)s' не был загружен.",
     "The server does not support the room version specified.": "Сервер не поддерживает указанную версию комнаты.",
     "Name or Matrix ID": "Имя или Matrix ID",
-    "<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> Мы разместим ссылку на новую комнату в старой версии комнаты - участники комнаты должны будут нажать эту ссылку для присоединения к новой комнате.",
     "Changes your avatar in this current room only": "Меняет ваш аватар только в этой комнате",
     "Unbans user with given ID": "Разблокирует пользователя с заданным ID",
     "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.": "Вы не можете изменять виджеты в этой комнате.",
-    "Sends the given message coloured as a rainbow": "Посылает сообщение, окрашенное в цвет радуги",
-    "Sends the given emote coloured as a rainbow": "Посылает данную эмоцию, окрашенную в цвет радуги",
+    "Sends the given message coloured as a rainbow": "Отправляет сообщение, окрашенное в цвета радуги",
+    "Sends the given emote coloured as a rainbow": "Отправляет эмоцию, окрашенную в цвета радуги",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s отозвал/а приглашение %(targetDisplayName)s присоединиться к комнате.",
     "No homeserver URL provided": "URL-адрес домашнего сервера не указан",
     "Unexpected error resolving homeserver configuration": "Неожиданная ошибка в настройках домашнего сервера",
@@ -1251,7 +1159,7 @@
     "<a>Upgrade</a> to your own domain": "<a>Обновление</a> до собственного домена",
     "Credits": "Благодарности",
     "Bulk options": "Групповые опции",
-    "Upgrade this room to the recommended room version": "Обновите комнату до рекомендованной версии",
+    "Upgrade this room to the recommended room version": "Модернизируйте комнату до рекомендованной версии",
     "this room": "эта комната",
     "View older messages in %(roomName)s.": "Просмотр старых сообщений в %(roomName)s.",
     "Change history visibility": "Изменить видимость истории",
@@ -1263,7 +1171,6 @@
     "Send %(eventType)s events": "Отправить %(eventType)s события",
     "Select the roles required to change various parts of the room": "Выберите роли, которые смогут менять различные параметры комнаты",
     "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>",
-    "To link to this room, please add an alias.": "Для ссылки на эту комнату, пожалуйста, добавьте псевдоним.",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Изменения в том, кто может читать историю, будут применяться только к будущим сообщениям в этой комнате. Существующие истории останутся без изменений.",
     "%(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 в этой комнате.",
@@ -1276,7 +1183,7 @@
     "Join the conversation with an account": "Присоединиться к разговору с учётной записью",
     "Sign Up": "Зарегистрироваться",
     "Sign In": "Войти",
-    "You were kicked from %(roomName)s by %(memberName)s": "Вы были выгнаны %(memberName)s из %(roomName)s",
+    "You were kicked from %(roomName)s by %(memberName)s": "Вы были выгнаны из %(roomName)s пользователем %(memberName)s",
     "Reason: %(reason)s": "Причина: %(reason)s",
     "Forget this room": "Забыть эту комнату",
     "Re-join": "Пере-присоединение",
@@ -1284,11 +1191,11 @@
     "Something went wrong with your invite to %(roomName)s": "Что-то пошло не так с вашим приглашением в %(roomName)s",
     "You can only join it with a working invite.": "Вы можете присоединиться к ней только с рабочим приглашением.",
     "You can still join it because this is a public room.": "Вы всё ещё можете присоединиться к ней, потому что это публичная комната.",
-    "Join the discussion": "Присоединяйтесь к обсуждению",
+    "Join the discussion": "Присоединиться к обсуждению",
     "Try to join anyway": "Постарайся присоединиться в любом случае",
     "Do you want to chat with %(user)s?": "Хотите пообщаться с %(user)s?",
     "Do you want to join %(roomName)s?": "Хотите присоединиться к %(roomName)s?",
-    "<userName/> invited you": "<userName/> приглашает вас",
+    "<userName/> invited you": "<userName/> пригласил(а) вас",
     "You're previewing %(roomName)s. Want to join it?": "Вы просматриваете %(roomName)s. Хотите присоединиться?",
     "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s не может быть предварительно просмотрена. Вы хотите присоединиться к ней?",
     "This room doesn't exist. Are you sure you're at the right place?": "Эта комната не существует. Вы уверены, что находитесь в правильном месте?",
@@ -1300,21 +1207,17 @@
     "Don't ask me again": "Больше не спрашивать",
     "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Обновление этой комнаты отключит текущий экземпляр комнаты и создаст обновлённую комнату с тем же именем.",
     "This room has already been upgraded.": "Эта комната уже была обновлена.",
-    "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Эта комната работает под управлением версии комнаты <roomVersion />, которую этот сервер пометил как <i>unstable</i>.",
+    "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "Версия этой комнаты — <roomVersion />, этот домашний сервер считает её <i>нестабильной</i>.",
     "Add some now": "Добавить сейчас",
     "Failed to revoke invite": "Не удалось отменить приглашение",
     "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Не удалось отозвать приглашение. Возможно, на сервере возникла вре́менная проблема или у вас недостаточно прав для отзыва приглашения.",
     "Revoke invite": "Отозвать приглашение",
     "Invited by %(sender)s": "Приглашен %(sender)s",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "При обновлении основного адреса комнаты произошла ошибка. Возможно, это не разрешено сервером или произошел временный сбой.",
-    "Error creating alias": "Ошибка при создании псевдонима",
-    "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "Произошла ошибка при создании этого псевдонима. Возможно, это не разрешено сервером или произошёл временный сбой.",
-    "Error removing alias": "Ошибка удаления псевдонима",
-    "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "Произошла ошибка при удалении этого псевдонима. Возможно, он больше не существует или произошла временная ошибка.",
     "Error updating flair": "Ошибка обновления стиля",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "При обновлении стиля для этой комнаты произошла ошибка. Сервер может не разрешить это или произошла временная ошибка.",
     "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>отреагировал с %(shortName)s</reactedWith>",
-    "edited": "отредактировано",
+    "edited": "изменено",
     "Maximize apps": "Развернуть приложения",
     "Rotate Left": "Повернуть влево",
     "Rotate counter-clockwise": "Повернуть против часовой стрелки",
@@ -1328,18 +1231,13 @@
     "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 пользователей и т. д., пожалуйста, включите эти данные.",
     "Unable to load commit detail: %(msg)s": "Невозможно загрузить детали: %(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 Riot to do this": "Чтобы не потерять историю чата, вы должны экспортировать ключи от комнаты перед выходом из системы. Для этого вам нужно будет вернуться к более новой версии Riot",
-    "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ": "В прошлый раз вы использовали более новую версию Riot на сервере %(host)s. Чтобы снова использовать эту версию со сквозным шифрованием, вам нужно выйти и снова войти. ",
-    "Waiting for partner to accept...": "Ожидание подтверждения партнера...",
-    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Ничего не появляется? Еще не все клиенты поддерживают интерактивную проверку. <button> Использовать устаревшую проверку</button>.",
-    "Waiting for %(userId)s to confirm...": "Ожидание подтверждения от %(userId)s...",
-    "Use two-way text verification": "Использовать двустороннюю проверку текста",
+    "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",
     "View Servers in Room": "Просмотр серверов в комнате",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Проверьте этого пользователя, чтобы отметить его как доверенного. Доверенные пользователи дают вам больше уверенности при использовании шифрованных сообщений.",
     "Waiting for partner to confirm...": "Ожидание подтверждения партнера...",
-    "You've previously used Riot 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, Riot needs to resync your account.": "Ранее вы использовали Riot на %(host)s с отложенной загрузкой участников. В этой версии отложенная загрузка отключена. Поскольку локальный кеш не совместим между этими двумя настройками, Riot необходимо повторно синхронизировать вашу учётную запись.",
-    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Если другая версия Riot все еще открыта на другой вкладке, закройте ее, так как использование Riot на том же хосте с включенной и отключенной ленивой загрузкой одновременно вызовет проблемы.",
-    "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Riot теперь использует в 3-5 раз меньше памяти, загружая информацию о других пользователях только когда это необходимо. Пожалуйста, подождите, пока мы ресинхронизируемся с сервером!",
+    "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 необходимо повторно синхронизировать вашу учётную запись.",
+    "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 на том же хосте с включенной и отключенной ленивой загрузкой одновременно вызовет проблемы.",
+    "%(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 раз меньше памяти, загружая информацию о других пользователях только когда это необходимо. Пожалуйста, подождите, пока мы ресинхронизируемся с сервером!",
     "I don't want my encrypted messages": "Мне не нужны мои зашифрованные сообщения",
     "Manually export keys": "Экспортировать ключи вручную",
     "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "Если вы заметили ошибку или хотите оставить отзыв, пожалуйста, сообщите нам на GitHub.",
@@ -1364,16 +1262,11 @@
     "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, хотел бы подтвердить вашу личность. Разрешая это, виджет сможет проверять ваш ID пользователя, но не выполнять действия как вы.",
     "Remember my selection for this widget": "Запомнить мой выбор для этого виджета",
     "Deny": "Отказать",
-    "Recovery Key Mismatch": "Несоответствие ключа восстановления",
-    "Incorrect Recovery Passphrase": "Неверный пароль восстановления",
-    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "Невозможно расшифровать резервную копию с помощью этой парольной фразы: убедитесь, что вы ввели правильную парольную фразу для восстановления.",
     "Failed to decrypt %(failedCount)s sessions!": "Не удалось расшифровать %(failedCount)s сессии!",
-    "Restored %(sessionCount)s session keys": "Восстановлены %(sessionCount)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.": "Получите доступ к своей истории защищенных сообщений и настройте безопасный обмен сообщениями, введя пароль для восстановления.",
     "Next": "Далее",
     "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>",
-    "Enter Recovery Key": "Введите ключ восстановления",
     "This looks like a valid recovery key!": "Это похоже на действительный ключ восстановления!",
     "Not a valid recovery key": "Недействительный ключ восстановления",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Получите доступ к своей истории защищенных сообщений и настройте безопасный обмен сообщениями, введя свой ключ восстановления.",
@@ -1384,7 +1277,6 @@
     "Set a new status...": "Установка нового статуса...",
     "Hide": "Скрыть",
     "This homeserver would like to make sure you are not a robot.": "Этот сервер хотел бы убедиться, что вы не робот.",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "Пользовательские серверные параметры можно использовать для входа на другой сервер Matrix по его адресу. Таким образом, вы сможете использовать это приложение с существующим аккаунтом Matrix на другом домашнем сервере.",
     "Please review and accept all of the homeserver's policies": "Пожалуйста, просмотрите и примите все правила сервера",
     "Please review and accept the policies of this homeserver:": "Пожалуйста, просмотрите и примите политику этого сервера:",
     "Unable to validate homeserver/identity server": "Невозможно проверить сервер/сервер идентификации",
@@ -1407,7 +1299,7 @@
     "Some characters not allowed": "Некоторые символы не разрешены",
     "Create your Matrix account on %(serverName)s": "Создайте свою учётную запись Matrix на %(serverName)s",
     "Create your Matrix account on <underlinedServerName />": "Создайте учётную запись Matrix на <underlinedServerName />",
-    "Join millions for free on the largest public server": "Присоединяйтесь бесплатно к миллионам  на крупнейшем общедоступном сервере",
+    "Join millions for free on the largest public server": "Присоединяйтесь бесплатно к миллионам на крупнейшем общедоступном сервере",
     "Premium hosting for organisations <a>Learn more</a>": "Премиум-хостинг для организаций <a>Подробнее</a>",
     "Find other public servers or use a custom server": "Найти другие общедоступные серверы или использовать другой сервер",
     "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> для наилучшего результата.",
@@ -1415,8 +1307,8 @@
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Вы являетесь администратором этого сообщества. Вы не сможете вернуться без приглашения от другого администратора.",
     "Want more than a community? <a>Get your own server</a>": "Хотите больше, чем просто сообщество? <a>Получите свой собственный сервер</a>",
     "This homeserver does not support communities": "Этот сервер не поддерживает сообщества",
-    "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot не смог получить список протоколов с сервера.Сервер может быть слишком старым для поддержки сетей сторонних производителей.",
-    "Riot failed to get the public room list.": "Riot не смог получить список публичных комнат.",
+    "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s не смог получить список протоколов с сервера.Сервер может быть слишком старым для поддержки сетей сторонних производителей.",
+    "%(brand)s failed to get the public room list.": "%(brand)s не смог получить список публичных комнат.",
     "The homeserver may be unavailable or overloaded.": "Сервер может быть недоступен или перегружен.",
     "Add room": "Добавить комнату",
     "You have %(count)s unread notifications in a prior version of this room.|other": "У вас есть %(count)s непрочитанных уведомлений в предыдущей версии этой комнаты.",
@@ -1432,24 +1324,19 @@
     "Set a new password": "Установить новый пароль",
     "Invalid homeserver discovery response": "Неверный ответ при попытке обнаружения домашнего сервера",
     "Failed to get autodiscovery configuration from server": "Не удалось получить конфигурацию автообнаружения с сервера",
-    "Show recently visited rooms above the room list": "Показать недавно посещённые комнаты над списком комнат",
     "Invalid base_url for m.homeserver": "Неверный base_url для m.homeserver",
     "Homeserver URL does not appear to be a valid Matrix homeserver": "URL-адрес сервера не является действительным URL-адресом сервера Матрица",
     "Invalid identity server discovery response": "Неверный ответ на запрос идентификации сервера",
     "Invalid base_url for m.identity_server": "Неверный base_url для m.identity_server",
     "Identity server URL does not appear to be a valid identity server": "URL-адрес сервера идентификации не является действительным сервером идентификации",
     "General failure": "Общая ошибка",
-    "This homeserver does not support login using email address.": "Этот сервер не поддерживает вход с использованием адреса электронной почты.",
+    "This homeserver does not support login using email address.": "Этот сервер не поддерживает вход по адресу электронной почты.",
     "Failed to perform homeserver discovery": "Не удалось выполнить обнаружение сервера",
     "Sign in with single sign-on": "Войти в систему с помощью единой точки входа",
     "Create account": "Создать учётную запись",
     "Registration has been disabled on this homeserver.": "Регистрация на этом сервере отключена.",
     "Unable to query for supported registration methods.": "Невозможно запросить поддерживаемые методы регистрации.",
-    "Great! This passphrase looks strong enough.": "Отлично! Этот пароль выглядит достаточно сильной.",
-    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "Мы будем хранить зашифрованную копию ваших ключей на нашем сервере. Защитите свою резервную копию паролем, чтобы сохранить ее в безопасности.",
     "For maximum security, this should be different from your account password.": "Для максимальной безопасности он должен отличаться от пароля вашей учётной записи.",
-    "Enter a passphrase...": "Введите пароль....",
-    "Set up with a Recovery Key": "Настройка с ключом восстановления",
     "That matches!": "Они совпадают!",
     "That doesn't match.": "Они не совпадают.",
     "Uploaded sound": "Загруженный звук",
@@ -1459,15 +1346,7 @@
     "Set a new custom sound": "Установка нового пользовательского звука",
     "Browse": "Просматривать",
     "Go back to set it again.": "Задать другой пароль.",
-    "Please enter your passphrase a second time to confirm.": "Пожалуйста, введите ваш пароль еще раз для подтверждения.",
-    "Repeat your passphrase...": "Повторите ваш пароль...",
-    "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Как сеть безопасности, вы можете использовать ее для восстановления истории зашифрованных сообщений, если вы забыли свой пароль восстановления.",
-    "As a safety net, you can use it to restore your encrypted message history.": "Как сеть безопасности, вы можете использовать ее для восстановления истории зашифрованных сообщений.",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Ключ восстановления - это сеть безопасности, с помощью которой можно восстановить доступ к зашифрованным сообщениям, если вы забудете пароль.",
     "<b>Print it</b> and store it somewhere safe": "<b>Распечатайте его</b> и храните в безопасном месте",
-    "Secure your backup with a passphrase": "Защитите вашу резервную копию паролем",
-    "Confirm your passphrase": "Подтвердите свой пароль",
-    "Recovery key": "Ключ восстановления",
     "Success!": "Успешно!",
     "Unable to create key backup": "Невозможно создать резервную копию ключа",
     "Retry": "Попробуйте снова",
@@ -1476,8 +1355,8 @@
     "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.": "Если вы не убрали метод восстановления, злоумышленник может получить доступ к вашей учётной записи. Смените пароль учётной записи и сразу задайте новый способ восстановления в настройках.",
     "Cannot reach homeserver": "Не удаётся связаться с сервером",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Убедитесь, что у вас есть стабильное подключение к интернету, или свяжитесь с администратором сервера",
-    "Your Riot is misconfigured": "Ваш Riot неправильно настроен",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Попросите администратора Riot проверить <a>конфигурационный файл</a > на наличие неправильных или повторяющихся записей.",
+    "Your %(brand)s is misconfigured": "Ваш %(brand)s неправильно настроен",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Попросите администратора %(brand)s проверить <a>конфигурационный файл</a > на наличие неправильных или повторяющихся записей.",
     "Unexpected error resolving identity server configuration": "Неопределённая ошибка при разборе параметра сервера идентификации",
     "Use lowercase letters, numbers, dashes and underscores only": "Используйте только строчные буквы, цифры, тире и подчеркивания",
     "Cannot reach identity server": "Не удаётся связаться с сервером идентификации",
@@ -1491,7 +1370,7 @@
     "%(senderName)s made no change.": "%(senderName)s не внёс изменений.",
     "Loading room preview": "Загрузка предпросмотра комнаты",
     "Show all": "Показать все",
-    "Edited at %(date)s. Click to view edits.": "Отредактировано в %(date)s. Нажмите, чтобы посмотреть историю редактирования.",
+    "Edited at %(date)s. Click to view edits.": "Изменено %(date)s. Нажмите для посмотра истории изменений.",
     "%(severalUsers)smade no changes %(count)s times|other": "%(severalUsers)sне внёс изменений %(count)s раз",
     "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)sне внёс изменений",
     "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)sне внёс изменений %(count)s раз",
@@ -1499,7 +1378,7 @@
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Пожалуйста, расскажите нам что пошло не так, либо, ещё лучше, создайте отчёт в GitHub с описанием проблемы.",
     "Removing…": "Удаление…",
     "Clear all data": "Очистить все данные",
-    "Your homeserver doesn't seem to support this feature.": "Ваш сервер похоже не поддерживает эту возможность.",
+    "Your homeserver doesn't seem to support this feature.": "Ваш сервер, похоже, не поддерживает эту возможность.",
     "Message edits": "Правки сообщения",
     "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:": "Модернизация этой комнаты требует закрытие комнаты в текущем состояние и создания новой комнаты вместо неё. Чтобы упростить процесс для участников, будет сделано:",
     "Identity Server": "Сервер идентификаций",
@@ -1554,7 +1433,7 @@
     "Use an identity server": "Используйте сервер идентификации",
     "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 to invite by email. Manage in Settings.": "Используйте сервер идентификации что бы пригласить по электронной почте Управление в настройках.",
-    "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-адрес будет использоваться во время вызова)",
+    "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-адрес будет использоваться во время вызова)",
     "Add Email Address": "Добавить адрес Email",
     "Add Phone Number": "Добавить номер телефона",
     "Changes the avatar of the current room": "Меняет аватарку текущей комнаты",
@@ -1563,8 +1442,6 @@
     "Filter": "Поиск",
     "Filter rooms…": "Поиск комнат…",
     "If you can't find the room you're looking for, ask for an invite or <a>Create a new room</a>.": "Если не удаётся найти комнату, то можно запросить приглашение или <a>Создать новую комнату</a>.",
-    "Room alias": "Псевдоним комнаты",
-    "Set a room alias to easily share your room with other people.": "Присвоить комнате адрес, чтобы было проще приглашать в неё людей.",
     "Create a public room": "Создать публичную комнату",
     "Create a private room": "Создать приватную комнату",
     "Topic (optional)": "Тема (опционально)",
@@ -1634,14 +1511,11 @@
     "Unread mentions.": "Непрочитанные упоминания.",
     "Show image": "Показать изображение",
     "e.g. my-room": "например, моя-комната",
-    "Please provide a room alias": "Пожалуйста, укажите псевдоним комнаты",
-    "This alias is available to use": "Этот псевдоним доступен для использования",
-    "This alias is already in use": "Этот псевдоним уже используется",
     "Close dialog": "Закрыть диалог",
     "Please enter a name for the room": "Пожалуйста, введите название комнаты",
-    "This room is private, and can only be joined by invitation.": "Эта комната приватная и может быть присоединена только по приглашению.",
-    "Hide advanced": "Скрыть расширения",
-    "Show advanced": "Показать расширения",
+    "This room is private, and can only be joined by invitation.": "Эта комната приватная, в неё можно войти только по приглашению.",
+    "Hide advanced": "Скрыть дополнительные настройки",
+    "Show advanced": "Показать дополнительные настройки",
     "Please fill why you're reporting.": "Пожалуйста, заполните, почему вы сообщаете.",
     "Report Content to Your Homeserver Administrator": "Сообщите о содержании своему администратору домашнего сервера",
     "Send report": "Отослать отчёт",
@@ -1652,10 +1526,10 @@
     "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?": "Деактивация этого пользователя приведет к его выходу из системы и запрету повторного входа. Кроме того, они оставит все комнаты, в которых он участник. Это действие безповоротно. Вы уверены, что хотите деактивировать этого пользователя?",
     "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). Вы можете попробовать передать эту информацию администратору комнаты.",
     "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Приглашение в %(roomName)s было отправлено на %(email)s, но этот адрес не связан с вашей учётной записью",
-    "Link this email with your account in Settings to receive invites directly in Riot.": "Свяжите этот адрес с вашей учетной записью в настройках, чтобы получать приглашения непосредственно в Riot.",
+    "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": "Это приглашение в %(roomName)s было отправлено на %(email)s",
-    "Use an identity server in Settings to receive invites directly in Riot.": "Используйте сервер идентификации в Настройках для получения приглашений непосредственно в Riot.",
-    "Share this email in Settings to receive invites directly in Riot.": "Введите адрес эл.почты в Настройках, чтобы получать приглашения прямо в Riot.",
+    "Use an identity server in Settings to receive invites directly in %(brand)s.": "Используйте сервер идентификации в Настройках для получения приглашений непосредственно в %(brand)s.",
+    "Share this email in Settings to receive invites directly in %(brand)s.": "Введите адрес эл.почты в Настройках, чтобы получать приглашения прямо в %(brand)s.",
     "%(count)s unread messages including mentions.|other": "%(count)s непрочитанные сообщения, включая упоминания.",
     "Failed to deactivate user": "Не удалось деактивировать пользователя",
     "This client does not support end-to-end encryption.": "Этот клиент не поддерживает сквозное шифрование.",
@@ -1673,9 +1547,9 @@
     "%(creator)s created and configured the room.": "%(creator)s создал и настроил комнату.",
     "Preview": "Заглянуть",
     "View": "Просмотр",
-    "Find a room…": "Найди комнату…",
-    "Find a room… (e.g. %(exampleRoom)s)": "Найди комнату... (напр. %(exampleRoom)s)",
-    "Explore rooms": "Исследуйте комнаты",
+    "Find a room…": "Поиск комнат…",
+    "Find a room… (e.g. %(exampleRoom)s)": "Поиск комнат... (напр. %(exampleRoom)s)",
+    "Explore rooms": "Список комнат",
     "No identity server is configured: add one in server settings to reset your password.": "Идентификационный сервер не настроен: добавьте его в настройки сервера, чтобы сбросить пароль.",
     "Command Autocomplete": "Автозаполнение команды",
     "Community Autocomplete": "Автозаполнение сообщества",
@@ -1685,7 +1559,7 @@
     "Room Autocomplete": "Автозаполнение комнаты",
     "User Autocomplete": "Автозаполнение пользователя",
     "Quick Reactions": "Быстрая реакция",
-    "Frequently Used": "Часто используемый",
+    "Frequently Used": "Часто используемые",
     "Smileys & People": "Смайлики & Люди",
     "Animals & Nature": "Животные & Природа",
     "Food & Drink": "Еда & Напитки",
@@ -1695,7 +1569,7 @@
     "Symbols": "Символы",
     "Flags": "Флаги",
     "React": "Реакция",
-    "Cancel search": "Отмена поиска",
+    "Cancel search": "Отменить поиск",
     "Room %(name)s": "Комната %(name)s",
     "Recent rooms": "Недавние комнаты",
     "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Сервер идентификации не настроен, поэтому вы не можете добавить адрес электронной почты, чтобы в будущем сбросить пароль.",
@@ -1714,11 +1588,9 @@
     "Ignored/Blocked": "Игнорируемые/Заблокированные",
     "Error adding ignored user/server": "Ошибка добавления игнорируемого пользователя/сервера",
     "Error subscribing to list": "Ошибка при подписке на список",
-    "Send cross-signing keys to homeserver": "Отправка ключей перекрестной подписи на домашний сервер",
     "Error upgrading room": "Ошибка обновления комнаты",
     "Match system theme": "Тема системы",
     "Show tray icon and minimize window to it on close": "Показать иконку в панели задач и свернуть окно при закрытии",
-    "The version of Riot": "Версия Riot",
     "Show typing notifications": "Показывать уведомления о наборе",
     "Delete %(count)s sessions|other": "Удалить %(count)s сессий",
     "Enable desktop notifications for this session": "Включить уведомления для рабочего стола для этой сессии",
@@ -1727,39 +1599,32 @@
     "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Используйте Менеджер интеграциями для управления ботами, виджетами и стикерами.",
     "Manage integrations": "Управление интеграциями",
     "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Менеджеры интеграции получают данные конфигурации и могут изменять виджеты, отправлять приглашения в комнаты и устанавливать уровни доступа от вашего имени.",
-    "Sessions": "Сессии",
     "Direct Messages": "Диалоги",
     "%(count)s sessions|other": "%(count)s сессий",
     "Hide sessions": "Скрыть сессии",
     "Enable 'Manage Integrations' in Settings to do this.": "Включите «Управление интеграциями» в настройках, чтобы сделать это.",
-    "Unknown sessions": "Неизвестные сессии",
     "Help": "Помощь",
     "If you cancel now, you won't complete verifying your other session.": "Если вы отмените сейчас, вы не завершите проверку вашей другой сессии.",
     "Verify this session": "Проверьте эту сессию",
-    "Unverified session": "Непроверенная сессия",
     "Verifies a user, session, and pubkey tuple": "Проверяет пользователя, сессию и публичные ключи",
-    "Unknown (user, session) pair:": "Неизвестная (пользователь:сессия) пара:",
+    "Unknown (user, session) pair:": "Неизвестная пара (пользователь, сессия):",
     "Session already verified!": "Сессия уже подтверждена!",
-    "Never send encrypted messages to unverified sessions from this session": "Никогда не отправляйте зашифрованные сообщения в непроверенные сессий из этой сессии",
-    "Never send encrypted messages to unverified sessions in this room from this session": "Никогда не отправляйте зашифрованные сообщения в непроверенные сессии в эту комнату из этой сессии",
+    "Never send encrypted messages to unverified sessions from this session": "Никогда не отправлять зашифрованные сообщения непроверенным сессиям в этой сессии",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Никогда не отправлять зашифрованные сообщения непроверенным сессиям в этой комнате и в этой сессии",
     "Your keys are <b>not being backed up from this session</b>.": "Ваши ключи <b>не резервируются с этой сессии</b>.",
     "Server or user ID to ignore": "Сервер или ID пользователя для игнорирования",
     "Subscribed lists": "Подписанные списки",
     "Subscribe": "Подписаться",
-    "A session's public name is visible to people you communicate with": "Публичное имя сессии видны людям, с которыми вы общаетесь",
+    "A session's public name is visible to people you communicate with": "Ваши собеседники видят публичные имена сессий",
     "If you cancel now, you won't complete verifying the other user.": "Если вы сейчас отмените, у вас не будет завершена проверка других пользователей.",
-    "If you cancel now, you won't complete your secret storage operation.": "Если вы сейчас отмените, вы не завершите операцию секретного хранения.",
     "Cancel entering passphrase?": "Отмена ввода пароль?",
     "Setting up keys": "Настройка ключей",
     "Encryption upgrade available": "Доступно обновление шифрования",
     "Set up encryption": "Настройка шифрования",
-    "Double check that your server supports the room version chosen and try again.": "Дважды проверьте, что ваш сервер поддерживает версию комнаты и попробуйте снова.",
-    "WARNING: Session already verified, but keys do NOT MATCH!": "ВНИМАНИЕ:Сессия уже подтверждена, но ключи НЕ совпадают!",
+    "Double check that your server supports the room version chosen and try again.": "Убедитесь, что ваш сервер поддерживает выбранную версию комнаты и попробуйте снова.",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "ВНИМАНИЕ: сессия уже подтверждена, но ключи НЕ совпадают!",
     "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\". Это может означать, что ваши сообщения перехватываются!",
-    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Ключ подписи, который вы предоставили, соответствует ключу подписи, который вы получили от %(userId)s's сессии %(deviceId)s. Сессия отмечена как подтверждена.",
-    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s добавил %(addedAddresses)s и %(count)s другие адреса к этой комнате",
-    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s удалил %(removedAddresses)s и %(count)s другие адреса из этой комнаты",
-    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s удалил %(countRemoved)s и добавил %(countAdded)s адреса к этой комнате",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Ключ подписи, который вы предоставили, соответствует ключу подписи, который вы получили от пользователя %(userId)s и сессии %(deviceId)s. Сессия отмечена как подтверждённая.",
     "%(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 сделал видео вызов.",
@@ -1780,13 +1645,8 @@
     "%(num)s hours from now": "%(num)s часов спустя",
     "about a day from now": "примерно через день",
     "%(num)s days from now": "%(num)s дней спустя",
-    "Show a presence dot next to DMs in the room list": "Показать точку присутствия рядом с DMs в списке комнат",
-    "Enable cross-signing to verify per-user instead of per-session (in development)": "Включение перекрестной подписи для проверки в расчете на одного пользователя, а не за сессию (в разработке)",
-    "Enable local event indexing and E2EE search (requires restart)": "Включить локальное индексирование событий и E2EE поиска (требуется перезапуск)",
     "Show info about bridges in room settings": "Показать информацию о мостах в настройках комнаты",
-    "Show padlocks on invite only rooms": "Показывать замки по приглашению только комнаты",
     "Enable message search in encrypted rooms": "Включить поиск сообщений в зашифрованных комнатах",
-    "Keep secret storage passphrase in memory for this session": "Храните в памяти секретную парольную фразу для этого сеанса",
     "How fast should messages be downloaded.": "Как быстро сообщения должны быть загружены.",
     "This is your list of users/servers you have blocked - don't leave the room!": "Это список пользователей/серверов, которые вы заблокировали - не покидайте комнату!",
     "Verify this session by completing one of the following:": "Проверьте эту сессию, выполнив одно из следующих действий:",
@@ -1795,8 +1655,6 @@
     "Compare unique emoji": "Сравнитe уникальныe смайлики",
     "Compare a unique set of emoji if you don't have a camera on either device": "Сравните уникальный набор смайликов, если у вас нет камеры ни на одном из устройств",
     "Start": "Начать",
-    "Confirm the emoji below are displayed on both devices, in the same order:": "Подтвердите, что смайлики, приведенные ниже, отображаются на обоих устройствах в одном и том же порядке:",
-    "Verify this device by confirming the following number appears on its screen.": "Проверьте это устройство, подтвердив, что на его экране появляется следующий номер.",
     "Waiting for %(displayName)s to verify…": "Ожидание %(displayName)s для проверки…",
     "Cancelling…": "Отмена…",
     "They match": "Они совпадают",
@@ -1817,13 +1675,9 @@
     "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.": "Если вы не экспортируете ключи для этой комнаты и не импортируете их в будущем, смена пароля приведёт к сбросу всех ключей сквозного шифрования и сделает невозможным чтение истории чата. В будущем это будет улучшено.",
-    "Whether you're using Riot on a device where touch is the primary input mechanism": "Используете ли вы Riot на устройстве с тач-дисплеем в качестве основного способа ввода",
-    "Whether you're using Riot as an installed Progressive Web App": "Используете ли вы Riot в виде установленного прогрессивного веб-приложения",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Используете ли вы %(brand)s на устройстве с тач-дисплеем в качестве основного способа ввода",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Используете ли вы %(brand)s в виде установленного прогрессивного веб-приложения",
     "Your user agent": "Ваш юзер-агент",
-    "The information being sent to us to help make Riot better includes:": "Информация, которая отправляется нам для улучшения Riot, включает в себя:",
-    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "В комнате присутствуют неизвестные сессии: если вы продолжите без подтверждения, возможно, кто-то сможет подслушать ваш звонок.",
-    "Review Sessions": "Просмотреть сессии",
-    "Unverified login. Was this you?": "Неподтверждённый вход. Это были вы?",
     "Sign In or Create Account": "Войдите или создайте учётную запись",
     "Use your account or create a new one to continue.": "Воспользуйтесь своей учётной записью или создайте новую, чтобы продолжить.",
     "Create Account": "Создать учётную запись",
@@ -1863,29 +1717,25 @@
     "Order rooms by name": "Сортировать комнаты по названию",
     "Show rooms with unread notifications first": "Показывать в начале комнаты с непрочитанными уведомлениями",
     "Show shortcuts to recently viewed rooms above the room list": "Показывать ссылки на недавние комнаты над списком комнат",
-    "Manually verify all remote sessions": "Подтверждать все удалённые сессии вручную",
-    "Update your secure storage": "Обновите ваше безопасное хранилище",
-    "Your homeserver does not support cross-signing.": "Ваш домашний сервер не поддерживает кросс-подпись.",
-    "Cross-signing and secret storage are enabled.": "Кросс-подпись и хранилище секретов разрешены.",
+    "Manually verify all remote sessions": "Подтверждать вручную все сессии на других устройствах",
+    "Your homeserver does not support cross-signing.": "Ваш домашний сервер не поддерживает кросс-подписи.",
+    "Cross-signing and secret storage are enabled.": "Кросс-подпись и секретное хранилище разрешены.",
     "Customise your experience with experimental labs features. <a>Learn more</a>.": "Попробуйте экспериментальные возможности. <a>Подробнее</a>.",
-    "Cross-signing and secret storage are not yet set up.": "Кросс-подпись и хранилище секретов ещё не настроены.",
-    "Reset cross-signing and secret storage": "Сбросить кросс-подпись и хранилище секретов",
+    "Cross-signing and secret storage are not yet set up.": "Кросс-подпись и секретное хранилище ещё не настроены.",
+    "Reset cross-signing and secret storage": "Сбросить кросс-подпись и секретное хранилище",
     "Cross-signing public keys:": "Публичные ключи для кросс-подписи:",
     "in memory": "в памяти",
     "not found": "не найдено",
     "Cross-signing private keys:": "Приватные ключи для кросс-подписи:",
-    "in secret storage": "в хранилище секретов",
+    "in secret storage": "в секретном хранилище",
     "cached locally": "сохранено локально",
     "not found locally": "не найдено локально",
     "User signing private key:": "Приватный ключ подписи пользователей:",
     "Session backup key:": "Резервная копия сессионного ключа:",
-    "Secret storage public key:": "Публичный ключ хранилища секретов:",
+    "Secret storage public key:": "Публичный ключ секретного хранилища:",
     "in account data": "в данных учётной записи",
     "Homeserver feature support:": "Поддержка со стороны домашнего сервера:",
     "exists": "существует",
-    "Secret Storage key format:": "Формат ключа хранилища секретов:",
-    "outdated": "устарел",
-    "up to date": "свежий",
     "Your homeserver does not support session management.": "Ваш домашний сервер не поддерживает управление сессиями.",
     "Unable to load session list": "Не удалось загрузить список сессий",
     "Enable": "Разрешить",
@@ -1916,7 +1766,7 @@
     "View rules": "Посмотреть правила",
     "You are currently subscribed to:": "Вы подписаны на:",
     "Security": "Безопасность",
-    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "Сессия, которую вы подтверждаете, не поддерживает проверку с помощью сканирования QR-кодов или смайлов, как в Riot. Попробуйте другой клиент.",
+    "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. Попробуйте другой клиент.",
     "Verify by scanning": "Подтверждение сканированием",
     "Ask %(displayName)s to scan your code:": "Попросите %(displayName)s отсканировать ваш код:",
     "Verify by emoji": "Подтверждение с помощью смайлов",
@@ -1928,11 +1778,11 @@
     "You've successfully verified %(displayName)s!": "Вы успешно подтвердили %(displayName)s!",
     "Got it": "Понятно",
     "Compare emoji": "Сравните смайлы",
-    "Activate selected button": "Активировать выбранную кнопку",
-    "Toggle right panel": "Переключить правую панель",
-    "Toggle this dialog": "Переключить этот диалог",
-    "Cancel autocomplete": "Отменить автодополнение",
-    "Esc": "",
+    "Activate selected button": "Нажать выбранную кнопку",
+    "Toggle right panel": "Показать/скрыть правую панель",
+    "Toggle this dialog": "Показать/скрыть этот диалог",
+    "Cancel autocomplete": "Отменить автозаполнение",
+    "Esc": "Esc",
     "Enter": "Enter",
     "Delete %(count)s sessions|one": "Удалить %(count)s сессий",
     "Use Single Sign On to continue": "Воспользуйтесь единой точкой входа для продолжения",
@@ -1948,8 +1798,8 @@
     "Verify this session by confirming the following number appears on its screen.": "Подтвердите эту сессию, убедившись, что следующее число отображается на экране.",
     "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Ожидание других ваших сессий, %(deviceName)s %(deviceId)s, для подтверждения…",
     "From %(deviceName)s (%(deviceId)s)": "От %(deviceName)s (%(deviceId)s)",
-    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "У вашей учётной записи есть кросс-подпись в хранилище секретов, но она пока не является доверенной в этой сессии.",
-    "Bootstrap cross-signing and secret storage": "Инициализировать кросс-подпись и хранилище секретов",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "У вашей учётной записи есть кросс-подпись в секретное хранилище, но она пока не является доверенной в этой сессии.",
+    "Bootstrap cross-signing and secret storage": "Инициализация кросс-подпись и секретного хранилища",
     "well formed": "корректный",
     "unexpected type": "непредвиденный тип",
     "Self signing private key:": "Самоподписанный приватный ключ:",
@@ -1976,10 +1826,6 @@
     "Someone is using an unknown session": "Кто-то использует неизвестную сессию",
     "This room is end-to-end encrypted": "Эта комната зашифрована сквозным шифрованием",
     "Everyone in this room is verified": "Все в этой комнате подтверждены",
-    "Some sessions for this user are not trusted": "К некоторым сессиям этого пользователя нет доверия",
-    "All sessions for this user are trusted": "Все сессии этого пользователя доверенные",
-    "Some sessions in this encrypted room are not trusted": "К некоторым сессиям в этой зашифрованной комнате нет доверия",
-    "All sessions in this encrypted room are trusted": "Все сессии в этой зашифрованной комнате доверенные",
     "Mod": "Модератор",
     "This message cannot be decrypted": "Не удалось расшифровать это сообщение",
     "Encrypted by an unverified session": "Зашифровано неподтверждённой сессией",
@@ -1998,7 +1844,6 @@
     "Send as message": "Отправить как сообщение",
     "Failed to connect to integration manager": "Не удалось подключиться к менеджеру интеграций",
     "Mark all as read": "Отметить всё как прочитанное",
-    "You don't have permission to delete the alias.": "У вас нет прав для удаления этого псевдонима.",
     "Local address": "Локальный адрес",
     "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.": "Публичные адреса позволяют кому угодно зайти в вашу комнату с любого сервера. Чтобы опубликовать адрес, сначала задайте его в качестве локального адреса.",
@@ -2029,14 +1874,12 @@
     "Encryption enabled": "Шифрование включено",
     "Delete sessions|other": "Удалить сессии",
     "Delete sessions|one": "Удалить сессию",
-    "Please verify the room ID or alias and try again.": "Пожалуйста, проверьте ID комнаты или псевдоним и попробуйте снова.",
     "Error removing ignored user/server": "Ошибка при удалении игнорируемого пользователя/сервера",
     "Please try again or view your console for hints.": "Попробуйте снова или посмотрите сообщения в консоли.",
     "Ban list rules - %(roomName)s": "Правила блокировки - %(roomName)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.": "Игнорирование людей реализовано через списки правил блокировки. Подписка на список блокировки приведёт к сокрытию от вас пользователей и серверов, которые в нём перечислены.",
     "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.": "Ваш личный список блокировки содержит всех пользователей и серверы, сообщения которых вы не хотите видеть. После внесения туда первого пользователя/сервера в списке комнат появится новая комната 'Мой список блокировки' — не покидайте эту комнату, чтобы список блокировки работал.",
     "Subscribing to a ban list will cause you to join it!": "При подписке на список блокировки вы присоединитесь к нему!",
-    "Room ID or alias of ban list": "ID комнаты или псевдоним списка блокировки",
     "Confirm your account deactivation by using Single Sign On to prove your identity.": "Подтвердите удаление учётной записи с помощью единой точки входа.",
     "Are you sure you want to deactivate your account? This is irreversible.": "Вы уверены, что хотите деактивировать свою учётную запись? Это необратимое действие.",
     "Confirm account deactivation": "Подтвердите деактивацию учётной записи",
@@ -2077,7 +1920,7 @@
     "Any of the following data may be shared:": "Следующие сведения могут быть переданы:",
     "Your user ID": "ID пользователя",
     "Your theme": "Ваша тема",
-    "Riot URL": "Ссылка на Riot",
+    "%(brand)s URL": "Ссылка на %(brand)s",
     "Room ID": "ID комнаты",
     "Widget ID": "ID виджета",
     "Widget added by": "Виджет добавлен",
@@ -2102,7 +1945,6 @@
     "Verify session": "Подтвердить сессию",
     "Session name": "Название сессии",
     "Session key": "Ключ сессии",
-    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Резервная копия ключа сохранена в хранилище секретов, но эта возможность не включена в этой сессии. Разрешите кросс-подпись в Лаборатории, чтобы изменить состояние резервной копии.",
     "Backup key stored: ": "Резервная копия ключа сохранена: ",
     "Command failed": "Не удалось выполнить команду",
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Чтобы сообщить о проблеме безопасности Matrix, пожалуйста, прочитайте <a>Политику раскрытия информации</a> Matrix.org.",
@@ -2112,20 +1954,17 @@
     "Enter recovery passphrase": "Введите пароль восстановления",
     "Enter a recovery passphrase": "Введите пароль восстановления",
     "Enter your recovery passphrase a second time to confirm it.": "Введите пароль восстановления ещё раз для подтверждения.",
-    "Enter a recovery passphrase...": "Введите пароль восстановления...",
     "Please enter your recovery passphrase a second time to confirm.": "Введите пароль восстановления повторно для подтверждения.",
     "If you cancel now, you won't complete your operation.": "Если вы отмените операцию сейчас, она не завершится.",
     "Failed to set topic": "Не удалось установить тему",
     "Could not find user in room": "Не удалось найти пользователя в комнате",
     "Please supply a widget URL or embed code": "Укажите URL или код вставки виджета",
     "Send a bug report with logs": "Отправить отчёт об ошибке с логами",
-    "Enable cross-signing to verify per-user instead of per-session": "Разрешить кросс-подпись для подтверждения пользователей вместо отдельных сессий",
-    "Keep recovery passphrase in memory for this session": "Сохранить пароль восстановления в памяти для этой сессии",
     "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 ": "Безопасно кэшировать шифрованные сообщения локально, чтобы они появлялись в результатах поиска с помощью ",
-    " to store messages from ": " чтобы сохранить сообщения от ",
+    "Securely cache encrypted messages locally for them to appear in search results, using ": "Кэшировать шифрованные сообщения локально, чтобы они выводились в результатах поиска, используя: ",
+    " to store messages from ": " хранить сообщения от ",
     "Securely cache encrypted messages locally for them to appear in search results.": "Безопасно кэшировать шифрованные сообщения локально, чтобы они появлялись в результатах поиска.",
-    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Отсутствуют некоторые необходимые компоненты для Riot, чтобы безопасно кэшировать шифрованные сообщения локально. Если вы хотите попробовать эту возможность, соберите самостоятельно Riot Desktop с <nativeLink>добавлением поисковых компонентов</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, чтобы безопасно кэшировать шифрованные сообщения локально. Если вы хотите попробовать эту возможность, соберите самостоятельно %(brand)s Desktop с <nativeLink>добавлением поисковых компонентов</nativeLink>.",
     "not stored": "не сохранено",
     "Backup has a <validity>valid</validity> signature from this session": "У резервной копии <validity>верная</validity> подпись этой сессии",
     "Backup has an <validity>invalid</validity> signature from this session": "У резервной копии <validity>неверная</validity> подпись этой сессии",
@@ -2134,15 +1973,437 @@
     "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>",
     "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Ваш пароль был успешно изменён. Вы не будете получать уведомления в других сессия, пока вы не войдёте в них",
-    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Добавьте пользователей и серверы, которых вы хотите игнорировать. Используйте звёздочки для совпадения с любыми символами. Например, <code>@bot:*</code> приведёт к игнорированию всех пользователей на любом сервере, у которых есть 'bot' в имени.",
     "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Эта комната пересылает сообщения с помощью моста на следующие платформы. <a>Подробнее</a>",
     "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Эта комната не пересылает никуда сообщения с помощью моста. <a>Подробнее</a>",
     "Your key share request has been sent - please check your other sessions for key share requests.": "Запрос ключа был отправлен - проверьте другие ваши сессии на предмет таких запросов.",
     "If your other sessions do not have the key for this message you will not be able to decrypt them.": "Вы не сможете расшифровать это сообщение в других сессиях, если у них нет ключа для него.",
-    "No sessions with registered encryption keys": "Нет сессий с зарегистрированными ключами шифрования",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "Для дополнительной безопасности подтвердите этого пользователя, сравнив одноразовый код на ваших устройствах.",
     "<strong>%(role)s</strong> in %(roomName)s": "<strong>%(role)s</strong>в %(roomName)s",
     "Start verification again from their profile.": "Начните подтверждение заново в профиле пользователя.",
     "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Сообщения в этой комнате зашифрованы сквозным шифрованием. Посмотрите подробности и подтвердите пользователя в его профиле.",
-    "Send a Direct Message": "Отправить сообщение"
+    "Send a Direct Message": "Отправить сообщение",
+    "Light": "Светлая",
+    "Dark": "Темная",
+    "Recent Conversations": "Недавние Диалоги",
+    "Suggestions": "Предложения",
+    "a key signature": "отпечаток ключа",
+    "Upload completed": "Отправка успешно завершена",
+    "Cancelled signature upload": "Отправка отпечатка отменена",
+    "Unable to upload": "Невозможно отправить",
+    "Signature upload success": "Отпечаток успешно отправлен",
+    "Signature upload failed": "Сбой отправки отпечатка",
+    "Room name or address": "Имя или адрес комнаты",
+    "Unrecognised room address:": "Не удалось найти адрес комнаты:",
+    "Use your account to sign in to the latest version": "Используйте свой аккаунт для входа в последнюю версию",
+    "We’re excited to announce Riot is now Element": "Мы рады объявить, что Riot теперь Element",
+    "Riot is now Element!": "Riot теперь Element!",
+    "Learn More": "Узнать больше",
+    "Joins room with given address": "Присоединиться к комнате с указанным адресом",
+    "Opens chat with the given user": "Открыть чат с данным пользователем",
+    "Sends a message to the given user": "Отправить сообщение данному пользователю",
+    "You signed in to a new session without verifying it:": "Вы вошли в новую сессию, не подтвердив её:",
+    "Verify your other session using one of the options below.": "Подтвердите другую сессию, используя один из вариантов ниже.",
+    "Help us improve %(brand)s": "Помогите нам улучшить %(brand)s",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Отправьте <UsageDataLink>анонимные данные об использовании</UsageDataLink>, которые помогут нам улучшить %(brand)s. Для этого будеть использоваться <PolicyLink>cookie</PolicyLink>.",
+    "I want to help": "Я хочу помочь",
+    "Review where you’re logged in": "Проверьте, где вы вошли",
+    "Verify all your sessions to ensure your account & messages are safe": "Подтвердите все свои сессии, чтобы убедиться, что ваша учетная запись и сообщения в безопасности",
+    "Your homeserver has exceeded its user limit.": "Ваш домашний сервер превысил свой лимит пользователей.",
+    "Your homeserver has exceeded one of its resource limits.": "Ваш домашний сервер превысил один из своих лимитов ресурсов.",
+    "Are you sure you want to cancel entering passphrase?": "Вы уверены, что хотите отменить ввод пароля?",
+    "Go Back": "Назад",
+    "Contact your <a>server admin</a>.": "Обратитесь к <a>администратору сервера</a>.",
+    "Ok": "Хорошо",
+    "Set password": "Установить пароль",
+    "To return to your account in future you need to set a password": "Чтобы вернуться в свой аккаунт в будущем, вам необходимо установить пароль",
+    "New login. Was this you?": "Новый вход в вашу учётную запись. Это были Вы?",
+    "Verify the new login accessing your account: %(name)s": "Проверьте новый вход в вашу учётную запись: %(name)s",
+    "Restart": "Перезапустить",
+    "Upgrade your %(brand)s": "Обновите ваш %(brand)s",
+    "A new version of %(brand)s is available!": "Доступна новая версия %(brand)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 покинул звонок",
+    "Call ended": "Звонок завершён",
+    "You started a call": "Вы начали звонок",
+    "%(senderName)s started a call": "%(senderName)s начал(а) звонок",
+    "Waiting for answer": "Ждём ответа",
+    "%(senderName)s is calling": "%(senderName)s звонит",
+    "You created the room": "Вы создали комнату",
+    "%(senderName)s created the room": "%(senderName)s создал(а) комнату",
+    "You made the chat encrypted": "Вы включили шифрование в комнате",
+    "%(senderName)s made the chat encrypted": "%(senderName)s включил(а) шифрование в комнате",
+    "You made history visible to new members": "Вы сделали историю видимой для новых участников",
+    "%(senderName)s made history visible to new members": "%(senderName)s сделал(а) историю видимой для новых участников",
+    "You made history visible to anyone": "Вы сделали историю видимой для всех",
+    "%(senderName)s made history visible to anyone": "%(senderName)s сделал(а) историю видимой для всех",
+    "You made history visible to future members": "Вы сделали историю видимой для будущих участников",
+    "%(senderName)s made history visible to future members": "%(senderName)s сделал(а) историю видимой для будущих участников",
+    "You were invited": "Вы были приглашены",
+    "%(targetName)s was invited": "%(targetName)s был(а) приглашен(а)",
+    "You left": "Вы покинули комнату",
+    "%(targetName)s left": "%(targetName)s покинул комнату",
+    "You were kicked (%(reason)s)": "Вас исключили из комнаты (%(reason)s)",
+    "%(targetName)s was kicked (%(reason)s)": "%(targetName)s был(а) исключен(а) из комнаты (%(reason)s)",
+    "You were kicked": "Вас исключили из комнаты",
+    "%(targetName)s was kicked": "%(targetName)s был(а) исключен(а) из комнаты",
+    "You rejected the invite": "Вы отклонили приглашение",
+    "%(targetName)s rejected the invite": "%(targetName)s отклонил(а) приглашение",
+    "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)",
+    "You were banned": "Вас заблокировали",
+    "%(targetName)s was banned": "%(targetName)s был(а) забанен(а)",
+    "You joined": "Вы вошли",
+    "%(targetName)s joined": "%(targetName)s присоединился(ась)",
+    "You changed your name": "Вы поменяли своё имя",
+    "%(targetName)s changed their name": "%(targetName)s поменял(а) своё имя",
+    "You changed your avatar": "Вы поменяли свой аватар",
+    "%(targetName)s changed their avatar": "%(targetName)s поменял(а) свой аватар",
+    "You changed the room name": "Вы поменяли имя комнаты",
+    "Enable experimental, compact IRC style layout": "Включите экспериментальный, компактный стиль IRC",
+    "Unknown caller": "Неизвестный абонент",
+    "Incoming call": "Входящий звонок",
+    "Waiting for your other session to verify…": "Ожидание вашей другой сессии для начала подтверждения…",
+    "%(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>, чтобы зашифрованные сообщения появились в результатах поиска.",
+    "There are advanced notifications which are not shown here.": "Есть расширенные уведомления, которые здесь не отображаются.",
+    "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, но они все еще применяются.",
+    "New version available. <a>Update now.</a>": "Доступна новая версия. <a>Обновить сейчас.</a>",
+    "Hey you. You're the best!": "Эй! Ты лучший!",
+    "Size must be a number": "Размер должен быть числом",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "Пользовательский размер шрифта может быть только между %(min)s pt и %(max)s pt",
+    "Use between %(min)s pt and %(max)s pt": "Введите значение между %(min)s pt и %(max)s pt",
+    "Message layout": "Макет сообщения",
+    "Compact": "Компактно",
+    "Modern": "Новый",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Установите имя шрифта, установленного в вашей системе, и %(brand)s попытается его использовать.",
+    "Customise your appearance": "Настройка внешнего вида",
+    "Reload": "Перезагрузить",
+    "Take picture": "Сделать снимок",
+    "Remove for everyone": "Убрать для всех",
+    "Remove for me": "Убрать для меня",
+    "User Status": "Статус пользователя",
+    "Country Dropdown": "Выпадающий список стран",
+    "%(senderName)s %(emote)s": "%(senderName)s %(emote)s",
+    "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
+    "%(senderName)s changed the room name": "%(senderName)s изменил(а) название комнаты",
+    "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
+    "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
+    "You uninvited %(targetName)s": "Вы отозвали приглашение %(targetName)s",
+    "%(senderName)s uninvited %(targetName)s": "%(senderName)s отозвал(а) приглашение %(targetName)s",
+    "You invited %(targetName)s": "Вы пригласили %(targetName)s",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s пригласил(а) %(targetName)s",
+    "You changed the room topic": "Вы изменили тему комнаты",
+    "%(senderName)s changed the room topic": "%(senderName)s изменил(а) тему комнаты",
+    "Enable advanced debugging for the room list": "Разрешить расширенную отладку списка комнат",
+    "Font size": "Размер шрифта",
+    "Use custom size": "Использовать другой размер",
+    "Use a more compact ‘Modern’ layout": "Использовать компактную 'современную' тему оформления",
+    "Use a system font": "Использовать системный шрифт",
+    "System font name": "Название системного шрифта",
+    "Incoming voice call": "Входящий звонок",
+    "Incoming video call": "Входящий видеозвонок",
+    "Please verify the room ID or address and try again.": "Проверьте ID комнаты или адрес и попробуйте снова.",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Администратор вашего сервера отключил сквозное шифрование по умолчанию в приватных комнатах и диалогах.",
+    "Make this room low priority": "Сделать эту комнату маловажной",
+    "Low priority rooms show up at the bottom of your room list in a dedicated section at the bottom of your room list": "Маловажные комнаты отображаются в конце списка в отдельной секции",
+    "People": "Люди",
+    "%(networkName)s rooms": "Комнаты %(networkName)s",
+    "Explore Public Rooms": "Просмотреть публичные комнаты",
+    "Search rooms": "Поиск комнат",
+    "Where you’re logged in": "Где вы вошли",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Ниже вы можете изменить названия сессий или выйти из них, либо <a>подтвердите их в своём профиле</a>.",
+    "Create room": "Создать комнату",
+    "Custom Tag": "Пользовательский тег",
+    "Appearance": "Внешний вид",
+    "Show rooms with unread messages first": "Комнаты с непрочитанными сообщениями в начале",
+    "Show previews of messages": "Показывать последнее сообщение",
+    "Sort by": "Сортировать",
+    "Activity": "По активности",
+    "A-Z": "А-Я",
+    "List options": "Настройки списка",
+    "Show %(count)s more|other": "Показать ещё %(count)s",
+    "Notification options": "Настройки уведомлений",
+    "Favourited": "В избранном",
+    "Leave Room": "Покинуть комнату",
+    "Room options": "Настройки комнаты",
+    "Set a room address to easily share your room with other people.": "Присвойте комнате адрес, чтобы поделиться ею с другими людьми.",
+    "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)s с существующей учётной записью Matrix на другом сервере.",
+    "Welcome to %(appName)s": "Добро пожаловать в %(appName)s",
+    "Liberate your communication": "Освободите общение",
+    "Create a Group Chat": "Создать групповой чат",
+    "Security & privacy": "Безопасность и конфиденциальность",
+    "All settings": "Все настройки",
+    "Feedback": "Отзыв",
+    "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
+    "New spinner design": "Новый дизайн спиннера",
+    "Appearance Settings only affect this %(brand)s session.": "Настройки внешнего вида работают только в этой сессии %(brand)s.",
+    "Emoji picker": "Смайлики",
+    "Show %(count)s more|one": "Показать ещё %(count)s",
+    "Mentions & Keywords": "Упоминания и ключевые слова",
+    "Forget Room": "Забыть комнату",
+    "This room is public": "Это публичная комната",
+    "Away": "Отошёл(ла)",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "Введите <code>/help</code> для списка доступных команд. Хотите отправить это сообщение как есть?",
+    "Error creating address": "Ошибка при создании адреса",
+    "You don't have permission to delete the address.": "У вас нет прав для удаления этого адреса.",
+    "Error removing address": "Ошибка при удалении адреса",
+    "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.": "В зашифрованных комнатах ваши сообщения в безопасности, только у вас и у получателя есть ключи для расшифровки.",
+    "You've successfully verified your device!": "Вы успешно подтвердили это устройство!",
+    "Start verification again from the notification.": "Начните подтверждение заново с уведомления.",
+    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "Вы заигнорировали этого пользователя, сообщение скрыто. <a>Показать</a>",
+    "Message deleted": "Сообщение удалено",
+    "Message deleted by %(name)s": "Сообщение удалено %(name)s",
+    "Message deleted on %(date)s": "Сообщение удалено %(date)s",
+    "Edited at %(date)s": "Изменено %(date)s",
+    "Click to view edits": "Нажмите для просмотра правок",
+    "Can't load this message": "Не удалось загрузить это сообщение",
+    "Submit logs": "Отправить логи",
+    "Categories": "Категории",
+    "Widgets do not use message encryption.": "Виджеты не используют шифрование сообщений.",
+    "QR Code": "QR код",
+    "Room address": "Адрес комнаты",
+    "Please provide a room address": "Укажите адрес комнаты",
+    "This address is available to use": "Этот адрес доступен",
+    "This address is already in use": "Этот адрес уже используется",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "Вы уверены, что хотите удалить <b>%(serverName)s</b>",
+    "Enter the name of a new server you want to explore.": "Введите имя нового сервера для просмотра.",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Напоминание: ваш браузер не поддерживается, возможны непредвиденные проблемы.",
+    "Notification settings": "Настройки уведомлений",
+    "Switch to light mode": "Переключить в светлый режим",
+    "Switch to dark mode": "Переключить в тёмный режим",
+    "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": "Изменить настройки уведомлений",
+    "IRC display name width": "Ширина отображаемого имени IRC",
+    "Your server isn't responding to some <a>requests</a>.": "Ваш сервер не отвечает на некоторые <a>запросы</a>.",
+    "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Добавьте сюда пользователей и сервера, которые вы хотите игнорировать. Используйте звездочки, чтобы %(brand)s соответствовали любым символам. Например, <code>@bot:*</code> будет игнорировать всех пользователей, имеющих имя \" bot \" на любом сервере.",
+    "Room ID or address of ban list": "ID комнаты или адрес списка блокировок",
+    "To link to this room, please add an address.": "Для связи с этой комнатой, пожалуйста, добавьте адрес.",
+    "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.": "Запросы на общий доступ к ключам автоматически отправляются в другие сессии. Если вы отклонили или пропустили запрос на общий доступ к ключам в других сессиях, нажмите здесь, чтобы перезапросить ключи для этой сессии.",
+    "The authenticity of this encrypted message can't be guaranteed on this device.": "Подлинность этого зашифрованного сообщения не может быть гарантирована на этом устройстве.",
+    "No recently visited rooms": "Нет недавно посещенных комнат",
+    "Use default": "Использовать по умолчанию",
+    "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.",
+    "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.": "Очистка всех данных этой сессии является необратимым действием. Зашифрованные сообщения будут потеряны, если их ключи не были сохранены.",
+    "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 в этой сессии. Чтобы снова использовать эту версию со сквозным шифрованием, вам нужно будет выйти из учётной записи и снова войти.",
+    "There was a problem communicating with the server. Please try again.": "Возникла проблема со связью с сервером. Пожалуйста, попробуйте еще раз.",
+    "Server did not require any authentication": "Сервер не требует проверки подлинности",
+    "Server did not return valid authentication information.": "Сервер не вернул существующую аутентификационную информацию.",
+    "Verification Requests": "Запрос на проверку",
+    "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.": "Подтвердите это устройство, чтобы сделать его доверенным. Доверие этому устройству дает вам и другим пользователям дополнительное спокойствие при использовании зашифрованных сообщений.",
+    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Проверка этого устройства пометит его как доверенное, и пользователи, которые проверили его вместе с вами, будут доверять этому устройству.",
+    "Integrations are disabled": "Интеграции отключены",
+    "Integrations not allowed": "Интеграции не разрешены",
+    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Ваш %(brand)s не позволяет вам использовать для этого Менеджер Интеграции. Пожалуйста, свяжитесь с администратором.",
+    "To continue, use Single Sign On to prove your identity.": "Чтобы продолжить, используйте единый вход, чтобы подтвердить свою личность.",
+    "Confirm to continue": "Подтвердите, чтобы продолжить",
+    "Click the button below to confirm your identity.": "Нажмите кнопку ниже, чтобы подтвердить свою личность.",
+    "Failed to invite the following users to chat: %(csvUsers)s": "Не удалось пригласить в чат этих пользователей: %(csvUsers)s",
+    "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.": "Пытаясь пригласить пользователей, что-то пошло не так.",
+    "We couldn't invite those users. Please check the users you want to invite and try again.": "Мы не могли пригласить этих пользователей. Пожалуйста, проверьте пользователей, которых вы хотите пригласить, и повторите попытку.",
+    "Failed to find the following users": "Не удалось найти этих пользователей",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Следующие пользователи могут не существовать или быть недействительными и не могут быть приглашены: %(csvNames)s",
+    "Recently Direct Messaged": "Недавно отправленные личные сообщения",
+    "Go": "Вперёд",
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Пригласите кого-нибудь, используя свое имя, имя пользователя (например, <userId/>), адрес электронной почты или <a>поделиться этой комнатой</a>.",
+    "a new master key signature": "новая подпись мастер-ключа",
+    "a new cross-signing key signature": "новый ключ подписи для кросс-подписи",
+    "a device cross-signing signature": "подпись устройства для кросс-подписи",
+    "%(brand)s encountered an error during upload of:": "%(brand)s обнаружил ошибку при загрузке файла:",
+    "Confirm by comparing the following with the User Settings in your other session:": "Подтвердите, сравнив следующие параметры с настройками пользователя в другой вашей сессии:",
+    "Confirm this user's session by comparing the following with their User Settings:": "Подтвердите сессию этого пользователя, сравнив следующие параметры с его пользовательскими настройками:",
+    "If they don't match, the security of your communication may be compromised.": "Если они не совпадают, безопасность вашего общения может быть поставлена под угрозу.",
+    "Your password": "Ваш пароль",
+    "This session, or the other session": "Эта сессия или другая сессия",
+    "The internet connection either session is using": "Подключение к интернету, используемое любой из сессий",
+    "We recommend you change your password and recovery key in Settings immediately": "Мы рекомендуем вам немедленно изменить свой пароль и ключ восстановления в настройках",
+    "New session": "Новая сессия",
+    "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.": "Если вы не входили в эту сессию, ваша учетная запись может быть скомпрометирована.",
+    "This wasn't me": "Это был не я",
+    "Use your account to sign in to the latest version of the app at <a />": "Используйте свою учетную запись для входа в последнюю версию приложения по адресу <a />",
+    "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>.": "Вы уже вошли в систему и можете остаться здесь, но вы также можете получить последние версии приложения на всех платформах по адресу <a>element.io/get-started</a>.",
+    "Go to Element": "Перейти к 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>",
+    "Automatically invite users": "Автоматически приглашать пользователей",
+    "Upgrade private room": "Модернизировать приватную комнату",
+    "Upgrade public room": "Модернизировать публичную комнату",
+    "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Модернизация комнаты - это расширенное действие, которое обычно рекомендуется, когда комната нестабильна из-за ошибок, отсутствующих функций или уязвимостей безопасности.",
+    "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>.",
+    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Вы модернизируете эту комнату с <oldVersion /> до <newVersion/>.",
+    "You're all caught up.": "Нет непрочитанных сообщений.",
+    "Server isn't responding": "Сервер не отвечает",
+    "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "Ваш сервер не отвечает на некоторые ваши запросы. Ниже приведены вероятные причины.",
+    "The server (%(serverName)s) took too long to respond.": "Сервер (%(serverName)s) слишком долго не отвечал.",
+    "Your firewall or anti-virus is blocking the request.": "Ваш брандмауэр или антивирус блокирует запрос.",
+    "A browser extension is preventing the request.": "Расширение браузера блокирует запрос.",
+    "The server is offline.": "Сервер оффлайн.",
+    "The server has denied your request.": "Сервер отклонил ваш запрос.",
+    "Your area is experiencing difficulties connecting to the internet.": "Ваше подключение к Интернету нестабильно или отсутствует.",
+    "A connection error occurred while trying to contact the server.": "Произошла ошибка при подключении к серверу.",
+    "The server is not configured to indicate what the problem is (CORS).": "Сервер не настроен должным образом, чтобы определить проблему (CORS).",
+    "Recent changes that have not yet been received": "Последние изменения, которые еще не были получены",
+    "This will allow you to return to your account after signing out, and sign in on other sessions.": "Это позволит вам вернуться в свою учетную запись после выхода из системы и войти в другие сессии.",
+    "Verify other session": "Проверьте другую сессию",
+    "Verification Request": "Запрос на подтверждение",
+    "Wrong file type": "Неправильный тип файла",
+    "Looks good!": "Выглядит неплохо!",
+    "Wrong Recovery Key": "Неверный ключ восстановления",
+    "Invalid Recovery Key": "Неверный ключ восстановления",
+    "Security Phrase": "Секретная фраза",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Невозможно получить доступ к секретному хранилищу. Пожалуйста, убедитесь, что вы ввели правильную парольную фразу восстановления.",
+    "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Введите свою секретную фразу или <button>Используйте ваш ключ безопасности</button>, чтобы продолжить.",
+    "Security Key": "Ключ безопасности",
+    "Use your Security Key to continue.": "Чтобы продолжить, используйте свой ключ безопасности.",
+    "Restoring keys from backup": "Восстановление ключей из резервной копии",
+    "Fetching keys from server...": "Получение ключей с сервера...",
+    "%(completed)s of %(total)s keys restored": "%(completed)s из %(total)s ключей восстановлено",
+    "Recovery key mismatch": "Несоответствие ключа восстановления",
+    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Резервная копия не может быть расшифрована с помощью этого ключа восстановления: пожалуйста, убедитесь, что вы ввели правильный ключ восстановления.",
+    "Incorrect recovery passphrase": "Неверная парольная фраза восстановления",
+    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Резервная копия не может быть расшифрована с помощью этой парольной фразы восстановления: пожалуйста, убедитесь, что вы ввели правильную парольную фразу восстановления.",
+    "Keys restored": "Ключи восстановлены",
+    "Successfully restored %(sessionCount)s keys": "Успешно восстановлено %(sessionCount)s ключей",
+    "Enter recovery key": "Введите ключ восстановления",
+    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Предупреждение</b>: вы должны настроивать резервное копирование ключей только с доверенного компьютера.",
+    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Если вы забыли свой ключ восстановления, вы можете <button>настроить новые параметры восстановления</button>",
+    "Address (optional)": "Адрес (необязательно)",
+    "Confirm your identity by entering your account password below.": "Подтвердите свою личность, введя пароль учетной записи ниже.",
+    "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>.",
+    "Sign in with SSO": "Вход с помощью SSO",
+    "Self-verification request": "Запрос самопроверки",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "Удалить адрес комнаты %(alias)s и удалить %(name)s из каталога?",
+    "delete the address.": "удалить адрес.",
+    "Switch theme": "Сменить тему",
+    "User menu": "Меню пользователя",
+    "Verify this login": "Подтвердите эту сессию",
+    "Session verified": "Сессия подтверждена",
+    "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.": "Изменение пароля приведет к сбросу всех сквозных ключей шифрования во всех ваших сессиях, и зашифрованная история чата станет недоступна. Перед сбросом пароля настройте резервное копирование ключей или экспортируйте ключи от комнат из другой сессии.",
+    "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.": "Вы вышли из всех сессий и больше не будете получать push-уведомления. Чтобы снова включить уведомления, войдите в систему еще раз на каждом устройстве.",
+    "Syncing...": "Синхронизация…",
+    "Signing In...": "Выполняется вход...",
+    "If you've joined lots of rooms, this might take a while": "Если вы присоединились к большому количеству комнат, это может занять некоторое время",
+    "Use Recovery Key or Passphrase": "Используйте ключ восстановления или парольную фразу",
+    "Use Recovery Key": "Используйте ключ восстановления",
+    "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:": "Для этого требуется последняя версия %(brand)s на других ваших устройствах:",
+    "%(brand)s Web": "Веб-версия %(brand)s",
+    "%(brand)s Desktop": "Настольный клиент %(brand)s",
+    "%(brand)s iOS": "iOS клиент %(brand)s",
+    "%(brand)s X for Android": "%(brand)s X для Android",
+    "or another cross-signing capable Matrix client": "или другой, поддерживаемый кросс-подпись Matrix клиент",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Ваша новая сессия теперь подтверждена. У неё есть доступ к вашим зашифрованным сообщениям, и другие пользователи будут считать её доверенной.",
+    "Your new session is now verified. Other users will see it as trusted.": "Ваша новая сессия теперь проверена. Другие пользователи будут считать её доверенной.",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "Без подтверждения этой сессии, у неё не будет доступа к зашифрованным сообщениям.",
+    "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.": "Восстановите доступ к своей учетной записи и восстановите ключи шифрования, хранящиеся в этой сессии. Без них вы не сможете прочитать никакие защищённые сообщения ни в одной сессии.",
+    "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.": "Предупреждение: ваши личные данные (включая ключи шифрования) всё ещё хранятся в этой сессии. Удалите их, если вы хотите завершить эту сессию или войти в другую учетную запись.",
+    "Confirm encryption setup": "Подтвердите настройку шифрования",
+    "Click the button below to confirm setting up encryption.": "Нажмите кнопку ниже, чтобы подтвердить настройку шифрования.",
+    "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Защитите себя от потери доступа к зашифрованным сообщениям и данным, создав резервные копии ключей шифрования на вашем сервере.",
+    "Generate a Security Key": "Создание ключа безопасности",
+    "We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "Мы создадим ключ безопасности для вас, чтобы вы могли хранить его в надежном месте, например, в менеджере паролей или сейфе.",
+    "Enter a Security Phrase": "Введите секретную фразу",
+    "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Используйте секретную фразу, известную только вам, и при необходимости сохраните ключ безопасности для резервного копирования.",
+    "Enter your account password to confirm the upgrade:": "Введите пароль своей учетной записи для подтверждения обновления:",
+    "Restore your key backup to upgrade your encryption": "Восстановите резервную копию ключа для обновления шифрования",
+    "Restore": "Восстановление",
+    "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.": "Модернизируйте эту сессию, чтобы она могла проверять другие сессии, предоставляя им доступ к зашифрованным сообщениям и помечая их как доверенные для других пользователей.",
+    "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 different 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.": "Храните ключ безопасности в надежном месте, например в менеджере паролей или сейфе, так как он используется для защиты ваших зашифрованных данных.",
+    "Copy": "Копировать",
+    "Unable to query secret storage status": "Невозможно запросить состояние секретного хранилища",
+    "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Если вы отмените сейчас, вы можете потерять зашифрованные сообщения и данные, если потеряете доступ к своим логинам.",
+    "You can also set up Secure Backup & manage your keys in Settings.": "Вы также можете настроить безопасное резервное копирование и управлять своими ключами в настройках.",
+    "Set up Secure backup": "Настройка безопасного резервного копирования",
+    "Upgrade your encryption": "Обновите свое шифрование",
+    "Set a Security Phrase": "Задайте секретную фразу",
+    "Confirm Security Phrase": "Подтвердите секретную фразу",
+    "Save your Security Key": "Сохраните свой ключ безопасности",
+    "Unable to set up secret storage": "Невозможно настроить секретное хранилище",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "Мы будем хранить зашифрованную копию ваших ключей на нашем сервере. Защитите свою резервную копию с помощью пароля восстановления.",
+    "Set up with a recovery key": "Настройка с помощью ключа восстановления",
+    "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.": "Ваш ключ восстановления - это защитная сетка - вы можете использовать его для восстановления доступа к зашифрованным сообщениям, если забудете пароль восстановления.",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Храните его копию в надежном месте, например, в менеджере паролей или даже в сейфе.",
+    "Your recovery key": "Ваш ключ восстановления",
+    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Ваш ключ восстановления был <b>скопирован в буфер обмена</b>, вставьте его в:",
+    "Your recovery key is in your <b>Downloads</b> folder.": "Ваш ключ восстановления находится в папке <b>Загрузки</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.": "Без настройки безопасного восстановления сообщений вы не сможете восстановить свою зашифрованную историю сообщений, если выйдете из системы или воспользуетесь другой сессией.",
+    "Secure your backup with a recovery passphrase": "Защитите свою резервную копию с помощью пароля восстановления",
+    "Make a copy of your recovery key": "Сделайте копию вашего ключа восстановления",
+    "Create key backup": "Создать резервную копию ключа",
+    "This session is encrypting history using the new recovery method.": "Эта сессия шифрует историю с помощью нового метода восстановления.",
+    "This session has detected that your recovery passphrase 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 disabled, messages from encrypted rooms won't appear in search results.": "Если этот параметр отключен, сообщения из зашифрованных комнат не будут отображаться в результатах поиска.",
+    "Disable": "Отключить",
+    "Not currently indexing messages for any room.": "В настоящее время не индексируются сообщения ни для одной комнаты.",
+    "Currently indexing: %(currentRoom)s": "В настоящее время идёт индексация: %(currentRoom)s",
+    "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s надежно кэширует зашифрованные сообщения локально, чтобы они появлялись в результатах поиска:",
+    "Space used:": "Занято места:",
+    "Indexed messages:": "Индексированные сообщения:",
+    "Indexed rooms:": "Индексированные комнаты:",
+    "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s из %(totalRooms)s",
+    "Message downloading sleep time(ms)": "Пауза между загрузками сообщений (в мс)",
+    "Navigation": "Навигация",
+    "Calls": "Звонки",
+    "Room List": "Список комнат",
+    "Autocomplete": "Автодополнение",
+    "Alt": "Alt",
+    "Alt Gr": "Правый Alt",
+    "Shift": "Shift",
+    "Super": "Super/Meta",
+    "Ctrl": "Ctrl",
+    "Toggle Bold": "Жирный шрифт",
+    "Toggle Italics": "Курсивный шрифт",
+    "Toggle Quote": "Цитата",
+    "New line": "Новая строка",
+    "Navigate recent messages to edit": "Выбор последних сообщений для редактирования",
+    "Jump to start/end of the composer": "Переход к началу/концу строки",
+    "Navigate composer history": "Просмотр истории сообщений",
+    "Cancel replying to a message": "Отмена ответа на сообщение",
+    "Toggle microphone mute": "Включить/выключить микрофон",
+    "Toggle video on/off": "Включить/выключить видео",
+    "Scroll up/down in the timeline": "Прокрутка чата вверх/вниз",
+    "Dismiss read marker and jump to bottom": "Убрать маркер прочтения и перейти в конец",
+    "Jump to oldest unread message": "Перейти к самому старому непрочитанному сообщению",
+    "Upload a file": "Загрузить файл",
+    "Jump to room search": "Перейти к поиску комнат",
+    "Navigate up/down in the room list": "Перемещение вверх/вниз по списку комнат",
+    "Select room from the room list": "Выбрать комнату из списка комнат",
+    "Collapse room list section": "Свернуть секцию списка комнат",
+    "Expand room list section": "Раскрыть секцию списка комнат",
+    "Clear room list filter field": "Очистить фильтр списка комнат",
+    "Previous/next unread room or DM": "Предыдущая/следующая непрочитанная комната или ЛС",
+    "Previous/next room or DM": "Предыдущая/следующая комната или ЛС",
+    "Toggle the top left menu": "Переключение верхнего левого меню",
+    "Close dialog or context menu": "Закрыть диалоговое окно или контекстное меню",
+    "Move autocomplete selection up/down": "Перемещение выбора автозаполнения вверх/вниз",
+    "Page Up": "Page Up",
+    "Page Down": "Page Down",
+    "Space": "Пробел",
+    "End": "End",
+    "No files visible in this room": "Нет видимых файлов в этой комнате",
+    "Attach files from chat or just drag and drop them anywhere in a room.": "Прикрепите файлы из чата или просто перетащите их в комнату.",
+    "You’re all caught up": "Нет непрочитанных сообщений",
+    "You have no visible notifications in this room.": "Нет видимых уведомлений в этой комнате.",
+    "%(brand)s Android": "%(brand)s Android",
+    "Master private key:": "Приватный мастер-ключ:"
 }
diff --git a/src/i18n/strings/si.json b/src/i18n/strings/si.json
new file mode 100644
index 0000000000..11da7b7e4c
--- /dev/null
+++ b/src/i18n/strings/si.json
@@ -0,0 +1,8 @@
+{
+    "This email address is already in use": "මෙම විද්‍යුත් තැපැල් ලිපිනය දැනටමත් භාවිතයේ පවතී",
+    "This phone number is already in use": "මෙම දුරකථන අංකය දැනටමත් භාවිතයේ පවතී",
+    "Use Single Sign On to continue": "ඉදිරියට යාමට තනි පුරනය වීම භාවිතා කරන්න",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "ඔබගේ අනන්‍යතාවය සනාථ කිරීම සඳහා තනි පුරනය භාවිතා කිරීමෙන් මෙම විද්‍යුත් තැපැල් ලිපිනය එක් කිරීම තහවුරු කරන්න.",
+    "Confirm": "තහවුරු කරන්න",
+    "Add Email Address": "විද්‍යුත් තැපැල් ලිපිනය එක් කරන්න"
+}
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index f6f0cd3a74..667768fd57 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -42,21 +42,19 @@
     "Invite to Community": "Pozvať do komunity",
     "Which rooms would you like to add to this community?": "Ktoré miestnosti by ste radi pridali do tejto komunity?",
     "Add rooms to the community": "Pridať miestnosti do komunity",
-    "Room name or alias": "Názov miestnosti alebo alias",
     "Add to community": "Pridať do komunity",
     "Failed to invite the following users to %(groupId)s:": "Do komunity %(groupId)s sa nepodarilo pozvať nasledujúcich používateľov:",
     "Failed to invite users to community": "Do komunity sa nepodarilo pozvať používateľov",
     "Failed to invite users to %(groupId)s": "Do komunity %(groupId)s sa nepodarilo pozvať používateľov",
     "Failed to add the following rooms to %(groupId)s:": "Do komunity %(groupId)s sa nepodarilo pridať nasledujúce miestnosti:",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot nemá udelené povolenie, aby vám mohol posielať oznámenia - Prosím, skontrolujte nastavenia vašeho prehliadača",
-    "Riot was not given permission to send notifications - please try again": "Aplikácii Riot nebolo udelené povolenie potrebné pre posielanie oznámení - prosím, skúste to znovu",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s nemá udelené povolenie, aby vám mohol posielať oznámenia - Prosím, skontrolujte nastavenia vašeho prehliadača",
+    "%(brand)s was not given permission to send notifications - please try again": "Aplikácii %(brand)s nebolo udelené povolenie potrebné pre posielanie oznámení - prosím, skúste to znovu",
     "Unable to enable Notifications": "Nie je možné povoliť oznámenia",
     "This email address was not found": "Túto emailovú adresu sa nepodarilo nájsť",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Zdá sa, že vaša emailová adresa nie je priradená k žiadnemu Matrix ID na tomto domovskom serveri.",
     "Default": "Predvolené",
     "Moderator": "Moderátor",
     "Admin": "Správca",
-    "Start a chat": "Začať konverzáciu",
     "Operation failed": "Operácia zlyhala",
     "Failed to invite": "Pozvanie zlyhalo",
     "Failed to invite the following users to the %(roomName)s room:": "Do miestnosti %(roomName)s sa nepodarilo pozvať nasledujúcich používateľov:",
@@ -74,7 +72,6 @@
     "Usage": "Použitie",
     "/ddg is not a command": "/ddg nie je žiaden príkaz",
     "To use it, just wait for autocomplete results to load and tab through them.": "Ak to chcete použiť, len počkajte na načítanie výsledkov automatického dopĺňania a cyklicky prechádzajte stláčaním klávesu tab..",
-    "Unrecognised room alias:": "Nerozpoznaný alias miestnosti:",
     "Ignored user": "Ignorovaný používateľ",
     "You are now ignoring %(userId)s": "Od teraz ignorujete používateľa %(userId)s",
     "Unignored user": "Ignorácia zrušená",
@@ -128,7 +125,7 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Server môže byť nedostupný, preťažený, alebo ste narazili na chybu.",
     "Unnamed Room": "Nepomenovaná miestnosť",
     "Your browser does not support the required cryptography extensions": "Váš prehliadač nepodporuje požadované kryptografické rozšírenia",
-    "Not a valid Riot keyfile": "Toto nie je správny súbor s kľúčami Riot",
+    "Not a valid %(brand)s keyfile": "Toto nie je správny súbor s kľúčami %(brand)s",
     "Authentication check failed: incorrect password?": "Kontrola overenia zlyhala: Nesprávne heslo?",
     "Failed to join room": "Nepodarilo sa vstúpiť do miestnosti",
     "Active call (%(roomName)s)": "Aktívny hovor (%(roomName)s)",
@@ -156,12 +153,9 @@
     "New Password": "Nové heslo",
     "Confirm password": "Potvrdiť heslo",
     "Change Password": "Zmeniť heslo",
-    "Device ID": "ID zariadenia",
     "Last seen": "Naposledy aktívne",
     "Failed to set display name": "Nepodarilo sa nastaviť zobrazované meno",
     "Authentication": "Overenie",
-    "Disable Notifications": "Zakázať oznámenia",
-    "Enable Notifications": "Povoliť oznámenia",
     "Cannot add any more widgets": "Nie je možné pridať ďalšie widgety",
     "The maximum permitted number of widgets have already been added to this room.": "Do tejto miestnosti už bol pridaný maximálny povolený počet widgetov.",
     "Add a widget": "Pridať widget",
@@ -175,8 +169,6 @@
     "%(senderName)s uploaded a file": "%(senderName)s nahral súbor",
     "Options": "Možnosti",
     "Please select the destination room for this message": "Prosím, vyberte cieľovú miestnosť pre túto správu",
-    "Blacklisted": "Na čiernej listine",
-    "device id: ": "ID zariadenia: ",
     "Disinvite": "Stiahnuť pozvanie",
     "Kick": "Vykázať",
     "Disinvite this user?": "Stiahnuť pozvanie tohoto používateľa?",
@@ -188,7 +180,6 @@
     "Ban this user?": "Zakázať vstúpiť tomuto používateľovi?",
     "Failed to ban user": "Nepodarilo sa zakázať vstup používateľa",
     "Failed to mute user": "Nepodarilo sa umlčať používateľa",
-    "Failed to toggle moderator status": "Nepodarilo sa prepnúť stav moderátor",
     "Failed to change power level": "Nepodarilo sa zmeniť úroveň moci",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Túto zmenu nebudete môcť vrátiť späť pretože tomuto používateľovi udeľujete rovnakú úroveň moci, akú máte vy.",
     "Are you sure?": "Ste si istí?",
@@ -197,12 +188,8 @@
     "Jump to read receipt": "Preskočiť na potvrdenie o prečítaní",
     "Mention": "Zmieniť sa",
     "Invite": "Pozvať",
-    "User Options": "Možnosti používateľa",
-    "Direct chats": "Priame konverzácie",
     "Unmute": "Zrušiť umlčanie",
     "Mute": "Umlčať",
-    "Revoke Moderator": "Odobrať stav moderátor",
-    "Make Moderator": "Udeliť stav moderátor",
     "Admin Tools": "Nástroje správcu",
     "and %(count)s others...|other": "a ďalších %(count)s…",
     "and %(count)s others...|one": "a jeden ďalší…",
@@ -279,10 +266,7 @@
     "Jump to first unread message.": "Preskočiť na prvú neprečítanú správu.",
     "Close": "Zatvoriť",
     "not specified": "nezadané",
-    "Remote addresses for this room:": "Vzdialené adresy do tejto miestnosti:",
-    "Local addresses for this room:": "Lokálne adresy do tejto miestnosti:",
     "This room has no local addresses": "Pre túto miestnosť nie sú žiadne lokálne adresy",
-    "New address (e.g. #foo:%(localDomain)s)": "Nová adresa (napr. #foo:%(localDomain)s)",
     "Invalid community ID": "Nesprávne ID komunity",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' nie je platným ID komunity",
     "New community ID (e.g. +foo:%(localDomain)s)": "Nové ID komunity (napr. +foo:%(localDomain)s)",
@@ -303,12 +287,8 @@
     "Failed to copy": "Nepodarilo sa skopírovať",
     "Add an Integration": "Pridať integráciu",
     "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 presmerovaní na stránku tretej strany, aby ste mohli overiť svoj účet na použitie s %(integrationsUrl)s. Chcete pokračovať?",
-    "Removed or unknown message type": "Odstránený alebo neznámy typ správy",
-    "Message removed by %(userId)s": "Správu odstránil %(userId)s",
-    "Message removed": "správa odstránená",
     "Custom Server Options": "Vlastné možnosti servera",
     "Dismiss": "Zamietnuť",
-    "To continue, please enter your password.": "Aby ste mohli pokračovať, prosím zadajte svoje heslo.",
     "An email has been sent to %(emailAddress)s": "Na adresu %(emailAddress)s bola odoslaná správa",
     "Please check your email to continue registration.": "Prosím, skontrolujte si emaily, aby ste mohli pokračovať v registrácii.",
     "Token incorrect": "Neplatný token",
@@ -345,13 +325,8 @@
     "Delete widget": "Vymazať widget",
     "Edit": "Upraviť",
     "Create new room": "Vytvoriť novú miestnosť",
-    "Unblacklist": "Odstrániť z čiernej listiny",
-    "Blacklist": "Pridať na čiernu listinu",
-    "Unverify": "Zrušiť overenie",
-    "Verify...": "Overiť…",
     "No results": "Žiadne výsledky",
     "Home": "Domov",
-    "Could not connect to the integration server": "Nie je možné sa pripojiť k integračnému serveru",
     "Manage Integrations": "Spravovať integrácie",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s%(count)s krát vstúpili",
@@ -430,15 +405,9 @@
     "Unknown error": "Neznáma chyba",
     "Incorrect password": "Nesprávne heslo",
     "Deactivate Account": "Deaktivovať účet",
-    "I verify that the keys match": "Overil som, kľúče sa zhodujú",
     "An error has occurred.": "Vyskytla sa chyba.",
     "OK": "OK",
-    "Start verification": "Spustiť overenie",
-    "Share without verifying": "Zdieľať bez overenia",
-    "Ignore request": "Ignorovať žiadosť",
-    "Encryption key request": "Žiadosť o šifrovacie kľúče",
     "Unable to restore session": "Nie je možné obnoviť reláciu",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Ak ste sa v minulosti prihlásili s novšou verziou programu Riot, vaša relácia nemusí byť kompatibilná s touto verziou. Zatvorte prosím toto okno a vráťte sa cez najnovšiu verziu Riot.",
     "Invalid Email Address": "Nesprávna emailová adresa",
     "This doesn't appear to be a valid email address": "Zdá sa, že toto nie je platná emailová adresa",
     "Verification Pending": "Nedokončené overenie",
@@ -454,11 +423,9 @@
     "To get started, please pick a username!": "Začnite tým, že si zvolíte používateľské meno!",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Toto bude názov vašeho účtu na domovskom serveri <span></span>, alebo si môžete zvoliť <a>iný server</a>.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Ak už máte Matrix účet, môžete sa hneď <a>Prihlásiť</a>.",
-    "Send anyway": "Napriek tomu odoslať",
     "Private Chat": "Súkromná konverzácia",
     "Public Chat": "Verejná konverzácia",
     "Custom": "Vlastné",
-    "Alias (optional)": "Alias (nepovinné)",
     "Name": "Názov",
     "You must <a>register</a> to use this functionality": "Aby ste mohli použiť túto vlastnosť, musíte byť <a>zaregistrovaný</a>",
     "You must join the room to see its files": "Aby ste si mohli zobraziť zoznam súborov, musíte vstúpiť do miestnosti",
@@ -511,7 +478,6 @@
     "Create a new community": "Vytvoriť novú komunitu",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Vytvorte si komunitu s cieľom zoskupiť miestnosti a používateľov! Zostavte si vlastnú domovskú stránku a vymedzte tak svoj priestor vo svete Matrix.",
     "You have no visible notifications": "Nie sú k dispozícii žiadne oznámenia",
-    "Scroll to bottom of page": "Posunúť na spodok stránky",
     "Connectivity to the server has been lost.": "Spojenie so serverom bolo prerušené.",
     "Sent messages will be stored until your connection has returned.": "Odoslané správy ostanú uložené, kým sa spojenie nenadviaže znovu.",
     "Active call": "Aktívny hovor",
@@ -521,7 +487,6 @@
     "Search failed": "Hľadanie zlyhalo",
     "Server may be unavailable, overloaded, or search timed out :(": "Server môže byť nedostupný, preťažený, alebo vypršal časový limit hľadania :(",
     "No more results": "Žiadne ďalšie výsledky",
-    "Unknown room %(roomId)s": "Neznáma miestnosť %(roomId)s",
     "Room": "Miestnosť",
     "Failed to reject invite": "Nepodarilo sa odmietnuť pozvanie",
     "Fill screen": "Vyplniť obrazovku",
@@ -538,12 +503,9 @@
     "Autoplay GIFs and videos": "Automaticky prehrávať animované GIF obrázky a videá",
     "Always show message timestamps": "Vždy zobrazovať časovú značku správ",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Pri zobrazovaní časových značiek používať 12 hodinový formát (napr. 2:30pm)",
-    "Use compact timeline layout": "Použiť kompaktné rozloženie časovej osy",
     "Enable automatic language detection for syntax highlighting": "Povoliť automatickú detegciu jazyka pre zvýrazňovanie syntaxe",
-    "Automatically replace plain text Emoji": "Automaticky nahrádzať textové Emoji",
+    "Automatically replace plain text Emoji": "Automaticky nahrádzať textové emotikony modernými emoji",
     "Mirror local video feed": "Zrkadliť lokálne video",
-    "Light theme": "Svetlý vzhľad",
-    "Dark theme": "Tmavý vzhľad",
     "Sign out": "Odhlásiť sa",
     "Failed to change password. Is your password correct?": "Nepodarilo sa zmeniť heslo. Zadali ste správne heslo?",
     "Success": "Úspech",
@@ -552,13 +514,13 @@
     "Import E2E room keys": "Importovať E2E šifrovacie kľúče miestností",
     "Cryptography": "Kryptografia",
     "Analytics": "Analytické údaje",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot zbiera anonymné analytické údaje, čo nám umožňuje aplikáciu ďalej zlepšovať.",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s zbiera anonymné analytické údaje, čo nám umožňuje aplikáciu ďalej zlepšovať.",
     "Labs": "Experimenty",
     "Check for update": "Skontrolovať dostupnosť aktualizácie",
     "Reject all %(invitedRooms)s invites": "Odmietnuť všetky %(invitedRooms)s pozvania",
     "Start automatically after system login": "Spustiť automaticky po prihlásení do systému",
     "No media permissions": "Nepovolený prístup k médiám",
-    "You may need to manually permit Riot to access your microphone/webcam": "Mali by ste aplikácii Riot ručne udeliť právo pristupovať k mikrofónu a kamere",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "Mali by ste aplikácii %(brand)s ručne udeliť právo pristupovať k mikrofónu a kamere",
     "No Microphones detected": "Neboli rozpoznané žiadne mikrofóny",
     "No Webcams detected": "Neboli rozpoznané žiadne kamery",
     "Default Device": "Predvolené zariadenie",
@@ -572,7 +534,7 @@
     "click to reveal": "Odkryjete kliknutím",
     "Homeserver is": "Domovský server je",
     "Identity Server is": "Server totožností je",
-    "riot-web version:": "Verzia riot-web:",
+    "%(brand)s version:": "Verzia %(brand)s:",
     "olm version:": "Verzia olm:",
     "Failed to send email": "Nepodarilo sa odoslať email",
     "The email address linked to your account must be entered.": "Musíte zadať emailovú adresu prepojenú s vašim účtom.",
@@ -596,7 +558,6 @@
     "Define the power level of a user": "Určí úroveň sili používateľa",
     "Deops user with given id": "Zruší stav moderátor používateľovi so zadaným ID",
     "Invites user with given id to current room": "Pošle používateľovi so zadaným ID pozvanie do tejto miestnosti",
-    "Joins room with given alias": "Vstúpi do miestnosti so zadaným aliasom",
     "Kicks user with given id": "Vykáže používateľa so zadaným ID",
     "Changes your display nickname": "Zmení vaše zobrazované meno",
     "Searches DuckDuckGo for results": "Vyhľadá výsledky na DuckDuckGo",
@@ -608,27 +569,13 @@
     "Notify the whole room": "Oznamovať celú miestnosť",
     "Room Notification": "Oznámenie miestnosti",
     "Users": "Používatelia",
-    "unknown device": "neznáme zariadenie",
-    "NOT verified": "NE-overené",
-    "verified": "overené",
-    "Verification": "Overenie",
-    "Ed25519 fingerprint": "Odtlačok prsta Ed25519",
-    "User ID": "ID používateľa",
-    "Curve25519 identity key": "Kľúč totožnosti Curve25519",
-    "none": "žiadny",
-    "Claimed Ed25519 fingerprint key": "Údajne kľúč s odtlačkom prsta Ed25519",
-    "Algorithm": "Algoritmus",
-    "unencrypted": "nešifrované",
-    "Decryption error": "Chyba dešifrovania",
     "Session ID": "ID relácie",
-    "End-to-end encryption information": "Informácie o šifrovaní E2E",
-    "Event information": "Informácie o udalosti",
     "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.",
-    "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, k to 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 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.": "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",
     "Export": "Exportovať",
     "Import room keys": "Importovať kľúče miestností",
@@ -646,11 +593,6 @@
     "URL previews are disabled by default for participants in this room.": "Náhľady URL adries sú predvolene zakázané pre členov tejto miestnosti.",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Okrem vás v tejto miestnosti nie je nik iný! Želáte si <inviteText>Pozvať ďalších</inviteText> alebo <nowarnText>Prestať upozorňovať na prázdnu miestnosť</nowarnText>?",
     "Call Failed": "Zlyhanie hovoru",
-    "Review Devices": "Prezrieť zariadenia",
-    "Call Anyway": "Napriek tomu zavolať",
-    "Answer Anyway": "Napriek tomu prijať",
-    "Call": "Hovor",
-    "Answer": "Prijať",
     "Send": "Odoslať",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
@@ -664,7 +606,6 @@
     "collapse": "zbaliť",
     "expand": "rozbaliť",
     "Old cryptography data detected": "Nájdené zastaralé kryptografické údaje",
-    "Data from an older version of Riot 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.": "Boli nájdené údaje zo staršej verzie Riot. Toto spôsobí, že E2E šifrovanie nebude v staršej verzii Riot fungovať. Zašifrované správy prijaté a odoslané v poslednom čase cez staršiu verziu Riot nemusia byť čitateľné v tejto verzii Riot. Môže to tiež spôsobiť, že šifrované konverzácie nebudú s touto verziou Riot čitateľné. Ak spozorujete niektoré s týchto problémov, odhláste sa a opätovne sa prihláste prosím. Históriu šifrovaných konverzácií zachováte tak, že si exportujete a znovu importujete kľúče miestností.",
     "Warning": "Upozornenie",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Tento domovský server neponúka žiadny prihlasovací mechanizmus podporovaný vašim klientom.",
     "Flair": "Príslušnosť ku komunitám",
@@ -674,9 +615,7 @@
     "%(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.",
     "Send an encrypted reply…": "Odoslať šifrovanú odpoveď…",
-    "Send a reply (unencrypted)…": "Odoslať odpoveď (nešifrovanú)…",
     "Send an encrypted message…": "Odoslať šifrovanú správu…",
-    "Send a message (unencrypted)…": "Odoslať správu (nešifrovanú)…",
     "Replying": "Odpoveď",
     "Minimize apps": "Minimalizovať aplikácie",
     "%(count)s of your messages have not been sent.|one": "Vaša správa nebola odoslaná.",
@@ -684,15 +623,13 @@
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Znovu odoslať správu</resendText> alebo <cancelText>zrušiť správu</cancelText> teraz.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Vaše súkromie je pre nás dôležité, preto nezhromažďujeme žiadne osobné údaje alebo údaje, na základe ktorých je možné vás identifikovať.",
     "Learn more about how we use analytics.": "Zistite viac o tom, ako spracúvame analytické údaje.",
-    "The information being sent to us to help make Riot.im better includes:": "S cieľom vylepšovať aplikáciu Riot.im zbierame nasledujúce údaje:",
+    "The information being sent to us to help make %(brand)s better includes:": "Informácie, ktoré nám posielate, aby sme zlepšili %(brand)s, zahŕňajú:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Ak sa na stránke vyskytujú identifikujúce údaje, akými sú napríklad názov miestnosti, ID používateľa, miestnosti alebo skupiny, tieto sú pred odoslaním na server odstránené.",
     "The platform you're on": "Vami používaná platforma",
-    "The version of Riot.im": "Verzia Riot.im",
+    "The version of %(brand)s": "Verzia %(brand)su",
     "Your language of choice": "Váš uprednostňovaný jazyk",
-    "Which officially provided instance you are using, if any": "Cez ktorú oficiálne podporovanú inštanciu Riot.im ste pripojení (ak nehostujete Riot sami)",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Či pri písaní správ používate rozbalenú lištu formátovania textu",
     "Your homeserver's URL": "URL adresa vami používaného domovského servera",
-    "Your identity server's URL": "URL adresa vami používaného servera totožností",
     "This room is not public. You will not be able to rejoin without an invite.": "Toto nie je verejne dostupná miestnosť. Bez pozvánky nebudete do nej môcť vstúpiť znovu.",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s si zmenil zobrazované meno na %(displayName)s.",
     "Failed to set direct chat tag": "Nepodarilo sa nastaviť značku priama konverzácia",
@@ -708,8 +645,7 @@
     "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Zmeny vykonané vo vašej komunite <bold1>názov</bold1> a <bold2>obrázok</bold2> nemusia byť nasledujúcich 30 minút viditeľné všetkými používateľmi.",
     "Join this community": "Vstúpiť do tejto komunity",
     "Leave this community": "Opustiť túto komunitu",
-    "Did you know: you can use communities to filter your Riot.im experience!": "Vedeli ste: Že prácu s Riot.im si môžete spríjemníť použitím komunít!",
-    "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.": "Ak si chcete nastaviť filter, pretiahnite obrázok komunity na panel filtrovania úplne na ľavej strane obrazovky. Potom môžete kedykoľvek kliknúť na obrázok komunity na tomto panely a Riot.im vám bude zobrazovať len miestnosti a ľudí z komunity, na ktorej obrázok ste klikli.",
+    "Did you know: you can use communities to filter your %(brand)s experience!": "Vedeli ste: Že prácu s %(brand)s si môžete spríjemníť použitím komunít!",
     "Clear filter": "Zrušiť filter",
     "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.": "Ak ste nám poslali hlásenie o chybe cez Github, ladiace záznamy nám môžu pomôcť lepšie identifikovať chybu. Ladiace záznamy obsahujú údaje o používaní aplikácii, vrátane vašeho používateľského mena, názvy a aliasy miestností a komunít, ku ktorým ste sa pripojili a mená ostatných používateľov. Tieto záznamy neobsahujú samotný obsah vašich správ.",
     "Submit debug logs": "Odoslať ladiace záznamy",
@@ -721,7 +657,6 @@
     "Who can join this community?": "Kto môže vstúpiť do tejto komunity?",
     "Everyone": "Ktokoľvek",
     "Fetching third party location failed": "Nepodarilo sa získať umiestnenie tretej strany",
-    "A new version of Riot is available.": "Dostupná je nová verzia Riot.",
     "Send Account Data": "Odoslať Údaje Účtu",
     "All notifications are currently disabled for all targets.": "Momentálne sú zakázané všetky oznámenia pre všetky ciele.",
     "Uploading report": "Prebieha odovzdanie hlásenia",
@@ -740,8 +675,6 @@
     "Send Custom Event": "Odoslať vlastnú udalosť",
     "Advanced notification settings": "Pokročilé nastavenia oznámení",
     "Failed to send logs: ": "Nepodarilo sa odoslať záznamy: ",
-    "delete the alias.": "vymazať alias.",
-    "To return to your account in future you need to <u>set a password</u>": "Aby ste sa v budúcnosti mohli vrátiť k vašemu účtu mali by ste si teraz <u>nastaviť heslo</u>",
     "Forget": "Zabudnuť",
     "You cannot delete this image. (%(code)s)": "Nemôžete vymazať tento obrázok. (%(code)s)",
     "Cancel Sending": "Zrušiť odosielanie",
@@ -765,7 +698,6 @@
     "No update available.": "K dispozícii nie je žiadna aktualizácia.",
     "Noisy": "Hlučné",
     "Collecting app version information": "Získavajú sa informácie o verzii aplikácii",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Vymazať alias %(alias)s a odstrániť miestnosť %(name)s z adresára?",
     "Keywords": "Kľúčové slová",
     "Enable notifications for this account": "Povoliť oznámenia pre tento účet",
     "Invite to this community": "Pozvať do tejto komunity",
@@ -776,7 +708,7 @@
     "Enter keywords separated by a comma:": "Zadajte kľúčové slová oddelené čiarkou:",
     "Forward Message": "Preposlať správu",
     "Remove %(name)s from the directory?": "Odstrániť miestnosť %(name)s z adresára?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot sa spolieha na mnohé pokročilé vlastnosti prehliadača internetu, a niektoré z nich sú vo vašom prehliadači experimentálne alebo nie sú k dispozícii vôbec.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s sa spolieha na mnohé pokročilé vlastnosti prehliadača internetu, a niektoré z nich sú vo vašom prehliadači experimentálne alebo nie sú k dispozícii vôbec.",
     "Event sent!": "Udalosť odoslaná!",
     "Preparing to send logs": "príprava odoslania záznamov",
     "Explore Account Data": "Preskúmať Údaje účtu",
@@ -797,7 +729,7 @@
     "All Rooms": "Vo všetkych miestnostiach",
     "State Key": "State Key",
     "Wednesday": "Streda",
-    "Quote": "Citácia",
+    "Quote": "Citovať",
     "Send logs": "Zahrnúť záznamy",
     "All messages": "Všetky správy",
     "Call invitation": "Audio / Video hovory",
@@ -814,7 +746,7 @@
     "Invite to this room": "Pozvať do tejto miestnosti",
     "You cannot delete this message. (%(code)s)": "Nemôžete vymazať túto správu. (%(code)s)",
     "Thursday": "Štvrtok",
-    "I understand the risks and wish to continue": "Rozumiem rizikám a želám si pokračovať",
+    "I understand the risks and wish to continue": "Rozumiem riziku a chcem pokračovať",
     "Logs sent": "Záznamy boli odoslané",
     "Back": "Naspäť",
     "Reply": "Odpovedať",
@@ -822,8 +754,7 @@
     "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.": "Ladiace záznamy obsahujú údaje o používaní aplikácii, vrátane vašeho používateľského mena, názvy a aliasy miestností a komunít, ku ktorým ste sa pripojili a mená ostatných používateľov. Tieto záznamy neobsahujú samotný obsah vašich správ.",
     "Unhide Preview": "Zobraziť náhľad",
     "Unable to join network": "Nie je možné sa pripojiť k sieti",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Tieto nastavenia oznámení sa použijú aj napriek tomu, že ich nemôžete meniť cez Riot. Pravdepodobne ste si ich nastavili v inej aplikácii",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Prepáčte, vo vašom prehliadači <b>nie je</b> možné spustiť Riot.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Prepáčte, vo vašom prehliadači <b>nie je</b> možné spustiť %(brand)s.",
     "Messages in group chats": "Správy v skupinových konverzáciách",
     "Yesterday": "Včera",
     "Error encountered (%(errorDetail)s).": "Vyskytla sa chyba (%(errorDetail)s).",
@@ -833,7 +764,7 @@
     "Set Password": "Nastaviť Heslo",
     "An error occurred whilst saving your email notification preferences.": "Počas ukladania vašich nastavení oznamovania emailom sa vyskytla chyba.",
     "Off": "Zakázané",
-    "Riot does not know how to join a room on this network": "Riot nedokáže vstúpiť do miestnosti na tejto sieti",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s nedokáže vstúpiť do miestnosti na tejto sieti",
     "Mentions only": "Len zmienky",
     "You can now return to your account after signing out, and sign in on other devices.": "Odteraz sa budete k svojmu účtu vedieť vrátiť aj po odhlásení, alebo tiež prihlásiť na iných zariadeniach.",
     "Enable email notifications": "Povoliť oznamovanie emailom",
@@ -845,12 +776,9 @@
     "View Source": "Zobraziť zdroj",
     "Event Content": "Obsah Udalosti",
     "Thank you!": "Ďakujeme!",
-    "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!": "Vo vašom súčasnom prehliadači nemusí Riot vizerať ani fungovať správne a niektoré alebo všetky vlastnosti môžu chýbať. Ak to chcete vyskúšať, môžete pokračovať, no pri riešení problémov s tým spojených si budete musieť poradiť na vlastnú päsť!",
     "Checking for an update...": "Kontrola dostupnosti aktualizácie…",
-    "There are advanced notifications which are not shown here": "Niektoré pokročilé oznámenia nemôžu byť zobrazené",
     "Every page you use in the app": "Každú stránku v aplikácii, ktorú navštívite",
     "e.g. <CurrentPageURL>": "príklad <CurrentPageURL>",
-    "Your User Agent": "Reťazec User Agent vašeho zariadenia",
     "Your device resolution": "Rozlíšenie obrazovky vašeho zariadenia",
     "Popout widget": "Otvoriť widget v novom okne",
     "Missing roomId.": "Chýba ID miestnosti.",
@@ -866,9 +794,6 @@
     "Send analytics data": "Odosielať analytické údaje",
     "Enable widget screenshots on supported widgets": "Umožniť zachytiť snímku obrazovky pre podporované widgety",
     "Muted Users": "Umlčaní používatelia",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Prosím pomôžte nám vylepšovať Riot.im odosielaním <UsageDataLink>anonymných údajov o používaní</UsageDataLink>. Na tento účel použijeme cookie (prečítajte si <PolicyLink>ako používame cookies</PolicyLink>).",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Prosím pomôžte nám vylepšovať Riot.im odosielaním <UsageDataLink>anonymných údajov o používaní</UsageDataLink>. Na tento účel použijeme cookie.",
-    "Yes, I want to help!": "Áno, chcem pomôcť",
     "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>": "Toto spôsobí, že váš účet nebude viac použiteľný. Nebudete sa môcť opätovne prihlásiť a nikto sa nebude môcť znovu zaregistrovať s rovnakým používateľským ID. Deaktiváciou účtu opustíte všetky miestnosti, do ktorých ste kedy vstúpili a vaše kontaktné údaje budú odstránené zo servera totožností. <b>Túto akciu nie je možné vrátiť späť.</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.": "Pri deaktivácii účtu <b>predvolene neodstraňujeme vami odoslané správy.</b> Ak si želáte uplatniť právo zabudnutia, zaškrtnite prosím zodpovedajúce pole nižšie.",
     "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.": "Viditeľnosť správ odoslaných cez matrix funguje podobne ako viditeľnosť správ elektronickej pošty. To, že zabudneme vaše správy v skutočnosti znamená, že správy ktoré ste už odoslali nebudú čitateľné pre nových alebo neregistrovaných používateľov, no registrovaní používatelia, ktorí už prístup k vašim správam majú, budú aj naďalej bez zmeny môcť pristupovať k ich vlastným kópiám vašich správ.",
@@ -913,9 +838,6 @@
     "Please <a>contact your service administrator</a> to continue using the service.": "Prosím, <a>kontaktujte správcu služieb</a> aby ste službu mohli naďalej používať.",
     "This homeserver has hit its Monthly Active User limit.": "Bol dosiahnutý mesačný limit počtu aktívnych používateľov tohoto domovského servera.",
     "This homeserver has exceeded one of its resource limits.": "Bol prekročený limit využitia prostriedkov pre tento domovský server.",
-    "Please <a>contact your service administrator</a> to get this limit increased.": "Prosím, <a>kontaktujte správcu služieb</a> a pokúste sa tento limit navýšiť.",
-    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "Bol dosiahnutý mesačný limit počtu aktívnych používateľov a <b>niektorí používatelia sa nebudú môcť prihlásiť</b>.",
-    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Bol prekročený limit využitia prostriedkov pre tento domovský server a <b>niektorí používatelia sa nebudú môcť prihlásiť</b>.",
     "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.": "Vaša správa nebola odoslaná, pretože bol dosiahnutý mesačný limit počtu aktívnych používateľov tohoto domovského servera. Prosím, <a>kontaktujte správcu služieb</a> aby ste službu mohli naďalej používať.",
     "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.": "Vaša správa nebola odoslaná, pretože bol prekročený limit prostriedkov tohoto domovského servera. Prosím, <a>kontaktujte správcu služieb</a> aby ste službu mohli naďalej používať.",
     "Please <a>contact your service administrator</a> to continue using this service.": "Prosím, <a>kontaktujte správcu služieb</a> aby ste mohli službu ďalej používať.",
@@ -932,20 +854,13 @@
     "Update any local room aliases to point to the new room": "Všetky lokálne aliasy pôvodnej miestnosti sa aktualizujú tak, aby ukazovali na novú miestnosť",
     "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "V pôvodnej miestnosti bude zverejnené odporúčanie prejsť do novej miestnosti a posielanie do pôvodnej miestnosti bude zakázané pre všetkých používateľov",
     "Put a link back to the old room at the start of the new room so people can see old messages": "História novej miestnosti sa začne odkazom do pôvodnej miestnosti, aby si členovia vedeli zobraziť staršie správy",
-    "Registration Required": "Vyžaduje sa registrácia",
-    "You need to register to do this. Would you like to register now?": "Aby ste mohli uskutočniť túto akciu, musíte sa zaregistrovať. Chcete teraz spustiť registráciu?",
     "Forces the current outbound group session in an encrypted room to be discarded": "Vynúti zabudnutie odchádzajúcej skupinovej relácii v šifrovanej miestnosti",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s pridal adresy %(addedAddresses)s do tejto miestnosti.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s pridal adresu %(addedAddresses)s do tejto miestnosti.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s odstránil adresy %(removedAddresses)s z tejto miestnosti.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s odstránil adresu %(removedAddresses)s z tejto miestnosti.",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s pridal %(addedAddresses)s a odstránil %(removedAddresses)s z tejto miestnosti.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s nastavil hlavnú adresu tejto miestnosti %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s odstránil hlavnú adresu tejto miestnosti.",
     "Unable to connect to Homeserver. Retrying...": "Nie je možné sa pripojiť k domovskému serveru. Prebieha pokus o opetovné pripojenie…",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Pred tým, než odošlete záznamy, musíte <a>nahlásiť váš problém na GitHub</a>. Uvedte prosím podrobný popis.",
-    "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Riot teraz vyžaduje 3-5× menej pamäte, pretože informácie o ostatných používateľoch načítava len podľa potreby. Prosím počkajte na dokončenie synchronizácie so serverom!",
-    "Updating Riot": "Prebieha aktualizácia Riot",
+    "%(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 teraz vyžaduje 3-5× menej pamäte, pretože informácie o ostatných používateľoch načítava len podľa potreby. Prosím počkajte na dokončenie synchronizácie so serverom!",
+    "Updating %(brand)s": "Prebieha aktualizácia %(brand)s",
     "Legal": "Právne",
     "Unable to load! Check your network connectivity and try again.": "Nie je možné načítať! Skontrolujte prístup na internet a skúste neskôr.",
     "Failed to invite users to the room:": "Používateľov sa nepodarilo pozvať do miestnosti:",
@@ -1002,34 +917,28 @@
     "That doesn't look like a valid email address": "Zdá sa, že toto nie je platná emailová adresa",
     "The following users may not exist": "Nasledujúci používatelia pravdepodobne neexistujú",
     "Unable to load commit detail: %(msg)s": "Nie je možné načítať podrobnosti pre commit: %(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 Riot to do this": "Aby ste po odhlásení neprišli o možnosť čítať históriu šifrovaných konverzácií, mali by ste si ešte pred odhlásením exportovať šifrovacie kľúče miestností. Prosím vráťte sa k novšej verzii Riot a exportujte si kľúče",
-    "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ": "Už ste použili novšiu verziu Riot na adrese %(host)s. Ak chcete znovu používať túto verziu aj s E2E šifrovaním, musíte sa odhlásiť a potom zas znovu prihlásiť. ",
+    "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": "Aby ste po odhlásení neprišli o možnosť čítať históriu šifrovaných konverzácií, mali by ste si ešte pred odhlásením exportovať šifrovacie kľúče miestností. Prosím vráťte sa k novšej verzii %(brand)s a exportujte si kľúče",
     "Incompatible Database": "Nekompatibilná databáza",
     "Continue With Encryption Disabled": "Pokračovať s vypnutým šifrovaním",
-    "You've previously used Riot 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, Riot needs to resync your account.": "Použili ste aj Riot na adrese %(host)s so zapnutou voľbou Načítanie zoznamu členov pri prvom zobrazení. V tejto verzii je Načítanie zoznamu členov pri prvom zobrazení vypnuté. Keď že lokálna vyrovnávacia pamäť nie je vzájomne kompatibilná s takýmito nastaveniami, Riot potrebuje znovu synchronizovať údaje z vašeho účtu.",
-    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Ak máte Riot s iným nastavením otvorený na ďalšej karte, prosím zatvorte ju, pretože použitie Riot s rôznym nastavením na jednom zariadení vám spôsobí len problémy.",
+    "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.": "Použili ste aj %(brand)s na adrese %(host)s so zapnutou voľbou Načítanie zoznamu členov pri prvom zobrazení. V tejto verzii je Načítanie zoznamu členov pri prvom zobrazení vypnuté. Keď že lokálna vyrovnávacia pamäť nie je vzájomne kompatibilná s takýmito nastaveniami, %(brand)s potrebuje znovu synchronizovať údaje z vašeho účtu.",
+    "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.": "Ak máte %(brand)s s iným nastavením otvorený na ďalšej karte, prosím zatvorte ju, pretože použitie %(brand)s s rôznym nastavením na jednom zariadení vám spôsobí len problémy.",
     "Incompatible local cache": "Nekompatibilná lokálna vyrovnávacia pamäť",
     "Clear cache and resync": "Vymazať vyrovnávaciu pamäť a synchronizovať znovu",
     "Checking...": "Kontrola…",
     "Unable to load backup status": "Nie je možné načítať stav zálohy",
     "Unable to restore backup": "Nie je možné obnoviť zo zálohy",
     "No backup found!": "Nebola nájdená žiadna záloha!",
-    "Backup Restored": "Obnova zo zálohy je hotová",
     "Failed to decrypt %(failedCount)s sessions!": "Nepodarilo sa dešifrovať %(failedCount)s relácií!",
-    "Restored %(sessionCount)s session keys": "Obnovených %(sessionCount)s kľúčov relácií",
-    "Enter Recovery Passphrase": "Zadajte heslo bezpečného obnovenia",
-    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Zabezpečte svoju komunikáciu a prístup k šifrovanej histórii konverzácií zadaním hesla obnovenia.",
-    "Waiting for %(userId)s to confirm...": "Čakanie na potvrdenie od používateľa %(userId)s…",
+    "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Získajte prístup k šifrovanej histórií správ a nastavte šiforvanú komunikáciu zadaním vášho (dlhého) hesla obnovenia.",
     "Prompt before sending invites to potentially invalid matrix IDs": "Upozorniť pred odoslaním pozvaní na potenciálne neexistujúce Matrix ID",
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Nie je možné nájsť používateľský profil pre Matrix ID zobrazené nižšie. Chcete ich napriek tomu pozvať?",
     "Invite anyway and never warn me again": "Napriek tomu pozvať a viac neupozorňovať",
     "Invite anyway": "Napriek tomu pozvať",
     "Next": "Ďalej",
     "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Ak ste zabudli heslo obnovenia, môžete <button1>použiť kľúč obnovenia</button1> alebo <button2>nastaviť bezpečné obnovenie znovu</button2>",
-    "Enter Recovery Key": "Zadajte kľúč obnovenia",
     "This looks like a valid recovery key!": "Zdá sa, že toto je platný kľúč obnovenia!",
     "Not a valid recovery key": "Neplatný kľúč obnovenia",
-    "Access your secure message history and set up secure messaging by entering your recovery key.": "Zabezpečte svoju komunikáciu a prístup k šifrovanej histórii konverzácií zadaním kľúča obnovenia.",
+    "Access your secure message history and set up secure messaging by entering your recovery key.": "Získajte prístup k šifrovanej histórií správ a nastavte šiforvanú komunikáciu zadaním vášho kľúča obnovenia.",
     "Set a new status...": "Nastaviť nový stav…",
     "Clear status": "Zrušiť stav",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Ste správcom tejto komunity. Nebudete môcť znovu vstúpiť bez pozvania od iného správcu.",
@@ -1038,29 +947,20 @@
     "General failure": "Všeobecná chyba",
     "Failed to perform homeserver discovery": "Nepodarilo sa zistiť adresu domovského servera",
     "Sign in with single sign-on": "Prihlásiť sa pomocou jediného prihlasovania",
-    "Great! This passphrase looks strong enough.": "Výborne! Toto je dostatočne silné heslo.",
-    "Enter a passphrase...": "Zadajte heslo…",
     "That matches!": "Zhoda!",
-    "That doesn't match.": "Nezhodujú sa.",
-    "Go back to set it again.": "Vráťte sa späť a nastavte znovu.",
-    "Repeat your passphrase...": "Zopakujte heslo…",
-    "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Ak zabudnete svoje heslo obnovenia, tento kľúč môžete použiť ako ďalší bezpečnostný prvok na obnovenie histórii šifrovaných konverzácií.",
-    "As a safety net, you can use it to restore your encrypted message history.": "Tento kľúč môžete použiť ako ďalší bezpečnostný prvok na obnovenie histórii šifrovaných konverzácií.",
-    "Your Recovery Key": "Váš kľúč obnovenia",
-    "Copy to clipboard": "Kopírovať do schránky",
+    "That doesn't match.": "To sa nezhoduje.",
+    "Go back to set it again.": "Vráťte sa späť a nastavte to znovu.",
     "Download": "Stiahnuť",
     "<b>Print it</b> and store it somewhere safe": "<b>Vytlačte si ho</b> a uchovajte na bezpečnom mieste",
     "<b>Save it</b> on a USB key or backup drive": "<b>Uložte si ho</b> na USB kľúč alebo iné zálohovacie médium",
     "<b>Copy it</b> to your personal cloud storage": "<b>Skopírujte si ho</b> na osobné úložisko v cloude",
     "Set up Secure Message Recovery": "Nastaviť bezpečné obnovenie správ",
-    "Keep it safe": "Bezpečne ho uchovajte",
-    "Create Key Backup": "Vytvoriť zálohu kľúčov",
     "Unable to create key backup": "Nie je možné vytvoriť zálohu šifrovacích kľúčov",
     "Retry": "Skúsiť znovu",
     "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Ak si nenastavíte Bezpečné obnovenie správ, po odhlásení stratíte prístup k histórii šifrovaných konverzácií.",
     "If you don't want to set this up now, you can later in Settings.": "Ak nechcete pokračovať v nastavení teraz, môžete sa k tomu vrátiť neskôr v časti nastavenia.",
-    "New Recovery Method": "Nový spôsob obnovi",
-    "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 útočníci sa môžu pokúsiť dostať k vášmu účtu. Ihneď si v nastaveniach zmeňte heslo a znovu  si nastavte možnosti obnovenia.",
+    "New Recovery Method": "Nový spôsob obnovy",
+    "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)",
@@ -1089,25 +989,24 @@
     "The user must be unbanned before they can be invited.": "Tomuto používateľovi musíte pred odoslaním pozvania povoliť vstup.",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Zoskupiť a filtrovať miestnosti podľa vlastných značiek (zmeny sa prejavia po obnovení stránky)",
     "Render simple counters in room header": "Zobraziť jednoduchú štatistiku v záhlaví miestnosti",
-    "Enable Emoji suggestions while typing": "Umožniť automatické návrhy Emoji počas písania",
+    "Enable Emoji suggestions while typing": "Umožniť automatické návrhy emoji počas písania",
     "Show a placeholder for removed messages": "Zobrazovať náhrady za odstránené správy",
     "Show join/leave messages (invites/kicks/bans unaffected)": "Zobrazovať správy o vstupe a opustení miestnosti (Nemá vplyv na pozvania/vykázania/zákazy vstupu)",
     "Show avatar changes": "Zobrazovať zmeny obrázka v profile",
     "Show display name changes": "Zobrazovať zmeny zobrazovaného mena",
     "Show read receipts sent by other users": "Zobrazovať potvrdenia o prečítaní od ostatných používateľov",
     "Show avatars in user and room mentions": "Pri zmienkach používateľov a miestností zobrazovať aj obrázok",
-    "Enable big emoji in chat": "Povoliť veľké Emoji v konverzáciách",
+    "Enable big emoji in chat": "Povoliť veľké emoji v konverzáciách",
     "Send typing notifications": "Posielať oznámenia, keď píšete",
     "Enable Community Filter Panel": "Povoliť panel filter komunít",
     "Allow Peer-to-Peer for 1:1 calls": "Povoliť P2P počas priamych audio/video hovorov",
-    "Order rooms in the room list by most important first instead of most recent": "Uprednostňovať  najdôležitejšie namiesto naposledy aktívnych v zozname miestností",
     "Messages containing my username": "Správy obsahujúce moje meno používateľa",
     "The other party cancelled the verification.": "Proti strana zrušila overovanie.",
     "Verified!": "Overený!",
     "You've successfully verified this user.": "Úspešne ste overili tohoto používateľa.",
     "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Zabezpečené správi s týmto používateľom sú E2E šifrované, čo znamená, že čítanie tretími stranami nie je možné.",
     "Got It": "Rozumiem",
-    "Verify this user by confirming the following emoji appear on their screen.": "Overte tohoto používateľa tým, že zistíte, či sa na jeho obrazovke objaví nasledujúci emoji.",
+    "Verify this user by confirming the following emoji appear on their screen.": "Overte tohto používateľa tak, že zistíte, či sa na jeho obrazovke objavia nasledujúce emoji.",
     "Verify this user by confirming the following number appears on their screen.": "Overte tohoto používateľa tým, že zistíte, či sa na jeho obrazovke objaví nasledujúce číslo.",
     "Unable to find a supported verification method.": "Nie je možné nájsť podporovanú metódu overenia.",
     "Dog": "Hlava psa",
@@ -1200,9 +1099,9 @@
     "Deactivating your account is a permanent action - be careful!": "Buďte opatrní, deaktivácia účtu je nezvratná akcia!",
     "General": "Všeobecné",
     "Credits": "Poďakovanie",
-    "For help with using Riot, click <a>here</a>.": "Pomoc pri používaní Riot môžete získať kliknutím <a>sem</a>.",
-    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "Pomoc pri používaní Riot môžete získať kliknutím <a>sem</a>, alebo začnite konverzáciu s našim robotom klepnutím na tlačidlo nižšie.",
-    "Chat with Riot Bot": "Konverzácia s Riot Bot",
+    "For help with using %(brand)s, click <a>here</a>.": "Pomoc pri používaní %(brand)s môžete získať kliknutím <a>sem</a>.",
+    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "Pomoc pri používaní %(brand)s môžete získať kliknutím <a>sem</a>, alebo začnite konverzáciu s našim robotom klepnutím na tlačidlo nižšie.",
+    "Chat with %(brand)s Bot": "Konverzácia s %(brand)s Bot",
     "Help & About": "Pomocník & O programe",
     "Bug reporting": "Hlásenie chýb",
     "FAQ": "Často kladené otázky (FAQ)",
@@ -1246,7 +1145,6 @@
     "Select the roles required to change various parts of the room": "Vyberte role potrebné na zmenu rôznych častí miestnosti",
     "Enable encryption?": "Povoliť šifrovanie?",
     "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>": "Po povolení šifrovania miestnosti nie je možné šifrovanie zakázať. Správy poslané v šifrovanej miestnosti nie sú viditeľné na servery, prečítať ich môžu len členovia miestnosti. Mnohí Boti, premostenia do iných sietí a integrácie nemusia po zapnutí šifrovania fungovať správne. <a>Dozvedieť sa viac o šifrovaní.</a>",
-    "To link to this room, please add an alias.": "Ak chcete získať odkaz do tejto miestnosti, musíte pridať alias.",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Zmena viditeľnosti histórie sa prejaví len na budúcich správach v tejto miestnosti. Viditeľnosť existujúcich správ ostane bez zmeny.",
     "Encryption": "Šifrovanie",
     "Once enabled, encryption cannot be disabled.": "Po aktivovaní šifrovanie nie je možné deaktivovať.",
@@ -1258,10 +1156,6 @@
     "Don't ask me again": "Viac sa nepýtať",
     "Error updating main address": "Chyba pri aktualizácii hlavnej adresy",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Pri aktualizácii hlavnej adresy miestnosti nastala chyba. Nie je to povolené na servery, alebo sa jedná o dočasný problém.",
-    "Error creating alias": "Chyba pri pridávaní aliasu",
-    "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "Pri pridávaní tohoto aliasu nastala chyba. Nie je to povolené na servery, alebo sa jedná o dočasný problém.",
-    "Error removing alias": "Chyba pri odstraňovaní aliasu",
-    "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "Pri odstraňovaní tohoto aliasu nastala chyba. Alias už neexistuje, alebo sa jedná o dočasný problém.",
     "Main address": "Hlavná adresa",
     "Error updating flair": "Chyba pri aktualizácii zobrazenia členstva",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Pri aktualizácii zobrazenia členstva v skupinách v tejto miestnosti nastala chyba. Nie je to povolené na servery, alebo sa jedná o dočasný problém.",
@@ -1270,12 +1164,6 @@
     "Room Topic": "Téma miestnosti",
     "Join": "Vstúpiť",
     "Power level": "Úroveň moci",
-    "Use Legacy Verification (for older clients)": "Použiť pôvodný spôsob overenia (kompatibilný so staršími aplikáciami)",
-    "Verify by comparing a short text string.": "Overiť porovnaním krátkeho textového reťazca.",
-    "Begin Verifying": "Začať overenie",
-    "Waiting for partner to accept...": "Čakanie na prijatie od partnera…",
-    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Nič sa nezobrazuje? Ešte nie všetky aplikácie podporujú interaktívne overenie. <button>Použiť pôvodný spôsob overenia</button>.",
-    "Use two-way text verification": "Použiť obojsmerné textové overenie",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Overte tohoto používateľa a označte ho ako dôveryhodného. Dôverovanie používateľov pridáva pokoj na duši pri posielaní E2E šifrovaných správ.",
     "Waiting for partner to confirm...": "Čakanie na potvrdenie od partnera…",
     "Incoming Verification Request": "Prichádzajúca žiadosť o overenie",
@@ -1289,17 +1177,12 @@
     "Go back": "Naspäť",
     "Room Settings - %(roomName)s": "Nastavenia miestnosti - %(roomName)s",
     "A username can only contain lower case letters, numbers and '=_-./'": "Meno používateľa môže obsahovať len malé písmená, číslice a znaky „=_-./“",
-    "Recovery Key Mismatch": "Kľúče obnovenia sa nezhodujú",
-    "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "Zálohu nie je možné dešifrovať zadaným kľúčom. Prosím, uistite sa, že ste zadali správny kľúč obnovenia.\nBackup could not be decrypted with this key: please verify that you entered the correct recovery key.",
-    "Incorrect Recovery Passphrase": "Nesprávne heslo obnovenia",
-    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "Zálohu nie je možné dešifrovať zadaným heslom. Prosím, uistite sa, že ste zadali správne heslo obnovenia.",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Pozor</b>: Zálohovanie šifrovacích kľúčov by ste mali nastavovať na dôverihodnom počítači.",
     "Share Permalink": "Zdieľať trvalý odkaz",
     "Update status": "Aktualizovať stav",
     "Set status": "Nastaviť stav",
     "Hide": "Skryť",
     "This homeserver would like to make sure you are not a robot.": "Tento domovský server by sa rád uistil, že nie ste robot.",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "Vlastné nastavenia servera môžete použiť na pripojenie k inému domovskému serveru Matrix zadaním URL adresy. Umožní vám to prihlásiť sa cez túto aplikáciu k existujúcemu Matrix účtu na inom domovskom servery.",
     "Your Modular server": "Váš server Modular",
     "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Zadajte umiestnenie vášho domovského servera modular. Môže to byť buď vaša doména alebo subdoména <a>modular.im</a>.",
     "Server Name": "Názov servera",
@@ -1321,7 +1204,7 @@
     "Premium hosting for organisations <a>Learn more</a>": "Platený hosting pre organizácie <a>Zistiť viac</a>",
     "Other": "Ďalšie",
     "Find other public servers or use a custom server": "Nájdite ďalšie verejné domovské servery alebo nastavte pripojenie k serveru ručne",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Pre najlepší zážitok si prosím nainštalujte <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> alebo <safariLink>Safari</safariLink>.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Prosím, nainštalujte si <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> alebo <safariLink>Safari</safariLink> pre najlepší zážitok.",
     "Couldn't load page": "Nie je možné načítať stránku",
     "Want more than a community? <a>Get your own server</a>": "Chceli by ste viac než komunitu? <a>Získajte vlastný server</a>",
     "This homeserver does not support communities": "Tento domovský server nepodporuje komunity",
@@ -1336,28 +1219,20 @@
     "Create account": "Vytvoriť účet",
     "Registration has been disabled on this homeserver.": "Na tomto domovskom servery nie je povolená registrácia.",
     "Unable to query for supported registration methods.": "Nie je možné požiadať o podporované metódy registrácie.",
-    "Create your account": "Vytvoriť váš účet",
+    "Create your account": "Vytvorte si váš účet",
     "Keep going...": "Pokračujte…",
-    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "Zašifrovanú kópiu vašich šifrovacích kľúčov uchováme na domovskom servery. Zabezpečte si zálohovanie zadaním hesla obnovenia, čo posilní ochranu vašich údajov.",
-    "For maximum security, this should be different from your account password.": "Aby ste zachovali maximálnu mieru zabezpečenia, heslo obnovenia by malo byť odlišné ako heslo, ktorým sa prihlasujete do Matrix účtu.",
-    "Set up with a Recovery Key": "Nastaviť použitím kľúča obnovenia",
-    "Please enter your passphrase a second time to confirm.": "Prosím zadajte heslo obnovenia ešte raz pre potvrdenie.",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Kľúč obnovenia je bezpečnostný mechanizmus - môžete ho použiť na prístup k šifrovacím kľúčom v prípade, ak zabudnete vaše heslo obnovenia.",
+    "For maximum security, this should be different from your account password.": "Aby ste zachovali maximálnu mieru zabezpečenia, (dlhé) heslo by malo byť odlišné od hesla, ktorým sa prihlasujete do vášho účtu.",
     "Your keys are being backed up (the first backup could take a few minutes).": "Zálohovanie kľúčov máte aktívne (prvé zálohovanie môže trvať niekoľko minút).",
-    "Secure your backup with a passphrase": "Zabezpečte si zálohu zadaním hesla obnovenia",
-    "Confirm your passphrase": "Potvrdiť heslo obnovenia",
-    "Recovery key": "Kľúč obnovenia",
     "Starting backup...": "Začína sa zálohovanie…",
-    "Success!": "Hotovo!",
-    "A new recovery passphrase and key for Secure Messages have been detected.": "Boli zistené nový kľúč a nové heslo obnovenia zálohovania šifrovacích kľúčov.",
+    "Success!": "Úspech!",
+    "A new recovery passphrase and key for Secure Messages have been detected.": "Nové (dlhé) heslo na obnovu zálohy a kľúč pre bezpečné správy boli spozorované.",
     "Recovery Method Removed": "Odstránený spôsob obnovenia",
-    "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.": "Ak ste spôsob obnovenia neodstránili vy, útočník sa pravdepodobne usiluje dostať k vašemu účtu. Zmente si prosím heslo na prihlásenie do Matrix účtu a znovu si ihneď nastavte možnosti obnovenia.",
+    "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.": "Ak ste neodstránili spôsob obnovenia vy, 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.",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Či používate alebo nie funkcionalitu známu ako „omrvinky“ (obrázky nad zoznamom miestností)",
     "Call failed due to misconfigured server": "Hovor zlyhal kvôli nesprávne nakonfigurovanému serveru",
     "Please ask the administrator of your homeserver (<code>%(homeserverDomain)s</code>) to configure a TURN server in order for calls to work reliably.": "Prosím, požiadajte správcu vášho domovského servera (<code>%(homeserverDomain)s</code>) aby nakonfiguroval Turn server, čo zlepší spoľahlivosť audio / video hovorov.",
     "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.": "Ako náhradu môžete použiť verejný server s adresou <code>turn.matrix.org</code>, čo nemusí byť úplne spoľahlivé a tiež odošle vašu adresu IP na spomínaný server. Toto môžete kedykoľvek opätovne zmeniť v časti Nastavenia.",
     "Try using turn.matrix.org": "Skúsiť používať turn.matrix.org",
-    "A conference call could not be started because the integrations server is not available": "Nie je možné začať konferenčný hovor, pretože integračný server nie je dostupný",
     "Replying With Files": "Odpoveď so súbormi",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Zatiaľ nie je možné odpovedať s priloženými súbormi. Chcete nahrať tento súbor bez odpovedania?",
     "The file '%(fileName)s' failed to upload.": "Nepodarilo sa nahrať súbor „%(fileName)s“.",
@@ -1379,8 +1254,7 @@
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s odvolal pozvanie vstúpiť do miestnosti pre %(targetDisplayName)s.",
     "Cannot reach homeserver": "Nie je možné pripojiť sa k domovskému serveru",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Uistite sa, že máte stabilné pripojenie na internet, alebo kontaktujte správcu servera",
-    "Your Riot is misconfigured": "Váš Riot nie je nastavený správne",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Požiadajte správcu, aby skontroloval <a>vaše nastavenia</a> na nesprávne alebo viacnásobne uvedené voľby.",
+    "Your %(brand)s is misconfigured": "Váš %(brand)s nie je nastavený správne",
     "Cannot reach identity server": "Nie je možné pripojiť sa k serveru totožností",
     "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.": "Môžete sa zaregistrovať, ale niektoré vlastnosti nebudú dostupné, kým server totožností nebude opäť v prevádzke. Ak sa toto upozornenie zobrazuje neustále, skontrolujte správnosť nastavení alebo kontaktujte správcu servera.",
     "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.": "Môžete si obnoviť heslo, ale niektoré vlastnosti nebudú dostupné, kým server totožností nebude opäť v prevádzke. Ak sa toto upozornenie zobrazuje neustále, skontrolujte správnosť nastavení alebo kontaktujte správcu servera.",
@@ -1389,11 +1263,10 @@
     "Unexpected error resolving homeserver configuration": "Neočakávaná chyba pri zisťovaní nastavení domovského servera",
     "Unexpected error resolving identity server configuration": "Neočakávaná chyba pri zisťovaní nastavení servera totožností",
     "The user's homeserver does not support the version of the room.": "Používateľov domovský server nepodporuje verziu miestnosti.",
-    "Show recently visited rooms above the room list": "Zobrazovať naposledy otvorené miestnosti nad zoznamom miestností",
     "Show hidden events in timeline": "Zobrazovať skryté udalosti v histórii obsahu miestností",
     "Low bandwidth mode": "Režim šetrenia údajov",
     "Allow fallback call assist server turn.matrix.org when your homeserver does not offer one (your IP address would be shared during a call)": "Ak váš domovský server neposkytuje pomocný server pri uskutočňovaní hovorov, povoliť použitie záložného servera turn.matrix.org (týmto počas hovoru zdieľate svoju adresu IP)",
-    "When rooms are upgraded": "Keď sú miestnosti aktualizované",
+    "When rooms are upgraded": "Keď sú miestnosti upgradované",
     "Accept <policyLink /> to continue:": "Ak chcete pokračovať, musíte prijať <policyLink />:",
     "ID": "ID",
     "Public Name": "Verejný názov",
@@ -1407,10 +1280,9 @@
     "Only continue if you trust the owner of the server.": "Pokračujte len v prípade, že dôverujete prevádzkovateľovi servera.",
     "Add Email Address": "Pridať emailovú adresu",
     "Add Phone Number": "Pridať telefónne číslo",
-    "Send cross-signing keys to homeserver": "Poslať kľúče pre podpisovanie naprieč zariadeniami na domovský 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.": "Táto akcia si vyžaduje mať overenú emailovú adresu alebo telefónne číslo cez predvolený server totožností <server />, ale server nezverejnil podmienky používania.",
+    "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.": "Táto akcia vyžaduje prístup k predvolenému serveru totožností <server /> na overenie emailovej adresy alebo telefónneho čísla, ale server nemá žiadne podmienky používania.",
     "Trust": "Dôverovať",
-    "Custom (%(level)s)": "Vlastná (%(level)s)",
+    "Custom (%(level)s)": "Vlastný (%(level)s)",
     "Sends a message as plain text, without interpreting it as markdown": "Odošle správu vo formáte obyčajný text, bez prekladu markdown",
     "You do not have the required permissions to use this command.": "Na použitie tohoto príkazu nemáte dostatočné povolenia.",
     "Error upgrading room": "Chyba pri aktualizácii miestnosti",
@@ -1441,9 +1313,8 @@
     "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s zmenil pravidlo zakázať vstúpiť z domovských serverov pôvodne sa zhodujúcich s %(oldGlob)s na servery zhodujúce sa s %(newGlob)s, dôvod: %(reason)s",
     "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s aktualizoval pravidlo zakázať vstúpiť pôvodne sa zhodujúce s %(oldGlob)s na %(newGlob)s, dôvod: %(reason)s",
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
-    "Multiple integration managers": "Viacej integračných serverov",
+    "Multiple integration managers": "Viac integračných serverov",
     "Try out new ways to ignore people (experimental)": "Vyskúšajte si nový spôsob ignorovania používateľov (experiment)",
-    "Enable local event indexing and E2EE search (requires restart)": "Povoliť lokálne indexovanie udalostí a vyhľadávanie v šifrovaných miestnostiach",
     "Match system theme": "Prispôsobiť sa vzhľadu systému",
     "Send read receipts for messages (requires compatible homeserver to disable)": "Odosielať potvrdenia o prečítaní správ (na zakázanie je vyžadovaný kompatibilný domovský server)",
     "Show previews/thumbnails for images": "Zobrazovať ukážky/náhľady obrázkov",
@@ -1452,12 +1323,12 @@
     "The message you are trying to send is too large.": "Správa, ktorú sa usilujete odoslať, je príliš veľká.",
     "This is your list of users/servers you have blocked - don't leave the room!": "Toto je zoznam používateľov / serverov, ktorých ste zablokovali - neopúšťajte miestnosť!",
     "Upload": "Nahrať",
-    "Cross-signing and secret storage are enabled.": "Podpisovanie naprieč zariadeniami a bezpečné úložisko sú aktívne.",
-    "Cross-signing and secret storage are not yet set up.": "Podpisovanie naprieč zariadeniami a bezpečné úložisko zatiaľ nie sú nastavené.",
+    "Cross-signing and secret storage are enabled.": "Krížové podpisovanie a bezpečné úložisko sú zapnuté.",
+    "Cross-signing and secret storage are not yet set up.": "Krížové podpisovanie a bezpečné úložisko zatiaľ nie sú nastavené.",
     "Bootstrap cross-signing and secret storage": "Zaviesť podpisovanie naprieč zariadeniami a bezpečné úložisko",
-    "Cross-signing public keys:": "Verejné kľúče podpisovania naprieč zariadeniami:",
+    "Cross-signing public keys:": "Verejné kľúče krížového podpisovania:",
     "not found": "nenájdené",
-    "Cross-signing private keys:": "Súkromné kľúče podpisovania naprieč zariadeniami:",
+    "Cross-signing private keys:": "Súkromné kľúče krížového podpisovania:",
     "in secret storage": "na bezpečnom úložisku",
     "Secret storage public key:": "Verejný kľúč bezpečného úložiska:",
     "in account data": "v údajoch účtu",
@@ -1475,13 +1346,13 @@
     "Disconnect identity server": "Odpojiť server totožností",
     "Disconnect from the identity server <idserver />?": "Naozaj sa chcete odpojiť od servera totožností <idserver />?",
     "Disconnect": "Odpojiť",
-    "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.": "Pred odpojením zo servera totožností <idserver /> by ste mali z neho <b>odstrániť vaše osobné údaje</b>. Žiaľ, server <idserver /> momentálne nie je dostupný a nie je možné sa k nemu pripojiť.",
+    "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.": "Pred odpojením by ste mali <b>odstrániť vaše osobné údaje</b> zo servera totožností <idserver />. Žiaľ, server totožnosti <idserver /> momentálne nie je dostupný a nie je možné sa k nemu pripojiť.",
     "You should:": "Mali by ste:",
     "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "Skontrolovať rozšírenia inštalované vo webovom prehliadači, ktoré by mohli blokovať prístup k serveru totožností (napr. rozšírenie Privacy Badger)",
     "contact the administrators of identity server <idserver />": "Kontaktovať správcu servera totožností <idserver />",
     "wait and try again later": "Počkať a skúsiť znovu neskôr",
     "Disconnect anyway": "Napriek tomu sa odpojiť",
-    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "na servery <idserver /> <b>máte stále uložené vaše osobné údaje</b>.",
+    "You are still <b>sharing your personal data</b> on the identity server <idserver />.": "Stále <b>zdielate vaše osobné údaje</b> so serverom totožnosti <idserver />.",
     "We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "Odporúčame, aby ste ešte pred odpojením sa zo servera totožností odstránili vašu emailovú adresu a telefónne číslo.",
     "Identity Server (%(server)s)": "Server totožností (%(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.": "Momentálne na vyhľadávanie kontaktov a na možnosť byť nájdení kontaktmi ktorých poznáte používate <server></server>. Zmeniť server totožností môžete nižšie.",
@@ -1496,7 +1367,7 @@
     "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Použiť integračný server na správu botov, widgetov a balíčkov s nálepkami.",
     "Manage integrations": "Spravovať integrácie",
     "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integračné servery zhromažďujú údaje nastavení, môžu spravovať widgety, odosielať vo vašom mene pozvánky alebo meniť úroveň moci.",
-    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Súhlas s podmienkami používania servera totožností (%(serverName)s), aby ste mohli byť nájdení zadaním emailovej adresy alebo telefónneho čísla.",
+    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "Súhlaste s podmienkami používania servera totožností (%(serverName)s), aby ste mohli byť nájdení zadaním emailovej adresy alebo telefónneho čísla.",
     "Discovery": "Objaviť",
     "Deactivate account": "Deaktivovať účet",
     "Clear cache and reload": "Vymazať vyrovnávaciu pamäť a načítať znovu",
@@ -1505,6 +1376,427 @@
     "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",
-    "Please verify the room ID or alias and try again.": "Prosím, overte platnosť ID miestnosti alebo alias a skúste znovu.\nPlease verify the room ID or alias and try again.",
-    "Error removing ignored user/server": "Chyba pri odstraňovaní ignorovaného používateľa / servera"
+    "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",
+    "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.",
+    "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.",
+    "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.",
+    "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",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "Nemožno sa dostať do tajného úložiska. Prosím, overte, že ste zadali správne (dlhé) heslo pre obnovu zálohy.",
+    "Encryption upgrade available": "Je dostupná aktualizácia šifrovania",
+    "Set up encryption": "Nastaviť šifrovanie",
+    "Review where you’re logged in": "Zobraziť, kde ste prihlásený",
+    "New login. Was this you?": "Nové pihlásenie. Ste to vy?",
+    "%(name)s is requesting verification": "%(name)s žiada o overenie",
+    "Sign In or Create Account": "Prihlásiť sa alebo vytvoriť nový účet",
+    "Use your account or create a new one to continue.": "Použite váš existujúci účet alebo si vytvorte nový, aby ste mohli pokračovať.",
+    "Create Account": "Vytvoriť účet",
+    "Sign In": "Prihlásiť sa",
+    "Sends a message as html, without interpreting it as markdown": "Pošlite správu ako HTML, bez interpretácie v Markdowne",
+    "Failed to set topic": "Nepodarilo sa nastaviť tému",
+    "Command failed": "Príkaz zlyhal",
+    "Could not find user in room": "Nepodarilo sa nájsť používateľa v miestnosti",
+    "Please supply a widget URL or embed code": "Prosím, zadajte URL widgetu alebo vložte kód",
+    "Verifies a user, session, and pubkey tuple": "Overí používateľa, reláciu a verejné kľúče",
+    "Unknown (user, session) pair:": "Neznámy pár (používateľ, relácia):",
+    "Session already verified!": "Relácia je už overená!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "VAROVANIE: Relácia je už overená, ale kľúče sa NEZHODUJÚ!",
+    "Incorrect recovery passphrase": "Nesprávne (dlhé) heslo pre obnovu zálohy",
+    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Záloha nemohla byť rozšifrovaná pomocou tohto (dlhého) helsa na obnovu zálohy: prosím, overte, či ste zadali správne (dlhé) helso na obnovu zálohy.",
+    "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!": "VAROVANIE: OVERENIE KĽÚČOV ZLYHALO! Podpisovaný kľúč používateľa %(userId)s a relácia %(deviceId)s je \"%(fprint)s\" čo nezodpovedá zadanému kľúču \"%(fingerprint)s\". Môže to znamenať, že vaša komunikácia je infiltrovaná!",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Zadaný podpisovací kľúč sa zhoduje s podpisovacím kľúčom od relácie %(deviceId)s používateľa %(userId)s. Relácia je označená ako overená.",
+    "Displays information about a user": "Zobrazuje informácie o používateľovi",
+    "Send a bug report with logs": "Zaslať chybové hlásenie so záznamami",
+    "Opens chat with the given user": "Otvorí konverzáciu s daným používateľom",
+    "Sends a message to the given user": "Pošle správu danému používateľovi",
+    "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s zmenil/a meno miestnosti z %(oldRoomName)s na %(newRoomName)s.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s pridal/a alternatívne adresy %(addresses)s pre túto miestnosť.",
+    "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s pridal/a alternatívnu adresu %(addresses)s pre túto miestnosť.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|other": "%(senderName)s odstránil/a alternatívne adresy %(addresses)s pre túto miestnosť.",
+    "%(senderName)s removed the alternative addresses %(addresses)s for this room.|one": "%(senderName)s odstránil/a alternatívnu adresu %(addresses)s pre túto miestnosť.",
+    "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s zmenil/a alternatívne adresy pre túto miestnosť.",
+    "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s zmenil/a hlavnú a alternatívne adresy pre túto miestnosť.",
+    "%(senderName)s changed the addresses for this room.": "%(senderName)s zmenil/a adresy pre túto miestnosť.",
+    "You signed in to a new session without verifying it:": "Prihlásili ste sa do novej relácie bez jej overenia:",
+    "Verify your other session using one of the options below.": "Overte svoje ostatné relácie pomocou jednej z nižšie uvedených možností.",
+    "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) sa prihlásil do novej relácie bez jej overenia:",
+    "Ask this user to verify their session, or manually verify it below.": "Poproste tohto používateľa, aby si overil svoju reláciu alebo ju nižšie manuálne overte.",
+    "Not Trusted": "Nedôveryhodné",
+    "Manually Verify by Text": "Manuálne overte pomocou textu",
+    "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 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",
+    "about a minute from now": "približne o minútu",
+    "about an hour from now": "približne o hodinu",
+    "about a day from now": "približne o deň",
+    "Support adding custom themes": "Umožniť pridávať vlastný vzhľad",
+    "Your homeserver does not support cross-signing.": "Váš domovský server nepodporuje krížové podpisovanie.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Váš účet má krížovo podpísanú identitu v bezpečnom úložisku, ale zatiaľ nie je nedôveryhodná pre túto reláciu.",
+    "Reset cross-signing and secret storage": "Obnoviť krížové podpisovanie a bezpečné úložisko",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "Individuálne overte každú používateľskú reláciu a označte ju za dôveryhodnú, bez dôvery krížovo podpísaných zariadení.",
+    "Cross-signing": "Krížové podpisovanie",
+    "Destroy cross-signing keys?": "Zmazať kľúče pre krížové podpisovanie?",
+    "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.": "Zmazanie kľúčov pre krížové podpisovanie je nenávratné. Každý, s kým ste sa overili, bude vidieť bezpečnostné upozornenia. Toto určite nechcete robiť, dokiaľ ste nestratili všetky zariadenia, s ktorými by ste mohli krížovo podpisovať.",
+    "Clear cross-signing keys": "Zmazať kľúče pre krížové podpisovanie",
+    "a new cross-signing key signature": "nový podpis kľúča pre krížové podpisovanie",
+    "a device cross-signing signature": "podpis krížovo podpísaného zariadenia",
+    "or another cross-signing capable Matrix client": "alebo iný Matrixový klient podporujúci krížové podpisovanie",
+    "Removing…": "Odstraňovanie…",
+    "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Váš nový účet (%(newAccountId)s) je registrovaný, ale už ste prihlásený pod iným účtom (%(loggedInUserId)s).",
+    "Continue with previous account": "Pokračovať s predošlým účtom",
+    "<a>Log in</a> to your new account.": "<a>Prihláste sa</a> do vášho nového účtu.",
+    "You can now close this window or <a>log in</a> to your new account.": "Teraz môžete toto okno zavrieť alebo sa <a>prihlásiť</a> do vášho nového účtu.",
+    "Registration Successful": "Úspešná registrácia",
+    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Potvrďte svoju identitu overením tohto účtu z jednej z vašich iných relácií, čím mu povolíte prístup k šifrovaným správam.",
+    "This requires the latest %(brand)s on your other devices:": "Toto vyžaduje najnovší %(brand)s na vašich ostatných zariadeniach:",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Vaša nová relácia je teraz overená. Má prístup k vašim šifrovaným správam a ostatný používatelia ju uvidia ako dôveryhodnú.",
+    "Your new session is now verified. Other users will see it as trusted.": "Vaša nová relácia je teraz overená. Ostatný používatelia ju uvidia ako dôveryhodnú.",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "Bez dokončenia overenia nebude mať táto relácia prístup k šifrovaným správam.",
+    "Go Back": "Späť",
+    "Failed to re-authenticate due to a homeserver problem": "Opätovná autentifikácia zlyhala kvôli problému domovského servera",
+    "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",
+    "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",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Nikdy neposielať šifrované správy neovereným reláciam v tejto miestnosti z tejto relácie",
+    "Order rooms by name": "Zoradiť miestnosti podľa názvu",
+    "Show rooms with unread notifications first": "Zobraziť miestnosti s neprečítanými oznámeniami navrchu",
+    "Show shortcuts to recently viewed rooms above the room list": "Zobraziť skratky nedávno zobrazených miestnosti nad zoznamom miestností",
+    "Enable message search in encrypted rooms": "Povoliť vyhľadávanie správ v šifrovaných miestnostiach",
+    "How fast should messages be downloaded.": "Ako rýchlo sa majú správy sťahovať.",
+    "Manually verify all remote sessions": "Manuálne overiť všetky relácie",
+    "IRC display name width": "Šírka zobrazovaného mena IRC",
+    "Verify this session by completing one of the following:": "Overte túto reláciu dokončením jedného z nasledujúcich:",
+    "Scan this unique code": "Naskenujte tento jedinečný kód",
+    "or": "alebo",
+    "Compare unique emoji": "Porovnajte jedinečnú kombináciu emoji",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Pokiaľ nemáte na svojich zariadeniach kameru, porovnajte jedinečnú kombináciu emoji",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Potvrďte, že nasledujúce emoji sú zobrazené na oboch reláciach v rovnakom poradí:",
+    "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.": "Relácia, ktorú sa snažíte overiť, nepodporuje overovanie QR kódom a ani pomocou emoji, čo sú funkcie, ktoré %(brand)s podporuje. Skúste použiť iného klienta.",
+    "QR Code": "QR kód",
+    "Enter your password to sign in and regain access to your account.": "Prihláste sa zadaním hesla a znovuzískajte prístup k vášmu účtu.",
+    "Forgotten your password?": "Zabudli ste heslo?",
+    "Sign in and regain access to your account.": "Prihláste sa a znovuzískajte prístup k vášmu účtu.",
+    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "Nemôžete sa prihlásiť do vášho účtu. Kontaktujte prosím vášho správcu domovského servera pre viac informácií.",
+    "You're signed out": "Ste odhlásený",
+    "Clear personal data": "Zmazať osobné dáta",
+    "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.": "Varovanie: Vaše osobné údaje (vrátane šifrovacích kľúčov) sú stále uložené v tejto relácií. Zmažte ich, ak chcete túto reláciu zahodiť alebo sa chcete prihlásiť cez iný účet.",
+    "Command Autocomplete": "Automatické dopĺňanie príkazov",
+    "Community Autocomplete": "Automatické dopĺňanie skupín",
+    "DuckDuckGo Results": "Výsledky hľadania DuckDuckGo",
+    "Emoji Autocomplete": "Automatické dopĺňanie emoji",
+    "Notification Autocomplete": "Automatické dopĺňanie oznámení",
+    "Room Autocomplete": "Automatické dopĺňanie miestností",
+    "User Autocomplete": "Automatické dopĺňanie používateľov",
+    "Start": "Začať",
+    "Verify this session by confirming the following number appears on its screen.": "Overte túto reláciu tým, že zistíte, či sa na jeho obrazovke objaví nasledujúce číslo.",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "Čakám na overenie od relácie %(deviceName)s (%(deviceId)s)…",
+    "Waiting for your other session to verify…": "Čakám na overenie od vašej druhej relácie…",
+    "Waiting for %(displayName)s to verify…": "Čakám na %(displayName)s, kým nás overí…",
+    "Cancelling…": "Rušenie…",
+    "They match": "Zhodujú sa",
+    "They don't match": "Nezhodujú sa",
+    "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 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é",
+    "Review": "Prehliadnuť",
+    "Later": "Neskôr",
+    "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ť",
+    "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 />.",
+    "Room name or address": "Meno alebo adresa miestnosti",
+    "Joins room with given address": "Pridať sa do miestnosti s danou adresou",
+    "Unrecognised room address:": "Nerozpoznaná adresa miestnosti:",
+    "This bridge is managed by <user />.": "Tento most spravuje <user />.",
+    "Workspace: %(networkName)s": "Pracovisko: %(networkName)s",
+    "Channel: %(channelName)s": "Kanál: %(channelName)s",
+    "Show less": "Zobraziť menej",
+    "Show more": "Zobraziť viac",
+    "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.": "Zmena hesla reštartuje všetky šifrovacie kľúče pre všetky vaše relácie. Šifrované správy sa stanú nečitateľnými, pokiaľ najprv nevyexportujete vaše kľúče a po zmene ich nenaimportujete. V budúcnosti sa tento proces zjednoduší.",
+    "well formed": "dobre sformulované",
+    "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",
+    "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:",
+    "Homeserver feature support:": "Funkcie podporované domovským serverom:",
+    "exists": "existuje",
+    "Your homeserver does not support session management.": "Váš domovský server nepodporuje správu relácií.",
+    "Unable to load session list": "Nemožno načítať zoznam relácií",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Potvrďte odstránenie týchto relácií použitím Jednotného prihlásenia na overenie vašej identity.",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Potvrďte odstránenie tejto relácie použitím Jednotného prihlásenia na overenie vašej identity.",
+    "Confirm deleting these sessions": "Potvrdiť odstránenie týchto relácií",
+    "Click the button below to confirm deleting these sessions.|other": "Stlačením tlačítka potvrdíte zmazanie týchto relácií.",
+    "Click the button below to confirm deleting these sessions.|one": "Stlačením tlačítka potvrdíte zmazanie tejto relácie.",
+    "Delete sessions|other": "Zmazať relácie",
+    "Delete sessions|one": "Zmazať reláciu",
+    "Delete %(count)s sessions|one": "Zmazať %(count)s reláciu",
+    "Manage": "Spravovať",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Bezpečne cachovať šifrované správy lokálne, aby sa mohli zobraziť vo vyhľadávaní.",
+    "Enable": "Povoliť",
+    "%(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 chýbajú niektoré komponenty potrebné na bezpečné cachovanie šifrovaných správ lokálne. Pokiaľ chcete experimentovať s touto funkciou, spravte si svoj vlastný %(brand)s Desktop s <nativeLink>pridanými vyhľadávacími komponentami</nativeLink>.",
+    "This session is backing up your keys. ": "Táto relácia zálohuje vaše kľúče. ",
+    "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.": "Táto relácia <b>nezálohuje vaše kľúče</b>, ale už máte jednu existujúcu zálohu z ktorej sa môžete obnoviť a postupne pridávať.",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "Pred odhlásením pripojte túto reláciu k zálohe kľúčov, aby ste predišli strate kľúčov, ktoré môžu byť len v tejto relácií.",
+    "Connect this session to Key Backup": "Pripojiť túto reláciu k Zálohe kľúčov",
+    "Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s": "Záloha je podpísaná z <verify>neznámej</verify> relácie s ID %(deviceId)s",
+    "Backup has a <validity>valid</validity> signature from this session": "Záloha má <validity>platný</validity> podpis z tejto relácie",
+    "Backup has an <validity>invalid</validity> signature from this session": "Záloha má <validity>neplatný</validity> podpis z tejto relácie",
+    "Backup has a <validity>valid</validity> signature from <verify>verified</verify> session <device></device>": "Záloha má <validity>platný</validity> podpis z <verify>overenej</verify> relácie <device></device>",
+    "Backup has a <validity>valid</validity> signature from <verify>unverified</verify> session <device></device>": "Záloha má <validity>platný</validity> podpis z <verify>neoverenej</verify> relácie <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>verified</verify> session <device></device>": "Záloha má <validity>neplatný</validity> podpis z <verify>overenej</verify> relácie <device></device>",
+    "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Záloha má <validity>neplatný</validity> podpis z <verify>neoverenej</verify> relácie <device></device>",
+    "Backup is not signed by any of your sessions": "Záloha nemá podpis zo žiadnej vašej relácie",
+    "This backup is trusted because it has been restored on this session": "Táto záloha je dôveryhodná, lebo už bola načítaná v tejto relácií",
+    "Your keys are <b>not being backed up from this session</b>.": "Vaše kľúče <b>nie sú zálohované z tejto relácie</b>.",
+    "Enable desktop notifications for this session": "Povoliť desktopové notifikácie pre túto reláciu",
+    "Enable audible notifications for this session": "Povoliť zvukové notifikácie pre túto reláciu",
+    "Size must be a number": "Veľkosť musí byť číslo",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "Vlastná veľkosť písma môže byť len v rozmedzí %(min)s pt až %(max)s pt",
+    "Help us improve %(brand)s": "Pomôžte nám zlepšovať %(brand)s",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Posielať <UsageDataLink>anonymné dáta o používaní</UsageDataLink>, ktoré nám pomôžu zlepšiť %(brand)s. Toto bude vyžadovať <PolicyLink>sušienku</PolicyLink>.",
+    "I want to help": "Chcem pomôcť",
+    "Your homeserver has exceeded its user limit.": "Na vašom domovskom serveri bol prekročený limit počtu používateľov.",
+    "Your homeserver has exceeded one of its resource limits.": "Na vašom domovskom serveri bol prekročený jeden z limitov systémových zdrojov.",
+    "Contact your <a>server admin</a>.": "Kontaktujte svojho <a>administrátora serveru</a>.",
+    "Ok": "Ok",
+    "Set password": "Nastaviť heslo",
+    "To return to your account in future you need to set a password": "Aby ste sa k účtu mohli vrátiť aj neskôr, je potrebné nastaviť heslo",
+    "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ú",
+    "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!",
+    "Learn More": "Dozvedieť sa viac",
+    "Light": "Svetlý",
+    "Dark": "Tmavý",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Požiadajte správcu vášho %(brand)su, aby skontroloval <a>vašu konfiguráciu</a>. Pravdepodobne obsahuje chyby alebo duplikáty.",
+    "You joined the call": "Pridali ste sa do hovoru",
+    "%(senderName)s joined the call": "%(senderName)s sa pridal/a do hovoru",
+    "Call in progress": "Práve prebieha hovor",
+    "You left the call": "Opustili ste hovor",
+    "%(senderName)s left the call": "%(senderName)s opustil/a hovor",
+    "Call ended": "Hovor skončil",
+    "You started a call": "Začali ste hovor",
+    "%(senderName)s started a call": "%(senderName)s začal/a hovor",
+    "Waiting for answer": "Čakám na odpoveď",
+    "%(senderName)s is calling": "%(senderName)s volá",
+    "You created the room": "Vytvorili ste miestnosť",
+    "%(senderName)s created the room": "%(senderName)s vytvoril/a miestnosť",
+    "You made the chat encrypted": "Zašifrovali ste čet",
+    "%(senderName)s made the chat encrypted": "%(senderName)s zašifroval/a čet",
+    "You made history visible to new members": "Zviditeľnili ste históriu pre nových členov",
+    "%(senderName)s made history visible to new members": "%(senderName)s zviditeľnil/a históriu pre nových členov",
+    "You made history visible to anyone": "Zviditeľnili ste históriu pre všetkých",
+    "%(senderName)s made history visible to anyone": "%(senderName)s zviditeľnil/a históriu pre všetkých",
+    "You made history visible to future members": "Zviditeľnili ste históriu pre budúcich členov",
+    "%(senderName)s made history visible to future members": "%(senderName)s zviditeľnil/a históriu pre budúcich členov",
+    "You were invited": "Boli ste pozvaný/á",
+    "%(targetName)s was invited": "%(targetName)s vás pozval/a",
+    "You left": "Odišli ste",
+    "%(targetName)s left": "%(targetName)s odišiel/odišla",
+    "You were kicked (%(reason)s)": "Boli ste vykopnutý/á (%(reason)s)",
+    "%(targetName)s was kicked (%(reason)s)": "%(targetName)s bol vykopnutý/á (%(reason)s)",
+    "You were kicked": "Boli ste vykopnutý/á",
+    "%(targetName)s was kicked": "%(targetName)s bol vykopnutý/á",
+    "You rejected the invite": "Odmietli ste pozvánku",
+    "%(targetName)s rejected the invite": "%(targetName)s odmietol/odmietla pozvánku",
+    "You were uninvited": "Boli ste odpozvaný/á",
+    "%(targetName)s was uninvited": "%(targetName)s bol odpozvaný/á",
+    "You were banned (%(reason)s)": "Boli ste vyhostený/á (%(reason)s)",
+    "%(targetName)s was banned (%(reason)s)": "%(targetName)s bol vyhostený/á (%(reason)s)",
+    "You were banned": "Boli ste vyhostený/á",
+    "%(targetName)s was banned": "%(targetName)s bol vyhostený/á",
+    "You joined": "Pridali ste sa",
+    "%(targetName)s joined": "%(targetName)s sa pridal/a",
+    "You changed your name": "Zmenili ste vaše meno",
+    "%(targetName)s changed their name": "%(targetName)s zmenil/a svoje meno",
+    "You changed your avatar": "Zmenili ste svojho avatara",
+    "%(targetName)s changed their avatar": "%(targetName)s zmenil/a svojho avatara",
+    "%(senderName)s %(emote)s": "%(senderName)s %(emote)s",
+    "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
+    "You changed the room name": "Zmenili ste meno miestnosti",
+    "%(senderName)s changed the room name": "%(senderName)s zmenil/a meno miestnosti",
+    "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
+    "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
+    "You uninvited %(targetName)s": "Odpozvali ste používateľa %(targetName)s",
+    "%(senderName)s uninvited %(targetName)s": "%(senderName)s odpozval/a používateľa %(targetName)s",
+    "You invited %(targetName)s": "Pozvali ste používateľa %(targetName)s",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s pozval/a používateľa %(targetName)s",
+    "You changed the room topic": "Zmenili ste tému miestnosti",
+    "%(senderName)s changed the room topic": "%(senderName)s zmenil/a tému miestnosti",
+    "New spinner design": "Nový točivý štýl",
+    "Use the improved room list (will refresh to apply changes)": "Použiť vylepšený list miestností (obnový stránku, aby sa aplikovali zmeny)",
+    "Use custom size": "Použiť vlastnú veľkosť",
+    "Use a more compact ‘Modern’ layout": "Použiť kompaktnejšie 'moderné' rozloženie",
+    "Use a system font": "Použiť systémové písmo",
+    "System font name": "Meno systémového písma",
+    "Enable experimental, compact IRC style layout": "Povoliť experimentálne, kompaktné rozloženie v štýle IRC",
+    "Unknown caller": "Neznámy volajúci",
+    "Incoming voice call": "Prichádzajúci hovor",
+    "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 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.",
+    "There are advanced notifications which are not shown here.": "Sú tam pokročilé notifikácie, ktoré tu nie sú zobrazené.",
+    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Možno ste ich nakonfigurovali v inom kliente než v %(brand)se. Nemôžete ich napasovať do %(brand)su, ale stále platia.",
+    "New version available. <a>Update now.</a>": "Je dostupná nová verzia. <a>Aktualizovať.</a>",
+    "Hey you. You're the best!": "Hej, ty. Si borec/borka!",
+    "Use between %(min)s pt and %(max)s pt": "Použite veľkosť mezi %(min)s pt a %(max)s pt",
+    "Invalid theme schema.": "Neplatná schéma vzhľadu.",
+    "Error downloading theme information.": "Chyba pri stiahnutí informácií o vzhľade.",
+    "Theme added!": "Vzhľad pridaný!",
+    "Custom theme URL": "URL adresa vlastného vzhľadu",
+    "Add theme": "Pridať vzhľad",
+    "Message layout": "Rozloženie správy",
+    "Compact": "Kompaktný",
+    "Modern": "Moderný",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Nastavte meno písma, ktoré máte nainštalované na vašom systéme & %(brand)s sa ho pokúsi použiť.",
+    "Customise your appearance": "Upravte si svoj výzor",
+    "Appearance Settings only affect this %(brand)s session.": "Nastavenia Výzoru ovplyvnia len túto reláciu %(brand)su.",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Vaše heslo bolo úspešne zmenené. Nebudete dostávať žiadne notifikácie z iných relácií, dokiaľ sa na nich znovu neprihlásite",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Pre nahlásenie bezpečnostnej chyby súvisiacu s Matrixom si prosím prečítajte <a>Bezpečnostnú Politiku Matrix.org-u</a> (anglicky).",
+    "Keyboard Shortcuts": "Klávesové skratky",
+    "Please verify the room ID or address and try again.": "Prosím, overte ID miestnosti alebo adresu a skúste to znovu.",
+    "Error unsubscribing from list": "Chyba pri zrušení odberu z listu",
+    "Please try again or view your console for hints.": "Skúste to prosím znovu alebo nahliadnite do konzoly po nápovedy.",
+    "None": "Žiadne",
+    "Ban list rules - %(roomName)s": "Pravidlá vyhosťovania - %(roomName)s",
+    "Server rules": "Pravidlá serveru",
+    "User rules": "Pravidlá používateľa",
+    "You have not ignored anyone.": "Nikoho neignorujete.",
+    "You are currently ignoring:": "Ignorujete:",
+    "You are not subscribed to any lists": "Neodbreráte žiadne listy",
+    "Unsubscribe": "Prestať odberať",
+    "View rules": "Zobraziť pravidlá",
+    "You are currently subscribed to:": "Odberáte:",
+    "⚠ These settings are meant for advanced users.": "⚠ Tieto nastavenia sú určené pre pokročilých používateľov.",
+    "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.": "Pridajte používateľov a servery, ktorých chcete ignorovať. Použite hviezdičku '*', aby %(brand)s ju priradil každému symbolu. Napríklad <code>@bot:*</code> by odignoroval všetkých používateľov s menom 'bot' na akomkoľvek serveri.",
+    "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.": "Ľudia a servery sú ignorovaný pomocou vyhosťovacích listov obsahujúce pravidlá, koho vyhostiť. Odberom vyhosťovacieho listu skryjete používateľov a servery, ktorý sú v ňom blokovaný.",
+    "Personal ban list": "Osobný zoznam vyhostených",
+    "Server or user ID to ignore": "Server alebo ID používateľa na odignorovanie",
+    "eg: @bot:* or example.org": "napr.: @bot:* alebo example.org",
+    "Subscribed lists": "Odberané listy",
+    "Subscribing to a ban list will cause you to join it!": "Odbraním listu vyhostených sa pridáte do jeho miestnosti!",
+    "If this isn't what you want, please use a different tool to ignore users.": "Pokiaľ to nechcete, tak prosím použite iný nástroj na ignorovanie používateľov.",
+    "Room ID or address of ban list": "ID miestnosti alebo adresa listu vyhostených",
+    "Subscribe": "Odberať",
+    "Always show the window menu bar": "Vždy zobraziť hornú lištu okna",
+    "Show tray icon and minimize window to it on close": "Zobraziť systémovú ikonu a minimalizovať pri zavretí",
+    "Read Marker lifetime (ms)": "Platnosť značky Prečítané (ms)",
+    "Read Marker off-screen lifetime (ms)": "Platnosť značky Prečítané mimo obrazovku (ms)",
+    "Session ID:": "ID relácie:",
+    "Session key:": "Kľúč relácie:",
+    "Message search": "Vyhľadávanie v správach",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Váš administrátor serveru zakázal predvolené E2E šifrovanie súkromných miestností & Priamych konverzácií.",
+    "Where you’re logged in": "Kde ste prihlásený",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Spravujte mená a odhláste sa z vašich relácií nižšie alebo <a>ich overte vo vašom profile používateľa</a>.",
+    "A session's public name is visible to people you communicate with": "Verejné meno relácie je viditeľné ľudom, s ktorými komunikujete",
+    "Upgrade this room to the recommended room version": "Upgradujte túto miestnosť na odporúčanú verziu",
+    "this room": "táto miestnosť",
+    "View older messages in %(roomName)s.": "Zobraziť staršie správy v miestnosti %(roomName)s.",
+    "Make this room low priority": "Priradiť tejto miestnosti nízku prioritu",
+    "Low priority rooms show up at the bottom of your room list in a dedicated section at the bottom of your room list": "Miestnosti s nízkou prioritou sa zobrazia vo vyhradenej sekcií na konci vášho zoznamu miestností",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Táto miestnosť premosťuje správy s nasledujúcimi platformami. <a>Viac informácií</a>",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Táto miestnosť nepremosťuje správy so žiadnymi ďalšími platformami. <a>Viac informácií</a>",
+    "Bridges": "Mosty",
+    "Uploaded sound": "Nahratý zvuk",
+    "Sounds": "Zvuky",
+    "Notification sound": "Zvuk oznámenia",
+    "Reset": "Obnoviť predvolené",
+    "Set a new custom sound": "Nastaviť vlastný zvuk",
+    "Browse": "Prechádzať",
+    "Upgrade the room": "Upgradovať miestnosť",
+    "Enable room encryption": "Povoliť v miestnosti šifrovanie",
+    "Error changing power level requirement": "Chyba pri zmene požiadavky na úroveň moci",
+    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Došlo k chybe pri zmene požiadavok na úroveň moci miestnosti. Ubezpečte sa, že na to máte dostatočné povolenia a skúste to znovu.",
+    "Error changing power level": "Chyba pri zmene úrovne moci",
+    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Došlo k chybe pri zmene úrovne moci používateľa. Ubezpečte sa, že na to máte dostatočné povolenia a skúste to znova.",
+    "To link to this room, please add an address.": "Na prepojenie s touto miestnosťou pridajte prosím adresu.",
+    "Unable to revoke sharing for email address": "Nepodarilo sa zrušiť zdieľanie emailovej adresy",
+    "Unable to share email address": "Nepodarilo sa zdieľať emailovú adresu",
+    "Your email address hasn't been verified yet": "Vaša emailová adresa nebola zatiaľ overená",
+    "Click the link in the email you received to verify and then click continue again.": "Pre overenie kliknite na odkaz v emaile, ktorý ste dostali, a potom znova kliknite pokračovať.",
+    "Verify the link in your inbox": "Overte si odkaz v emailovej schránke",
+    "Complete": "Dokončiť",
+    "Revoke": "Odvolať",
+    "Share": "Zdieľať",
+    "Unable to revoke sharing for phone number": "Nepodarilo sa zrušiť zdieľanie telefónneho čísla",
+    "Unable to share phone number": "Nepodarilo sa zdieľanie telefónneho čísla",
+    "Please enter verification code sent via text.": "Zadajte prosím overovací SMS kód.",
+    "Remove %(email)s?": "Odstrániť adresu %(email)s?",
+    "Remove %(phone)s?": "Odstrániť číslo %(phone)s?",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "SMSka vám bola zaslaná na +%(msisdn)s. Zadajte prosím overovací kód, ktorý obsahuje.",
+    "This user has not verified all of their sessions.": "Tento používateľ si neoveril všetky svoje relácie.",
+    "You have not verified this user.": "Tohto používateľa ste neoverili.",
+    "You have verified this user. This user has verified all of their sessions.": "Tohto používateľa ste overili. Tento používateľ si overil všetky svoje relácie.",
+    "Someone is using an unknown session": "Niekto používa neznámu reláciu",
+    "This room is end-to-end encrypted": "Táto miestnosť je E2E šifrovaná",
+    "Everyone in this room is verified": "Všetci v tejto miestnosti sú overení",
+    "Edit message": "Upraviť správu",
+    "Mod": "Moderátor",
+    "Are you sure you want to cancel entering passphrase?": "Naozaj chcete zrušiť zadávanie prístupovej frázy?",
+    "%(num)s minutes from now": "o %(num)s minút",
+    "%(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.",
+    "* %(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í",
+    "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.",
+    "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.": "Váš osobný zoznam blokácií obsahuje všetkých používateľov a servery, ktoré nechcete vidieť. Po ignorovaní prvého používateľa/servera sa vytvorí nová miestnosť 'Môj zoznam blokácií' - zostaňte v ňom, aby zoznam platil.",
+    "Discovery options will appear once you have added an email above.": "Možnosti nastavenia verejného profilu sa objavia po pridaní e-mailovej adresy vyššie.",
+    "Discovery options will appear once you have added a phone number above.": "Možnosti nastavenia verejného profilu sa objavia po pridaní telefónneho čísla vyššie.",
+    "Your key share request has been sent - please check your other sessions for key share requests.": "Požiadavka na zdieľanie kľúčov bola odoslaná - prosím skontrolujte si svoje relácie, či vám prišla.",
+    "No recently visited rooms": "Žiadne nedávno navštívené miestnosti",
+    "People": "Ľudia",
+    "Appearance": "Vzhľad",
+    "Show rooms with unread messages first": "Najprv ukázať miestnosti s neprečítanými správami",
+    "All rooms": "Všetky miestnosti",
+    "Hide advanced": "Skryť pokročilé možnosti",
+    "Show advanced": "Ukázať pokročilé možnosti",
+    "Explore rooms": "Preskúmať miestnosti",
+    "Search rooms": "Hľadať miestnosti",
+    "Security & privacy": "Bezpečnosť & súkromie",
+    "All settings": "Všetky nastavenia",
+    "Feedback": "Spätná väzba",
+    "Indexed rooms:": "Indexované miestnosti:"
 }
diff --git a/src/i18n/strings/sl.json b/src/i18n/strings/sl.json
index cba7f4c067..764b80e449 100644
--- a/src/i18n/strings/sl.json
+++ b/src/i18n/strings/sl.json
@@ -3,9 +3,9 @@
     "This phone number is already in use": "Ta telefonska številka je že v uporabi",
     "Failed to verify email address: make sure you clicked the link in the email": "E-poštnega naslova ni bilo mogoče preveriti: preverite, ali ste kliknili povezavo v e-poštnem sporočilu",
     "The platform you're on": "Vaša platforma",
-    "The version of Riot.im": "Različica Riot.im",
+    "The version of %(brand)s": "Različica %(brand)s",
     "Dismiss": "Opusti",
-    "Chat with Riot Bot": "Klepetajte z Riot Botom",
+    "Chat with %(brand)s Bot": "Klepetajte z %(brand)s Botom",
     "Sign In": "Prijava",
     "powered by Matrix": "poganja Matrix",
     "Custom Server Options": "Možnosti strežnika po meri",
diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 7e94977f63..9d9be78fdf 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -3,21 +3,15 @@
     "This phone number is already in use": "Ky numër telefoni është tashmë në përdorim",
     "Failed to verify email address: make sure you clicked the link in the email": "S’u arrit të verifikohej adresë email: sigurohuni se keni klikuar lidhjen te email-i",
     "The platform you're on": "Platforma ku gjendeni",
-    "The version of Riot.im": "Versioni i Riot.im-it",
+    "The version of %(brand)s": "Versioni i %(brand)s-it",
     "Your language of choice": "Gjuha juaj e zgjedhur",
     "Which officially provided instance you are using, if any": "Cilën instancë të furnizuar zyrtarish po përdorni, në pastë",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Nëse po përdorni apo jo mënyrën Richtext të Përpunuesit të Teksteve të Pasur",
     "Your homeserver's URL": "URL e Shërbyesit tuaj Home",
-    "Your identity server's URL": "URL e shërbyesit tuaj të identiteteve",
     "Analytics": "Analiza",
-    "The information being sent to us to help make Riot.im better includes:": "Të dhënat që na dërgohen për të na ndihmuar ta bëjmë më të mirë Riot.im-in përfshijnë:",
+    "The information being sent to us to help make %(brand)s better includes:": "Te të dhënat e dërguara te ne për të na ndihmuar ta bëjmë %(brand)s-in më të mirë përfshihen:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Kur kjo faqe përfshin të dhëna të identifikueshme, të tilla si një ID dhome përdoruesi apo grupi, këto të dhëna hiqen përpara se të dërgohet te shërbyesi.",
     "Call Failed": "Thirrja Dështoi",
-    "Review Devices": "Shqyrtoni Pajisje",
-    "Call Anyway": "Thirre Sido Qoftë",
-    "Answer Anyway": "Përgjigju Sido Qoftë",
-    "Call": "Thirrje",
-    "Answer": "Përgjigje",
     "Call Timeout": "Mbarim kohe Thirrjeje",
     "The remote side failed to pick up": "Ana e largët dështoi të përgjigjet",
     "Unable to capture screen": "S’arrihet të fotografohet ekrani",
@@ -30,7 +24,6 @@
     "Upload Failed": "Ngarkimi Dështoi",
     "Failure to create room": "S’u arrit të krijohej dhomë",
     "Server may be unavailable, overloaded, or you hit a bug.": "Shërbyesi mund të jetë i pakapshëm, i mbingarkuar, ose hasët një të metë.",
-    "Send anyway": "Dërgoje sido qoftë",
     "Send": "Dërgoje",
     "Sun": "Die",
     "Mon": "Hën",
@@ -68,8 +61,8 @@
     "Failed to invite users to %(groupId)s": "S’u arrit të ftoheshin përdorues te %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "S’u arrit të shtoheshin dhomat vijuese te %(groupId)s:",
     "Unnamed Room": "Dhomë e Paemërtuar",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot-i s’ka leje t’ju dërgojë njoftime - Ju lutemi, kontrolloni rregullimet e shfletuesit tuaj",
-    "Riot was not given permission to send notifications - please try again": "Riot-it s’iu dha leje të dërgojë njoftime - ju lutemi, riprovoni",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s-i s’ka leje t’ju dërgojë njoftime - Ju lutemi, kontrolloni rregullimet e shfletuesit tuaj",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s-it s’iu dha leje të dërgojë njoftime - ju lutemi, riprovoni",
     "Unable to enable Notifications": "S’arrihet të aktivizohen njoftimet",
     "This email address was not found": "Kjo adresë email s’u gjet",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Adresa juaj email s’duket të jetë e përshoqëruar me një ID Matrix në këtë shërbyes Home.",
@@ -77,7 +70,6 @@
     "Restricted": "E kufizuar",
     "Moderator": "Moderator",
     "Admin": "Përgjegjës",
-    "Start a chat": "Nisni një fjalosje",
     "Operation failed": "Veprimi dështoi",
     "Failed to invite": "S’u arrit të ftohej",
     "Failed to invite the following users to the %(roomName)s room:": "S’u arrit të ftoheshin përdoruesit vijues te dhoma %(roomName)s:",
@@ -93,12 +85,10 @@
     "Usage": "Përdorim",
     "/ddg is not a command": "/ddg s’është urdhër",
     "To use it, just wait for autocomplete results to load and tab through them.": "Për ta përdorur, thjesht pritni që të ngarkohen përfundimet e vetëplotësimit dhe shihini një nga një.",
-    "Unrecognised room alias:": "Alias dhome jo i pranuar:",
     "Ignored user": "Përdorues i shpërfillur",
     "You are now ignoring %(userId)s": "Tani po e shpërfillni %(userId)s",
     "Unignored user": "U hoq shpërfillja për përdoruesin",
     "Fetching third party location failed": "Dështoi prurja e vendndodhjes së palës së tretë",
-    "A new version of Riot is available.": "Ka gati një version të ri Riot-it.",
     "Send Account Data": "Dërgo të Dhëna Llogarie",
     "All notifications are currently disabled for all targets.": "Krejt njoftimet hëpërhë janë çaktivizuar për krejt objektivat.",
     "Uploading report": "Po ngarkohet raporti",
@@ -122,8 +112,6 @@
     "Send Custom Event": "Dërgoni Akt Vetjak",
     "Advanced notification settings": "Rregullime të mëtejshme për njoftimet",
     "Failed to send logs: ": "S’u arrit të dërgoheshin regjistra: ",
-    "delete the alias.": "fshije aliasin.",
-    "To return to your account in future you need to <u>set a password</u>": "Që të riktheheni te llogaria juaj në të ardhmen, lypset të <u>caktoni një fjalëkalim</u>",
     "Forget": "Harroje",
     "World readable": "E lexueshme nga bota",
     "Mute": "Pa Zë",
@@ -153,7 +141,6 @@
     "No update available.": "S’ka përditësim gati.",
     "Noisy": "I zhurmshëm",
     "Collecting app version information": "Po grumbullohen të dhëna versioni aplikacioni",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Të fshihet aliasi i dhomës %(alias)s dhe të hiqet %(name)s nga drejtoria?",
     "Keywords": "Fjalëkyçe",
     "Unpin Message": "Shfiksojeni Mesazhin",
     "Enable notifications for this account": "Aktivizo njoftime për këtë llogari",
@@ -167,7 +154,7 @@
     "Forward Message": "Përcille Mesazhin",
     "You have successfully set a password and an email address!": "Keni caktuar me sukses një fjalëkalim dhe një adresë email!",
     "Remove %(name)s from the directory?": "Të hiqet %(name)s prej drejtorisë?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot-i përdor mjaft veçori të përparuara të shfletuesve, disa prej të cilave s’janë gati ose janë eksperimentale në shfletuesin tuaj të tanishëm.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s-i përdor mjaft veçori të përparuara të shfletuesve, disa prej të cilave s’janë gati ose janë eksperimentale në shfletuesin tuaj të tanishëm.",
     "Event sent!": "Akti u dërgua!",
     "Preparing to send logs": "Po përgatitet për dërgim regjistrash",
     "Unnamed room": "Dhomë e paemërtuar",
@@ -213,7 +200,7 @@
     "Invite to this room": "Ftojeni te kjo dhomë",
     "You cannot delete this message. (%(code)s)": "S’mund ta fshini këtë mesazh. (%(code)s)",
     "Thursday": "E enjte",
-    "I understand the risks and wish to continue": "I kuptoj rreziqet dhe dua të vazhdoj",
+    "I understand the risks and wish to continue": "I kuptoj rreziqet dhe dëshiroj të vazhdoj",
     "Logs sent": "Regjistrat u dërguan",
     "Back": "Mbrapsht",
     "Reply": "Përgjigje",
@@ -221,8 +208,7 @@
     "You must specify an event type!": "Duhet të përcaktoni një lloj akti!",
     "Unhide Preview": "Shfshihe Paraparjen",
     "Unable to join network": "S’arrihet të hyhet në rrjet",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Mund t’i keni formësuar në një tjetër klient nga Riot-i. S’mund t’i sintonizoni në Riot, por ata janë ende të vlefshëm",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Na ndjeni, shfletuesi juaj <b>nuk</b> është në gjendje të xhirojë Riot-in.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Na ndjeni, shfletuesi juaj <b>nuk</b> është në gjendje të xhirojë %(brand)s-in.",
     "Messages in group chats": "Mesazhe në fjalosje në grup",
     "Yesterday": "Dje",
     "Error encountered (%(errorDetail)s).": "U has gabim (%(errorDetail)s).",
@@ -234,7 +220,7 @@
     "Register": "Regjistrohuni",
     "Off": "Off",
     "Edit": "Përpuno",
-    "Riot does not know how to join a room on this network": "Riot-i nuk di si të hyjë në një dhomë në këtë rrjet",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s-i nuk di si të hyjë në një dhomë në këtë rrjet",
     "Mentions only": "Vetëm përmendje",
     "remove %(name)s from the directory.": "hiqe %(name)s prej drejtorie.",
     "You can now return to your account after signing out, and sign in on other devices.": "Mund të ktheheni te llogaria juaj, pasi të keni bërë daljen, dhe të bëni hyrjen nga pajisje të tjera.",
@@ -253,10 +239,8 @@
     "Rooms": "Dhoma",
     "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!": "Me shfletuesin tuaj të tanishëm, pamja dhe ndjesitë nga aplikacioni mund të jenë plotësisht të pasakta, dhe disa nga ose krejt veçoritë të mos funksionojnë. Nëse doni ta provoni sido qoftë, mund të vazhdoni, por mos u ankoni për çfarëdo problemesh që mund të hasni!",
     "Checking for an update...": "Po kontrollohet për një përditësim…",
-    "There are advanced notifications which are not shown here": "Ka njoftime të thelluara që nuk shfaqen këtu",
     "PM": "PM",
     "AM": "AM",
-    "Room name or alias": "Emër dhome ose alias",
     "Verified key": "Kyç i verifikuar",
     "Reason": "Arsye",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s kërkoi një konferencë VoIP.",
@@ -268,7 +252,6 @@
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s e bëri historikun e ardhshëm të dhomës të dukshëm për krejt anëtarët e dhomës, prej çastit kur morën pjesë.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s e bëri historikun e ardhshëm të dhomës të dukshëm për krejt anëtarët e dhomës.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s e bëri historikun e ardhshëm të dhomës të dukshëm për këdo.",
-    "Use compact timeline layout": "Përdorni skemë grafike kompakte për rrjedhën kohore",
     "Always show message timestamps": "Shfaq përherë vula kohore për mesazhet",
     "Room Colour": "Ngjyrë Dhome",
     "unknown caller": "thirrës i panjohur",
@@ -290,13 +273,8 @@
     "Confirm password": "Ripohoni frazëkalimin",
     "Change Password": "Ndryshoni Fjalëkalimin",
     "Authentication": "Mirëfilltësim",
-    "Device ID": "ID Pajisjeje",
     "Last seen": "Parë së fundi më",
-    "Disable Notifications": "Çaktivizo Njoftimet",
-    "Enable Notifications": "Aktivizo Njoftimet",
     "not specified": "e papërcaktuar",
-    "Remote addresses for this room:": "Adresa të largëta për këtë dhomë:",
-    "Local addresses for this room:": "Adresa vendore për këtë dhomë:",
     "This room has no local addresses": "Kjo dhomë s’ka adresë vendore",
     "Invalid community ID": "ID bashkësie e pavlefshme",
     "URL Previews": "Paraparje URL-sh",
@@ -309,8 +287,6 @@
     "Options": "Mundësi",
     "Key request sent.": "Kërkesa për kyç u dërgua.",
     "Please select the destination room for this message": "Ju lutemi, përzgjidhni dhomën vendmbërritje për këtë mesazh",
-    "Blacklisted": "Në Listë të Zezë",
-    "device id: ": "ID pajisjeje: ",
     "Kick": "Përzëre",
     "Kick this user?": "Të përzihet ky përdorues?",
     "Unban": "Hiqja dëbimin",
@@ -322,9 +298,6 @@
     "Ignore": "Shpërfille",
     "Mention": "Përmendje",
     "Invite": "Ftoje",
-    "User Options": "Mundësi Përdoruesi",
-    "Direct chats": "Fjalosje të drejtpërdrejta",
-    "Make Moderator": "Kaloje Moderator",
     "Admin Tools": "Mjete Përgjegjësi",
     "and %(count)s others...|other": "dhe %(count)s të tjerë…",
     "and %(count)s others...|one": "dhe një tjetër…",
@@ -334,9 +307,7 @@
     "Video call": "Thirrje video",
     "Upload file": "Ngarkoni kartelë",
     "Send an encrypted reply…": "Dërgoni një përgjigje të fshehtëzuar…",
-    "Send a reply (unencrypted)…": "Dërgoni një përgjigje (të pafshehtëzuar)…",
     "Send an encrypted message…": "Dërgoni një mesazh të fshehtëzuar…",
-    "Send a message (unencrypted)…": "Dërgoni një mesazh (të pafshehtëzuar)…",
     "You do not have permission to post to this room": "S’keni leje të postoni në këtë dhomë",
     "Server error": "Gabim shërbyesi",
     "Command error": "Gabim urdhri",
@@ -399,14 +370,9 @@
     "Unknown Address": "Adresë e Panjohur",
     "Allow": "Lejoje",
     "Create new room": "Krijoni dhomë të re",
-    "Unblacklist": "Hiqe nga listë e zezë",
-    "Blacklist": "Listë e zezë",
-    "Unverify": "Hiqi verifikimin",
-    "Verify...": "Verifikoni…",
     "No results": "S’ka përfundime",
     "Communities": "Bashkësi",
     "Home": "Kreu",
-    "Could not connect to the integration server": "S’u lidh dot te shërbyesi i integrimt",
     "Manage Integrations": "Administroni Integrime",
     "were invited %(count)s times|one": "janë ftuar",
     "was invited %(count)s times|other": "është ftuar %(count)s herë",
@@ -446,10 +412,6 @@
     "Incorrect password": "Fjalëkalim i pasaktë",
     "Deactivate Account": "Çaktivizoje Llogarinë",
     "An error has occurred.": "Ndodhi një gabim.",
-    "Start verification": "Fillo verifikimin",
-    "Share without verifying": "Ndajeni me të tjerë pa e verifikuar",
-    "Ignore request": "Shpërfille kërkesën",
-    "Encryption key request": "Kërkesë kyçi fshehtëzimesh",
     "Invalid Email Address": "Adresë Email e Pavlefshme",
     "This doesn't appear to be a valid email address": "Kjo s’duket se është adresë email e vlefshme",
     "Verification Pending": "Verifikim Në Pritje të Miratimit",
@@ -460,7 +422,6 @@
     "Private Chat": "Fjalosje Private",
     "Public Chat": "Fjalosje Publike",
     "Custom": "Vetjak",
-    "Alias (optional)": "Alias (opsional)",
     "Name": "Emër",
     "You must <a>register</a> to use this functionality": "Që të përdorni këtë funksion, duhet të <a>regjistroheni</a>",
     "Add rooms to the community summary": "Shtoni dhoma te përmbledhja mbi bashkësinë",
@@ -497,12 +458,10 @@
     "Uploading %(filename)s and %(count)s others|other": "Po ngarkohet %(filename)s dhe %(count)s të tjera",
     "Uploading %(filename)s and %(count)s others|zero": "Po ngarkohet %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Po ngarkohet %(filename)s dhe %(count)s tjetër",
-    "Light theme": "Temë e çelët",
-    "Dark theme": "Temë e errët",
     "Sign out": "Dilni",
     "Success": "Sukses",
     "Cryptography": "Kriptografi",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot-i grumbullon të dhëna analitike anonime që të na lejojë ta përmirësojmë aplikacionin.",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s-i grumbullon të dhëna analitike anonime që të na lejojë ta përmirësojmë aplikacionin.",
     "Check for update": "Kontrollo për përditësime",
     "No media permissions": "S’ka leje mediash",
     "No Microphones detected": "S’u pikasën Mikrofona",
@@ -515,7 +474,7 @@
     "Account": "Llogari",
     "Access Token:": "Token Hyrjesh:",
     "Identity Server is": "Shërbyes Identitetesh është",
-    "riot-web version:": "Version riot-web:",
+    "%(brand)s version:": "Version %(brand)s:",
     "olm version:": "version olm:",
     "The email address linked to your account must be entered.": "Duhet dhënë adresa email e lidhur me llogarinë tuaj.",
     "Return to login screen": "Kthehuni te skena e hyrjeve",
@@ -533,19 +492,7 @@
     "Notify the whole room": "Njofto krejt dhomën",
     "Room Notification": "Njoftim Dhome",
     "Users": "Përdorues",
-    "unknown device": "pajisje e panjohur",
-    "NOT verified": "JO e verifikuar",
-    "verified": "e verifikuar",
-    "Verification": "Verifikim",
-    "User ID": "ID përdoruesi",
-    "Curve25519 identity key": "Kyç identiteti Curve25519",
-    "none": "asnjë",
-    "Algorithm": "Algoritëm",
-    "unencrypted": "të pafshehtëzuara",
-    "Decryption error": "Gabim shfshehtëzimi",
     "Session ID": "ID sesioni",
-    "End-to-end encryption information": "Të dhëna fshehtëzimi skaj-më-skaj",
-    "Event information": "Të dhëna akti",
     "Passphrases must match": "Frazëkalimet duhet të përputhen",
     "Passphrase must not be empty": "Frazëkalimi s’mund të jetë i zbrazët",
     "Export room keys": "Eksporto kyçe dhome",
@@ -564,7 +511,6 @@
     "Incoming video call from %(name)s": "Thirrje video ardhëse nga %(name)s",
     "Incoming call from %(name)s": "Thirrje ardhëse nga %(name)s",
     "Failed to upload profile picture!": "S’u arrit të ngarkohej foto profili!",
-    "New address (e.g. #foo:%(localDomain)s)": "Adresë e re (p.sh. #foo:%(localDomain)s)",
     "New community ID (e.g. +foo:%(localDomain)s)": "ID bashkësie të re (p.sh. +foo:%(localDomain)s)",
     "Ongoing conference call%(supportedText)s.": "Thirrje konference që po zhvillohet%(supportedText)s.",
     "Failed to kick": "S’u arrit të përzihej",
@@ -583,9 +529,6 @@
     "Members only (since they joined)": "Vetëm anëtarë (që kur janë bërë pjesë)",
     "Jump to first unread message.": "Hidhu te mesazhi i parë i palexuar.",
     "Failed to copy": "S’u arrit të kopjohej",
-    "Message removed by %(userId)s": "Mesazhi u hoq nga %(userId)s",
-    "Message removed": "Mesazhi u hoq",
-    "To continue, please enter your password.": "Që të vazhdohet, ju lutemi, jepni fjalëkalimin tuaj.",
     "Token incorrect": "Token i pasaktë",
     "Remove from community": "Hiqe prej bashkësie",
     "Remove this user from community?": "Të hiqet ky përdoruesin prej bashkësisë?",
@@ -594,7 +537,6 @@
     "Failed to remove room from community": "S’u arrit të hiqej dhoma nga bashkësia",
     "Minimize apps": "Minimizoji aplikacionet",
     "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)sndryshoi avatarin e vet",
-    "I verify that the keys match": "Verifikoj se kyçet përputhen",
     "Unable to restore session": "S’arrihet të rikthehet sesioni",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Ju lutemi, kontrolloni email-in tuaj dhe klikoni mbi lidhjen që përmban. Pasi të jetë bërë kjo, klikoni që të vazhdohet.",
     "Unable to add email address": "S’arrihet të shtohet adresë email",
@@ -610,8 +552,6 @@
     "Failed to load %(groupId)s": "S’u arrit të ngarkohej %(groupId)s",
     "Failed to reject invitation": "S’u arrit të hidhej poshtë ftesa",
     "Failed to leave room": "S’u arrit të braktisej",
-    "Scroll to bottom of page": "Rrëshqit te fundi i faqes",
-    "Unknown room %(roomId)s": "Dhomë e panjohur %(roomId)s",
     "Fill screen": "Mbushe ekranin",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "U provua të ngarkohej një pikë të dhënë prej rrjedhës kohore në këtë dhomë, por s’u arrit të gjendej.",
     "Failed to load timeline position": "S’u arrit të ngarkohej pozicion rrjedhe kohore",
@@ -622,7 +562,6 @@
     "I have verified my email address": "E kam verifikuar adresën time email",
     "Failed to fetch avatar URL": "S’u arrit të sillej URL avatari",
     "Invites user with given id to current room": "Fton te dhoma e tanishme përdoruesin me ID-në e dhënë",
-    "Joins room with given alias": "Hyn në dhomë me aliasin e dhënë",
     "Searches DuckDuckGo for results": "Kërkon te DuckDuckGo për përfundime",
     "Ignores a user, hiding their messages from you": "Shpërfill një përdorues, duke ju fshehur krejt mesazhet prej tij",
     "File to import": "Kartelë për importim",
@@ -654,7 +593,6 @@
     "Download %(text)s": "Shkarko %(text)s",
     "Error decrypting image": "Gabim në shfshehtëzim figure",
     "Error decrypting video": "Gabim në shfshehtëzim videoje",
-    "Removed or unknown message type": "Lloj mesazhi i hequr ose i panjohur",
     "An email has been sent to %(emailAddress)s": "U dërgua një email te %(emailAddress)s",
     "Delete Widget": "Fshije Widget-in",
     "Delete widget": "Fshije widget-in",
@@ -679,7 +617,6 @@
     "Deops user with given id": "I heq cilësinë e operatorit përdoruesit me ID-në e dhënë",
     "Changes your display nickname": "Ndryshon nofkën tuaj në ekran",
     "Emoji": "Emoji",
-    "Ed25519 fingerprint": "Shenja gishtash Ed25519",
     "Failed to set direct chat tag": "S’u arrit të caktohej etiketa e fjalosjes së drejtpërdrejtë",
     "You are no longer ignoring %(userId)s": "Nuk e shpërfillni më %(userId)s",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s caktoi për veten emër ekrani %(displayName)s.",
@@ -747,7 +684,6 @@
     "e.g. %(exampleValue)s": "p.sh., %(exampleValue)s",
     "e.g. <CurrentPageURL>": "p.sh., <CurrentPageURL>",
     "Permission Required": "Lypset Leje",
-    "Registration Required": "Lyp Regjistrim",
     "This homeserver has hit its Monthly Active User limit.": "Ky shërbyes home ka tejkaluar kufirin e vet Përdorues Aktivë Mujorë.",
     "This homeserver has exceeded one of its resource limits.": "Ky shërbyes home ka tejkaluar një nga kufijtë e tij mbi burimet.",
     "Please <a>contact your service administrator</a> to continue using the service.": "Ju lutemi, që të vazhdoni të përdorni shërbimin, <a>lidhuni me përgjegjësin e shërbimit tuaj</a>.",
@@ -765,16 +701,13 @@
     "The email field must not be blank.": "Fusha email s’duhet të jetë e zbrazët.",
     "The phone number field must not be blank.": "Fusha numër telefoni s’duhet të jetë e zbrazët.",
     "The password field must not be blank.": "Fusha fjalëkalim s’duhet të jetë e zbrazët.",
-    "Yes, I want to help!": "Po, dua të ndihmoj!",
-    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "Ky shërbyes home ka tejkaluar kufirin e vet të Përdoruesve Aktivë Mujorë, ndaj <b>disa përdorues s’do të jenë në gjendje të bëjnë hyrjen</b>.",
-    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Ky shërbyes home ka tejkaluar një nga kufijtë mbi burimet, ndaj <b>disa përdorues s’do të jenë në gjendje të bëjnë hyrjen</b>.",
     "Failed to remove widget": "S’u arrit të hiqej widget-i",
     "Popout widget": "Widget flluskë",
     "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.": "Dukshmëria e mesazheve në Matrix është e ngjashme me atë në email. Harrimi i mesazheve nga ana jonë do të thotë që mesazhet që keni dërguar nuk do të ndahen me çfarëdo përdoruesi të ri apo të paregjistruar, por përdoruesit e regjistruar, që kanë tashmë hyrje në këto mesazhe, do të kenë prapëseprapë hyrje te kopja e tyre.",
     "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)": "Të lutem, harro krejt mesazhet që kamë dërguar, kur të çaktivizohet llogaria ime (<b>Kujdes</b>: kjo do të bëjë që përdorues të ardhshëm të shohin një pamje jo të plotë të bisedave)",
     "To continue, please enter your password:": "Që të vazhdohet, ju lutemi, jepni fjalëkalimin tuaj:",
     "Incompatible local cache": "Fshehtinë vendore e papërputhshme",
-    "Updating Riot": "Riot-i po përditësohet",
+    "Updating %(brand)s": "%(brand)s-i po përditësohet",
     "Failed to upgrade room": "S’u arrit të përmirësohej dhoma",
     "The room upgrade could not be completed": "Përmirësimi i dhomës s’u plotësua",
     "Upgrade Room Version": "Përmirësoni Versionin e Dhomës",
@@ -794,14 +727,10 @@
     "Please <a>contact your service administrator</a> to continue using this service.": "Ju lutemi, që të vazhdoni të përdorni këtë shërbim, <a>lidhuni me përgjegjësin e shërbimit tuaj</a>.",
     "Open Devtools": "Hapni Mjete Zhvilluesi",
     "Show developer tools": "Shfaq mjete zhvilluesi",
-    "Your User Agent": "Agjent Përdoruesi i Juaj",
     "Your device resolution": "Qartësi e pajisjes tuaj",
     "A call is currently being placed!": "Është duke u bërë një thirrje!",
     "You do not have permission to start a conference call in this room": "S’keni leje për të nisur një thirrje konferencë këtë në këtë dhomë",
     "Missing roomId.": "Mungon roomid.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s shtoi %(addedAddresses)s si një adresë për këtë dhomë.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s hoqi %(removedAddresses)s si adresa për këtë dhomë.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s hoqi %(removedAddresses)s si adresë për këtë dhomë.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s hoqi adresën kryesore për këtë dhomë.",
     "This room has been replaced and is no longer active.": "Kjo dhomë është zëvendësuar dhe s’është më aktive.",
     "Share room": "Ndani dhomë me të tjerë",
@@ -826,10 +755,7 @@
     "Failed to add the following users to the summary of %(groupId)s:": "S’u arrit të ftoheshin përdoruesit vijues te përmbledhja e %(groupId)s:",
     "Unable to join community": "S’arrihet të bëhet pjesë e bashkësisë",
     "Unable to leave community": "S’arrihet të braktiset bashkësia",
-    "Claimed Ed25519 fingerprint key": "U pretendua për shenja gishtash Ed25519",
     "Every page you use in the app": "Çdo faqe që përdorni te aplikacioni",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s shtoi %(addedAddresses)s si adresa për këtë dhomë.",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s shtoi %(addedAddresses)s dhe hoqi %(removedAddresses)s si adresa për këtë dhomë.",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s nga %(fromPowerLevel)s në %(toPowerLevel)s",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ndryshoi shkallën e pushtetit të %(powerLevelDiffText)s.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ndryshoi mesazhin e fiksuar për këtë dhomë.",
@@ -852,8 +778,8 @@
     "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Ndryshimet e bëra te <bold1>emri</bold1> dhe <bold2>avatari</bold2> i bashkësisë tuaj mund të mos shihen nga përdoruesit e tjera para deri 30 minutash.",
     "Can't leave Server Notices room": "Dhoma Njoftime Shërbyesi, s’braktiset dot",
     "For security, this session has been signed out. Please sign in again.": "Për hir të sigurisë, është bërë dalja nga ky sesion. Ju lutemi, ribëni hyrjen.",
-    "Data from an older version of Riot 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.": "Janë pikasur të dhëna nga një version i dikurshëm i Riot-it. Kjo do të bëjë që kriptografia skaj-më-skaj te versioni i dikurshëm të mos punojë si duhet. Mesazhet e fshehtëzuar skaj-më-skaj tani së fundi teksa përdorej versioni i dikurshëm mund të mos jenë të shfshehtëzueshëm në këtë version. Kjo mund bëjë edhe që mesazhet e shkëmbyera me këtë version të dështojnë. Nëse ju dalin probleme, bëni daljen dhe rihyni në llogari. Që të ruhet historiku i mesazheve, eksportoni dhe riimportoni kyçet tuaj.",
-    "Did you know: you can use communities to filter your Riot.im experience!": "E dinit se: mund t’i përdorni bashkësitë për të filtruar punimin tuaj në Riot.im?",
+    "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.": "Janë pikasur të dhëna nga një version i dikurshëm i %(brand)s-it. Kjo do të bëjë që kriptografia skaj-më-skaj te versioni i dikurshëm të mos punojë si duhet. Mesazhet e fshehtëzuar skaj-më-skaj tani së fundi teksa përdorej versioni i dikurshëm mund të mos jenë të shfshehtëzueshëm në këtë version. Kjo mund bëjë edhe që mesazhet e shkëmbyera me këtë version të dështojnë. Nëse ju dalin probleme, bëni daljen dhe rihyni në llogari. Që të ruhet historiku i mesazheve, eksportoni dhe riimportoni kyçet tuaj.",
+    "Did you know: you can use communities to filter your %(brand)s experience!": "E dinit se: mund t’i përdorni bashkësitë për të filtruar punimin tuaj në %(brand)s?",
     "Error whilst fetching joined communities": "Gabim teksa silleshin bashkësitë ku merret pjesë",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Ridërgojini krejt</resendText> ose <cancelText>anulojini krejt</cancelText> tani. Për ridërgim ose anulim, mundeni edhe të përzgjidhni mesazhe individualë.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Ridërgojeni mesazhin</resendText> ose <cancelText>anulojeni mesazhin</cancelText> tani.",
@@ -867,7 +793,6 @@
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Merrni pjesë me <voiceText>zë</voiceText> ose me <videoText>video</videoText>.",
     "Demote yourself?": "Të zhgradohet vetvetja?",
     "Demote": "Zhgradoje",
-    "Failed to toggle moderator status": "S’u arrit të këmbehet gjendje moderatori",
     "Server unavailable, overloaded, or something else went wrong.": "Shërbyesi është i pakapshëm, i mbingarkuar, ose diç tjetër shkoi ters.",
     "No users have specific privileges in this room": "S’ka përdorues me privilegje të caktuara në këtë dhomë",
     "Guests cannot join this room even if explicitly invited.": "Vizitorët s’mund të marrin pjesë në këtë edhe po të jenë ftuar shprehimisht.",
@@ -876,13 +801,10 @@
     "Please review and accept the policies of this homeserver:": "Ju lutemi, shqyrtoni dhe pranoni rregullat e këtij shërbyesi home:",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Nëse nuk përcaktoni një adresë email, s’do të jeni në gjendje të bëni ricaktime të fjalëkalimit tuaj. Jeni i sigurt?",
     "Removing a room from the community will also remove it from the community page.": "Heqja e një dhome nga bashkësia do ta heqë atë edhe nga faqja e bashkësisë.",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Ju lutemi, ndihmoni të përmirësohet Riot.im duke dërguar <UsageDataLink>të dhëna anonime përdorimi</UsageDataLink>. Për këtë do të përdoret një cookie (ju lutemi, shihni <PolicyLink>Rregullat tona mbi Cookie-t</PolicyLink>).",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Ju lutemi, ndihmoni të përmirësohet Riot.im duke dërguar <UsageDataLink>të dhëna anonime përdorimi</UsageDataLink>. Për këtë do të përdoret një cookie.",
-    "Please <a>contact your service administrator</a> to get this limit increased.": "Ju lutemi, që të shtohet ky kufi, <a>lidhuni me përgjegjësin e shërbimit</a>.",
-    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Nëse versioni tjetër i Riot-it është ende i hapur në një skedë tjetër, ju lutemi, mbylleni, ngaqë përdorimi njëkohësisht i Riot-it në të njëjtën strehë, në njërën anë me <em>lazy loading</em> të aktivizuar dhe në anën tjetër të çaktivizuar do të shkaktojë probleme.",
-    "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Riot-i tani përdor 3 deri 5 herë më pak kujtesë, duke ngarkuar të dhëna mbi përdorues të tjerë vetëm kur duhen. Ju lutemi, prisni, teksa njëkohësojmë të dhënat me shërbyesin!",
+    "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.": "Nëse versioni tjetër i %(brand)s-it është ende i hapur në një skedë tjetër, ju lutemi, mbylleni, ngaqë përdorimi njëkohësisht i %(brand)s-it në të njëjtën strehë, në njërën anë me <em>lazy loading</em> të aktivizuar dhe në anën tjetër të çaktivizuar do të shkaktojë probleme.",
+    "%(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-i tani përdor 3 deri 5 herë më pak kujtesë, duke ngarkuar të dhëna mbi përdorues të tjerë vetëm kur duhen. Ju lutemi, prisni, teksa njëkohësojmë të dhënat me shërbyesin!",
     "Put a link back to the old room at the start of the new room so people can see old messages": "Vendosni në krye të dhomës së re një lidhje për te dhoma e vjetër, që njerëzit të mund të shohin mesazhet e vjetër",
-    "If you have previously used a more recent version of Riot, 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ë Riot-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.",
+    "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.",
@@ -894,7 +816,6 @@
     "Reject all %(invitedRooms)s invites": "Mos prano asnjë ftesë për në %(invitedRooms)s",
     "New passwords must match each other.": "Fjalëkalimet e rinj duhet të përputhen me njëri-tjetrin.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Ju lutemi, kini parasysh se jeni futur te shërbyesi %(hs)s, jo te matrix.org.",
-    "You need to register to do this. Would you like to register now?": "Për ta bërë këtë, lypset të regjistroheni. Doni të regjistroheni që tani?",
     "Stops ignoring a user, showing their messages going forward": "Resht shpërfilljen e një përdoruesi, duke i shfaqur mesazhet e tij të dërgohen",
     "Your browser does not support the required cryptography extensions": "Shfletuesi juaj nuk mbulon zgjerimet kriptografike të domosdoshme",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Vulat kohore shfaqi në formatin 12 orësh (p.sh. 2:30pm)",
@@ -916,7 +837,7 @@
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "S’arrihet të ngarkohet akti të cilit iu përgjigj, ose nuk ekziston, ose s’keni leje ta shihni.",
     "Try using one of the following valid address types: %(validTypesList)s.": "Provoni të përdorni një nga llojet e vlefshme të adresave më poshtë: %(validTypesList)s.",
     "Something went wrong whilst creating your community": "Diç shkoi ters teksa krijohej bashkësia juaj",
-    "You've previously used Riot 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, Riot needs to resync your account.": "Më parë përdornit Riot në %(host)s me <em>lazy loading</em> anëtarësh të aktivizuar. Në këtë version <em>lazy loading</em> është çaktivizuar. Ngaqë fshehtina vendore s’është e përputhshme mes këtyre dy rregullimeve, Riot-i lyp të rinjëkohësohet llogaria juaj.",
+    "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.": "Më parë përdornit %(brand)s në %(host)s me <em>lazy loading</em> anëtarësh të aktivizuar. Në këtë version <em>lazy loading</em> është çaktivizuar. Ngaqë fshehtina vendore s’është e përputhshme mes këtyre dy rregullimeve, %(brand)s-i lyp të rinjëkohësohet llogaria juaj.",
     "Update any local room aliases to point to the new room": "Përditësoni çfarëdo aliasesh dhomash vendore që të shpien te dhoma e re",
     "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Ndalojuni përdoruesve të flasin në versionin e vjetër të dhomës, dhe postoni një mesazh që u këshillon atyre të hidhen te dhoma e re",
     "We encountered an error trying to restore your previous session.": "Hasëm një gabim teksa provohej të rikthehej sesioni juaj i dikurshëm.",
@@ -937,12 +858,11 @@
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "S’ka njeri këtu! Do të donit të <inviteText>ftoni të tjerë</inviteText> apo <nowarnText>të reshtet së njoftuari për dhomë të zbrazët</nowarnText>?",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "U provua të ngarkohej një pikë e caktuar në kronologjinë e kësaj dhome, por nuk keni leje për ta parë mesazhin në fjalë.",
     "Start automatically after system login": "Nisu vetvetiu pas hyrjes në sistem",
-    "You may need to manually permit Riot to access your microphone/webcam": "Lypset të lejoni dorazi Riot-in të përdorë mikrofonin/kamerën tuaj web",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "Lypset të lejoni dorazi %(brand)s-in të përdorë mikrofonin/kamerën tuaj web",
     "No Audio Outputs detected": "S’u pikasën Sinjale Audio Në Dalje",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Ky shërbyes home nuk ofron ndonjë mënyrë hyrjesh që mbulohet nga ky klient.",
     "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.": "Kartela e eksportuar do t’i lejojë kujtdo që e lexon të shfshehtëzojë çfarëdo mesazhesh të fshehtëzuar që mund të shihni, ndaj duhet të jeni i kujdesshëm për ta mbajtur të parrezikuar. Si ndihmë për këtë, duhet të jepni më poshtë një frazëkalim, që do të përdoret për të fshehtëzuar të dhënat e eksportuara. Importimi i të dhënave do të jetë i mundur vetëm duke përdorur të njëjtin frazëkalim.",
-    "Not a valid Riot keyfile": "S’është kartelë kyçesh Riot e vlefshme",
-    "Revoke Moderator": "Shfuqizoje Si Moderator",
+    "Not a valid %(brand)s keyfile": "S’është kartelë kyçesh %(brand)s e vlefshme",
     "Historical": "Të dikurshme",
     "Flair": "Simbole",
     "Showing flair for these communities:": "Shfaqen simbole për këto bashkësi:",
@@ -950,8 +870,7 @@
     "Please review and accept all of the homeserver's policies": "Ju lutemi, shqyrtoni dhe pranoni krejt rregullat e këtij shërbyesi home",
     "Display your community flair in rooms configured to show it.": "Shfaqni simbolet e bashkësisë tuaj në dhoma të formësuara për t’i shfaqur ato.",
     "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.": "Jeni i sigurt se doni të hiqet (fshihet) ky akt? Mbani parasysh se nëse fshini emrin e një dhome ose ndryshimin e temës, kjo mund të sjellë zhbërjen e ndryshimit.",
-    "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 Riot to do this": "Që të shmanget humbja e historikut të fjalosjes tuaj, duhet të eksportoni kyçet e dhomës tuaj përpara se të dilni nga llogari. Që ta bëni këtë, duhe të riktheheni te versioni më i ri i Riot-it",
-    "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ": "Më parë përdorët një version më të ri të Riot-it në %(host)s. Që ta përdorni sërish këtë version me fshehtëzim skaj-më-skaj, duhet të dilni dhe rihyni te llogaria juaj. ",
+    "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": "Që të shmanget humbja e historikut të fjalosjes tuaj, duhet të eksportoni kyçet e dhomës tuaj përpara se të dilni nga llogari. Që ta bëni këtë, duhe të riktheheni te versioni më i ri i %(brand)s-it",
     "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.",
@@ -960,34 +879,23 @@
     "Unable to load key backup status": "S’arrihet të ngarkohet gjendje kopjeruajtjeje kyçesh",
     "Backup version: ": "Version kopjeruajtjeje: ",
     "Algorithm: ": "Algoritëm: ",
-    "Enter a passphrase...": "Jepni një frazëkalim…",
     "Next": "Pasuesja",
     "That matches!": "U përputhën!",
     "That doesn't match.": "S’përputhen.",
     "Go back to set it again.": "Shkoni mbrapsht që ta ricaktoni.",
-    "Repeat your passphrase...": "Përsëritni frazëkalimin tuaj…",
-    "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Si masë sigurie, mund ta përdoreni për të rikthyer historikun e mesazheve tuaj të fshehtëzuar, nëse harroni Frazëkalimin e Rimarrjeve.",
-    "Your Recovery Key": "Kyçi Juaj i Rimarrjeve",
-    "Copy to clipboard": "Kopjoje në të papastër",
     "Download": "Shkarkoje",
     "<b>Print it</b> and store it somewhere safe": "<b>Shtypeni</b> dhe ruajeni diku pa rrezik",
     "<b>Save it</b> on a USB key or backup drive": "<b>Ruajeni</b> në një diskth USB ose disk kopjeruajtjesh",
     "<b>Copy it</b> to your personal cloud storage": "<b>Kopjojeni</b> te depoja juaj personale në re",
     "Set up Secure Message Recovery": "Rregulloni Rimarrje të Sigurt Mesazhesh",
-    "Keep it safe": "Mbajeni të parrezikuar",
-    "Create Key Backup": "Krijo Kopjeruajtje Kyçesh",
     "Unable to create key backup": "S’arrihet të krijohet kopjeruajtje kyçesh",
     "Retry": "Riprovo",
     "Unable to load backup status": "S’arrihet të ngarkohet gjendje kopjeruajtjeje",
     "Unable to restore backup": "S’arrihet të rikthehet kopjeruajtje",
     "No backup found!": "S’u gjet kopjeruajtje!",
-    "Backup Restored": "Kopjeruajtja u Rikthye",
     "Failed to decrypt %(failedCount)s sessions!": "S’u arrit të shfshehtëzohet sesioni %(failedCount)s!",
-    "Restored %(sessionCount)s session keys": "U rikthyen kyçet e sesionit %(sessionCount)s",
-    "Enter Recovery Passphrase": "Jepni Frazëkalim Rimarrjeje",
     "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Hyni te historiku i mesazheve tuaj të siguruar dhe rregulloni shkëmbim mesazhesh të sigurt duke dhënë frazëkalimin tuaj të rimarrjeve.",
     "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "Nëse keni harruar frazëkalimin tuaj të rimarrjeve, mund të <button1>përdorni kyçin tuaj të rimarrjeve</button1> ose <button2>rregulloni mundësi të reja rimarrjesh</button2>",
-    "Enter Recovery Key": "Jepni Kyç Rimarrjeje",
     "This looks like a valid recovery key!": "Ky duket si kyç i vlefshëm rimarrjesh!",
     "Not a valid recovery key": "Kyç rimarrjesh jo i vlefshëm",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Hyni te historiku i mesazheve tuaj të siguruar dhe rregulloni shkëmbim mesazhesh të sigurt duke dhënë kyçin tuaj të rimarrjeve.",
@@ -1019,9 +927,7 @@
     "A word by itself is easy to guess": "Një fjalë më vete është e lehtë të hamendësohet",
     "Names and surnames by themselves are easy to guess": "Emrat dhe mbiemrat në vetvete janë të lehtë për t’i hamendësuar",
     "Common names and surnames are easy to guess": "Emra dhe mbiemra të rëndomtë janë të kollajtë për t’u hamendësuar",
-    "Great! This passphrase looks strong enough.": "Bukur! Ky frazëkalim duket goxha i fuqishëm.",
     "Failed to load group members": "S'u arrit të ngarkoheshin anëtarë grupi",
-    "As a safety net, you can use it to restore your encrypted message history.": "Si masë sigurie, mund ta përdorni për të rikthyer historikun e mesazheve tuaj të fshehtëzuar.",
     "Failed to invite users to the room:": "S’u arrit të ftohen përdorues te dhoma:",
     "You do not have permission to invite people to this room.": "S’keni leje të ftoni njerëz në këtë dhomë.",
     "User %(user_id)s does not exist": "Përdoruesi %(user_id)s nuk ekziston",
@@ -1050,7 +956,6 @@
     "Clear status": "Spastroji gjendjen",
     "Unrecognised address": "Adresë jo e pranuar",
     "User %(user_id)s may or may not exist": "Përdoruesi %(user_id)s mund të ekzistojë ose jo",
-    "Waiting for %(userId)s to confirm...": "Po pritet që %(userId)s të bëjë ripohimin…",
     "Prompt before sending invites to potentially invalid matrix IDs": "Pyet, përpara se të dërgohen ftesa te ID Matrix potencialisht të pavlefshme",
     "The following users may not exist": "Përdoruesit vijues mund të mos ekzistojnë",
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "S’arrihet të gjenden profile për ID-të Matrix të treguara më poshtë - do të donit të ftohet, sido qoftë?",
@@ -1100,15 +1005,15 @@
     "Developer options": "Mundësi zhvilluesi",
     "General": "Të përgjithshme",
     "Room Addresses": "Adresa Dhomash",
-    "Set a new account password...": "Caktoni një fjalëkalim të rri llogarie…",
+    "Set a new account password...": "Caktoni një fjalëkalim të ri llogarie…",
     "Email addresses": "Adresa email",
     "Phone numbers": "Numra telefonash",
     "Language and region": "Gjuhë dhe rajon",
     "Theme": "Temë",
     "Account management": "Administrim llogarish",
     "Deactivating your account is a permanent action - be careful!": "Çaktivizimi i llogarisë tuaj është një veprim i pakthyeshëm - hapni sytë!",
-    "For help with using Riot, click <a>here</a>.": "Për ndihmë rreth përdorimit të Riot-it, klikoni <a>këtu</a>.",
-    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "Për ndihmë rreth përdorimit të Riot-it, klikoni <a>këtu</a>, ose nisni një fjalosje me robotin tonë duke përdorur butonin më poshtë.",
+    "For help with using %(brand)s, click <a>here</a>.": "Për ndihmë rreth përdorimit të %(brand)s-it, klikoni <a>këtu</a>.",
+    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "Për ndihmë rreth përdorimit të %(brand)s-it, klikoni <a>këtu</a>, ose nisni një fjalosje me robotin tonë duke përdorur butonin më poshtë.",
     "Help & About": "Ndihmë & Rreth",
     "Bug reporting": "Njoftim të metash",
     "FAQ": "FAQ",
@@ -1119,7 +1024,6 @@
     "Timeline": "Rrjedhë Kohore",
     "Autocomplete delay (ms)": "Vonesë Vetëplotësimi (ms)",
     "Roles & Permissions": "Role & Leje",
-    "To link to this room, please add an alias.": "Që të bëni lidhje për te kjo dhomë, ju lutemi, shtoni një alias.",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Ndryshime se cilët mund të lexojnë historikun do të vlejnë vetëm për mesazhe të ardhshëm në këtë dhomë. Dukshmëria e historikut ekzistues nuk do të ndryshohet.",
     "Security & Privacy": "Siguri & Privatësi",
     "Encryption": "Fshehtëzim",
@@ -1137,21 +1041,14 @@
     "Room Name": "Emër Dhome",
     "Room Topic": "Temë Dhome",
     "Join": "Bëhuni pjesë",
-    "Use Legacy Verification (for older clients)": "Përdor Verifikim të Dikurshëm (për klientë të vjetër)",
-    "Verify by comparing a short text string.": "Verifikoje duke krahasuar një varg të shkurtër teksti.",
-    "Begin Verifying": "Po verifikohet",
-    "Waiting for partner to accept...": "Po pritet pranimi nga partneri…",
-    "Use two-way text verification": "Përdor verifikim të anasjelltë me tekst",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifikojeni këtë përdorues që t’i vihet shenjë si i besuar. Përdoruesit e besuar ju më tepër siguri kur përdorni mesazhe të fshehtëzuar skaj-më-skaj.",
     "Waiting for partner to confirm...": "Po pritet ripohimi nga partneri…",
     "Incoming Verification Request": "Kërkesë Verifikimi e Ardhur",
     "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.": "Për të na ndihmuar të shmangim çështje të përsëdytura, ju lutemi, së pari <existingIssuesLink>shihni çështjet ekzistuese</existingIssuesLink> (dhe shtoni një +1) ose <newIssueLink>krijoni një çështje të re</newIssueLink>, nëse nuk gjeni gjë.",
     "Report bugs & give feedback": "Njoftoni të meta & jepni përshtypjet",
     "Go back": "Kthehu mbrapsht",
-    "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "Nuk u shfshehtëzua dot kopjeruajtja me këtë kyç: ju lutemi, verifikoni që dhatë kyçin e duhur të rimarrjeve.",
     "Update status": "Përditëso gendjen",
     "Set status": "Caktojini gjendjen",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "Mund të përdorni mundësitë mbi shërbyes vetjak, për të bërë hyrjen në shërbyes të tjerë Matrix, duke dhënë URL-në e një tjetër shërbyesi Home. Kjo ju lejon ta përdorni këtë aplikacion në një tjetër shërbyes Home, me një llogari ekzistuese Matrix.",
     "Your Modular server": "Shërbyesi juaj Modular",
     "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of <a>modular.im</a>.": "Jepni vendndodhjen e shërbyesit tuaj Home Modular. Mund të përdorë emrin e përkatësisë tuaj ose të jetë një nënpërkatësi e <a>modular.im</a>.",
     "Server Name": "Emër Shërbyesi",
@@ -1242,10 +1139,7 @@
     "Anchor": "Spirancë",
     "Headphones": "Kufje",
     "Folder": "Dosje",
-    "Chat with Riot Bot": "Fjalosuni me Robotin Riot",
-    "Recovery Key Mismatch": "Mospërputhje Kyçesh Rimarrjeje",
-    "Incorrect Recovery Passphrase": "Frazëkalim Rimarrjeje i Pasaktë",
-    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "S’u shfshehtëzua dot kopjeruajtja me këtë frazëkalim: ju lutemi, verifikoni që dhatë frazëkalimin e duhur të rimarrjeve.",
+    "Chat with %(brand)s Bot": "Fjalosuni me Robotin %(brand)s",
     "This homeserver would like to make sure you are not a robot.": "Ky Shërbyes Home do të donte të sigurohej se s’jeni robot.",
     "Change": "Ndërroje",
     "Couldn't load page": "S’u ngarkua dot faqja",
@@ -1278,22 +1172,14 @@
     "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Kopjeruajini kyçet tuaj në mënyrë të sigurt, për të shmangur humbjen e tyre. <a>Mësoni më tepër.</a>",
     "Not now": "Jo tani",
     "Don't ask me again": "Mos më pyet sërish",
-    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "S’duket gjë? Jo të tërë klientët mbulojnë verifikim ndërveprues ende. <button>Përdorni verifikimin në stil të vjetër</button>.",
     "I don't want my encrypted messages": "Nuk i dua mesazhet e mia të fshehtëzuar",
     "Manually export keys": "Eksporto dorazi kyçet",
     "You'll lose access to your encrypted messages": "Do të humbni hyrje te mesazhet tuaj të fshehtëzuar",
     "Are you sure you want to sign out?": "Jeni i sigurt se doni të dilni?",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Kujdes</b>: duhet të ujdisni kopjeruajtje kyçesh vetëm nga një kompjuter i besuar.",
     "Hide": "Fshihe",
-    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "Do të depozitojmë në shërbyesin tonë një kopje të fshehtëzuar të kyçeve tuaj. Mbrojeni kopjeruajtjen tuaj me një frazëkalim, për ta mbajtur të parrezikuar.",
     "For maximum security, this should be different from your account password.": "Për maksimumin e sigurisë, ky do të duhej të ishte i ndryshëm nga fjalëkalimi juaj për llogarinë.",
-    "Set up with a Recovery Key": "Rregullojeni me një Kyç Rimarrjesh",
-    "Please enter your passphrase a second time to confirm.": "Ju lutemi, që të ripohohet, rijepeni frazëkalimin tuaj.",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Kyçi juaj i rimarrjeve është një masë sigurie - mund ta përdorni për rimarrje hyrjeje te mesazhet tuaj të fshehtëzuar, nëse harroni frazëkalimin tuaj.",
     "Your keys are being backed up (the first backup could take a few minutes).": "Kyçet tuaj po kopjeruhen (kopjeruajtja e parë mund të hajë disa minuta).",
-    "Secure your backup with a passphrase": "Sigurojeni kopjeruajtjen tuaj me një frazëkalim",
-    "Confirm your passphrase": "Ripohoni frazëkalimin tuaj",
-    "Recovery key": "Kyç rimarrjesh",
     "Success!": "Sukses!",
     "Allow Peer-to-Peer for 1:1 calls": "Lejo Peer-to-Peer për thirrje tek për tek",
     "Credits": "Kredite",
@@ -1303,15 +1189,10 @@
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s çaktivizoi flair-in për %(groups)s në këtë dhomë.",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s aktivizoi flair-in për %(newGroups)s dhe çaktivizoi flair-in për %(oldGroups)s në këtë dhomë.",
     "Show read receipts sent by other users": "Shfaq dëftesa leximi dërguar nga përdorues të tjerë",
-    "Order rooms in the room list by most important first instead of most recent": "Renditi dhomat te lista e dhomave sipas më të rëndësishmeve së pari, në vend se më të freskëtave",
     "Scissors": "Gërshërë",
     "Pin": "Fiksoje",
     "Error updating main address": "Gabim gjatë përditësimit të adresës kryesore",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Pati një gabim në përditësimin e adresës kryesore të dhomës. Mund të mos lejohet nga shërbyesi ose mund të ketë ndodhur një gabim i përkohshëm.",
-    "Error creating alias": "Gabim në krijim aliasi",
-    "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "Pati një gabim gjatë krijimit të atij alias-i. Mund të mos lejohet nga shërbyesi ose mund të ketë ndodhur një dështim i përkohshëm.",
-    "Error removing alias": "Gabim në heqje aliasi",
-    "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "Pati një gabim gjatë heqjes së atij aliasi. Mund të mos ekzistojë më, ose mund të ketë ndodhur një gabim i përkohshëm.",
     "Error updating flair": "Gabim gjatë përditësimit të flair-it",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Pati një gabim me përditësimin e flair-it për këtë dhomë. Shërbyesi mund të mos e lejojë ose mund të ketë ndodhur një gabim i përkohshëm.",
     "Room Settings - %(roomName)s": "Rregullime Dhome - %(roomName)s",
@@ -1347,8 +1228,7 @@
     "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>": "Pasi të aktivizohet, fshehtëzimi për një dhomë nuk mund të çaktivizohet. Mesazhet e dërguar në një dhomë të fshehtëzuar s’mund të shihen nga shërbyesi, vetëm nga pjesëmarrësit në dhomë. Aktivizimi i fshehtëzimit mund të pengojë funksionimin si duhet të mjaft robotëve dhe urave. <a>Mësoni më tepër rreth fshehtëzimit.</a>",
     "Want more than a community? <a>Get your own server</a>": "Doni më shumë se një bashkësi? <a>Merrni një shërbyes tuajin</a>",
     "Power level": "Shkallë pushteti",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Për funksionimin më të mirë, ju lutemi, instaloni <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, ose <safariLink>Safari</safariLink>.",
-    "A conference call could not be started because the integrations server is not available": "S’u nis dot një thirrje konferencë, ngaqë shërbyesi i integrimit s’është i kapshëm",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Ju lutemi, për funksionimin më të mirë, instaloni <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, ose <safariLink>Safari</safariLink>.",
     "Replying With Files": "Përgjigje Me Kartela",
     "The file '%(fileName)s' failed to upload.": "Dështoi ngarkimi i kartelës '%(fileName)s'.",
     "Name or Matrix ID": "Emër ose ID Matrix-i",
@@ -1382,7 +1262,7 @@
     "Failed to revoke invite": "S’u arrit të shfuqizohej ftesa",
     "Revoke invite": "Shfuqizoje ftesën",
     "Invited by %(sender)s": "Ftuar nga %(sender)s",
-    "edited": "përpunoi",
+    "edited": "e përpunuar",
     "Maximize apps": "Maksimizoni aplikacione",
     "Rotate Left": "Rrotulloje Majtas",
     "Rotate counter-clockwise": "Rrotulloje në kah kundërorar",
@@ -1416,7 +1296,7 @@
     "Enter username": "Jepni emër përdoruesi",
     "Some characters not allowed": "Disa shenja nuk lejohen",
     "Create your Matrix account on <underlinedServerName />": "Krijoni llogarinë tuaj Matrix te <underlinedServerName />",
-    "Riot failed to get the public room list.": "Riot-i s’arriti të merrte listën e dhomave publike.",
+    "%(brand)s failed to get the public room list.": "%(brand)s-i s’arriti të merrte listën e dhomave publike.",
     "The homeserver may be unavailable or overloaded.": "Shërbyesi Home mund të jetë i pakapshëm ose i mbingarkuar.",
     "Add room": "Shtoni dhomë",
     "Your profile": "Profili juaj",
@@ -1457,12 +1337,11 @@
     "A widget would like to verify your identity": "Një widget do të donte të verifikonte identitetin tuaj",
     "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.": "Një widget që gjendet te %(widgetUrl)s do të donte të verifikonte identitetin tuaj. Përmes lejimit të kësaj, widget-i do të jetë në gjendje të verifiojë ID-në tuaj të përdoruesit, por pa mundur të kryejë veprime në këmbë tuajën.",
     "Unable to validate homeserver/identity server": "S’arrihet të vleftësohet shërbyesi Home/shërbyesi i identiteteve",
-    "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot-i s’arriti të merrte listë protokollesh nga shërbyesi Home. Shërbyesi Home mund të jetë shumë i vjetër për mbulim rrjetesh nga palë të treta.",
+    "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s-i s’arriti të merrte listë protokollesh nga shërbyesi Home. Shërbyesi Home mund të jetë shumë i vjetër për mbulim rrjetesh nga palë të treta.",
     "You have %(count)s unread notifications in a prior version of this room.|other": "Keni %(count)s njoftime të palexuar në një version të mëparshëm të kësaj dhome.",
     "You have %(count)s unread notifications in a prior version of this room.|one": "Keni %(count)s njoftim të palexuar në një version të mëparshëm të kësaj dhome.",
     "Invalid base_url for m.identity_server": "Parametër base_url i i pavlefshëm për m.identity_server",
     "Identity server URL does not appear to be a valid identity server": "URL-ja e shërbyesit të identiteteve s’duket të jetë një shërbyes i vlefshëm identitetesh",
-    "Show recently visited rooms above the room list": "Dhomat e vizituara së fundi shfaqi sipër listës së dhomave",
     "Uploaded sound": "U ngarkua tingull",
     "Sounds": "Tinguj",
     "Notification sound": "Tingull njoftimi",
@@ -1470,8 +1349,8 @@
     "Browse": "Shfletoni",
     "Cannot reach homeserver": "S’kapet dot shërbyesi Home",
     "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 Riot is misconfigured": "Riot-i juaj është i keqformësuar",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Kërkojini përgjegjësit të Riot-it tuaj të kontrollojë <a>formësimin tuaj</a> për zëra të pasaktë ose të përsëdytur.",
+    "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",
     "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",
@@ -1588,10 +1467,10 @@
     "Deactivate user": "Çaktivizoje përdoruesin",
     "An error (%(errcode)s) was returned while trying to validate your invite. You could try to pass this information on to a room admin.": "U shkaktua një gabim (%(errcode)s) teksa provohej të vleftësohej ftesa juaj. Mund të provonit t’ia jepni një përgjegjësi dhome këtë informacion.",
     "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Kjo ftesë për %(roomName)s u dërgua te %(email)s që s’është i përshoqëruar me llogarinë tuaj",
-    "Link this email with your account in Settings to receive invites directly in Riot.": "Që të merrni ftesa drejt e në Riot, lidheni këtë email me llogarinë tuaj, te Rregullimet.",
+    "Link this email with your account in Settings to receive invites directly in %(brand)s.": "Që të merrni ftesa drejt e në %(brand)s, lidheni këtë email me llogarinë tuaj, te Rregullimet.",
     "This invite to %(roomName)s was sent to %(email)s": "Kjo ftesë për %(roomName)s u dërgua te %(email)s",
-    "Use an identity server in Settings to receive invites directly in Riot.": "Që të merrni ftesa drejt e në Riot, përdorni një shërbyes identitetesh, te Rregullimet.",
-    "Share this email in Settings to receive invites directly in Riot.": "Që të merrni ftesa drejt e te Riot, ndajeni me të tjerët këtë email, te Rregullimet.",
+    "Use an identity server in Settings to receive invites directly in %(brand)s.": "Që të merrni ftesa drejt e në %(brand)s, përdorni një shërbyes identitetesh, te Rregullimet.",
+    "Share this email in Settings to receive invites directly in %(brand)s.": "Që të merrni ftesa drejt e te %(brand)s, ndajeni me të tjerët këtë email, te Rregullimet.",
     "Error changing power level": "Gabim në ndryshimin e shkallës së pushtetit",
     "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Ndodhi një gabim gjatë ndryshimit të shkallës së pushtetit të përdoruesit. Sigurohuni se keni leje të mjaftueshme dhe riprovoni.",
     "Bold": "Të trasha",
@@ -1627,14 +1506,9 @@
     "Read Marker lifetime (ms)": "Kohëzgjatje e Shenjës së Leximit (ms)",
     "Read Marker off-screen lifetime (ms)": "Kohëzgjatje Shenje Leximi jashtë ekrani (ms)",
     "Verify the link in your inbox": "Verifikoni lidhjen te mesazhet tuaj",
-    "Room alias": "Alias dhome",
     "e.g. my-room": "p.sh., dhoma-ime",
-    "Please provide a room alias": "Ju lutemi, jepni një alias dhome",
-    "This alias is available to use": "Ky alias është i lirë të përdoret",
-    "This alias is already in use": "Ky alias është i përdorur tashmë",
     "Close dialog": "Mbylle dialogun",
     "Please enter a name for the room": "Ju lutemi, jepni një emër për dhomën",
-    "Set a room alias to easily share your room with other people.": "Caktoni një alias dhome për t’ua dhënë lehtësisht dhomën tuaj personave të tjerë.",
     "This room is private, and can only be joined by invitation.": "Kjo dhomë është private dhe në të mund të hyhet vetëm me ftesë.",
     "Create a public room": "Krijoni një dhomë publike",
     "Create a private room": "Krijoni një dhomë private",
@@ -1721,7 +1595,6 @@
     "Error adding ignored user/server": "Gabim shtimi përdoruesi/shërbyesi të shpërfillur",
     "Something went wrong. Please try again or view your console for hints.": "Diç shkoi ters. Ju lutemi, riprovoni ose, për ndonjë ide, shihni konsolën tuaj.",
     "Error subscribing to list": "Gabim pajtimi te lista",
-    "Please verify the room ID or alias and try again.": "Ju lutemi, verifikoni ID-në ose aliasin e dhomës dhe riprovoni.",
     "Error removing ignored user/server": "Gabim në heqje përdoruesi/shërbyes të shpërfillur",
     "Error unsubscribing from list": "Gabim shpajtimi nga lista",
     "Please try again or view your console for hints.": "Ju lutemi, riprovoni, ose shihni konsolën tuaj, për ndonjë ide.",
@@ -1736,7 +1609,7 @@
     "View rules": "Shihni rregulla",
     "You are currently subscribed to:": "Jeni i pajtuar te:",
     "⚠ These settings are meant for advanced users.": "⚠ Këto rregullime janë menduar për përdorues të përparuar.",
-    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "Shtoni këtu përdorues dhe shërbyes që doni të shpërfillen. Që Riot të kërkojë për përputhje me çfarëdo shkronjash, përdorni yllthin. Për shembull, <code>@bot:*</code> do të shpërfillë krej përdoruesit që kanë emrin 'bot' në çfarëdo shërbyesi.",
+    "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.": "Shtoni këtu përdorues dhe shërbyes që doni të shpërfillen. Që %(brand)s të kërkojë për përputhje me çfarëdo shkronjash, përdorni yllthin. Për shembull, <code>@bot:*</code> do të shpërfillë krej përdoruesit që kanë emrin 'bot' në çfarëdo shërbyesi.",
     "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.": "Shpërfillja e personave kryhet përmes listash dëbimi, të cilat përmbajnë rregulla se cilët të dëbohen. Pajtimi te një listë dëbimesh do të thotë se përdoruesit/shërbyesit e bllokuar nga ajo listë do t’ju fshihen juve.",
     "Personal ban list": "Listë personale dëbimesh",
     "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.": "Lista juaj personale e dëbimeve mban krejt përdoruesit/shërbyesit prej të cilëve ju personalisht s’dëshironi të shihni mesazhe. Pas shpërfilljes së përdoruesit/shërbyesit tuaj të parë, te lista juaj e dhomave do të shfaqet një dhomë e re e quajtur 'Lista Ime e Dëbimeve' - qëndroni në këtë dhomë që ta mbani listën e dëbimeve në fuqi.",
@@ -1745,7 +1618,6 @@
     "Subscribed lists": "Lista me pajtim",
     "Subscribing to a ban list will cause you to join it!": "Pajtimi te një listë dëbimesh do të shkaktojë pjesëmarrjen tuaj në të!",
     "If this isn't what you want, please use a different tool to ignore users.": "Nëse kjo s’është ajo çka doni, ju lutemi, përdorni një tjetër mjet për të shpërfillur përdorues.",
-    "Room ID or alias of ban list": "ID dhome ose alias e listës së dëbimeve",
     "Subscribe": "Pajtohuni",
     "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "E keni shpërfillur këtë përdorues, ndaj mesazhi i tij është fshehur. <a>Shfaqe, sido qoftë.</a>",
     "Custom (%(level)s)": "Vetjak (%(level)s)",
@@ -1761,7 +1633,7 @@
     "Your avatar URL": "URL-ja e avatarit tuaj",
     "Your user ID": "ID-ja juaj e përdoruesit",
     "Your theme": "Tema juaj",
-    "Riot URL": "URL Riot-i",
+    "%(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.",
@@ -1782,22 +1654,19 @@
     "Integrations are disabled": "Integrimet janë të çaktivizuara",
     "Enable 'Manage Integrations' in Settings to do this.": "Që të bëhet kjo, aktivizoni “Administroni Integrime”, te Rregullimet.",
     "Integrations not allowed": "Integrimet s’lejohen",
-    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Riot-i juah nuk ju lejon të përdorni një Përgjegjës Integrimesh për të bërë këtë. Ju lutemi, lidhuni me përgjegjësin.",
+    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "%(brand)s-i juah nuk ju lejon të përdorni një Përgjegjës Integrimesh për të bërë këtë. Ju lutemi, lidhuni me përgjegjësin.",
     "Reload": "Ringarkoje",
     "Take picture": "Bëni një foto",
     "Remove for everyone": "Hiqe për këdo",
     "Remove for me": "Hiqe për mua",
     "Verification Request": "Kërkesë Verifikimi",
-    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
     "Error upgrading room": "Gabim në përditësim dhome",
     "Double check that your server supports the room version chosen and try again.": "Rikontrolloni që shërbyesi juaj e mbulon versionin e zgjedhur për dhomën dhe riprovoni.",
     "%(senderName)s placed a voice call.": "%(senderName)s bëri një thirrje zanore.",
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s bëri një thirrje zanore. (e pambuluar nga ky shfletues)",
     "%(senderName)s placed a video call.": "%(senderName)s bëri një thirrje video.",
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s bëri një thirrje video. (e pambuluar nga ky shfletues)",
-    "Enable local event indexing and E2EE search (requires restart)": "Aktivizoni indeksim aktesh vendore dhe kërkim E2EE (lyp rinisje)",
     "Match system theme": "Përputhe me temën e sistemit",
-    "Send cross-signing keys to homeserver": "Dërgo te shërbyesi Home kyçe <em>cross-signing</em>",
     "Cross-signing public keys:": "Kyçe publikë për <em>cross-signing</em>:",
     "not found": "s’u gjet",
     "in secret storage": "në depozitë të fshehtë",
@@ -1815,27 +1684,16 @@
     "Upgrade private room": "Përmirëso dhomë private",
     "Upgrade public room": "Përmirëso dhomë publike",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Përmirësimi i një dhome është një veprim i thelluar dhe zakonisht rekomandohet kur një dhomë është e papërdorshme, për shkak të metash, veçorish që i mungojnë ose cenueshmëri sigurie.",
-    "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Kjo zakonisht prek vetëm mënyrën se si përpunohet dhoma te shërbyesi. Nëse keni probleme me Riot-in, ju lutemi, <a>njoftoni një të metë</a>.",
+    "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>.": "Kjo zakonisht prek vetëm mënyrën se si përpunohet dhoma te shërbyesi. Nëse keni probleme me %(brand)s-in, ju lutemi, <a>njoftoni një të metë</a>.",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Do ta përmirësoni këtë dhomë nga <oldVersion /> në <newVersion />.",
     "Upgrade": "Përmirësoje",
-    "Enter secret storage passphrase": "Jepni frazëkalim për te depozitë e fshehtë",
-    "Unable to access secret storage. Please verify that you entered the correct passphrase.": "S’arrihet të hyhet te depozitë e fshehtë. Ju lutemi, verifikoni se dhatë frazëkalimin e saktë.",
-    "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>Kujdes</b>: Duhet të hyni në depozitën e fshehtë vetëm nga një kompjuter i besuar.",
-    "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Nëse keni harruar frazëkalimin tuaj, mund të <button1>përdorni kyçin tuaj të rimarrjes</button1> ose <button2>të ujdisni mundësi të reja rimarrjeje</button2>.",
-    "Enter secret storage recovery key": "Jepni kyç rimarrjeje për depozitë të fshehtë",
-    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "S’arrihet të hyhet te depozitë e fshehtë. Ju lutemi, verifikoni se dhatë kyç të saktë rimarrjeje.",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "Nëse keni harruar kyçin tuaj të rimarrjeve, mund të <button>ujdisni mundësi të reja rimarrjeje</button>.",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Kujdes</b>: duhet të ujdisni kopjeruajtje kyçesh vetëm nga një kompjuter i besuar.",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "Nëse keni harruar kyçin tuaj të rimarrjeve, mund të <button>ujdisni mundësi të reja rimarrjeje</button>",
     "Notification settings": "Rregullime njoftimesh",
     "User Status": "Gjendje Përdoruesi",
     "Set up with a recovery key": "Rregullojeni me një kyç rimarrjesh",
-    "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "Si masë sigurie, mund ta përdorni për të rifituar hyrjen tuaj te mesazhe të fshehtëzuar, nëse harroni frazëkalimin tuaj.",
-    "As a safety net, you can use it to restore your access to encrypted messages.": "Si një masë sigurie, mund ta përdorni për të rifituar hyrjen tuaj te mesazhe të fshehtëzuar.",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "Mbajeni kyçin tuaj të rimarrjeve diku në një vend shumë të sigurt, bie fjala, nën një përgjegjës fjalëkalimesh (ose në një kasafortë).",
     "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Kyçi juaj i rimarrjeve është <b>kopjuar te e papastra juaj</b>, ngjiteni te:",
     "Your recovery key is in your <b>Downloads</b> folder.": "Kyçi juaj i rimarrjeve gjendet te dosja juaj <b>Shkarkime</b>.",
-    "Storing secrets...": "Po depozitohen të fshehta…",
     "Unable to set up secret storage": "S’u arrit të ujdiset depozitë e fshehtë",
     "%(senderName)s removed the rule banning users matching %(glob)s": "%(senderName)s hoqi rregullin për dëbim përdoruesish që kanë përputhje me %(glob)s",
     "%(senderName)s removed the rule banning rooms matching %(glob)s": "%(senderName)s hoqi rregullin që dëbon dhoma që kanë përputhje me %(glob)s",
@@ -1873,11 +1731,6 @@
     "Country Dropdown": "Menu Hapmbyll Vendesh",
     "Show info about bridges in room settings": "Shfaq te rregullime dhome të dhëna rreth urash",
     "This bridge is managed by <user />.": "Kjo urë administrohet nga <user />.",
-    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s shtoi %(addedAddresses)s dhe dhe %(count)s adresa të tjera te kjo dhomë",
-    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s hoqi %(removedAddresses)s dhe %(count)s adresa të tjera nga kjo dhomë",
-    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s hoqi %(countRemoved)s dhe shtoi %(countAdded)s adresa te kjo dhomë",
-    "%(senderName)s turned on end-to-end encryption.": "%(senderName)s aktivizoi fshehtëzimin skaj-më-skaj.",
-    "%(senderName)s turned on end-to-end encryption (unrecognised algorithm %(algorithm)s).": "%(senderName)s aktivizoi fshehtëzimin skaj-më-skaj (algoritëm jo i pranuar %(algorithm)s).",
     "a few seconds ago": "pak sekonda më parë",
     "about a minute ago": "rreth një minutë më parë",
     "%(num)s minutes ago": "%(num)s minuta më parë",
@@ -1892,7 +1745,6 @@
     "%(num)s hours from now": "%(num)s orë nga tani",
     "about a day from now": "rreth një ditë nga tani",
     "%(num)s days from now": "%(num)s ditë nga tani",
-    "Show a presence dot next to DMs in the room list": "Shfaqni një pikë pranie në krah DM-sh te lista e dhomave",
     "Other users may not trust it": "Përdorues të tjerë mund të mos e besojnë",
     "Later": "Më vonë",
     "Cross-signing and secret storage are enabled.": "<em>Cross-signing</em> dhe depozitimi i fshehtë janë aktivizuar.",
@@ -1921,10 +1773,6 @@
     "Failed to find the following users": "S’u arrit të gjendeshin përdoruesit vijues",
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "Përdoruesit vijues mund të mos ekzistojnë ose janë të pavlefshëm, dhe s’mund të ftohen: %(csvNames)s",
     "Suggestions": "Sugjerime",
-    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "Nëse s’gjeni dot dikë, kërkojini emrin e tij të përdoruesit, tregojuni emrin tuaj të përdoruesit (%(userId)s) ose <a>lidhjen e profilit</a>.",
-    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "Nëse s’gjeni dot dikë, kërkojini emrin e tij të përdoruesit (p.sh., @përdorues:shërbyes.com) ose <a>tregojuni këtë dhomë</a>.",
-    "Complete security": "Siguri të plotë",
-    "Verify this session to grant it access to encrypted messages.": "Verifikojeni këtë sesion që t’i akordohet hyrje te mesazhe të fshehtëzuar.",
     "Start": "Nise",
     "Session verified": "Sesion i verifikuar",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Sesioni juaj i ri tani është i verifikuar. Ka hyrje te mesazhet tuaj të fshehtëzuar dhe përdoruesit e tjerë do ta shohin si të besuar.",
@@ -1933,14 +1781,8 @@
     "Restore": "Riktheje",
     "Enter your account password to confirm the upgrade:": "Që të ripohohet përmirësimi, jepni fjalëkalimin e llogarisë tuaj:",
     "You'll need to authenticate with the server to confirm the upgrade.": "Do t’ju duhet të bëni mirëfilltësimin me shërbyesin që të ripohohet përmirësimi.",
-    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "Sigurojini kyçet tuaj të fshehtëzimit me një frazëkalim. Për siguri maksimale, ky do të duhej të ishte i ndryshëm nga fjalëkalimi për llogarinë tuaj:",
-    "Enter a passphrase": "Jepni një frazëkalim",
-    "Enter your passphrase a second time to confirm it.": "Që të ripohohet, jepeni edhe një herë frazëkalimin tuaj.",
-    "Verify other users in their profile.": "Verifikoni përdorues të tjerë në profilin e tyre.",
     "Upgrade your encryption": "Përmirësoni fshehtëzimin tuaj",
     "Set up encryption": "Ujdisni fshehtëzim",
-    "Encryption upgraded": "U përmirësua fshehtëzimi",
-    "Encryption setup complete": "Ujdisje fshehtëzimit e plotësuar",
     "Verify this session": "Verifikoni këtë sesion",
     "Encryption upgrade available": "Ka të gatshëm përmirësim fshehtëzimi",
     "Review": "Shqyrtojeni",
@@ -1951,38 +1793,26 @@
     "Manage": "Administroni",
     "Securely cache encrypted messages locally for them to appear in search results.": "Ruaj lokalisht në mënyrë të sigurt në fshehtinë mesazhet që të shfaqen në përfundime kërkimi.",
     "Enable": "Aktivizoje",
-    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Riot-it i mungojnë disa përbërës të domosdoshëm për ruajtje lokalisht në mënyrë të sigurt në fshehtinë mesazhe. Nëse do të donit të eksperimentonit me këtë veçori, montoni një Desktop vetjak Riot Desktop me <nativeLink>shtim përbërësish kërkimi</nativeLink>.",
-    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot-i s’mund të ruajë lokalisht në mënyrë të sigurt mesazhe në fshehtinë teksa xhirohet nën shfletues. Që mesazhet e fshehtëzuar të shihen në përfundime kërkimi, përdorni <riotLink>Riot Desktop</riotLink>.",
+    "%(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-it i mungojnë disa përbërës të domosdoshëm për ruajtje lokalisht në mënyrë të sigurt në fshehtinë mesazhe. Nëse do të donit të eksperimentonit me këtë veçori, montoni një Desktop vetjak %(brand)s Desktop me <nativeLink>shtim përbërësish kërkimi</nativeLink>.",
     "Message search": "Kërkim mesazhesh",
     "If disabled, messages from encrypted rooms won't appear in search results.": "Në u çaktivizoftë, mesazhet prej dhomash të fshehtëzuara s’do të duken në përfundime kërkimi.",
     "Disable": "Çaktivizoje",
-    "Not currently downloading messages for any room.": "Aktualisht s’po shkarkohen mesazhe për ndonjë dhomë.",
-    "Downloading mesages for %(currentRoom)s.": "Po shkarkohen mesazhe për %(currentRoom)s.",
-    "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot-i po ruan lokalisht në mënyrë të sigurt në fshehtinë mesazhet që të shfaqen në përfundime kërkimi:",
+    "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s-i po ruan lokalisht në mënyrë të sigurt në fshehtinë mesazhet që të shfaqen në përfundime kërkimi:",
     "Space used:": "Hapësirë e përdorur:",
     "Indexed messages:": "Mesazhe të indeksuar:",
-    "Number of rooms:": "Numër dhomash:",
-    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Në këtë dhomë ka sesione të panjohur: nëse vazhdoni pa i verifikuar ata, për dikë do të jetë e mundur të përgjojë thirrjen tuaj.",
     "If you cancel now, you won't complete verifying the other user.": "Nëse e anuloni tani, s’do të plotësoni verifikimin e përdoruesit tjetër.",
     "If you cancel now, you won't complete verifying your other session.": "Nëse e anuloni tani, s’do të plotësoni verifikimin e sesionit tuaj tjetër.",
-    "If you cancel now, you won't complete your secret storage operation.": "Nëse e anuloni tani, s’do të plotësoni veprimin tuaj për depozitë të fshehtë.",
     "Cancel entering passphrase?": "Të anulohet dhënue frazëkalimi?",
     "Setting up keys": "Ujdisje kyçesh",
-    "Unverified session": "Sesion i paverifikuar",
     "Verifies a user, session, and pubkey tuple": "Verifikon një përdorues, sesion dhe një set kyçesh publikë",
     "Unknown (user, session) pair:": "Çift (përdorues, sesion) i panjohur:",
     "Session already verified!": "Sesion i tashmë i verifikuar!",
     "WARNING: Session already verified, but keys do NOT MATCH!": "KUJDES: Sesion tashmë i verifikuar, por kyçet NUK PËRPUTHEN!",
     "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!": "KUJDES: VERIFIKIMI I KYÇIT DËSHTOI! Kyçi i nënshkrimit për %(userId)s dhe sesionin %(deviceId)s është \"%(fprint)s\", që nuk përputhet me kyçin e dhënë \"%(fingerprint)s\". Kjo mund të jetë shenjë se komunikimet tuaja po përgjohen!",
     "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Kyçi i nënshkrimit që dhatë përputhet me kyçin e nënshkrimit që morët nga sesioni i %(userId)s %(deviceId)s. Sesionit iu vu shenjë si i verifikuar.",
-    "Enable cross-signing to verify per-user instead of per-session (in development)": "Aktivizoni <em>cross-signing</em> për të verifikuar me bazë përdorues në vend se me bazë sesioni (në zhvillim)",
-    "Show padlocks on invite only rooms": "Për dhoma vetëm me ftesa shfaq dryna",
     "Never send encrypted messages to unverified sessions from this session": "Mos dërgo kurrë prej këtij sesioni mesazhe të fshehtëzuar te sesione të paverifikuar",
     "Never send encrypted messages to unverified sessions in this room from this session": "Mos dërgo kurrë prej këtij sesioni mesazhe të fshehtëzuar te sesione të paverifikuar në këtë dhomë",
-    "Keep secret storage passphrase in memory for this session": "Për këtë sesion, frazëkalimin e depozitës së fshehtë mbaje në kujtesë",
     "How fast should messages be downloaded.": "Sa shpejt duhen shkarkuar mesazhet.",
-    "Confirm the emoji below are displayed on both devices, in the same order:": "Ripohoni që emoji-t më poshtë shfaqen në të dyja pajisjet, në të njëjtën radhë:",
-    "Verify this device by confirming the following number appears on its screen.": "Verifikojeni këtë pajisje duke ripohuar shfaqjen e numrit vijues në skenën e tij.",
     "Waiting for %(displayName)s to verify…": "Po pritet për %(displayName)s të verifikojë…",
     "They match": "Përputhen",
     "They don't match": "S’përputhen",
@@ -2012,14 +1842,12 @@
     "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "Kopjeruajtja ka një nënshkrim të <validity>pavlefshëm</validity> prej sesioni të <verify>paverifikuar</verify> <device></device>",
     "Backup is not signed by any of your sessions": "Kopjeruajtja s’është nënshkruar nga ndonjë prej sesioneve tuaj",
     "This backup is trusted because it has been restored on this session": "Kjo kopjeruajtje është e besuar, ngaqë është rikthyer në këtë sesion",
-    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "Kyçi i kopjeruajtjeve u depozitua në depozitë të fshehtë, po kjo veçori s’është e aktivizuar në këtë sesion. Ju lutemi, aktivizoni në Labs <em>cross-signing</em> që të modifikoni gjendje kopjeruatjeje kyçesh.",
     "Your keys are <b>not being backed up from this session</b>.": "Kyçet tuaj <b>nuk po kopjeruhen nga ky sesion</b>.",
     "Enable desktop notifications for this session": "Aktivizo njoftime desktop për këtë sesion",
     "Enable audible notifications for this session": "Aktivizo njoftime audio për këtë sesion",
     "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "Fjalëkalimi juaj u ndryshua me sukses. Nuk do të merrni njoftime push në sesionet tuaj të tjerë, veç në hyfshi sërish në llogarinë tuaj në to",
     "Session ID:": "ID sesioni:",
     "Session key:": "Kyç sesioni:",
-    "Sessions": "Sesione",
     "A session's public name is visible to people you communicate with": "Emri publik i një sesioni është i dukshëm për persona me të cilët komunikoni",
     "This room is bridging messages to the following platforms. <a>Learn more.</a>": "Kjo dhomë po kalon mesazhe përmes ure te platformat vijuese. <a>Mësoni më tepër.</a>",
     "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "Kjo dhomë s’kalon mesazhe përmes ure te ndonjë platformë. <a>Mësoni më tepër.</a>",
@@ -2028,10 +1856,6 @@
     "You have not verified this user.": "S’e keni verifikuar këtë përdorues.",
     "You have verified this user. This user has verified all of their sessions.": "E keni verifikuar këtë përdorues. Ky përdorues ka verifikuar krejt sesionet e veta.",
     "Someone is using an unknown session": "Dikush po përdor një sesion të panjohur",
-    "Some sessions for this user are not trusted": "Disa sesione për këtë përdorues s’janë të besuar",
-    "All sessions for this user are trusted": "Krejt sesionet për këtë përdorues janë të besuar",
-    "Some sessions in this encrypted room are not trusted": "Disa sesione në këtë dhomë të fshehtëzuar s’janë të besuar",
-    "All sessions in this encrypted room are trusted": "Krejt sesionet në këtë dhomë të fshehtëzuar janë të besuar",
     "Mod": "Moderator",
     "Your key share request has been sent - please check your other sessions for key share requests.": "Kërkesa juaj për shkëmbim kyçesh u dërgua - ju lutemi, kontrolloni sesionet tuaj të tjerë për kërkesa shkëmbimi kyçesh.",
     "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.": "Kërkesat për ndarje kyçesh dërgohen automatikisht te sesionet tuaj të tjerë. Nëse s’e pranuat ose e hodhët tej kërkesën për ndarje kyçesh në sesionet tuaj të tjerë, klikoni këtu që të rikërkoni kyçe për këtë sesion.",
@@ -2039,7 +1863,6 @@
     "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "<requestLink>Rikërkoni kyçe fshehtëzimi</requestLink> prej sesionesh tuaj të tjerë.",
     "Encrypted by an unverified session": "Fshehtëzuar nga një sesion i paverifikuar",
     "Encrypted by a deleted session": "Fshehtëzuar nga një sesion i fshirë",
-    "No sessions with registered encryption keys": "S’ka sesion me kyçe fshehtëzimi të regjistruar",
     "Waiting for %(displayName)s to accept…": "Po pritet për %(displayName)s të pranojë…",
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "Mesazhet tuaj janë të sigurt dhe vetëm ju dhe marrësi kanë kyçet unikë për t’i shkyçur.",
     "Your messages are not secure": "Mesazhet tuaj s’janë të sigurt",
@@ -2057,9 +1880,6 @@
     "If you can't scan the code above, verify by comparing unique emoji.": "Nëse s’e skanoni dot kodin më sipër, verifikojeni duke krahasuar emoji unik.",
     "You've successfully verified %(displayName)s!": "E verifikuat me sukses %(displayName)s!",
     "Got it": "E mora vesh",
-    "Verification timed out. Start verification again from their profile.": "Verifikimit i mbaroi koha. Riniseni verifikimin prej profilit të tij.",
-    "%(displayName)s cancelled verification. Start verification again from their profile.": "%(displayName)s e anuloi verifikimin. Rinisni verifkimin nga profili i tij.",
-    "You cancelled verification. Start verification again from their profile.": "Anuluat verifikimin. Riniseni verifikimin nga profili i tij.",
     "Encryption enabled": "Fshehtëzim i aktivizuar",
     "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Mesazhet në këtë dhomë fshehtëzohen skaj-më-skaj. Mësoni më tepër & verifikoni këtë përdorues në profilin e tij.",
     "Encryption not enabled": "Fshehtëzim jo i aktivizuar",
@@ -2067,61 +1887,39 @@
     "Clear all data in this session?": "Të pastrohen krejt të dhënat në këtë sesion?",
     "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Spastrimi i krejt të dhënave prej këtij sesioni është përfundimtar. Mesazhet e fshehtëzuar do të humbin, veç në qofshin kopjeruajtur kyçet e tyre.",
     "Verify session": "Verifiko sesion",
-    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "Që të verifikohet se ky sesion mund të besohet, ju lutemi, kontrolloni se kyçi që shihni te Rregullime Përdoruesi në atë pajisje të përputhet me kyçin më poshtë:",
-    "To verify that this session can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this session matches the key below:": "Që të verifikoni se këtij sesioni mund t’i zihet besë, ju lutemi, lidhuni me të zotët e saj përmes ndonjë rruge tjetër (p.sh., personalisht, ose përmes një thirrjeje telefonike) dhe pyetini nëse përputhet apo jo kyçi që shohin te Rregullime të tyret të Përdoruesit për këtë pajisje me kyçin më poshtë:",
     "Session name": "Emër sesioni",
     "Session key": "Kyç sesioni",
-    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "Nëse përputhet, shtypni butonin e verifikimit më poshtë. Nëse jo, atëherë dikush tjetër po e përgjon këtë sesion dhe gjasat janë që të doni të shtypni butonin e kalimit në listë bllokimesh.",
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "Verifikimi i këtij përdoruesi do t’i vërë shenjë sesionit të tij si të besuar dhe sesionit tuaj si të besuar për ta.",
     "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.": "Që t’i vihet shenjë si e besuar, verifikojeni këtë pajisje. Besimi i kësaj pajisjeje ju jep juve dhe përdoruesve të tjerë ca qetësi më tepër, kur përdoren mesazhe të fshehtëzuar skaj-më-skaj.",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "Verifikimi i kësaj pajisjeje do të t’i vërë shenjë si të besuar dhe përdoruesit që janë verifikuar me ju do ta besojnë këtë pajisje.",
-    "You added a new session '%(displayName)s', which is requesting encryption keys.": "Shtuat një sesion të ri '%(displayName)s', i cili po kërkon kyçe fshehtëzimi.",
-    "Your unverified session '%(displayName)s' is requesting encryption keys.": "Sesioni juaj i paverifikuar '%(displayName)s' po kërkon kyçe fshehtëzimi.",
-    "Loading session info...": "Po ngarkohen të dhëna sesioni…",
     "New session": "Sesion i ri",
     "Use this session to verify your new one, granting it access to encrypted messages:": "Përdoreni këtë sesion për të verifikuar atë tuajin të ri, duke i akorduar hyrje te mesazhe të fshehtëzuar:",
     "If you didn’t sign in to this session, your account may be compromised.": "Nëse s’bëtë hyrjen te ky sesion, llogaria muaj mund të jetë komprometuar.",
     "This wasn't me": "Ky s’jam unë",
     "This will allow you to return to your account after signing out, and sign in on other sessions.": "Kjo do t’ju lejojë të riktheheni te llogaria juaj pasi të keni bërë daljen, dhe të hyni në sesione të tjerë.",
-    "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "Po kaloni në listë të bllokimesh sesione të paverifikuar; që të dërgoni mesazhe te këta sesione, duhet t’i verifikoni.",
-    "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Këshillojmë të përshkoni procesin e verifikimit për çdo sesion, për t’u bindur se u takojnë të zotëve të ligjshëm, por, nëse parapëlqeni, mund ta dërgoni mesazhin pa verifikuar gjë.",
-    "Room contains unknown sessions": "Dhoma përmban sesione të panjohur",
-    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "\"%(RoomName)s\" përmban sesione që s’i keni parë më parë.",
-    "Unknown sessions": "Sesione të panjohur",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "Për verifikim sesionesh të tjerë përmes dhënies së frazëkalimit tuaj, hyni te historiku i mesazheve tuaj të sigurt dhe identiteti juaj për <em>cross-signing</em>.",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "Për verifikim sesionesh të tjerë përmes dhënies së kyçit tuaj të rimarrjes, hyni te historiku i mesazheve tuaj të sigurt dhe identiteti juaj për <em>cross-signing</em>.",
     "Recovery key mismatch": "Mospërputhje kyçesh rimarrjeje",
     "Incorrect recovery passphrase": "Frazëkalim rimarrjeje i pasaktë",
-    "Backup restored": "Kopjeruajtja u rikthye",
     "Enter recovery passphrase": "Jepni frazëkalim rimarrjesh",
     "Enter recovery key": "Jepni kyç rimarrjesh",
     "Confirm your identity by entering your account password below.": "Ripohoni identitetin tuaj duke dhënë më poshtë fjalëkalimin e llogarisë tuaj.",
-    "Message not sent due to unknown sessions being present": "Mesazhi s’u dërgua, për shkak të pranisë së sesioneve të panjohur",
-    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Shfaq sesione</showSessionsText>, <sendAnywayText>dërgoje sido qoftë</sendAnywayText> ose <cancelText>anuloje</cancelText>.",
     "Your new session is now verified. Other users will see it as trusted.": "Sesioni juaj i ri tani është i verifikuar. Përdoruesit e tjerë do të shohin si të besuar.",
     "Without completing security on this session, it won’t have access to encrypted messages.": "Pa plotësuar sigurinë në këtë sesion, s’do të ketë hyrje te mesazhe të fshehtëzuar.",
     "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.": "Ndryshimi i fjalëkalimit tuaj do të sjellë zerim të çfarëdo kyçesh fshehtëzimi skaj-më-skaj në krejt sesionet tuaj, duke e bërë të palexueshëm historikun e bisedave të fshehtëzuara. Ujdisni një Kopjeruajtje Kyçesh ose eksportoni kyçet e dhomës tuaj prej një tjetër sesioni, përpara se të ricaktoni fjalëkalimin tuaj.",
     "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.": "Jeni nxjerrë jashtë krejt sesioneve dhe nuk do të merrni më njoftime push. Që të riaktivizoni njoftimet, bëni sërish hyrjen në çdo pajisje.",
     "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.": "Rifitoni hyrjen te llogaria juaj dhe rimerrni kyçe fshehtëzimi të depozituar në këtë sesion. Pa ta, s’do të jeni në gjendje të lexoni krejt mesazhet tuaj të siguruar në çfarëdo sesion.",
     "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.": "Kujdes: Të dhënat tuaja personale (përfshi kyçe fshehtëzimi) janë ende të depozituara në këtë sesion. Spastrojini, nëse keni përfunduar së përdoruri këtë sesion, ose dëshironi të bëni hyrjen në një tjetër llogari.",
-    "Sender session information": "Të dhëna sesioni dërguesi",
     "Restore your key backup to upgrade your encryption": "Që të përmirësoni fshehtëzimin tuaj, riktheni kopjeruajtjen e kyçeve tuaj",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Përmirësojeni këtë sesion për ta lejuar të verifikojë sesione të tjerë, duke u akorduar hyrje te mesazhe të fshehtëzuar dhe duke u vënë shenjë si të besuar për përdorues të tjerë.",
-    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "Ujdisni fshehtëzim në këtë sesion që ta lejoni të verifikojë sesione të tjerë, duke u akorduar atyre hyrje te mesazhe të fshehtëzuar dhe duke u vënë shenjë si të besuar për përdorues të tjerë.",
-    "Back up my encryption keys, securing them with the same passphrase": "Kopjeruaj kyçet e mi të fshehtëzimit, duke i siguruar me të njëjtin frazëkalim",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "Mbajeni kyçin tuaj të rimarrjeve diku në një vend pak a shumë të sigurt, bie fjala, nën një përgjegjës fjalëkalimesh ose madje në një kasafortë.",
     "Your recovery key": "Kyçi juaj i rimarrjeve",
     "Copy": "Kopjoje",
-    "You can now verify your other devices, and other users to keep your chats safe.": "Tani mund të verifikoni pajisje tuajat të tjera dhe përdorues të tjerë, për t’i mbajtur të sigurta bisedat tuaja.",
     "Make a copy of your recovery key": "Bëni një kopje të kyçit tuaj të rimarrjeve",
-    "You're done!": "Mbaruat!",
     "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.": "Pa ujdisur Rimarrje të Sigurt Mesazhesh, s’do të jeni në gjendje të riktheni historikun e mesazheve tuaj të fshehtëzuar, nëse bëni daljen ose përdorni një sesion tjetër.",
     "Create key backup": "Krijo kopjeruajtje kyçesh",
     "This session is encrypting history using the new recovery method.": "Ky sesion e fshehtëzon historikun duke përdorur metodë të re rimarrjesh.",
     "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Ky sesion ka pikasur se frazëkalimi dhe kyçi juaj i rimarrjeve për Mesazhe të Sigurt janë hequr.",
     "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.": "Nëse këtë e keni bërë pa dashje, mund të ujdisni Mesazhe të Sigurt në këtë sesion, gjë që do të sjellë rifshehtëzimin e historikut të mesazheve të sesionit me një metodë të re rimarrjesh.",
     "Indexed rooms:": "Dhoma të indeksuara:",
-    "%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s nga %(totalRooms)s gjithsej",
     "Message downloading sleep time(ms)": "Kohë fjetjeje shkarkimi mesazhi(ms)",
     "Show typing notifications": "Shfaq njoftime shtypjeje",
     "Destroy cross-signing keys?": "Të shkatërrohen kyçet <em>cross-signing</em>?",
@@ -2135,18 +1933,13 @@
     "Not Trusted": "Jo e Besuar",
     "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) bëri hyrjen në një sesion të ri pa e verifikuar:",
     "Ask this user to verify their session, or manually verify it below.": "Kërkojini këtij përdoruesi të verifikojë sesionin e vet, ose ta verifikojë më poshtë dorazi.",
-    "Manually Verify": "Verifikoje Dorazi",
     "Verify by scanning": "Verifikoje me skanim",
-    "The version of Riot": "Versioni i Riot-it",
-    "Whether you're using Riot on a device where touch is the primary input mechanism": "Nëse po e përdorni Riot-in në një pajisje ku touch-i është mekanizmi parësor për input-e",
-    "Whether you're using Riot as an installed Progressive Web App": "Nëse po e përdorni Riot-in të instaluar si një Aplikacion Web Progresiv",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Nëse po e përdorni %(brand)s-in në një pajisje ku touch-i është mekanizmi parësor për input-e",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Nëse po e përdorni %(brand)s-in të instaluar si një Aplikacion Web Progresiv",
     "Your user agent": "Agjenti juaj i përdoruesit",
-    "The information being sent to us to help make Riot better includes:": "Te të dhënat e dërguara te ne për të na ndihmuar ta bëjmë Riot-in më të mirë përfshihen:",
-    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "Sesioni që po provoni të verifikoni, nuk mbulon skanim kodesh QR apo verifikim emoji-sh, çka janë ato që Riot-i mbulon. Provoni me një tjetër klient.",
+    "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.": "Sesioni që po provoni të verifikoni, nuk mbulon skanim kodesh QR apo verifikim emoji-sh, çka janë ato që %(brand)s-i mbulon. Provoni me një tjetër klient.",
     "You declined": "Hodhët poshtë",
     "%(name)s declined": "%(name)s hodhi poshtë",
-    "accepting …": "po pranohet …",
-    "declining …": "po hidhet poshtë …",
     "Order rooms by name": "Renditini dhomat sipas emrash",
     "Show rooms with unread notifications first": "Shfaq së pari dhoma me njoftime të palexuara",
     "Show shortcuts to recently viewed rooms above the room list": "Shfaq te lista e dhomave shkurtore për te dhoma të para së fundi",
@@ -2170,7 +1963,6 @@
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Që të njoftoni një problem sigurie lidhur me Matrix-in, ju lutemi, lexoni <a>Rregulla Tregimi Çështjes Sigurie</a> te Matrix.org.",
     "Mark all as read": "Vëru të tërave shenjë si të lexuara",
     "Not currently indexing messages for any room.": "Pa indeksuar aktualisht mesazhe nga ndonjë dhomë.",
-    "Currently indexing: %(currentRoom)s.": "Aktualisht nën indeksim: %(currentRoom)s.",
     "%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s nga %(totalRooms)s",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s shtoi adresat alternative %(addresses)s për këtë dhomë.",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|one": "%(senderName)s shtoi adresën alternative %(addresses)s për këtë dhomë.",
@@ -2187,12 +1979,6 @@
     "Custom theme URL": "URL teme vetjake",
     "Add theme": "Shtoni temë",
     "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "Pati një gabim gjatë përditësimit të adresave alternative të dhomës. Mund të mos lejohet nga shërbyesi pse ndodhi një gabim i përkohshëm.",
-    "You don't have permission to delete the alias.": "S’keni leje të fshini aliasin.",
-    "Alternative addresses for this room:": "Adresa alternative për këtë dhomë:",
-    "This room has no alternative addresses": "Kjo dhomë nuk ka adresa alternative",
-    "New address (e.g. #foo:domain)": "Adresë e re (p.sh., #foo:domain)",
-    "Local addresses (unmoderated content)": "Adresa vendore (lëndë e pamoderuar)",
-    "Review Sessions": "Shqyrtoni Sesione",
     "Local address": "Adresë vendore",
     "Published Addresses": "Adresa të Publikuara",
     "Scroll to most recent messages": "Rrëshqit te mesazhet më të freskët",
@@ -2215,9 +2001,6 @@
     "Add a new server...": "Shtoni një shërbyes të ri…",
     "%(networkName)s rooms": "Dhoma %(networkName)s",
     "Matrix rooms": "Dhoma Matrix",
-    "Open an existing session & use it to verify this one, granting it access to encrypted messages.": "Hapni një sesion ekzistues & përdoreni për të verifikuar këtë këtu, duke i akorduar hyrje te mesazhe të fshehtëzuar.",
-    "Waiting…": "Po pritet…",
-    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "Nëse s’hapni dot një, <button>përdorni kyçin ose frazëkalimin tuaj të rimarrjes.</button>",
     "Reset cross-signing and secret storage": "Rikthe te parazgjedhjet <em>cross-signing</em> dhe depozitën e fshehtë",
     "Keyboard Shortcuts": "Shkurtore Tastiere",
     "Matrix": "Matrix",
@@ -2225,10 +2008,9 @@
     "a new cross-signing key signature": "një nënshkrim i ri kyçi <em>cross-signing</em>",
     "a device cross-signing signature": "një nënshkrim <em>cross-signing</em> pajisjeje",
     "a key signature": "një nënshkrim kyçi",
-    "Riot encountered an error during upload of:": "Riot-i hasi një gabim gjatë ngarkimit të:",
+    "%(brand)s encountered an error during upload of:": "%(brand)s-i hasi një gabim gjatë ngarkimit të:",
     "Upload completed": "Ngarkimi u plotësua",
     "Cancelled signature upload": "Ngarkim i anuluar nënshkrimi",
-    "Unabled to upload": "S’u arrit të ngarkohej",
     "Signature upload success": "Sukses ngarkimi nënshkrimi",
     "Signature upload failed": "Ngarkimi i nënshkrimit dështoi",
     "Navigation": "Lëvizje",
@@ -2242,7 +2024,6 @@
     "Toggle Bold": "Aktivizo/çaktivizo Të trasha",
     "Toggle Italics": "Aktivizo/çaktivizo Të pjerrëta",
     "Toggle Quote": "Aktivizo/çaktivizo Thonjëza",
-    "Toggle Markdown": "Aktivizo/çaktivizo Markdown",
     "New line": "Rresht i ri",
     "Navigate recent messages to edit": "Shihni mesazhe së fundi për përpunim",
     "Jump to start/end of the composer": "Hidhu te fillimi/fundi i hartuesit",
@@ -2268,9 +2049,6 @@
     "End": "End",
     "Manually Verify by Text": "Verifikojeni Dorazi përmes Teksti",
     "Interactively verify by Emoji": "Verifikojeni në mënyrë ndërvepruese përmes Emoji-sh",
-    "Secret Storage key format:": "Format kyçesh Depozite të Fshehtë:",
-    "outdated": "e vjetruar",
-    "up to date": "e përditësuar",
     "Start a conversation with someone using their name, username (like <userId/>) or email address.": "Nisni një bisedë me dikë duke përdorur emrin e tij, emrin e përdoruesit për të (bie fjala, <userId/>) ose adresë email.",
     "Confirm by comparing the following with the User Settings in your other session:": "Ripohojeni duke krahasuar sa vijon me Rregullimet e Përdoruesit te sesioni juaj tjetër:",
     "Confirm this user's session by comparing the following with their User Settings:": "Ripohojeni këtë sesion përdoruesi duke krahasuar sa vijon me Rregullimet e tij të Përdoruesit:",
@@ -2281,9 +2059,7 @@
     "Previous/next unread room or DM": "Dhoma ose MD i palexuar i mëparshëm/pasues",
     "Previous/next room or DM": "Dhoma ose MD i mëparshëm/pasues",
     "Toggle right panel": "Hap/mbyll panelin djathtas",
-    "Unverified login. Was this you?": "Hyrje e paverifikuar. A qetë ju?",
     "Manually verify all remote sessions": "Verifikoni dorazi krejt sesionet e largët",
-    "Update your secure storage": "Përditësoni depozitën tuaj të sigurt",
     "Self signing private key:": "Kyç privat vetënënshkrimi:",
     "cached locally": "ruajtur në fshehtinë lokalisht",
     "not found locally": "i pagjetur lokalisht",
@@ -2352,31 +2128,284 @@
     "Server did not return valid authentication information.": "Shërbyesi s’ktheu ndonjë të dhënë të vlefshme mirëfilltësimi.",
     "There was a problem communicating with the server. Please try again.": "Pati një problem në komunikimin me shërbyesin. Ju lutemi, riprovoni.",
     "If you cancel now, you won't complete your operation.": "Nëse e anuloni tani, s’do ta plotësoni veprimin tuaj.",
-    "Keep recovery passphrase in memory for this session": "Për këtë sesion, mbaje në kujtesë frazëkalimin e rimarrjeve",
     "Verify other session": "Verifikoni tjetër sesion",
     "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "S’arrihet të hyhet në depozitë të fshehtë. Ju lutemi, verifikoni se dhatë frazëkalimin e duhur për rimarrje.",
-    "<b>Warning</b>: You should only do this on a trusted computer.": "<b>Kujdes</b>: Këtë duhet ta bëni vetëm në një kompjuter të besuar.",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery passphrase.": "Hyni te historiku i mesazheve tuaj të sigurt dhe identiteti juaj për <em>cross-signing</em> për verifikim sesionesh të tjerë, duke dhënë frazëkalimin tuaj për rimarrje.",
-    "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "Nëse e keni harruar frazëkalimin tuaj të rimarrjeve, mund të <button1>përdorni kyçin tuaj të rimarrjeve</button1> ose <button2>të ujdisni mundësi të reja rimarrjesh</button2>.",
     "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "Kopjeruajtja s’u shfshehtëzua dot me këtë kyç rimarrjesh: ju lutemi, verifikoni se keni dhënë kyçin e saktë të rimarrjeve.",
     "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "Kopjeruajtja s’u shfshehtëzua dot me këtë frazëkalim rimarrjesh: ju lutemi, verifikoni se keni dhënë frazëkalimin e saktë të rimarrjeve.",
     "Syncing...": "Po njëkohësohet…",
     "Signing In...": "Po hyhet…",
     "If you've joined lots of rooms, this might take a while": "Nëse jeni pjesë e shumë dhomave, kjo mund të zgjasë ca",
-    "Use an existing session to verify this one, granting it access to encrypted messages.": "Që të verifikoni këtë, përdorni një sesion ekzistues, duke i akorduar hyrje te mesazhe të fshehtëzuar.",
-    "If you can’t access one, <button>use your recovery key or recovery passphrase.</button>": "Nëse s’hyni dot në një, <button>përdorni kyçin tuaj të rimarrjeve ose frazëkalim rimarrjesh.</button>",
-    "Use your other device to continue…": "Që të vazhdohet, përdorni pajisjen tuaj tjetër…",
     "Great! This recovery passphrase looks strong enough.": "Bukur! Ky frazëkalim rimarrjesh duket mjaftueshëm i fuqishëm.",
-    "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:": "Caktoni një frazëkalim rimarrjesh që të siguroni informacione të fshehtëzuar dhe për ta rimarrë, nëse dilni nga llogaria. Ky duhet të jetë i ndryshëm nga fjalëkalimi juaj për llogarinë:",
     "Enter a recovery passphrase": "Jepni një frazëkalim rimarrjesh",
-    "Back up encrypted message keys": "Kopjeruani kyçe mesazhesh të fshehtëzuar",
     "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.",
-    "Confirm recovery passphrase": "Ripohoni frazëkalim rimarrjesh",
     "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.",
-    "Enter a recovery passphrase...": "Jepni 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…",
-    "Secure your backup with a recovery passphrase": "Sigurojeni kopjeruajtjen tuaj me një frazëkalim rimarrjesh"
+    "Secure your backup with a recovery passphrase": "Sigurojeni kopjeruajtjen tuaj me një frazëkalim rimarrjesh",
+    "Review where you’re logged in": "Shqyrtojini kur të jeni i futur",
+    "New login. Was this you?": "Hyrje e re. Ju qetë?",
+    "Please supply a widget URL or embed code": "Ju lutemi, furnizoni një URL widget-i ose kod trupëzimi",
+    "Send a bug report with logs": "Dërgoni një njoftim të metash me regjistra",
+    "You signed in to a new session without verifying it:": "Bëtë hyrjen në një sesion të ri pa e verifikuar:",
+    "Verify your other session using one of the options below.": "Verifikoni sesionit tuaj tjetër duke përdorur një nga mundësitë më poshtë.",
+    "Lock": "Kyçje",
+    "Verify all your sessions to ensure your account & messages are safe": "Verifikoni krejt sesionet tuaj që të siguroheni se llogaria & mesazhet tuaja janë të sigurt",
+    "Verify the new login accessing your account: %(name)s": "Verifikoni kredencialet e reja për hyrje te llogaria juaj: %(name)s",
+    "Cross-signing": "<em>Cross-signing</em>",
+    "Where you’re logged in": "Kur të jeni i futur",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Administroni emrat dhe bëni daljen pre sesioneve tuaj më poshtë ose <a>verifikojini te Profili juaj i Përdoruesit</a>.",
+    "Reset": "Rikthe te parazgjedhjet",
+    "Can't load this message": "S’ngarkohet dot ky mesazh",
+    "Submit logs": "Parashtro regjistra",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Kujtesë: Shfletuesi juaj është i pambuluar, ndaj punimi juaj mund të jetë i paparashikueshëm.",
+    "Unable to upload": "S’arrihet të ngarkohet",
+    "Restoring keys from backup": "Po rikthehen kyçesh nga kopjeruajtje",
+    "Fetching keys from server...": "Po sillen kyçet prej shërbyesi…",
+    "%(completed)s of %(total)s keys restored": "U rikthyen %(completed)s nga %(total)s kyçe",
+    "Keys restored": "Kyçet u rikthyen",
+    "Successfully restored %(sessionCount)s keys": "U rikthyen me sukses %(sessionCount)s kyçe",
+    "Verify this login": "Verifikoni këto kredenciale hyrjeje",
+    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "Ripohoni identitetin tuaj duke verifikuar këto kredenciale hyrjesh prej një nga sesionet tuaj të tjerë, duke i akorduar hyrje te mesazhet e fshehtëzuar.",
+    "This requires the latest %(brand)s on your other devices:": "Kjo lyp %(brand)s-in më të ri te pajisjet tuaja të tjera:",
+    "or another cross-signing capable Matrix client": "ose një tjetër klient Matrix i aftë për <em>cross-signing</em",
+    "Unable to query secret storage status": "S’u arrit të merret gjendje depozite të fshehtë",
+    "Currently indexing: %(currentRoom)s": "Indeksim aktual: %(currentRoom)s",
+    "Opens chat with the given user": "Hap fjalosje me përdoruesin e dhënë",
+    "Sends a message to the given user": "I dërgon një mesazh përdoruesit të dhënë",
+    "Waiting for your other session to verify…": "Po pritet për verifikimin e sesionit tuaj tjetër…",
+    "You've successfully verified your device!": "E verifikuat me sukses pajisjen tuaj!",
+    "Message deleted": "Mesazhi u fshi",
+    "Message deleted by %(name)s": "Mesazh i fshirë nga %(name)s",
+    "QR Code": "Kod QR",
+    "To continue, use Single Sign On to prove your identity.": "Që të vazhdohet, përdorni Hyrje Njëshe, që të provoni identitetin tuaj.",
+    "Confirm to continue": "Ripohojeni që të vazhdohet",
+    "Click the button below to confirm your identity.": "Klikoni mbi butonin më poshtë që të ripohoni identitetin tuaj.",
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "Ftoni dikë duke përdorur emrin e tij, emrin e përdoruesit (bie fjala, <userId/>), adresën email ose <a>duke ndarë me të këtë dhomë</a>.",
+    "Confirm encryption setup": "Ripohoni ujdisje fshehtëzimi",
+    "Click the button below to confirm setting up encryption.": "Klikoni mbi butonin më poshtë që të ripohoni ujdisjen e fshehtëzimit.",
+    "Dismiss read marker and jump to bottom": "Mos merr parasysh piketë leximi dhe hidhu te fundi",
+    "Jump to oldest unread message": "Hidhu te mesazhi më i vjetër i palexuar",
+    "Upload a file": "Ngarkoni një kartelë",
+    "Font scaling": "Përshkallëzim shkronjash",
+    "Font size": "Madhësi shkronjash",
+    "IRC display name width": "Gjerësi shfaqjeje emrash IRC",
+    "Size must be a number": "Madhësia duhet të jetë një numër",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "Madhësia vetjake për shkronjat mund të jetë vetëm mes vlerave %(min)s pt dhe %(max)s pt",
+    "Use between %(min)s pt and %(max)s pt": "Përdor me %(min)s pt dhe %(max)s pt",
+    "Appearance": "Dukje",
+    "Create room": "Krijo dhomë",
+    "Room name or address": "Emër ose adresë dhome",
+    "Joins room with given address": "Hyhet në dhomën me adresën e dhënë",
+    "Unrecognised room address:": "Adresë dhome që s’njihet:",
+    "Help us improve %(brand)s": "Ndihmonani të përmirësojmë %(brand)s-in",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Dërgoni <UsageDataLink>të dhëna anonime përdorimi</UsageDataLink> të cilat na ndihmojnë të përmirësojmë %(brand)s-in. Kjo do të përdorë një <PolicyLink>cookie</PolicyLink>.",
+    "I want to help": "Dua të ndihmoj",
+    "Your homeserver has exceeded its user limit.": "Shërbyesi juaj Home ka tejkaluar kufijtë e tij të përdorimit.",
+    "Your homeserver has exceeded one of its resource limits.": "Shërbyesi juaj Home ka tejkaluar një nga kufijtë e tij të burimeve.",
+    "Contact your <a>server admin</a>.": "Lidhuni me <a>përgjegjësin e shërbyesit tuaj</a>.",
+    "Ok": "OK",
+    "Set password": "Caktoni fjalëkalim",
+    "To return to your account in future you need to set a password": "Që të ktheheni te llogaria juaj në të ardhmen, duhet të caktoni një fjalëkalim",
+    "Restart": "Rinise",
+    "Upgrade your %(brand)s": "Përmirësoni %(brand)s-in tuaj",
+    "A new version of %(brand)s is available!": "Ka gati një version të ri të %(brand)s-it!",
+    "Please verify the room ID or address and try again.": "Ju lutemi, verifikoni ID-në ose adresën e dhomës dhe riprovoni.",
+    "Room ID or address of ban list": "ID dhome ose adresë prej liste ndalimi",
+    "To link to this room, please add an address.": "Që të lidhni këtë dhomë, ju lutemi, jepni një adresë.",
+    "Error creating address": "Gabim në krijim adrese",
+    "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "Pati një gabim në krijimin e asaj adrese. Mund të mos lejohet nga shërbyesi, ose ndodhi një gabim i përkohshëm.",
+    "You don't have permission to delete the address.": "S’keni leje të fshini adresën.",
+    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "Pati një gabim në heqjen e asaj adrese. Mund të mos ekzistojë më, ose ndodhi një gabim i përkohshëm.",
+    "Error removing address": "Gabim në heqje adrese",
+    "Categories": "Kategori",
+    "Room address": "Adresë dhome",
+    "Please provide a room address": "Ju lutemi, jepni një adresë dhome",
+    "This address is available to use": "Kjo adresë është e lirë për përdorim",
+    "This address is already in use": "Kjo adresë është e përdorur tashmë",
+    "Set a room address to easily share your room with other people.": "Caktoni një adresë dhome që të ndani dhomën tuaj me persona të tjerë.",
+    "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.": "Me këtë sesion, keni përdorur më herët një version më të ri të %(brand)s-it. Që të ripërdorni këtë version me fshehtëzim skaj më skaj, do t’ju duhet të bëni daljen dhe të rihyni.",
+    "Address (optional)": "Adresë (opsionale)",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "Të fshihet adresa e dhomës %(alias)s dhe të hiqet %(name)s nga drejtoria?",
+    "delete the address.": "fshije adresën.",
+    "Use a different passphrase?": "Të përdoret një frazëkalim tjetër?",
+    "New version available. <a>Update now.</a>": "Version i ri gati. <a>Përditësojeni tani.</a>",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Përgjegjësi i shërbyesit tuaj ka çaktivizuar fshehtëzimin skaj-më-skaj, si parazgjedhje, në dhoma private & Mesazhe të Drejtpërdrejtë.",
+    "Emoji picker": "Zgjedhës emoji-sh",
+    "People": "Persona",
+    "Recently Direct Messaged": "Me Mesazhe të Drejtpërdrejtë Së Fundi",
+    "Switch to light mode": "Kalo nën mënyrën e çelët",
+    "Switch to dark mode": "Kalo nën mënyrën e errët",
+    "Switch theme": "Ndërroni temën",
+    "Security & privacy": "Siguri & privatësi",
+    "All settings": "Krejt rregullimet",
+    "Feedback": "Mendime",
+    "No recently visited rooms": "S’ka dhoma të vizituara së fundi",
+    "Sort by": "Renditi sipas",
+    "Unread rooms": "Dhoma të palexuara",
+    "Always show first": "Shfaq përherë të parën",
+    "Show": "Shfaqe",
+    "Message preview": "Paraparje mesazhi",
+    "List options": "Mundësi liste",
+    "Show %(count)s more|other": "Shfaq %(count)s të tjera",
+    "Show %(count)s more|one": "Shfaq %(count)s tjetër",
+    "Leave Room": "Dil Nga Dhoma",
+    "Room options": "Mundësi dhome",
+    "Light": "E çelët",
+    "Dark": "E errët",
+    "Customise your appearance": "Përshtatni dukjen tuaj",
+    "Appearance Settings only affect this %(brand)s session.": "Rregullimet e Dukjes prekin vetëm këtë sesion %(brand)s.",
+    "Activity": "Veprimtari",
+    "A-Z": "A-Z",
+    "Looks good!": "Mirë duket!",
+    "Use Recovery Key or Passphrase": "Përdorni Kyç ose Frazëkalim Rimarrjesh",
+    "Use Recovery Key": "Përdorni Kyç Rimarrjesh",
+    "Use the improved room list (will refresh to apply changes)": "Përdor listën e përmirësuar të dhomave (do të rifreskohet, që të aplikohen ndryshimet)",
+    "Use custom size": "Përdor madhësi vetjake",
+    "Hey you. You're the best!": "Hej, ju. S’u ka kush shokun!",
+    "Message layout": "Skemë mesazhesh",
+    "Compact": "Kompakte",
+    "Modern": "Moderne",
+    "Use a system font": "Përdor një palë shkronja sistemi",
+    "System font name": "Emër shkronjash sistemi",
+    "You joined the call": "U bëtë pjesë e thirrjes",
+    "%(senderName)s joined the call": "%(senderName)s u bë pjesë e thirrjes",
+    "Call in progress": "Thirrje në ecuri e sipër",
+    "You left the call": "E braktisët thirrjen",
+    "%(senderName)s left the call": "%(senderName)s e braktisi thirrjen",
+    "Call ended": "Thirrja përfundoi",
+    "You started a call": "Filluat një thirrje",
+    "%(senderName)s started a call": "%(senderName)s filluat një thirrje",
+    "Waiting for answer": "Po pritet për përgjigje",
+    "%(senderName)s is calling": "%(senderName)s po thërret",
+    "You created the room": "Krijuat dhomën",
+    "%(senderName)s created the room": "%(senderName)s krijoi dhomën",
+    "You made the chat encrypted": "E bëtë të fshehtëzuar fjalosjen",
+    "%(senderName)s made the chat encrypted": "%(senderName)s e bëri të fshehtëzuar fjalosjen",
+    "You made history visible to new members": "E bëtë historikun të dukshëm për anëtarë të rinj",
+    "%(senderName)s made history visible to new members": "%(senderName)s e bëri historikun të dukshëm për anëtarë të rinj",
+    "You made history visible to anyone": "E bëtë historikun të dukshëm për këdo",
+    "%(senderName)s made history visible to anyone": "%(senderName)s e bëri historikun të dukshëm për këdo",
+    "You made history visible to future members": "E bëtë historikun të dukshëm për anëtarë të ardhshëm",
+    "%(senderName)s made history visible to future members": "%(senderName)s e bëri historikun të dukshëm për anëtarë të ardhshëm",
+    "You were invited": "U ftuat",
+    "%(targetName)s was invited": "%(targetName)s u ftua",
+    "You left": "Dolët",
+    "%(targetName)s left": "%(targetName)s doli",
+    "You were kicked (%(reason)s)": "U përzutë (%(reason)s)",
+    "%(targetName)s was kicked (%(reason)s)": "%(targetName)s u përzu (%(reason)s)",
+    "You were kicked": "U përzutë",
+    "%(targetName)s was kicked": "%(targetName)s u përzu",
+    "You rejected the invite": "S’pranuat ftesën",
+    "%(targetName)s rejected the invite": "%(targetName)s s’pranoi ftesën",
+    "You were uninvited": "Ju shfuqizuan ftesën",
+    "%(targetName)s was uninvited": "%(targetName)s i shfuqizuan ftesën",
+    "You were banned (%(reason)s)": "U dëbuat (%(reason)s)",
+    "%(targetName)s was banned (%(reason)s)": "%(targetName)s u dëbua (%(reason)s)",
+    "You were banned": "U dëbuat",
+    "%(targetName)s was banned": "%(targetName)s u dëbua",
+    "You joined": "U bëtë pjesë",
+    "%(targetName)s joined": "%(targetName)s u bë pjesë",
+    "You changed your name": "Ndryshuat emrin",
+    "%(targetName)s changed their name": "%(targetName)s ndryshoi emrin e vet",
+    "You changed your avatar": "Ndryshuat avatarin tuaj",
+    "%(targetName)s changed their avatar": "%(targetName)s ndryshoi avatarin e vet",
+    "%(senderName)s %(emote)s": "%(senderName)s %(emote)s",
+    "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
+    "You changed the room name": "Ndryshuat emrin e dhomës",
+    "%(senderName)s changed the room name": "%(senderName)s ndryshoi emrin e dhomës",
+    "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
+    "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
+    "You uninvited %(targetName)s": "Shfuqizuat ftesën për %(targetName)s",
+    "%(senderName)s uninvited %(targetName)s": "%(senderName)s shfuqizoi ftesën për %(targetName)s",
+    "You invited %(targetName)s": "Ftuat %(targetName)s",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s ftoi %(targetName)s",
+    "You changed the room topic": "Ndryshuat temën e dhomës",
+    "%(senderName)s changed the room topic": "%(senderName)s ndryshoi temën e dhomës",
+    "Use a more compact ‘Modern’ layout": "Përdorni një skemë ‘Modern’ më kompakte",
+    "The authenticity of this encrypted message can't be guaranteed on this device.": "Mirëfilltësia e këtij mesazhi të fshehtëzuar s’mund të garantohet në këtë pajisje.",
+    "Message deleted on %(date)s": "Mesazh i fshirë më %(date)s",
+    "Wrong file type": "Lloj i gabuar kartele",
+    "Wrong Recovery Key": "Kyç Rimarrjesh i Gabuar",
+    "Invalid Recovery Key": "Kyç Rimarrjesh i Pavlefshëm",
+    "Security Phrase": "Frazë Sigurie",
+    "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "Që të vazhdohet, jepni Frazën tuaj të Sigurisë ose <button>Përdorni Kyçin tuaj të Sigurisë</button>.",
+    "Security Key": "Kyç Sigurie",
+    "Use your Security Key to continue.": "Që të vazhdohet përdorni Kyçin tuaj të Sigurisë.",
+    "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "Mbrohuni kundër humbjes së hyrjes në mesazhe & të dhëna të fshehtëzuara duke kopjeruajtur kyçe fshehtëzimi në shërbyesin tuaj.",
+    "Generate a Security Key": "Prodhoni një Kyç Sigurie",
+    "We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "Do të prodhojmë për ju një Kyç Sigurie që ta depozitoni diku të parrezik, bie fjala në një përgjegjës fjalëkalimesh ose në një kasafortë.",
+    "Enter a Security Phrase": "Jepni një Frazë Sigurie",
+    "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "Jepni një frazë të fshehtë që e dini vetëm ju, dhe, në daçi, ruani një Kyç Sigurie për ta përdorur për kopjeruajtje.",
+    "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.": "Jepni një frazë sigurie që e dini vetëm ju, ngaqë përdoret për të mbrojtur të dhënat tuaja. Që të jeni të sigurt, s’duhet të ripërdorni fjalëkalimin e llogarisë tuaj.",
+    "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "Depozitojeni Kyçin tuaj të Sigurisë diku të parrezik, bie fjala në një përgjegjës fjalëkalimesh ose në një kasafortë, ngaqë përdoret për të mbrojtur të dhënat tuaja të fshehtëzuara.",
+    "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "Nëse e anuloni tani, mund të humbni mesazhe & të dhëna të fshehtëzuara, nëse humbni hyrjen te kredencialet tuaja të hyrjeve.",
+    "You can also set up Secure Backup & manage your keys in Settings.": "Mundeni edhe të ujdisni Kopjeruajtje të Sigurt & administroni kyçet tuaj që nga Rregullimet.",
+    "Set up Secure backup": "Ujdisni kopjeruajtje të Sigurt",
+    "Set a Security Phrase": "Caktoni një Frazë Sigurie",
+    "Confirm Security Phrase": "Ripohoni Frazë Sigurie",
+    "Save your Security Key": "Ruani Kyçin tuaj të Sigurisë",
+    "Use your account to sign in to the latest version": "Përdorni llogarinë tuaj për të bërë hyrjen te versioni më i ri",
+    "We’re excited to announce Riot is now Element": "Jemi të ngazëllyer t’ju njoftojmë se Riot tanimë është Element",
+    "Riot is now Element!": "Riot-i tani është Element!",
+    "Learn More": "Mësoni Më Tepër",
+    "Are you sure you want to cancel entering passphrase?": "Jeni i sigurt se doni të anulohet dhënie frazëkalimi?",
+    "Enable advanced debugging for the room list": "Aktivizo diagnostikim të thelluar për listën e dhomave",
+    "Enable experimental, compact IRC style layout": "Aktivizo skemë eksperimentale, kompakte, IRC-je",
+    "Unknown caller": "Thirrës i panjohur",
+    "Incoming voice call": "Thirrje zanore ardhëse",
+    "Incoming video call": "Thirrje video ardhëse",
+    "Incoming call": "Thirrje ardhëse",
+    "%(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 s’mund të ruajë lokalisht në fshehtinë në mënyrë të siguruar mesazhe të fshehtëzuar, teksa xhirohet në një shfletues. Që mesazhet e fshehtëzuar të shfaqen te përfundime kërkimi, përdorni <desktopLink>%(brand)s Desktop</desktopLink>.",
+    "There are advanced notifications which are not shown here.": "Ka njoftime të thelluara që s’janë shfaqur këtu.",
+    "You might have configured them in a client other than %(brand)s. You cannot tune them in %(brand)s but they still apply.": "Mund t’i keni formësuar në një klient tjetër nga %(brand)s. S’mund t’i përimtoni në %(brand)s, por janë ende të vlefshëm.",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Caktoni emrin e një palë shkronjash të instaluara në sistemin tuaj & %(brand)s do të provojë t’i përdorë.",
+    "Make this room low priority": "Bëje këtë dhomë të përparësisë së ulët",
+    "Low priority rooms show up at the bottom of your room list in a dedicated section at the bottom of your room list": "Dhomat me përparësi të ulët shfaqen në fund të listës tuaj të dhomave, në një ndarje enkas në fund të listës tuaj të dhomave",
+    "Show rooms with unread messages first": "Së pari shfaq dhoma me mesazhe të palexuar",
+    "Show previews of messages": "Shfaq paraparje mesazhesh",
+    "Use default": "Përdor parazgjedhjen",
+    "Mentions & Keywords": "Përmendje & Fjalëkyçe",
+    "Notification options": "Mundësi njoftimesh",
+    "Forget Room": "Harroje Dhomën",
+    "This room is public": "Kjo dhomë është publike",
+    "Away": "I larguar",
+    "Edited at %(date)s": "Përpunuar më %(date)s",
+    "Click to view edits": "Klikoni që të shihni përpunime",
+    "Use your account to sign in to the latest version of the app at <a />": "Përdorni llogarinë tuaj për të hyrë te versioni më i ri i aplikacionit te <a />",
+    "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>.": "Keni bërë tashmë hyrjen këtu dhe jeni në rregull, por mundeni edhe të merrnit versionet më të reja të aplikacioneve në krejt platformat, te <a>element.io/get-started</a>.",
+    "Go to Element": "Shko te Element-i",
+    "We’re excited to announce Riot is now Element!": "Jemi të ngazëllyer të njoftojmë se Riot-i tani e tutje është Element-i!",
+    "Learn more at <a>element.io/previously-riot</a>": "Mësoni më tepër te <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.": "Mund të përdorni mundësitë vetjake për shërbyesin Që të bëni hyrjen te shërbyes të tjerë Matrix, duke specifikuar një URL të një shërbyesi Home tjetër. Kjo ju lejon të përdorni %(brand)s në një tjetër shërbyes Home me një llogari Matrix ekzistuese.",
+    "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>.": "Jepni vendndodhjen e shërbyesit tuaj vatër Element Matrix Services. Mund të përdorë emrin e përkatësisë tuaj vetjake ose të jetë një nënpërkatësi e <a>element.io</a>.",
+    "Search rooms": "Kërkoni në dhoma",
+    "User menu": "Menu përdoruesi",
+    "%(brand)s Web": "%(brand)s Web",
+    "%(brand)s Desktop": "%(brand)s Desktop",
+    "%(brand)s iOS": "%(brand)s iOS",
+    "%(brand)s X for Android": "%(brand)s X për Android",
+    "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
+    "Custom Tag": "Etiketë Vetjake",
+    "The person who invited you already left the room.": "Personi që ju ftoi ka dalë nga dhoma tashmë.",
+    "The person who invited you already left the room, or their server is offline.": "Personi që ju ftoi, ka dalë nga dhoma tashmë, ose shërbyesi i tij është jashtë funksionimi.",
+    "Change notification settings": "Ndryshoni rregullime njoftimesh",
+    "Your server isn't responding to some <a>requests</a>.": "Shërbyesi juaj s’po u përgjigjet ca <a>kërkesave</a>.",
+    "Server isn't responding": "Shërbyesi s’po përgjigjet",
+    "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "Shërbyesi juaj s’po u përgjigjet disa kërkesave nga ju. Më poshtë gjenden disa nga arsyet më të mundshme.",
+    "The server (%(serverName)s) took too long to respond.": "Shërbyesi (%(serverName)s) e zgjati shumë përgjigjen.",
+    "Your firewall or anti-virus is blocking the request.": "Kërkesën po e bllokon firewall-i ose anti-virus-i juaj.",
+    "A browser extension is preventing the request.": "Kërkesën po e pengon një zgjerim i shfletuesit.",
+    "The server is offline.": "Shërbyesi është jashtë funksionimi.",
+    "The server has denied your request.": "Shërbyesi e ka hedhur poshtë kërkesën tuaj.",
+    "Your area is experiencing difficulties connecting to the internet.": "Zona juaj po ka probleme lidhjeje në internet.",
+    "A connection error occurred while trying to contact the server.": "Ndodhi një gabim teksa provohej lidhja me shërbyesin.",
+    "The server is not configured to indicate what the problem is (CORS).": "Shërbyesi s’është formësuar të tregojë se cili është problemi (CORS).",
+    "Recent changes that have not yet been received": "Ndryshime tani së fundi që s’janë marrë ende",
+    "No files visible in this room": "S’ka kartela të dukshme në këtë dhomë",
+    "Attach files from chat or just drag and drop them anywhere in a room.": "Bashkëngjitni kartela prej fjalosjeje ose thjesht tërhiqini dhe lërini kudo qoftë brenda dhomës.",
+    "You have no visible notifications in this room.": "S’ka njoftime të dukshme për ju në këtë dhomë.",
+    "Master private key:": "Kyç privat i përgjithshëm:",
+    "%(brand)s Android": "%(brand)s Android"
 }
diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index e5bd6d6f1a..bce9fe6728 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -42,14 +42,13 @@
     "Which rooms would you like to add to this community?": "Које собе желите додати у ову заједницу?",
     "Show these rooms to non-members on the community page and room list?": "Приказати ове собе нечлановима на страници заједнице и у списку соба?",
     "Add rooms to the community": "Додај собе у заједницу",
-    "Room name or alias": "Назив собе или алијас",
     "Add to community": "Додај у заједницу",
     "Failed to invite the following users to %(groupId)s:": "Нисам успео да позовем следеће кориснике у %(groupId)s:",
     "Failed to invite users to community": "Нисам успео да позовем кориснике у заједницу",
     "Failed to invite users to %(groupId)s": "Нисам успео да позовем кориснике у %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Нисам успео да додам следеће собе у %(groupId)s:",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot нема овлашћења за слање обавештења, проверите подешавања вашег прегледача",
-    "Riot was not given permission to send notifications - please try again": "Riot-у није дато овлашћење за слање обавештења, пробајте поново касније",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s нема овлашћења за слање обавештења, проверите подешавања вашег прегледача",
+    "%(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.": "Изгледа да ваша мејл адреса није повезана са Матрикс ИБ-јем на овом кућном серверу.",
@@ -57,7 +56,6 @@
     "Restricted": "Ограничено",
     "Moderator": "Модератор",
     "Admin": "Админ",
-    "Start a chat": "Крени са ћаскањем",
     "Operation failed": "Радња није успела",
     "Failed to invite": "Нисам успео да пошаљем позивницу",
     "Failed to invite the following users to the %(roomName)s room:": "Нисам успео да пошаљем позивницу корисницима за собу %(roomName)s:",
@@ -73,17 +71,11 @@
     "Room %(roomId)s not visible": "Соба %(roomId)s није видљива",
     "Missing user_id in request": "Недостаје user_id у захтеву",
     "Call Failed": "Позивање неуспешно",
-    "Review Devices": "Испрегледај уређаје",
-    "Call Anyway": "Ипак позови",
-    "Answer Anyway": "Ипак одговори",
-    "Call": "Позови",
-    "Answer": "Одговори",
     "Call Timeout": "Прекорачено време позивања",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
     "Usage": "Коришћење",
     "/ddg is not a command": "/ddg није наредба",
     "To use it, just wait for autocomplete results to load and tab through them.": "Да бисте је користили, само сачекајте да се исходи самодовршавања учитају и табом прођите кроз њих.",
-    "Unrecognised room alias:": "Непознати алијас собе:",
     "Ignored user": "Занемарени корисник",
     "You are now ignoring %(userId)s": "Сада занемарујете корисника %(userId)s",
     "Unignored user": "Незанемарени корисник",
@@ -133,15 +125,13 @@
     "%(widgetName)s widget removed by %(senderName)s": "Корисник %(senderName)s је уклонио виџет %(widgetName)s",
     "Failure to create room": "Неуспех при прављењу собе",
     "Server may be unavailable, overloaded, or you hit a bug.": "Сервер је можда недоступан, преоптерећен или сте нашли грешку.",
-    "Send anyway": "Ипак пошаљи",
     "Send": "Пошаљи",
     "Unnamed Room": "Неименована соба",
     "Your browser does not support the required cryptography extensions": "Ваш прегледач не подржава потребна криптографска проширења",
-    "Not a valid Riot keyfile": "Није исправана Riot кључ-датотека",
+    "Not a valid %(brand)s keyfile": "Није исправана %(brand)s кључ-датотека",
     "Authentication check failed: incorrect password?": "Провера идентитета није успела: нетачна лозинка?",
     "Failed to join room": "Нисам успео да уђем у собу",
     "Message Pinning": "Закачене поруке",
-    "Use compact timeline layout": "Користи збијени распоред временске линије",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Прикажи временске жигове у 12-сатном облику (нпр.: 2:30 ПоП)",
     "Always show message timestamps": "Увек прикажи временске жигове",
     "Autoplay GIFs and videos": "Самостално пуштај GIF-ове и видео записе",
@@ -178,11 +168,8 @@
     "Confirm password": "Потврди лозинку",
     "Change Password": "Промени лозинку",
     "Authentication": "Идентификација",
-    "Device ID": "ИБ уређаја",
     "Last seen": "Последњи пут виђен",
     "Failed to set display name": "Нисам успео да поставим приказно име",
-    "Disable Notifications": "Онемогући обавештења",
-    "Enable Notifications": "Омогући обавештења",
     "Cannot add any more widgets": "Не могу да додам још виџета",
     "The maximum permitted number of widgets have already been added to this room.": "Највећи број дозвољених додатих виџета је прекорачен у овој соби.",
     "Add a widget": "Додај виџет",
@@ -196,8 +183,6 @@
     "%(senderName)s uploaded a file": "Корисник %(senderName)s је отпремио датотеку",
     "Options": "Опције",
     "Please select the destination room for this message": "Изаберите одредишну собу за ову поруку",
-    "Blacklisted": "На црном списку",
-    "device id: ": "иб уређаја: ",
     "Disinvite": "Откажи позивницу",
     "Kick": "Избаци",
     "Disinvite this user?": "Отказати позивницу за овог корисника?",
@@ -209,7 +194,6 @@
     "Ban this user?": "Забранити приступ овом кориснику?",
     "Failed to ban user": "Неуспех при забрањивању приступа кориснику",
     "Failed to mute user": "Неуспех при пригушивању корисника",
-    "Failed to toggle moderator status": "Неуспех при промени стања модератора",
     "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?": "Да ли сте сигурни?",
@@ -219,12 +203,8 @@
     "Jump to read receipt": "Скочи на потврду о прочитаности",
     "Mention": "Спомени",
     "Invite": "Позови",
-    "User Options": "Корисничке опције",
-    "Direct chats": "Директна ћаскања",
     "Unmute": "Појачај",
     "Mute": "Утишај",
-    "Revoke Moderator": "Опозови модератора",
-    "Make Moderator": "Учини модератором",
     "Admin Tools": "Админ алатке",
     "and %(count)s others...|other": "и %(count)s других...",
     "and %(count)s others...|one": "и још један други...",
@@ -237,9 +217,7 @@
     "Video call": "Видео позив",
     "Upload file": "Отпреми датотеку",
     "Send an encrypted reply…": "Пошаљи шифровани одговор…",
-    "Send a reply (unencrypted)…": "Пошаљи одговор (нешифровани)…",
     "Send an encrypted message…": "Пошаљи шифровану поруку…",
-    "Send a message (unencrypted)…": "Пошаљи поруку (нешифровану)…",
     "You do not have permission to post to this room": "Немате овлашћење за писање у овој соби",
     "Server error": "Грешка на серверу",
     "Server unavailable, overloaded, or something else went wrong.": "Сервер није доступан или је преоптерећен или је нешто пошло наопако.",
@@ -313,10 +291,7 @@
     "Jump to first unread message.": "Скочи на прву непрочитану поруку.",
     "Close": "Затвори",
     "not specified": "није наведено",
-    "Remote addresses for this room:": "Удаљене адресе за ову собу:",
-    "Local addresses for this room:": "Локална адреса ове собе:",
     "This room has no local addresses": "Ова соба нема локалних адреса",
-    "New address (e.g. #foo:%(localDomain)s)": "Нова адреса (нпр.: #soba:%(localDomain)s)",
     "Invalid community ID": "Неисправан ИБ заједнице",
     "'%(groupId)s' is not a valid community ID": "„%(groupId)s“ није исправан ИБ заједнице",
     "Flair": "Беџ",
@@ -342,12 +317,8 @@
     "Failed to copy": "Нисам успео да ископирам",
     "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?": "Бићете пребачени на сајт треће стране да бисте се идентификовали са својим налогом зарад коришћења уградње %(integrationsUrl)s. Да ли желите да наставите?",
-    "Removed or unknown message type": "Уклоњена порука или порука непознатог типа",
-    "Message removed by %(userId)s": "Поруку је уклонио корисник %(userId)s",
-    "Message removed": "Порука је уклоњена",
     "Custom Server Options": "Прилагођене опције сервера",
     "Dismiss": "Одбаци",
-    "To continue, please enter your password.": "Да бисте наставили, унесите вашу лозинку.",
     "An email has been sent to %(emailAddress)s": "Мејл је послат на адресу %(emailAddress)s",
     "Please check your email to continue registration.": "Проверите ваше сандуче да бисте наставили регистровање.",
     "Token incorrect": "Жетон је нетачан",
@@ -388,14 +359,9 @@
     "Minimize apps": "Умањи апликације",
     "Edit": "Уреди",
     "Create new room": "Направи нову собу",
-    "Unblacklist": "Скини са црног списка",
-    "Blacklist": "Стави на црни списак",
-    "Unverify": "Означи непровереним",
-    "Verify...": "Провери...",
     "No results": "Нема резултата",
     "Communities": "Заједнице",
     "Home": "Почетна",
-    "Could not connect to the integration server": "Не могу да се повежем на сервер за уградње",
     "Manage Integrations": "Управљај уградњама",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s су ушли %(count)s пута",
@@ -454,7 +420,7 @@
     "Custom level": "Прилагођени ниво",
     "Quote": "Цитат",
     "Room directory": "Фасцикла са собама",
-    "Start chat": "Започни ћаскање",
+    "Start chat": "Започни разговор",
     "And %(count)s more...|other": "И %(count)s других...",
     "ex. @bob:example.com": "нпр.: @pera:domen.rs",
     "Add User": "Додај корисника",
@@ -478,15 +444,10 @@
     "Unknown error": "Непозната грешка",
     "Incorrect password": "Нетачна лозинка",
     "Deactivate Account": "Угаси налог",
-    "I verify that the keys match": "Потврђујем да се кључеви подударају",
     "An error has occurred.": "Догодила се грешка.",
     "OK": "У реду",
-    "Start verification": "Започни проверу",
-    "Share without verifying": "Подели без провере",
-    "Ignore request": "Занемари захтев",
-    "Encryption key request": "Захтев за кључ шифровања",
     "Unable to restore session": "Не могу да повратим сесију",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Ако сте претходно користили новије издање Riot-а, ваша сесија може бити некомпатибилна са овим издањем. Затворите овај прозор и вратите се на новије издање.",
+    "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": "Изгледа да ово није исправна мејл адреса",
     "Verification Pending": "Чека се на проверу",
@@ -505,7 +466,6 @@
     "Private Chat": "Приватно ћаскање",
     "Public Chat": "Јавно ћаскање",
     "Custom": "Прилагођено",
-    "Alias (optional)": "Алијас (изборно)",
     "Name": "Име",
     "You must <a>register</a> to use this functionality": "Морате се <a>регистровати</a> да бисте користили ову могућност",
     "You must join the room to see its files": "Морате приступити соби да бисте видели њене датотеке",
@@ -553,14 +513,13 @@
     "For security, this session has been signed out. Please sign in again.": "Зарад безбедности, одјављени сте из ове сесије. Пријавите се поново.",
     "Old cryptography data detected": "Нађени су стари криптографски подаци",
     "The platform you're on": "Платформа коју користите",
-    "The version of Riot.im": "Riot.im издање",
+    "The version of %(brand)s": "%(brand)s издање",
     "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 identity server's URL": "Адреса вашег идентитеског сервера",
     "Analytics": "Аналитика",
-    "The information being sent to us to help make Riot.im better includes:": "У податке које нам шаљете зарад побољшавања Riot.im-а спадају:",
+    "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.": "Ако страница садржи поверљиве податке (као што је назив собе, корисника или ИБ-ја групе), ти подаци се уклањају пре слања на сервер.",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "Корисник %(oldDisplayName)s је променио приказно име у %(displayName)s.",
     "Failed to set direct chat tag": "Нисам успео да поставим ознаку директног ћаскања",
@@ -568,14 +527,13 @@
     "Failed to add tag %(tagName)s to room": "Нисам успео да додам ознаку %(tagName)s на собу",
     "<a>In reply to</a> <pill>": "<a>Као одговор за</a> <pill>",
     "This room is not public. You will not be able to rejoin without an invite.": "Ова соба није јавна. Нећете моћи да поново приступите без позивнице.",
-    "Data from an older version of Riot 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.": "Подаци из старијег издања Riot-а су нађени. Ово ће узроковати лош рад шифровања с краја на крај у старијем издању. Размењене поруке које су шифроване с краја на крај у старијем издању је можда немогуће дешифровати у овом издању. Такође, ово може узроковати неуспешно размењивање порука са овим издањем. Ако доживите проблеме, одјавите се и пријавите се поново. Да бисте задржали историјат поруке, извезите па поново увезите ваше кључеве.",
+    "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-а су нађени. Ово ће узроковати лош рад шифровања с краја на крај у старијем издању. Размењене поруке које су шифроване с краја на крај у старијем издању је можда немогуће дешифровати у овом издању. Такође, ово може узроковати неуспешно размењивање порука са овим издањем. Ако доживите проблеме, одјавите се и пријавите се поново. Да бисте задржали историјат поруке, извезите па поново увезите ваше кључеве.",
     "Logout": "Одјава",
     "Your Communities": "Ваше заједнице",
     "Error whilst fetching joined communities": "Грешка приликом добављања списка са приступљеним заједницама",
     "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.": "Направите заједницу да бисте спојили кориснике и собе! Направите прилагођену почетну страницу да бисте означили ваш кутак у Матрикс универзуму.",
     "You have no visible notifications": "Немате видљивих обавештења",
-    "Scroll to bottom of page": "Превуци на дно странице",
     "%(count)s of your messages have not been sent.|other": "Неке ваше поруке нису послате.",
     "%(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> сада. Такође можете изабрати појединачне поруке за поновно слање или отказивање.",
@@ -590,7 +548,6 @@
     "Search failed": "Претрага је неуспешна",
     "Server may be unavailable, overloaded, or search timed out :(": "Сервер је можда недоступан, преоптерећен или је истекло време претраживања :(",
     "No more results": "Нема више резултата",
-    "Unknown room %(roomId)s": "Непозната соба %(roomId)s",
     "Room": "Соба",
     "Failed to reject invite": "Нисам успео да одбацим позивницу",
     "Fill screen": "Испуни екран",
@@ -604,8 +561,6 @@
     "Uploading %(filename)s and %(count)s others|other": "Отпремам датотеку %(filename)s и још %(count)s других",
     "Uploading %(filename)s and %(count)s others|zero": "Отпремам датотеку %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Отпремам датотеку %(filename)s и %(count)s других датотека",
-    "Light theme": "Светла тема",
-    "Dark theme": "Тамна тема",
     "Sign out": "Одјави ме",
     "Failed to change password. Is your password correct?": "Нисам успео да променим лозинку. Да ли је ваша лозинка тачна?",
     "Success": "Успех",
@@ -613,7 +568,7 @@
     "<not supported>": "<није подржано>",
     "Import E2E room keys": "Увези E2E кључеве собе",
     "Cryptography": "Криптографија",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot прикупља анонимне податке о коришћењу да бисмо побољшали апликацију.",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s прикупља анонимне податке о коришћењу да бисмо побољшали апликацију.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Приватност је веома важна нама те не сакупљамо било какве податке личне природе у нашој аналитици.",
     "Learn more about how we use analytics.": "Сазнајте више о нашем начину употребе аналитике.",
     "Labs": "Лабораторије",
@@ -621,7 +576,7 @@
     "Reject all %(invitedRooms)s invites": "Одбиј све позивнице за собе %(invitedRooms)s",
     "Start automatically after system login": "Самостално покрећи након пријаве на систем",
     "No media permissions": "Нема овлашћења за медије",
-    "You may need to manually permit Riot to access your microphone/webcam": "Можда ћете морати да ручно доделите овлашћења Riot-у за приступ микрофону/веб камери",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "Можда ћете морати да ручно доделите овлашћења %(brand)s-у за приступ микрофону/веб камери",
     "No Microphones detected": "Нема уочених микрофона",
     "No Webcams detected": "Нема уочених веб камера",
     "Default Device": "Подразумевани уређај",
@@ -635,7 +590,7 @@
     "click to reveal": "кликни за приказ",
     "Homeserver is": "Кућни сервер је",
     "Identity Server is": "Идентитетски сервер је",
-    "riot-web version:": "riot-web издање:",
+    "%(brand)s version:": "%(brand)s издање:",
     "olm version:": "olm издање:",
     "Failed to send email": "Нисам успео да пошаљем мејл",
     "The email address linked to your account must be entered.": "Морате унети мејл адресу која је везана за ваш налог.",
@@ -661,7 +616,6 @@
     "Define the power level of a user": "Дефинише ниво моћи корисника",
     "Deops user with given id": "Укида админа за корисника са датим иб-јем",
     "Invites user with given id to current room": "Позива корисника са датим иб-јем у тренутну собу",
-    "Joins room with given alias": "Приступа соби са датим алијасем",
     "Kicks user with given id": "Избацује корисника са датим иб-јем",
     "Changes your display nickname": "Мења ваш приказни надимак",
     "Searches DuckDuckGo for results": "Претражује DuckDuckGo за резултате",
@@ -673,21 +627,7 @@
     "Notify the whole room": "Обавести све у соби",
     "Room Notification": "Собно обавештење",
     "Users": "Корисници",
-    "unknown device": "непознати уређај",
-    "NOT verified": "НИЈЕ проверен",
-    "verified": "проверен",
-    "Verification": "Провера",
-    "Ed25519 fingerprint": "Ed25519 отисак прста",
-    "User ID": "Кориснички ИБ",
-    "Curve25519 identity key": "Curve25519 идентитески кључ",
-    "none": "ништа",
-    "Claimed Ed25519 fingerprint key": "Наводни Ed25519 кључ отиска прста",
-    "Algorithm": "Алгоритам",
-    "unencrypted": "нешифрован",
-    "Decryption error": "Грешка дешифровања",
     "Session ID": "ИБ сесије",
-    "End-to-end encryption information": "Подаци о шифровању с краја на крај",
-    "Event information": "Подаци о догађају",
     "Passphrases must match": "Фразе се морају подударати",
     "Passphrase must not be empty": "Фразе не смеју бити празне",
     "Export room keys": "Извези кључеве собе",
@@ -701,12 +641,11 @@
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Извезена датотека ће бити заштићена са фразом. Требало би да унесете фразу овде, да бисте дешифровали датотеку.",
     "File to import": "Датотека за увоз",
     "Import": "Увези",
-    "Did you know: you can use communities to filter your Riot.im experience!": "Да ли сте знали: можете користити заједнице за филтрирање вашег Riot.im искуства!",
+    "Did you know: you can use communities to filter your %(brand)s experience!": "Да ли сте знали: можете користити заједнице за филтрирање вашег %(brand)s искуства!",
     "Clear filter": "Очисти филтер",
     "Key request sent.": "Захтев за дељење кључа послат.",
     "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.": "Да бисте поставили филтер, повуците аватар заједнице на површ филтрирања скроз на леву страну екрана. Можете кликнути на аватар у површи филтрирања било када да бисте видели само собе и особе везане за ту заједницу.",
     "Fetching third party location failed": "Добављање локације треће стране није успело",
-    "A new version of Riot is available.": "Ново издање RIot-а је доступно.",
     "Send Account Data": "Пошаљи податке налога",
     "All notifications are currently disabled for all targets.": "Сва обавештења су тренутно онемогућена за све циљеве.",
     "Uploading report": "Отпремам извештај",
@@ -725,8 +664,6 @@
     "Send Custom Event": "Пошаљи прилагођени догађај",
     "Off": "Искључено",
     "Advanced notification settings": "Напредна подешавања обавештења",
-    "delete the alias.": "обриши алијас.",
-    "To return to your account in future you need to <u>set a password</u>": "Да бисте се вратили на ваш налог у будућности, морате <u>поставити лозинку</u>",
     "Forget": "Заборави",
     "You cannot delete this image. (%(code)s)": "Не можете обрисати ову слику. (%(code)s)",
     "Cancel Sending": "Откажи слање",
@@ -749,7 +686,6 @@
     "No update available.": "Нема нових ажурирања.",
     "Noisy": "Бучно",
     "Collecting app version information": "Прикупљам податке о издању апликације",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Обрисати алијас собе %(alias)s и уклонити %(name)s из фасцикле?",
     "Keywords": "Кључне речи",
     "Enable notifications for this account": "Омогући обавештења за овај налог",
     "Invite to this community": "Позови у ову заједницу",
@@ -760,7 +696,7 @@
     "Enter keywords separated by a comma:": "Унесите кључне речи одвојене зарезима:",
     "Forward Message": "Проследи поруку",
     "Remove %(name)s from the directory?": "Уклонити %(name)s из фасцикле?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot користи напредне могућности прегледача од којих неке нису доступне или су у пробној фази, у вашем прегледачу.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s користи напредне могућности прегледача од којих неке нису доступне или су у пробној фази, у вашем прегледачу.",
     "Event sent!": "Догађај је послат!",
     "Explore Account Data": "Истражи податке налога",
     "All messages (noisy)": "Све поруке (гласно)",
@@ -796,14 +732,13 @@
     "Invite to this room": "Позови у ову собу",
     "You cannot delete this message. (%(code)s)": "Не можете обрисати ову поруку. (%(code)s)",
     "Thursday": "Четвртак",
-    "I understand the risks and wish to continue": "Разумем опасност и желим да наставим",
+    "I understand the risks and wish to continue": "Разумем могуће последице и желим наставити",
     "Back": "Назад",
     "Reply": "Одговори",
     "Show message in desktop notification": "Прикажи поруку у стоном обавештењу",
     "Unhide Preview": "Откриј преглед",
     "Unable to join network": "Не могу да приступим мрежи",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Можда сте их подесили у неком другом клијенту а не Riot-у. Не можете их преправљати у Riot-у али се и даље примењују",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Нажалост, ваш прегледач <b>не може</b> да покреће Riot.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Нажалост, ваш прегледач <b>не може</b> да покреће %(brand)s.",
     "Messages in group chats": "Поруке у групним ћаскањима",
     "Yesterday": "Јуче",
     "Error encountered (%(errorDetail)s).": "Догодила се грешка (%(errorDetail)s).",
@@ -813,7 +748,7 @@
     "Set Password": "Постави лозинку",
     "An error occurred whilst saving your email notification preferences.": "Догодила се грешка при чувању ваших поставки мејл обавештења.",
     "Resend": "Поново пошаљи",
-    "Riot does not know how to join a room on this network": "Riot не зна како да приступи соби на овој мрежи",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s не зна како да приступи соби на овој мрежи",
     "Mentions only": "Само спомињања",
     "You can now return to your account after signing out, and sign in on other devices.": "Можете се вратити у ваш налог након што се одјавите и пријавите поново, на другим уређајима.",
     "Enable email notifications": "Омогући мејл обавештења",
@@ -827,8 +762,6 @@
     "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...": "Проверавам ажурирања...",
-    "There are advanced notifications which are not shown here": "Постоје напредна обавештења која нису приказана овде",
-    "Your User Agent": "Ваш кориснички агент",
     "Every page you use in the app": "Свака страница коју будете користили у апликацији",
     "e.g. <CurrentPageURL>": "Нпр.: <CurrentPageURL>",
     "Your device resolution": "Резолуција вашег уређаја",
@@ -864,9 +797,6 @@
     "Send analytics data": "Пошаљи аналитичке податке",
     "Enable widget screenshots on supported widgets": "Омогући снимке екрана виџета у подржаним виџетима",
     "Muted Users": "Утишани корисници",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Помозите побољшавање Riot.im програма тако што ћете послати <UsageDataLink>анонимне податке о коришћењу</UsageDataLink>. Ово ће захтевати коришћење колачића (погледајте нашу <PolicyLink>политику о колачићима</PolicyLink>).",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Помозите побољшавање Riot.im програма тако што ћете послати <UsageDataLink>анонимне податке о коришћењу</UsageDataLink>. Ово ће захтевати коришћење колачића.",
-    "Yes, I want to help!": "Да, желим помоћи!",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Не могу да учитам догађај на који је послат одговор, или не постоји или немате овлашћење да га погледате.",
     "To continue, please enter your password:": "Да бисте наставили, унесите вашу лозинку:",
     "Collapse Reply Thread": "Скупи нит са одговорима",
@@ -902,8 +832,6 @@
     "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.": "Нисам могао да учитам! Проверите вашу мрежну везу и пробајте поново.",
-    "Registration Required": "Потребна је регистрација",
-    "You need to register to do this. Would you like to register now?": "Морате се регистровати да бисте урадили ово. Да ли желите да се региструјете сада?",
     "Failed to invite users to the room:": "Нисам успео да позовем кориснике у собу:",
     "Upgrades a room to a new version": "Надограђује собу на ново издање",
     "Gets or sets the room topic": "Добавља или поставља тему собе",
@@ -923,12 +851,9 @@
     "Sign in instead": "Пријава са постојећим налогом",
     "Create your account": "Направите ваш налог",
     "Create account": "Направи налог",
-    "Waiting for %(userId)s to confirm...": "Чекам да корисник %(userId)s потврди...",
     "Waiting for partner to confirm...": "Чекам да партнер потврди...",
     "Confirm": "Потврди",
     "A verification email will be sent to your inbox to confirm setting your new password.": "Мејл потврде ће бити послат у ваше сандуче да бисмо потврдили постављање ваше нове лозинке.",
-    "Please enter your passphrase a second time to confirm.": "Унесите вашу фразу други пут да бисте је потврдили.",
-    "Confirm your passphrase": "Потврдите вашу фразу",
     "Email (optional)": "Мејл (изборно)",
     "Your 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>.": "Унесите адресу вашег Модулар кућног сервера. Можете користити ваш домен или унети поддомен на домену <a>modular.im</a>.",
@@ -943,5 +868,180 @@
     "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",
-    "A conference call could not be started because the integrations server is not available": "Конференцијски позив није могао бити започет јер интеграциони сервер није расположив"
+    "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": "Додај е-адресу",
+    "Room name or address": "Назив собе или адреса",
+    "Identity server has no terms of service": "Идентитетски сервер нема услове коришћења",
+    "Changes your avatar in all rooms": "Промените ваш аватар у свим собама",
+    "%(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 је започео видео позив.",
+    "%(senderName)s placed a video call. (not supported by this browser)": "Корисник %(senderName)s је започео видео позив. (није подржано од стране овог прегледача)",
+    "You do not have permission to invite people to this room.": "Немате дозволу за позивање људи у ову собу.",
+    "Set up encryption": "Подеси шифровање",
+    "Encryption upgrade available": "Надоградња шифровања је доступна",
+    "You changed the room name": "Променили сте назив собе",
+    "%(senderName)s changed the room name": "Корисник %(senderName)s је променио назив собе",
+    "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
+    "You changed the room topic": "Променили сте тему собе",
+    "%(senderName)s changed the room topic": "Корисник %(senderName)s је променио тему собе",
+    "Multiple integration managers": "Више управника уградњи",
+    "Try out new ways to ignore people (experimental)": "Испробајте нове начине за игнорисање људи (у пробној фази)",
+    "Show info about bridges in room settings": "Прикажи податке о мостовима у подешавањима собе",
+    "Enable Emoji suggestions while typing": "Омогући предлоге емоџија приликом куцања",
+    "Upload": "Отпреми",
+    "Show more": "Прикажи више",
+    "Connecting to integration manager...": "Повезујем се на управника уградњи…",
+    "Cannot connect to integration manager": "Не могу се повезати на управника уградњи",
+    "<a>Upgrade</a> to your own domain": "<a>Искористите</a> ваш сопствени домен",
+    "Email addresses": "Мејл адресе",
+    "Phone numbers": "Бројеви телефона",
+    "Set a new account password...": "Подеси нову лозинку налога…",
+    "Language and region": "Језик и област",
+    "General": "Опште",
+    "Discovery": "Откривање",
+    "None": "Ништа",
+    "Security & Privacy": "Безбедност и приватност",
+    "Change room name": "Промени назив собе",
+    "Enable room encryption": "Омогући шифровање собе",
+    "Roles & Permissions": "Улоге и дозволе",
+    "Enable encryption?": "Омогућити шифровање?",
+    "Encryption": "Шифровање",
+    "Once enabled, encryption cannot be disabled.": "Након омогућавања, шифровање се не можете онемогућити.",
+    "Discovery options will appear once you have added an email above.": "Опције откривања појавиће се након што додате мејл адресу изнад.",
+    "Discovery options will appear once you have added a phone number above.": "Опције откривања појавиће се након што додате број телефона изнад.",
+    "Email Address": "Е-адреса",
+    "Phone Number": "Број телефона",
+    "Encrypted by an unverified session": "Шифровано од стране непотврђене сесије",
+    "Scroll to most recent messages": "Пребаци на најновије поруке",
+    "Emoji picker": "Бирач емоџија",
+    "Send a message…": "Пошаљи поруку…",
+    "Direct Messages": "Непосредне поруке",
+    "Create room": "Направи собу",
+    "People": "Људи",
+    "Forget this room": "Заборави ову собу",
+    "Start chatting": "Започни ћаскање",
+    "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Поруке у овој соби су обезбеђене шифровањем с краја на крај. Само ви и ваши саговорници имате кључеве потребне за читање ових порука.",
+    "List options": "Прикажи опције",
+    "Use default": "Користи подразумевано",
+    "Mentions & Keywords": "Спомињања и кључне речи",
+    "Notification options": "Опције обавештавања",
+    "Forget Room": "Заборави собу",
+    "Room options": "Опције собе",
+    "Mark all as read": "Означи све као прочитано",
+    "Room Name": "Назив собе",
+    "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": "Једна потврђена сесија",
+    "Hide verified sessions": "Сакриј потврђене сесије",
+    "Remove recent messages by %(user)s": "Уклони недавне поруке корисника %(user)s",
+    "Remove recent messages": "Уклони недавне поруке",
+    "Encryption enabled": "Шифровање омогућено",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "Поруке у овој соби су шифроване с краја на крај. Сазнајте више и потврдите овог корисника у његовом корисничком профилу.",
+    "Encryption not enabled": "Шифровање није омогућено",
+    "The encryption used by this room isn't supported.": "Начин шифровања унутар ове собе није подржан.",
+    "React": "Реагуј",
+    "Reactions": "Реакције",
+    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> реаговали са %(content)s</reactedWith>",
+    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>реаговали са %(shortName)s</reactedWith>",
+    "Smileys & People": "Смешци и особе",
+    "Quick Reactions": "Брзе реакције",
+    "Widgets do not use message encryption.": "Виџети не користе шифровање порука.",
+    "Join": "Приступи",
+    "Enable end-to-end encryption": "Омогући шифровање с краја на крај",
+    "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": "Пријави садржај администратору вашег кућног сервера",
+    "Room Settings - %(roomName)s": "Подешавања собе - %(roomName)s",
+    "Terms of Service": "Услови коришћења",
+    "To continue you need to accept the terms of this service.": "За наставак, морате прихватити услове коришћења ове услуге.",
+    "Service": "Услуга",
+    "Summary": "Сажетак",
+    "Document": "Документ",
+    "Resend %(unsentCount)s reaction(s)": "Поново пошаљи укупно %(unsentCount)s реакција",
+    "Share Permalink": "Подели трајну везу",
+    "Report Content": "Пријави садржај",
+    "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": "Претпреглед",
+    "Switch to light mode": "Пребаци на светлу тему",
+    "Switch to dark mode": "Пребаци на тамну тему",
+    "Security & privacy": "Безбедност и приватност",
+    "All settings": "Сва подешавања",
+    "Feedback": "Повратни подаци",
+    "General failure": "Општа грешка",
+    "Copy": "Копирај",
+    "Go Back": "Назад",
+    "We’re excited to announce Riot is now Element": "Са радошћу објављујемо да је Рајот (Riot) сада Елемент (Element)",
+    "Riot is now Element!": "Рајот (Riot) је сада Елемент!",
+    "Send a bug report with logs": "Пошаљи извештај о грешци са записницима",
+    "Light": "Светла",
+    "Dark": "Тамна",
+    "a few seconds ago": "пре неколико секунди",
+    "about a minute ago": "пре једног минута",
+    "%(num)s minutes ago": "пре %(num)s минута",
+    "about an hour ago": "пре једног часа",
+    "%(num)s hours ago": "пре %(num)s часова",
+    "about a day ago": "пре једног дана",
+    "%(num)s days ago": "пре %(num)s дана",
+    "Font size": "Величина фонта",
+    "Use custom size": "Користи прилагођену величину",
+    "Use a more compact ‘Modern’ layout": "Користи збијенији распоред звани „Модерн“",
+    "Match system theme": "Прати тему система",
+    "Use a system font": "Користи системски фонт",
+    "System font name": "Назив системског фонта",
+    "Show rooms with unread notifications first": "Прво прикажи собе са непрочитаним обавештењима",
+    "Enable experimental, compact IRC style layout": "Омогући пробни, збијенији распоред у IRC стилу",
+    "Got It": "Разумем",
+    "Light bulb": "Сијалица",
+    "Algorithm: ": "Алгоритам: ",
+    "Go back": "Назад",
+    "Hey you. You're the best!": "Хеј! Само напред!",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "Прилагођена величина фонта може бити између %(min)s и %(max)s тачака",
+    "Theme added!": "Тема додата!",
+    "Custom theme URL": "Адреса прилагођене теме",
+    "Add theme": "Додај тему",
+    "Theme": "Тема",
+    "Customise your appearance": "Прилагодите изглед",
+    "Appearance Settings only affect this %(brand)s session.": "Подешавања изгледа се примењују само на %(brand)s сесију.",
+    "Help & About": "Помоћ и подаци о програму",
+    "Preferences": "Поставке",
+    "Voice & Video": "Глас и видео",
+    "Unable to revoke sharing for email address": "Не могу да опозовем дељење ове мејл адресе",
+    "Revoke": "Опозови",
+    "Unable to revoke sharing for phone number": "Не могу да опозовем дељење броја телефона",
+    "Send a reply…": "Пошаљи одговор…",
+    "No recently visited rooms": "Нема недавно посећених соба",
+    "Appearance": "Изглед",
+    "Show rooms with unread messages first": "Прво прикажи собе са непрочитаним порукама",
+    "Show previews of messages": "Прикажи претпрегледе порука",
+    "Sort by": "Поређај по",
+    "Activity": "Активности",
+    "A-Z": "А-Ш",
+    "Send as message": "Пошаљи у облику поруке",
+    "Failed to revoke invite": "Неуспех при отказивању позивнице",
+    "Revoke invite": "Откажи позивницу",
+    "Got it": "Разумем",
+    "Categories": "Категорије",
+    "Your theme": "Ваша тема",
+    "Looks good": "Изгледа добро",
+    "Show advanced": "Прикажи напредно",
+    "Recent Conversations": "Недавни разговори",
+    "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": "Промени тему"
 }
diff --git a/src/i18n/strings/sr_Latn.json b/src/i18n/strings/sr_Latn.json
index 810f2a97cf..19778858d0 100644
--- a/src/i18n/strings/sr_Latn.json
+++ b/src/i18n/strings/sr_Latn.json
@@ -5,22 +5,20 @@
     "Failed to verify email address: make sure you clicked the link in the email": "Neuspela provera adrese elektronske pošte: proverite da li ste kliknuli na link u poruci elektronske pošte",
     "Add Phone Number": "Dodajte broj telefona",
     "The platform you're on": "Platforma koju koristite",
-    "The version of Riot.im": "Verzija Riot.im",
+    "The version of %(brand)s": "Verzija %(brand)s",
     "Whether or not you're logged in (we don't record your username)": "Da li ste prijavljeni ili ne (ne beležimo vaše korisničko ime)",
     "Your language of choice": "Vaš izbor jezika",
     "Which officially provided instance you are using, if any": "Koju zvaničnu instancu koristite, ako koristite",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Da li koristite režim bogatog teksta u uređivaču bogatog teksta",
     "Your homeserver's URL": "URL vašeg kućnog servera",
-    "Your identity server's URL": "URL vašeg servera identiteta",
     "e.g. %(exampleValue)s": "npr. %(exampleValue)s",
     "Dismiss": "Odbaci",
-    "Your Riot is misconfigured": "Vaš Riot nije dobro podešen",
-    "Chat with Riot Bot": "Ćaskajte sa Riot botom",
+    "Your %(brand)s is misconfigured": "Vaš %(brand)s nije dobro podešen",
+    "Chat with %(brand)s Bot": "Ćaskajte sa %(brand)s botom",
     "Sign In": "Prijavite se",
     "powered by Matrix": "pokreće Matriks",
     "Custom Server Options": "Prilagođene opcije servera",
     "Explore rooms": "Istražite sobe",
-    "Send anyway": "Ipak pošalji",
     "Send": "Pošalji",
     "Sun": "Ned",
     "Mon": "Pon",
@@ -47,17 +45,14 @@
     "Unnamed Room": "Soba bez imena",
     "Error": "Greška",
     "Unable to load! Check your network connectivity and try again.": "Neuspelo učitavanje! Proverite vašu mrežu i pokušajte ponovo.",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot nema dozvolu da vam šalje obaveštenja. Molim proverite podešavanja vašeg internet pregledača",
-    "Riot was not given permission to send notifications - please try again": "Riot nije dobio dozvolu da šalje obaveštenja. Molim pokušajte ponovo",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s nema dozvolu da vam šalje obaveštenja. Molim proverite podešavanja vašeg internet pregledača",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s nije dobio dozvolu da šalje obaveštenja. Molim pokušajte ponovo",
     "This email address was not found": "Ova adresa elektronske pošte nije pronađena",
-    "Registration Required": "Potrebna je registracija",
-    "You need to register to do this. Would you like to register now?": "Morate biti registrovani da bi uradili ovo. Da li želite da se registrujete sad?",
     "Register": "Registruj se",
     "Default": "Podrazumevano",
     "Restricted": "Ograničeno",
     "Moderator": "Moderator",
     "Admin": "Administrator",
-    "Start a chat": "Pokreni ćaskanje",
     "Operation failed": "Operacija nije uspela",
     "Failed to invite": "Slanje pozivnice nije uspelo",
     "Failed to invite users to the room:": "Nije uspelo pozivanje korisnika u sobu:",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 3edb02df92..b2c7623fca 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -7,12 +7,11 @@
     "No Microphones detected": "Ingen mikrofon hittades",
     "No Webcams detected": "Ingen webbkamera hittades",
     "No media permissions": "Inga mediebehörigheter",
-    "You may need to manually permit Riot to access your microphone/webcam": "Du måste manuellt tillåta Riot att komma åt din mikrofon/kamera",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "Du måste manuellt tillåta %(brand)s att komma åt din mikrofon/kamera",
     "Default Device": "Standardenhet",
     "Microphone": "Mikrofon",
     "Camera": "Kamera",
     "Advanced": "Avancerat",
-    "Algorithm": "Algoritm",
     "Always show message timestamps": "Visa alltid tidsstämpel för meddelanden",
     "Authentication": "Autentisering",
     "%(items)s and %(lastItem)s": "%(items)s och %(lastItem)s",
@@ -28,7 +27,6 @@
     "Are you sure you want to leave the room '%(roomName)s'?": "Vill du lämna rummet '%(roomName)s'?",
     "Autoplay GIFs and videos": "Spela automatiskt upp GIFar och videor",
     "Are you sure you want to reject the invitation?": "Är du säker på att du vill avböja inbjudan?",
-    "Blacklisted": "Svartlistad",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s bannade %(targetName)s.",
     "Banned users": "Bannade användare",
     "Bans user with given id": "Bannar användare med givet id",
@@ -42,7 +40,6 @@
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s tog bort rummets namn.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s bytte rummets ämne till \"%(topic)s\".",
     "Changes your display nickname": "Ändrar ditt visningsnamn",
-    "Claimed Ed25519 fingerprint key": "Påstådd Ed25519-fingeravtrycksnyckel",
     "Click here to fix": "Klicka här för att fixa",
     "Click to mute audio": "Klicka för att tysta ljud",
     "Click to mute video": "Klicka för att stänga av video",
@@ -53,33 +50,24 @@
     "Commands": "Kommandon",
     "Confirm password": "Bekräfta lösenord",
     "Continue": "Fortsätt",
-    "Could not connect to the integration server": "Det gick inte att ansluta till integrationsservern",
     "Create Room": "Skapa rum",
     "Cryptography": "Kryptografi",
     "Current password": "Nuvarande lösenord",
-    "Curve25519 identity key": "Curve25519 -identitetsnyckel",
     "Custom level": "Anpassad nivå",
     "/ddg is not a command": "/ddg är inte ett kommando",
     "Deactivate Account": "Inaktivera konto",
     "Decrypt %(text)s": "Dekryptera %(text)s",
-    "Decryption error": "Dekrypteringsfel",
     "Deops user with given id": "Degraderar användare med givet id",
     "Default": "Standard",
-    "Device ID": "Enhets-ID",
-    "device id: ": "enhets-id: ",
-    "Direct chats": "Direkt-chattar",
     "Disinvite": "Häv inbjudan",
     "Displays action": "Visar åtgärd",
     "Download %(text)s": "Ladda ner %(text)s",
-    "Ed25519 fingerprint": "Ed25519-fingeravtryck",
     "Email": "Epost",
     "Email address": "Epostadress",
     "Emoji": "Emoji",
     "%(senderName)s ended the call.": "%(senderName)s avslutade samtalet.",
-    "End-to-end encryption information": "Krypteringsinformation",
     "Error": "Fel",
     "Error decrypting attachment": "Det gick inte att dekryptera bilagan",
-    "Event information": "Händelseinformation",
     "Existing Call": "Existerande samtal",
     "Export": "Exportera",
     "Export E2E room keys": "Exportera krypteringsrumsnycklar",
@@ -97,24 +85,20 @@
     "Failed to send email": "Det gick inte att skicka epost",
     "Failed to send request.": "Det gick inte att sända begäran.",
     "Failed to set display name": "Det gick inte att ange visningsnamn",
-    "Failed to toggle moderator status": "Det gick inte att växla moderator-status",
     "Failed to unban": "Det gick inte att avbanna",
-    "Failed to verify email address: make sure you clicked the link in the email": "Det gick inte att bekräfta epostadressen, klicka på länken i epostmeddelandet",
+    "Failed to verify email address: make sure you clicked the link in the email": "Det gick inte att bekräfta e-postadressen, klicka på länken i e-postmeddelandet",
     "Favourite": "Favorit",
     "Accept": "Godkänn",
     "Access Token:": "Åtkomsttoken:",
     "Active call (%(roomName)s)": "Aktiv samtal (%(roomName)s)",
     "Add": "Lägg till",
     "Admin Tools": "Admin-verktyg",
-    "Alias (optional)": "Alias (valfri)",
     "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.": "Det gick inte att ansluta till hemservern - kontrollera anslutningen, se till att <a>hemserverns SSL-certifikat</a> är betrott, och att inget webbläsartillägg blockerar förfrågningar.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ändrade behörighetsnivå för %(powerLevelDiffText)s.",
     "Close": "Stäng",
     "Custom": "Egen",
     "Decline": "Avvisa",
-    "Disable Notifications": "Slå av aviseringar",
     "Drop File Here": "Dra filen hit",
-    "Enable Notifications": "Aktivera aviseringar",
     "Enter passphrase": "Ange lösenfras",
     "Error: Problem communicating with the given homeserver.": "Fel: Det gick inte att kommunicera med den angivna hemservern.",
     "Failed to fetch avatar URL": "Det gick inte att hämta avatar-URL",
@@ -150,7 +134,6 @@
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Gå med som <voiceText>röst</voiceText> eller <videoText>video</videoText>.",
     "Join Room": "Gå med i rum",
     "%(targetName)s joined the room.": "%(targetName)s gick med i rummet.",
-    "Joins room with given alias": "Går med i rummet med givet alias",
     "Jump to first unread message.": "Hoppa till första olästa meddelande.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s kickade %(targetName)s.",
     "Kick": "Kicka",
@@ -159,7 +142,6 @@
     "Last seen": "Senast sedd",
     "Leave room": "Lämna rummet",
     "%(targetName)s left the room.": "%(targetName)s lämnade rummet.",
-    "Local addresses for this room:": "Lokala adresser för rummet:",
     "Logout": "Logga ut",
     "Low priority": "Låg prioritet",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gjorde framtida rumshistorik synligt för alla rumsmedlemmar från att de bjöds in.",
@@ -172,15 +154,12 @@
     "Moderator": "Moderator",
     "Mute": "Tysta",
     "Name": "Namn",
-    "New address (e.g. #foo:%(localDomain)s)": "Ny address (t.ex. #foo:%(localDomain)s)",
     "New passwords don't match": "De nya lösenorden matchar inte",
     "New passwords must match each other.": "De nya lösenorden måste vara de samma.",
-    "none": "inget",
     "not specified": "inte specifierad",
     "Notifications": "Aviseringar",
     "(not supported by this browser)": "(stöds inte av webbläsaren)",
     "<not supported>": "<stöds inte>",
-    "NOT verified": "INTE verifierad",
     "No display name": "Inget visningsnamn",
     "No more results": "Inga fler resultat",
     "No results": "Inga resultat",
@@ -200,32 +179,28 @@
     "Profile": "Profil",
     "Public Chat": "Offentlig chatt",
     "Reason": "Orsak",
-    "Revoke Moderator": "Degradera moderator",
     "Register": "Registrera",
     "%(targetName)s rejected the invitation.": "%(targetName)s avvisade inbjudan.",
     "Reject invitation": "Avböj inbjudan",
-    "Remote addresses for this room:": "Fjärradresser för det här rummet:",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s tog bort sitt visningsnamn (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s tog bort sin profilbild.",
     "Remove": "Ta bort",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s begärde en VoIP-konferens.",
     "Results from DuckDuckGo": "Resultat från DuckDuckGo",
     "Return to login screen": "Tillbaka till login-skärmen",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot har inte tillstånd att skicka aviseringar - kontrollera webbläsarens inställningar",
-    "Riot was not given permission to send notifications - please try again": "Riot fick inte tillstånd att skicka aviseringar - försök igen",
-    "riot-web version:": "riot-web -version:",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s har inte tillstånd att skicka aviseringar - kontrollera webbläsarens inställningar",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s fick inte tillstånd att skicka aviseringar - försök igen",
+    "%(brand)s version:": "%(brand)s -version:",
     "Room %(roomId)s not visible": "Rummet %(roomId)s är inte synligt",
     "Room Colour": "Rumsfärg",
     "%(roomName)s does not exist.": "%(roomName)s finns inte.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s är inte tillgängligt för tillfället.",
     "Rooms": "Rum",
     "Save": "Spara",
-    "Scroll to bottom of page": "Gå till slutet av sidan",
     "Search": "Sök",
     "Search failed": "Sökning misslyckades",
     "Searches DuckDuckGo for results": "Söker efter resultat på DuckDuckGo",
     "Seen by %(userName)s at %(dateTime)s": "Sedd av %(userName)s %(dateTime)s",
-    "Send anyway": "Skicka ändå",
     "Send Reset Email": "Skicka återställningsmeddelande",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s skickade en bild.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s bjöd in %(targetDisplayName)s med i rummet.",
@@ -243,7 +218,6 @@
     "Sign out": "Logga ut",
     "%(count)s of your messages have not been sent.|other": "Vissa av dina meddelanden har inte skickats.",
     "Someone": "Någon",
-    "Start a chat": "Starta en chatt",
     "Start authentication": "Starta autentisering",
     "Cancel": "Avbryt",
     "Create new room": "Skapa nytt rum",
@@ -261,12 +235,12 @@
     "Edit": "Ändra",
     "Enable automatic language detection for syntax highlighting": "Aktivera automatisk språkdetektering för syntaxmarkering",
     "Publish this room to the public in %(domain)s's room directory?": "Publicera rummet i den offentliga rumskatalogen på %(domain)s?",
-    "AM": "a.m.",
-    "PM": "p.m.",
+    "AM": "AM",
+    "PM": "PM",
     "Submit": "Lämna in",
     "The maximum permitted number of widgets have already been added to this room.": "Den största tillåtna mängden widgetar har redan tillsats till rummet.",
     "The phone number entered looks invalid": "Det angivna telefonnumret är ogiltigt",
-    "This email address is already in use": "Den här epostadressen används redan",
+    "This email address is already in use": "Den här e-postadressen används redan",
     "This email address was not found": "Den här epostadressen finns inte",
     "The email address linked to your account must be entered.": "Epostadressen som är kopplad till ditt konto måste anges.",
     "Online": "Online",
@@ -275,11 +249,8 @@
     "Guests can join": "Gäster kan gå med i rummet",
     "No rooms to show": "Inga fler rum att visa",
     "This phone number is already in use": "Detta telefonnummer används redan",
-    "The version of Riot.im": "Versionen av Riot.im",
+    "The version of %(brand)s": "Version av %(brand)s",
     "Call Failed": "Samtal misslyckades",
-    "Call Anyway": "Ring ändå",
-    "Call": "Ring",
-    "Answer": "Svara",
     "You are already in a call.": "Du är redan i ett samtal.",
     "You cannot place a call with yourself.": "Du kan inte ringa till dig själv.",
     "Warning!": "Varning!",
@@ -291,23 +262,21 @@
     "Thu": "Tors",
     "Fri": "Fre",
     "Sat": "Lör",
-    "Jan": "jan",
-    "Feb": "feb",
-    "Mar": "mar",
-    "Apr": "apr",
-    "May": "maj",
-    "Jun": "jun",
-    "Jul": "jul",
-    "Aug": "aug",
-    "Sep": "sep",
-    "Oct": "okt",
-    "Nov": "nov",
-    "Dec": "dec",
+    "Jan": "Jan",
+    "Feb": "Feb",
+    "Mar": "Mar",
+    "Apr": "Apr",
+    "May": "Maj",
+    "Jun": "Jun",
+    "Jul": "Jul",
+    "Aug": "Aug",
+    "Sep": "Sep",
+    "Oct": "Okt",
+    "Nov": "Nov",
+    "Dec": "Dec",
     "Invite to Community": "Bjud in till community",
     "Unable to enable Notifications": "Det går inte att aktivera aviseringar",
-    "The information being sent to us to help make Riot.im better includes:": "Informationen som skickas till oss för att hjälpa Riot.im att bli bättre inkluderar:",
-    "Review Devices": "Granska enheter",
-    "Answer Anyway": "Svara ändå",
+    "The information being sent to us to help make %(brand)s better includes:": "Informationen som skickas till oss för att förbättra %(brand)s inkluderar:",
     "VoIP is unsupported": "VoIP stöds ej",
     "Failed to invite": "Inbjudan misslyckades",
     "You need to be logged in.": "Du måste vara inloggad.",
@@ -315,7 +284,6 @@
     "You are not in this room.": "Du är inte i det här rummet.",
     "You do not have permission to do that in this room.": "Du har inte behörighet att göra det i det här rummet.",
     "Fetching third party location failed": "Det gick inte att hämta platsdata från tredje part",
-    "A new version of Riot is available.": "En ny version av Riot är tillgänglig.",
     "All notifications are currently disabled for all targets.": "Alla aviseringar är för tillfället avstängda för alla mål.",
     "Uploading report": "Laddar upp rapport",
     "Sunday": "söndag",
@@ -333,8 +301,6 @@
     "Leave": "Lämna",
     "Uploaded on %(date)s by %(user)s": "%(user)s laddade upp %(date)s",
     "Advanced notification settings": "Avancerade aviseringsinställingar",
-    "delete the alias.": "radera adressen.",
-    "To return to your account in future you need to <u>set a password</u>": "För att återgå till ditt konto i framtiden måste du <u>välja ett lösenord</u>",
     "Forget": "Glöm bort",
     "You cannot delete this image. (%(code)s)": "Du kan inte radera den här bilden. (%(code)s)",
     "Cancel Sending": "Avbryt sändning",
@@ -361,7 +327,6 @@
     "Resend": "Skicka igen",
     "Files": "Filer",
     "Collecting app version information": "Samlar in appversionsinformation",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Radera rumsadressen %(alias)s och ta bort %(name)s från katalogen?",
     "Keywords": "Nyckelord",
     "Enable notifications for this account": "Aktivera aviseringar för det här kontot",
     "Messages containing <span>keywords</span>": "Meddelanden som innehåller <span>nyckelord</span>",
@@ -370,7 +335,7 @@
     "Enter keywords separated by a comma:": "Skriv in nyckelord, separerade med kommatecken:",
     "Search…": "Sök…",
     "Remove %(name)s from the directory?": "Ta bort %(name)s från katalogen?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot använder flera avancerade webbläsaregenskaper, av vilka alla inte stöds eller är experimentella i din nuvarande webbläsare.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s använder flera avancerade webbläsaregenskaper, av vilka alla inte stöds eller är experimentella i din nuvarande webbläsare.",
     "Remember, you can always set an email address in user settings if you change your mind.": "Kom ihåg att du alltid kan välja en e-postadress i dina användarinställningar om du ändrar dig.",
     "All messages (noisy)": "Alla meddelanden (högljudd)",
     "Saturday": "lördag",
@@ -408,8 +373,7 @@
     "Show message in desktop notification": "Visa meddelande i skrivbordsavisering",
     "Unhide Preview": "Visa förhandsvisning",
     "Unable to join network": "Det gick inte att ansluta till nätverket",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Du kan ha konfigurerat dem i en annan klient än Riot. Du kan inte ändra dem i Riot men de tillämpas ändå",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Beklagar, din webbläsare kan <b>inte</b> köra Riot.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Beklagar, din webbläsare kan <b>inte</b> köra %(brand)s.",
     "Messages in group chats": "Meddelanden i gruppchattar",
     "Yesterday": "igår",
     "Error encountered (%(errorDetail)s).": "Fel påträffat (%(errorDetail)s).",
@@ -417,7 +381,7 @@
     "Unable to fetch notification target list": "Det gick inte att hämta aviseringsmållistan",
     "Set Password": "Välj lösenord",
     "Off": "Av",
-    "Riot does not know how to join a room on this network": "Riot kan inte gå med i ett rum på det här nätverket",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s kan inte gå med i ett rum på det här nätverket",
     "Mentions only": "Endast omnämnande",
     "Failed to remove tag %(tagName)s from room": "Det gick inte att radera taggen %(tagName)s från rummet",
     "You can now return to your account after signing out, and sign in on other devices.": "Du kan nu återgå till ditt konto efter att ha loggat ut och logga in på andra enheter.",
@@ -429,7 +393,6 @@
     "Quote": "Citera",
     "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!": "Med din nuvarande webbläsare kan appens utseende vara helt fel, och vissa eller alla egenskaper kommer nödvändigtvis inte att fungera. Om du ändå vill försöka så kan du fortsätta, men gör det på egen risk!",
     "Checking for an update...": "Letar efter uppdateringar...",
-    "There are advanced notifications which are not shown here": "Det finns avancerade aviseringar som inte visas här",
     "Who can access this room?": "Vilka kan komma åt detta rum?",
     "Who can read history?": "Vilka kan läsa historik?",
     "Members only (since the point in time of selecting this option)": "Endast medlemmar (från tidpunkten för när denna inställning valdes)",
@@ -440,11 +403,9 @@
     "Your language of choice": "Ditt språkval",
     "The platform you're on": "Plattformen du använder",
     "Your homeserver's URL": "Din hemservers URL",
-    "Your identity server's URL": "Din identitetsservers URL",
     "Every page you use in the app": "Varje sida du använder i appen",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Om du använder Richtext-läget i Rich-Text-editorn eller inte",
     "e.g. <CurrentPageURL>": "t.ex. <CurrentPageURL>",
-    "Your User Agent": "Din användaragent",
     "Your device resolution": "Din enhetsupplösning",
     "You cannot place VoIP calls in this browser.": "Du kan inte ringa VoIP-samtal i den här webbläsaren.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Din epostadress verkar inte vara kopplad till något Matrix-ID på den här hemservern.",
@@ -469,14 +430,11 @@
     "Ignore": "Ignorera",
     "Jump to message": "Hoppa till meddelande",
     "Mention": "Nämn",
-    "Make Moderator": "Gör till moderator",
     "Voice call": "Röstsamtal",
     "Video call": "Videosamtal",
     "Upload file": "Ladda upp fil",
     "Send an encrypted reply…": "Skicka ett krypterat svar…",
-    "Send a reply (unencrypted)…": "Skicka ett svar (okrypterat)…",
     "Send an encrypted message…": "Skicka ett krypterat meddelande…",
-    "Send a message (unencrypted)…": "Skicka ett meddelande (okrypterat)…",
     "You do not have permission to post to this room": "Du har inte behörighet att posta till detta rum",
     "Loading...": "Laddar...",
     "%(duration)ss": "%(duration)s",
@@ -521,7 +479,6 @@
     "Submit debug logs": "Skicka felsökningsloggar",
     "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.": "Felsökningsloggar innehåller användningsdata för applikationen inklusive ditt användarnamn, ID:n eller alias för de rum och grupper du har besökt och användarnamn för andra användare. De innehåller inte meddelanden.",
     "An email has been sent to %(emailAddress)s": "Ett epostmeddelande har skickats till %(emailAddress)s",
-    "To continue, please enter your password.": "För att fortsätta, vänligen ange ditt lösenord.",
     "Please check your email to continue registration.": "Vänligen kolla din epost för att fortsätta registreringen.",
     "Token incorrect": "Ogiltig token",
     "A text message has been sent to %(msisdn)s": "Ett textmeddelande har skickats till %(msisdn)s",
@@ -533,8 +490,6 @@
     "Uploading %(filename)s and %(count)s others|other": "Laddar upp %(filename)s och %(count)s andra",
     "Uploading %(filename)s and %(count)s others|zero": "Laddar upp %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Laddar upp %(filename)s och %(count)s annan",
-    "Light theme": "Ljust tema",
-    "Dark theme": "Mörkt tema",
     "This doesn't appear to be a valid email address": "Det här verkar inte vara en giltig epostadress",
     "Verification Pending": "Avvaktar verifiering",
     "Unable to add email address": "Det gick inte att lägga till epostadress",
@@ -556,8 +511,7 @@
     "Failed to upload image": "Det gick inte att ladda upp bild",
     "New Password": "Nytt lösenord",
     "Do you want to set an email address?": "Vill du ange en epostadress?",
-    "Use compact timeline layout": "Använd kompakt tidslinjelayout",
-    "Not a valid Riot keyfile": "Inte en giltig Riot-nyckelfil",
+    "Not a valid %(brand)s keyfile": "Inte en giltig %(brand)s-nyckelfil",
     "Authentication check failed: incorrect password?": "Autentiseringskontroll misslyckades: felaktigt lösenord?",
     "Always show encryption icons": "Visa alltid krypteringsikoner",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s bytte avatar för %(roomName)s",
@@ -577,7 +531,6 @@
     "Connectivity to the server has been lost.": "Anslutning till servern har brutits.",
     "Sent messages will be stored until your connection has returned.": "Skickade meddelanden kommer att lagras tills anslutningen är tillbaka.",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Det är ingen annan här! Vill du <inviteText>bjuda in någon</inviteText> eller <nowarnText>sluta varna om det tomma rummet</nowarnText>?",
-    "Unknown room %(roomId)s": "Okänt rum %(roomId)s",
     "Room": "Rum",
     "Clear filter": "Töm filter",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Försökte ladda en viss punkt i det här rummets tidslinje, men du har inte behörighet att visa det aktuella meddelandet.",
@@ -590,14 +543,9 @@
     "Upload new:": "Ladda upp ny:",
     "Copied!": "Kopierat!",
     "Failed to copy": "Det gick inte att kopiera",
-    "Removed or unknown message type": "Borttagen eller okänd meddelandetyp",
-    "Message removed by %(userId)s": "Meddelande borttaget av %(userId)s",
-    "Message removed": "Meddelande borttaget",
     "Delete Widget": "Ta bort widget",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Widget tas bort för alla användare i rummet. Är du säker på att du vill ta bort den?",
     "Minimize apps": "Minimera appar",
-    "Blacklist": "Svartlista",
-    "Unblacklist": "Ta bort svartlistning",
     "Failed to invite the following users to %(groupId)s:": "Det gick inte att bjuda in följande användare till %(groupId)s:",
     "Failed to invite users to %(groupId)s": "Det gick inte att bjuda in användare till %(groupId)s",
     "This room is not public. You will not be able to rejoin without an invite.": "Detta rum är inte offentligt. Du kommer inte kunna gå med igen utan en inbjudan.",
@@ -607,11 +555,6 @@
     "Notify the whole room": "Meddela hela rummet",
     "Room Notification": "Rumsavisering",
     "Users": "Användare",
-    "unknown device": "okänd enhet",
-    "verified": "verifierad",
-    "Verification": "Verifiering",
-    "User ID": "Användar-ID",
-    "unencrypted": "okrypterad",
     "Export room keys": "Exportera rumsnycklar",
     "Import room keys": "Importera rumsnycklar",
     "File to import": "Fil att importera",
@@ -644,24 +587,17 @@
     "Create": "Skapa",
     "Unknown error": "Okänt fel",
     "Incorrect password": "Felaktigt lösenord",
-    "I verify that the keys match": "Jag verifierar att nycklarna matchar",
     "State Key": "Lägesnyckel",
     "Send Account Data": "Skicka kontodata",
     "Explore Account Data": "Utforska kontodata",
     "Toolbox": "Verktygslåda",
     "Developer Tools": "Utvecklarverktyg",
-    "Unverify": "Ta bort verifiering",
-    "Verify...": "Verifiera...",
-    "Start verification": "Starta verifiering",
-    "Share without verifying": "Dela utan att verifiera",
-    "Ignore request": "Ignorera begäran",
-    "Encryption key request": "Begäran av krypteringsnyckel",
     "Clear Storage and Sign Out": "Rensa lagring och logga ut",
     "Send Logs": "Skicka loggar",
     "Refresh": "Uppdatera",
     "Unable to restore session": "Det gick inte att återställa sessionen",
     "We encountered an error trying to restore your previous session.": "Ett fel uppstod vid återställning av din tidigare session.",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Om du nyligen har använt en senare version av Riot kan din session vara inkompatibel med den här versionen. Stäng det här fönstret och använd senare versionen istället.",
+    "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.": "Om du nyligen har använt en senare version av %(brand)s kan din session vara inkompatibel med den här versionen. Stäng det här fönstret och använd senare versionen istället.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Att rensa webbläsarens lagring kan lösa problemet, men då loggas du ut och krypterad chatthistorik blir oläslig.",
     "Collapse Reply Thread": "Dölj svarstråd",
     "Terms and Conditions": "Villkor",
@@ -673,14 +609,12 @@
     "Missing roomId.": "Rums-ID saknas.",
     "This room is not recognised.": "Detta rum känns inte igen.",
     "Usage": "Användning",
-    "Unrecognised room alias:": "Oigenkänt rumsalias:",
     "Verified key": "Verifierad nyckel",
     "VoIP conference started.": "VoIP-konferens startad.",
     "VoIP conference finished.": "VoIP-konferens avslutad.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s gjorde framtida rumshistorik synligt för okänd (%(visibility)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.": "Där denna sida innehåller identifierbar information, till exempel ett rums-, användar- eller grupp-ID, tas data bort innan den skickas till servern.",
     "The remote side failed to pick up": "Mottagaren kunde inte svara",
-    "Room name or alias": "Rumsnamn eller alias",
     "Jump to read receipt": "Hoppa till läskvitto",
     "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.": "Denna process låter dig exportera nycklarna för meddelanden som du har fått i krypterade rum till en lokal fil. Du kommer sedan att kunna importera filen i en annan Matrix-klient i framtiden, så att den klienten också kan dekryptera meddelandena.",
     "Unknown for %(duration)s": "Okänt i %(duration)s",
@@ -688,11 +622,8 @@
     "e.g. %(exampleValue)s": "t.ex. %(exampleValue)s",
     "Can't leave Server Notices room": "Kan inte lämna serveraviseringsrummet",
     "This room is used for important messages from the Homeserver, so you cannot leave it.": "Detta rum används för viktiga meddelanden från hemservern, så du kan inte lämna det.",
-    "Data from an older version of Riot 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 från en äldre version av Riot has upptäckts. Detta ska ha orsakat att totalsträckskryptering inte fungerat i den äldre versionen. Krypterade meddelanden som nyligen har skickats medans den äldre versionen användes kanske inte kan dekrypteras i denna version. Detta kan även orsaka att meddelanden skickade med denna version inte fungerar. Om du upplever problem, logga ut och in igen. För att behålla meddelandehistoriken, exportera dina nycklar och importera dem igen.",
+    "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 från en äldre version av %(brand)s has upptäckts. Detta ska ha orsakat att totalsträckskryptering inte fungerat i den äldre versionen. Krypterade meddelanden som nyligen har skickats medans den äldre versionen användes kanske inte kan dekrypteras i denna version. Detta kan även orsaka att meddelanden skickade med denna version inte fungerar. Om du upplever problem, logga ut och in igen. För att behålla meddelandehistoriken, exportera dina nycklar och importera dem igen.",
     "Confirm Removal": "Bekräfta borttagning",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Vänligen hjälp till att förbättra Riot.im genom att skicka <UsageDataLink>anonyma användardata</UsageDataLink>. Detta kommer att använda en cookie (se vår <PolicyLink>Cookiepolicy</PolicyLink>).",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Vänligen hjälp till att förbättra Riot.im genom att skicka <UsageDataLink>anonyma användardata</UsageDataLink>. Detta kommer att använda en cookie.",
-    "Yes, I want to help!": "Ja, jag vill hjälpa till!",
     "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)slämnade och gick med igen %(count)s gånger",
     "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)slämnade och gick med igen",
     "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)slämnade och gick med igen %(count)s gånger",
@@ -789,7 +720,7 @@
     "You're not currently a member of any communities.": "Du är för närvarande inte medlem i någon community.",
     "Communities": "Communityn",
     "Your Communities": "Dina communityn",
-    "Did you know: you can use communities to filter your Riot.im experience!": "Visste du att: du kan använda communityn för att filtrera din Riot.im-upplevelse!",
+    "Did you know: you can use communities to filter your %(brand)s experience!": "Visste du att: du kan använda communityn för att filtrera din %(brand)s-upplevelse!",
     "Error whilst fetching joined communities": "Fel vid hämtning av anslutna communityn",
     "Featured Rooms:": "Utvalda rum:",
     "Featured Users:": "Utvalda användare:",
@@ -808,7 +739,6 @@
     "Disinvite this user?": "Ta bort användarens inbjudan?",
     "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 kommer inte att kunna ångra den här ändringen eftersom du sänker din egen behörighetsnivå, om du är den sista privilegierade användaren i rummet blir det omöjligt att ändra behörigheter.",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Du kommer inte att kunna ångra den här ändringen eftersom du höjer användaren till samma behörighetsnivå som dig själv.",
-    "User Options": "Användaralternativ",
     "unknown caller": "okänd uppringare",
     "To use it, just wait for autocomplete results to load and tab through them.": "För att använda detta, vänta på att autokompletteringen laddas och tabba igenom resultatet.",
     "Enable inline URL previews by default": "Aktivera URL-förhandsvisning som standard",
@@ -858,7 +788,7 @@
     "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)": "Glöm alla meddelanden som jag har skickat när mitt konto inaktiveras (<b>Varning:</b> detta kommer att göra så att framtida användare får se ofullständiga konversationer)",
     "To continue, please enter your password:": "För att fortsätta, ange ditt lösenord:",
     "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.": "Om du har anmält en bugg via GitHub, kan felsökningsloggar hjälpa oss spåra problemet. Felsökningsloggarna innehåller användningsdata för applikationen inklusive ditt användarnamn, ID eller alias för rum och grupper du besökt och användarnamn för andra användare. De innehåller inte meddelanden.",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot samlar in anonym analysdata för att vi ska kunna förbättra applikationen.",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s samlar in anonym analysdata för att vi ska kunna förbättra applikationen.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Integritet är viktig för oss, så vi samlar inte in några personliga eller identifierbara uppgifter för våra analyser.",
     "Learn more about how we use analytics.": "Läs mer om hur vi använder analysdata.",
     "Analytics": "Analysdata",
@@ -913,9 +843,6 @@
     "Please <a>contact your service administrator</a> to continue using the service.": "<a>Kontakta din serviceadministratör</a> för att fortsätta använda tjänsten.",
     "This homeserver has hit its Monthly Active User limit.": "Hemservern har nått sin månatliga gräns för användaraktivitet.",
     "This homeserver has exceeded one of its resource limits.": "Hemservern har överskridit en av sina resursgränser.",
-    "Please <a>contact your service administrator</a> to get this limit increased.": "<a>Kontakta din serviceadministratör</a> för att få denna gräns ökad.",
-    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "Hemservern har nått sin månatliga gräns för användaraktivitet så <b>vissa användare kommer inte kunna logga in</b>.",
-    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Hemservern har överskridit en av sina resursgränser så <b>vissa användare kommer inte kunna logga in</b>.",
     "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.": "Ditt meddelande skickades inte för hemservern har nått sin månatliga gräns för användaraktivitet. <a>Kontakta din serviceadministratör</a> för att fortsätta använda servicen.",
     "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.": "Ditt meddelande skickades inte för hemservern har överskridit en av sina resursgränser. <a>Kontakta din serviceadministratör</a> för att fortsätta använda servicen.",
     "Legal": "Juridiskt",
@@ -933,21 +860,14 @@
     "Update any local room aliases to point to the new room": "Uppdatera lokala rumsalias att peka på det nya rummet",
     "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Hindra användare från att prata i den gamla rumsversionen och posta ett meddelande som rekommenderar användare att flytta till det nya rummet",
     "Put a link back to the old room at the start of the new room so people can see old messages": "Sätta en länk tillbaka till det gamla rummet i början av det nya rummet så att folk kan se gamla meddelanden",
-    "Registration Required": "Registrering krävs",
-    "You need to register to do this. Would you like to register now?": "Du måste registrera dig för att göra detta. Vill du registrera dig nu?",
     "Forces the current outbound group session in an encrypted room to be discarded": "Tvingar den aktuella utgående gruppsessionen i ett krypterat rum att överges",
     "Unable to connect to Homeserver. Retrying...": "Det gick inte att ansluta till hemserver. Försöker igen ...",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s satte huvudadressen för detta rum till %(address)s.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s lade till %(addedAddresses)s som adresser för detta rum.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s lade till %(addedAddresses)s som adress för detta rum.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s tog bort %(removedAddresses)s som adresser för detta rum.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s tog bort %(removedAddresses)s som adress för detta rum.",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s lade till %(addedAddresses)s och tog bort %(removedAddresses)s som adresser för detta rum.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s tog bort huvudadressen för detta rum.",
     "Add some now": "Lägg till några nu",
     "Please review and accept the policies of this homeserver:": "Granska och acceptera policyn för denna hemserver:",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Innan du skickar in loggar måste du <a>skapa en GitHub-bugg</a> för att beskriva problemet.",
-    "Updating Riot": "Uppdaterar Riot",
+    "Updating %(brand)s": "Uppdaterar %(brand)s",
     "Open Devtools": "Öppna Devtools",
     "Show developer tools": "Visa utvecklingsverktyg",
     "You are an administrator of this community. You will not be able to rejoin without an invite from another administrator.": "Du är administratör för denna community. Du kommer inte kunna gå med igen utan en inbjudan från en annan administratör.",
@@ -1099,14 +1019,14 @@
     "Deactivating your account is a permanent action - be careful!": "Inaktivering av ditt konto är en permanent åtgärd - var försiktig!",
     "General": "Allmänt",
     "Credits": "Tack",
-    "For help with using Riot, click <a>here</a>.": "För hjälp med att använda Riot, klicka <a>här</a>.",
-    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "För hjälp med att använda Riot, klicka <a>här</a> eller starta en chatt med vår bot med knappen nedan.",
-    "Chat with Riot Bot": "Chatta med Riot Bot",
+    "For help with using %(brand)s, click <a>here</a>.": "För hjälp med att använda %(brand)s, klicka <a>här</a>.",
+    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "För hjälp med att använda %(brand)s, klicka <a>här</a> eller starta en chatt med vår bot med knappen nedan.",
+    "Chat with %(brand)s Bot": "Chatta med %(brand)s Bot",
     "Help & About": "Hjälp & Om",
     "Bug reporting": "Felrapportering",
     "FAQ": "FAQ",
     "Versions": "Versioner",
-    "Preferences": "Inställningar",
+    "Preferences": "Alternativ",
     "Timeline": "Tidslinje",
     "Room list": "Rumslista",
     "Autocomplete delay (ms)": "Autokompletteringsfördröjning (ms)",
@@ -1165,7 +1085,6 @@
     "The user must be unbanned before they can be invited.": "Användare behöver avbannas innan de kan bjudas in.",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Gruppera och filtrera rum med anpassade taggar (ladda om för att visa ändringar)",
     "Render simple counters in room header": "Rendera enkla räknare i rumsrubriken",
-    "Order rooms in the room list by most important first instead of most recent": "Ordna rum i rumslistan med viktigaste först i stället för senaste",
     "Yes": "Ja",
     "No": "Nej",
     "Missing media permissions, click the button below to request.": "Saknar mediebehörigheter, klicka på knappen nedan för att begära.",
@@ -1189,7 +1108,6 @@
     "Roles & Permissions": "Roller och behörigheter",
     "Enable encryption?": "Aktivera kryptering?",
     "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>": "När det är aktiverat kan kryptering för ett rum inte inaktiveras. Meddelanden som skickas i ett krypterat rum kan inte ses av servern, utan endast av deltagarna i rummet. Att aktivera kryptering kan förhindra att många botar och bryggor att fungera korrekt. <a>Läs mer om kryptering.</a>",
-    "To link to this room, please add an alias.": "För att länka detta rum, lägg till ett alias.",
     "Encryption": "Kryptering",
     "Once enabled, encryption cannot be disabled.": "Efter aktivering kan kryptering inte inaktiveras igen.",
     "Encrypted": "Krypterat",
@@ -1231,14 +1149,9 @@
     "Revoke invite": "Återkalla inbjudan",
     "Invited by %(sender)s": "Inbjuden av %(sender)s",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "Det uppstod ett fel vid uppdatering av rummets huvudadress. Det kanske inte tillåts av servern eller så inträffade ett tillfälligt fel.",
-    "Error creating alias": "Fel vid skapande av alias",
-    "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "Det uppstod ett fel när alias skulle skapas. Det kanke inte tillåtas av servern eller så inträffade ett tillfälligt fel.",
-    "Error removing alias": "Fel vid borttagning av alias",
-    "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "Det uppstod ett fel när alias skulle tas bort. Det kanske inte längre finns eller så inträffade ett tillfälligt fel.",
     "Main address": "Huvudadress",
     "Error updating flair": "Fel vid uppdatering av emblem",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "Det uppstod ett fel vid uppdatering av emblem för detta rum. Servern kanske inte tillåter det eller ett så inträffade tillfälligt fel.",
-    "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ": "Du har tidigare använt en nyare version av Riot på %(host)s. För att använda denna version igen med totalsträckskryptering, måste du logga ut och in igen. ",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifiera denna användare för att markera den som betrodd. Att kunna lita på användare ger en extra sinnesfrid när man använder totalsträckskrypterade meddelanden.",
     "A widget would like to verify your identity": "En widget vill verifiera din identitet",
     "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.": "En widget på %(widgetUrl)s vill verifiera din identitet. Genom att tillåta detta kommer widgeten att kunna verifiera ditt användar-ID, men inte agera som dig.",
@@ -1264,11 +1177,11 @@
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "Det gick inte att hitta profiler för de Matrix-IDn som anges nedan - vill du bjuda in dem ändå?",
     "GitHub issue": "GitHub-ärende",
     "Notes": "Noteringar",
-    "You've previously used Riot 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, Riot needs to resync your account.": "Du har tidigare använt Riot på %(host)s med lazy loading av medlemmar aktiverat. I den här versionen är lazy loading inaktiverat. Eftersom den lokala cachen inte är kompatibel mellan dessa två inställningar behöver Riot synkronisera om ditt konto.",
-    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Om den andra versionen av Riot fortfarande är öppen i en annan flik, stäng den eftersom användning av Riot på samma värd med både lazy loading aktiverad och inaktiverad samtidigt kommer att orsaka 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.": "Du har tidigare använt %(brand)s på %(host)s med lazy loading av medlemmar aktiverat. I den här versionen är lazy loading inaktiverat. Eftersom den lokala cachen inte är kompatibel mellan dessa två inställningar behöver %(brand)s synkronisera om ditt konto.",
+    "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.": "Om den andra versionen av %(brand)s fortfarande är öppen i en annan flik, stäng den eftersom användning av %(brand)s på samma värd med både lazy loading aktiverad och inaktiverad samtidigt kommer att orsaka problem.",
     "Incompatible local cache": "Inkompatibel lokal cache",
     "Clear cache and resync": "Töm cache och synkronisera om",
-    "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Riot använder nu 3-5 gånger mindre minne, genom att bara ladda information om andra användare när det behövs. Vänta medan vi återsynkroniserar med servern!",
+    "%(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 använder nu 3-5 gånger mindre minne, genom att bara ladda information om andra användare när det behövs. Vänta medan vi återsynkroniserar med servern!",
     "I don't want my encrypted messages": "Jag vill inte ha mina krypterade meddelanden",
     "Manually export keys": "Exportera nycklar manuellt",
     "You'll lose access to your encrypted messages": "Du kommer att förlora åtkomst till dina krypterade meddelanden",
@@ -1296,10 +1209,9 @@
     "Cancel All": "Avbryt alla",
     "Upload Error": "Uppladdningsfel",
     "Name or Matrix ID": "Namn eller Martix-ID",
-    "Your Riot is misconfigured": "Riot är felkonfigurerat",
+    "Your %(brand)s is misconfigured": "%(brand)s är felkonfigurerat",
     "Call failed due to misconfigured server": "Anrop misslyckades på grund av felkonfigurerad server",
     "Try using turn.matrix.org": "Prova att använda turn.matrix.org",
-    "A conference call could not be started because the integrations server is not available": "Ett konferenssamtal kunde inte startas eftersom integrationsservern inte är tillgänglig",
     "The server does not support the room version specified.": "Servern stöder inte den angivna rumsversionen.",
     "Messages": "Meddelanden",
     "Actions": "Åtgärder",
@@ -1315,7 +1227,7 @@
     "%(senderName)s made no change.": "%(senderName)s gjorde ingen ändring.",
     "Cannot reach homeserver": "Kan inte nå hemservern",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Se till att du har en stabil internetanslutning, eller kontakta serveradministratören",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Be din Riot-administratör att kontrollera <a>din konfiguration</a> efter felaktiga eller duplicerade poster.",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Be din %(brand)s-administratör att kontrollera <a>din konfiguration</a> efter felaktiga eller duplicerade poster.",
     "Cannot reach identity server": "Kan inte nå identitetsservern",
     "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.": "Du kan registrera dig, men vissa funktioner kommer inte att vara tillgängliga förrän identitetsservern är online igen. Om du fortsätter att se den här varningen, kontrollera din konfiguration eller kontakta en serveradministratör.",
     "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.": "Du kan återställa ditt lösenord, men vissa funktioner kommer inte att vara tillgängliga förrän identitetsservern är online igen. Om du fortsätter att se den här varningen, kontrollera din konfiguration eller kontakta en serveradministratör.",
@@ -1323,7 +1235,6 @@
     "No homeserver URL provided": "Ingen hemserver-URL angiven",
     "The user's homeserver does not support the version of the room.": "Användarens hemserver stöder inte versionen av rummet.",
     "Multiple integration managers": "Flera integrationshanterare",
-    "Show recently visited rooms above the room list": "Visa nyligen besökta rum ovanför rumslistan",
     "Show hidden events in timeline": "Visa dolda händelser i tidslinjen",
     "Low bandwidth mode": "Läge för låg bandbredd",
     "Send read receipts for messages (requires compatible homeserver to disable)": "Skicka läskvitton för meddelanden (kräver kompatibel hemserver för att inaktivera)",
@@ -1427,7 +1338,6 @@
     "%(name)s (%(userId)s)": "%(name)s (%(userId)s)",
     "Try out new ways to ignore people (experimental)": "Testa nya sätt att ignorera personer (experimentalt)",
     "Show previews/thumbnails for images": "Visa förhandsvisning/tumnagel för bilder",
-    "Send cross-signing keys to homeserver": "Skicka korssigneringsnycklar till hemserver",
     "Custom (%(level)s)": "Anpassad (%(level)s)",
     "Error upgrading room": "Fel vid uppgradering av rum",
     "Double check that your server supports the room version chosen and try again.": "Dubbelkolla att din server stöder den valda rumsversionen och försök igen.",
@@ -1497,7 +1407,7 @@
     "Your avatar URL": "Din avatar-URL",
     "Your user ID": "Ditt användar-ID",
     "Your theme": "Ditt tema",
-    "Riot URL": "Riot-URL",
+    "%(brand)s URL": "%(brand)s-URL",
     "Room ID": "Rums-ID",
     "Widget ID": "Widget-ID",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "Att använda denna widget kan dela data <helpIcon /> med %(widgetDomain)s och din Integrationshanterare.",
@@ -1514,12 +1424,8 @@
     "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)sgjorde inga ändringar",
     "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)sgjorde inga ändringar %(count)s gånger",
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)sgjorde inga ändringar",
-    "Room alias": "Rumsalias",
     "e.g. my-room": "t.ex. mitt rum",
     "Some characters not allowed": "Vissa tecken är inte tillåtna",
-    "Please provide a room alias": "Vänligen ange ett rumsalias",
-    "This alias is available to use": "Detta alias är tillgängligt att använda",
-    "This alias is already in use": "Detta alias används redan",
     "Use an identity server to invite by email. <default>Use the default (%(defaultIdentityServerName)s)</default> or manage in <settings>Settings</settings>.": "Använd en identitetsserver för att bjuda in via epost. <default>Använd standard (%(defaultIdentityServerName)s)</default> eller hantera i <settings>Inställningar</settings>.",
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Använd en identitetsserver för att bjuda in via epost. Hantera i <settings>Inställningar</settings>.",
     "Close dialog": "Stäng dialogrutan",
@@ -1535,7 +1441,7 @@
     "Integrations are disabled": "Integrationer är inaktiverade",
     "Enable 'Manage Integrations' in Settings to do this.": "Aktivera \"Hantera integrationer\" i Inställningar för att göra detta.",
     "Integrations not allowed": "Integrationer inte tillåtna",
-    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Ditt Riot tillåter dig inte att använda en Integrationshanterare för att göra detta. Vänligen kontakta en administratör.",
+    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "Ditt %(brand)s tillåter dig inte att använda en Integrationshanterare för att göra detta. Vänligen kontakta en administratör.",
     "Your homeserver doesn't seem to support this feature.": "Din hemserver verkar inte stödja den här funktionen.",
     "Message edits": "Meddelandedigeringar",
     "Preview": "Förhandsvisa",
@@ -1547,22 +1453,16 @@
     "Service": "Tjänst",
     "Summary": "Sammanfattning",
     "Document": "Dokument",
-    "The version of Riot": "Version av Riot",
-    "Whether you're using Riot on a device where touch is the primary input mechanism": "Om du använder Riot på en enhet där pekskärm är den primära inmatningsmekanismen",
-    "Whether you're using Riot as an installed Progressive Web App": "Om du använder Riot som en installerad progressiv webbapp",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Om du använder %(brand)s på en enhet där pekskärm är den primära inmatningsmekanismen",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Om du använder %(brand)s som en installerad progressiv webbapp",
     "Your user agent": "Din användaragent",
-    "The information being sent to us to help make Riot better includes:": "Informationen som skickas till oss för att förbättra Riot inkluderar:",
-    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Det finns okända sessioner i det här rummet: om du fortsätter utan att verifiera dem kommer det att vara möjligt för någon att lyssna på ditt samtal.",
-    "Review Sessions": "Granska sessioner",
     "If you cancel now, you won't complete verifying the other user.": "Om du avbryter nu kommer du inte att verifiera den andra användaren.",
     "If you cancel now, you won't complete verifying your other session.": "Om du avbryter nu kommer du inte att verifiera din andra session.",
-    "If you cancel now, you won't complete your secret storage operation.": "Om du avbryter nu slutför du inte din operation för hemlig lagring.",
     "Cancel entering passphrase?": "Avbryta att ange lösenfras?",
     "Setting up keys": "Sätter upp nycklar",
     "Verify this session": "Verifiera denna session",
     "Encryption upgrade available": "Krypteringsuppgradering tillgänglig",
     "Set up encryption": "Ställ in kryptering",
-    "Unverified session": "Overifierad session",
     "Sign In or Create Account": "Logga in eller skapa konto",
     "Use your account or create a new one to continue.": "Använd ditt konto eller skapa ett nytt för att fortsätta.",
     "Create Account": "Skapa konto",
@@ -1581,23 +1481,13 @@
     "Please enter verification code sent via text.": "Ange verifieringskod skickad via textmeddelande.",
     "Discovery options will appear once you have added a phone number above.": "Upptäcktsalternativ visas när du har lagt till ett telefonnummer ovan.",
     "Verify session": "Verifiera sessionen",
-    "Use Legacy Verification (for older clients)": "Använd gammal verifiering (för äldre klienter)",
-    "Verify by comparing a short text string.": "Verifiera genom att jämföra en kort textsträng.",
-    "Begin Verifying": "Börja verifiera",
-    "Waiting for partner to accept...": "Väntar på partner att acceptera...",
-    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Dyker inget upp? Alla klienter stöder inte interaktiv verifiering ännu. <button>Använd äldre verifiering</button>.",
-    "Waiting for %(userId)s to confirm...": "Väntar på att %(userId)s ska bekräfta...",
-    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "För att verifiera att den här sessionen är betrodd, kontrollera att nyckeln du ser i Användarinställningar på den enheten stämmer med nyckeln nedan:",
-    "To verify that this session can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this session matches the key below:": "För att verifiera att den här sessionen är betrodd, vänligen kontakta dess ägare på annat sätt (t.ex. personligen eller via ett telefonsamtal) och fråga om nyckeln i deras användarinställningar för denna session stämmer med nyckeln nedan:",
-    "Use two-way text verification": "Använd tvåvägs textverifiering",
     "Session name": "Sessionsnamn",
     "Session key": "Sessionsnyckel",
-    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "Om det matchar, tryck på verifieringsknappen nedan. Om det inte gör det, avlyssnar någon annan den här sessionen och du vill förmodligen trycka på svartlistaknappen istället.",
     "Automatically invite users": "Bjud in användare automatiskt",
     "Upgrade private room": "Uppgradera privat rum",
     "Upgrade public room": "Uppgradera publikt rum",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "Att uppgradera ett rum är en avancerad åtgärd och rekommenderas vanligtvis när ett rum är instabilt på grund av buggar, saknade funktioner eller säkerhetsproblem.",
-    "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "Detta påverkar vanligtvis bara hur rummet bearbetas på servern. Om du har problem med Riot, <a>rapportera ett fel</a>.",
+    "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>.": "Detta påverkar vanligtvis bara hur rummet bearbetas på servern. Om du har problem med %(brand)s, <a>rapportera ett fel</a>.",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Du kommer att uppgradera detta rum från <oldVersion /> till <newVersion />.",
     "This will allow you to return to your account after signing out, and sign in on other sessions.": "Detta gör att du kan återgå till ditt konto efter att du har loggat ut, och logga in på andra sessioner.",
     "Help": "Hjälp",
@@ -1630,5 +1520,24 @@
     "Esc": "Esc",
     "Enter": "Enter",
     "Space": "Space",
-    "End": "End"
+    "End": "End",
+    "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 har blivit utloggad från alla dina sessioner och kommer inte längre att motta pushnotiser. För att återaktivera pushnotiser, logga in igen på varje enhet.",
+    "Use Single Sign On to continue": "Använd Engångs Inloggning för att fortsätta",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Bekräfta att du lägger till e-postadressen genom att använda Engångs Inloggning för att bevisa din identitet.",
+    "Single Sign On": "Engångs Inloggning",
+    "Confirm adding email": "Bekräfta att du lägger till e-posten",
+    "Click the button below to confirm adding this email address.": "Klicka på knappen nedan för att bekräfta att du lägger till e-postadressen.",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Bekräfta att du lägger till telefon numret genom att använda Engångs Inloggning för att bevisa din identitet.",
+    "Confirm adding phone number": "Bekräfta att du lägger till telefon numret",
+    "Click the button below to confirm adding this phone number.": "Klicka på knappen nedan för att bekräfta att du lägger till telefon numret.",
+    "Are you sure you want to cancel entering passphrase?": "Är du säker på att du bill avbryta inmatning av lösenordet?",
+    "Go Back": "Gå tillbaka",
+    "Room name or address": "Rum namn eller adress",
+    "%(name)s is requesting verification": "%(name)s begär verifiering",
+    "Use your account to sign in to the latest version": "Använd ditt konto för att logga in till den senaste versionen",
+    "We’re excited to announce Riot is now Element": "Vi är glada att meddela att Riot är nu Element",
+    "Riot is now Element!": "Riot är nu Element!",
+    "Learn More": "Lär mer",
+    "Sends a message as html, without interpreting it as markdown": "Skicka ett meddelande som html, utan att tolka det som markdown",
+    "Failed to set topic": "Misslyckades med att ställa in ämnet"
 }
diff --git a/src/i18n/strings/ta.json b/src/i18n/strings/ta.json
index 9bc5ccbfaf..9cb046ed39 100644
--- a/src/i18n/strings/ta.json
+++ b/src/i18n/strings/ta.json
@@ -1,5 +1,4 @@
 {
-    "A new version of Riot is available.": "Riot-ன் புதிய பதிப்பு உள்ளது.",
     "Advanced notification settings": "மேம்பட்ட அறிவிப்பிற்கான அமைப்புகள்",
     "All messages": "அனைத்து செய்திகள்",
     "All messages (noisy)": "அனைத்து செய்திகள் (உரக்க)",
@@ -16,8 +15,6 @@
     "Can't update user notification settings": "பயனர் அறிவிப்பு அமைப்புகளை மாற்ற முடியவில்லை",
     "Couldn't find a matching Matrix room": "பொருத்தமான Matrix அறை கிடைக்கவில்லை",
     "Custom Server Options": "விருப்பிற்கேற்ற வழங்கி இடப்புகள்",
-    "delete the alias.": "மாற்றை அழி.",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "அறை மாற்று %(alias)s -ஐ அழித்து, %(name)s -ஐ அடைவிலிருந்து நீக்க வேண்டுமா?",
     "Direct Chat": "நேரடி அரட்டை",
     "Dismiss": "நீக்கு",
     "Download this file": "இந்த கோப்பைத் தரவிறக்கு",
@@ -86,9 +83,8 @@
     "Update": "புதுப்பி",
     "Uploaded on %(date)s by %(user)s": "%(date)s அன்று %(user)s ஆல் பதிவேற்றப்பட்டது",
     "Uploading report": "அறிக்கை பதிவேற்றப்படுகிறது",
-    "Riot does not know how to join a room on this network": "இந்த வலையமைப்பில் உள்ள அறையில் எப்படி சேர்வதென்று Riotற்க்கு தெரியவில்லை",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot பல மேம்பட்ட உலாவி வசதிகளைப் பயன்படுத்துகிறது, அதில் சிலவற்றைக் காணவில்லை அல்லது உங்கள் உலாவியில் பரிசோதனைக்காக உள்ளது.",
-    "There are advanced notifications which are not shown here": "இங்கு காண்பிக்கப்படாத மேம்பட்ட அறிவிப்புகள் உள்ளது",
+    "%(brand)s does not know how to join a room on this network": "இந்த வலையமைப்பில் உள்ள அறையில் எப்படி சேர்வதென்று %(brand)sற்க்கு தெரியவில்லை",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s பல மேம்பட்ட உலாவி வசதிகளைப் பயன்படுத்துகிறது, அதில் சிலவற்றைக் காணவில்லை அல்லது உங்கள் உலாவியில் பரிசோதனைக்காக உள்ளது.",
     "The server may be unavailable or overloaded": "வழங்கி அளவுமீறிய சுமையில் உள்ளது அல்லது செயல்பாட்டில் இல்லை",
     "Unable to fetch notification target list": "அறிவிப்பு பட்டியலை பெற முடியவில்லை",
     "Unable to look up room ID from server": "வழங்கியிலிருந்து அறை ID யை காண முடியவில்லை",
@@ -133,29 +129,23 @@
     "This phone number is already in use": "இந்த தொலைபேசி எண் ஏற்கனவே பயன்பாட்டில் உள்ளது",
     "Failed to verify email address: make sure you clicked the link in the email": "மின்னஞ்சல் முகவரியைச் சரிபார்க்கத் தவறிவிட்டது: மின்னஞ்சலில் உள்ள இணைப்பைக் கிளிக் செய்துள்ளீர்கள் என்பதை உறுதிப்படுத்திக் கொள்ளுங்கள்",
     "The platform you're on": "நீங்கள் இருக்கும் தளம்",
-    "The version of Riot.im": "Riot.im இன் பதிப்பு",
+    "The version of %(brand)s": "%(brand)s இன் பதிப்பு",
     "Whether or not you're logged in (we don't record your username)": "நீங்கள் உள்நுழைந்திருந்தாலும் இல்லாவிட்டாலும் (உங்கள் பயனர்பெயரை நாங்கள் பதிவு செய்ய மாட்டோம்)",
     "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": "பணக்கார உரை எடிட்டரின் ரிச்ச்டெக்ஸ்ட் பயன்முறையைப் பயன்படுத்துகிறீர்களா இல்லையா",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "நீங்கள் 'breadcrumbs' அம்சத்தைப் பயன்படுத்துகிறீர்களோ இல்லையோ (அறை பட்டியலுக்கு மேலே உள்ள அவதாரங்கள்)",
     "Your homeserver's URL": "உங்கள் வீட்டு சேவையகத்தின் URL",
-    "Your identity server's URL": "உங்கள் அடையாள சர்வரின் URL",
     "e.g. %(exampleValue)s": "உதாரணமாக %(exampleValue)s",
     "Every page you use in the app": "பயன்பாட்டில் நீங்கள் பயன்படுத்தும் ஒவ்வொரு பக்கமும்",
-    "Your Riot is misconfigured": "உங்கள் Riot தவறாக உள்ளமைக்கப்பட்டுள்ளது",
+    "Your %(brand)s is misconfigured": "உங்கள் %(brand)s தவறாக உள்ளமைக்கப்பட்டுள்ளது",
     "Sign In": "உள்நுழைக",
     "e.g. <CurrentPageURL>": "உதாரணமாக <CurrentPageURL>",
     "Your device resolution": "உங்கள் சாதனத் தீர்மானம்",
     "Analytics": "பகுப்பாய்வு",
-    "The information being sent to us to help make Riot.im better includes:": "Riot.im ஐ சிறப்பாகச் செய்ய எங்களுக்கு அனுப்பப்படும் தகவல்களில் பின்வருவன அடங்கும்:",
+    "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.": "இந்த பக்கம் ஒரு அறை, பயனர் அல்லது குழு ஐடி போன்ற அடையாளம் காணக்கூடிய தகவல்களை உள்ளடக்கியது, அந்த தரவு சேவையகத்திற்கு அனுப்பப்படுவதற்கு முன்பு அகற்றப்படும்.",
     "Call Failed": "அழைப்பு தோல்வியுற்றது",
-    "Review Devices": "சாதனங்களை மதிப்பாய்வு செய்யவும்",
-    "Call Anyway": "எப்படியும் அழைக்கவும்",
-    "Answer Anyway": "எப்படியும் பதில் சொல்லுங்கள்",
-    "Call": "அழைப்பு",
-    "Answer": "பதில்",
     "Call Timeout": "அழைப்பு நேரம் முடிந்தது",
     "The remote side failed to pick up": "தொலைதூரப் பக்கத்தை எடுக்கத் தவறிவிட்டது",
     "Unable to capture screen": "திரையைப் பிடிக்க முடியவில்லை",
@@ -164,8 +154,6 @@
     "VoIP is unsupported": "VoIP ஆதரிக்கப்படவில்லை",
     "You cannot place VoIP calls in this browser.": "இந்த உலாவியில் நீங்கள் VoIP அழைப்புகளை வைக்க முடியாது.",
     "You cannot place a call with yourself.": "உங்களுடன் அழைப்பை மேற்கொள்ள முடியாது.",
-    "Could not connect to the integration server": "ஒருங்கிணைப்பு சேவையகத்துடன் இணைக்க முடியவில்லை",
-    "A conference call could not be started because the integrations server is not available": "ஒருங்கிணைப்பு சேவையகம் கிடைக்காததால் ஒரு மாநாட்டு அழைப்பைத் தொடங்க முடியவில்லை",
     "Call in Progress": "அழைப்பு முன்னேற்றத்தில் உள்ளது",
     "A call is currently being placed!": "தற்போது அழைப்பு வைக்கப்பட்டுள்ளது!",
     "A call is already in progress!": "அழைப்பு ஏற்கனவே செயலில் உள்ளது!",
@@ -179,7 +167,6 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "சேவையகம் கிடைக்காமல் போகலாம், அதிக சுமை அல்லது பிழையைத் தாக்கலாம்.",
     "The server does not support the room version specified.": "குறிப்பிடப்பட்ட அறை பதிப்பை சேவையகம் ஆதரிக்கவில்லை.",
     "Failure to create room": "அறையை உருவாக்கத் தவறியது",
-    "Send anyway": "இருந்தாலும் அனுப்பு",
     "Sun": "ஞாயிறு",
     "Mon": "திங்கள்",
     "Tue": "செவ்வாய்",
diff --git a/src/i18n/strings/te.json b/src/i18n/strings/te.json
index c5afde7e24..431c4571ea 100644
--- a/src/i18n/strings/te.json
+++ b/src/i18n/strings/te.json
@@ -10,15 +10,12 @@
     "No Microphones detected": "మైక్రోఫోన్లు కనుగొనబడలేదు",
     "No Webcams detected": "వెబ్కామ్లు కనుగొనబడలేదు",
     "No media permissions": "మీడియా అనుమతులు లేవు",
-    "You may need to manually permit Riot to access your microphone/webcam": "రియోట్ను ను మీరు మాన్యువల్ గా మీ మైక్రోఫోన్ / వెబ్క్యామ్ను ప్రాప్యత చేయడానికి  అనుమతించాలి",
     "Default Device": "డిఫాల్ట్ పరికరం",
     "Microphone": "మైక్రోఫోన్",
     "Camera": "కెమెరా",
     "Advanced": "ఆధునిక",
-    "Algorithm": "అల్గారిథం",
     "Always show message timestamps": "ఎల్లప్పుడూ సందేశాల సమయ ముద్రలు చూపించు",
     "Authentication": "ప్రామాణీకరణ",
-    "Alias (optional)": "అలియాస్ (ఇవచు ఇవకపపోవచు)",
     "You do not have permission to post to this room": "మీకు ఈ గదికి పోస్ట్ చేయడానికి అనుమతి లేదు",
     "Active call (%(roomName)s)": "క్రియాశీల కాల్ల్ (%(roomName)s)",
     "A new password must be entered.": "కొత్త పాస్ వర్డ్ ను తప్పక నమోదు చేయాలి.",
@@ -35,7 +32,6 @@
     "Ban": "బాన్",
     "Banned users": "నిషేధించిన వినియోగదారులు",
     "Bans user with given id": "ఇచ్చిన ఐడి తో వినియోగదారుని నిషేధించారు",
-    "Blacklisted": "నిరోధిత జాబితాలోని",
     "Call Timeout": "కాల్ గడువు ముగిసింది",
     "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> 1 హోమరుసు యొక్క ఎస్ఎస్ఎల్ సర్టిఫికేట్ </a> 2 ని విశ్వసనీయపరుచుకొని, బ్రౌజర్ పొడిగింపు అభ్యర్థనలను నిరోధించబడదని నిర్ధారించుకోండి.",
     "Change Password": "పాస్వర్డ్ మార్చండి",
@@ -47,7 +43,6 @@
     "You cannot place VoIP calls in this browser.": "మీరు ఈ బ్రౌజర్లో కాల్లను చేయలేరు.",
     "You have no visible notifications": "మీకు కనిపించే నోటిఫికేషన్లు లేవు",
     "You need to be able to invite users to do that.": "మీరు దీన్ని చేయడానికి వినియోగదారులను ఆహ్వానించగలరు.",
-    "Claimed Ed25519 fingerprint key": "ఎడ్25519 వేలిముద్ర కీ ని పేర్కొన్నారు",
     "Click here to fix": "పరిష్కరించడానికి ఇక్కడ క్లిక్ చేయండి",
     "Click to mute audio": "ఆడియోను మ్యూట్ చేయడానికి క్లిక్ చేయండి",
     "Click to mute video": "వీడియో మ్యూట్ చేయడానికి క్లిక్ చేయండి",
@@ -59,17 +54,14 @@
     "Commands": "కమ్మండ్స్",
     "Confirm password": "పాస్వర్డ్ని నిర్ధారించండి",
     "Continue": "కొనసాగించు",
-    "Could not connect to the integration server": "ఇంటిగ్రేషన్ సర్వర్కు కనెక్ట్ చేయడం సాధ్యం కాలేదు",
     "Create Room": "రూమ్ ని సృష్టించండి",
     "Cryptography": "క్రిప్టోగ్రఫీ",
     "Current password": "ప్రస్తుత పాస్వర్డ్",
-    "Curve25519 identity key": "Curve25519 గుర్తింపు కీ",
     "Custom": "కస్టమ్",
     "Custom level": "అనుకూల స్థాయి",
     "/ddg is not a command": "/ ddg కమాండ్ కాదు",
     "Deactivate Account": "ఖాతాను డీయాక్టివేట్ చేయండి",
     "Decline": "డిక్లైన్",
-    "Decryption error": "గుప్తలేఖన లోపం",
     "Deops user with given id": "ఇచ్చిన ID తో వినియోగదారుని విడదీస్తుంది",
     "Default": "డిఫాల్ట్",
     "Sun": "ఆదివారం",
@@ -101,7 +93,6 @@
     "Upload an avatar:": "అవతార్ను అప్లోడ్ చేయండి:",
     "This server does not support authentication with a phone number.": "ఈ సర్వర్ ఫోన్ నంబర్తో ప్రామాణీకరణకు మద్దతు ఇవ్వదు.",
     "New passwords don't match": "కొత్త పాస్వర్డ్లు సరిపోలడం లేదు",
-    "Make Moderator": "మోడరేటర్ చేయండి",
     "There are no visible files in this room": "ఈ గదిలో కనిపించే ఫైల్లు లేవు",
     "Connectivity to the server has been lost.": "సెర్వెర్ కనెక్టివిటీని కోల్పోయారు.",
     "Sent messages will be stored until your connection has returned.": "మీ కనెక్షన్ తిరిగి వచ్చే వరకు పంపిన సందేశాలు నిల్వ చేయబడతాయి.",
@@ -110,8 +101,6 @@
     "Incorrect verification code": "ధృవీకరణ కోడ్ సరిగా లెదు",
     "unknown error code": "తెలియని కోడ్ లోపం",
     "Please enter the code it contains:": "దయచేసి దాన్ని కలిగి ఉన్న కోడ్ను నమోదు చేయండి:",
-    "riot-web version:": "రయట్-వెబ్ సంస్కరణ:",
-    "Riot was not given permission to send notifications - please try again": "రయట్ కు ప్రకటనలను పంపడానికి అనుమతి లేదు - దయచేసి మళ్ళీ ప్రయత్నించండి",
     "Unable to restore session": "సెషన్ను పునరుద్ధరించడానికి సాధ్యపడలేదు",
     "Remove": "తొలగించు",
     "Room directory": "గది వివరము",
@@ -126,7 +115,6 @@
     "Search": "శోధన",
     "Settings": "అమరికలు",
     "Fetching third party location failed": "మూడవ పార్టీ స్థానాన్ని పొందడం విఫలమైంది",
-    "A new version of Riot is available.": "కొత్త రిమోట్ వివరణము అందుబాటులో ఉంది.",
     "Advanced notification settings": "ఆధునిక తాఖీదు అమరిక",
     "Sunday": "ఆదివారం",
     "Guests can join": "అతిథులు చేరవచ్చు",
@@ -139,7 +127,6 @@
     "Changelog": "మార్పు వివరణ",
     "Leave": "వదిలి",
     "All notifications are currently disabled for all targets.": "ప్రస్తుతానికి అన్ని చోట్లనుంచి అన్ని ప్రకటనలు ఆగి వున్నాయి.",
-    "delete the alias.": "అలియాస్ తొలగించండి.",
     "Forget": "మర్చిపో",
     "Source URL": "మూల URL",
     "Warning": "హెచ్చరిక",
@@ -188,7 +175,6 @@
     "Invite to this room": "ఈ గదికి ఆహ్వానించండి",
     "Thursday": "గురువారం",
     "Search…": "శోధన…",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "క్షమించండి, మీ బ్రౌజర్ <b>రియట్ని అమలు చేయలేరు</b>.",
     "Messages in group chats": "సమూహ మాటామంతిలో సందేశాలు",
     "Yesterday": "నిన్న",
     "Error encountered (%(errorDetail)s).": "లోపం సంభవించింది (%(errorDetail)s).",
@@ -208,17 +194,11 @@
     "This phone number is already in use": "ఈ ఫోన్ నంబర్ ఇప్పటికే వాడుకం లో ఉంది",
     "Failed to verify email address: make sure you clicked the link in the email": "ఇమెయిల్ అడ్రస్ ని నిరూపించలేక పోయాము. ఈమెయిల్ లో వచ్చిన లింక్ ని నొక్కారా",
     "The platform you're on": "మీరు ఉన్న ప్లాట్ఫార్మ్",
-    "The version of Riot.im": "రయట్.ఐఎమ్ యొక్క వెర్సన్",
     "Your homeserver's URL": "మీ హోమ్ సర్వర్ యొక్క URL",
-    "Your identity server's URL": "మీ ఐడెంటిటి సర్వర్ యొక్క URL",
     "e.g. %(exampleValue)s": "ఉ.దా. %(exampleValue)s 1",
     "Every page you use in the app": "ఆప్ లో మీరు వాడే ప్రతి పేజి",
     "e.g. <CurrentPageURL>": "ఉ.దా. <CurrentPageURL>",
-    "Your User Agent": "మీ యీసర్ ఏజెంట్",
     "Call Failed": "కాల్ విఫలమయింది",
-    "Review Devices": "పరికరాలని ఒక మారు చూసుకో",
-    "Call": "కాల్",
-    "Answer": "ఎత్తు",
     "The remote side failed to pick up": "అటు వైపు ఎత్తలేకపోయారు",
     "Unable to capture screen": "తెరని చూపలేకపోతున్నారు",
     "Existing Call": "నజుస్తున్న కాల్",
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index 333beca311..811d549d54 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -12,8 +12,6 @@
     "%(senderName)s banned %(targetName)s.": "%(senderName)s แบน %(targetName)s แล้ว",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s เปลี่ยนหัวข้อเป็น \"%(topic)s\"",
     "Decrypt %(text)s": "ถอดรหัส %(text)s",
-    "Device ID": "ID อุปกรณ์",
-    "device id: ": "id อุปกรณ์: ",
     "Download %(text)s": "ดาวน์โหลด %(text)s",
     "Emoji": "อีโมจิ",
     "Error": "ข้อผิดพลาด",
@@ -26,7 +24,7 @@
     "Reason": "เหตุผล",
     "Register": "ลงทะเบียน",
     "Results from DuckDuckGo": "ผลจาก DuckDuckGo",
-    "riot-web version:": "เวอร์ชัน riot-web:",
+    "%(brand)s version:": "เวอร์ชัน %(brand)s:",
     "Cancel": "ยกเลิก",
     "Dismiss": "ไม่สนใจ",
     "Mute": "เงียบ",
@@ -47,8 +45,7 @@
     "Admin": "ผู้ดูแล",
     "No Webcams detected": "ไม่พบกล้องเว็บแคม",
     "No media permissions": "ไม่มีสิทธิ์เข้าถึงสื่อ",
-    "You may need to manually permit Riot to access your microphone/webcam": "คุณอาจต้องให้สิทธิ์ Riot เข้าถึงไมค์โครโฟนไมค์โครโฟน/กล้องเว็บแคม ด้วยตัวเอง",
-    "Algorithm": "อัลกอริทึม",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "คุณอาจต้องให้สิทธิ์ %(brand)s เข้าถึงไมค์โครโฟนไมค์โครโฟน/กล้องเว็บแคม ด้วยตัวเอง",
     "Authentication": "การยืนยันตัวตน",
     "%(items)s and %(lastItem)s": "%(items)s และ %(lastItem)s",
     "and %(count)s others...|one": "และอีกหนึ่งผู้ใช้...",
@@ -65,7 +62,6 @@
     "Autoplay GIFs and videos": "เล่น GIF และวิดิโออัตโนมัติ",
     "Banned users": "ผู้ใช้ที่ถูกแบน",
     "Bans user with given id": "ผู้ใช้และ id ที่ถูกแบน",
-    "Blacklisted": "ขึ้นบัญชีดำ",
     "%(senderName)s changed their profile picture.": "%(senderName)s เปลี่ยนรูปโปรไฟล์ของเขา",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s เปลี่ยนชื่อห้องไปเป็น %(roomName)s",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s ลบชื่อห้อง",
@@ -84,10 +80,7 @@
     "Current password": "รหัสผ่านปัจจุบัน",
     "/ddg is not a command": "/ddg ไม่ใช่คำสั่ง",
     "Deactivate Account": "ปิดการใช้งานบัญชี",
-    "Decryption error": "การถอดรหัสผิดพลาด",
-    "Direct chats": "แชทตรง",
     "Disinvite": "ถอนคำเชิญ",
-    "Ed25519 fingerprint": "ลายนิ้วมือ Ed25519",
     "Email": "อีเมล",
     "Email address": "ที่อยู่อีเมล",
     "%(senderName)s ended the call.": "%(senderName)s จบการโทร",
@@ -103,7 +96,6 @@
     "Failed to send email": "การส่งอีเมลล้มเหลว",
     "Failed to send request.": "การส่งคำขอล้มเหลว",
     "Failed to set display name": "การตั้งชื่อที่แสดงล้มเหลว",
-    "Failed to toggle moderator status": "การสลับสถานะผู้ช่วยดูแลล้มเหลว",
     "Failed to unban": "การถอนแบนล้มเหลว",
     "Failed to verify email address: make sure you clicked the link in the email": "การยืนยันอีเมลล้มเหลว: กรุณาตรวจสอบว่าคุณคลิกลิงก์ในอีเมลแล้ว",
     "Failure to create room": "การสร้างห้องล้มเหลว",
@@ -136,14 +128,11 @@
     "Logout": "ออกจากระบบ",
     "Missing user_id in request": "ไม่พบ user_id ในคำขอ",
     "Moderator": "ผู้ช่วยดูแล",
-    "New address (e.g. #foo:%(localDomain)s)": "ที่อยู่ใหม่ (เช่น #foo:%(localDomain)s)",
     "New passwords don't match": "รหัสผ่านใหม่ไม่ตรงกัน",
     "New passwords must match each other.": "รหัสผ่านใหม่ทั้งสองช่องต้องตรงกัน",
-    "none": "ไม่มี",
     "not specified": "ไม่ได้ระบุ",
     "(not supported by this browser)": "(เบราว์เซอร์นี้ไม่รองรับ)",
     "<not supported>": "<ไม่รองรับ>",
-    "NOT verified": "ยังไม่ได้ยืนยัน",
     "No more results": "ไม่มีผลลัพธ์อื่น",
     "No results": "ไม่มีผลลัพธ์",
     "Passwords can't be empty": "รหัสผ่านต้องไม่ว่าง",
@@ -151,18 +140,16 @@
     "Phone": "โทรศัพท์",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "กรุณาเช็คอีเมลและคลิกลิงก์ข้างใน หลังจากนั้น คลิกดำเนินการต่อ",
     "Privileged Users": "ผู้ใช้ที่มีสิทธิพิเศษ",
-    "Revoke Moderator": "เพิกถอนผู้ช่วยดูแล",
     "%(targetName)s rejected the invitation.": "%(targetName)s ปฏิเสธคำเชิญแล้ว",
     "Reject invitation": "ปฏิเสธคำเชิญ",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s ลบชื่อที่แสดงแล้ว (%(oldDisplayName)s)",
     "%(senderName)s removed their profile picture.": "%(senderName)s ลบรูปโปรไฟล์ของเขาแล้ว",
     "Return to login screen": "กลับไปยังหน้าลงชื่อเข้าใช้",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot ไม่มีสิทธิ์ส่งการแจ้งเตือน - กรุณาตรวจสอบการตั้งค่าเบราว์เซอร์ของคุณ",
-    "Riot was not given permission to send notifications - please try again": "Riot ไม่ได้รับสิทธิ์ส่งการแจ้งเตือน - กรุณาลองใหม่อีกครั้ง",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s ไม่มีสิทธิ์ส่งการแจ้งเตือน - กรุณาตรวจสอบการตั้งค่าเบราว์เซอร์ของคุณ",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s ไม่ได้รับสิทธิ์ส่งการแจ้งเตือน - กรุณาลองใหม่อีกครั้ง",
     "Room Colour": "สีห้อง",
     "Rooms": "ห้องสนทนา",
     "Save": "บันทึก",
-    "Scroll to bottom of page": "เลื่อนลงไปล่างสุด",
     "Search failed": "การค้นหาล้มเหลว",
     "Searches DuckDuckGo for results": "ค้นหาบน DuckDuckGo",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s ได้ส่งรูป",
@@ -179,7 +166,6 @@
     "Someone": "ใครบางคน",
     "Always show message timestamps": "แสดงเวลาในแชทเสมอ",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "แสดงเวลาในแชทในรูปแบบ 12 ชั่วโมง (เช่น 2:30pm)",
-    "Start a chat": "เริ่มแชท",
     "Submit": "ส่ง",
     "Success": "สำเร็จ",
     "This email address is already in use": "ที่อยู่อีเมลถูกใช้แล้ว",
@@ -189,7 +175,6 @@
     "Room directory": "ไดเรกทอรีห้อง",
     "Start chat": "เริ่มแชท",
     "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 ได้เนื่องจาก URL ที่อยู่บนเบราว์เซอร์เป็น HTTPS กรุณาใช้ HTTPS หรือ<a>เปิดใช้งานสคริปต์ที่ไม่ปลอดภัย</a>.",
-    "End-to-end encryption information": "ข้อมูลการเข้ารหัสจากปลายทางถึงปลายทาง",
     "Error: Problem communicating with the given homeserver.": "ข้อผิดพลาด: มีปัญหาในการติดต่อกับเซิร์ฟเวอร์บ้านที่กำหนด",
     "Export E2E room keys": "ส่งออกกุญแจถอดรหัส E2E",
     "Failed to change power level": "การเปลี่ยนระดับอำนาจล้มเหลว",
@@ -202,17 +187,12 @@
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s ปลดแบน %(targetName)s แล้ว",
     "Unable to capture screen": "ไม่สามารถจับภาพหน้าจอ",
     "Unable to enable Notifications": "ไม่สามารถเปิดใช้งานการแจ้งเตือน",
-    "unencrypted": "ยังไม่ได้เข้ารหัส",
-    "unknown device": "อุปกรณ์ที่ไม่รู้จัก",
-    "Unknown room %(roomId)s": "ห้องที่ไม่รู้จัก %(roomId)s",
-    "Unrecognised room alias:": "นามแฝงห้องที่ไม่รู้จัก:",
     "Uploading %(filename)s and %(count)s others|zero": "กำลังอัปโหลด %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "กำลังอัปโหลด %(filename)s และอีก %(count)s ไฟล์",
     "Uploading %(filename)s and %(count)s others|other": "กำลังอัปโหลด %(filename)s และอีก %(count)s ไฟล์",
     "Upload Failed": "การอัปโหลดล้มเหลว",
     "Upload file": "อัปโหลดไฟล์",
     "Usage": "การใช้งาน",
-    "User ID": "ID ผู้ใช้",
     "Warning!": "คำเตือน!",
     "Who can access this room?": "ใครสามารถเข้าถึงห้องนี้ได้?",
     "Who can read history?": "ใครสามารถอ่านประวัติแชทได้?",
@@ -243,7 +223,6 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s %(day)s %(monthName)s %(fullYear)s %(time)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
     "Set a display name:": "ตั้งชื่อที่แสดง:",
-    "Make Moderator": "เลื่อนขั้นเป็นผู้ช่วยดูแล",
     "Room": "ห้อง",
     "New Password": "รหัสผ่านใหม่",
     "Options": "ตัวเลือก",
@@ -257,8 +236,6 @@
     "Unknown error": "ข้อผิดพลาดที่ไม่รู้จัก",
     "Incorrect password": "รหัสผ่านไม่ถูกต้อง",
     "Unknown Address": "ที่อยู่ที่ไม่รู้จัก",
-    "Unblacklist": "ถอดบัญชีดำ",
-    "Blacklist": "ขึ้นบัญชีดำ",
     "ex. @bob:example.com": "เช่น @bob:example.com",
     "Add User": "เพิ่มผู้ใช้",
     "Add": "เพิ่ม",
@@ -272,14 +249,11 @@
     "Unnamed Room": "ห้องที่ยังไม่ได้ตั้งชื่อ",
     "(~%(count)s results)|one": "(~%(count)s ผลลัพท์)",
     "(~%(count)s results)|other": "(~%(count)s ผลลัพท์)",
-    "Alias (optional)": "นามแฝง (ไม่ใส่ก็ได้)",
     "A new password must be entered.": "กรุณากรอกรหัสผ่านใหม่",
     "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 certificate ของเซิร์ฟเวอร์บ้าน</a>ของคุณเชื่อถือได้, และวไม่มีส่วนขยายเบราว์เซอร์ใดบล๊อคการเชื่อมต่ออยู่",
     "Drop File Here": "วางไฟล์ที่นี่",
-    "Enable Notifications": "เปิดใฃ้งานการแจ้งเตือน",
     "Private Chat": "แชทส่วนตัว",
     "Public Chat": "แชทสาธารณะ",
-    "Disable Notifications": "ปิดใช้งานการแจ้งเตือน",
     "Custom level": "กำหนดระดับเอง",
     "No display name": "ไม่มีชื่อที่แสดง",
     "Only people who have been invited": "เฉพาะบุคคลที่ได้รับเชิญ",
@@ -292,17 +266,12 @@
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (ระดับอำนาจ %(powerLevelNumber)s)",
     "Users": "ผู้ใช้",
     "Verification Pending": "รอการตรวจสอบ",
-    "Verification": "การตรวจสอบ",
-    "verified": "ตรวจสอบแล้ว",
     "You are already in a call.": "คุณอยู่ในสายแล้ว",
     "You cannot place a call with yourself.": "คุณไม่สามารถโทรหาตัวเองได้",
-    "Unverify": "ถอนการตรวจสอบ",
-    "Verify...": "ตรวจสอบ...",
     "Error decrypting audio": "เกิดข้อผิดพลาดในการถอดรหัสเสียง",
     "Error decrypting image": "เกิดข้อผิดพลาดในการถอดรหัสรูป",
     "Error decrypting video": "เกิดข้อผิดพลาดในการถอดรหัสวิดิโอ",
     "Fetching third party location failed": "การเรียกข้อมูลตำแหน่งจากบุคคลที่สามล้มเหลว",
-    "A new version of Riot is available.": "มี Riot เวอร์ชั่นใหม่",
     "I understand the risks and wish to continue": "ฉันเข้าใจความเสี่ยงและต้องการดำเนินการต่อ",
     "Advanced notification settings": "ตั้งค่าการแจ้งเตือนขั้นสูง",
     "Uploading report": "กำลังอัปโหลดรายงาน",
@@ -323,8 +292,6 @@
     "Leave": "ออกจากห้อง",
     "Uploaded on %(date)s by %(user)s": "อัปโหลดเมื่อ %(date)s โดย %(user)s",
     "All notifications are currently disabled for all targets.": "การแจ้งเตือนทั้งหมดถูกปิดใช้งานสำหรับทุกอุปกรณ์",
-    "delete the alias.": "ลบนามแฝง",
-    "To return to your account in future you need to <u>set a password</u>": "คุณต้อง<u>ตั้งรหัสผ่าน</u>เพื่อจะกลับมาที่บัญชีนี้ในอนาคต",
     "Forget": "ลืม",
     "World readable": "ทุกคนอ่านได้",
     "You cannot delete this image. (%(code)s)": "คุณไม่สามารถลบรูปนี้ได้ (%(code)s)",
@@ -350,7 +317,6 @@
     "No update available.": "ไม่มีอัปเดตที่ใหม่กว่า",
     "Noisy": "เสียงดัง",
     "Collecting app version information": "กำลังรวบรวมข้อมูลเวอร์ชันแอป",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "ลบนามแฝง %(alias)s ของห้องและถอด %(name)s ออกจากไดเรกทอรี?",
     "Enable notifications for this account": "เปิดใช้งานการแจ้งเตือนสำหรับบัญชีนี้",
     "Messages containing <span>keywords</span>": "ข้อความที่มี<span>คีย์เวิร์ด</span>",
     "View Source": "ดูซอร์ส",
@@ -358,7 +324,7 @@
     "Enter keywords separated by a comma:": "กรอกคีย์เวิร์ดทั้งหมด คั่นด้วยเครื่องหมายจุลภาค:",
     "Search…": "ค้นหา…",
     "Remove %(name)s from the directory?": "ถอด %(name)s ออกจากไดเรกทอรี?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot ใช้คุณสมบัติขั้นสูงในเบราว์เซอร์หลายประการ คุณสมบัติบางอย่างอาจยังไม่พร้อมใช้งานหรืออยู่ในขั้นทดลองในเบราว์เซอร์ปัจจุบันของคุณ",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s ใช้คุณสมบัติขั้นสูงในเบราว์เซอร์หลายประการ คุณสมบัติบางอย่างอาจยังไม่พร้อมใช้งานหรืออยู่ในขั้นทดลองในเบราว์เซอร์ปัจจุบันของคุณ",
     "Unnamed room": "ห้องที่ไม่มีชื่อ",
     "All messages (noisy)": "ทุกข้อความ (เสียงดัง)",
     "Saturday": "วันเสาร์",
@@ -394,13 +360,12 @@
     "Forward Message": "ส่งต่อข้อความ",
     "Unhide Preview": "แสดงตัวอย่าง",
     "Unable to join network": "ไม่สามารถเข้าร่วมเครือข่ายได้",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "คุณอาจมีการตั้งค่าจากไคลเอนต์อื่นนอกจาก Riot การตั้งต่าเหล่านั้นยังถูกใช้งานอยู่แต่คุณจะปรับแต่งจากใน Riot ไม่ได้",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "ขออภัย เบราว์เซอร์ของคุณ<b>ไม่</b>สามารถ run Riot ได้",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "ขออภัย เบราว์เซอร์ของคุณ<b>ไม่</b>สามารถ run %(brand)s ได้",
     "Messages in group chats": "ข้อความในแชทกลุ่ม",
     "Yesterday": "เมื่อวานนี้",
     "Error encountered (%(errorDetail)s).": "เกิดข้อผิดพลาด (%(errorDetail)s)",
     "Low Priority": "ความสำคัญต่ำ",
-    "Riot does not know how to join a room on this network": "Riot ไม่รู้วิธีเข้าร่วมห้องในเครือข่ายนี้",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s ไม่รู้วิธีเข้าร่วมห้องในเครือข่ายนี้",
     "Set Password": "ตั้งรหัสผ่าน",
     "Off": "ปิด",
     "Mentions only": "เมื่อถูกกล่าวถึงเท่านั้น",
@@ -413,6 +378,5 @@
     "Unable to fetch notification target list": "ไม่สามารถรับรายชื่ออุปกรณ์แจ้งเตือน",
     "Quote": "อ้างอิง",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "การแสดงผลของโปรแกรมอาจผิดพลาด ฟังก์ชันบางอย่างหรือทั้งหมดอาจไม่ทำงานในเบราว์เซอร์ปัจจุบันของคุณ หากคุณต้องการลองดำเนินการต่อ คุณต้องรับมือกับปัญหาที่อาจจะเกิดขึ้นด้วยตัวคุณเอง!",
-    "Checking for an update...": "กำลังตรวจหาอัปเดต...",
-    "There are advanced notifications which are not shown here": "มีการแจ้งเตือนขั้นสูงที่ไม่ได้แสดงที่นี่"
+    "Checking for an update...": "กำลังตรวจหาอัปเดต..."
 }
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 7b5a0ac3ec..5a152eeab6 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -12,15 +12,13 @@
     "No Microphones detected": "Hiçbir Mikrofon bulunamadı",
     "No Webcams detected": "Hiçbir Web kamerası bulunamadı",
     "No media permissions": "Medya izinleri yok",
-    "You may need to manually permit Riot to access your microphone/webcam": "Riot'un mikrofonunuza / web kameranıza el le erişmesine izin vermeniz gerekebilir",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "%(brand)s'un mikrofonunuza / web kameranıza el le erişmesine izin vermeniz gerekebilir",
     "Default Device": "Varsayılan Cihaz",
     "Microphone": "Mikrofon",
     "Camera": "Kamera",
     "Advanced": "Gelişmiş",
-    "Algorithm": "Algoritma",
     "Always show message timestamps": "Her zaman mesaj zaman dalgalarını (timestamps) gösterin",
     "Authentication": "Doğrulama",
-    "Alias (optional)": "Diğer ad (isteğe bağlı)",
     "%(items)s and %(lastItem)s": "%(items)s ve %(lastItem)s",
     "and %(count)s others...|one": "ve bir diğeri...",
     "and %(count)s others...|other": "ve %(count)s diğerleri...",
@@ -39,7 +37,6 @@
     "Ban": "Yasak",
     "Banned users": "Yasaklanan(Banlanan) Kullanıcılar",
     "Bans user with given id": "Yasaklanan(Banlanan) Kullanıcılar , ID'leri ile birlikte",
-    "Blacklisted": "Kara listeye alınanlar",
     "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.",
@@ -50,7 +47,6 @@
     "%(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",
-    "Claimed Ed25519 fingerprint key": "Ed25519 parmak izi anahtarı istendi",
     "Click here to fix": "Düzeltmek için buraya tıklayın",
     "Click to mute audio": "Sesi kapatmak için  tıklayın",
     "Click to mute video": "Videoyu kapatmak için tıklayın",
@@ -62,40 +58,29 @@
     "Commands": "Komutlar",
     "Confirm password": "Şifreyi Onayla",
     "Continue": "Devam Et",
-    "Could not connect to the integration server": "Bütünleştirme (Integration) Sunucusuna bağlanamadı",
     "Create Room": "Oda Oluştur",
     "Cryptography": "Kriptografi",
     "Current password": "Şimdiki Şifre",
-    "Curve25519 identity key": "Curve25519 kimlik anahtarı",
     "Custom": "Özel",
     "Custom level": "Özel seviye",
     "/ddg is not a command": "/ddg bir komut değildir",
     "Deactivate Account": "Hesabı Devre Dışı Bırakma",
     "Decline": "Reddet",
     "Decrypt %(text)s": "%(text)s metninin şifresini çöz",
-    "Decryption error": "Şifre çözme hatası",
     "Deops user with given id": "ID'leriyle birlikte , düşürülmüş kullanıcılar",
     "Default": "Varsayılan",
-    "Device ID": "Cihaz ID",
-    "device id: ": "cihaz id: ",
-    "Direct chats": "Doğrudan Sohbetler",
-    "Disable Notifications": "Bildirimleri Devre Dışı Bırak",
     "Disinvite": "Daveti İptal Et",
     "Displays action": "Eylemi görüntüler",
     "Download %(text)s": "%(text)s metnini indir",
     "Drop File Here": "Dosyayı Buraya Bırak",
-    "Ed25519 fingerprint": "Ed25519 parmak izi",
     "Email": "E-posta",
     "Email address": "E-posta Adresi",
     "Emoji": "Emoji (Karakter)",
-    "Enable Notifications": "Bildirimleri Etkinleştir",
     "%(senderName)s ended the call.": "%(senderName)s çağrıyı bitirdi.",
-    "End-to-end encryption information": "Uçtan-uca şifreleme bilgileri",
     "Enter passphrase": "Şifre deyimi Girin",
     "Error": "Hata",
     "Error decrypting attachment": "Ek şifresini çözme hatası",
     "Error: Problem communicating with the given homeserver.": "Hata: verilen Ana Sunucu ile iletişim kurulamıyor.",
-    "Event information": "Etkinlik bilgileri",
     "Existing Call": "Mevcut Çağrı",
     "Export": "Dışa Aktar",
     "Export E2E room keys": "Uçtan uca Oda anahtarlarını Dışa Aktar",
@@ -114,7 +99,6 @@
     "Failed to send email": "E-posta gönderimi başarısız oldu",
     "Failed to send request.": "İstek gönderimi başarısız oldu.",
     "Failed to set display name": "Görünür ismi ayarlama başarısız oldu",
-    "Failed to toggle moderator status": "Moderatör durumunu değiştirmek başarısız oldu",
     "Failed to unban": "Yasağı kaldırmak başarısız oldu",
     "Failed to upload profile picture!": "Profil resmi yükleme başarısız oldu!",
     "Failed to verify email address: make sure you clicked the link in the email": "Eposta adresini doğrulamadı: epostadaki bağlantıya tıkladığınızdan emin olun",
@@ -150,7 +134,6 @@
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "<voiceText> ses </voiceText> veya <videoText> video </videoText> olarak katılın.",
     "Join Room": "Odaya Katıl",
     "%(targetName)s joined the room.": "%(targetName)s odaya katıldı.",
-    "Joins room with given alias": "Verilen takma ad (nick name) ile odaya katıl",
     "Jump to first unread message.": "İlk okunmamış iletiye atla.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s %(targetName)s' ı attı.",
     "Kick": "Atmak (Odadan atmak vs.)",
@@ -159,7 +142,6 @@
     "Last seen": "Son görülme",
     "Leave room": "Odadan ayrıl",
     "%(targetName)s left the room.": "%(targetName)s odadan ayrıldı.",
-    "Local addresses for this room:": "Bu oda için yerel adresler :",
     "Logout": "Çıkış Yap",
     "Low priority": "Düşük öncelikli",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s gelecekte oda geçmişini görünür yaptı Tüm oda üyeleri , davet edildiği noktadan.",
@@ -173,15 +155,12 @@
     "Moderator": "Moderatör",
     "Mute": "Sessiz",
     "Name": "İsim",
-    "New address (e.g. #foo:%(localDomain)s)": "Yeni adres (e.g. #foo:%(localDomain)s)",
     "New passwords don't match": "Yeni şifreler uyuşmuyor",
     "New passwords must match each other.": "Yeni şifreler birbirleriyle eşleşmelidir.",
-    "none": "Hiç (Yok)",
     "not specified": "Belirtilmemiş",
     "Notifications": "Bildirimler",
     "(not supported by this browser)": "(Bu tarayıcı tarafından desteklenmiyor)",
     "<not supported>": "<Desteklenmiyor>",
-    "NOT verified": "Doğrulanmadı",
     "No display name": "Görünür isim yok",
     "No more results": "Başka sonuç yok",
     "No results": "Sonuç yok",
@@ -201,32 +180,28 @@
     "Profile": "Profil",
     "Public Chat": "Genel Sohbet",
     "Reason": "Sebep",
-    "Revoke Moderator": "Moderatörü İptal Et",
     "Register": "Kaydolun",
     "%(targetName)s rejected the invitation.": "%(targetName)s daveti reddetti.",
     "Reject invitation": "Daveti Reddet",
-    "Remote addresses for this room:": "Bu oda için uzak adresler:",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s görünen adı (%(oldDisplayName)s) kaldırdı.",
     "%(senderName)s removed their profile picture.": "%(senderName)s profil resmini kaldırdı.",
     "Remove": "Kaldır",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s bir VoIP konferansı talep etti.",
     "Results from DuckDuckGo": "DuckDuckGo Sonuçları",
     "Return to login screen": "Giriş ekranına dön",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot size bildirim gönderme iznine sahip değil - lütfen tarayıcı ayarlarınızı kontrol edin",
-    "Riot was not given permission to send notifications - please try again": "Riot'a bildirim gönderme izni verilmedi - lütfen tekrar deneyin",
-    "riot-web version:": "riot-web versiyon:",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s size bildirim gönderme iznine sahip değil - lütfen tarayıcı ayarlarınızı kontrol edin",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s'a bildirim gönderme izni verilmedi - lütfen tekrar deneyin",
+    "%(brand)s version:": "%(brand)s versiyon:",
     "Room %(roomId)s not visible": "%(roomId)s odası görünür değil",
     "Room Colour": "Oda Rengi",
     "%(roomName)s does not exist.": "%(roomName)s mevcut değil.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s şu anda erişilebilir değil.",
     "Rooms": "Odalar",
     "Save": "Kaydet",
-    "Scroll to bottom of page": "Sayfanın altına kaydır",
     "Search": "Ara",
     "Search failed": "Arama başarısız",
     "Searches DuckDuckGo for results": "Sonuçlar için DuckDuckGo'yu arar",
     "Seen by %(userName)s at %(dateTime)s": "%(dateTime)s ' de %(userName)s tarafından görüldü",
-    "Send anyway": "Her durumda gönder",
     "Send Reset Email": "E-posta Sıfırlama Gönder",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s bir resim gönderdi.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s %(targetDisplayName)s' a odaya katılması için bir davet gönderdi.",
@@ -244,12 +219,11 @@
     "Sign out": "Çıkış Yap",
     "%(count)s of your messages have not been sent.|other": "Bazı mesajlarınız gönderilemedi.",
     "Someone": "Birisi",
-    "Start a chat": "Bir Sohbet Başlat",
     "Start authentication": "Kimlik Doğrulamayı başlatın",
     "Submit": "Gönder",
     "Success": "Başarılı",
     "The phone number entered looks invalid": "Girilen telefon numarası geçersiz görünüyor",
-    "This email address is already in use": "Bu eposta adresi zaten kullanımda",
+    "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ı)",
@@ -269,14 +243,10 @@
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s %(targetName)s 'in yasağını kaldırdı.",
     "Unable to capture screen": "Ekran yakalanamadı",
     "Unable to enable Notifications": "Bildirimler aktif edilemedi",
-    "unencrypted": "şifrelenmemiş",
     "unknown caller": "bilinmeyen arayıcı",
-    "unknown device": "bilinmeyen cihaz",
     "unknown error code": "bilinmeyen hata kodu",
-    "Unknown room %(roomId)s": "Bilinmeyen oda %(roomId)s",
     "Unmute": "Sesi aç",
     "Unnamed Room": "İsimsiz Oda",
-    "Unrecognised room alias:": "Tanınmayan oda isimleri :",
     "Uploading %(filename)s and %(count)s others|zero": "%(filename)s yükleniyor",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s ve %(count)s kadarı yükleniyor",
     "Uploading %(filename)s and %(count)s others|other": "%(filename)s ve %(count)s kadarları yükleniyor",
@@ -285,14 +255,10 @@
     "Upload file": "Dosya yükle",
     "Upload new:": "Yeni yükle :",
     "Usage": "Kullanım",
-    "Use compact timeline layout": "Kompakt zaman akışı düzenini kullan",
-    "User ID": "Kullanıcı ID",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (güç %(powerLevelNumber)s)",
     "Username invalid: %(errMessage)s": "Kullanıcı ismi geçersiz : %(errMessage)s",
     "Users": "Kullanıcılar",
     "Verification Pending": "Bekleyen doğrulama",
-    "Verification": "Doğrulama",
-    "verified": "doğrulanmış",
     "Verified key": "Doğrulama anahtarı",
     "Video call": "Görüntülü arama",
     "Voice call": "Sesli arama",
@@ -346,7 +312,6 @@
     "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.",
     "An error occurred: %(error_string)s": "Bir hata oluştu : %(error_string)s",
-    "Make Moderator": "Moderatör Yap",
     "There are no visible files in this room": "Bu odada görünür hiçbir dosya yok",
     "Room": "Oda",
     "Connectivity to the server has been lost.": "Sunucuyla olan bağlantı kesildi.",
@@ -363,7 +328,7 @@
     "Start automatically after system login": "Sisteme giriş yaptıktan sonra otomatik başlat",
     "Analytics": "Analitik",
     "Options": "Seçenekler",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot , uygulamayı iyileştirmemize izin vermek için anonim analitik toplar.",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s , uygulamayı iyileştirmemize izin vermek için anonim analitik toplar.",
     "Passphrases must match": "Şifrenin eşleşmesi gerekir",
     "Passphrase must not be empty": "Şifrenin boş olmaması gerekir",
     "Export room keys": "Oda anahtarlarını dışa aktar",
@@ -382,15 +347,9 @@
     "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.": "Bu etkinliği kaldırmak(silmek) istediğinizden emin misiniz ? Bir odayı ismini silmeniz veya konu değiştirmeniz , geri alınabilir bir durumdur.",
     "Unknown error": "Bilinmeyen Hata",
     "Incorrect password": "Yanlış Şifre",
-    "To continue, please enter your password.": "Devam etmek için , lütfen şifrenizi girin.",
-    "I verify that the keys match": "Anahtarların uyuştuğunu doğruluyorum",
     "Unable to restore session": "Oturum geri yüklenemiyor",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Eğer daha önce Riot'un daha yeni bir versiyonunu kullandıysanız , oturumunuz bu sürümle uyumsuz olabilir . Bu pencereyi kapatın ve daha yeni sürüme geri dönün.",
+    "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.": "Eğer daha önce %(brand)s'un daha yeni bir versiyonunu kullandıysanız , oturumunuz bu sürümle uyumsuz olabilir . Bu pencereyi kapatın ve daha yeni sürüme geri dönün.",
     "Unknown Address": "Bilinmeyen Adres",
-    "Unblacklist": "Karaliste Dışı",
-    "Blacklist": "Kara Liste",
-    "Unverify": "Doğrulamasını İptal Et",
-    "Verify...": "Doğrulama...",
     "ex. @bob:example.com": "örn. @bob:example.com",
     "Add User": "Kullanıcı Ekle",
     "Custom Server Options": "Özelleştirilebilir Sunucu Seçenekleri",
@@ -405,7 +364,6 @@
     "Error decrypting video": "Video şifre çözme hatası",
     "Add an Integration": "Entegrasyon ekleyin",
     "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?": "Hesabınızı %(integrationsUrl)s ile kullanmak üzere doğrulayabilmeniz için üçüncü taraf bir siteye götürülmek üzeresiniz. Devam etmek istiyor musunuz ?",
-    "Removed or unknown message type": "Kaldırılmış veya bilinmeyen ileti tipi",
     "URL Previews": "URL önizlemeleri",
     "Drop file here to upload": "Yüklemek için dosyaları buraya bırakın",
     " (unsupported)": " (desteklenmeyen)",
@@ -422,17 +380,12 @@
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Bu sizin <span></span>Ana Sunucunuzdaki hesap adınız olacak , veya <a>farklı sunucu</a> seçebilirsiniz.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Eğer Matrix hesabınız varsa , bunun yerine <a>Giriş Yapabilirsiniz</a> .",
     "Your browser does not support the required cryptography extensions": "Tarayıcınız gerekli şifreleme uzantılarını desteklemiyor",
-    "Not a valid Riot keyfile": "Geçersiz bir Riot anahtar dosyası",
+    "Not a valid %(brand)s keyfile": "Geçersiz bir %(brand)s anahtar dosyası",
     "Authentication check failed: incorrect password?": "Kimlik doğrulama denetimi başarısız oldu : yanlış şifre ?",
     "Do you want to set an email address?": "Bir e-posta adresi ayarlamak ister misiniz ?",
     "This will allow you to reset your password and receive notifications.": "Bu şifrenizi sıfırlamanızı ve bildirimler almanızı sağlayacak.",
     "Skip": "Atla",
-    "Start verification": "Doğrulamayı başlat",
-    "Share without verifying": "Doğrulamadan paylaş",
-    "Ignore request": "İsteği yoksay",
-    "Encryption key request": "Şifreleme anahtarı isteği",
     "Fetching third party location failed": "Üçüncü parti konumunu çekemedi",
-    "A new version of Riot is available.": "Riot'un yeni bir versiyonu mevcuttur.",
     "All notifications are currently disabled for all targets.": "Tüm bildirimler şu anda tüm hedefler için devre dışı bırakılmıştır.",
     "Uploading report": "Rapor yükleniyor",
     "Sunday": "Pazar",
@@ -450,7 +403,6 @@
     "Waiting for response from server": "Sunucudan yanıt bekleniyor",
     "Leave": "Ayrıl",
     "Advanced notification settings": "Gelişmiş bildirim ayarları",
-    "delete the alias.": "Tüm rumuzları sil.",
     "Forget": "Unut",
     "World readable": "Okunabilir dünya",
     "You cannot delete this image. (%(code)s)": "Bu resmi silemezsiniz. (%(code)s)",
@@ -472,7 +424,6 @@
     "Resend": "Yeniden Gönder",
     "Files": "Dosyalar",
     "Collecting app version information": "Uygulama sürümü bilgileri toplanıyor",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "%(alias)s oda rumuzu silinsin ve %(name)s dizinden kaldırılsın mı ?",
     "Keywords": "Anahtar kelimeler",
     "Enable notifications for this account": "Bu hesap için bildirimleri etkinleştir",
     "Messages containing <span>keywords</span>": "<span> anahtar kelimeleri </span> içeren mesajlar",
@@ -481,7 +432,7 @@
     "Enter keywords separated by a comma:": "Anahtar kelimeleri virgül ile ayırarak girin:",
     "I understand the risks and wish to continue": "Riskleri anlıyorum ve devam etmek istiyorum",
     "Remove %(name)s from the directory?": "%(name)s'i dizinden kaldırılsın mı ?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot geçerli tarayıcınızda mevcut olmayan veya denemelik olan birçok gelişmiş tarayıcı özelliği kullanıyor.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s geçerli tarayıcınızda mevcut olmayan veya denemelik olan birçok gelişmiş tarayıcı özelliği kullanıyor.",
     "Unnamed room": "İsimsiz oda",
     "All messages (noisy)": "Tüm mesajlar (uzun)",
     "Saturday": "Cumartesi",
@@ -518,8 +469,7 @@
     "Search…": "Arama…",
     "Unhide Preview": "Önizlemeyi Göster",
     "Unable to join network": "Ağa bağlanılamıyor",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Onları Riot dışında bir istemciden yapılandırmış olabilirsiniz . Onları Riot içersinide ayarlayamazsınız ama hala geçerlidirler",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Üzgünüz , tarayıcınız Riot'u  <b> çalıştıramıyor </b>.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Üzgünüz , tarayıcınız %(brand)s'u  <b> çalıştıramıyor </b>.",
     "Uploaded on %(date)s by %(user)s": "%(user)s tarafında %(date)s e yüklendi",
     "Messages in group chats": "Grup sohbetlerindeki mesajlar",
     "Yesterday": "Dün",
@@ -527,7 +477,7 @@
     "Unable to fetch notification target list": "Bildirim hedef listesi çekilemedi",
     "An error occurred whilst saving your email notification preferences.": "E-posta bildirim tercihlerinizi kaydetme işlemi sırasında bir hata oluştu.",
     "Off": "Kapalı",
-    "Riot does not know how to join a room on this network": "Riot bu ağdaki bir odaya nasıl gireceğini bilmiyor",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s bu ağdaki bir odaya nasıl gireceğini bilmiyor",
     "Mentions only": "Sadece Mention'lar",
     "Failed to remove tag %(tagName)s from room": "Odadan %(tagName)s etiketi kaldırılamadı",
     "You can now return to your account after signing out, and sign in on other devices.": "Şimdi oturumunuzu iptal ettikten sonra başka cihazda oturum açarak hesabınıza dönebilirsiniz.",
@@ -537,25 +487,17 @@
     "Failed to change settings": "Ayarlar değiştirilemedi",
     "View Source": "Kaynağı Görüntüle",
     "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!": "Geçerli tarayıcınız ile birlikte , uygulamanın görünüş ve kullanım hissi tamamen hatalı olabilir ve bazı ya da tüm özellikler çalışmayabilir. Yine de denemek isterseniz devam edebilirsiniz ancak karşılaşabileceğiniz sorunlar karşısında kendi başınasınız !",
-    "There are advanced notifications which are not shown here": "Burada gösterilmeyen gelişmiş bildirimler var",
     "The platform you're on": "Platformunuz",
-    "The version of Riot.im": "Riot.im'in sürümü",
+    "The version of %(brand)s": "%(brand)s sürümü",
     "Your language of choice": "Dil seçiminiz",
     "Which officially provided instance you are using, if any": "Hangi resmi destekli platformu kullanmaktasınız (eğer varsa)",
     "Add Email Address": "Eposta Adresi Ekle",
     "Add Phone Number": "Telefon Numarası Ekle",
-    "Your identity server's URL": "Kimlik sunucunuzun linki",
     "e.g. %(exampleValue)s": "örn.%(exampleValue)s",
     "Every page you use in the app": "Uygulamadaki kullandığınız tüm sayfalar",
     "e.g. <CurrentPageURL>": "örn. <CurrentPageURL>",
-    "Your User Agent": "Kullanıcı Ajanınız",
     "Your device resolution": "Cihazınızın çözünürlüğü",
     "Call Failed": "Arama Başarısız",
-    "Review Devices": "Cihazları Gözden Geçir",
-    "Call Anyway": "Yinede Ara",
-    "Answer Anyway": "Yinede Cevapla",
-    "Call": "Ara",
-    "Answer": "Cevap",
     "Call failed due to misconfigured server": "Hatalı yapılandırılmış sunucu nedeniyle arama başarısız",
     "Call in Progress": "Arama Yapılıyor",
     "A call is already in progress!": "Zaten bir arama devam etmekte!",
@@ -573,8 +515,6 @@
     "Only continue if you trust the owner of the server.": "Sadece sunucunun sahibine güveniyorsanız devam edin.",
     "Trust": "Güven",
     "Unable to load! Check your network connectivity and try again.": "Yüklenemiyor! Ağ bağlantınızı kontrol edin ve yeniden deneyin.",
-    "Registration Required": "Kayıt Zorunlu",
-    "You need to register to do this. Would you like to register now?": "Bunu yapabilmek için kayıt olmalısınız. Şimdi kayıt olmak ister misiniz?",
     "Restricted": "Sınırlı",
     "Failed to invite users to the room:": "Kullanıcıların odaya daveti başarısız oldu:",
     "Missing roomId.": "roomId eksik.",
@@ -596,20 +536,18 @@
     "%(senderDisplayName)s made the room invite only.": "Odayı sadece davetle yapan %(senderDisplayName)s.",
     "%(senderDisplayName)s has prevented guests from joining the room.": "Odaya misafirlerin girişini engelleyen %(senderDisplayName)s.",
     "%(senderName)s removed the main address for this room.": "Bu oda için ana adresi silen %(senderName)s.",
-    "Light theme": "Açık tema",
-    "Dark theme": "Koyu tema",
     "%(displayName)s is typing …": "%(displayName)s yazıyor…",
     "%(names)s and %(count)s others are typing …|one": "%(names)s ve bir diğeri yazıyor…",
     "%(names)s and %(lastPerson)s are typing …": "%(names)s ve %(lastPerson)s yazıyor…",
     "Cannot reach homeserver": "Ana sunucuya erişilemiyor",
-    "Your Riot is misconfigured": "Riot hatalı ayarlanmış",
+    "Your %(brand)s is misconfigured": "%(brand)s hatalı ayarlanmış",
     "Cannot reach identity server": "Kimlik sunucu erişilemiyor",
     "No homeserver URL provided": "Ana sunucu adresi belirtilmemiş",
     "Unexpected error resolving homeserver configuration": "Ana sunucu yapılandırması çözümlenirken beklenmeyen hata",
     "Unexpected error resolving identity server configuration": "Kimlik sunucu yapılandırması çözümlenirken beklenmeyen hata",
     "The message you are trying to send is too large.": "Göndermeye çalıştığın mesaj çok büyük.",
     "This homeserver has hit its Monthly Active User limit.": "Bu ana sunucu Aylık Aktif Kullanıcı limitine ulaştı.",
-    "Riot URL": "Riot Linki",
+    "%(brand)s URL": "%(brand)s Linki",
     "Room ID": "Oda ID",
     "More options": "Daha fazla seçenek",
     "Join": "Katıl",
@@ -674,8 +612,6 @@
     "Show advanced": "Gelişmiş göster",
     "Incompatible Database": "Uyumsuz Veritabanı",
     "To continue, please enter your password:": "Devam etmek için lütfen şifrenizi giriniz:",
-    "Begin Verifying": "Doğrulamaya Başla",
-    "Use two-way text verification": "İki yönlü metin doğrulama kullan",
     "Back": "Geri",
     "You must specify an event type!": "Bir olay tipi seçmek zorundasınız!",
     "Event sent!": "Olay gönderildi!",
@@ -691,7 +627,7 @@
     "Integrations not allowed": "Bütünleştirmelere izin verilmiyor",
     "Incompatible local cache": "Yerel geçici bellek uyumsuz",
     "Clear cache and resync": "Geçici belleği temizle ve yeniden eşle",
-    "Updating Riot": "Riot güncelleniyor",
+    "Updating %(brand)s": "%(brand)s güncelleniyor",
     "I don't want my encrypted messages": "Şifrelenmiş mesajlarımı istemiyorum",
     "Manually export keys": "Elle dışa aktarılmış anahtarlar",
     "You'll lose access to your encrypted messages": "Şifrelenmiş mesajlarınıza erişiminizi kaybedeceksiniz",
@@ -738,15 +674,11 @@
     "Cancel All": "Hepsi İptal",
     "Upload Error": "Yükleme Hatası",
     "Allow": "İzin ver",
-    "Enter secret storage recovery key": "Depolama kurtarma anahtarı için şifre gir",
     "This looks like a valid recovery key!": "Bu geçerli bir kurtarma anahtarına benziyor!",
     "Not a valid recovery key": "Geçersiz bir kurtarma anahtarı",
     "Unable to load backup status": "Yedek durumu yüklenemiyor",
-    "Recovery Key Mismatch": "Kurtarma Anahtarı Kurtarma",
     "Unable to restore backup": "Yedek geri dönüşü yapılamıyor",
     "No backup found!": "Yedek bulunamadı!",
-    "Backup Restored": "Yedek Geri Dönüldü",
-    "Enter Recovery Key": "Kurtarma Anahtarını Gir",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>Uyarı</b>: Yedek anahtarı kurulumunu sadece güvenli bir bilgisayardan yapmalısınız.",
     "Unable to reject invite": "Davet reddedilemedi",
     "Pin Message": "Pin Mesajı",
@@ -851,7 +783,7 @@
     "Whether or not you're logged in (we don't record your username)": "İster oturum açın yada açmayın (biz kullanıcı adınızı kaydetmiyoruz)",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Zengin Metin Düzenleyicisinin Zengin metin modunu kullanıyor ya da kullanmıyorsunuz",
     "Your homeserver's URL": "Ana sunucunuzun URL’i",
-    "The information being sent to us to help make Riot.im better includes:": "Riot.im i daha iyi yapmamıza yardımcı olacak bize gönderdiğiniz bilgilerin içeriği:",
+    "The information being sent to us to help make %(brand)s better includes:": "%(brand)s'u geliştirmemizde bize yardım etmek için gönderdiğiniz bilgiler şunları içeriyor:",
     "Try using turn.matrix.org": "turn.matrix.org i kullanarak dene",
     "You do not have permission to start a conference call in this room": "Bu odada bir konferans başlatmak için izniniz yok",
     "The file '%(fileName)s' failed to upload.": "%(fileName)s dosyası için yükleme başarısız.",
@@ -893,18 +825,14 @@
     "Set up with a recovery key": "Kurtarma anahtarı ile kur",
     "That matches!": "Eşleşti!",
     "That doesn't match.": "Eşleşmiyor.",
-    "Your Recovery Key": "Kurtarma Anahtarınız",
     "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>Copy it</b> to your personal cloud storage": "Kişisel bulut depolamaya <b>kopyala</b>",
-    "Recovery key": "Kurtarma anahtarı",
     "Success!": "Başarılı!",
     "Retry": "Yeniden Dene",
-    "Set up with a Recovery Key": "Bir Kurtarma Anahtarı ile Kur",
     "Set up Secure Message Recovery": "Güvenli Mesaj Kurtarma Kurulumu",
     "Starting backup...": "Yedeklemeye başlanıyor...",
-    "Create Key Backup": "Anahtar Yedeği Oluştur",
     "Unable to create key backup": "Anahtar yedeği oluşturulamıyor",
     "Don't ask again": "Yeniden sorma",
     "New Recovery Method": "Yeni Kurtarma Yöntemi",
@@ -1108,10 +1036,7 @@
     "Ban this user?": "Bu kullanıcıyı yasakla?",
     "Remove %(count)s messages|other": "%(count)s mesajı sil",
     "Remove %(count)s messages|one": "1 mesajı sil",
-    "A conference call could not be started because the integrations server is not available": "Entegrasyon sunucusu mevcut olmadığından konferans çağrısı başlatılamadı",
-    "Send cross-signing keys to homeserver": "Çapraz-imzalama anahtarlarını anasunucuya gönder",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Uyarı: Topluluğa eklediğiniz her bir kişi topluluk IDsini bilen herhangi biri tarafından açıkça görünür olacaktır",
-    "Room name or alias": "Oda adı ve lakabı",
     "Failed to invite users to %(groupId)s": "%(groupId)s grubuna kullanıcı daveti başarısız",
     "Failed to add the following rooms to %(groupId)s:": "%(groupId)s odalarına ekleme başarısız:",
     "Prepends ¯\\_(ツ)_/¯ to a plain-text message": "Düz-metin mesajına ¯\\_(ツ)_/¯ ifadesi ekler",
@@ -1134,11 +1059,8 @@
     "Failed to deactivate user": "Kullanıcı pasifleştirme başarısız",
     "Invite": "Davet",
     "Share Link to User": "Kullanıcıya Link Paylaş",
-    "User Options": "Kullanıcı Ayarları",
     "Send an encrypted reply…": "Şifrelenmiş bir cevap gönder…",
-    "Send a reply (unencrypted)…": "Bir cevap gönder (şifresiz)…",
     "Send an encrypted message…": "Şifreli bir mesaj gönder…",
-    "Send a message (unencrypted)…": "Bir mesaj gönder (şifresiz)…",
     "Bold": "Kalın",
     "Italics": "Eğik",
     "Code block": "Kod bloku",
@@ -1195,7 +1117,6 @@
     "Revoke invite": "Davet geri çekildi",
     "Invited by %(sender)s": "%(sender)s tarafından davet",
     "Error updating main address": "Ana adresi güncellemede hata",
-    "Error removing alias": "Lakap silmede hata",
     "Main address": "Ana adres",
     "Invalid community ID": "Geçersiz topluluk ID si",
     "'%(groupId)s' is not a valid community ID": "%(groupId)s geçerli olmayan bir topluluk ID si",
@@ -1229,17 +1150,15 @@
     "Copied!": "Kopyalandı!",
     "Failed to copy": "Kopyalama başarısız",
     "edited": "düzenlendi",
-    "Message removed by %(userId)s": "Mesaj %(userId)s tarafından silindi",
     "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 />.",
     "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!",
     "Deactivate account": "Hesabı pasifleştir",
-    "For help with using Riot, click <a>here</a>.": "Riot kullanarak yardım etmek için, <a>buraya</a> tıklayın.",
-    "Chat with Riot Bot": "Riot Bot ile Sohbet Et",
+    "For help with using %(brand)s, click <a>here</a>.": "%(brand)s kullanarak yardım etmek için, <a>buraya</a> tıklayın.",
+    "Chat with %(brand)s Bot": "%(brand)s Bot ile Sohbet Et",
     "Submit debug logs": "Hata ayıklama kayıtlarını gönder",
     "Something went wrong. Please try again or view your console for hints.": "Bir şeyler hatalı gitti. Lütfen yeniden deneyin veya ipuçları için konsolunuza bakın.",
-    "Please verify the room ID or alias and try again.": "Lütfen odanın ID si veya lakabı doğrulayın ve yeniden deneyin.",
     "Please try again or view your console for hints.": "Lütfen yeniden deneyin veya ipuçları için konsolunuza bakın.",
     "None": "Yok",
     "Ban list rules - %(roomName)s": "Yasak Liste Kuralları - %(roomName)s",
@@ -1254,7 +1173,6 @@
     "Ignore": "Yoksay",
     "Subscribed lists": "Abone olunmuş listeler",
     "If this isn't what you want, please use a different tool to ignore users.": "Eğer istediğiniz bu değilse, kullanıcıları yoksaymak için lütfen farklı bir araç kullanın.",
-    "Room ID or alias of ban list": "Yasak listesinin Oda ID veya lakabı",
     "Subscribe": "Abone ol",
     "Always show the window menu bar": "Pencerenin menü çubuğunu her zaman göster",
     "Bulk options": "Toplu işlem seçenekleri",
@@ -1268,7 +1186,6 @@
     "Error changing power level requirement": "Güç düzey gereksinimi değiştirmede hata",
     "Error changing power level": "Güç düzeyi değiştirme hatası",
     "Send %(eventType)s events": "%(eventType)s olaylarını gönder",
-    "To link to this room, please add an alias.": "Bu odaya bağlanmak için, lütfen bir lakap ekle.",
     "This event could not be displayed": "Bu olay görüntülenemedi",
     "Demote yourself?": "Kendinin rütbeni düşür?",
     "Demote": "Rütbe Düşür",
@@ -1288,9 +1205,7 @@
     "This invite to %(roomName)s was sent to %(email)s": "%(roomName)s odası daveti %(email)s adresine gönderildi",
     "You're previewing %(roomName)s. Want to join it?": "%(roomName)s odasını inceliyorsunuz. Katılmak ister misiniz?",
     "You don't currently have any stickerpacks enabled": "Açılmış herhangi bir çıkartma paketine sahip değilsiniz",
-    "Error creating alias": "Lakap oluştururken hata",
     "Room Topic": "Oda Başlığı",
-    "Verify this session to grant it access to encrypted messages.": "Şifrelenmiş mesajlara erişmek için bu oturumu doğrula.",
     "Start": "Başlat",
     "Session verified": "Oturum doğrulandı",
     "Done": "Bitti",
@@ -1342,7 +1257,6 @@
     "Group & filter rooms by custom tags (refresh to apply changes)": "Özel etiketler ile odaları grupla & filtrele ( değişiklikleri uygulamak için yenile)",
     "Render simple counters in room header": "Oda başlığında basit sayaçları görüntüle",
     "Try out new ways to ignore people (experimental)": "Kişileri yoksaymak için yeni yöntemleri dene (deneysel)",
-    "Enable local event indexing and E2EE search (requires restart)": "E2EE arama ve yerel olay indeksini aç (yeniden başlatma gerekli)",
     "Mirror local video feed": "Yerel video beslemesi yansısı",
     "Enable Community Filter Panel": "Toluluk Filtre Panelini Aç",
     "Match system theme": "Sistem temasıyla eşle",
@@ -1370,10 +1284,6 @@
     "%(severalUsers)smade no changes %(count)s times|one": "%(severalUsers)s değişiklik yapmadı",
     "%(oneUser)smade no changes %(count)s times|other": "%(oneUser)s %(count)s kez değişiklik yapmadı",
     "%(oneUser)smade no changes %(count)s times|one": "%(oneUser)s değişiklik yapmadı",
-    "Room alias": "Oda lakabı",
-    "Please provide a room alias": "Lütfen bir oda lakabı belirtin",
-    "This alias is available to use": "Bu lakap kullanmaya uygun",
-    "This alias is already in use": "Bu lakap zaten kullanımda",
     "And %(count)s more...|other": "ve %(count)s kez daha...",
     "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.": "Alternatif olarak,<code>turn.matrix.org</code> adresindeki herkese açık sunucuyu kullanmayı deneyebilirsiniz. Fakat bu güvenilir olmayabilir. IP adresiniz bu sunucu ile paylaşılacaktır. Ayarlardan yönetebilirsiniz.",
     "An error ocurred whilst trying to remove the widget from the room": "Görsel bileşen odadan silinmeye çalışılırken bir hata oluştu",
@@ -1414,10 +1324,9 @@
     "Please tell us what went wrong or, better, create a GitHub issue that describes the problem.": "Lütfen neyin yanlış gittiğini bize bildirin ya da en güzeli problemi tanımlayan bir GitHub talebi oluşturun.",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Logları göndermeden önce, probleminizi betimleyen <a>bir GitHub talebi oluşturun</a>.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Topluluk ID leri sadece a-z, 0-9 ya da '=_-./' karakterlerini içerebilir",
-    "Set a room alias to easily share your room with other people.": "Odanızı diğer kişilerle kolayca paylaşabilmek için bir oda lakabı ayarların.",
     "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 Riot 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 Riotun 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.",
@@ -1433,7 +1342,7 @@
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s bir çağrı başlattı. (Bu tarayıcı tarafından desteklenmiyor)",
     "%(senderName)s placed a video call.": "%(senderName)s bir görüntülü çağrı yaptı.",
     "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s bir görüntülü çağrı yaptı. (bu tarayıcı tarafından desteklenmiyor)",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Riot yöneticinize <a>yapılandırmanızın</a> hatalı ve mükerrer girdilerini kontrol etmesi için talepte bulunun.",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "%(brand)s yöneticinize <a>yapılandırmanızın</a> hatalı ve mükerrer girdilerini kontrol etmesi için talepte bulunun.",
     "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.": "Kayıt olabilirsiniz, fakat kimlik sunucunuz çevrimiçi olana kadar bazı özellikler mevcut olmayacak. Bu uyarıyı sürekli görüyorsanız, yapılandırmanızı kontrol edin veya sunucu yöneticinizle iletişime geçin.",
     "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.": "Parolanızı sıfırlayabilirsiniz, fakat kimlik sunucunuz çevrimiçi olana kadar bazı özellikler mevcut olmayacak. Bu uyarıyı sürekli görüyorsanız, yapılandırmanızı kontrol edin veya sunucu yöneticinizle iletişime geçin.",
     "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.": "Oturum açabilirsiniz, fakat kimlik sunucunuz çevrimiçi olana kadar bazı özellikler mevcut olmayacak. Bu uyarıyı sürekli görüyorsanız, yapılandırmanızı kontrol edin veya sunucu yöneticinizle iletişime geçin.",
@@ -1454,7 +1363,6 @@
     "Enable URL previews for this room (only affects you)": "Bu oda için URL önizlemeyi aç (sadece sizi etkiler)",
     "Enable URL previews by default for participants in this room": "Bu odadaki katılımcılar için URL önizlemeyi varsayılan olarak açık hale getir",
     "Enable widget screenshots on supported widgets": "Desteklenen görsel bileşenlerde anlık görüntüleri aç",
-    "Show recently visited rooms above the room list": "En son ziyaret edilen odaları oda listesinin en üstünde göster",
     "Show hidden events in timeline": "Zaman çizelgesinde gizli olayları göster",
     "Encrypted messages in one-to-one chats": "Birebir sohbetlerdeki şifrelenmiş mesajlar",
     "Encrypted messages in group chats": "Grup sohbetlerdeki şifrelenmiş mesajlar",
@@ -1471,7 +1379,6 @@
     "Verify this session": "Bu oturumu doğrula",
     "Encryption upgrade available": "Şifreleme güncellemesi var",
     "Set up encryption": "Şifrelemeyi ayarla",
-    "Unverified session": "Doğrulanmamış oturum",
     "You are no longer ignoring %(userId)s": "%(userId)s artık yoksayılmıyor",
     "Verifies a user, session, and pubkey tuple": "Bir kullanıcı, oturum ve açık anahtar çiftini doğrular",
     "Unknown (user, session) pair:": "Bilinmeyen (kullanıcı, oturum) çifti:",
@@ -1486,7 +1393,6 @@
     "Invalid identity server discovery response": "Geçersiz kimlik sunucu keşfi yanıtı",
     "Please <a>contact your service administrator</a> to continue using this service.": "Bu servisi kullanmaya devam etmek için lütfen <a>servis yöneticinizle bağlantı kurun</a>.",
     "Failed to perform homeserver discovery": "Anasunucu keşif işlemi başarısız",
-    "Sender session information": "Gönderici oturum bilgisi",
     "Go back to set it again.": "Geri git ve yeniden ayarla.",
     "Your recovery key": "Kurtarma anahtarınız",
     "Copy": "Kopyala",
@@ -1496,7 +1402,6 @@
     "Set up Secure Messages": "Güvenli Mesajları Ayarla",
     "Space used:": "Kullanılan alan:",
     "Indexed messages:": "İndekslenmiş mesajlar:",
-    "Number of rooms:": "Oda sayısı:",
     "Enable inline URL previews by default": "Varsayılan olarak satır içi URL önizlemeleri aç",
     "Waiting for %(displayName)s to verify…": "%(displayName)s ın doğrulaması için bekleniyor…",
     "They match": "Eşleşiyorlar",
@@ -1530,28 +1435,21 @@
     "Use an Integration Manager to manage bots, widgets, and sticker packs.": "Botları, görsel bileşenleri ve çıkartma paketlerini yönetmek için bir entegrasyon yöneticisi kullanın.",
     "Session ID:": "Oturum ID:",
     "Session key:": "Oturum anahtarı:",
-    "Sessions": "Oturumlar",
     "This user has not verified all of their sessions.": "Bu kullanıcı bütün oturumlarında doğrulanmamış.",
     "You have not verified this user.": "Bu kullanıcıyı doğrulamadınız.",
     "Someone is using an unknown session": "Birisi bilinmeyen bir oturum kullanıyor",
     "Everyone in this room is verified": "Bu odadaki herkes doğrulanmış",
-    "Some sessions for this user are not trusted": "Bu kullanıcı için bazı oturumlar güvenilir değil",
-    "All sessions for this user are trusted": "Bu kullanıcı için tüm oturumlar güvenilir",
-    "The version of Riot": "Riot sürümü",
     "Your user agent": "Kullanıcı aracınız",
     "If you cancel now, you won't complete verifying the other user.": "Şimdi iptal ederseniz, diğer kullanıcıyı doğrulamayı tamamlamış olmayacaksınız.",
     "If you cancel now, you won't complete verifying your other session.": "Şimdi iptal ederseniz, diğer oturumu doğrulamış olmayacaksınız.",
     "Setting up keys": "Anahtarları ayarla",
     "Custom (%(level)s)": "Özel (%(level)s)",
-    "Room contains unknown sessions": "Oda bilinmeyen oturumlar içeriyor",
-    "Unknown sessions": "Bilinmeyen oturumlar",
     "Upload %(count)s other files|other": "%(count)s diğer dosyaları yükle",
     "Upload %(count)s other files|one": "%(count)s dosyayı sağla",
     "A widget would like to verify your identity": "Bir görsel tasarım kimliğinizi teyit etmek istiyor",
     "Remember my selection for this widget": "Bu görsel bileşen işin seçimimi hatırla",
     "Deny": "Reddet",
     "Recovery key mismatch": "Kurtarma anahtarı uyumsuz",
-    "Backup restored": "Yedek geri dönüldü",
     "Enter recovery key": "Kurtarma anahtarı gir",
     "Help": "Yardım",
     "Take picture": "Resim çek",
@@ -1562,9 +1460,7 @@
     "Add users to the community summary": "Topluluk özetine kullanıcıları ekle",
     "Who would you like to add to this summary?": "Bu özete kimi eklemek istersiniz?",
     "Failed to update community": "Toluluğu güncelleme başarısız",
-    "Downloading mesages for %(currentRoom)s.": "%(currentRoom)s için mesajlar indiriliyor.",
     "Indexed rooms:": "İndekslenmiş odalar:",
-    "%(crawlingRooms)s out of %(totalRooms)s": "%(totalRooms)s odadan %(crawlingRooms)s tanesi",
     "Bridges": "Köprüler",
     "Send a reply…": "Bir cevap gönder…",
     "Send a message…": "Bir mesaj gönder…",
@@ -1580,7 +1476,6 @@
     "%(count)s sessions|other": "%(count)s oturum",
     "%(count)s sessions|one": "%(count)s oturum",
     "%(name)s cancelled verifying": "%(name)s doğrulama iptal edildi",
-    "Message removed": "Mesaj silindi",
     "Filter community members": "Topluluk üyeleri filtrelendi",
     "Invite to this community": "Bu topluluğa davet et",
     "Failed to remove room from community": "Topluluktan oda silinmesi başarısız",
@@ -1589,7 +1484,6 @@
     "Add rooms to this community": "Bu topluluğa odaları ekle",
     "Filter community rooms": "Topluluk odalarını filtrele",
     "You're not currently a member of any communities.": "Şu anda hiç bir topluluğun bir üyesi değilsiniz.",
-    "Yes, I want to help!": "Evet, Yardım istiyorum!",
     "Set Password": "Şifre oluştur",
     "Error encountered (%(errorDetail)s).": "Hata oluştu (%(errorDetail)s).",
     "Checking for an update...": "Güncelleme kontrolü...",
@@ -1615,7 +1509,6 @@
     "Clear cross-signing keys": "Çapraz-imzalama anahtarlarını temizle",
     "Clear all data in this session?": "Bu oturumdaki tüm verileri temizle?",
     "Verify session": "Oturum doğrula",
-    "Use Legacy Verification (for older clients)": "Eski Doğrulamayı Kullan (eski istemciler için)",
     "Session name": "Oturum adı",
     "Session key": "Oturum anahtarı",
     "Verification Requests": "Doğrulama İstekleri",
@@ -1623,7 +1516,6 @@
     "Suggestions": "Öneriler",
     "Recently Direct Messaged": "Güncel Doğrudan Mesajlar",
     "Go": "Git",
-    "Loading session info...": "Oturum bilgisi yükleniyor...",
     "Your account is not secure": "Hesabınız güvende değil",
     "Your password": "Parolanız",
     "This session, or the other session": "Bu oturum veya diğer oturum",
@@ -1654,8 +1546,6 @@
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Bir metin mesajı gönderildi: +%(msisdn)s. Lütfen içerdiği doğrulama kodunu girin.",
     "You have verified this user. This user has verified all of their sessions.": "Bu kullanıcıyı doğruladınız. Bu kullanıcı tüm oturumlarını doğruladı.",
     "This room is end-to-end encrypted": "Bu oda uçtan uça şifreli",
-    "Some sessions in this encrypted room are not trusted": "Şifrelenmiş bu odadaki bazı oturumlar güvenilir değil",
-    "All sessions in this encrypted room are trusted": "Bu odadaki tün oturumlar güvenilir",
     "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "Diğer oturumlardan şifreleme anahtarlarını <requestLink>yeniden talep et</requestLink>.",
     "Encrypted by an unverified session": "Doğrulanmamış bir oturum tarafından şifrelenmiş",
     "Encrypted by a deleted session": "Silinen bir oturumla şifrelenmiş",
@@ -1672,9 +1562,7 @@
     "Not sure of your password? <a>Set a new one</a>": "Şifrenizden emin değil misiniz? <a>Yenisini ayalarla</a>",
     "Want more than a community? <a>Get your own server</a>": "Bir topluluktan fazlasınımı istiyorsunuz? <a>Kendi sunucunuzu edinin</a>",
     "Explore rooms": "Odaları keşfet",
-    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>Oturumları gözat</showSessionsText>, <sendAnywayText>yinede gönder</sendAnywayText> yada <cancelText>iptal</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>Mesajı yeniden gönder</resendText> veya <cancelText> şimdi mesajı iptal et </cancelText>.",
-    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
     "Your new session is now verified. Other users will see it as trusted.": "Yeni oturumunuz şimdi doğrulandı. Diğer kullanıcılar güvenilir olarak görecek.",
     "Invalid base_url for m.homeserver": "m.anasunucu için geçersiz base_url",
     "Invalid base_url for m.identity_server": "m.kimlik_sunucu için geçersiz base_url",
@@ -1686,22 +1574,12 @@
     "Enter your account password to confirm the upgrade:": "Güncellemeyi başlatmak için hesap şifreni gir:",
     "Restore": "Geri yükle",
     "You'll need to authenticate with the server to confirm the upgrade.": "Güncellemeyi teyit etmek için sunucuda oturum açmaya ihtiyacınız var.",
-    "Great! This passphrase looks strong enough.": "Harika! Bu parola yeterince güçlü gözüküyor.",
-    "Enter a passphrase": "Bir parola girin",
-    "Back up my encryption keys, securing them with the same passphrase": "Şifreleme anahtarlarımı aynı parola ile güvenli hale getirerek yedekle",
-    "Enter your passphrase a second time to confirm it.": "Parolanızı ikinci kez girerek teyit edin.",
-    "Confirm your passphrase": "Parolanızı teyit edin",
     "Your recovery key is in your <b>Downloads</b> folder.": "Kurtarma anahtarı <b>İndirilenler</b> klasörünüzde.",
     "Unable to set up secret storage": "Sır deposu ayarlanamıyor",
     "For maximum security, this should be different from your account password.": "En üst düzey güvenlik için, bu şifre hesap şifrenizden farklı olmalı.",
-    "Enter a passphrase...": "Bir parola girin...",
-    "Please enter your passphrase a second time to confirm.": "Lütfen parolanızı ikinci kez girerek teyit edin.",
-    "Repeat your passphrase...": "Parolanızı tekrarlayın...",
     "Your keys are being backed up (the first backup could take a few minutes).": "Anahtarlarınız yedekleniyor (ilk yedek bir kaç dakika sürebilir).",
-    "Secure your backup with a passphrase": "Yedeğinizi bir parola ile koruyun",
     "If you don't want to set this up now, you can later in Settings.": "Şimdi ayarlamak istemiyorsanız daha sonra Ayarlar menüsünden yapabilirsiniz.",
     "Set up": "Ayarla",
-    "Review Sessions": "Oturumlar Gözden Geçir",
     "Cancel entering passphrase?": "Parola girişini iptal et?",
     "%(senderName)s changed the alternative addresses for this room.": "Bu oda için alternatif adresler %(senderName)s tarafından değiştirildi.",
     "%(senderName)s changed the main and alternative addresses for this room.": "Bu oda için ana ve alternatif adresler %(senderName)s tarafından değiştirildi.",
@@ -1712,11 +1590,9 @@
     "A username can only contain lower case letters, numbers and '=_-./'": "Bir kullanıcı adı sadece küçük karakterler, numaralar ve  '=_-./' karakterlerini içerebilir",
     "To help us prevent this in future, please <a>send us logs</a>.": "Bunun gelecekte de olmasının önüne geçmek için lütfen <a>günceleri bize gönderin</a>.",
     "To continue you need to accept the terms of this service.": "Devam etmek için bu servisi kullanma şartlarını kabul etmeniz gerekiyor.",
-    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "“%(RoomName)s” odası sizin daha önce görmediğiniz oturumlar içeriyor.",
     "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!",
-    "Restored %(sessionCount)s session keys": "Geri yüklenen %(sessionCount)s oturum anahtarı",
     "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",
@@ -1729,12 +1605,9 @@
     "%(inviter)s has invited you to join this community": "%(inviter)s sizi bu topluluğa katılmanız için davet etti",
     "This room is not public. You will not be able to rejoin without an invite.": "Bu oda açık bir oda değil. Davet almadan tekrar katılamayacaksınız.",
     "%(creator)s created and configured the room.": "%(creator)s odayı oluşturdu ve yapılandırdı.",
-    "Riot failed to get the public room list.": "Açık oda listesini getirirken Riot başarısız oldu.",
-    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Bu odada bilinmeyen oturumlar mevcut: eğer doğrulamadan devam ederseniz, birilerinin çağrılarınıza göz atma durumu ortaya çıkabilir.",
-    "If you cancel now, you won't complete your secret storage operation.": "Eğer şimdi iptal ederseniz, sır depolama operasyonunu tamamlamış olmayacaksınız.",
+    "%(brand)s failed to get the public room list.": "Açık oda listesini getirirken %(brand)s başarısız oldu.",
     "Show these rooms to non-members on the community page and room list?": "Bu odaları oda listesinde ve topluluğun sayfasında üye olmayanlara göster?",
     "%(senderName)s added the alternative addresses %(addresses)s for this room.|other": "%(senderName)s bu odaya alternatif olarak %(addresses)s adreslerini ekledi.",
-    "Waiting for partner to accept...": "Partnerin kabul etmesi için bekleniyor...",
     "Failed to invite the following users to chat: %(csvUsers)s": "Sohbet için gönderilen davetin başarısız olduğu kullanıcılar: %(csvUsers)s",
     "Something went wrong trying to invite the users.": "Kullanıcıların davet edilmesinde bir şeyler yanlış gitti.",
     "a new master key signature": "yeni bir master anahtar imzası",
@@ -1742,21 +1615,18 @@
     "a key signature": "bir anahtar imzası",
     "Upload completed": "Yükleme tamamlandı",
     "Cancelled signature upload": "anahtar yükleme iptal edildi",
-    "Unabled to upload": "Yüklenemedi",
     "Signature upload success": "Anahtar yükleme başarılı",
     "Signature upload failed": "İmza yükleme başarısız",
     "If you didn’t sign in to this session, your account may be compromised.": "Eğer bu oturuma bağlanmadıysanız, hesabınız ele geçirilmiş olabilir.",
     "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "Bu dosyalar yükleme için <b>çok büyük</b>. Dosya boyut limiti %(limit)s.",
     "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "Bazı dosyalar yükleme için <b>çok büyük</b>. Dosya boyutu limiti %(limit)s.",
-    "Waiting…": "Bekleniyor…",
     "Failed to re-authenticate due to a homeserver problem": "Anasunucu problemi yüzünden yeniden kimlik doğrulama başarısız",
     "Failed to re-authenticate": "Yeniden kimlik doğrulama başarısız",
     "A new recovery passphrase and key for Secure Messages have been detected.": "Yeni bir kurtarma parolası ve Güvenli Mesajlar için anahtar tespit edildi.",
     "Not currently indexing messages for any room.": "Şu an hiç bir odada mesaj indeksleme yapılmıyor.",
-    "Whether you're using Riot on a device where touch is the primary input mechanism": "Riot'u ana giriş yöntemi dokunma olan bir cihazda kullanıyor olsanızda",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "%(brand)s'u ana giriş yöntemi dokunma olan bir cihazda kullanıyor olsanızda",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "'Breadcrumbs' özelliğini kullanıp kullanmadığınız (oda listesi üzerinde avatarlar)",
-    "Whether you're using Riot as an installed Progressive Web App": "Riot'u gelişmiş web uygulaması olarak yükleyip yüklemediğinizi",
-    "The information being sent to us to help make Riot better includes:": "Riot'u geliştirmemizde bize yardım etmek için gönderdiğiniz bilgiler şunları içeriyor:",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "%(brand)s'u gelişmiş web uygulaması olarak yükleyip yüklemediğinizi",
     "A call is currently being placed!": "Bir çağrı şu anda başlatılıyor!",
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Şu anda dosya ile birlikte mesaj yollamak mümkün değil. Dosyayı mesajsız yüklemek ister misiniz?",
     "PM": "24:00",
@@ -1796,10 +1666,7 @@
     "A word by itself is easy to guess": "Kelime zaten kolay tahmin edilir",
     "Straight rows of keys are easy to guess": "Aynı klavye satırındaki ardışık tuşlar kolay tahmin edilir",
     "Short keyboard patterns are easy to guess": "Kısa klavye desenleri kolay tahmin edilir",
-    "Show a presence dot next to DMs in the room list": "Oda listesinde DM'lerin yanında varlık noktası göster",
     "Support adding custom themes": "Özel tema eklemeyi destekle",
-    "Enable cross-signing to verify per-user instead of per-session (in development)": "Oturum başına doğrulamak yerine kullanıcı başına doğrulama yapmak için çapraz giriş yapmayı etkinleştir (geliştirmede)",
-    "Show padlocks on invite only rooms": "Sadece davetle girilen odalarda kilit işareti göster",
     "Show read receipts sent by other users": "Diğer kullanıcılar tarafından gönderilen okundu bilgisini göster",
     "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Şifrelenmiş odalarda güvenli mesaj kurtarmayı etkinleştirmek için hatırlatıcı göster",
     "Enable automatic language detection for syntax highlighting": "Sözdizimi vurgularken otomatik dil algılamayı etkinleştir",
@@ -1809,7 +1676,6 @@
     "Never send encrypted messages to unverified sessions in this room from this session": "Şifreli mesajları asla oturumdaki bu odadaki doğrulanmamış oturumlara iletme",
     "Prompt before sending invites to potentially invalid matrix IDs": "Potansiyel olarak geçersiz matrix kimliği olanlara davet gönderirken uyarı ver",
     "Show shortcuts to recently viewed rooms above the room list": "Oda listesinin üzerinde en son kullanılan odaları göster",
-    "Secret Storage key format:": "Sır Depolama anahtar biçemi:",
     "Error downloading theme information.": "Tema bilgisi indirilirken hata.",
     "Theme added!": "Tema eklendi!",
     "Add theme": "Tema ekle",
@@ -1826,5 +1692,70 @@
     "Verify by comparing unique emoji.": "Eşsiz emoji eşleştirme ile doğrulama.",
     "Edited at %(date)s. Click to view edits.": "%(date)s tarihinde düzenlendi. Düzenlemeleri görmek için tıkla.",
     "Failed to load group members": "Grup üyeleri yüklenirken başarısız",
-    "Visibility in Room List": "Oda Listesindeki Görünürlük"
+    "Visibility in Room List": "Oda Listesindeki Görünürlük",
+    "Confirm adding email": "E-posta adresini eklemeyi onayla",
+    "Click the button below to confirm adding this email address.": "E-posta adresini eklemeyi kabul etmek için aşağıdaki tuşa tıklayın.",
+    "Confirm adding phone number": "Telefon numayasını ekleyi onayla",
+    "Click the button below to confirm adding this phone number.": "Telefon numarasını eklemeyi kabul etmek için aşağıdaki tuşa tıklayın.",
+    "Are you sure you want to cancel entering passphrase?": "Parola girmeyi iptal etmek istediğinizden emin misiniz?",
+    "Room name or address": "Oda adı ya da adresi",
+    "%(name)s is requesting verification": "%(name)s doğrulama istiyor",
+    "Use your account to sign in to the latest version": "En son sürümde oturum açmak için hesabınızı kullanın",
+    "We’re excited to announce Riot is now Element": "Riot'ın artık Element olduğunu duyurmaktan heyecan duyuyoruz",
+    "Riot is now Element!": "Riot artık Element!",
+    "Learn More": "",
+    "Sends a message as html, without interpreting it as markdown": "İletiyi MarkDown olarak göndermek yerine HTML olarak gönderir",
+    "Failed to set topic": "Konu belirlenemedi",
+    "Joins room with given address": "Belirtilen adres ile odaya katılır",
+    "Unrecognised room address:": "Tanımlanamayan oda adresi:",
+    "Command failed": "Komut başarısız",
+    "Could not find user in room": "Kullanıcı odada bulunamadı",
+    "Send a bug report with logs": "Günlükler (log) ile hata raporu gönderin",
+    "Opens chat with the given user": "Belirtilen kullanıcı ile sohbet başlatır",
+    "Sends a message to the given user": "Belirtilen kullanıcıya ileti gönderir",
+    "Light": "Aydınlık",
+    "Dark": "Karanlık",
+    "You signed in to a new session without verifying it:": "Yeni bir oturuma, doğrulamadan oturum açtınız:",
+    "Verify your other session using one of the options below.": "Diğer oturumunuzu aşağıdaki seçeneklerden birini kullanarak doğrulayın.",
+    "I want to help": "Yardım etmek istiyorum",
+    "Review where you’re logged in": "Nerelerde oturum açığınızı inceleyin",
+    "Verify all your sessions to ensure your account & messages are safe": "Hesabınızın ve iletileriniz güvenliği için bütün oturumlarınızı doğrulayın",
+    "Your homeserver has exceeded its user limit.": "Homeserver'ınız kullanıcı limitini aştı.",
+    "Your homeserver has exceeded one of its resource limits.": "Homeserver'ınız kaynaklarından birisinin sınırını aştı.",
+    "Contact your <a>server admin</a>.": "<a>Sunucu yöneticinize</a> başvurun.",
+    "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?": "",
+    "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ı",
+    "Call in progress": "Çağrı devam ediyor",
+    "You left the call": "Çağrıdan ayrıldınız",
+    "%(senderName)s left the call": "%(senderName)s çağrıdan ayrıldı",
+    "Call ended": "Çağrı sonlandı",
+    "You started a call": "Bir çağrı başlattınız",
+    "%(senderName)s started a call": "%(senderName)s bir çağrı başlattı",
+    "Waiting for answer": "Yanıt bekleniyor",
+    "%(senderName)s is calling": "%(senderName)s arıyor",
+    "You created the room": "Odayı oluşturdunuz",
+    "%(senderName)s created the room": "%(senderName)s odayı oluşturdu",
+    "You made the chat encrypted": "Sohbeti şifrelediniz",
+    "%(senderName)s made the chat encrypted": "%(senderName)s sohbeti şifreledi",
+    "You made history visible to new members": "Yeni üyelere sohbet geçmişini görünür yaptınız",
+    "%(senderName)s made history visible to new members": "%(senderName)s yeni üyelere  sohbet geçmişini görünür yaptı",
+    "You made history visible to anyone": "Sohbet geçmişini herkese görünür yaptınız",
+    "%(senderName)s made history visible to anyone": "%(senderName)s sohbet geçmişini herkese görünür yaptı",
+    "You made history visible to future members": "Sohbet geçmişini gelecek kullanıcılara görünür yaptınız",
+    "%(senderName)s made history visible to future members": "%(senderName)s sohbet geçmişini gelecek kullanıcılara görünür yaptı",
+    "You were invited": "Davet edildiniz",
+    "%(targetName)s was invited": "%(targetName)s davet edildi",
+    "You left": "Ayrıldınız",
+    "%(targetName)s left": "%(targetName)s ayrıldı",
+    "You were kicked (%(reason)s)": "Atıldınız (%(reason)s)",
+    "%(targetName)s was kicked (%(reason)s)": "%(targetName)s atıldı (%(reason)s)",
+    "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"
 }
diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index e1db73e8b1..3bae709451 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -6,7 +6,7 @@
     "Dismiss": "Відхилити",
     "Error": "Помилка",
     "Failed to forget room %(errCode)s": "Не вдалось видалити кімнату %(errCode)s",
-    "Favourite": "Вибране",
+    "Favourite": "Улюблені",
     "Mute": "Стишити",
     "Notifications": "Сповіщення",
     "Operation failed": "Не вдалося виконати дію",
@@ -21,7 +21,7 @@
     "Failed to change password. Is your password correct?": "Не вдалось змінити пароль. Ви впевнені, що пароль введено правильно?",
     "Continue": "Продовжити",
     "Accept": "Прийняти",
-    "Account": "Обліковка",
+    "Account": "Обліковий запис",
     "%(targetName)s accepted an invitation.": "%(targetName)s приймає запрошення.",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s приймає запрошення від %(displayName)s.",
     "Access Token:": "Токен доступу:",
@@ -35,15 +35,13 @@
     "Favourites": "Вибрані",
     "Fill screen": "На весь екран",
     "No media permissions": "Нема дозволів на відео/аудіо",
-    "You may need to manually permit Riot to access your microphone/webcam": "Можливо, вам треба дозволити Riot використання мікрофону/камери вручну",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "Можливо, вам треба дозволити %(brand)s використання мікрофону/камери вручну",
     "Default Device": "Уставний пристрій",
     "Microphone": "Мікрофон",
     "Camera": "Камера",
     "Advanced": "Додаткові",
-    "Algorithm": "Алгоритм",
     "Always show message timestamps": "Завжди показувати часові позначки повідомлень",
     "Authentication": "Впізнавання",
-    "Alias (optional)": "Псевдонім (необов'язково)",
     "%(items)s and %(lastItem)s": "%(items)s та %(lastItem)s",
     "and %(count)s others...|one": "і інше...",
     "and %(count)s others...|other": "та %(count)s інші...",
@@ -64,30 +62,28 @@
     "Ban": "Заблокувати",
     "Banned users": "Заблоковані користувачі",
     "Bans user with given id": "Блокує користувача з вказаним ідентифікатором",
-    "Blacklisted": "В чорному списку",
     "Call Timeout": "Час очікування виклика",
     "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": "Поміняти пароль",
+    "Change Password": "Змінити пароль",
     "%(senderName)s changed their profile picture.": "%(senderName)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.",
     "%(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.",
     "Email": "е-пошта",
-    "Email address": "Адреса е-почти",
+    "Email address": "Адреса е-пошти",
     "Failed to send email": "Помилка відправки  е-почти",
-    "Edit": "Редактувати",
+    "Edit": "Відредагувати",
     "Unpin Message": "Відкріпити повідомлення",
     "Register": "Зареєструватися",
     "Rooms": "Кімнати",
-    "Add rooms to this community": "Добавити кімнати в це суспільство",
-    "This email address is already in use": "Ця електронна пошта вже використовується",
+    "Add rooms to this community": "Додати кімнати в цю спільноту",
+    "This email address is already in use": "Ця е-пошта вже використовується",
     "This phone number is already in use": "Цей телефонний номер вже використовується",
     "Fetching third party location failed": "Не вдалось отримати стороннє місцеперебування",
     "Messages in one-to-one chats": "Повідомлення у чатах \"сам на сам\"",
-    "A new version of Riot is available.": "Доступне оновлення для Riot.",
-    "Send Account Data": "Відправити данні аккаунта",
+    "Send Account Data": "Надіслати дані облікового запису",
     "Advanced notification settings": "Додаткові налаштування сповіщень",
     "Uploading report": "Завантаження звіту",
     "Sunday": "Неділя",
@@ -96,7 +92,7 @@
     "Notification targets": "Цілі сповіщень",
     "Failed to set direct chat tag": "Не вдалося встановити мітку прямого чату",
     "Today": "Сьогодні",
-    "You are not receiving desktop notifications": "Ви не отримуєте сповіщення на стільниці",
+    "You are not receiving desktop notifications": "Ви не отримуєте системні сповіщення",
     "Friday": "П'ятниця",
     "Update": "Оновити",
     "What's New": "Що нового",
@@ -105,10 +101,8 @@
     "Waiting for response from server": "Очікується відповідь від сервера",
     "Leave": "Вийти",
     "Send Custom Event": "Відправити приватний захід",
-    "All notifications are currently disabled for all targets.": "Сповіщення для усіх цілей на даний момент вимкнені.",
+    "All notifications are currently disabled for all targets.": "Сповіщення для усіх цілей наразі момент вимкнені.",
     "Failed to send logs: ": "Не вдалося відправити журнали: ",
-    "delete the alias.": "видалити псевдонім.",
-    "To return to your account in future you need to <u>set a password</u>": "Щоб мати змогу використовувати вашу обліковку у майбутньому, <u>зазначте пароль</u>",
     "Forget": "Забути",
     "World readable": "Відкрито для світу",
     "You cannot delete this image. (%(code)s)": "Ви не можете видалити це зображення. (%(code)s)",
@@ -117,8 +111,8 @@
     "This Room": "Ця кімната",
     "Noisy": "Шумний",
     "Error saving email notification preferences": "Помилка при збереженні параметрів сповіщень е-поштою",
-    "Messages containing my display name": "Повідомлення,  вміщає моє ім'я",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Пам'ятайте, що ви завжди можете встановити адресу е-пошти у налаштуваннях, якщо передумаєте.",
+    "Messages containing my display name": "Повідомлення, що містять моє видиме ім'я",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Пам'ятайте, що ви завжди можете встановити адресу е-пошти у користувацьких налаштуваннях, якщо передумаєте.",
     "Unavailable": "Нема в наявності",
     "View Decrypted Source": "Переглянути розшифроване джерело",
     "Failed to update keywords": "Не вдалось оновити ключові слова",
@@ -131,14 +125,13 @@
     "Source URL": "Джерельне посилання",
     "Messages sent by bot": "Повідомлення, надіслані ботом",
     "Filter results": "Фільтр результатів",
-    "Members": "Члени",
+    "Members": "Учасники",
     "No update available.": "Оновлення відсутні.",
     "Resend": "Перенадіслати",
     "Files": "Файли",
     "Collecting app version information": "Збір інформації про версію застосунка",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Видалити псевдонім %(alias)s та прибрати з каталогу %(name)s?",
     "Keywords": "Ключові слова",
-    "Enable notifications for this account": "Увімкнути сповіщення для цієї обліковки",
+    "Enable notifications for this account": "Увімкнути сповіщення для цього облікового запису",
     "Invite to this community": "Запросити в це суспільство",
     "Messages containing <span>keywords</span>": "Повідомлення, що містять <span>ключові слова</span>",
     "When I'm invited to a room": "Коли мене запрошено до кімнати",
@@ -147,14 +140,14 @@
     "Forward Message": "Переслати повідомлення",
     "You have successfully set a password and an email address!": "Пароль та адресу е-пошти успішно встановлено!",
     "Remove %(name)s from the directory?": "Прибрати %(name)s з каталогу?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot використовує багато новітніх функцій, деякі з яких не доступні або є експериментальними у вашому оглядачі.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s використовує багато новітніх функцій, деякі з яких не доступні або є експериментальними у вашому оглядачі.",
     "Developer Tools": "Інструменти розробника",
     "Preparing to send logs": "Підготовка до відправки журланлу",
     "Unnamed room": "Неназвана кімната",
-    "Explore Account Data": "Продивитись данні аккаунта",
+    "Explore Account Data": "Переглянути дані облікового запису",
     "All messages (noisy)": "Усі повідомлення (гучно)",
     "Saturday": "Субота",
-    "I understand the risks and wish to continue": "Я ознайомлений з ризиками і хочу продовжити",
+    "I understand the risks and wish to continue": "Я усвідомлюю ризик і бажаю продовжити",
     "Direct Chat": "Прямий чат",
     "The server may be unavailable or overloaded": "Сервер може бути недосяжним або перевантаженим",
     "Room not found": "Кімнату не знайдено",
@@ -170,12 +163,12 @@
     "All Rooms": "Усі кімнати",
     "Wednesday": "Середа",
     "You cannot delete this message. (%(code)s)": "Ви не можете видалити це повідомлення. (%(code)s)",
-    "Quote": "Цитувати",
+    "Quote": "Процитувати",
     "Send": "Надіслати",
     "Send logs": "Надіслати журнали",
     "All messages": "Усі повідомлення",
     "Call invitation": "Запрошення до виклику",
-    "Downloading update...": "Звантаженя оновлення…",
+    "Downloading update...": "Завантаженя оновлення…",
     "State Key": "Ключ стану",
     "Failed to send custom event.": "Не вдалося відправити приватний захід.",
     "What's new?": "Що нового?",
@@ -188,65 +181,56 @@
     "Invite to this room": "Запросити до цієї кімнати",
     "Thursday": "Четвер",
     "Search…": "Пошук…",
-    "Logs sent": "Журнали відправленні",
+    "Logs sent": "Журнали надіслані",
     "Back": "Назад",
     "Reply": "Відповісти",
-    "Show message in desktop notification": "Показати повідомлення в сповіщення на робочому столі",
+    "Show message in desktop notification": "Показувати повідомлення у стільничних сповіщеннях",
     "Unable to join network": "Неможливо приєднатись до мережі",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Можливо, ви налаштували їх не у Riot, а у іншому застосунку. Ви не можете регулювати їх у Riot, але вони все ще мають силу",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Вибачте, ваш оглядач <b>не</b> спроможний запустити Riot.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Вибачте, ваш оглядач <b>не</b> спроможний запустити %(brand)s.",
     "Uploaded on %(date)s by %(user)s": "Завантажено %(date)s користувачем %(user)s",
     "Messages in group chats": "Повідомлення у групових чатах",
     "Yesterday": "Вчора",
     "Error encountered (%(errorDetail)s).": "Трапилась помилка (%(errorDetail)s).",
     "Low Priority": "Неважливі",
     "Unable to fetch notification target list": "Неможливо отримати перелік цілей сповіщення",
-    "Set Password": "Задати пароль",
+    "Set Password": "Встановити пароль",
     "Off": "Вимкнено",
-    "Riot does not know how to join a room on this network": "Riot не знає як приєднатись до кімнати у цій мережі",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s не знає як приєднатись до кімнати у цій мережі",
     "Mentions only": "Тільки згадки",
     "Failed to remove tag %(tagName)s from room": "Не вдалося прибрати з кімнати мітку %(tagName)s",
-    "You can now return to your account after signing out, and sign in on other devices.": "Тепер ви можете повернутися до своєї обліковки після виходу з неї, та зайти з інших пристроїв.",
+    "You can now return to your account after signing out, and sign in on other devices.": "Тепер ви можете повернутися до свого облікового запису після виходу з нього, а також зайти з інших пристроїв.",
     "Enable email notifications": "Увімкнути сповіщення е-поштою",
     "Event Type": "Тип західу",
-    "No rooms to show": "Кімнати відсутні",
+    "No rooms to show": "Відсутні кімнати для показу",
     "Download this file": "Звантажити цей файл",
     "Pin Message": "Прикріпити повідомлення",
     "Failed to change settings": "Не вдалось змінити налаштування",
     "Event sent!": "Захід відправлено!",
     "Unhide Preview": "Відкрити попередній перегляд",
     "Event Content": "Зміст заходу",
-    "Thank you!": "Дякую!",
+    "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...": "Перевірка оновлень…",
-    "There are advanced notifications which are not shown here": "Є додаткові сповіщення, що не показуються тут",
     "Check for update": "Перевірити на наявність оновлень",
     "Reject all %(invitedRooms)s invites": "Відхилити запрошення до усіх %(invitedRooms)s",
     "Profile": "Профіль",
     "click to reveal": "натисніть щоб побачити",
     "Homeserver is": "Домашній сервер —",
-    "The version of Riot.im": "Версія Riot.im",
+    "The version of %(brand)s": "Версія %(brand)s",
     "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": "Чи використовуєте ви режим форматованого тексту у редакторі 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": "Використовувана платформа",
-    "Your identity server's URL": "URL адреса серверу ідентифікації",
     "e.g. %(exampleValue)s": "напр. %(exampleValue)s",
     "Every page you use in the app": "Кожна сторінка, яку ви використовуєте в програмі",
     "e.g. <CurrentPageURL>": "напр. <CurrentPageURL>",
-    "Your User Agent": "Ваш користувацький агент",
     "Your device resolution": "Роздільна здатність вашого пристрою",
     "Analytics": "Аналітика",
-    "The information being sent to us to help make Riot.im better includes:": "Інформація, що надсилається нам, щоб допомогти зробити Riot.im кращим, включає в себе:",
+    "The information being sent to us to help make %(brand)s better includes:": "Відсилана до нас інформація, що допомагає покращити %(brand)s, містить:",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Введіть пароль для захисту експортованого файлу. Щоб розшифрувати файл потрібно буде ввести цей пароль.",
     "Call Failed": "Виклик не вдався",
-    "Review Devices": "Перевірити пристрої",
-    "Call Anyway": "Подзвонити все одно",
-    "Answer Anyway": "Відповісти все одно",
-    "Call": "Подзвонити",
-    "Answer": "Відповісти",
     "The remote side failed to pick up": "На ваш дзвінок не змогли відповісти",
     "Unable to capture screen": "Не вдалось захопити екран",
     "Existing Call": "Наявний виклик",
@@ -256,34 +240,33 @@
     "You cannot place a call with yourself.": "Ви не можете подзвонити самим собі.",
     "Warning!": "Увага!",
     "Upload Failed": "Помилка відвантаження",
-    "Sun": "Нд",
-    "Mon": "Пн",
-    "Tue": "Вт",
-    "Wed": "Ср",
-    "Thu": "Чт",
-    "Fri": "Пт",
-    "Sat": "Сб",
-    "Jan": "Січ",
-    "Feb": "Лют",
-    "Mar": "Бер",
-    "Apr": "Квіт",
-    "May": "Трав",
-    "Jun": "Чер",
-    "Jul": "Лип",
-    "Aug": "Сер",
-    "Sep": "Вер",
-    "Oct": "Жов",
-    "Nov": "Лис",
-    "Dec": "Гру",
-    "PM": "PM",
-    "AM": "AM",
+    "Sun": "нд",
+    "Mon": "пн",
+    "Tue": "вт",
+    "Wed": "ср",
+    "Thu": "чт",
+    "Fri": "пт",
+    "Sat": "сб",
+    "Jan": "січ.",
+    "Feb": "лют.",
+    "Mar": "бер.",
+    "Apr": "квіт.",
+    "May": "трав.",
+    "Jun": "черв.",
+    "Jul": "лип.",
+    "Aug": "серп.",
+    "Sep": "вер.",
+    "Oct": "жовт.",
+    "Nov": "лист.",
+    "Dec": "груд.",
+    "PM": "пп",
+    "AM": "дп",
     "%(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, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)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",
     "Who would you like to add to this community?": "Кого ви хочете додати до цієї спільноти?",
-    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Якщо дана сторінка містить особисту інформацію, як то назва кімнати, користувача чи групи, ці дані будуть вилучені перед надсиланням на сервер.",
-    "Could not connect to the integration 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.": "Там, де ця сторінка містить ототожненну інформацію, як-от назва кімнати, користувача чи групи, ці дані будуть вилучені перед надсиланням на сервер.",
     "Call in Progress": "Іде виклик",
     "A call is currently being placed!": "Зараз іде виклик!",
     "A call is already in progress!": "Вже здійснюється дзвінок!",
@@ -295,22 +278,18 @@
     "Which rooms would you like to add to this community?": "Які кімнати ви хочете додати до цієї спільноти?",
     "Show these rooms to non-members on the community page and room list?": "Показувати ці кімнати тим, хто не належить до спільноти, на сторінці спільноти та списку кімнат?",
     "Add rooms to the community": "Додати кімнати до спільноти",
-    "Room name or alias": "Назва або псевдонім кімнати",
     "Add to community": "Додати до спільноти",
     "Failed to invite the following users to %(groupId)s:": "Не вдалося запросити таких користувачів до %(groupId)s:",
     "Failed to invite users to community": "Не вдалося запросити користувачів до кімнати",
     "Failed to invite users to %(groupId)s": "Не вдалося запросити користувачів до %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Не вдалося додати такі кімнати до %(groupId)s:",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot не має дозволу надсилати вам сповіщення — будь ласка, перевірте налаштування переглядача",
-    "Riot was not given permission to send notifications - please try again": "Riot не має дозволу надсилати сповіщення — будь ласка, спробуйте ще раз",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s не має дозволу надсилати вам сповіщення — будь ласка, перевірте налаштування переглядача",
+    "%(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.": "Схоже, ваша адреса електронної пошти не пов'язана з жодним ідентифікатор Matrix на цьому домашньому сервері.",
-    "Registration Required": "Потрібна реєстрація",
-    "You need to register to do this. Would you like to register now?": "Вам потрібно зареєструватися, щоб це зробити. Бажаєте зареєструватися зараз?",
     "Restricted": "Обмежено",
     "Moderator": "Модератор",
-    "Start a chat": "Розпочати балачку",
     "Failed to invite": "Не вдалося запросити",
     "Failed to invite the following users to the %(roomName)s room:": "Не вдалося запросити таких користувачів до кімнати %(roomName)s:",
     "You need to be logged in.": "Вам потрібно увійти.",
@@ -319,7 +298,7 @@
     "Missing roomId.": "Бракує ідентифікатора кімнати.",
     "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",
@@ -331,27 +310,25 @@
     "To use it, just wait for autocomplete results to load and tab through them.": "Щоб цим скористатися, просто почекайте на підказки доповнення й перемикайтеся між ними клавішею TAB.",
     "Changes your display nickname": "Змінює ваш нік",
     "Invites user with given id to current room": "Запрошує користувача з вказаним ідентифікатором до кімнати",
-    "Joins room with given alias": "Приєднується до кімнати під іншим псевдонімом",
     "Leave room": "Покинути кімнату",
-    "Unrecognised room alias:": "Не розпізнано псевдонім кімнати:",
-    "Kicks user with given id": "Вилучити з кімнати користувача з вказаним ідентифікатором",
-    "Ignores a user, hiding their messages from you": "Ігнорує користувача, приховуючи повідомлення від них",
-    "Ignored user": "Користувача ігноровано",
+    "Kicks user with given id": "Викидає з кімнати користувача з вказаним ідентифікатором",
+    "Ignores a user, hiding their messages from you": "Ігнорує користувача, приховуючи його повідомлення від вас",
+    "Ignored user": "Зігнорований користувач",
     "You are now ignoring %(userId)s": "Ви ігноруєте %(userId)s",
     "Stops ignoring a user, showing their messages going forward": "Припиняє ігнорувати користувача, від цього моменту показуючи їхні повідомлення",
     "Unignored user": "Припинено ігнорування користувача",
     "You are no longer ignoring %(userId)s": "Ви більше не ігноруєте %(userId)s",
-    "Define the power level of a user": "Вказати рівень прав користувача",
+    "Define the power level of a user": "Вказати рівень повноважень користувача",
     "Deops user with given id": "Знімає права оператора з користувача з вказаним ідентифікатором",
     "Opens the Developer Tools dialog": "Відкриває вікно інструментів розробника",
-    "Verified key": "Перевірений ключ",
-    "Displays action": "Показує дію",
+    "Verified key": "Звірений ключ",
+    "Displays action": "Відбиває дію",
     "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.",
-    "%(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).",
+    "%(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 встановив/ла світлину профілю.",
     "VoIP conference started.": "Розпочато дзвінок-конференцію.",
@@ -362,14 +339,9 @@
     "%(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.",
-    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s надіслав/ла зображення.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s додав/ла %(addedAddresses)s як адреси цієї кімнати.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s додав/ла %(addedAddresses)s як адресу цієї кімнати.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s вилучив/ла %(removedAddresses)s з адрес цієї кімнати.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s вилучив/ла %(removedAddresses)s з адрес цієї кімнати.",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s додав/ла %(addedAddresses)s і вилучив/ла %(removedAddresses)s з адрес цієї кімнати.",
-    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s призначив/ла основну адресу цієї кімнати: %(address)s.",
-    "%(senderName)s removed the main address for this room.": "%(senderName)s вилучив/ла основу адресу цієї кімнати.",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s надіслав(-ла) зображення.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s призначив(-ла) основну адресу цієї кімнати: %(address)s.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s прибрав(-ла) основу адресу цієї кімнати.",
     "Someone": "Хтось",
     "(not supported by this browser)": "(не підтримується цією веб-переглядачкою)",
     "(could not connect media)": "(не можливо під'єднати медіа)",
@@ -377,7 +349,7 @@
     "(unknown failure: %(reason)s)": "(невідома помилка: %(reason)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": "Показати інструменти розробки",
+    "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 зробив/ла майбутню історію кімнати видимою для всіх учасників, з моменту, коли вони приєдналися.",
@@ -391,24 +363,22 @@
     "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s вилучив/ла %(widgetName)s",
     "Failure to create room": "Не вдалося створити кімнату",
     "Server may be unavailable, overloaded, or you hit a bug.": "Сервер може бути недоступний, перевантажений, або ж ви натрапили на ваду.",
-    "Send anyway": "Надіслати хоч би там що",
     "Unnamed Room": "Кімната без назви",
     "This homeserver has hit its Monthly Active User limit.": "Цей домашній сервер досягнув свого ліміту щомісячних активних користувачів.",
     "This homeserver has exceeded one of its resource limits.": "Цей домашній сервер досягнув одного зі своїх лімітів ресурсів.",
     "Please <a>contact your service administrator</a> to continue using the service.": "Будь ласка, <a>зв'яжіться з адміністратором вашого сервісу</a>, щоб продовжити користуватися цим сервісом.",
     "Unable to connect to Homeserver. Retrying...": "Не вдається приєднатися до домашнього сервера. Повторення спроби...",
     "Your browser does not support the required cryptography extensions": "Ваша веб-переглядачка не підтримує необхідних криптографічних функцій",
-    "Not a valid Riot keyfile": "Файл ключа Riot некоректний",
+    "Not a valid %(brand)s keyfile": "Файл ключа %(brand)s некоректний",
     "Authentication check failed: incorrect password?": "Помилка автентифікації: неправильний пароль?",
     "Sorry, your homeserver is too old to participate in this room.": "Вибачте, ваш домашній сервер занадто старий, щоб приєднатися до цієї кімнати.",
     "Please contact your homeserver administrator.": "Будь ласка, зв'яжіться з адміністратором вашого домашнього сервера.",
     "Failed to join room": "Не вдалося приєднатися до кімнати",
-    "Message Pinning": "Прикріплені повідомлення",
-    "Use compact timeline layout": "Використовувати компактну розкладку стрічки",
-    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Показувати час у 12-годинному форматі (напр. 2:30 pm)",
+    "Message Pinning": "Закріплені повідомлення",
+    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Показувати час у 12-годинному форматі (напр. 2:30 пп)",
     "Always show encryption icons": "Завжди показувати значки шифрування",
     "Enable automatic language detection for syntax highlighting": "Показувати автоматичне визначення мови для підсвічування синтаксису",
-    "Automatically replace plain text Emoji": "Автоматично замінювати емоційки в простому тексті",
+    "Automatically replace plain text Emoji": "Автоматично замінювати простотекстові емодзі",
     "Mirror local video feed": "Показувати локальне відео віддзеркалено",
     "Send analytics data": "Надсилати дані аналітики",
     "Enable inline URL previews by default": "Увімкнути вбудований перегляд гіперпосилань за умовчанням",
@@ -424,20 +394,17 @@
     "Phone": "Телефон",
     "Failed to upload profile picture!": "Не вдалося відвантажити світлину профілю!",
     "Upload new:": "Відвантажити нову:",
-    "No display name": "Немає імені для показу",
+    "No display name": "Немає видимого імені",
     "New passwords don't match": "Нові паролі не збігаються",
     "Passwords can't be empty": "Пароль не може бути пустим",
     "Export E2E room keys": "Експортувати ключі наскрізного шифрування кімнат",
-    "Do you want to set an email address?": "Бажаєте вказати адресу електронної пошти?",
+    "Do you want to set an email address?": "Бажаєте вказати адресу е-пошти?",
     "Current password": "Поточний пароль",
     "Password": "Пароль",
     "New Password": "Новий пароль",
     "Confirm password": "Підтвердження пароля",
-    "Device ID": "ID пристрою",
-    "Last seen": "Востаннє з'являвся",
-    "Failed to set display name": "Не вдалося встановити ім'я для показу",
-    "Disable Notifications": "Вимкнути сповіщення",
-    "Enable Notifications": "Увімкнути сповіщення",
+    "Last seen": "Востаннє в мережі",
+    "Failed to set display name": "Не вдалося зазначити видиме ім'я",
     "The maximum permitted number of widgets have already been added to this room.": "Максимально дозволену кількість віджетів уже додано до цієї кімнати.",
     "Drop File Here": "Киньте файл сюди",
     "Drop file here to upload": "Киньте файл сюди, щоб відвантажити",
@@ -448,10 +415,9 @@
     "%(senderName)s sent an image": "%(senderName)s надіслав/ла зображення",
     "%(senderName)s sent a video": "%(senderName)s надіслав/ла відео",
     "%(senderName)s uploaded a file": "%(senderName)s надіслав/ла файл",
-    "Options": "Налаштування",
+    "Options": "Параметри",
     "Key request sent.": "Запит ключа надіслано.",
     "Please select the destination room for this message": "Будь ласка, виберіть кімнату, куди потрібно надіслати це повідомлення",
-    "device id: ": "id пристрою: ",
     "Disinvite": "Скасувати запрошення",
     "Kick": "Викинути",
     "Disinvite this user?": "Скасувати запрошення для цього користувача?",
@@ -465,11 +431,9 @@
     "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": "Знизити рівень прав",
     "Failed to mute user": "Не вдалося заглушити користувача",
-    "Failed to toggle moderator status": "Не вдалося перемкнути статус модератора",
     "Failed to change power level": "Не вдалося змінити рівень повноважень",
-    "Chat with Riot Bot": "Чат із Riot-ботом",
+    "Chat with %(brand)s Bot": "Балачка з %(brand)s-ботом",
     "Whether or not you're logged in (we don't record your username)": "Незалежно від того, увійшли ви чи ні (ми не записуємо ваше ім'я користувача)",
-    "A conference call could not be started because the integrations server is not available": "Конференц-дзвінок не можна розпочати оскільки інтеграційний сервер недоступний",
     "The file '%(fileName)s' failed to upload.": "Файл '%(fileName)s' не вийшло відвантажити.",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "Файл '%(fileName)s' перевищує ліміт розміру для відвантажень домашнього сервера",
     "The server does not support the room version specified.": "Сервер не підтримує вказану версію кімнати.",
@@ -484,7 +448,7 @@
     "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Зараз неможливо відповісти файлом. Хочете відвантажити цей файл без відповіді?",
     "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 />, але сервер не має жодних умов надання послуг.",
+    "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.": "Продовжуйте тільки якщо довіряєте власнику сервера.",
     "Trust": "Довіра",
     "Unable to load! Check your network connectivity and try again.": "Завантаження неможливе! Перевірте інтернет-зʼєднання та спробуйте ще.",
@@ -496,7 +460,7 @@
     "Sends a message as plain text, without interpreting it as markdown": "Надсилає повідомлення як чистий текст, не використовуючи markdown",
     "Upgrades a room to a new version": "Покращує кімнату до нової версії",
     "You do not have the required permissions to use this command.": "Вам бракує дозволу на використання цієї команди.",
-    "<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> Ми опублікуємо посилання на нову кімнату у старій версії кімнати, а учасники мають власноруч клацнути це посилання, щоб приєднатися до нової кімнати.",
     "Changes your display nickname in the current room only": "Змінює ваше псевдо тільки для поточної кімнати",
     "Changes the avatar of the current room": "Змінює аватар поточної кімнати",
     "Changes your avatar in this current room only": "Змінює ваш аватар для поточної кімнати",
@@ -505,25 +469,23 @@
     "This room has no topic.": "Ця кімната не має теми.",
     "Sets the room name": "Встановлює назву кімнати",
     "Use an identity server": "Використовувати сервер ідентифікації",
-    "Use an identity server to invite by email. Manage in Settings.": "Використовувати ідентифікаційний сервер для запрошення через е-пошту. Керування у настройках.",
+    "Use an identity server to invite by email. Manage in Settings.": "Використовувати сервер ідентифікації для запрошень через е-пошту. Керуйте у налаштуваннях.",
     "Unbans user with given ID": "Розблоковує користувача з вказаним ідентифікатором",
     "Adds a custom widget by URL to the room": "Додає власний віджет до кімнати за посиланням",
     "Please supply a https:// or http:// widget URL": "Вкажіть посилання на віджет — https:// або http://",
     "You cannot modify widgets in this room.": "Ви не можете змінювати віджети у цій кімнаті.",
-    "Forces the current outbound group session in an encrypted room to be discarded": "Примусово відкидає поточний вихідний груповий сеанс у шифрованій кімнаті",
-    "Sends the given message coloured as a rainbow": "Надсилає вказане повідомлення розфарбоване веселкою",
-    "Your Riot is misconfigured": "Ваш Riot налаштовано неправильно",
+    "Forces the current outbound group session in an encrypted room to be discarded": "Примусово відкидає поточний вихідний груповий сеанс у зашифрованій кімнаті",
+    "Sends the given message coloured as a rainbow": "Надсилає вказане повідомлення, розфарбоване веселкою",
+    "Your %(brand)s is misconfigured": "Ваш %(brand)s налаштовано неправильно",
     "Join the discussion": "Приєднатися до обговорення",
-    "Upload": "Відвантажити",
+    "Upload": "Обрати",
     "Upload file": "Відвантажити файл",
     "Send an encrypted message…": "Надіслати зашифроване повідомлення…",
-    "Send a message (unencrypted)…": "Надіслати повідомлення (незашифроване)…",
     "The conversation continues here.": "Розмова триває тут.",
     "This room has been replaced and is no longer active.": "Ця кімната була замінена і не є активною.",
     "You do not have permission to post to this room": "У вас нема дозволу дописувати у цю кімнату",
     "Sign out": "Вийти",
-    "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 Riot to do this": "Щоб уникнути втрати історії ваших листувань, ви маєте експортувати ключі кімнати перед виходом. Вам треба буде повернутися до новішої версії Riot аби зробити це",
-    "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ": "Раніше ви використовували новішу версію Riot на %(host)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 аби зробити це",
     "Incompatible Database": "Несумісна база даних",
     "Continue With Encryption Disabled": "Продовжити із вимкненим шифруванням",
     "Unknown error": "Невідома помилка",
@@ -532,7 +494,7 @@
     "Your homeserver doesn't seem to support this feature.": "Схоже, що ваш домашній сервер не підтримує цю властивість.",
     "Sign out and remove encryption keys?": "Вийти та видалити ключі шифрування?",
     "Clear Storage and Sign Out": "Очистити сховище та вийти",
-    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Очищення сховища вашого оглядача може усунути проблему, але воно виведе вас з системи і зробить непрочитною історію ваших зашифрованих листувань.",
+    "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Очищення сховища вашого переглядача може усунути проблему, але воно виведе вас з системи та зробить непрочитною історію ваших зашифрованих листувань.",
     "Verification Pending": "Очікується перевірка",
     "Upload files (%(current)s of %(total)s)": "Відвантажити файли (%(current)s з %(total)s)",
     "Upload files": "Відвантажити файли",
@@ -546,8 +508,677 @@
     "Upload avatar": "Завантажити аватар",
     "For security, this session has been signed out. Please sign in again.": "З метою безпеки вашу сесію було завершено. Зайдіть, будь ласка, знову.",
     "Upload an avatar:": "Завантажити аватар:",
-    "Send cross-signing keys to homeserver": "Надсилання ключей підпису на домашній сервер",
     "Custom (%(level)s)": "Власний (%(level)s)",
     "Error upgrading room": "Помилка оновлення кімнати",
-    "Double check that your server supports the room version chosen and try again.": "Перевірте, чи підримує ваш сервер вказану версію кімнати та спробуйте ще."
+    "Double check that your server supports the room version chosen and try again.": "Перевірте, чи підримує ваш сервер вказану версію кімнати та спробуйте ще.",
+    "Liberate your communication": "Вивільни своє спілкування",
+    "Send a Direct Message": "Надіслати особисте повідомлення",
+    "Explore Public Rooms": "Дослідити прилюдні кімнати",
+    "Create a Group Chat": "Створити групову балачку",
+    "Explore": "Дослідити",
+    "Filter": "Фільтрувати",
+    "Filter rooms…": "Фільтрувати кімнати…",
+    "Failed to reject invitation": "Не вдалось відхилити запрошення",
+    "This room is not public. You will not be able to rejoin without an invite.": "Ця кімната не є прилюдною. Ви не зможете перепід'єднатись без запрошення.",
+    "Failed to leave room": "Не вдалось залишити кімнату",
+    "Can't leave Server Notices room": "Неможливо залишити кімнату Оголошення Сервера",
+    "This room is used for important messages from the Homeserver, so you cannot leave it.": "Ця кімната використовується для важливих повідомлень з домашнього сервера, тож ви не можете її залишити.",
+    "Use Single Sign On to continue": "Використати Single Sign On для продовження",
+    "Confirm adding this email address by using Single Sign On to prove your identity.": "Підтвердьте додавання цієї адреси е-пошти через використання Single Sign On аби довести вашу ідентичність.",
+    "Single Sign On": "Єдиний вхід",
+    "Confirm adding email": "Підтвердити додавання е-пошти",
+    "Click the button below to confirm adding this email address.": "Клацніть на кнопці нижче щоб підтвердити додавання цієї адреси е-пошти.",
+    "Confirm": "Підтвердити",
+    "Confirm adding this phone number by using Single Sign On to prove your identity.": "Підтвердьте додавання цього телефонного номера через використання Single Sign On аби довести вашу ідентичність.",
+    "Confirm adding phone number": "Підтвердьте додавання телефонного номера",
+    "Click the button below to confirm adding this phone number.": "Клацніть на кнопці нижче щоб підтвердити додавання цього телефонного номера.",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "Чи використовуєте ви %(brand)s на пристрої, де основним засобом вводження є дотик",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "Чи використовуєте ви %(brand)s як встановлений Progressive Web App",
+    "Your user agent": "Ваш user agent",
+    "If you cancel now, you won't complete verifying the other user.": "Якщо ви скасуєте зараз, то не завершите звіряння іншого користувача.",
+    "If you cancel now, you won't complete verifying your other session.": "Якщо ви скасуєте зараз, то не завершите звіряння вашої іншої сесії.",
+    "If you cancel now, you won't complete your operation.": "Якщо ви скасуєте зараз, то не завершите вашу дію.",
+    "Cancel entering passphrase?": "Скасувати введення парольної фрази?",
+    "Enter passphrase": "Введіть парольну фразу",
+    "Setting up keys": "Налаштовування ключів",
+    "Verify this session": "Звірити цю сесію",
+    "Sign In or Create Account": "Увійти або створити обліковий запис",
+    "Use your account or create a new one to continue.": "Скористайтесь вашим обліковим записом або створіть нову, щоб продовжити.",
+    "Create Account": "Створити обліковий запис",
+    "Sign In": "Увійти",
+    "Verify all your sessions to ensure your account & messages are safe": "Звірте усі ваші сеанси, аби переконатись, що ваш обліковий запис і повідомлення у безпеці",
+    "Later": "Пізніше",
+    "Review": "Переглянути",
+    "Verify yourself & others to keep your chats safe": "Верифікуйте себе й інших щоб зберегти ваше спілкування у безпеці",
+    "Verify": "Звірити",
+    "Verify the new login accessing your account: %(name)s": "Звірити новий вхід, що доступається до вашого облікового запису: %(name)s",
+    "From %(deviceName)s (%(deviceId)s)": "Від %(deviceName)s (%(deviceId)s)",
+    "Decline (%(counter)s)": "Відхилити (%(counter)s)",
+    "Language and region": "Мова та регіон",
+    "Account management": "Керування обліковим записом",
+    "Deactivating your account is a permanent action - be careful!": "Деактивація вашого облікового запису є безповоротною дією — будьте обережні!",
+    "Deactivate Account": "Деактивувати обліковий запис",
+    "Deactivate account": "Знедіяти обліківку",
+    "Legal": "Правова інформація",
+    "Credits": "Подяки",
+    "For help with using %(brand)s, click <a>here</a>.": "Якщо необхідна допомога у користуванні %(brand)s'ом, клацніть <a>тут</a>.",
+    "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> або розпочніть балачку з нашим ботом, клацнувши на кнопці нижче.",
+    "Join the conversation with an account": "Приєднатись до бесіди з обліковим записом",
+    "Unable to restore session": "Неможливо відновити сесію",
+    "We encountered an error trying to restore your previous session.": "Ми натрапили на помилку, намагаючись відновити вашу попередню сесію.",
+    "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>.",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Ваш обліковий запис має перехресно-підписувану ідентичність у таємному сховищі, але вона ще не є довіреною у цій сесії.",
+    "in account data": "у даних облікового запису",
+    "Clear notifications": "Очистити сповіщення",
+    "Add an email address to configure email notifications": "Додати адресу е-пошти для налаштування поштових сповіщень",
+    "Theme added!": "Тему додано!",
+    "Email addresses": "Адреса е-пошти",
+    "Phone numbers": "Номери телефонів",
+    "Set a new account password...": "Встановити новий пароль облікового запису…",
+    "Forget this room": "Забути цю кімнату",
+    "Re-join": "Перепід'єднатись",
+    "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "Це запрошення до %(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": "Це запрошення до %(roomName)s було надіслане на %(email)s",
+    "Use an identity server in Settings to receive invites directly in %(brand)s.": "Використовувати сервер ідентифікації у Налаштуваннях щоб отримувати запрошення прямо у %(brand)s.",
+    "Are you sure you want to deactivate your account? This is irreversible.": "Ви впевнені у тому, що бажаєте знедіяти ваш обліковий запис? Ця дія безповоротна.",
+    "Confirm account deactivation": "Підтвердьте деактивацію облікового запису",
+    "To continue, please enter your password:": "Щоб продовжити, введіть, будь ласка, ваш пароль:",
+    "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": "Ключ сесії",
+    "%(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> зараз.",
+    "Connectivity to the server has been lost.": "З'єднання з сервером було втрачено.",
+    "Sent messages will be stored until your connection has returned.": "Надіслані повідомлення будуть збережені поки не з'явиться зв'язок.",
+    "Active call": "Активний виклик",
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Тут нікого нема! Ви б хотіли <inviteText>запросити інших</inviteText> чи краще <nowarnText>припинити попереджати про порожню кімнату</nowarnText>?",
+    "Jump to first unread room.": "Перейти до першої непрочитаної кімнати.",
+    "Jump to first invite.": "Перейти до першого запрошення.",
+    "Add room": "Додати кімнату",
+    "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?": "Схоже, ви намагаєтесь вийти посеред розмови. Ви впевнені, що хочете вийти?",
+    "Search failed": "Пошук не вдався",
+    "Server may be unavailable, overloaded, or search timed out :(": "Сервер може бути недосяжним, перевантаженим або запит на пошук застарів :(",
+    "No more results": "Інших результатів нема",
+    "Room": "Кімната",
+    "Failed to reject invite": "Не вдалось відхилити запрошення",
+    "You have %(count)s unread notifications in a prior version of this room.|other": "Ви маєте %(count)s непрочитаних сповіщень у попередній версії цієї кімнати.",
+    "You have %(count)s unread notifications in a prior version of this room.|one": "У вас %(count)s непрочитане сповіщення у попередній версії цієї кімнати.",
+    "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": "Знедіяти користувача",
+    "Failed to deactivate user": "Не вдалось знедіяти користувача",
+    "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> після цього майбутні користувачі бачитимуть неповні бесіди)",
+    "Are you sure you want to cancel entering passphrase?": "Ви точно хочете скасувати введення парольної фрази?",
+    "Go Back": "Назад",
+    "Room name or address": "Назва та адреса кімнати",
+    "%(name)s is requesting verification": "%(name)s робить запит на звірення",
+    "Use your account to sign in to the latest version": "Увійдіть до останньої версії через свій обліковий запис",
+    "We’re excited to announce Riot is now Element": "Ми раді повідомити, що Riot тепер називається Element",
+    "Riot is now Element!": "Riot тепер - Element!",
+    "Learn More": "Дізнатися більше",
+    "Command error": "Помилка команди",
+    "Sends a message as html, without interpreting it as markdown": "Надсилає повідомлення як HTML, не інтерпритуючи Markdown",
+    "Failed to set topic": "Не вдалося встановити тему",
+    "Once enabled, encryption cannot be disabled.": "Після увімкнення шифрування не можна буде вимкнути.",
+    "Please enter verification code sent via text.": "Будь ласка, введіть звірювальний код, відправлений у текстовому повідомленні.",
+    "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.": "Повідомлення у цій кімнаті не є наскрізно зашифрованими.",
+    "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": "Ви відправили звірювальний запит",
+    "Direct Messages": "Особисті повідомлення",
+    "Room Settings - %(roomName)s": "Налаштування кімнати - %(roomName)s",
+    "A verification email will be sent to your inbox to confirm setting your new password.": "Ми відправимо перевіряльний електронний лист до вас для підтвердження зміни пароля.",
+    "To return to your account in future you need to set a password": "Щоб повернутися до своєї обліківки в майбутньому, вам потрібно встановити пароль",
+    "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Використовувати сервер ідентифікації, щоб запрошувати через е-пошту. Натисніть \"Продовжити\", щоб використовувати типовий сервер ідентифікації (%(defaultIdentityServerName)s) або змініть його у налаштуваннях.",
+    "Joins room with given address": "Приєднатися до кімнати зі вказаною адресою",
+    "Unrecognised room address:": "Невпізнана адреса кімнати:",
+    "Command failed": "Не вдалося виконати команду",
+    "Could not find user in room": "Не вдалося знайти користувача в кімнаті",
+    "Please supply a widget URL or embed code": "Вкажіть URL або код вставки віджету",
+    "Verifies a user, session, and pubkey tuple": "Звіряє користувача, сеанс та кортеж відкритого ключа",
+    "Unknown (user, session) pair:": "Невідома пара (користувача, сеансу):",
+    "Session already verified!": "Сеанс вже підтверджений!",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "УВАГА: Сеанс вже підтверджений, проте ключі НЕ ЗБІГАЮТЬСЯ!",
+    "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\". Це може означати, що ваші повідомлення перехоплюють!",
+    "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "Наданий вами ключ підпису збігається з ключем підпису, що ви отримали від сеансу %(deviceId)s %(userId)s. Сеанс позначено як звірений.",
+    "Sends the given emote coloured as a rainbow": "Надсилає вказаний смайлик, розфарбований веселкою",
+    "Displays list of commands with usages and descriptions": "Відбиває перелік команд із прикладами вжитку та описом",
+    "Displays information about a user": "Відбиває інформацію про користувача",
+    "Send a bug report with logs": "Надіслати звіт про ваду разом з журналами",
+    "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 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 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 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 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 розпочав(-ла) відеовиклик.",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s розпочав(-ла) відеовиклик. (не підтримується цим переглядачем)",
+    "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s відкликав(-ла) запрошення %(targetDisplayName)s приєднання до кімнати.",
+    "%(senderName)s removed the rule banning users 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 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 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",
+    "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) почав(ла) нову сесію без її підтвердження:",
+    "Ask this user to verify their session, or manually verify it below.": "Попросіть цього користувача підтвердити сесію, або підтвердіть її власноруч нижче.",
+    "Not Trusted": "Недовірене",
+    "Manually Verify by Text": "Ручна перевірка за допомогою тексту",
+    "Interactively verify by Emoji": "Інтерактивно звірити за допомогою емодзі",
+    "Done": "Зроблено",
+    "%(displayName)s is typing …": "%(displayName)s пише…",
+    "%(names)s and %(count)s others are typing …|other": "%(names)s та ще %(count)s учасників пишуть…",
+    "%(names)s and %(count)s others are typing …|one": "%(names)s та ще один учасник пишуть…",
+    "%(names)s and %(lastPerson)s are typing …": "%(names)s та %(lastPerson)s пишуть…",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Попросіть адміністратора %(brand)s перевірити <a>конфігураційний файл</a> на наявність неправильних або повторюваних записів.",
+    "Cannot reach identity server": "Не вдається зв'язатися із сервером ідентифікаціїї",
+    "No homeserver URL provided": "URL адресу домашнього сервера не вказано",
+    "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|one": "%(items)s і ще хтось",
+    "a few seconds ago": "Декілька секунд тому",
+    "about a minute ago": "близько хвилини тому",
+    "%(num)s minutes ago": "%(num)s хвилин тому",
+    "about an hour ago": "близько години тому",
+    "%(num)s hours ago": "%(num)s годин тому",
+    "%(num)s days ago": "%(num)s днів тому",
+    "a few seconds from now": "декілька секунд тому",
+    "about a minute from now": "приблизно через хвилинку",
+    "%(num)s minutes from now": "%(num)s хвилин по тому",
+    "about an hour from now": "приблизно через годинку",
+    "%(num)s hours from now": "%(num)s годин по тому",
+    "about a day from now": "приблизно через день",
+    "%(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 %(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.": "Домашній сервер користувача не підтримує версію кімнати.",
+    "Unknown server error": "Невідома помилка з боку сервера",
+    "Use a few words, avoid common phrases": "Використовуйте декілька слів, уникайте звичайних фраз",
+    "Use a longer keyboard pattern with more turns": "Використовуйте довшу комбінацію клавіш з більшою кількістю поворотів",
+    "Avoid repeated words and characters": "Уникайте повторюваних слів та символів",
+    "Avoid sequences": "Уникайте послідовностей",
+    "Avoid recent years": "Уникайте останніх років",
+    "Avoid years that are associated with you": "Уникайте років, які зв'язані з вами",
+    "Avoid dates and years that are associated with you": "Уникайте дат і років, які зв'язані з вами",
+    "All-uppercase is almost as easy to guess as all-lowercase": "Все прописними буквами так само легко вгадується як і все малими",
+    "Reversed words aren't much harder to guess": "Вгадувати перевернуті слова не сильно важче",
+    "Predictable substitutions like '@' instead of 'a' don't help very much": "Передбачувані заміни типу «@» замість «a» не особливо допомагають",
+    "Add another word or two. Uncommon words are better.": "Додайте ще один-два слова. Краще використовувати рідкісні слова.",
+    "Repeats like \"aaa\" are easy to guess": "Повтори типу \"ааа\" легко вгадувані",
+    "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Повтори типу «abcabcabc», лише трішки складніше вгадати, ніж «abc»",
+    "Sequences like abc or 6543 are easy to guess": "Послідовності типу abc або 6543 легко вгадувані",
+    "Recent years are easy to guess": "Останні роки легко вгадувані",
+    "Dates are often easy to guess": "Часто, дати вгадувати легко",
+    "This is a top-10 common password": "Це топ-10 легких та звичайних паролів",
+    "This is a top-100 common password": "Це топ-100 легких та розповсюджених паролів",
+    "This is a very common password": "Це дуже розповсюджений пароль",
+    "This is similar to a commonly used password": "Це занадто простий пароль",
+    "A word by itself is easy to guess": "Загальновживані слова легко вгадувані",
+    "Names and surnames by themselves are easy to guess": "Імена та прізвища легко вгадувані",
+    "Common names and surnames are easy to guess": "Розповсюджені імена та прізвища легко вгадувані",
+    "Straight rows of keys are easy to guess": "Прямі ради клавіш легко вгадувані",
+    "Short keyboard patterns are easy to guess": "Короткі клавіатурні шаблони легко вгадувані",
+    "Help us improve %(brand)s": "Допоможіть нам покращити %(brand)s",
+    "I want to help": "Я хочу допомогти",
+    "No": "НІ",
+    "Review where you’re logged in": "Перевірте, де ви ввійшли",
+    "Your homeserver has exceeded its user limit.": "Ваш домашній сервер перевищив свій ліміт користувачів.",
+    "Your homeserver has exceeded one of its resource limits.": "Ваш домашній сервер перевищив один із своїх ресурсних лімітів.",
+    "Contact your <a>server admin</a>.": "Зверніться до <a>адміністратора серверу</a>.",
+    "Ok": "Гаразд",
+    "Set password": "Встановити пароль",
+    "Set up encryption": "Налаштування шифрування",
+    "Encryption upgrade available": "Доступне поліпшене шифрування",
+    "Set up": "Налаштувати",
+    "Upgrade": "Поліпшити",
+    "Other users may not trust it": "Інші користувачі можуть не довіряти цьому",
+    "New login. Was this you?": "Новий вхід у вашу обліківку. Це були Ви?",
+    "Restart": "Перезапустити",
+    "Upgrade your %(brand)s": "Оновіть ваш %(brand)s",
+    "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 приєднався(лась) до дзвінку",
+    "Call in progress": "Дзвінок у процесі",
+    "You left the call": "Ви припинили розмову",
+    "%(senderName)s left the call": "%(senderName)s покинув(ла) дзвінок",
+    "Call ended": "Дзвінок завершено",
+    "You started a call": "Ви почали дзвінок",
+    "%(senderName)s started a call": "%(senderName)s почав(ла) дзвінок",
+    "Waiting for answer": "Чекаємо відповіді",
+    "%(senderName)s is calling": "%(senderName)s баламкає",
+    "* %(senderName)s %(emote)s": "*%(senderName)s %(emote)s",
+    "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
+    "%(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)": "Групувати та фільтрувати кімнати за кастомними тегами (оновіть для застосування змін)",
+    "Multiple integration managers": "Декілька менджерів інтеграції",
+    "Try out new ways to ignore people (experimental)": "Спробуйте нові способи ігнорувати людей (експериментальні)",
+    "Support adding custom themes": "Підтримка користувацьких тем",
+    "Enable advanced debugging for the room list": "Увімкнути просунуте зневаджування для переліку кімнат",
+    "Show info about bridges in room settings": "Показувати інформацію про мости в налаштуваннях кімнати",
+    "Font size": "Розмір шрифту",
+    "Use custom size": "Використовувати нетиповий розмір",
+    "Enable Emoji suggestions while typing": "Увімкнути пропонування емодзі при друкуванні",
+    "Use a more compact ‘Modern’ layout": "Використовувати компактнішу \"Сучасну\" тему",
+    "General": "Загальні",
+    "Discovery": "Відкриття",
+    "Help & About": "Допомога та про програму",
+    "Bug reporting": "Повідомити про помилку",
+    "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, журнали можуть допомогти нам виявити проблеми. Журнали відладки, що містять інформацію про використані додатки, включають ваше ім’я користувача, ідентифікатори або псевдоніми кімнат або груп, які ви відвідували, а також імена інших користувачів. Вони не містять повідомлень.",
+    "Submit debug logs": "Відправити відладочні журнали (debug logs)",
+    "Clear cache and reload": "Очистити кеш та перезавантажити",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "Щоб повідомити про проблеми безпеки Matrix, будь ласка, прочитайте <a>Політику розкриття інформації</a> Matrix.org.",
+    "FAQ": "Часті питання",
+    "Keyboard Shortcuts": "Гарячі клавіші",
+    "Versions": "Версії",
+    "%(brand)s version:": "версія %(brand)s:",
+    "olm version:": "Версія olm:",
+    "Identity Server is": "Сервер ідентифікації",
+    "Labs": "Лабораторія",
+    "Customise your experience with experimental labs features. <a>Learn more</a>.": "Спробуйте експериментальні можливості. <a>Більше</a>.",
+    "Ignored/Blocked": "Ігноровані/Заблоковані",
+    "Error adding ignored user/server": "Помилка при додаванні ігнорованого користувача/сервера",
+    "Something went wrong. Please try again or view your console for hints.": "Щось пішло не так. Спробуйте знову, або пошукайте підказки в консолі.",
+    "Error subscribing to list": "Помилка при підписці на список",
+    "Please verify the room ID or address and try again.": "Перевірте ID кімнати, або адресу та попробуйте знову.",
+    "Error removing ignored user/server": "Помилка при видаленні ігнорованого користувача/сервера",
+    "Error unsubscribing from list": "Не вдалося відписатися від списку",
+    "Please try again or view your console for hints.": "Спробуйте знову, або подивіться повідомлення в консолі.",
+    "Ban list rules - %(roomName)s": "Правила блокування - %(roomName)s",
+    "Server rules": "Правила серверу",
+    "User rules": "Правила користування",
+    "You have not ignored anyone.": "Ви нікого не ігноруєте.",
+    "You are currently ignoring:": "Ви ігноруєте:",
+    "You are not subscribed to any lists": "Ви не підписані ні на один список",
+    "Unsubscribe": "Відписатись",
+    "View rules": "Подивитись правила",
+    "You are currently subscribed to:": "Ви підписані на:",
+    "⚠ These settings are meant for advanced users.": "⚠ Ці налаштування розраховані на досвідчених користувачів.",
+    "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.": "Ігнорування людей реалізовано через списки правил блокування. Підписка на список блокування призведе до приховування від вас користувачів і серверів, які в ньому перераховані.",
+    "Personal ban list": "Особистий бан-ліст",
+    "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.": "Ваш особистий список блокування містить всіх користувачів і сервери, повідомлення яких ви не хочете бачити. Після внесення туди першого користувача / сервера в списку кімнат з'явиться нова кімната 'Мій список блокування' - не покидає цю кімнату, щоб список блокування працював.",
+    "Server or user ID to ignore": "Сервер або ID користувача для ігнорування",
+    "eg: @bot:* or example.org": "наприклад: @bot:* або example.org",
+    "Ignore": "Ігнорувати",
+    "Subscribed lists": "Підписані списки",
+    "Subscribing to a ban list will cause you to join it!": "При підписці на список блокування ви приєднаєтесь до нього!",
+    "If this isn't what you want, please use a different tool to ignore users.": "Якщо вас це не влаштовує, спробуйте інший інструмент для ігнорування користувачів.",
+    "Room ID or address of ban list": "Ідентифікатор номера або адреса бан-лісту",
+    "Subscribe": "Підписатись",
+    "Start automatically after system login": "Автозапуск при вході в систему",
+    "Always show the window menu bar": "Завжди показувати рядок меню",
+    "Show tray icon and minimize window to it on close": "Показувати піктограму у лотку та згортати вікно при закритті",
+    "Preferences": "Параметри",
+    "Room list": "Перелік кімнат",
+    "Composer": "Редактор",
+    "Security & Privacy": "Безпека та конфіденційність",
+    "Where you’re logged in": "Де ви ввійшли",
+    "Skip": "Пропустити",
+    "Notification settings": "Налаштування сповіщень",
+    "Appearance Settings only affect this %(brand)s session.": "Налаштування вигляду впливають тільки на цей сеанс %(brand)s.",
+    "Error changing power level requirement": "Помилка під час зміни вимог до рівня повноважень",
+    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "Під час зміни вимог рівня повноважень кімнати трапилась помилка. Переконайтесь, що ви маєте необхідні дозволи і спробуйте ще раз.",
+    "Error changing power level": "Помилка під час зміни рівня повноважень",
+    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "Під час зміни рівня повноважень користувача трапилась помилка. Переконайтесь, що ви маєте необхідні дозволи і спробуйте ще раз.",
+    "Change settings": "Змінити налаштування",
+    "Only people who have been invited": "Тільки люди, що були запрошені",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (повноваження %(powerLevelNumber)s)",
+    "Send a message…": "Надіслати повідомлення…",
+    "People": "Люди",
+    "Share this email in Settings to receive invites directly in %(brand)s.": "Поширте цю адресу е-пошти у налаштуваннях щоб отримувати запрошення прямо у %(brand)s.",
+    "Room options": "Параметри кімнати",
+    "Send as message": "Надіслати як повідомлення",
+    "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 on %(date)s": "Повідомлення видалено %(date)s",
+    "Power level": "Рівень повноважень",
+    "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Використовуйте сервер ідентифікації щоб запрошувати через е-пошту. Керується у <settings>налаштуваннях</settings>.",
+    "Enable 'Manage Integrations' in Settings to do this.": "Щоб зробити це увімкніть \"Керувати інтеграціями\" у налаштуваннях.",
+    "Confirm by comparing the following with the User Settings in your other session:": "Підтвердьте шляхом порівняння наступного рядка з рядком у користувацьких налаштуваннях вашого іншого сеансу:",
+    "Confirm this user's session by comparing the following with their User Settings:": "Підтвердьте сеанс цього користувача шляхом порівняння наступного рядка з рядком з їхніх користувацьких налаштувань:",
+    "We recommend you change your password and recovery key in Settings immediately": "Ми радимо невідкладно змінити ваші пароль та відновлювальний ключ у налаштуваннях",
+    "Share Message": "Поширити повідомлення",
+    "Community Settings": "Налаштування спільноти",
+    "All settings": "Усі налаштування",
+    "User menu": "Користувацьке меню",
+    "If you don't want to set this up now, you can later in Settings.": "Якщо ви не бажаєте налаштовувати це зараз, ви можете зробити це пізніше у налаштуваннях.",
+    "Go to Settings": "Перейти до налаштувань",
+    "Compare unique emoji": "Порівняйте унікальні емодзі",
+    "Cancelling…": "Скасування…",
+    "Dog": "Пес",
+    "Cat": "Кіт",
+    "Lion": "Лев",
+    "Horse": "Кінь",
+    "Pig": "Свиня",
+    "Elephant": "Слон",
+    "Rabbit": "Кріль",
+    "Panda": "Панда",
+    "Rooster": "Когут",
+    "Penguin": "Пінгвін",
+    "Turtle": "Черепаха",
+    "Fish": "Риба",
+    "Octopus": "Восьминіг",
+    "Moon": "Місяць",
+    "Cloud": "Хмара",
+    "Fire": "Вогонь",
+    "Banana": "Банан",
+    "Apple": "Яблуко",
+    "Strawberry": "Полуниця",
+    "Corn": "Кукурудза",
+    "Pizza": "Піца",
+    "Heart": "Серце",
+    "Smiley": "Посмішка",
+    "Robot": "Робот",
+    "Hat": "Капелюх",
+    "Glasses": "Окуляри",
+    "Spanner": "Гайковий ключ",
+    "Thumbs up": "Великий палець вгору",
+    "Umbrella": "Парасолька",
+    "Hourglass": "Пісковий годинник",
+    "Clock": "Годинник",
+    "Light bulb": "Лампочка",
+    "Book": "Книга",
+    "Pencil": "Олівець",
+    "Paperclip": "Спиначка",
+    "Scissors": "Ножиці",
+    "Key": "Ключ",
+    "Hammer": "Молоток",
+    "Telephone": "Телефон",
+    "Flag": "Прапор",
+    "Train": "Потяг",
+    "Bicycle": "Велоcипед",
+    "Aeroplane": "Літак",
+    "Rocket": "Ракета",
+    "Trophy": "Приз",
+    "Ball": "М'яч",
+    "Guitar": "Гітара",
+    "Trumpet": "Труба",
+    "Bell": "Дзвін",
+    "Anchor": "Якір",
+    "Headphones": "Навушники",
+    "Folder": "Тека",
+    "Pin": "Кнопка",
+    "Accept <policyLink /> to continue:": "Прийміть <policyLink /> для продовження:",
+    "Flower": "Квітка",
+    "Unicorn": "Єдиноріг",
+    "Butterfly": "Метелик",
+    "Cake": "Пиріг",
+    "Tree": "Дерево",
+    "Cactus": "Кактус",
+    "Mushroom": "Гриб",
+    "Globe": "Глобус",
+    "This bridge was provisioned by <user />.": "Цей місток був підготовленим <user />.",
+    "This bridge is managed by <user />.": "Цей міст керується <user />.",
+    "Workspace: %(networkName)s": "Робочий простір: %(networkName)s",
+    "Channel: %(channelName)s": "Канал: %(channelName)s",
+    "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": "Санта Клаус",
+    "Gift": "Подарунок",
+    "Lock": "Замок",
+    "Cross-signing and secret storage are not yet set up.": "Перехресне підписування та таємне сховище ще не налагоджені.",
+    "Your homeserver does not support cross-signing.": "Ваш домашній сервер не підтримує кросс-підпис.",
+    "Cross-signing and secret storage are enabled.": "Кросс-підпис та секретне сховище дозволені.",
+    "well formed": "добре сформований",
+    "unexpected type": "несподіваний тип",
+    "Cross-signing public keys:": "Перехресно-підписувальні відкриті ключі:",
+    "in memory": "у пам'яті",
+    "not found": "не знайдено",
+    "Cross-signing private keys:": "Приватні ключі для кросс-підпису:",
+    "exists": "існує",
+    "Delete sessions|other": "Видалити сесії",
+    "Delete sessions|one": "Видалити сесію",
+    "Delete %(count)s sessions|other": "Видалити %(count)s сесій",
+    "Delete %(count)s sessions|one": "Видалити %(count)s сесій",
+    "ID": "ID",
+    "Public Name": "Публічне ім'я",
+    " to store messages from ": " зберігання повідомлень від ",
+    "rooms.": "кімнати.",
+    "Manage": "Керування",
+    "Enable": "Дозволити",
+    "Connecting to integration manager...": "З'єднання з менджером інтеграцій...",
+    "Cannot connect to integration manager": "Не вдалося з'єднатися з менджером інтеграцій",
+    "Delete Backup": "Видалити резервну копію",
+    "Restore from Backup": "Відновити з резервної копії",
+    "not stored": "не збережено",
+    "All keys backed up": "Усі ключі збережено",
+    "Backup version: ": "Версія резервної копії: ",
+    "Algorithm: ": "Алгоритм: ",
+    "Backup key stored: ": "Резервна копія ключа збережена ",
+    "Enable audible notifications for this session": "Ввімкнути звукові сповіщення для цього сеансу",
+    "Save": "Зберегти",
+    "Checking server": "Перевірка серверу",
+    "Disconnect": "Відключити",
+    "You should:": "Вам варто:",
+    "Disconnect anyway": "Відключити в будь-якому випадку",
+    "Identity Server (%(server)s)": "Сервер ідентифікації  (%(server)s)",
+    "Identity Server": "Сервер ідентифікації",
+    "Do not use an identity server": "Не використовувати сервер ідентифікації",
+    "Enter a new identity server": "Введіть новий сервер ідентифікації",
+    "Change": "Змінити",
+    "Manage integrations": "Керування інтеграціями",
+    "Size must be a number": "Розмір повинен бути числом",
+    "Incoming voice call": "Входовий голосовий виклик",
+    "Incoming video call": "Входовий відеовиклик",
+    "<a>Upgrade</a> to your own domain": "<a>Поліпшити</a> до свого власного домену",
+    "No Audio Outputs detected": "Звуковий вивід не виявлено",
+    "Audio Output": "Звуковий вивід",
+    "Voice & Video": "Голос та відео",
+    "Upgrade this room to the recommended room version": "Поліпшити цю кімнату до рекомендованої версії",
+    "this room": "ця кімната",
+    "Upgrade the room": "Поліпшити кімнату",
+    "Unable to revoke sharing for email address": "Не вдалось відкликати оприлюднювання адреси е-пошти",
+    "Revoke": "Відкликати",
+    "Unable to revoke sharing for phone number": "Не вдалось відкликати оприлюднювання телефонного номеру",
+    "Filter room members": "Відфільтрувати учасників кімнати",
+    "Voice call": "Голосовий виклик",
+    "Video call": "Відеовиклик",
+    "Not now": "Не зараз",
+    "Don't ask me again": "Не запитувати мене знову",
+    "Appearance": "Вигляд",
+    "Show rooms with unread messages first": "Спочатку показувати кімнати з непрочитаними повідомленнями",
+    "Show previews of messages": "Показувати попередній перегляд повідомлень",
+    "Sort by": "Упорядкувати за",
+    "Activity": "Активністю",
+    "A-Z": "А-Я",
+    "List options": "Параметри переліку",
+    "Use default": "Типово",
+    "Mentions & Keywords": "Згадки та ключові слова",
+    "Notification options": "Параметри сповіщень",
+    "Leave Room": "Вийти з кімнати",
+    "Forget Room": "Забути кімнату",
+    "Favourited": "Улюблено",
+    "%(count)s unread messages including mentions.|other": "%(count)s непрочитаних повідомлень включно зі згадками.",
+    "%(count)s unread messages including mentions.|one": "1 непрочитана згадка.",
+    "%(count)s unread messages.|other": "%(count)s непрочитаних повідомлень.",
+    "%(count)s unread messages.|one": "1 непрочитане повідомлення.",
+    "Unread messages.": "Непрочитані повідомлення.",
+    "This room is public": "Ця кімната є прилюдною",
+    "Show Stickers": "Показати наліпки",
+    "Failed to revoke invite": "Не вдалось відкликати запрошення",
+    "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Не вдалось відкликати запрошення. Сервер може мати тимчасові збої або у вас немає достатніх дозволів щоб відкликати запрошення.",
+    "Revoke invite": "Відкликати запрошення",
+    "Security": "Безпека",
+    "Report bugs & give feedback": "Відзвітувати про вади та залишити відгук",
+    "Report Content to Your Homeserver Administrator": "Поскаржитись на зміст адміністратору вашого домашнього сервера",
+    "Failed to upgrade room": "Не вдалось поліпшити кімнату",
+    "The room upgrade could not be completed": "Поліпшення кімнати не може бути завершене",
+    "Upgrade this room to version %(version)s": "Поліпшити цю кімнату до версії %(version)s",
+    "Upgrade Room Version": "Поліпшити версію кімнати",
+    "Upgrade private room": "Поліпшити закриту кімнату",
+    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "Ви поліпшите цю кімнату з <oldVersion /> до <newVersion /> версії.",
+    "Share Room Message": "Поширити повідомлення кімнати",
+    "Report Content": "Поскаржитись на зміст",
+    "Feedback": "Зворотній зв'язок",
+    "General failure": "Загальний збій",
+    "Enter your account password to confirm the upgrade:": "Введіть пароль вашого облікового запису щоб підтвердити поліпшення:",
+    "Security & privacy": "Безпека та конфіденційність",
+    "Secret storage public key:": "Таємне сховище відкритого ключа:",
+    "Key backup": "Резервне копіювання ключів",
+    "Message search": "Пошук повідомлень",
+    "Cross-signing": "Перехресне підписування",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "Адміністратором вашого сервера було вимкнено початкове наскрізне шифрування у закритих кімнатах та особистих повідомленнях.",
+    "Something went wrong!": "Щось пішло не так!",
+    "expand": "розгорнути",
+    "Wrong Recovery Key": "Неправильний відновлювальний ключ",
+    "Invalid Recovery Key": "Нечинний відновлювальний ключ",
+    "Recovery key mismatch": "Незбіг відновлювального ключа",
+    "Backup could not be decrypted with this recovery key: please verify that you entered the correct 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>",
+    "Enter recovery key": "Введіть відновлювальний ключ",
+    "This looks like a valid recovery key!": "Це скидається на чинний відновлювальний ключ!",
+    "Not a valid 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>": "Якщо ви забули ваш відновлювальний ключ, ви можете <button>наново налаштувати параметри відновлювання</button>",
+    "Switch to light mode": "Світла тема",
+    "Switch to dark mode": "Темна тема",
+    "Use Recovery Key or Passphrase": "Скористуйтесь відновлювальними ключем або парольною фразою",
+    "Use Recovery Key": "Скористуйтесь відновлювальним ключем",
+    "Set up with a recovery key": "Налаштувати з відновлювальним ключем",
+    "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": "Ваш відновлювальний ключ",
+    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "Ваш відновлювальний ключ було <b>скопійовано до буферу обміну</b>, вставте його у:",
+    "Your recovery key is in your <b>Downloads</b> folder.": "Ваш відновлювальний ключ у вашій теці <b>Завантаження</b>.",
+    "Make a copy of your recovery key": "Зробити копію вашого відновлювального ключа",
+    "Don't ask again": "Не запитувати знову",
+    "New Recovery Method": "Новий відновлювальний засіб",
+    "A new recovery passphrase and key for Secure Messages have been detected.": "Було виявлено нові відновлювальні парольну фразу та ключ від захищених повідомлень.",
+    "This session is encrypting history using the new recovery method.": "Цей сеанс зашифровує історію новим відновлювальним засобом.",
+    "Set up Secure Messages": "Налаштувати захищені повідомлення",
+    "Recovery Method Removed": "Відновлювальний засіб було видалено",
+    "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "Цей сеанс виявив, що ваші відновлювальні парольна фраза та ключ від захищених повідомлень були видалені.",
+    "%(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": "Відновіть резервну копію вашого ключа щоб поліпшити шифрування",
+    "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 join/leave messages (invites/kicks/bans unaffected)": "Показувати повідомлення про приєднання/залишення (не впливає на запрошення/викидання/заборону)",
+    "Show avatar changes": "Показувати зміни личини",
+    "Show display name changes": "Показувати зміни видимого імені",
+    "Show read receipts sent by other users": "Показувати мітки прочитання, надіслані іншими користувачами",
+    "Show a reminder to enable Secure Message Recovery in encrypted rooms": "Показувати нагадку про ввімкнення відновлювання захищених повідомлень у зашифрованих кімнатах",
+    "Show avatars in user and room mentions": "Показувати личини у згадках користувачів та кімнат",
+    "Never send encrypted messages to unverified sessions from this session": "Ніколи не надсилати зашифровані повідомлення до незвірених сеансів з цього сеансу",
+    "Never send encrypted messages to unverified sessions in this room from this session": "Ніколи не надсилати зашифровані повідомлення до незвірених сеансів у цій кімнаті з цього сеансу",
+    "Enable message search in encrypted rooms": "Увімкнути шукання повідомлень у зашифрованих кімнатах",
+    "IRC display name width": "Ширина видимого імені IRC",
+    "Encrypted messages in one-to-one chats": "Зашифровані повідомлення у балачках віч-на-віч",
+    "Encrypted messages in group chats": "Зашифровані повідомлення у групових балачках",
+    "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Захищені повідомлення з цим користувачем є наскрізно зашифрованими та непрочитними для сторонніх осіб.",
+    "Securely cache encrypted messages locally for them to appear in search results.": "Безпечно локально кешувати зашифровані повідомлення щоб вони з'являлись у результатах пошуку.",
+    "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.": "%(brand)s'ові бракує деяких складників, необхідних для безпечного локального кешування зашифрованих повідомлень. Якщо ви хочете поекспериментувати з цією властивістю, зберіть спеціальну збірку %(brand)s Desktop із <nativeLink>доданням пошукових складників</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 не може безпечно локально кешувати зашифровані повідомлення під час виконання у переглядачі. Користуйтесь <desktopLink>%(brand)s Desktop</desktopLink>, в якому зашифровані повідомлення з'являються у результатах пошуку.",
+    "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": "почекайте та спробуйте пізніше",
+    "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": "Ця кімната є наскрізно зашифрованою",
+    "Encrypted by an unverified session": "Зашифроване незвіреним сеансом",
+    "Encrypted by a deleted session": "Зашифроване видаленим сеансом",
+    "The authenticity of this encrypted message can't be guaranteed on this device.": "Справжність цього зашифрованого повідомлення не може бути гарантованою на цьому пристрої.",
+    "Send an encrypted reply…": "Надіслати зашифровану відповідь…",
+    "Replying": "Відповідання",
+    "Low priority": "Неважливі",
+    "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 encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "У зашифрованих кімнатах ваші повідомлення є захищеними, тож тільки ви та отримувач маєте ключі для їх розблокування.",
+    "In encrypted rooms, verify all users to ensure it’s secure.": "У зашифрованих кімнатах звіряйте усіх користувачів щоб переконатись у безпеці спілкування.",
+    "Failed to copy": "Не вдалось скопіювати",
+    "Your display name": "Ваше видиме ім'я",
+    "COPY": "СКОПІЮВАТИ",
+    "Set a display name:": "Зазначити видиме ім'я:",
+    "Copy": "Скопіювати",
+    "Cancel replying to a message": "Скасувати відповідання на повідомлення",
+    "Page Up": "Page Up",
+    "Page Down": "Page Down",
+    "Esc": "Esc",
+    "Enter": "Enter",
+    "Space": "Пропуск",
+    "End": "End",
+    "Clearing all data from this session is permanent. Encrypted messages will be lost unless their keys have been backed up.": "Видалення даних з цього сеансу є безповоротним. Зашифровані повідомлення будуть втрачені якщо їхні ключі не було продубльовано.",
+    "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 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.": "Звірте цей пристрій щоб позначити його довіреним. Довіряння цьому пристрою додає вам та іншим користувачам спокою якщо ви користуєтесь наскрізно зашифрованими повідомленнями.",
+    "I don't want my encrypted messages": "Мені не потрібні мої зашифровані повідомлення",
+    "You'll lose access to your encrypted messages": "Ви втратите доступ до ваших зашифрованих повідомлень",
+    "Use this session to verify your new one, granting it access to encrypted messages:": "Використати цей сеанс для звірення вашого нового сеансу, надаючи йому доступ до зашифрованих повідомлень:",
+    "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.": "Змінення паролю скине усі ключі наскрізного шифрування в усіх ваших сеансах, роблячи зашифровану історію листувань непрочитною. Налагодьте дублювання ключів або експортуйте ключі кімнат з іншого сеансу перед скиданням паролю.",
+    "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": "Сповіщати про друкування",
+    "Show rooms with unread notifications first": "Спочатку показувати кімнати з непрочитаними сповіщеннями",
+    "Show shortcuts to recently viewed rooms above the room list": "Показувати нещодавно бачені кімнати вгорі понад переліком кімнат",
+    "Show hidden events in timeline": "Показувати приховані події у часоряді",
+    "Show previews/thumbnails for images": "Показувати попередній перегляд зображень",
+    "Compare a unique set of emoji if you don't have a camera on either device": "Порівняйте унікальну низку емодзі якщо ви не маєте камери на жодному пристрої",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "Підтвердьте, що нижчевказані емодзі відбиваються в обох сеансах в однаковому порядку:",
+    "Verify this user by confirming the following emoji appear on their screen.": "Звірте цього користувача підтвердженням того, що наступні емодзі з'являються на його екрані.",
+    "Emoji picker": "Обирач емодзі",
+    "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. Спробуйте використати інший клієнт.",
+    "If you can't scan the code above, verify by comparing unique emoji.": "Якщо ви не можете відсканувати вищезазначений код, звірте порівнянням унікальних емодзі.",
+    "Verify by comparing unique emoji.": "Звірити порівнянням унікальних емодзі.",
+    "Verify by emoji": "Звірити за допомогою емодзі",
+    "Compare emoji": "Порівняти емодзі",
+    "This requires the latest %(brand)s on your other devices:": "Це потребує найостаннішого %(brand)s на ваших інших пристроях:",
+    "%(brand)s Web": "%(brand)s Web",
+    "%(brand)s Desktop": "%(brand)s Desktop",
+    "%(brand)s iOS": "%(brand)s iOS",
+    "%(brand)s Android": "%(brand)s Android",
+    "or another cross-signing capable Matrix client": "або інший здатний до перехресного підписування Matrix-клієнт",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "Ваш новий сеанс тепер є звірений. Він має доступ до ваших зашифрованих повідомлень, а інші користувачі бачитимуть його як довірений.",
+    "Emoji": "Емодзі",
+    "Emoji Autocomplete": "Самодоповнення емодзі"
 }
diff --git a/src/i18n/strings/vi.json b/src/i18n/strings/vi.json
index 14575a61ff..744310675c 100644
--- a/src/i18n/strings/vi.json
+++ b/src/i18n/strings/vi.json
@@ -3,27 +3,20 @@
     "This phone number is already in use": "Số điện thoại này hiện đã được sử dụng",
     "Failed to verify email address: make sure you clicked the link in the email": "Xác thực email thất bại: hãy đảm bảo bạn nhấp đúng đường dẫn đã gửi vào email",
     "The platform you're on": "Nền tảng bạn đang tham gia",
-    "The version of Riot.im": "Phiên bản của Riot.im",
+    "The version of %(brand)s": "Phiên bản của %(brand)s",
     "Your language of choice": "Ngôn ngữ bạn chọn",
     "Your homeserver's URL": "Đường dẫn Homeserver của bạn",
     "Whether or not you're logged in (we don't record your username)": "Dù bạn có đăng nhập hay không (chúng tôi không lưu tên đăng nhập của bạn)",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Dù bạn có dùng chức năng Richtext của Rich Text Editor hay không",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Dù bạn có dùng chức năng breadcrumbs hay không (avatar trên danh sách phòng)",
-    "Your identity server's URL": "Đường dẫn identify server của bạn",
     "e.g. %(exampleValue)s": "ví dụ %(exampleValue)s",
     "Every page you use in the app": "Mọi trang bạn dùng trong app",
     "e.g. <CurrentPageURL>": "ví dụ <CurrentPageURL>",
-    "Your User Agent": "Trình duyệt của bạn",
     "Your device resolution": "Độ phân giải thiết bị",
     "Analytics": "Phân tích",
-    "The information being sent to us to help make Riot.im better includes:": "Thông tin gửi lên máy chủ giúp cải thiện Riot.im bao gồm:",
+    "The information being sent to us to help make %(brand)s better includes:": "Thông tin gửi lên máy chủ giúp cải thiện %(brand)s bao gồm:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Trường hợp trang này chứa thông tin định danh như phòng chat, người dùng hoặc mã nhóm, dữ liệu định danh sẽ được loại bỏ trước khi gửi lên máy chủ.",
     "Call Failed": "Cuộc gọi thất bại",
-    "Review Devices": "Xác nhận thiết bị",
-    "Call Anyway": "Vẫn gọi",
-    "Answer Anyway": "Vẫn trả lời",
-    "Call": "Gọi",
-    "Answer": "Trả lời",
     "Call Timeout": "Hết thời hạn gọi",
     "The remote side failed to pick up": "Phía được gọi không thể trả lời",
     "Unable to capture screen": "Không thể chụp màn hình",
@@ -32,8 +25,6 @@
     "VoIP is unsupported": "VoIP không được hỗ trợ",
     "You cannot place VoIP calls in this browser.": "Bạn không thể gọi VoIP với trình duyệt này.",
     "You cannot place a call with yourself.": "Bạn không thể tự gọi cho chính mình.",
-    "Could not connect to the integration server": "Không thể kết nối tới máy chủ tích hợp",
-    "A conference call could not be started because the integrations server is not available": "Cuộc gọi hội nghị không thể được khởi tạo vì máy chủ tích hợp không có sẵn",
     "Call in Progress": "Đang trong cuộc gọi",
     "A call is currently being placed!": "Một cuộc gọi hiện đang được thực hiện!",
     "A call is already in progress!": "Một cuộc gọi đang diễn ra!",
@@ -48,7 +39,6 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "Máy chủ không hoạt động, quá tải hoặc gặp lỗi.",
     "The server does not support the room version specified.": "Máy chủ không hỗ trợ phiên bản phòng chat.",
     "Failure to create room": "Khởi tạo phòng thất bại",
-    "Send anyway": "Vẫn gửi đi",
     "Send": "Gửi đi",
     "Sun": "Chủ nhật",
     "Mon": "Thứ hai",
@@ -83,7 +73,6 @@
     "Which rooms would you like to add to this community?": "Phòng chat nào bạn muốn thêm vào cộng đồng này?",
     "Show these rooms to non-members on the community page and room list?": "Hiển thị những phòng này cho người dùng không phải là thành viên?",
     "Add rooms to the community": "Thêm phòng chat vào cộng đồng",
-    "Room name or alias": "Tên phòng chat",
     "Add to community": "Thêm vào cộng đồng",
     "Failed to invite the following users to %(groupId)s:": "Người dùng sau không thể được mời vào %(groupId)s:",
     "Failed to invite users to community": "Không thể mời người dùng vào cộng đồng",
@@ -93,19 +82,16 @@
     "Error": "Lỗi",
     "Unable to load! Check your network connectivity and try again.": "Không thể tải! Kiểm tra kết nối và thử lại.",
     "Dismiss": "Bỏ qua",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot không có đủ quyền để gửi notification - vui lòng kiểm tra thiết lập trình duyệt",
-    "Riot was not given permission to send notifications - please try again": "Riot không được cấp quyền để gửi notification - vui lòng thử lại",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s không có đủ quyền để gửi notification - vui lòng kiểm tra thiết lập trình duyệt",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s không được cấp quyền để gửi notification - vui lòng thử lại",
     "Unable to enable Notifications": "Không thể bật Notification",
     "This email address was not found": "Địa chỉ email này không tồn tại trong hệ thống",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Email của bạn không được liên kết với một mã Matrix ID nào trên Homeserver này.",
-    "Registration Required": "Yêu cầu đăng ký",
-    "You need to register to do this. Would you like to register now?": "Bạn phải đăng ký ký để thực hiện tác vụ. Bạn có muốn đăng ký bay giờ không?",
     "Register": "Đăng ký",
     "Default": "Mặc định",
     "Restricted": "Hạn chế",
     "Moderator": "Quản trị viên",
     "Admin": "Admin",
-    "Start a chat": "Bắt đầu chat",
     "Operation failed": "Tác vụ thất bại",
     "Failed to invite": "Không thể mời",
     "Failed to invite users to the room:": "Mời thành viên vào phòng chat thất bại:",
@@ -136,9 +122,7 @@
     "This room has no topic.": "Phòng này chưa có chủ đề.",
     "Sets the room name": "Đặt tên phòng",
     "Invites user with given id to current room": "Mời thành viên vào phòng hiện tại",
-    "Joins room with given alias": "Tham gia phòng",
     "Leave room": "Rời phòng",
-    "Unrecognised room alias:": "Không xác định được tên phòng:",
     "Kicks user with given id": "Loại thành viên khỏi phòng",
     "Bans user with given id": "Cấm thành viên tham gia phòng",
     "Unbans user with given ID": "Gỡ cấm thành viên",
@@ -195,11 +179,6 @@
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s đã cấm flair đối với %(groups)s.",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s đã cho phép flair đối với %(newGroups)s và cấm flair đối với %(oldGroups)s.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s đã gửi một hình.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s đã thêm %(addedAddresses)s vào danh sách địa chỉ của phòng.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s đã thêm %(addedAddresses)s thành một địa chỉ của phòng.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s đã loại %(removedAddresses)s khỏi danh sách địa chỉ phòng.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s đã loại %(removedAddresses)s khỏi danh sách địa chỉ phòng.",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s đã thêm %(addedAddresses)s và đã loại %(removedAddresses)s khỏi danh sách địa chỉ phòng.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s thiết lập địa chỉ chính cho phòng thành %(address)s.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s đã loại địa chỉ chính của phòng.",
     "Someone": "Ai đó",
@@ -228,8 +207,7 @@
     "%(names)s and %(lastPerson)s are typing …": "%(names)s và %(lastPerson)s đang gõ …",
     "Cannot reach homeserver": "Không thể kết nối tới máy chủ",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Đảm bảo bạn có kết nối Internet ổn địn, hoặc liên hệ Admin để được hỗ trợ",
-    "Your Riot is misconfigured": "Hệ thống Riot của bạn bị thiết lập sai",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Liên hệ Admin để kiểm tra <a>thiết lập của bạn</a> để sửa lỗi.",
+    "Your %(brand)s is misconfigured": "Hệ thống %(brand)s của bạn bị thiết lập sai",
     "Cannot reach identity server": "Không thể kết nối server định danh",
     "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.": "Bạn có thể đăng ký, nhưng một vài chức năng sẽ không sử đụng dược cho đến khi server định danh hoạt động trở lại. Nếu bạn thấy thông báo này, hãy kiểm tra thiết lập hoặc liên hệ 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.": "Bạn có thể đặt lại mật khẩu, nhưng một vài chức năng sẽ không sử đụng dược cho đến khi server định danh hoạt động trở lại. Nếu bạn thấy thông báo này, hãy kiểm tra thiết lập hoặc liên hệ Admin.",
@@ -245,7 +223,7 @@
     "%(items)s and %(count)s others|one": "%(items)s và một mục khác",
     "%(items)s and %(lastItem)s": "%(items)s và %(lastItem)s",
     "Your browser does not support the required cryptography extensions": "Trình duyệt của bạn không hỗ trợ chức năng mã hóa",
-    "Not a valid Riot keyfile": "Tệp khóa Riot không hợp lệ",
+    "Not a valid %(brand)s keyfile": "Tệp khóa %(brand)s không hợp lệ",
     "Authentication check failed: incorrect password?": "Kiểm tra đăng nhập thất bại: sai mật khẩu?",
     "Unrecognised address": "Không nhận ra địa chỉ",
     "You do not have permission to invite people to this room.": "Bạn không đủ quyền để mời người khác vào phòng chat.",
@@ -291,7 +269,6 @@
     "Group & filter rooms by custom tags (refresh to apply changes)": "Nhóm và lọc phòng chat theo tag tùy biến (làm tươi để áp dụng thay đổi)",
     "Render simple counters in room header": "Hiển thị số đếm giản đơn ở tiêu đề phòng",
     "Enable Emoji suggestions while typing": "Cho phép gợi ý Emoji khi đánh máy",
-    "Use compact timeline layout": "Sử dụng giao diện thời gian rút gọn",
     "Show a placeholder for removed messages": "Hiển thị khu đánh dấu tin bị xóa",
     "Show join/leave messages (invites/kicks/bans unaffected)": "Hiển thị tin báo tham gia/rời phòng (mời/đá/cấm không bị ảnh hưởng)",
     "Show avatar changes": "Hiển thị thay đổi hình đại diện",
diff --git a/src/i18n/strings/vls.json b/src/i18n/strings/vls.json
index b08bc31e5d..1172804efa 100644
--- a/src/i18n/strings/vls.json
+++ b/src/i18n/strings/vls.json
@@ -3,28 +3,21 @@
     "This phone number is already in use": "Dezen telefongnumero es al in gebruuk",
     "Failed to verify email address: make sure you clicked the link in the email": "Kostege ’t e-mailadresse nie verifieern: zorgt dervoor da je de koppelienge in den e-mail èt angeklikt",
     "The platform you're on": "’t Platform da je gebruukt",
-    "The version of Riot.im": "De versie van Riot.im",
+    "The version of %(brand)s": "De versie van %(brand)s",
     "Whether or not you're logged in (we don't record your username)": "Of da je al dan nie angemeld zyt (we sloan je gebruukersnoame nie ip)",
     "Your language of choice": "De deur joun gekoozn toale",
     "Which officially provided instance you are using, if any": "Welke officieel angeboodn instantie da je eventueel gebruukt",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Of da je den tekstverwerker al of nie in de modus voor ipgemakte tekst gebruukt",
     "Whether or not you're using the 'breadcrumbs' feature (avatars above the room list)": "Of da je de ‘krumeltjes’-functie al of nie gebruukt (avatars boven de gesprekslyste)",
     "Your homeserver's URL": "Den URL van je thuusserver",
-    "Your identity server's URL": "Den URL van jen identiteitsserver",
     "e.g. %(exampleValue)s": "bv. %(exampleValue)s",
     "Every page you use in the app": "Iedere bladzyde da je in de toepassienge gebruukt",
     "e.g. <CurrentPageURL>": "bv. <CurrentPageURL>",
-    "Your User Agent": "Je gebruukersagent",
     "Your device resolution": "De resolutie van je toestel",
     "Analytics": "Statistische gegeevns",
-    "The information being sent to us to help make Riot.im better includes:": "D’informoasje da noar uus wor verstuurd vo Riot.im te verbetern betreft:",
+    "The information being sent to us to help make %(brand)s better includes:": "D’informoasje da noar uus wor verstuurd vo %(brand)s te verbetern betreft:",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Woar da da blad hier identificeerboare informoasje bevat, gelyk e gespreks-, gebruukers- of groeps-ID, goan deze gegevens verwyderd wordn voorda ze noa de server gestuurd wordn.",
     "Call Failed": "Iproep mislukt",
-    "Review Devices": "Toestelln noakykn",
-    "Call Anyway": "Algelyk belln",
-    "Answer Anyway": "Algelyk beantwoordn",
-    "Call": "Belln",
-    "Answer": "Beantwoordn",
     "Call Timeout": "Iproeptime-out",
     "The remote side failed to pick up": "Den andere kant èt nie ipgepakt",
     "Unable to capture screen": "Kostege geen schermafdruk moakn",
@@ -33,8 +26,6 @@
     "VoIP is unsupported": "VoIP wor nie oundersteund",
     "You cannot place VoIP calls in this browser.": "J’en kut in deezn browser gin VoIP-iproepen pleegn.",
     "You cannot place a call with yourself.": "J’en ku jezelve nie belln.",
-    "Could not connect to the integration server": "Verbindienge me d’integroasjeserver es mislukt",
-    "A conference call could not be started because the integrations server is not available": "Me da d’integroasjeserver ounbereikboar is kostege ’t groepsaudiogesprek nie gestart wordn",
     "Call in Progress": "Loopnd gesprek",
     "A call is currently being placed!": "’t Wordt al een iproep gemakt!",
     "A call is already in progress!": "’t Es al e gesprek actief!",
@@ -49,7 +40,6 @@
     "Server may be unavailable, overloaded, or you hit a bug.": "De server es misschiens ounbereikboar of overbelast, of je zyt e foute tegengekommn.",
     "The server does not support the room version specified.": "De server oundersteunt deze versie van gesprekkn nie.",
     "Failure to create room": "Anmoakn van gesprek es mislukt",
-    "Send anyway": "Algelyk verstuurn",
     "Send": "Verstuurn",
     "Sun": "Zun",
     "Mon": "Moa",
@@ -84,7 +74,6 @@
     "Which rooms would you like to add to this community?": "Welke gesprekkn wil je toevoegn an deze gemeenschap?",
     "Show these rooms to non-members on the community page and room list?": "Deze gesprekkn toogn an nie-leedn ip ’t gemeenschapsblad en de gesprekslyste?",
     "Add rooms to the community": "Voegt gesprekkn toe an de gemeenschap",
-    "Room name or alias": "Gespreks(by)noame",
     "Add to community": "Toevoegn an gemeenschap",
     "Failed to invite the following users to %(groupId)s:": "Uutnodign van de volgende gebruukers in %(groupId)s es mislukt:",
     "Failed to invite users to community": "Uutnodign van gebruukers in gemeenschap es mislukt",
@@ -94,19 +83,16 @@
     "Error": "Foute",
     "Unable to load! Check your network connectivity and try again.": "Loadn mislukt! Controleer je netwerktoegang en herprobeer ’t e ki.",
     "Dismiss": "Afwyzn",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot èt geen toestemmienge vo je meldiengn te verstuurn - controleert je browserinstelliengn",
-    "Riot was not given permission to send notifications - please try again": "Riot èt geen toestemmienge gekreegn ghed vo joun meldiengn te verstuurn - herprobeer ’t e ki",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s èt geen toestemmienge vo je meldiengn te verstuurn - controleert je browserinstelliengn",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s èt geen toestemmienge gekreegn ghed vo joun meldiengn te verstuurn - herprobeer ’t e ki",
     "Unable to enable Notifications": "Kostege meldiengn nie inschoakeln",
     "This email address was not found": "Dat e-mailadresse hier es nie gevoundn",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "’t Ziet ernoar uut da jen e-mailadresse ip dezen thuusserver nie an e Matrix-ID es gekoppeld.",
-    "Registration Required": "Registroasje vereist",
-    "You need to register to do this. Would you like to register now?": "Hiervoorn moe je je registreern. Wil je da nu doen?",
     "Register": "Registreern",
     "Default": "Standoard",
     "Restricted": "Beperkten toegank",
     "Moderator": "Moderator",
     "Admin": "Beheerder",
-    "Start a chat": "Gesprek beginn",
     "Operation failed": "Handelienge es mislukt",
     "Failed to invite": "Uutnodign es mislukt",
     "Failed to invite users to the room:": "Kostege de volgende gebruukers hier nie uutnodign:",
@@ -137,9 +123,7 @@
     "This room has no topic.": "Da gesprek hier èt geen ounderwerp.",
     "Sets the room name": "Stelt de gespreksnoame in",
     "Invites user with given id to current room": "Nodigt de gebruuker me de gegeevn ID uut in ’t huudig gesprek",
-    "Joins room with given alias": "Treedt tout ’t gesprek toe me de gegeevn bynoame",
     "Leave room": "Deuregoan uut ’t gesprek",
-    "Unrecognised room alias:": "Ounbekende gespreksbynoame:",
     "Kicks user with given id": "Stuurt de gebruuker me de gegeevn ID uut ’t gesprek",
     "Bans user with given id": "Verbant de gebruuker me de gegeevn ID",
     "Unbans user with given ID": "Ountbant de gebruuker me de gegeevn ID",
@@ -194,11 +178,6 @@
     "%(senderDisplayName)s disabled flair for %(groups)s in this room.": "%(senderDisplayName)s èt badges vo %(groups)s in da gesprek hier uutgeschoakeld.",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s èt badges in da gesprek hier vo %(newGroups)s in-, en vo %(oldGroups)s uutgeschoakeld.",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s èt e fotootje gestuurd.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s èt de adressn %(addedAddresses)s an da gesprek hier toegekend.",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s èt %(addedAddresses)s als gespreksadresse toegevoegd.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s èt ’t gespreksadresse %(removedAddresses)s verwyderd.",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s èt de gespreksadressn %(removedAddresses)s verwyderd.",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s èt de gespreksadressn %(addedAddresses)s toegevoegd, en %(removedAddresses)s verwyderd.",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s èt %(address)s als hoofdadresse vo dit gesprek ingesteld.",
     "%(senderName)s removed the main address for this room.": "%(senderName)s èt ’t hoofdadresse vo dit gesprek verwyderd.",
     "Someone": "Etwien",
@@ -235,7 +214,7 @@
     "%(items)s and %(count)s others|one": "%(items)s en één ander",
     "%(items)s and %(lastItem)s": "%(items)s en %(lastItem)s",
     "Your browser does not support the required cryptography extensions": "Je browser oundersteunt de benodigde cryptografie-extensies nie",
-    "Not a valid Riot keyfile": "Geen geldig Riot-sleuterbestand",
+    "Not a valid %(brand)s keyfile": "Geen geldig %(brand)s-sleuterbestand",
     "Authentication check failed: incorrect password?": "Anmeldiengscontrole mislukt: verkeerd paswoord?",
     "Unrecognised address": "Adresse nie herkend",
     "You do not have permission to invite people to this room.": "J’en èt geen toestemmienge vo menschn in dit gesprek uut te nodign.",
@@ -281,7 +260,6 @@
     "Group & filter rooms by custom tags (refresh to apply changes)": "Gesprekkn groepeern en filtern volgens eigen labels (herloadt vo de veranderienge te zien)",
     "Render simple counters in room header": "Eenvoudige tellers boovnan ’t gesprek toogn",
     "Enable Emoji suggestions while typing": "Emoticons voorstelln binst ’t typn",
-    "Use compact timeline layout": "Compacte tydlynindelienge gebruukn",
     "Show a placeholder for removed messages": "Vullienge toogn vo verwyderde berichtn",
     "Show join/leave messages (invites/kicks/bans unaffected)": "Berichtn over deelnaomn en verlatiengn toogn (dit èt geen effect ip uutnodigiengn, berispiengn of verbanniengn)",
     "Show avatar changes": "Veranderiengn van avatar toogn",
@@ -308,7 +286,6 @@
     "Enable widget screenshots on supported widgets": "Widget-schermafdrukkn inschoakeln ip oundersteunde widgets",
     "Prompt before sending invites to potentially invalid matrix IDs": "Bevestigienge vroagn voda uutnodigiengn noar meuglik oungeldige Matrix-ID’s wordn verstuurd",
     "Show developer tools": "Ontwikkeliengsgereedschap toogn",
-    "Order rooms in the room list by most important first instead of most recent": "Gesprekkn in de gesprekslyste sorteern ip belang in plekke van latste gebruuk",
     "Show hidden events in timeline": "Verborgn gebeurtenissn ip de tydslyn weregeevn",
     "Low bandwidth mode": "Lagebandbreedtemodus",
     "Collecting app version information": "App-versieinformoasje wor verzoameld",
@@ -419,7 +396,6 @@
     "Confirm password": "Bevestig ’t paswoord",
     "Change Password": "Paswoord verandern",
     "Authentication": "Authenticoasje",
-    "Device ID": "Toestel-ID",
     "Last seen": "Latst gezien",
     "Failed to set display name": "Instelln van weergavenoame es mislukt",
     "Unable to remove contact information": "Kan contactinformoasje nie verwydern",
@@ -434,8 +410,6 @@
     "Add": "Toevoegn",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "M'èn joun een e-mail gestuurd vo jen adresse te verifieern. Gelieve de doarin gegeven anwyziengn ip te volgn en ton ip de knop hierounder te klikkn.",
     "Email Address": "E-mailadresse",
-    "Disable Notifications": "Meldiengn uutschoakeln",
-    "Enable Notifications": "Meldiengn inschoakeln",
     "Delete Backup": "Back-up verwydern",
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Zy je zeker? Je goa je versleuterde berichtn kwytspeeln a je sleuters nie correct geback-upt zyn.",
     "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Versleuterde berichtn zyn beveiligd me eind-tout-eind-versleuterienge. Alleene d’ountvanger(s) en gy èn de sleuters vo deze berichtn te leezn.",
@@ -467,8 +441,6 @@
     "Unable to fetch notification target list": "Kostege de bestemmiengslyste vo meldiengn nie iphoaln",
     "Notification targets": "Meldiengsbestemmiengn",
     "Advanced notification settings": "Geavanceerde meldiengsinstelliengn",
-    "There are advanced notifications which are not shown here": "Der zyn geavanceerde meldiengn dat hier nie getoogd wordn",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "J’è ze meuglik ingesteld in een andere cliënt als Riot. Je ku ze nie anpassn in Riot, moa ze zyn wel actief",
     "Show message in desktop notification": "Bericht toogn in bureaubladmeldienge",
     "Off": "Uut",
     "On": "An",
@@ -491,17 +463,15 @@
     "Phone numbers": "Telefongnumero’s",
     "Language and region": "Toale en regio",
     "Theme": "Thema",
-    "Light theme": "Licht thema",
-    "Dark theme": "Dounker thema",
     "Account management": "Accountbeheer",
     "Deactivating your account is a permanent action - be careful!": "’t Deactiveern van jen account ku nie oungedoan gemakt wordn - zy voorzichtig!",
     "Deactivate Account": "Account deactiveern",
     "General": "Algemeen",
     "Legal": "Wettelik",
     "Credits": "Me dank an",
-    "For help with using Riot, click <a>here</a>.": "Klikt <a>hier</a> voor hulp by ’t gebruukn van Riot.",
-    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "Klikt <a>hier</a> voor hulp by ’t gebruukn van Riot, of begint e gesprek met uzze robot me de knop hieroundern.",
-    "Chat with Riot Bot": "Chattn me Riot-robot",
+    "For help with using %(brand)s, click <a>here</a>.": "Klikt <a>hier</a> voor hulp by ’t gebruukn van %(brand)s.",
+    "For help with using %(brand)s, click <a>here</a> or start a chat with our bot using the button below.": "Klikt <a>hier</a> voor hulp by ’t gebruukn van %(brand)s, of begint e gesprek met uzze robot me de knop hieroundern.",
+    "Chat with %(brand)s Bot": "Chattn me %(brand)s-robot",
     "Check for update": "Controleern ip updates",
     "Help & About": "Hulp & Info",
     "Bug reporting": "Foutmeldiengn",
@@ -509,7 +479,7 @@
     "Submit debug logs": "Foutipsporiengslogboekn indienn",
     "FAQ": "VGV",
     "Versions": "Versies",
-    "riot-web version:": "riot-web-versie:",
+    "%(brand)s version:": "%(brand)s-versie:",
     "olm version:": "olm-versie:",
     "Homeserver is": "Thuusserver es",
     "Identity Server is": "Identiteitsserver es",
@@ -533,11 +503,11 @@
     "Reject all %(invitedRooms)s invites": "Alle %(invitedRooms)s-uutnodigiengn weigern",
     "Key backup": "Sleuterback-up",
     "Security & Privacy": "Veiligheid & privacy",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot verzoamelt anonieme analysegegeevns da ’t meuglik moakn van de toepassienge te verbetern.",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s verzoamelt anonieme analysegegeevns da ’t meuglik moakn van de toepassienge te verbetern.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privacy es belangryk voor uus, dus me verzoameln geen persoonlike of identificeerboare gegeevns voor uzze gegeevnsanalyse.",
     "Learn more about how we use analytics.": "Leest meer over hoe da we joun gegeevns gebruukn.",
     "No media permissions": "Geen mediatoestemmiengn",
-    "You may need to manually permit Riot to access your microphone/webcam": "Je moe Riot wellicht handmoatig toestoan van je microfoon/webcam te gebruukn",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "Je moe %(brand)s wellicht handmoatig toestoan van je microfoon/webcam te gebruukn",
     "Missing media permissions, click the button below to request.": "Mediatoestemmiengn ountbreekn, klikt ip de knop hierounder vo deze an te vroagn.",
     "Request media permissions": "Mediatoestemmiengn verzoekn",
     "No Audio Outputs detected": "Geen geluudsuutgangn gedetecteerd",
@@ -591,7 +561,6 @@
     "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>": "Van zodra da de versleuterienge voor e gesprek es ingeschoakeld gewist, es ’t nie mi meuglik van ’t were uut te schoakeln. Berichtn da in e versleuterd gesprek wordn verstuurd wordn nie gezien deur de server, alleene moa deur de deelnemers an ’t gesprek. Deur de versleuterienge in te schoakeln kunn veel robots en overbruggiengen nie juste functioneern. <a>Leest meer over de versleuterienge.</a>",
     "Guests cannot join this room even if explicitly invited.": "Gastn kunn nie tout dit gesprek toetreedn, zelfst nie as ze uutdrukkelik uutgenodigd gewist zyn.",
     "Click here to fix": "Klikt hier vo dit ip te lossen",
-    "To link to this room, please add an alias.": "Voegt een bynoame toe vo noa dit gesprek te verwyzn.",
     "Only people who have been invited": "Alleen menschn dat uutgenodigd gewist zyn",
     "Anyone who knows the room's link, apart from guests": "Iedereen da de koppelienge van ’t gesprek kent, behalve gastn",
     "Anyone who knows the room's link, including guests": "Iedereen da de koppelienge van ’t gesprek kent, inclusief gastn",
@@ -619,8 +588,6 @@
     "%(senderName)s uploaded a file": "%(senderName)s èt e bestand ipgeloaden",
     "Key request sent.": "Sleuterverzoek verstuurd.",
     "Please select the destination room for this message": "Selecteer ’t bestemmingsgesprek vo dit bericht",
-    "Scroll to bottom of page": "Scrollt noa den onderkant van ’t blad",
-    "device id: ": "toestel-ID: ",
     "Disinvite": "Uutnodigienge intrekkn",
     "Kick": "Uut ’t gesprek stuurn",
     "Disinvite this user?": "Uutnodigienge vo deze gebruuker intrekkn?",
@@ -634,7 +601,6 @@
     "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.": "Je kut deze actie nie oungedoan moakn omda je jen eigen degradeert. A je de latste bevoorrechte gebruuker in ’t gesprek zyt, is ’t ounmeuglik van deze rechtn were te krygn.",
     "Demote": "Degradeern",
     "Failed to mute user": "Dempn van gebruuker es mislukt",
-    "Failed to toggle moderator status": "Anpassn van moderatorstatus es mislukt",
     "Failed to change power level": "Wyzign van ’t machtsniveau es mislukt",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Je kut deze veranderiengn nie oungedoan moakn angezien da je de gebruuker tout ’tzelfste niveau als jen eigen promoveert.",
     "Ignore": "Negeern",
@@ -642,12 +608,8 @@
     "Mention": "Vermeldn",
     "Invite": "Uutnodign",
     "Share Link to User": "Koppelienge me de gebruuker deeln",
-    "User Options": "Gebruukersopties",
-    "Direct chats": "Twigesprekkn",
     "Unmute": "Nie dempn",
     "Mute": "Dempn",
-    "Revoke Moderator": "Moderator degradeern",
-    "Make Moderator": "Benoemn tout moderator",
     "Admin Tools": "Beheerdersgereedschap",
     "Close": "Sluutn",
     "and %(count)s others...|other": "en %(count)s anderen…",
@@ -661,9 +623,7 @@
     "Hangup": "Iphangn",
     "Upload file": "Bestand iploadn",
     "Send an encrypted reply…": "Verstuurt e versleuterd antwoord…",
-    "Send a reply (unencrypted)…": "Verstuurt een antwoord (ounversleuterd)…",
     "Send an encrypted message…": "Verstuurt e versleuterd bericht…",
-    "Send a message (unencrypted)…": "Verstuurt een bericht (ounversleuterd)…",
     "The conversation continues here.": "’t Gesprek goat hier verder.",
     "This room has been replaced and is no longer active.": "Dit gesprek is vervangn gewist en is nie langer actief.",
     "You do not have permission to post to this room": "J’èt geen toestemmienge voor in dit gesprek te postn",
@@ -763,16 +723,9 @@
     "Jump to first unread message.": "Spriengt noa ’t eeste oungeleezn bericht.",
     "Error updating main address": "Foute by ’t bywerkn van ’t hoofdadresse",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "’t Es e foute ipgetreedn by ’t bywerkn van ’t hoofdadresse van ’t gesprek. Dit wor meugliks nie toegeloatn deur de server, of der es een tydelik probleem ipgetreedn.",
-    "Error creating alias": "Foute by ’t anmoakn van de bynoame",
-    "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "’t Es e foute ipgetreedn by ’t anmoakn van die bynoame. Dit wor meugliks nie toegeloatn deur de server, of der is een tydelik probleem ipgetreedn.",
-    "Error removing alias": "Foute by ’t verwydern van de bynoame",
-    "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "’t Es e foute ipgetreedn by ’t verwydern van die bynoame. Meugliks bestoa ze nie mi, of der es een tydelike foute ipgetreedn.",
     "Main address": "Hoofdadresse",
     "not specified": "nie ingegeevn",
-    "Remote addresses for this room:": "Externe adressn vo dit gesprek:",
-    "Local addresses for this room:": "Lokoale adressn vo dit gesprek:",
     "This room has no local addresses": "Dit gesprek è geen lokoale adressn",
-    "New address (e.g. #foo:%(localDomain)s)": "Nieuw adresse (bv. #foo:%(localDomain)s)",
     "Error updating flair": "Foute by ’t bywerkn van de badge",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "’t Es e foute ipgetreedn by ’t bywerkn van de badge vo dit gesprek. De server oundersteunt dit meugliks nie, of der es een tydelike foute ipgetreedn.",
     "Invalid community ID": "Oungeldige gemeenschaps-ID",
@@ -822,9 +775,6 @@
     "Add an Integration": "Voegt een integroasje toe",
     "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?": "Je goa sebiet noar en derdepartywebsite gebracht wordn zoda je den account ku legitimeern vo gebruuk me %(integrationsUrl)s. Wil je verdergoan?",
     "edited": "bewerkt",
-    "Removed or unknown message type": "Verwyderd of ounbekend berichttype",
-    "Message removed by %(userId)s": "Bericht verwyderd deur %(userId)s",
-    "Message removed": "Bericht verwyderd",
     "Remove from community": "Verwydern uut de gemeenschap",
     "Disinvite this user from community?": "Uutnodigienge vo deze gebruuker tout de gemeenschap intrekkn?",
     "Remove this user from community?": "Deze gebruuker uut de gemeenschap verwydern?",
@@ -847,20 +797,12 @@
     "Something went wrong when trying to get your communities.": "’t Ging etwa verkeerd by ’t iphoaln van je gemeenschappn.",
     "Display your community flair in rooms configured to show it.": "Toogt je gemeenschapsbadge in gesprekkn da doarvoorn ingesteld gewist zyn.",
     "You're not currently a member of any communities.": "Je zy vo de moment geen lid van e gemeenschap.",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "Helpt mee me Riot.im te verbetern door <UsageDataLink>anonieme gebruuksgegeevns</UsageDataLink> te verstuurn. Dit goat een cookie gebruukn (bekykt hiervoorn uus <PolicyLink>cookiebeleid</PolicyLink>).",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "Helpt mee me Riot.im te verbetern door <UsageDataLink>anonieme gebruuksgegeevns</UsageDataLink> te verstuurn. Dit goat een cookie gebruukn.",
-    "Yes, I want to help!": "Joak, ’k willn ik helpn!",
     "You are not receiving desktop notifications": "J’ontvangt vo de moment geen bureaubladmeldiengn",
     "Enable them now": "Deze nu inschoakeln",
     "What's New": "Wuk es ’t er nieuw",
     "Update": "Bywerkn",
     "What's new?": "Wuk es ’t er nieuw?",
-    "A new version of Riot is available.": "Der es e nieuwe versie van Riot beschikboar.",
-    "To return to your account in future you need to <u>set a password</u>": "Voor in de toekomst noa jen account were te keren es ’t nodig van <u>e paswoord in te stelln</u>",
     "Set Password": "Paswoord instelln",
-    "Please <a>contact your service administrator</a> to get this limit increased.": "Gelieve <a>contact ip te neemn me je dienstbeheerder</a> vo deze limiet te verhoogn.",
-    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "Deze thuusserver è z’n limiet vo moandeliks actieve gebruukers bereikt, woadeure da <b>sommige gebruukers hunder nie goan kunn anmeldn</b>.",
-    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "Deze thuusserver èt één van z’n systeembronlimietn overschreedn, woadeure da <b>sommige gebruukers hunder nie goan kunn anmeldn</b>.",
     "Error encountered (%(errorDetail)s).": "’t Es e foute ipgetreedn (%(errorDetail)s).",
     "Checking for an update...": "Bezig me te controleern ip updates…",
     "No update available.": "Geen update beschikboar.",
@@ -877,10 +819,6 @@
     "Maximize apps": "Apps maximaliseern",
     "Popout widget": "Widget in e nieuwe veinster openn",
     "Create new room": "E nieuw gesprek anmoakn",
-    "Unblacklist": "Deblokkeern",
-    "Blacklist": "Blokkeern",
-    "Unverify": "Ountverifieern",
-    "Verify...": "Verifieern…",
     "Join": "Deelneemn",
     "No results": "Geen resultoatn",
     "Communities": "Gemeenschappn",
@@ -988,8 +926,7 @@
     "Create": "Anmoakn",
     "Create Room": "Gesprek anmoakn",
     "Sign out": "Afmeldn",
-    "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 Riot to do this": "Vo je gespreksgeschiedenisse nie kwyt te speeln, moe je je gesprekssleuters exporteern vooraleer da je jen afmeldt. Je goa moetn werekeern noa de nieuwere versie van Riot vo dit te doen",
-    "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ": "J’èt al e ki e nieuwere versie van Riot ip %(host)s gebruukt. Vo deze versie were met eind-tout-eind-versleuterienge te gebruukn, goa je je moetn afmeldn en were anmeldn. ",
+    "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": "Vo je gespreksgeschiedenisse nie kwyt te speeln, moe je je gesprekssleuters exporteern vooraleer da je jen afmeldt. Je goa moetn werekeern noa de nieuwere versie van %(brand)s vo dit te doen",
     "Incompatible Database": "Incompatibele database",
     "Continue With Encryption Disabled": "Verdergoan me versleuterienge uutgeschoakeld",
     "Unknown error": "Ounbekende foute",
@@ -999,14 +936,6 @@
     "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 zichtboarheid van berichtn in Matrix is lik by e-mails. ’t Vergeetn van je berichtn betekent da berichtn da je gy è verstuurd nie mi gedeeld goan wordn me nieuwe of oungeregistreerde gebruukers, mo geregistreerde gebruukers dat al toegank han tout deze berichtn goan nog assan toegank èn tout hunder eigen kopie dervan.",
     "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 alle berichtn dan ’kik verstuurd ghed èn wanneer da myn account gedeactiveerd gewist es (<b>Let ip:</b> dit goat der voorn zorgn da toekomstige gebruukers een ounvolledig beeld krygn van gesprekkn)",
     "To continue, please enter your password:": "Gif je paswoord in vo verder te goan:",
-    "Use Legacy Verification (for older clients)": "Verouderde verificoasje gebruukn (voor oudere cliëntn)",
-    "Verify by comparing a short text string.": "Verifieert deur e korte tekenreekse te vergelykn.",
-    "Begin Verifying": "Verificoasje beginn",
-    "Waiting for partner to accept...": "An ’t wachtn ip de partner…",
-    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Verschynt er nietent? Nog nie alle cliëntn biedn oundersteunienge voor interactieve verificoasje. <button>Gebruukt verouderde verificoasje</button>.",
-    "Waiting for %(userId)s to confirm...": "Wachtn ip bevestigienge van %(userId)s…",
-    "Use two-way text verification": "Twirichtiengstekstverificoasje gebruukn",
-    "I verify that the keys match": "’k Verifieern dan de sleuters overeenkommn",
     "Back": "Were",
     "Send Custom Event": "Angepaste gebeurtenisse verstuurn",
     "You must specify an event type!": "Je moet e gebeurtenistype ingeevn!",
@@ -1026,16 +955,12 @@
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verifieert deze gebruuker vo n’hem/heur als vertrouwd te markeern. Gebruukers vertrouwn gift je extra gemoedsrust by ’t gebruuk van eind-tout-eind-versleuterde berichtn.",
     "Waiting for partner to confirm...": "Wachtn ip bevestigienge van partner…",
     "Incoming Verification Request": "Inkomend verificoasjeverzoek",
-    "Start verification": "Verificoasje beginn",
-    "Share without verifying": "Deeln zounder verificoasje",
-    "Ignore request": "Verzoek negeern",
-    "Encryption key request": "Verzoek vo versleuteriengssleuter",
-    "You've previously used Riot 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, Riot needs to resync your account.": "J’èt al e ki Riot ip %(host)s gebruukt me lui loadn van leedn ingeschoakeld. In deze versie is lui laden uutgeschoakeld. Me da de lokoale cache nie compatibel is tusschn deze twi instelliengn, moe Riot jen account hersynchroniseern.",
-    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "Indien dat d’andere versie van Riot nog in een ander tabblad is geopend, sluut je da best, want Riot ip dezelfsten host tegelykertyd me lui loadn ingeschoakeld en uutgeschoakeld gebruukn goa vo probleemn zorgn.",
+    "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’èt al e ki %(brand)s ip %(host)s gebruukt me lui loadn van leedn ingeschoakeld. In deze versie is lui laden uutgeschoakeld. Me da de lokoale cache nie compatibel is tusschn deze twi instelliengn, moe %(brand)s jen account hersynchroniseern.",
+    "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.": "Indien dat d’andere versie van %(brand)s nog in een ander tabblad is geopend, sluut je da best, want %(brand)s ip dezelfsten host tegelykertyd me lui loadn ingeschoakeld en uutgeschoakeld gebruukn goa vo probleemn zorgn.",
     "Incompatible local cache": "Incompatibele lokoale cache",
     "Clear cache and resync": "Cache wissn en hersynchroniseern",
-    "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Riot verbruukt nu 3-5x minder geheugn, deur informoasje over andere gebruukers alleene moa te loadn wanneer dan ’t nodig is. Eftjes geduld, we zyn an ’t hersynchroniseern me de server!",
-    "Updating Riot": "Riot wor bygewerkt",
+    "%(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 verbruukt nu 3-5x minder geheugn, deur informoasje over andere gebruukers alleene moa te loadn wanneer dan ’t nodig is. Eftjes geduld, we zyn an ’t hersynchroniseern me de server!",
+    "Updating %(brand)s": "%(brand)s wor bygewerkt",
     "I don't want my encrypted messages": "’k En willn ik myn versleuterde berichtn nie",
     "Manually export keys": "Sleuters handmatig exporteern",
     "You'll lose access to your encrypted messages": "Je goat de toegank tou je versleuterde berichtn kwytspeeln",
@@ -1059,7 +984,7 @@
     "Refresh": "Herloadn",
     "Unable to restore session": "’t En is nie meuglik van de sessie t’herstelln",
     "We encountered an error trying to restore your previous session.": "’t Is e foute ipgetreedn by ’t herstelln van je vorige sessie.",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "A j’al e ki gebruuk gemakt èt van e recentere versie van Riot, is je sessie meugliks ounverenigboar me deze versie. Sluut deze veinster en goa were noa de recentere versie.",
+    "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.": "A j’al e ki gebruuk gemakt èt van e recentere versie van %(brand)s, is je sessie meugliks ounverenigboar me deze versie. Sluut deze veinster en goa were noa de recentere versie.",
     "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "’t Legen van den ipslag van je browser goa ’t probleem misschiens verhelpn, mo goa joun ook afmeldn en gans je versleuterde gespreksgeschiedenisse ounleesboar moakn.",
     "Verification Pending": "Verificoasje in afwachtienge",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Bekyk jen e-mails en klikt ip de koppelienge derin. Klikt van zodra da je da gedoan èt ip ‘Verdergoan’.",
@@ -1107,28 +1032,19 @@
     "Remember my selection for this widget": "Onthoudt myn keuze vo deze widget",
     "Deny": "Weigern",
     "Unable to load backup status": "Kostege back-upstatus nie loadn",
-    "Recovery Key Mismatch": "Herstelsleuter kom nie overeen",
-    "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "Den back-up kostege me deze sleuter nie ountsleuterd wordn: controleert of da je de juste herstelsleuter èt ingegeevn.",
-    "Incorrect Recovery Passphrase": "Verkeerd herstelpaswoord",
-    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "Den back-up kostege me dit paswoord nie ountsleuterd wordn: controleert of da je ’t juste herstelpaswoord èt ingegeevn.",
     "Unable to restore backup": "Kostege back-up nie herstelln",
     "No backup found!": "Geen back-up gevoundn!",
-    "Backup Restored": "Back-up hersteld",
     "Failed to decrypt %(failedCount)s sessions!": "Ountsleutern van %(failedCount)s sessies is mislukt!",
-    "Restored %(sessionCount)s session keys": "%(sessionCount)s sessiesleuters hersteld",
-    "Enter Recovery Passphrase": "Gif ’t herstelpaswoord in",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Let ip</b>: stelt sleuterback-up alleene moar in ip e vertrouwde computer.",
     "Access your secure message history and set up secure messaging by entering your recovery passphrase.": "Verkrygt toegank tout je beveiligde berichtgeschiedenisse en stel beveiligd chattn in door jen herstelpaswoord in te geevn.",
     "Next": "Volgende",
     "If you've forgotten your recovery passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>": "A je jen herstelpaswoord zy vergeetn, ku je <button1>jen herstelsleuter gebruukn</button1> of <button2>nieuwe herstelopties instelln</button2>",
-    "Enter Recovery Key": "Gift de herstelsleuter in",
     "This looks like a valid recovery key!": "Dit is e geldigen herstelsleuter!",
     "Not a valid recovery key": "Geen geldigen herstelsleuter",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "Verkrygt toegank tout je beveiligde berichtgeschiedenisse en stel beveiligd chattn in door jen herstelsleuter in te geevn.",
     "Private Chat": "Privégesprek",
     "Public Chat": "Openboar gesprek",
     "Custom": "Angepast",
-    "Alias (optional)": "Bynoame (optioneel)",
     "Reject invitation": "Uutnodigienge weigern",
     "Are you sure you want to reject the invitation?": "Zy je zeker da je d’uutnodigienge wil weigern?",
     "Unable to reject invite": "Kostege d’uutnodigienge nie weigern",
@@ -1145,7 +1061,6 @@
     "Quote": "Citeern",
     "Source URL": "Bron-URL",
     "Collapse Reply Thread": "Reactiekettienge toeklappn",
-    "End-to-end encryption information": "Info over eind-tout-eind-versleuterienge",
     "Failed to set Direct Message status of room": "Instelln van twigesprekstoestand van gesprek is mislukt",
     "unknown error code": "ounbekende foutcode",
     "Failed to forget room %(errCode)s": "Vergeetn van gesprek is mislukt %(errCode)s",
@@ -1167,8 +1082,6 @@
     "powered by Matrix": "meuglik gemakt deur Matrix",
     "This homeserver would like to make sure you are not a robot.": "Deze thuusserver wil geirn weetn of da je gy geen robot zyt.",
     "Custom Server Options": "Angepaste serverinstelliengn",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "Je kut de angepaste serveropties gebruukn vo jen an te meldn by andere Matrix-servers, deur een andere thuusserver-URL in te geevn. Dit biedt je de meuglikheid vo deze toepassienge te gebruukn met een bestoande Matrix-account ip een andere thuusserver.",
-    "To continue, please enter your password.": "Gif je paswoord in vo verder te goan.",
     "Please review and accept all of the homeserver's policies": "Gelieve ’t beleid van de thuusserver te leezn en ’anveirdn",
     "Please review and accept the policies of this homeserver:": "Gelieve ’t beleid van deze thuusserver te leezn en t’anveirdn:",
     "An email has been sent to %(emailAddress)s": "’t Is een e-mail noa %(emailAddress)s verstuurd gewist",
@@ -1223,8 +1136,8 @@
     "Premium hosting for organisations <a>Learn more</a>": "Premium hosting voor organisoasjes <a>Leest meer</a>",
     "Other": "Overige",
     "Find other public servers or use a custom server": "Zoekt achter andere publieke servers, of gebruukt een angepaste server",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Sorry, je browser werkt <b>nie</b> me Riot.",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot gebruukt veel geavanceerde browserfuncties, woavan enkele nie (of slechts experimenteel) in je browser beschikboar zyn.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "Sorry, je browser werkt <b>nie</b> me %(brand)s.",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s gebruukt veel geavanceerde browserfuncties, woavan enkele nie (of slechts experimenteel) in je browser beschikboar zyn.",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Installeert <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, of <safariLink>Safari</safariLink> vo de beste gebruukservoarienge.",
     "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!": "Me jen huudigen browser kut de toepassienge der geheel verkeerd uutzien. ’t Is ook meuglik da nie alle functies werkn lyk of dan ze zoudn moetn. Je kut verdergoan a je ’t algelyk wil probeern, moa by probleemn zy je gy ’t dan ’t goa moetn iplossn!",
     "I understand the risks and wish to continue": "’k Verstoan de risico’s en ’k willn geirn verdergoan",
@@ -1286,26 +1199,24 @@
     "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Vo de %(homeserverDomain)s-thuusserver te bluuvn gebruukn, goa je de gebruuksvoorwoardn moetn leezn en anveirdn.",
     "Review terms and conditions": "Gebruuksvoorwoardn leezn",
     "Old cryptography data detected": "Oude cryptografiegegeevns gedetecteerd",
-    "Data from an older version of Riot 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.": "’t Zyn gegeevns van een oudere versie van Riot gedetecteerd gewist. Dit goa probleemn veroorzakt ghed èn me de eind-tout-eind-versleuterienge in d’oude versie. Eind-tout-eind-versleuterde berichtn da recent uutgewisseld gewist zyn me d’oude versie zyn meugliks nie t’ountsleutern in deze versie. Dit zoudt der ook voorn kunnn zorgn da berichtn da uutgewisseld gewist zyn in deze versie foaln. Meldt jen heran moest je probleemn ervoarn. Exporteert de sleuters en importeer z’achteraf were vo de berichtgeschiedenisse te behoudn.",
+    "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.": "’t Zyn gegeevns van een oudere versie van %(brand)s gedetecteerd gewist. Dit goa probleemn veroorzakt ghed èn me de eind-tout-eind-versleuterienge in d’oude versie. Eind-tout-eind-versleuterde berichtn da recent uutgewisseld gewist zyn me d’oude versie zyn meugliks nie t’ountsleutern in deze versie. Dit zoudt der ook voorn kunnn zorgn da berichtn da uutgewisseld gewist zyn in deze versie foaln. Meldt jen heran moest je probleemn ervoarn. Exporteert de sleuters en importeer z’achteraf were vo de berichtgeschiedenisse te behoudn.",
     "Logout": "Afmeldn",
     "Your Communities": "Je gemeenschappn",
-    "Did you know: you can use communities to filter your Riot.im experience!": "Wist je da: je gemeenschappn kun gebruukn vo je Riot.im-belevienge te filtern!",
+    "Did you know: you can use communities to filter your %(brand)s experience!": "Wist je da: je gemeenschappn kun gebruukn vo je %(brand)s-belevienge te 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.": "Verslipt e gemeenschapsavatar noa ’t filterpaneel helegans links ip ’t scherm voor e filter in te stelln. Doarachter ku j’ip den avatar in ’t filterpaneel klikkn wanneer da je je wil beperkn tout de gesprekkn en menschn uut die gemeenschap.",
     "Error whilst fetching joined communities": "’t Is e foute ipgetreedn by ’t iphoaln van de gemeenschappn da je lid van zyt",
     "Create a new community": "Makt e nieuwe gemeenschap an",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Makt e gemeenschap an vo gebruukers en gesprekkn by makoar te briengn! Schep met e startblad ip moet jen eigen pleksje in ’t Matrix-universum.",
     "You have no visible notifications": "J’è geen zichtboare meldiengn",
-    "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot kostege de protocollyste nie iphoaln van de thuusserver. Meugliks is de thuusserver te oud vo derdepartynetwerkn t’oundersteunn.",
-    "Riot failed to get the public room list.": "Riot kostege de lyste met openboare gesprekkn nie verkrygn.",
+    "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s kostege de protocollyste nie iphoaln van de thuusserver. Meugliks is de thuusserver te oud vo derdepartynetwerkn t’oundersteunn.",
+    "%(brand)s failed to get the public room list.": "%(brand)s kostege de lyste met openboare gesprekkn nie verkrygn.",
     "The homeserver may be unavailable or overloaded.": "De thuusserver is meugliks ounbereikboar of overbelast.",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "De bynoame %(alias)s verwydern en %(name)s uut de cataloog verwydern?",
     "Remove %(name)s from the directory?": "%(name)s uut de cataloog verwydern?",
     "Remove from Directory": "Verwydern uut cataloog",
     "remove %(name)s from the directory.": "verwydert %(name)s uut de cataloog.",
-    "delete the alias.": "verwydert de bynoame.",
     "The server may be unavailable or overloaded": "De server is meuglik ounbereikboar of overbelast",
     "Unable to join network": "Kostege nie toetreedn tout dit netwerk",
-    "Riot does not know how to join a room on this network": "Riot weet nie hoe da ’t moet deelneemn an e gesprek ip dit netwerk",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s weet nie hoe da ’t moet deelneemn an e gesprek ip dit netwerk",
     "Room not found": "Gesprek nie gevoundn",
     "Couldn't find a matching Matrix room": "Kostege geen byhoornd Matrix-gesprek viendn",
     "Fetching third party location failed": "’t Iphoaln van de locoasje van de derde party is mislukt",
@@ -1327,7 +1238,6 @@
     "Search failed": "Zoekn mislukt",
     "Server may be unavailable, overloaded, or search timed out :(": "De server is misschiens ounbereikboar of overbelast, of ’t zoekn deurdege te lank :(",
     "No more results": "Geen resultoatn nie mi",
-    "Unknown room %(roomId)s": "Ounbekend gesprek %(roomId)s",
     "Room": "Gesprek",
     "Failed to reject invite": "Weigern van d’uutnodigienge is mislukt",
     "You have %(count)s unread notifications in a prior version of this room.|other": "J’èt %(count)s oungeleezn meldiengn in e voorgoande versie van dit gesprek.",
@@ -1394,22 +1304,8 @@
     "Notify the whole room": "Loat dit an gans ’t groepsgesprek weetn",
     "Room Notification": "Groepsgespreksmeldienge",
     "Users": "Gebruukers",
-    "unknown device": "ounbekend toestel",
-    "NOT verified": "NIE geverifieerd",
-    "Blacklisted": "Geblokkeerd",
-    "verified": "geverifieerd",
     "Name": "Noame",
-    "Verification": "Verificoasje",
-    "Ed25519 fingerprint": "Ed25519-viengerafdruk",
-    "User ID": "Gebruukers-ID",
-    "Curve25519 identity key": "Curve25519-identiteitssleuter",
-    "none": "geen",
-    "Claimed Ed25519 fingerprint key": "Geclaimde Ed25519-viengerafdrukssleuter",
-    "Algorithm": "Algoritme",
-    "unencrypted": "ounversleuterd",
-    "Decryption error": "Ountsleuteriengsfoute",
     "Session ID": "Sessie-ID",
-    "Event information": "Gebeurtenisinformoasje",
     "Passphrases must match": "Paswoordn moetn overeenkommn",
     "Passphrase must not be empty": "Paswoord meug nie leeg zyn",
     "Export room keys": "Gesprekssleuters exporteern",
@@ -1423,34 +1319,18 @@
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "’t Geëxporteerd bestand is beveiligd met e paswoord. Gift da paswoord hier in vo ’t bestand t’ountsleutern.",
     "File to import": "T’importeern bestand",
     "Import": "Importeern",
-    "Great! This passphrase looks strong enough.": "Top! Dit paswoord ziet der sterk genoeg uut.",
-    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "We bewoarn e versleuterde kopie van je sleuters ip uzze server. Bescherm je back-up met e paswoord vo n’hem veilig t’houdn.",
     "For maximum security, this should be different from your account password.": "Vo maximoale veiligheid zoudt dit moetn verschilln van jen accountpaswoord.",
-    "Enter a passphrase...": "Gift e paswoord in…",
-    "Set up with a Recovery Key": "Instelln met een herstelsleuter",
     "That matches!": "Da komt overeen!",
     "That doesn't match.": "Da kom nie overeen.",
     "Go back to set it again.": "Goa were vo ’t herin te stelln.",
-    "Please enter your passphrase a second time to confirm.": "Gif je paswoord nog e keer in vo te bevestign.",
-    "Repeat your passphrase...": "Herhoal je paswoord…",
-    "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "Als veiligheidsnet ku je dit gebruukn vo je versleuterde berichtgeschiedenisse t’herstelln indien da je jen herstelpaswoord zou vergeetn.",
-    "As a safety net, you can use it to restore your encrypted message history.": "Als veiligheidsnet ku je ’t gebruukn vo je versleuterde berichtgeschiedenisse t’herstelln.",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Jen herstelsleuter is e veiligheidsnet - je kut hem gebruukn vo de toegank tou je versleuterde berichtn t’herstelln indien da je je paswoord zou vergeetn.",
-    "Your Recovery Key": "Jen herstelsleuter",
-    "Copy to clipboard": "Kopieern noa ’t klembord",
     "Download": "Downloadn",
     "<b>Print it</b> and store it somewhere safe": "<b>Print hem af</b> en bewoart hem ip e veilige plekke",
     "<b>Save it</b> on a USB key or backup drive": "<b>Sloat hem ip</b> ip een USB-stick of e back-upschyf",
     "<b>Copy it</b> to your personal cloud storage": "<b>Kopieert hem</b> noa je persoonlike cloudipslag",
     "Your keys are being backed up (the first backup could take a few minutes).": "’t Wordt e back-up van je sleuters gemakt (den eesten back-up kut e poar minuutn deurn).",
     "Set up Secure Message Recovery": "Veilig berichtherstel instelln",
-    "Secure your backup with a passphrase": "Beveilig je back-up met e paswoord",
-    "Confirm your passphrase": "Bevestig je paswoord",
-    "Recovery key": "Herstelsleuter",
-    "Keep it safe": "Bewoart hem ip e veilige plekke",
     "Starting backup...": "Back-up wor gestart…",
     "Success!": "Gereed!",
-    "Create Key Backup": "Sleuterback-up anmoakn",
     "Unable to create key backup": "Kostege de sleuterback-up nie anmoakn",
     "Retry": "Herprobeern",
     "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "Zounder veilig berichtherstel in te stelln, goa je je versleuterde berichtgeschiedenisse kwytspeeln wanneer da je jen afmeldt.",
@@ -1467,7 +1347,6 @@
     "Failed to set direct chat tag": "Instelln van twigesprekslabel is mislukt",
     "Failed to remove tag %(tagName)s from room": "Verwydern van %(tagName)s-label van gesprek is mislukt",
     "Failed to add tag %(tagName)s to room": "Toevoegn van %(tagName)s-label an gesprek is mislukt",
-    "Show recently visited rooms above the room list": "Recent bezochte gesprekken bovenoan de gesprekslyste weregeevn",
     "Uploaded sound": "Ipgeloadn-geluud",
     "Sounds": "Geluudn",
     "Notification sound": "Meldiengsgeluud",
@@ -1476,8 +1355,8 @@
     "Browse": "Bloadern",
     "Cannot reach homeserver": "Kostege de thuusserver nie bereikn",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "Zorgt da j’e stabiele internetverbiendienge èt, of neem contact op met de systeembeheerder",
-    "Your Riot is misconfigured": "Je Riot is verkeerd geconfigureerd gewist",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "Vroagt an je Riot-beheerder van <a>je configuroasje</a> noa te kykn ip verkeerde of duplicoate items.",
+    "Your %(brand)s is misconfigured": "Je %(brand)s is verkeerd geconfigureerd gewist",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "Vroagt an je %(brand)s-beheerder van <a>je configuroasje</a> noa te kykn ip verkeerde of duplicoate items.",
     "Unexpected error resolving identity server configuration": "Ounverwachte foute by ’t iplossn van d’identiteitsserverconfiguroasje",
     "Use lowercase letters, numbers, dashes and underscores only": "Gebruukt alleene moa letters, cyfers, streeptjes en underscores",
     "Cannot reach identity server": "Kostege den identiteitsserver nie bereikn",
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 58e4130d99..da53880409 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -3,12 +3,9 @@
     "Cryptography": "加密",
     "Current password": "当前密码",
     "/ddg is not a command": "/ddg 不是一个命令",
-    "Deactivate Account": "销毁账号",
+    "Deactivate Account": "停用账号",
     "Decrypt %(text)s": "解密 %(text)s",
-    "Decryption error": "解密出错",
     "Default": "默认",
-    "Device ID": "设备 ID",
-    "Direct chats": "私聊",
     "Disinvite": "取消邀请",
     "Displays action": "显示操作",
     "Download %(text)s": "下载 %(text)s",
@@ -16,10 +13,8 @@
     "Email address": "邮箱地址",
     "Emoji": "表情",
     "%(senderName)s ended the call.": "%(senderName)s 结束了通话。",
-    "End-to-end encryption information": "端到端加密信息",
     "Error": "错误",
     "Error decrypting attachment": "解密附件时出错",
-    "Event information": "事件信息",
     "Existing Call": "当前通话",
     "Export E2E room keys": "导出聊天室的端到端加密密钥",
     "Failed to ban user": "封禁失败",
@@ -35,9 +30,8 @@
     "Failed to send email": "发送邮件失败",
     "Failed to send request.": "请求发送失败。",
     "Failed to set display name": "设置昵称失败",
-    "Failed to toggle moderator status": "无法切换管理员权限",
     "Failed to unban": "解除封禁失败",
-    "Failed to verify email address: make sure you clicked the link in the email": "邮箱验证失败： 请确保你已点击邮件中的链接",
+    "Failed to verify email address: make sure you clicked the link in the email": "邮箱验证失败：请确保你已点击邮件中的链接",
     "Failure to create room": "创建聊天室失败",
     "Favourite": "收藏",
     "Favourites": "收藏夹",
@@ -57,13 +51,12 @@
     "Invalid Email Address": "邮箱地址格式错误",
     "Invalid file%(extra)s": "非法文件%(extra)s",
     "Return to login screen": "返回登录页面",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot 没有通知发送权限 - 请检查您的浏览器设置",
-    "Riot was not given permission to send notifications - please try again": "Riot 没有通知发送权限 - 请重试",
-    "riot-web version:": "riot-web 版本：",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s 没有通知发送权限 - 请检查您的浏览器设置",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s 没有通知发送权限 - 请重试",
+    "%(brand)s version:": "%(brand)s 版本：",
     "Room %(roomId)s not visible": "聊天室 %(roomId)s 已隐藏",
     "Room Colour": "聊天室颜色",
     "Rooms": "聊天室",
-    "Scroll to bottom of page": "滚动到页面底部",
     "Search": "搜索",
     "Search failed": "搜索失败",
     "Searches DuckDuckGo for results": "搜索 DuckDuckGo",
@@ -84,14 +77,12 @@
     "Sign out": "注销",
     "%(count)s of your messages have not been sent.|other": "部分消息未发送。",
     "Someone": "某位用户",
-    "Start a chat": "创建聊天",
     "Submit": "提交",
     "Success": "成功",
     "This email address is already in use": "此邮箱地址已被使用",
     "This email address was not found": "未找到此邮箱地址",
     "The email address linked to your account must be entered.": "必须输入和你账号关联的邮箱地址。",
     "Advanced": "高级",
-    "Algorithm": "算法",
     "Always show message timestamps": "总是显示消息时间戳",
     "A new password must be entered.": "必须输入新密码。",
     "%(senderName)s answered the call.": "%(senderName)s 接了通话。",
@@ -104,7 +95,6 @@
     "Click here to fix": "点击这里以修复",
     "Confirm password": "确认密码",
     "Continue": "继续",
-    "Ed25519 fingerprint": "Ed25519指纹",
     "Join Room": "加入聊天室",
     "%(targetName)s joined the room.": "%(targetName)s 已加入聊天室。",
     "Jump to first unread message.": "跳到第一条未读消息。",
@@ -116,12 +106,11 @@
     "No Microphones detected": "未检测到麦克风",
     "No Webcams detected": "未检测到摄像头",
     "No media permissions": "没有媒体存取权限",
-    "You may need to manually permit Riot to access your microphone/webcam": "你可能需要手动授权 Riot 使用你的麦克风或摄像头",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "你可能需要手动授权 %(brand)s 使用你的麦克风或摄像头",
     "Default Device": "默认设备",
     "Microphone": "麦克风",
     "Camera": "摄像头",
     "Authentication": "认证",
-    "Alias (optional)": "别名（可选）",
     "%(items)s and %(lastItem)s": "%(items)s 和 %(lastItem)s",
     "and %(count)s others...|other": "和其它 %(count)s 个...",
     "and %(count)s others...|one": "和其它一个...",
@@ -132,7 +121,6 @@
     "Are you sure you want to leave the room '%(roomName)s'?": "你确定要退出聊天室 “%(roomName)s” 吗？",
     "Are you sure you want to reject the invitation?": "你确定要拒绝邀请吗？",
     "Bans user with given id": "按照 ID 封禁指定的用户",
-    "Blacklisted": "已拉黑",
     "Call Timeout": "通话超时",
     "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 的 URL 时，不能使用 HTTP 连接主服务器。请使用 HTTPS 或者<a>允许不安全的脚本</a>。",
@@ -153,10 +141,7 @@
     "Custom": "自定义",
     "Custom level": "自定义级别",
     "Decline": "拒绝",
-    "device id: ": "设备 ID: ",
-    "Disable Notifications": "关闭消息通知",
     "Drop File Here": "把文件拖拽到这里",
-    "Enable Notifications": "启用消息通知",
     "Enter passphrase": "输入密码",
     "Error: Problem communicating with the given homeserver.": "错误: 与指定的主服务器通信时出错。",
     "Export": "导出",
@@ -177,14 +162,12 @@
     "Missing user_id in request": "请求中没有 user_id",
     "Moderator": "协管员",
     "Mute": "静音",
-    "Name": "姓名",
+    "Name": "名称",
     "New passwords don't match": "两次输入的新密码不符",
-    "none": "无",
     "not specified": "未指定",
     "Notifications": "通知",
     "(not supported by this browser)": "（未被此浏览器支持）",
     "<not supported>": "<不支持>",
-    "NOT verified": "未验证",
     "No display name": "无昵称",
     "No results": "没有更多结果",
     "OK": "确定",
@@ -192,7 +175,7 @@
     "Password": "密码",
     "Passwords can't be empty": "密码不能为空",
     "Permissions": "权限",
-    "Phone": "手机号码",
+    "Phone": "电话号码",
     "Cancel": "取消",
     "Create new room": "创建新聊天室",
     "Custom Server Options": "自定义服务器选项",
@@ -205,11 +188,7 @@
     "Account": "账户",
     "Add": "添加",
     "Allow": "允许",
-    "Claimed Ed25519 fingerprint key": "声称的 Ed25519 指纹密钥",
-    "Could not connect to the integration server": "无法连接关联的服务器",
-    "Curve25519 identity key": "Curve25519 认证密钥",
     "Edit": "编辑",
-    "Joins room with given alias": "通过指定的别名加入聊天室",
     "Labs": "实验室",
     "%(targetName)s left the room.": "%(targetName)s 退出了聊天室。",
     "Logout": "登出",
@@ -224,8 +203,6 @@
     "%(targetName)s rejected the invitation.": "%(targetName)s 拒绝了邀请。",
     "Reject invitation": "拒绝邀请",
     "Users": "用户",
-    "Verification": "验证",
-    "verified": "已验证",
     "Verified key": "已验证的密钥",
     "Video call": "视频通话",
     "Voice call": "语音通话",
@@ -235,7 +212,6 @@
     "Warning!": "警告！",
     "You must <a>register</a> to use this functionality": "你必须 <a>注册</a> 以使用此功能",
     "You need to be logged in.": "你需要登录。",
-    "Make Moderator": "使成为主持人",
     "Room": "聊天室",
     "Connectivity to the server has been lost.": "到服务器的连接已经丢失。",
     "New Password": "新密码",
@@ -249,11 +225,7 @@
     "Failed to invite": "邀请失败",
     "Unknown error": "未知错误",
     "Incorrect password": "密码错误",
-    "To continue, please enter your password.": "请输入你的密码继续。",
-    "I verify that the keys match": "我验证此密钥匹配",
     "Unable to restore session": "无法恢复会话",
-    "Blacklist": "列入黑名单",
-    "Unverify": "取消验证",
     "ex. @bob:example.com": "例如 @bob:example.com",
     "Add User": "添加用户",
     "Token incorrect": "令牌错误",
@@ -265,8 +237,6 @@
     "Username available": "用户名可用",
     "Username not available": "用户名不可用",
     "Skip": "跳过",
-    "Start verification": "开始验证",
-    "Ignore request": "忽略请求",
     "Example": "例子",
     "Create": "创建",
     "Failed to upload image": "上传图像失败",
@@ -281,27 +251,21 @@
     "Kick": "移除",
     "Kicks user with given id": "按照 ID 移除特定的用户",
     "Last seen": "最近一次上线",
-    "Local addresses for this room:": "此聊天室的本地地址：",
     "New passwords must match each other.": "新密码必须互相匹配。",
     "Power level must be positive integer.": "滥权等级必须是正整数。",
-    "Revoke Moderator": "撤销主持人",
-    "Remote addresses for this room:": "此聊天室的远程地址：",
     "Results from DuckDuckGo": "来自 DuckDuckGo 的结果",
     "%(roomName)s does not exist.": "%(roomName)s 不存在。",
     "Save": "保存",
-    "Send anyway": "仍然发送",
     "This room has no local addresses": "此聊天室没有本地地址",
     "This doesn't appear to be a valid email address": "这似乎不是有效的邮箱地址",
-    "This phone number is already in use": "此手机号码已被使用",
+    "This phone number is already in use": "此电话号码已被使用",
     "This room": "此聊天室",
     "This room is not accessible by remote Matrix servers": "此聊天室无法被远程 Matrix 服务器访问",
     "Unable to create widget.": "无法创建小挂件。",
     "Unban": "解除封禁",
     "Unable to capture screen": "无法录制屏幕",
     "Unable to enable Notifications": "无法启用通知",
-    "unencrypted": "未加密的",
     "unknown caller": "未知呼叫者",
-    "unknown device": "未知设备",
     "Unnamed Room": "未命名的聊天室",
     "Upload avatar": "上传头像",
     "Upload Failed": "上传失败",
@@ -310,14 +274,13 @@
     "Who can read history?": "谁可以阅读历史消息？",
     "You are not in this room.": "您不在此聊天室中。",
     "You have no visible notifications": "没有可见的通知",
-    "Unblacklist": "移出黑名单",
-    "Not a valid Riot keyfile": "不是有效的 Riot 密钥文件",
+    "Not a valid %(brand)s keyfile": "不是有效的 %(brand)s 密钥文件",
     "%(targetName)s accepted an invitation.": "%(targetName)s 已接受邀请。",
     "Publish this room to the public in %(domain)s's room directory?": "是否将此聊天室发布至 %(domain)s 的聊天室目录中？",
     "Manage Integrations": "管理集成",
     "No users have specific privileges in this room": "此聊天室中没有用户有特殊权限",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "请检查你的电子邮箱并点击里面包含的链接。完成时请点击继续。",
-    "%(senderName)s removed their profile picture.": "%(senderName)s 移除了他们的头像。",
+    "%(senderName)s removed their profile picture.": "%(senderName)s 移除了头像。",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s 已请求发起 VoIP 会议。",
     "Seen by %(userName)s at %(dateTime)s": "在 %(dateTime)s 被 %(userName)s 看到",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s 接受了 %(displayName)s 的邀请。",
@@ -332,20 +295,18 @@
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s 设定历史浏览功能为 未知的 (%(visibility)s).",
     "AM": "上午",
     "PM": "下午",
-    "Profile": "个人配置",
+    "Profile": "个人资料",
     "Public Chat": "公开的",
     "%(roomName)s is not accessible at this time.": "%(roomName)s 此时无法访问。",
     "Start authentication": "开始认证",
     "The maximum permitted number of widgets have already been added to this room.": "此聊天室可拥有的小挂件数量已达到上限。",
-    "The phone number entered looks invalid": "此手机号码似乎无效",
+    "The phone number entered looks invalid": "此电话号码似乎无效",
     "The remote side failed to pick up": "对方未能接听",
     "This room is not recognised.": "无法识别此聊天室。",
     "To get started, please pick a username!": "请点击用户名！",
     "Unable to add email address": "无法添加邮箱地址",
     "Automatically replace plain text Emoji": "将符号表情转换为 Emoji",
     "Unable to verify email address.": "无法验证邮箱地址。",
-    "Unknown room %(roomId)s": "未知聊天室 %(roomId)s",
-    "Unrecognised room alias:": "无法识别的聊天室别名：",
     "(no answer)": "（无回复）",
     "Who can access this room?": "谁有权访问此聊天室？",
     "You are already in a call.": "您正在通话。",
@@ -358,7 +319,6 @@
     "An error occurred: %(error_string)s": "发生了一个错误： %(error_string)s",
     "There are no visible files in this room": "此聊天室中没有可见的文件",
     "Active call": "当前通话",
-    "Verify...": "验证...",
     "Error decrypting audio": "解密音频时出错",
     "Error decrypting image": "解密图像时出错",
     "Error decrypting video": "解密视频时出错",
@@ -368,18 +328,16 @@
     "Something went wrong!": "出了点问题！",
     "If you already have a Matrix account you can <a>log in</a> instead.": "若您已经拥有 Matrix 帐号，您也可以 <a>登录</a>。",
     "Do you want to set an email address?": "您想要设置一个邮箱地址吗？",
-    "New address (e.g. #foo:%(localDomain)s)": "新的地址（例如 #foo:%(localDomain)s）",
     "Upload new:": "上传新的：",
-    "User ID": "用户 ID",
     "Username invalid: %(errMessage)s": "用户名无效： %(errMessage)s",
     "Verification Pending": "验证等待中",
     "(unknown failure: %(reason)s)": "（未知错误：%(reason)s）",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s 收回了 %(targetName)s 的邀请。",
-    "You cannot place a call with yourself.": "你怎么寂寞到要和自己打电话，不支持的啦。",
+    "You cannot place a call with yourself.": "您无法向自己发起通话。",
     "You have <a>disabled</a> URL previews by default.": "你已经默认 <a>禁用</a> 链接预览。",
     "You have <a>enabled</a> URL previews by default.": "你已经默认 <a>启用</a> 链接预览。",
     "Set a display name:": "设置昵称：",
-    "This server does not support authentication with a phone number.": "此服务器不支持使用手机号码认证。",
+    "This server does not support authentication with a phone number.": "此服务器不支持使用电话号码认证。",
     "Copied!": "已复制！",
     "Failed to copy": "复制失败",
     "Sent messages will be stored until your connection has returned.": "已发送的消息会被保存直到你的连接回来。",
@@ -414,33 +372,23 @@
     "Unknown Address": "未知地址",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s 删除了他们的昵称 (%(oldDisplayName)s).",
     "Unable to remove contact information": "无法移除联系人信息",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot 收集匿名的分析数据以允许我们改善它。",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s 收集匿名的分析数据以允许我们改善它。",
     "Please check your email to continue registration.": "请查看你的电子邮件以继续注册。",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "如果不指定一个邮箱地址，您将无法重置你的密码。你确定吗？",
     "Add an Integration": "添加集成",
-    "Removed or unknown message type": "被移除或未知的消息类型",
     "Ongoing conference call%(supportedText)s.": "正在进行的会议通话 %(supportedText)s.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s 修改了 %(roomName)s 的头像",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "这将会成为你在 <span></span> 主服务器上的账户名，或者你可以选择一个 <a>不同的服务器</a>。",
-    "Your browser does not support the required cryptography extensions": "你的浏览器不支持 Riot 所需的密码学特性",
     "Authentication check failed: incorrect password?": "身份验证失败：密码错误？",
     "This will allow you to reset your password and receive notifications.": "这将允许你重置你的密码和接收通知。",
-    "Share without verifying": "不验证就分享",
-    "Encryption key request": "加密密钥请求",
     "%(widgetName)s widget added by %(senderName)s": "%(senderName)s 添加了 %(widgetName)s 小挂件",
     "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s 移除了 %(widgetName)s 小挂件",
     "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s 修改了 %(widgetName)s 小挂件",
     "Unpin Message": "取消置顶消息",
     "Add rooms to this community": "添加聊天室到此社区",
     "Call Failed": "呼叫失败",
-    "Review Devices": "复查设备",
-    "Call Anyway": "仍然呼叫",
-    "Answer Anyway": "仍然接听",
-    "Call": "呼叫",
-    "Answer": "接听",
     "Invite new community members": "邀请新社区成员",
     "Invite to Community": "邀请到社区",
-    "Room name or alias": "聊天室名称或别名",
     "Ignored user": "已忽略的用户",
     "You are now ignoring %(userId)s": "你正在忽视 %(userId)s",
     "Unignored user": "未忽略的用户",
@@ -450,7 +398,6 @@
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s 更改了聊天室的置顶消息。",
     "Send": "发送",
     "Message Pinning": "消息置顶",
-    "Use compact timeline layout": "使用紧凑的时间线布局",
     "Enable URL previews for this room (only affects you)": "在此聊天室中启用链接预览（仅影响你）",
     "Enable URL previews by default for participants in this room": "对此聊天室的所有成员默认启用链接预览",
     "%(senderName)s sent an image": "%(senderName)s 发送了一张图片",
@@ -461,7 +408,6 @@
     "Jump to read receipt": "跳到阅读回执",
     "Mention": "提及",
     "Invite": "邀请",
-    "User Options": "用户选项",
     "Jump to message": "跳到消息",
     "No pinned messages.": "没有置顶消息。",
     "Loading...": "正在加载...",
@@ -471,7 +417,6 @@
     "World readable": "公开可读",
     "Guests can join": "访客可以加入",
     "No rooms to show": "无聊天室",
-    "Message removed": "消息已移除",
     "An email has been sent to %(emailAddress)s": "一封邮件已发送到 %(emailAddress)s",
     "A text message has been sent to %(msisdn)s": "一封短信已发送到 %(msisdn)s",
     "Visible to everyone": "对所有人可见",
@@ -509,17 +454,13 @@
     "Leave": "退出",
     "Description": "描述",
     "Warning": "警告",
-    "Light theme": "浅色主题",
-    "Dark theme": "深色主题",
     "Room Notification": "聊天室通知",
     "The platform you're on": "您使用的平台是",
-    "The version of Riot.im": "Riot.im 的版本是",
+    "The version of %(brand)s": "%(brand)s 版本",
     "Your language of choice": "您选择的语言是",
-    "Which officially provided instance you are using, if any": "您正在使用的任何官方 Riot 实现（如果有的话）",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "您是否正在使用富文本编辑器的富文本模式",
     "Your homeserver's URL": "您的主服务器的链接",
-    "Your identity server's URL": "您的身份认证服务器的链接",
-    "The information being sent to us to help make Riot.im better includes:": "将要为帮助 Riot.im 发展而发送的信息包含：",
+    "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.": "此页面中含有可用于识别您身份的信息，比如聊天室、用户或群组 ID，这些数据会在发送到服务器前被移除。",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(monthName)s %(day)s %(time)s, %(weekDayName)s",
@@ -537,9 +478,7 @@
     "Unban this user?": "是否解封此用户？",
     "Ban this user?": "是否封禁此用户？",
     "Send an encrypted reply…": "发送加密回复…",
-    "Send a reply (unencrypted)…": "发送回复（未加密）…",
     "Send an encrypted message…": "发送加密消息…",
-    "Send a message (unencrypted)…": "发送消息 （未加密）…",
     "Replying": "正在回复",
     "Community Invites": "社区邀请",
     "Banned by %(displayName)s": "被 %(displayName)s 封禁",
@@ -572,7 +511,7 @@
     "To use it, just wait for autocomplete results to load and tab through them.": "若要使用自动补全，只要等待自动补全结果加载完成，按 Tab 键切换即可。",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s 将他们的昵称修改成了 %(displayName)s 。",
     "Stickerpack": "贴图集",
-    "You don't currently have any stickerpacks enabled": "您目前没有启用任何贴纸包",
+    "You don't currently have any stickerpacks enabled": "您目前没有启用任何贴图集",
     "Key request sent.": "已发送密钥共享请求。",
     "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 promoting the user to have the same power level as yourself.": "您将无法撤回此修改，因为您正在将此用户的滥权等级提升至与你相同。",
@@ -591,7 +530,6 @@
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s (%(userName)s) 在 %(dateTime)s 看到这里",
     "'%(groupId)s' is not a valid community ID": "“%(groupId)s” 不是有效的社区 ID",
     "Flair": "个性徽章",
-    "Message removed by %(userId)s": "此消息已被 %(userId)s 移除",
     "Code": "代码",
     "Remove from community": "从社区中移除",
     "Disinvite this user from community?": "是否不再邀请此用户加入本社区？",
@@ -636,7 +574,7 @@
     "Community IDs cannot be empty.": "社区 ID 不能为空。",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "社区 ID 只能包含 a-z、0-9 或 “=_-./” 等字符",
     "Something went wrong whilst creating your community": "创建社区时出现问题",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "如果您之前使用过较新版本的 Riot，则您的会话可能与当前版本不兼容。请关闭此窗口并使用最新版本。",
+    "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，则您的会话可能与当前版本不兼容。请关闭此窗口并使用最新版本。",
     "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）",
@@ -669,8 +607,8 @@
     "Leave this community": "退出此社区",
     "Long Description (HTML)": "长描述（HTML）",
     "Old cryptography data detected": "检测到旧的加密数据",
-    "Data from an older version of Riot 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.": "已检测到旧版Riot的数据，这将导致端到端加密在旧版本中发生故障。在此版本中，使用旧版本交换的端对端加密消息可能无法解密。这也可能导致与此版本交换的消息失败。如果您遇到问题，请退出并重新登录。要保留历史消息，请先导出并在重新登录后导入您的密钥。",
-    "Did you know: you can use communities to filter your Riot.im experience!": "你知道吗：你可以将社区用作过滤器以增强你的 Riot.im 使用体验！",
+    "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的数据，这将导致端到端加密在旧版本中发生故障。在此版本中，使用旧版本交换的端对端加密消息可能无法解密。这也可能导致与此版本交换的消息失败。如果您遇到问题，请退出并重新登录。要保留历史消息，请先导出并在重新登录后导入您的密钥。",
+    "Did you know: you can use communities to filter your %(brand)s experience!": "你知道吗：你可以将社区用作过滤器以增强你的 %(brand)s 使用体验！",
     "Create a new community": "创建新社区",
     "Error whilst fetching joined communities": "获取已加入社区列表时出现错误",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "创建社区，将用户与聊天室整合在一起！搭建自定义社区主页以在 Matrix 宇宙之中标出您的私人空间。",
@@ -698,7 +636,6 @@
     "Something went wrong when trying to get your communities.": "获取你加入的社区时发生错误。",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "删除小挂件时将为聊天室中的所有成员删除。您确定要删除此小挂件吗？",
     "Fetching third party location failed": "获取第三方位置失败",
-    "A new version of Riot is available.": "Riot 有更新可用。",
     "Send Account Data": "发送账户数据",
     "All notifications are currently disabled for all targets.": "目前所有通知都已禁用。",
     "Uploading report": "上传报告",
@@ -715,8 +652,6 @@
     "Send Custom Event": "发送自定义事件",
     "Advanced notification settings": "通知高级设置",
     "Failed to send logs: ": "无法发送日志： ",
-    "delete the alias.": "删除别名。",
-    "To return to your account in future you need to <u>set a password</u>": "要在未来回到您的账号，您需要 <u>设置密码</u>",
     "Forget": "忘记",
     "You cannot delete this image. (%(code)s)": "无法删除此图片。(%(code)s)",
     "Cancel Sending": "取消发送",
@@ -724,7 +659,7 @@
     "Noisy": "响铃",
     "Error saving email notification preferences": "保存电子邮件通知选项时出错",
     "Messages containing my display name": "消息中含有我的显示名称",
-    "Messages in one-to-one chats": "一对一聊天种的消息",
+    "Messages in one-to-one chats": "一对一聊天中的消息",
     "Unavailable": "无法获得",
     "View Decrypted Source": "查看解密的来源",
     "Failed to update keywords": "无法更新关键词",
@@ -742,7 +677,6 @@
     "Resend": "重新发送",
     "Files": "文件",
     "Collecting app version information": "正在收集应用版本信息",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "确定要删除聊天室别名 %(alias)s 并将 %(name)s 从列表中删除吗？",
     "Keywords": "关键词",
     "Enable notifications for this account": "对此账号启用通知",
     "Invite to this community": "邀请加入此社区",
@@ -753,7 +687,7 @@
     "Forward Message": "转发消息",
     "You have successfully set a password and an email address!": "您已经成功设置了密码和邮箱地址！",
     "Remove %(name)s from the directory?": "是否从目录中移除 %(name)s？",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot 使用了许多先进的浏览器功能，有些在你目前所用的浏览器上无法使用或仅为实验性的功能。",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s 使用了许多先进的浏览器功能，有些在你目前所用的浏览器上无法使用或仅为实验性的功能。",
     "Developer Tools": "开发者工具",
     "Preparing to send logs": "准备发送日志",
     "Remember, you can always set an email address in user settings if you change your mind.": "请记住，如果您改变想法，您永远可以在用户设置中设置电子邮件。",
@@ -782,7 +716,7 @@
     "Downloading update...": "正在下载更新…",
     "State Key": "状态密钥",
     "Failed to send custom event.": "自定义事件发送失败。",
-    "What's new?": "更新了什么？",
+    "What's new?": "更新内容",
     "Notify me for anything else": "通知所有消息",
     "When I'm invited to a room": "当我被邀请进入聊天室",
     "Can't update user notification settings": "不能更新用户通知设置",
@@ -799,8 +733,7 @@
     "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.": "调试日志包含使用数据（包括您的用户名，您访问过的聊天室 / 小组的 ID 或别名以及其他用户的用户名）。它们不包含聊天信息。",
     "Unhide Preview": "取消隐藏预览",
     "Unable to join network": "无法加入网络",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "您也许不曾在其他 Riot 之外的客户端设置它们。在 Riot 下你无法调整他们但仍然可用",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "抱歉，您的浏览器 <b>无法</b> 运行 Riot.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "抱歉，您的浏览器 <b>无法</b> 运行 %(brand)s.",
     "Uploaded on %(date)s by %(user)s": "由 %(user)s 在 %(date)s 上传",
     "Messages in group chats": "群组聊天中的消息",
     "Yesterday": "昨天",
@@ -809,7 +742,7 @@
     "Unable to fetch notification target list": "无法获取通知目标列表",
     "Set Password": "设置密码",
     "Off": "关闭",
-    "Riot does not know how to join a room on this network": "Riot 不知道如何在此网络中加入聊天室",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s 不知道如何在此网络中加入聊天室",
     "Mentions only": "只限提及",
     "You can now return to your account after signing out, and sign in on other devices.": "您可以在注销后回到您的账号，并在其他设备上登录。",
     "Enable email notifications": "启用电子邮件通知",
@@ -824,13 +757,10 @@
     "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...": "正在检查更新…",
-    "There are advanced notifications which are not shown here": "更多的通知并没有在此显示出来",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "这里没有其他人了！你是想 <inviteText>邀请用户</inviteText> 还是 <nowarnText>不再提示</nowarnText>？",
     "You need to be able to invite users to do that.": "你需要有邀请用户的权限才能进行此操作。",
     "Missing roomId.": "找不到此聊天室 ID 所对应的聊天室。",
-    "Every page you use in the app": "您在 Riot 中使用的所有页面",
     "e.g. <CurrentPageURL>": "例如：<CurrentPageURL>",
-    "Your User Agent": "您的 User Agent",
     "Your device resolution": "您设备的分辨率",
     "Always show encryption icons": "总是显示加密标志",
     "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 提供的集成。您希望继续吗？",
@@ -847,7 +777,7 @@
     "Enable widget screenshots on supported widgets": "对支持的小挂件启用小挂件截图",
     "Demote yourself?": "是否降低您自己的权限？",
     "Demote": "降权",
-    "A call is currently being placed!": "已发起一次通话！",
+    "A call is currently being placed!": "正在发起通话！",
     "Permission Required": "需要权限",
     "You do not have permission to start a conference call in this room": "您没有在此聊天室发起通话会议的权限",
     "This event could not be displayed": "无法显示此事件",
@@ -858,12 +788,9 @@
     "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.": "在启用加密的聊天室中，比如此聊天室，链接预览被默认禁用以确保主服务器（访问链接、生成预览的地方）无法获知聊天室中的链接及其信息。",
     "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.": "当有人发送一条带有链接的消息后，可显示链接的预览，链接预览可包含此链接的网页标题、描述以及图片。",
     "The email 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.": "必须输入密码。",
     "Display your community flair in rooms configured to show it.": "在启用“显示徽章”的聊天室中显示本社区的个性徽章。",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "请发送 <UsageDataLink>匿名使用数据</UsageDataLink> 以帮助我们改进 Riot.im。这将用到 Cookie（请看看我们的 <PolicyLink>Cookie 隐私政策</PolicyLink>）。",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "请发送 <UsageDataLink>匿名使用数据</UsageDataLink> 以帮助我们改进 Riot.im。这将用到 Cookie。",
-    "Yes, I want to help!": "好啊，我要帮助你们！",
     "Failed to remove widget": "移除小挂件失败",
     "An error ocurred whilst trying to remove the widget from the room": "尝试从聊天室中移除小部件时发生了错误",
     "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.": "您确定要移除（删除）此事件吗？注意，如果删除了聊天室名称或话题的变化，就会撤销此更改。",
@@ -907,11 +834,9 @@
     "No Audio Outputs detected": "未检测到可用的音频输出方式",
     "Audio Output": "音频输出",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "已向 %(emailAddress)s 发送了一封电子邮件。点开邮件中的链接后，请点击下面。",
-    "Registration Required": "需要注册",
-    "You need to register to do this. Would you like to register now?": "您必须注册以继续。您想现在就注册吗？",
     "Forces the current outbound group session in an encrypted room to be discarded": "强制丢弃加密聊天室中的当前出站群组会话",
     "Unable to connect to Homeserver. Retrying...": "无法连接至主服务器。正在重试…",
-    "Sorry, your homeserver is too old to participate in this room.": "对不起，您的主服务器的程序版本过旧以至于无法加入此聊天室。",
+    "Sorry, your homeserver is too old to participate in this room.": "抱歉，因您的主服务器的程序版本过旧，无法加入此聊天室。",
     "Mirror local video feed": "镜像翻转本地视频源",
     "This room has been replaced and is no longer active.": "此聊天室已被取代，且不再活跃。",
     "The conversation continues here.": "对话在这里继续。",
@@ -929,19 +854,11 @@
     "Legal": "法律信息",
     "This homeserver has hit its Monthly Active User limit.": "此主服务器已达到其每月活跃用户限制。",
     "This homeserver has exceeded one of its resource limits.": "本服务器已达到其使用量限制之一。",
-    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "本服务器已达到其每月活跃用户限制，<b>部分用户将无法登录</b>。",
-    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "本主服务器已达到其使用量限制之一，<b>部分用户将无法登录</b>。",
     "Please <a>contact your service administrator</a> to continue using this service.": "请 <a>联系您的服务管理员</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.": "您的消息未被发送，因为本主服务器已达到其使用量限制之一。请 <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> 以继续使用本服务。",
     "Please <a>contact your service administrator</a> to continue using the service.": "请 <a>联系您的服务管理员</a> 以继续使用本服务。",
-    "Please contact your homeserver administrator.": "请 联系您主服务器的管理员。",
-    "Please <a>contact your service administrator</a> to get this limit increased.": "请 <a>联系您的服务管理员</a> 以增加此限制的额度。",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s 添加了聊天室地址 %(addedAddresses)s。",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s 添加了一个聊天室地址 %(addedAddresses)s。",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s 移除了聊天室地址 %(removedAddresses)s。",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s 移除了一个聊天室地址 %(removedAddresses)s。",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s 添加了聊天室地址 %(addedAddresses)s 并移除了地址 %(removedAddresses)s。",
+    "Please contact your homeserver administrator.": "请 联系您的主服务器管理员。",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s 将此聊天室的主地址设为了 %(address)s。",
     "%(senderName)s removed the main address for this room.": "%(senderName)s 移除了此聊天室的主地址。",
     "Unable to load! Check your network connectivity and try again.": "无法加载！请检查您的网络连接并重试。",
@@ -962,13 +879,11 @@
     "Incompatible Database": "数据库不兼容",
     "Continue With Encryption Disabled": "在停用加密的情况下继续",
     "Checking...": "正在检查…",
-    "Updating Riot": "正在更新 Riot",
-    "Backup Restored": "备份已还原",
+    "Updating %(brand)s": "正在更新 %(brand)s",
     "No backup found!": "找不到备份！",
     "Unable to restore backup": "无法还原备份",
     "Unable to load backup status": "无法获取备份状态",
     "Next": "下一个",
-    "Copy to clipboard": "复制到剪贴板",
     "Download": "下载",
     "Retry": "重试",
     "Go to Settings": "打开设置",
@@ -1040,7 +955,6 @@
     "Enable Community Filter Panel": "启用社区筛选器面板",
     "Allow Peer-to-Peer for 1:1 calls": "允许一对一通话使用 P2P",
     "Prompt before sending invites to potentially invalid matrix IDs": "在发送邀请之前提示可能无效的 Matrix ID",
-    "Order rooms in the room list by most important first instead of most recent": "聊天室列表按重要程度排序而不按时间排序",
     "Messages containing my username": "包含我的用户名的消息",
     "Encrypted messages in one-to-one chats": "一对一聊天中的加密消息",
     "Encrypted messages in group chats": "群聊中的加密消息",
@@ -1116,7 +1030,7 @@
     "Folder": "文件夹",
     "Pin": "别针",
     "Yes": "是",
-    "No": "否",
+    "No": "拒绝",
     "We've sent you an email to verify your address. Please follow the instructions there and then click the button below.": "我们已向您发送了一封电子邮件，以验证您的地址。 请按照里面的说明操作，然后单击下面的按钮。",
     "Email Address": "电子邮箱地址",
     "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "您确定吗？如果密钥没有正确地备份您将失去您的加密消息。",
@@ -1131,7 +1045,7 @@
     "Unable to verify phone number.": "无法验证电话号码。",
     "Verification code": "验证码",
     "Phone Number": "电话号码",
-    "Profile picture": "个人资料头像",
+    "Profile picture": "头像",
     "Display Name": "昵称",
     "Set a new account password...": "设置一个新的账号密码...",
     "Email addresses": "电子邮箱地址",
@@ -1142,9 +1056,9 @@
     "Deactivating your account is a permanent action - be careful!": "停用您的账号是一项永久性操作 - 请小心！",
     "General": "通用",
     "Credits": "感谢",
-    "For help with using Riot, click <a>here</a>.": "对使用 Riot 的说明，请点击 <a>这里</a>。",
-    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "对使用 Riot 的说明，请点击 <a>这里</a> 或者使用下面的按钮开始与我们的机器人聊聊。",
-    "Chat with Riot Bot": "与 Riot 机器人聊天",
+    "For help with using %(brand)s, click <a>here</a>.": "对使用 %(brand)s 的说明，请点击 <a>这里</a>。",
+    "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> 或者使用下面的按钮开始与我们的机器人聊聊。",
+    "Chat with %(brand)s Bot": "与 %(brand)s 机器人聊天",
     "Help & About": "帮助及关于",
     "Bug reporting": "错误上报",
     "FAQ": "常见问题",
@@ -1168,7 +1082,6 @@
     "Developer options": "开发者选项",
     "Room Addresses": "聊天室地址",
     "Roles & Permissions": "角色与权限",
-    "To link to this room, please add an alias.": "要连接到此聊天室，请添加一个别名。",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "历史记录阅读权限的变更只会应用到此聊天室中将来的消息。既有历史记录的可见性将不会变更。",
     "Encryption": "加密",
     "Once enabled, encryption cannot be disabled.": "一旦启用加密就无法停止。",
@@ -1181,10 +1094,6 @@
     "Add some now": "立即添加",
     "Error updating main address": "更新主地址时发生错误",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "更新聊天室的主地址时发生错误。可能是该服务器不允许，也可能是出现了一个临时错误。",
-    "Error creating alias": "创建别名时发生错误",
-    "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "创建该别名时发生错误。可能是该服务器不允许，也可能是出现了一个临时错误。",
-    "Error removing alias": "移除别名时发生错误",
-    "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "移除该别名时发生错误。可能别名已不存在，也可能是出现了一个临时错误。",
     "Main address": "主地址",
     "Error updating flair": "更新个性徽章时发生错误",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "更新此聊天室的个性徽章时发生错误。可能时该服务器不允许，也可能是发生了一个临时错误。",
@@ -1194,26 +1103,17 @@
     "Join": "加入",
     "That doesn't look like a valid email address": "看起来不像是个有效的电子邮箱地址",
     "The following users may not exist": "以下用户可能不存在",
-    "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "无法找到以下列表中 Matrix ID 的用户资料 - 您还是要邀请他们吗？",
+    "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "无法找到以下列表中 Matrix ID 的用户资料 - 您还是要邀请吗？",
     "Invite anyway and never warn me again": "还是邀请，不用再提醒我",
     "Invite anyway": "还是邀请",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "在提交日志之前，您必须 <a>创建一个GitHub issue</a> 来描述您的问题。",
     "Unable to load commit detail: %(msg)s": "无法加载提交详情：%(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 Riot to do this": "为避免丢失聊天记录，您必须在登出前导出房间密钥。 您需要回到较新版本的 Riot 才能执行此操作",
-    "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ": "您之前在 %(host)s 使用过更新版本的 Riot 。为了使用带有端对端加密功能的此版本，您必须退出账号再重新登入。 ",
-    "Use Legacy Verification (for older clients)": "使用旧版验证 （针对旧版客户端）",
-    "Verify by comparing a short text string.": "通过比较一段短文本字符串进行验证。",
-    "Begin Verifying": "开始验证",
-    "Waiting for partner to accept...": "等待对方接受...",
-    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "没有任何显示？不是所有客户端都支持互动验证。<button>使用旧版验证</button>。",
-    "Waiting for %(userId)s to confirm...": "等待 %(userId)s 确认中...",
-    "Use two-way text verification": "使用双向文本验证",
+    "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 才能执行此操作",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "验证此用户并标记为受信任。在使用端到端加密消息时，信任用户可让您更加放心。",
     "Waiting for partner to confirm...": "等待对方确认中...",
     "Incoming Verification Request": "收到验证请求",
-    "You've previously used Riot 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, Riot needs to resync your account.": "您之前在 %(host)s 上开启了 Riot 的成员列表延迟加载设置。目前版本中延迟加载功能已被停用。因为本地缓存在这两个设置项上不相容，Riot 需要重新同步您的账号。",
-    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "如果有其他版本的 Riot 仍然在另一个标签页中运行，请将其关闭，因为在同一主机上同时启用和禁用延迟加载将会发生问题。",
-    "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "通过仅在需要时加载其他用户的信息，Riot 现在使用的内存减少到了原来的三分之一至五分之一。 请等待与服务器重新同步！",
+    "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.": "您之前在 %(host)s 上开启了 %(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 现在使用的内存减少到了原来的三分之一至五分之一。 请等待与服务器重新同步！",
     "I don't want my encrypted messages": "我不想要我的加密消息",
     "Manually export keys": "手动导出密钥",
     "You'll lose access to your encrypted messages": "您将失去您的加密消息的访问权",
@@ -1224,17 +1124,10 @@
     "Go back": "返回",
     "Room Settings - %(roomName)s": "聊天室设置 - %(roomName)s",
     "A username can only contain lower case letters, numbers and '=_-./'": "用户名只能包含小写字母、数字和 '=_-./'",
-    "Recovery Key Mismatch": "恢复密钥不匹配",
-    "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "备份无法使用此密钥解密：请检查您输入的恢复密钥是否正确。",
-    "Incorrect Recovery Passphrase": "错误的恢复密码",
-    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "备份无法使用此密码解密：请检查您输入的恢复密码是否正确。",
     "Failed to decrypt %(failedCount)s sessions!": "%(failedCount)s 会话解密失败",
-    "Restored %(sessionCount)s session keys": "%(sessionCount)s 会话密钥已还原",
-    "Enter Recovery Passphrase": "输入恢复密码",
     "<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>",
-    "Enter Recovery Key": "输入恢复密钥",
     "This looks like a valid recovery key!": "看起来是有效的恢复密钥！",
     "Not a valid recovery key": "不是有效的恢复密钥",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "通过输入恢复密钥来访问您的安全消息历史记录和设置安全通信。",
@@ -1245,7 +1138,6 @@
     "Set a new status...": "设置新状态...",
     "Hide": "隐藏",
     "This homeserver would like to make sure you are not a robot.": "此主服务器想要确认您不是机器人。",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "您可以通过在自定义服务器选项中指定不同的主服务器网址来登入其他 Matrix 服务器。这让您可以通过不同的主服务器上已有的 Matrix 账号来使用此应用程序。",
     "Please review and accept all of the homeserver's policies": "请阅读并接受该主服务器的所有政策",
     "Please review and accept the policies of this homeserver:": "请阅读并接受此主服务器的政策：",
     "Your Modular server": "您的模组服务器",
@@ -1289,33 +1181,18 @@
     "Registration has been disabled on this homeserver.": "此主服务器已禁止注册。",
     "Unable to query for supported registration methods.": "无法查询支持的注册方法。",
     "Create your account": "创建您的账号",
-    "Great! This passphrase looks strong enough.": "太棒了！这个密码看起来强度足够。",
     "Keep going...": "请继续...",
-    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "我们会在服务器上保存您的密钥的加密副本。请用密码来保护您的备份的安全。",
     "For maximum security, this should be different from your account password.": "为确保最大的安全性，它应该与您的账号密码不同。",
-    "Enter a passphrase...": "输入密码...",
-    "Set up with a Recovery Key": "设置恢复密钥",
     "That matches!": "匹配成功！",
     "That doesn't match.": "不匹配。",
     "Go back to set it again.": "返回重新设置。",
-    "Please enter your passphrase a second time to confirm.": "请再输入一次密码以确认。",
-    "Repeat your passphrase...": "重复您的密码...",
-    "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "作为一张安全网，您可以在忘记了恢复密码的时候使用它来还原您的加密消息历史记录。",
-    "As a safety net, you can use it to restore your encrypted message history.": "作为一张安全网，您可以使用它来还原您的加密消息历史记录。",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "恢复密钥是您的一张安全网 - 如果忘记了密码，您可以用它来重获加密消息的访问权。",
-    "Your Recovery Key": "您的恢复密钥",
     "<b>Print it</b> and store it somewhere safe": "<b>打印</b> 并存放在安全的地方",
     "<b>Save it</b> on a USB key or backup drive": "<b>保存</b> 在 U 盘或备份磁盘中",
     "<b>Copy it</b> to your personal cloud storage": "<b>复制</b> 到您的个人云端存储",
     "Your keys are being backed up (the first backup could take a few minutes).": "正在备份您的密钥（第一次备份可能会花费几分钟时间）。",
     "Set up Secure Message Recovery": "设置安全消息恢复",
-    "Secure your backup with a passphrase": "使用密码保护您的备份",
-    "Confirm your passphrase": "确认你的密码",
-    "Recovery key": "恢复密钥",
-    "Keep it safe": "确保其安全",
     "Starting backup...": "开始备份...",
     "Success!": "成功！",
-    "Create Key Backup": "创建密钥备份",
     "Unable to create key backup": "无法创建密钥备份",
     "Without setting up Secure Message Recovery, you'll lose your secure message history when you log out.": "如果您登出账号而没有设置安全消息恢复，您将失去您的安全消息历史记录。",
     "If you don't want to set this up now, you can later in Settings.": "如果您现在不想设置，您可以稍后在设置中操作。",
@@ -1354,8 +1231,8 @@
     "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> 我们将会在旧版聊天室中发布一个新版聊天室的链接 - 聊天室成员必须点击该链接以加入新聊天室。",
     "Adds a custom widget by URL to the room": "用链接方式为聊天室添加自定义小部件",
-    "Please supply a https:// or http:// widget URL": "请提供一个 https:// 或 http:// 形式的小部件链接",
-    "You cannot modify widgets in this room.": "您无法修改此聊天室的小部件。",
+    "Please supply a https:// or http:// widget URL": "请提供一个 https:// 或 http:// 形式的插件",
+    "You cannot modify widgets in this room.": "您无法修改此聊天室的插件。",
     "%(senderName)s revoked the invitation for %(targetDisplayName)s to join the room.": "%(senderName)s 撤销了对 %(targetDisplayName)s 加入聊天室的邀请。",
     "Upgrade this room to the recommended room version": "升级此聊天室至推荐版本",
     "This room is running room version <roomVersion />, which this homeserver has marked as <i>unstable</i>.": "此聊天室运行的聊天室版本是 <roomVersion /> ，该版本已被主服务器标记为 <i>不稳定</i> 。",
@@ -1369,8 +1246,8 @@
     "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 的小部件想要验证您的身份。在您允许后，小部件就可以验证您的用户 ID，但不能代您执行操作。",
     "Remember my selection for this widget": "记住我对此小部件的选择",
     "Deny": "拒绝",
-    "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot 无法从主服务器处获取协议列表。该主服务器上的软件可能过旧，不支持第三方网络。",
-    "Riot failed to get the public room list.": "Riot 无法获取公开聊天室列表。",
+    "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s 无法从主服务器处获取协议列表。该主服务器上的软件可能过旧，不支持第三方网络。",
+    "%(brand)s failed to get the public room list.": "%(brand)s 无法获取公开聊天室列表。",
     "The homeserver may be unavailable or overloaded.": "主服务器似乎不可用或过载。",
     "You have %(count)s unread notifications in a prior version of this room.|other": "您在此聊天室的先前版本中有 %(count)s 条未读通知。",
     "You have %(count)s unread notifications in a prior version of this room.|one": "您在此聊天室的先前版本中有 %(count)s 条未读通知。",
@@ -1381,5 +1258,1058 @@
     "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",
-    "Your Riot is misconfigured": "您的 Riot 配置有错误"
+    "Your %(brand)s is misconfigured": "您的 %(brand)s 配置有错误",
+    "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.": "点击下面的按钮，添加此邮箱地址。",
+    "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.": "点击下面的按钮，确认添加此电话号码。",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "是否在触屏设备上使用 %(brand)s",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "您是否已经安装 %(brand)s 作为一种渐进式的 Web 应用",
+    "Your user agent": "您的代理用户",
+    "Replying With Files": "回复文件",
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "当前无法在回复中附加文件。您想要仅上传此文件而不回复吗？",
+    "The file '%(fileName)s' failed to upload.": "上传文件 ‘%(fileName)s’ 失败。",
+    "The server does not support the room version specified.": "服务器不支持指定的聊天室版本。",
+    "If you cancel now, you won't complete verifying the other user.": "如果现在取消，您将无法完成验证其他用户。",
+    "If you cancel now, you won't complete verifying your other session.": "如果现在取消，您将无法完成验证您的其他会话。",
+    "If you cancel now, you won't complete your operation.": "如果现在取消，您将无法完成您的操作。",
+    "Cancel entering passphrase?": "取消输入密码？",
+    "Setting up keys": "设置按键",
+    "Verify this session": "验证此会话",
+    "Encryption upgrade available": "提供加密升级",
+    "Set up encryption": "设置加密",
+    "Review where you’re logged in": "查看您的登陆位置",
+    "New login. Was this you?": "现在登陆。请问是您本人吗？",
+    "Name or Matrix ID": "姓名或Matrix账号",
+    "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.": "只有您信任服务器所有者才能继续。",
+    "Trust": "信任",
+    "%(name)s is requesting verification": "%(name)s请求验证",
+    "Sign In or Create Account": "登录或创建账户",
+    "Use your account or create a new one to continue.": "使用已有账户或创建一个新账户。",
+    "Create Account": "创建账户",
+    "Sign In": "登录",
+    "Custom (%(level)s)": "访客(%(level)s)",
+    "Messages": "信息",
+    "Actions": "动作",
+    "Sends a message as plain text, without interpreting it as markdown": "以纯文本形式发送消息，而不是markdown",
+    "Sends a message as html, without interpreting it as markdown": "以html格式发送消息，而不是markdown",
+    "You do not have the required permissions to use this command.": "您没有权限使用此命令。",
+    "Error upgrading room": "升级聊天室出错",
+    "Double check that your server supports the room version chosen and try again.": "再次检查您的服务器是否支持所选聊天室版本，然后重试。",
+    "Changes the avatar of the current room": "更改当前聊天室头像",
+    "Changes your avatar in this current room only": "仅改变您在当前聊天室的头像",
+    "Changes your avatar in all rooms": "改变您在所有聊天室的头像",
+    "Failed to set topic": "设置话题失败",
+    "Use an identity server": "使用身份服务器",
+    "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 to invite by email. Manage in Settings.": "使用身份服务器以电子邮件邀请。在设置中进行管理。",
+    "Unbans user with given ID": "禁止给定ID的用户",
+    "Command failed": "命令失败",
+    "Could not find user in room": "聊天室中无用户",
+    "Please supply a widget URL or embed code": "请提供一个插件或嵌入代码",
+    "Verifies a user, session, and pubkey tuple": "验证用户、会话和公钥元组",
+    "Unknown (user, session) pair:": "未知（用户、会话）对：",
+    "Session already verified!": "会话已验证！",
+    "WARNING: Session already verified, but keys do NOT MATCH!": "警告：会话已验证，但密钥不匹配！",
+    "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 不符。这可能表示您的通讯已被截获！",
+    "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 获取的一致。该会话被标为已验证。",
+    "Sends the given message coloured as a rainbow": "以彩虹色发送给定消息",
+    "Sends the given emote coloured as a rainbow": "以彩虹色发送给定表情符号",
+    "Displays list of commands with usages and descriptions": "显示指令清单与其描述和用法",
+    "Displays information about a user": "显示关于用户的信息",
+    "Send a bug report with logs": "发送带日志的错误报告",
+    "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。",
+    "%(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 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 发起了视频通话。",
+    "%(senderName)s placed a video call. (not supported by this browser)": "%(senderName)s 发起了视频通话。（此浏览器不支持）",
+    "%(senderName)s removed the rule banning users 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 removed the rule banning rooms 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 更新了由于%(reason)s 而禁止用户匹配%(glob)s的规则",
+    "%(senderName)s updated the rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s 更新了由于%(reason)s而禁止聊天室匹配%(glob)s的规则",
+    "%(senderName)s updated the rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s 更新了由于%(reason)s而禁止服务器匹配%(glob)s的规则",
+    "%(senderName)s updated a ban rule matching %(glob)s for %(reason)s": "%(senderName)s 更新了由于%(reason)s而禁止匹配%(glob)s的规则",
+    "%(senderName)s created a rule banning users matching %(glob)s for %(reason)s": "%(senderName)s 创建了因为%(reason)s而禁止用户匹配%(glob)s的规则",
+    "%(senderName)s created a rule banning rooms matching %(glob)s for %(reason)s": "%(senderName)s 创建了由于%(reason)s而禁止聊天室匹配%(glob)s的规则",
+    "%(senderName)s created a rule banning servers matching %(glob)s for %(reason)s": "%(senderName)s 创建了由于%(reason)s而禁止服务器匹配%(glob)s的规则",
+    "%(senderName)s created a ban rule matching %(glob)s for %(reason)s": "%(senderName)s 创建了由于%(reason)s而禁止匹配%(glob)s的股则",
+    "%(senderName)s changed a rule that was banning users matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s 更改了一个由于%(reason)s而禁止用户%(oldGlob)s跟%(newGlob)s匹配的规则",
+    "%(senderName)s changed a rule that was banning rooms matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s更改了一个由于%(reason)s而禁止聊天室%(oldGlob)s跟%(newGlob)s匹配的规则",
+    "%(senderName)s changed a rule that was banning servers matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s 更新了一个由于%(reason)s而禁止服务器%(oldGlob)s跟%(newGlob)s匹配的规则",
+    "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s 更新了一个由于%(reason)s而禁止%(oldGlob)s跟%(newGlob)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": "手动验证文字",
+    "Interactively verify by Emoji": "通过表情符号进行交互式验证",
+    "Done": "完成",
+    "Cannot reach homeserver": "不可连接到主服务器",
+    "Ensure you have a stable internet connection, or get in touch with the server admin": "确保您的网络连接稳定，或与服务器管理员联系",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "跟您的%(brand)s管理员确认<a>您的配置</a>不正确或重复的条目。",
+    "Cannot reach identity server": "不可连接到身份服务器",
+    "Room name or address": "房间名称或地址",
+    "Joins room with given address": "使用给定地址加入房间",
+    "Verify this login": "验证此登录名",
+    "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "通过从其他会话之一验证此登录名并授予其访问加密信息的权限来确认您的身份。",
+    "Which officially provided instance you are using, if any": "如果您在使用官方实例，是哪一个",
+    "Every page you use in the app": "您在应用中使用的每个页面",
+    "Are you sure you want to cancel entering passphrase?": "确定要取消输入密码？",
+    "Go Back": "后退",
+    "Use your account to sign in to the latest version": "使用您的帐户登录到最新版本",
+    "We’re excited to announce Riot is now Element": "我们很高兴地宣布Riot现在更名为Element",
+    "Learn More": "了解更多",
+    "Unrecognised room address:": "无法识别的聊天室地址：",
+    "Light": "浅色",
+    "Dark": "深色",
+    "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.": "您可以重置密码，但部分功能在身份服务器重新上线之前不可用。如果持续看到此警告，请检查配置或联系服务器管理员。",
+    "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.": "您可以登录，但部分功能在身份服务器重新上线之前不可用。如果持续看到此警告，请检查配置或联系服务器管理员。",
+    "No homeserver URL provided": "未输入主服务器链接",
+    "Unexpected error resolving homeserver configuration": "解析主服务器配置时发生未知错误",
+    "Unexpected error resolving identity server configuration": "解析身份服务器配置时发生未知错误",
+    "The message you are trying to send is too large.": "您正发送的信息过大。",
+    "a few seconds ago": "数秒前",
+    "about a minute ago": "约一分钟前",
+    "%(num)s minutes ago": "%(num)s分钟前",
+    "about an hour ago": "约一小时前",
+    "%(num)s hours ago": "%(num)s小时前",
+    "about a day ago": "约一天前",
+    "%(num)s days ago": "%(num)s天前",
+    "a few seconds from now": "从现在开始数秒",
+    "about a minute from now": "从现在开始约一分钟",
+    "%(num)s minutes from now": "从现在开始%(num)s分钟",
+    "about an hour from now": "从现在开始约一小时",
+    "%(num)s hours from now": "从现在开始%(num)s小时",
+    "about a day from now": "从现在开始约一天",
+    "%(num)s days from now": "从现在开始%(num)s天",
+    "%(name)s (%(userId)s)": "%(name)s%(userId)s",
+    "Your browser does not support the required cryptography extensions": "您的浏览器不支持必需的加密插件",
+    "The user's homeserver does not support the version of the room.": "用户的主服务器不支持该聊天室版本。",
+    "Help us improve %(brand)s": "请协助我们改进%(brand)s",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "发送<UsageDataLink>匿名使用情况数据</UsageDataLink>，以协助我们改进%(brand)s。这将使用<PolicyLink>cookie</PolicyLink>。",
+    "I want to help": "我乐意协助",
+    "Verify all your sessions to ensure your account & messages are safe": "验证您的所有会话，以确保帐户和消息安全",
+    "Review": "开始验证",
+    "Later": "稍后再说",
+    "Your homeserver has exceeded its user limit.": "您的主服务器已超过用户限制。",
+    "Your homeserver has exceeded one of its resource limits.": "您的主服务器已超过某项资源限制。",
+    "Contact your <a>server admin</a>.": "请联系您的<a>服务器管理员</a>。",
+    "Ok": "确定",
+    "Set password": "设置密码",
+    "To return to your account in future you need to set a password": "要在之后取回您的帐户，您需要设置密码",
+    "Upgrade": "升级加密",
+    "Verify": "验证",
+    "Verify yourself & others to keep your chats safe": "验证您自己和他人身份，以确保您的聊天安全",
+    "Other users may not trust it": "其他用户可能不信任它",
+    "Verify the new login accessing your account: %(name)s": "验证正访问您帐户的新登录：%(name)s",
+    "Restart": "重启应用",
+    "Upgrade your %(brand)s": "升级您的%(brand)s",
+    "A new version of %(brand)s is available!": "发现%(brand)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离开了通话",
+    "Call ended": "通话结束",
+    "You started a call": "您开始了通话",
+    "%(senderName)s started a call": "%(senderName)s开始了通话",
+    "Waiting for answer": "等待接听",
+    "%(senderName)s is calling": "%(senderName)s正在通话",
+    "You created the room": "您创建了聊天室",
+    "%(senderName)s created the room": "%(senderName)s创建了聊天室",
+    "You made the chat encrypted": "您启用了聊天加密",
+    "%(senderName)s made the chat encrypted": "%(senderName)s启用了聊天加密",
+    "You made history visible to new members": "您设置了历史记录对新成员可见",
+    "%(senderName)s made history visible to new members": "%(senderName)s设置了历史记录对新成员可见",
+    "You made history visible to anyone": "您设置了历史记录对所有人可见",
+    "Riot is now Element!": "Riot现在是Element了！",
+    "Support adding custom themes": "支持添加自定义主题",
+    "Font size": "字体大小",
+    "Use custom size": "使用自定义大小",
+    "Match system theme": "匹配系统主题",
+    "Use a system font": "使用系统字体",
+    "System font name": "系统字体名称",
+    "Never send encrypted messages to unverified sessions from this session": "永不从本会话向未验证的会话发送加密信息",
+    "Never send encrypted messages to unverified sessions in this room from this session": "永不从本会话在本房间中向未验证的会话发送加密信息",
+    "Order rooms by name": "按名称排列房间",
+    "Show rooms with unread notifications first": "优先显示有未读通知的房间",
+    "Show previews/thumbnails for images": "显示图片的预览图",
+    "Enable message search in encrypted rooms": "在加密房间中启用消息搜索",
+    "Enable experimental, compact IRC style layout": "启用实验性的、紧凑的IRC式布局",
+    "Verify this session by completing one of the following:": "完成以下之一以验证这一会话：",
+    "or": "或者",
+    "Start": "开始",
+    "Confirm the emoji below are displayed on both sessions, in the same order:": "确认两个会话上都以同样顺序显示了下面的emoji：",
+    "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": "修改通知设置",
+    "Manually verify all remote sessions": "手动验证所有远程会话",
+    "My Ban List": "我的封禁列表",
+    "This is your list of users/servers you have blocked - don't leave the room!": "这是您屏蔽的用户和服务器的列表——请不要离开此聊天室！",
+    "Unknown caller": "未知来电人",
+    "Incoming voice call": "语音来电",
+    "Incoming video call": "视频来电",
+    "Incoming call": "来电",
+    "Waiting for your other session, %(deviceName)s (%(deviceId)s), to verify…": "等待您的另一个会话 %(deviceName)s (%(deviceId)s) 进行验证…",
+    "Waiting for your other session to verify…": "等待您的另一个会话进行验证…",
+    "Waiting for %(displayName)s to verify…": "等待 %(displayName)s 进行验证…",
+    "Cancelling…": "正在取消…",
+    "They match": "它们匹配",
+    "They don't match": "它们不匹配",
+    "To be secure, do this in person or use a trusted way to communicate.": "为了安全，请当面完成或使用信任的方法交流。",
+    "Lock": "锁",
+    "Your server isn't responding to some <a>requests</a>.": "您的服务器没有响应一些<a>请求</a>。",
+    "From %(deviceName)s (%(deviceId)s)": "来自 %(deviceName)s (%(deviceId)s)",
+    "Decline (%(counter)s)": "拒绝 (%(counter)s)",
+    "Accept <policyLink /> to continue:": "接受 <policyLink /> 以继续：",
+    "Upload": "上传",
+    "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.": "修改密码会重置所有会话上的端对端加密的密钥，使加密聊天记录不可读，除非您先导出您的聊天室密钥，之后再重新导入。在未来会有所改进。",
+    "Your homeserver does not support cross-signing.": "您的主服务器不支持交叉签名。",
+    "Cross-signing and secret storage are enabled.": "交叉签名和秘密存储已启用。",
+    "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "您的账户在秘密存储中有交叉签名身份，但并没有被此会话信任。",
+    "Cross-signing and secret storage are not yet set up.": "交叉签名和秘密存储尚未设置。",
+    "Reset cross-signing and secret storage": "重置交叉签名和秘密存储",
+    "Bootstrap cross-signing and secret storage": "自举交叉签名和秘密存储",
+    "unexpected type": "未预期的类型",
+    "Cross-signing public keys:": "交叉签名公钥：",
+    "in memory": "在内存中",
+    "not found": "未找到",
+    "Cross-signing private keys:": "交叉签名私钥：",
+    "in secret storage": "在秘密存储中",
+    "cached locally": "本地缓存",
+    "not found locally": "本地未找到",
+    "Session backup key:": "会话备份密钥：",
+    "Secret storage public key:": "秘密存储公钥：",
+    "in account data": "在账户数据中",
+    "exists": "存在",
+    "Your homeserver does not support session management.": "您的主服务器不支持会话管理。",
+    "Unable to load session list": "无法加载会话列表",
+    "Confirm deleting these sessions": "确认删除这些会话",
+    "Click the button below to confirm deleting these sessions.|other": "点击下方按钮以确认删除这些会话。",
+    "Click the button below to confirm deleting these sessions.|one": "点击下方按钮以确认删除此会话。",
+    "Delete sessions|other": "删除会话",
+    "Delete sessions|one": "删除会话",
+    "Delete %(count)s sessions|other": "删除 %(count)s 个会话",
+    "Delete %(count)s sessions|one": "删除 %(count)s 个会话",
+    "ID": "账号",
+    "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "逐一验证用户的每一个会话以将其标记为受信任的，而不信任交叉签名的设备。",
+    "Manage": "管理",
+    "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 缺少安全地在本地缓存加密信息所必须的部件。如果您想实验此功能，请构建一个自定义的<nativeLink>带有搜索部件的</nativeLink> %(brand)s 桌面版。",
+    "%(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 桌面版</desktopLink>以使加密信息出现在搜索结果中。",
+    "This session is backing up your keys. ": "此会话正在备份您的密钥。 ",
+    "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "在登出前连接此会话到密钥备份以避免丢失可能仅在此会话上的密钥。",
+    "Connect this session to Key Backup": "将此会话连接到密钥备份",
+    "Backup has a <validity>valid</validity> signature from this user": "备份有来自此用户的<validity>有效</validity>签名",
+    "Backup has a <validity>invalid</validity> signature from this user": "备份有来自此用户的<validity>无效</validity>签名",
+    "Backup has a signature from <verify>unknown</verify> user with ID %(deviceId)s": "备份有来自 ID 为 %(deviceId)s 的<verify>未知</verify>用户的签名",
+    "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 is not signed by any of your sessions": "备份没有被您的任何一个会话签名",
+    "This backup is trusted because it has been restored on this session": "此备份是受信任的因为它被恢复到了此会话上",
+    "Backup key stored: ": "存储的备份密钥： ",
+    "Your keys are <b>not being backed up from this session</b>.": "您的密钥<b>没有被此会话备份</b>。",
+    "Clear notifications": "清除通知",
+    "There are advanced notifications which are not shown here.": "有高级通知没有显示在此处。",
+    "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 里无法修改它们，但它们仍然适用。",
+    "Enable desktop notifications for this session": "为此会话启用桌面通知",
+    "Enable audible notifications for this session": "为此会话启用声音通知",
+    "Identity Server URL must be HTTPS": "身份服务器连接必须是 HTTPS",
+    "Not a valid Identity Server (status code %(code)s)": "不是有效的身份服务器（状态码 %(code)s）",
+    "Could not connect to Identity Server": "无法连接到身份服务器",
+    "Checking server": "检查服务器",
+    "Change identity server": "更改身份服务器",
+    "Disconnect from the identity server <current /> and connect to <new /> instead?": "从 <current /> 身份服务器断开连接并连接到 <new /> 吗？",
+    "Terms of service not accepted or the identity server is invalid.": "服务协议未同意或身份服务器无效。",
+    "The identity server you have chosen does not have any terms of service.": "您选择的身份服务器没有服务协议。",
+    "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:": "您应该：",
+    "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>。",
+    "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": "未存储",
+    "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> 以发现您认识的现存联系人并被其发现。您可以在下方更改您的身份服务器。",
+    "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "如果您不想使用 <server /> 以发现您认识的现存联系人并被其发现，请在下方输入另一个身份服务器。",
+    "Identity Server": "身份服务器",
+    "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "您现在没有使用身份服务器。若想发现您认识的现存联系人并被其发现，请在下方添加一个身份服务器。",
+    "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.": "从您的身份服务器断开连接意味着您将不可被别的用户发现，同时您也将不能用邮箱或电话邀请别人。",
+    "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.": "使用身份服务器是可选的。如果您选择不使用身份服务器，您将不能被别的用户发现，也不能用邮箱或电话邀请别人。",
+    "Do not use an identity server": "不使用身份服务器",
+    "Enter a new identity server": "输入一个新的身份服务器",
+    "New version available. <a>Update now.</a>": "新版本可用。<a>现在更新。</a>",
+    "Hey you. You're the best!": "嘿呀。您就是最棒的！",
+    "Size must be a number": "大小必须是数字",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "自定义字体大小只能介于 %(min)s pt 和 %(max)s pt 之间",
+    "Error downloading theme information.": "下载主题信息时发生错误。",
+    "Theme added!": "主题已添加！",
+    "Custom theme URL": "自定义主题链接",
+    "Add theme": "添加主题",
+    "Message layout": "信息布局",
+    "Compact": "紧凑",
+    "Modern": "现代",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "设置一个安装在您的系统上的字体名称，%(brand)s 会尝试使用它。",
+    "Customise your appearance": "自定义您的外观",
+    "Appearance Settings only affect this %(brand)s session.": "外观设置仅会影响此 %(brand)s 会话。",
+    "Your password was successfully changed. You will not receive push notifications on other sessions until you log back in to them": "您的密码已成功更改。在您重新登录别的会话之前，您将不会在那里收到推送通知",
+    "Agree to the identity server (%(serverName)s) Terms of Service to allow yourself to be discoverable by email address or phone number.": "同意身份服务器（%(serverName)s）的服务协议以允许自己被通过邮件地址或电话号码发现。",
+    "Discovery": "发现",
+    "Clear cache and reload": "清除缓存重新加载",
+    "Keyboard Shortcuts": "键盘快捷键",
+    "Customise your experience with experimental labs features. <a>Learn more</a>.": "通过实验功能自定义您的体验。<a>了解更多</a>。",
+    "Ignored/Blocked": "已忽略/已屏蔽",
+    "Error adding ignored user/server": "添加已忽略的用户/服务器时出现错误",
+    "Error subscribing to list": "订阅列表时出现错误",
+    "Please verify the room ID or address and try again.": "请验证聊天室 ID 或地址并重试。",
+    "Error removing ignored user/server": "移除已忽略用户/服务器时出现错误",
+    "Error unsubscribing from list": "取消订阅列表时出现错误",
+    "None": "无",
+    "Ban list rules - %(roomName)s": "封禁列表规则 - %(roomName)s",
+    "Server rules": "服务器规则",
+    "User rules": "用户规则",
+    "You have not ignored anyone.": "您没有忽略任何人。",
+    "You are currently ignoring:": "您正在忽略：",
+    "You are not subscribed to any lists": "您没有订阅任何列表",
+    "Unsubscribe": "取消订阅",
+    "View rules": "查看规则",
+    "You are currently subscribed to:": "您正在订阅：",
+    "⚠ These settings are meant for advanced users.": "⚠ 这些设置是为高级用户准备的。",
+    "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> 会忽略在任何服务器上以「bot」为名的用户。",
+    "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.": "忽略人是通过含有封禁规则的封禁列表来完成的。订阅一个封禁列表意味着被该列表阻止的用户/服务器将会对您隐藏。",
+    "Personal ban list": "个人封禁列表",
+    "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.": "您的个人封禁列表包含所有您不想看见信息的用户/服务器。您第一次忽略用户/服务器。后，一个名叫「我的封禁列表」的新聊天室将会显示在您的聊天室列表中——留在该聊天室以保持该封禁列表生效。",
+    "Server or user ID to ignore": "要忽略的服务器或用户 ID",
+    "eg: @bot:* or example.org": "例如： @bot:* 或 example.org",
+    "Subscribed lists": "订阅的列表",
+    "Subscribing to a ban list will cause you to join it!": "订阅一个封禁列表会使您加入它！",
+    "If this isn't what you want, please use a different tool to ignore users.": "如果这不是您想要的，请使用别的的工具来忽略用户。",
+    "Room ID or address of ban list": "封禁列表的聊天室 ID 或地址",
+    "Subscribe": "订阅",
+    "Always show the window menu bar": "总是显示窗口菜单栏",
+    "Show tray icon and minimize window to it on close": "显示托盘图标并在关闭时最小化窗口到托盘",
+    "Session ID:": "会话 ID：",
+    "Session key:": "会话密钥：",
+    "Message search": "信息搜索",
+    "Cross-signing": "交叉签名",
+    "Where you’re logged in": "您在何处登录",
+    "A session's public name is visible to people you communicate with": "会话的公共名称会对和您交流的人显示",
+    "this room": "此聊天室",
+    "View older messages in %(roomName)s.": "查看 %(roomName)s 里更旧的信息。",
+    "Uploaded sound": "已上传的声音",
+    "Sounds": "声音",
+    "Notification sound": "通知声音",
+    "Reset": "重置",
+    "Set a new custom sound": "使用新的自定义声音",
+    "Browse": "浏览",
+    "Upgrade the room": "更新聊天室",
+    "Enable room encryption": "启用聊天室加密",
+    "Error changing power level requirement": "更改权限级别需求时出错",
+    "An error occurred changing the room's power level requirements. Ensure you have sufficient permissions and try again.": "更改此聊天室的权限级别需求时出错。请确保您有足够的权限后重试。",
+    "Error changing power level": "更改权限级别时出错",
+    "An error occurred changing the user's power level. Ensure you have sufficient permissions and try again.": "更改此用户的权限级别时出错。请确保您有足够权限后重试。",
+    "To link to this room, please add an address.": "要链接至此聊天室，请添加一个地址。",
+    "Unable to share email address": "无法共享邮件地址",
+    "Your email address hasn't been verified yet": "您的邮件地址尚未被验证",
+    "Click the link in the email you received to verify and then click continue again.": "请点击您收到的邮件中的链接后再点击继续。",
+    "Verify the link in your inbox": "验证您的收件箱中的链接",
+    "Complete": "完成",
+    "Share": "共享",
+    "Discovery options will appear once you have added an email above.": "您在上方添加邮箱后发现选项将会出现。",
+    "Unable to share phone number": "无法共享电话号码",
+    "Please enter verification code sent via text.": "请输入短信中发送的验证码。",
+    "Discovery options will appear once you have added a phone number above.": "您添加电话号码后发现选项将会出现。",
+    "Remove %(email)s?": "删除 %(email)s 吗？",
+    "Remove %(phone)s?": "删除 %(phone)s 吗？",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "一封短信已发送至 +%(msisdn)s。请输入其中包含的验证码。",
+    "This user has not verified all of their sessions.": "此用户没有验证其全部会话。",
+    "You have not verified this user.": "您没有验证此用户。",
+    "You have verified this user. This user has verified all of their sessions.": "您验证了此用户。此用户已验证了其全部会话。",
+    "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
+    "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
+    "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
+    "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
+    "Multiple integration managers": "多个集成管理器",
+    "Try out new ways to ignore people (experimental)": "尝试忽略别人的新方法（实验性）",
+    "Enable advanced debugging for the room list": "为此聊天室列表启用高级调试",
+    "Show info about bridges in room settings": "在聊天室设置中显示桥接信息",
+    "Use a more compact ‘Modern’ layout": "使用更紧凑的「现代」布局",
+    "Show typing notifications": "显示输入通知",
+    "Show shortcuts to recently viewed rooms above the room list": "在聊天室列表上方显示最近浏览过的聊天室的快捷方式",
+    "Show hidden events in timeline": "显示时间线中的隐藏事件",
+    "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)": "为消息发送已读回执（需要兼容的主服务器方可禁用）",
+    "Scan this unique code": "扫描此唯一代码",
+    "Compare unique emoji": "比较唯一表情符号",
+    "Compare a unique set of emoji if you don't have a camera on either device": "若您在两个设备上都没有相机，比较唯一一组表情符号",
+    "Verify this session by confirming the following number appears on its screen.": "确认下方数字显示在屏幕上以验证此会话。",
+    "This bridge is managed by <user />.": "此桥接由 <user /> 管理。",
+    "Homeserver feature support:": "主服务器功能支持：",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "通过单点登录证明您的身份并确认删除这些会话。",
+    "Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "通过单点登录证明您的身份并确认删除此会话。",
+    "Public Name": "公开名称",
+    "Securely cache encrypted messages locally for them to appear in search results.": "在本地安全地缓存加密消息以使其出现在搜索结果中。",
+    "Connecting to integration manager...": "正在连接至集成管理器...",
+    "Cannot connect to integration manager": "不能连接到集成管理器",
+    "The integration manager is offline or it cannot reach your homeserver.": "此集成管理器为离线状态或者其不能访问您的主服务器。",
+    "check your browser plugins for anything that might block the identity server (such as Privacy Badger)": "检查您的浏览器是否安装有可能屏蔽身份服务器的插件（例如 Privacy Badger）",
+    "Use an Integration Manager <b>(%(serverName)s)</b> to manage bots, widgets, and sticker packs.": "使用集成管理器 <b>（%(serverName)s）</b> 以管理机器人、小挂件和贴图集。",
+    "Use an Integration Manager to manage bots, widgets, and sticker packs.": "使用集成管理器以管理机器人、小挂件和贴图集。",
+    "Manage integrations": "管理集成",
+    "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "集成管理器接收配置数据，并可以以您的名义修改小挂件、发送聊天室邀请及设置权限级别。",
+    "Use between %(min)s pt and %(max)s pt": "请使用介于 %(min)s pt 和 %(max)s pt 之间的大小",
+    "Deactivate account": "停用帐号",
+    "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "要报告 Matrix 相关的安全问题，请阅读 Matrix.org 的<a>安全公开策略</a>。",
+    "Something went wrong. Please try again or view your console for hints.": "出现问题。请重试或查看您的终端以获得提示。",
+    "Please try again or view your console for hints.": "请重试或查看您的终端以获得提示。",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "您的服务器管理员未在私人聊天室和私聊中默认启用端对端加密。",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "在下方管理会话名称，登出您的会话或<a>在您的用户资料中验证它们</a>。",
+    "This room is bridging messages to the following platforms. <a>Learn more.</a>": "此聊天室正将消息桥接到以下平台。<a>了解更多。</a>",
+    "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "此聊天室未将消息桥接到任何平台。<a>了解更多。</a>",
+    "Bridges": "桥接",
+    "Someone is using an unknown session": "有人在使用未知会话",
+    "This room is end-to-end encrypted": "此聊天室是端对端加密的",
+    "Everyone in this room is verified": "聊天室中所有人都已被验证",
+    "Edit message": "编辑消息",
+    "Your key share request has been sent - please check your other sessions for key share requests.": "您的密钥共享请求已发送——请检查您别的会话。",
+    "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.": "密钥共享请求会自动发送至您别的会话。如果您拒绝或忽略了您别的会话上的密钥共享请求，请点击此处重新为此会话请求密钥。",
+    "If your other sessions do not have the key for this message you will not be able to decrypt them.": "如果您别的会话没有此消息的密钥您将不能解密它们。",
+    "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "从您别的会话<requestLink>重新请求加密密钥</requestLink>。",
+    "This message cannot be decrypted": "此消息无法被解密",
+    "Encrypted by an unverified session": "由未验证的会话加密",
+    "Unencrypted": "未加密",
+    "Encrypted by a deleted session": "由已删除的会话加密",
+    "The authenticity of this encrypted message can't be guaranteed on this device.": "此加密消息的权威性不能在此设备上被保证。",
+    "Scroll to most recent messages": "滚动到最近的消息",
+    "Close preview": "关闭预览",
+    "Emoji picker": "表情符号选择器",
+    "Send a reply…": "发送回复…",
+    "Send a message…": "发送消息…",
+    "Bold": "粗体",
+    "Italics": "斜体",
+    "Strikethrough": "删除线",
+    "Code block": "代码块",
+    "Room %(name)s": "聊天室 %(name)s",
+    "No recently visited rooms": "没有最近访问过的聊天室",
+    "People": "联系人",
+    "Create room": "创建聊天室",
+    "Custom Tag": "自定义标签",
+    "Joining room …": "正在加入聊天室…",
+    "Loading …": "正在加载…",
+    "Rejecting invite …": "正在拒绝邀请…",
+    "Join the conversation with an account": "使用一个账户加入对话",
+    "Sign Up": "注册",
+    "Loading room preview": "正在加载聊天室预览",
+    "You were kicked from %(roomName)s by %(memberName)s": "您被 %(memberName)s 踢出了 %(roomName)s",
+    "Reason: %(reason)s": "原因：%(reason)s",
+    "Forget this room": "忘记此聊天室",
+    "Re-join": "重新加入",
+    "You were banned from %(roomName)s by %(memberName)s": "您被 %(memberName)s 从 %(roomName)s 封禁了",
+    "Something went wrong with your invite to %(roomName)s": "您到 %(roomName)s 的邀请出错",
+    "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）。您可以将此信息转告给聊天室管理员。",
+    "Try to join anyway": "仍然尝试加入",
+    "You can still join it because this is a public room.": "您仍然能加入，因为这是一个公共聊天室。",
+    "Join the discussion": "加入讨论",
+    "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "这个到 %(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": "这个到 %(roomName)s 的邀请是发送给 %(email)s 的",
+    "Use an identity server in Settings to receive invites directly in %(brand)s.": "要直接在 %(brand)s 中接收邀请，请在设置中使用一个身份服务器。",
+    "Share this email in Settings to receive invites directly in %(brand)s.": "要在 %(brand)s 中直接接收邀请，请在设置中共享此邮箱。",
+    "Do you want to chat with %(user)s?": "您想和 %(user)s 聊天吗？",
+    "<userName/> wants to chat": "<userName/> 想聊天",
+    "Start chatting": "开始聊天",
+    "Do you want to join %(roomName)s?": "您想加入 %(roomName)s 吗？",
+    "<userName/> invited you": "<userName/> 邀请了您",
+    "Reject & Ignore user": "拒绝并忽略用户",
+    "You're previewing %(roomName)s. Want to join it?": "您正在预览 %(roomName)s。想加入吗？",
+    "%(roomName)s can't be previewed. Do you want to join it?": "%(roomName)s 不能被预览。您想加入吗？",
+    "This room doesn't exist. Are you sure you're at the right place?": "此聊天室不存在。您确定您在正确的地方吗？",
+    "Try again later, or ask a room admin to check if you have access.": "请稍后重试，或询问聊天室管理员以检查您是否有权限。",
+    "%(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>。",
+    "Appearance": "外观",
+    "Show rooms with unread messages first": "优先显示有未读消息的聊天室",
+    "Show previews of messages": "显示消息预览",
+    "Sort by": "排序",
+    "Activity": "活动",
+    "A-Z": "字典顺序",
+    "List options": "列表选项",
+    "Jump to first unread room.": "跳转至第一个未读聊天室。",
+    "Jump to first invite.": "跳转至第一个邀请。",
+    "Add room": "添加聊天室",
+    "Show %(count)s more|other": "多显示 %(count)s 个",
+    "Show %(count)s more|one": "多显示 %(count)s 个",
+    "Use default": "使用默认",
+    "Mentions & Keywords": "提及和关键词",
+    "Notification options": "通知选项",
+    "Leave Room": "离开聊天室",
+    "Forget Room": "忘记聊天室",
+    "Favourited": "已收藏",
+    "Room options": "聊天室选项",
+    "%(count)s unread messages including mentions.|other": "包括提及在内有 %(count)s 个未读消息。",
+    "%(count)s unread messages including mentions.|one": "1 个未读提及。",
+    "%(count)s unread messages.|other": "%(count)s 个未读消息。",
+    "%(count)s unread messages.|one": "1 个未读消息。",
+    "Unread messages.": "未读消息。",
+    "This room is public": "此聊天室为公共的",
+    "Away": "离开",
+    "This room has already been upgraded.": "此聊天室已经被升级。",
+    "Unknown Command": "未知命令",
+    "Unrecognised command: %(commandText)s": "未识别的命令：%(commandText)s",
+    "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "您可以使用 <code>/help</code> 列出可用命令。您是否要将其作为消息发送？",
+    "Hint: Begin your message with <code>//</code> to start it with a slash.": "提示：以 <code>//</code> 开始您的消息来使其以一个斜杠开始。",
+    "Send as message": "作为消息发送",
+    "Failed to connect to integration manager": "连接至集成管理器失败",
+    "Mark all as read": "标记所有为已读",
+    "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "更新此聊天室的备用地址时出现错误。可能是服务器不允许，也可能是出现了一个暂时的错误。",
+    "Error creating address": "创建地址时出现错误",
+    "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "创建地址时出现错误。可能是服务器不允许，也可能是出现了一个暂时的错误。",
+    "You don't have permission to delete the address.": "您没有权限删除此地址。",
+    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "删除那个地址时出现错误。可能它已不存在，也可能出现了一个暂时的错误。",
+    "Error removing address": "删除地址时出现错误",
+    "Local address": "本地地址",
+    "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.": "发布的地址可以被任何服务器上的任何人用来加入您的聊天室。要发布一个地址，它必须先被设为一个本地地址。",
+    "Other published addresses:": "其它发布的地址：",
+    "No other published addresses yet, add one below": "还没有别的发布的地址，可在下方添加",
+    "New published address (e.g. #alias:server)": "新的发布的地址（例如 #alias:server）",
+    "Local Addresses": "本地地址",
+    "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "为此聊天室设置地址以便用户通过您的主服务器（%(localDomain)s）找到此聊天室",
+    "Waiting for you to accept on your other session…": "等待您在您别的会话上接受…",
+    "Waiting for %(displayName)s to accept…": "等待 %(displayName)s 接受…",
+    "Accepting…": "正在接受…",
+    "Start Verification": "开始验证",
+    "Messages in this room are 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 not end-to-end encrypted.": "此聊天室内的消息未端对端加密。",
+    "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": "您的消息不安全",
+    "One of the following may be compromised:": "以下之一可能被损害：",
+    "Your homeserver": "您的主服务器",
+    "The homeserver the user you’re verifying is connected to": "您在验证的用户连接到的主服务器",
+    "Yours, or the other users’ internet connection": "您的或另一位用户的网络连接",
+    "Yours, or the other users’ session": "您的或另一位用户的会话",
+    "Trusted": "受信任的",
+    "Not trusted": "不受信任的",
+    "%(count)s verified sessions|other": "%(count)s 个已验证的会话",
+    "%(count)s verified sessions|one": "1 个已验证的会话",
+    "Hide verified sessions": "隐藏已验证的会话",
+    "%(count)s sessions|other": "%(count)s 个会话",
+    "%(count)s sessions|one": "%(count)s 个会话",
+    "Hide sessions": "隐藏会话",
+    "Direct message": "私聊",
+    "No recent messages by %(user)s found": "没有找到 %(user)s 最近发送的消息",
+    "Try scrolling up in the timeline to see if there are any earlier ones.": "请尝试在时间线中向上滚动以查看是否有更早的。",
+    "Remove recent messages by %(user)s": "删除 %(user)s 最近发送的消息",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|other": "您将删除 %(user)s 发送的 %(count)s 条消息。此操作不能撤销。您想继续吗？",
+    "You are about to remove %(count)s messages by %(user)s. This cannot be undone. Do you wish to continue?|one": "您将删除 %(user)s 发送的 1 条消息。此操作不能撤销。您想继续吗？",
+    "For a large amount of messages, this might take some time. Please don't refresh your client in the meantime.": "对于大量消息，可能会消耗一段时间。在此期间请不要刷新您的客户端。",
+    "Remove %(count)s messages|other": "删除 %(count)s 条消息",
+    "Remove %(count)s messages|one": "删除 1 条消息",
+    "Remove recent messages": "删除最近消息",
+    "<strong>%(role)s</strong> in %(roomName)s": "%(roomName)s 中的 <strong>%(role)s</strong>",
+    "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": "停用用户",
+    "Failed to deactivate user": "停用用户失败",
+    "This client does not support end-to-end encryption.": "此客户端不支持端对端加密。",
+    "Security": "安全",
+    "Verify by scanning": "扫码验证",
+    "Ask %(displayName)s to scan your code:": "请 %(displayName)s 扫描您的代码：",
+    "If you can't scan the code above, verify by comparing unique emoji.": "如果您不能扫描以上代码，请通过比较唯一的表情符号来验证。",
+    "Verify by comparing unique emoji.": "通过比较唯一的表情符号来验证。",
+    "Verify by emoji": "通过表情符号验证",
+    "Almost there! Is your other session showing the same shield?": "快完成了！您的另一个会话显示了同样的盾牌吗？",
+    "Almost there! Is %(displayName)s showing the same shield?": "快完成了！%(displayName)s 显示了同样的盾牌吗？",
+    "Verify all users in a room 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 %(deviceName)s (%(deviceId)s)!": "您成功验证了 %(deviceName)s （%(deviceId)s）！",
+    "You've successfully verified %(displayName)s!": "您成功验证了 %(displayName)s！",
+    "Verified": "已验证",
+    "Got it": "知道了",
+    "Start verification again from the notification.": "请从提示重新开始验证。",
+    "Start verification again from their profile.": "请从对方资料重新开始验证。",
+    "Verification timed out.": "雅正超时。",
+    "You cancelled verification on your other session.": "您在您别的会话上取消了验证。",
+    "%(displayName)s cancelled verification.": "%(displayName)s 取消了验证。",
+    "You cancelled verification.": "您取消了验证。",
+    "Verification cancelled": "验证已取消",
+    "Compare emoji": "比较表情符号",
+    "Encryption enabled": "加密已启用",
+    "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "此聊天室中的消息是端对端加密的。请在其用户资料中了解更多并验证此用户。",
+    "Encryption not enabled": "加密未启用",
+    "The encryption used by this room isn't supported.": "不支持此聊天室使用的加密方式。",
+    "React": "回应",
+    "Message Actions": "消息操作",
+    "Show image": "显示图像",
+    "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "您已忽略该用户，所以其消息已被隐藏。<a>仍然显示。</a>",
+    "You verified %(name)s": "您验证了 %(name)s",
+    "You cancelled verifying %(name)s": "您取消了 %(name)s 的验证",
+    "%(name)s cancelled verifying": "%(name)s 取消了验证",
+    "You accepted": "您接受了",
+    "%(name)s accepted": "%(name)s 接受了",
+    "You declined": "您拒绝了",
+    "You cancelled": "您取消了",
+    "%(name)s declined": "%(name)s 拒绝了",
+    "%(name)s cancelled": "%(name)s 取消了",
+    "Accepting …": "正在接受…",
+    "Declining …": "正在拒绝…",
+    "%(name)s wants to verify": "%(name)s 想要验证",
+    "You sent a verification request": "您发送了一个验证请求",
+    "Show all": "显示全部",
+    "Reactions": "回应",
+    "<reactors/><reactedWith> reacted with %(content)s</reactedWith>": "<reactors/><reactedWith> 回应了 %(content)s</reactedWith>",
+    "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>回应了 %(shortName)s</reactedWith>",
+    "Message deleted": "消息已删除",
+    "Message deleted by %(name)s": "消息被 %(name)s 删除",
+    "Message deleted on %(date)s": "消息于 %(date)s 被删除",
+    "Edited at %(date)s": "编辑于 %(date)s",
+    "Click to view edits": "点击查看编辑",
+    "Edited at %(date)s. Click to view edits.": "编辑于 %(date)s。点击以查看编辑。",
+    "edited": "被编辑过",
+    "Can't load this message": "无法加载此消息",
+    "Submit logs": "提交日志",
+    "Frequently Used": "经常使用",
+    "Smileys & People": "表情和人",
+    "Animals & Nature": "动物和自然",
+    "Food & Drink": "食物和饮料",
+    "Activities": "活动",
+    "Travel & Places": "旅行和地点",
+    "Objects": "物体",
+    "Symbols": "符号",
+    "Flags": "旗帜",
+    "Categories": "类别",
+    "Quick Reactions": "快速回应",
+    "Cancel search": "取消搜索",
+    "Any of the following data may be shared:": "以下数据之一可能被分享：",
+    "Your display name": "您的显示名称",
+    "Your avatar URL": "您的头像链接",
+    "Your user ID": "您的用户 ID",
+    "Your theme": "您的主题",
+    "%(brand)s URL": "%(brand)s 的链接",
+    "Room ID": "聊天室 ID",
+    "Widget ID": "小挂件 ID",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "使用此小挂件可能会和 %(widgetDomain)s 及您的集成管理器共享数据 <helpIcon />。",
+    "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "使用此小挂件可能会和 %(widgetDomain)s 共享数据 <helpIcon />。",
+    "Widgets do not use message encryption.": "小挂件不适用消息加密。",
+    "This widget may use cookies.": "此小挂件可能使用 cookie。",
+    "More options": "更多选项",
+    "Please <newIssueLink>create a new issue</newIssueLink> on GitHub so that we can investigate this bug.": "请在 GitHub 上<newIssueLink>创建一个新 issue</newIssueLink> 以便我们调查此错误。",
+    "Rotate Left": "向左旋转",
+    "Rotate counter-clockwise": "逆时针旋转",
+    "Rotate Right": "向右旋转",
+    "Rotate clockwise": "顺时针旋转",
+    "QR Code": "QR 码",
+    "Room address": "聊天室地址",
+    "e.g. my-room": "例如 my-room",
+    "Some characters not allowed": "一些字符不被允许",
+    "Please provide a room address": "请提供一个聊天室地址",
+    "This address is available to use": "此地址可用",
+    "This address is already in use": "此地址已被使用",
+    "Enter a server name": "输入一个服务器名",
+    "Looks good": "看着不错",
+    "Can't find this server or its room list": "不能找到此服务器或其聊天室列表",
+    "All rooms": "所有聊天室",
+    "Your server": "您的服务器",
+    "Are you sure you want to remove <b>%(serverName)s</b>": "您确定想删除 <b>%(serverName)s</b> 吗",
+    "Remove server": "删除服务器",
+    "Matrix": "Matrix",
+    "Add a new server": "添加一个新服务器",
+    "Enter the name of a new server you want to explore.": "输入您想探索的新服务器名。",
+    "Server name": "服务器名",
+    "Add a new server...": "添加一个新服务器...",
+    "%(networkName)s rooms": "%(networkName)s 的聊天室",
+    "Matrix rooms": "Matrix 聊天室",
+    "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>中管理。",
+    "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",
+    "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…": "正在删除…",
+    "Destroy 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.": "删除交叉签名密钥是永久的。所有您验证过的人都会看到安全警报。除非您丢失了所有可以交叉签名的设备，否则几乎可以确定您不想这么做。",
+    "Clear cross-signing keys": "清楚交叉签名密钥",
+    "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.": "清除此会话中的所有数据是永久的。加密消息会丢失，除非其密钥已被备份。",
+    "Clear all data": "清除所有数据",
+    "Please enter a name for the room": "请为此聊天室输入一个名称",
+    "Set a room address to easily share your room with other people.": "设置一个聊天室地址以轻松地和别人共享您的聊天室。",
+    "This room is private, and can only be joined by invitation.": "此聊天室是私人的，只能通过邀请加入。",
+    "You can’t disable this later. Bridges & most bots won’t work yet.": "您之后不能禁用此项。桥接和大部分机器人还不能正常工作。",
+    "Enable end-to-end encryption": "启用端对端加密",
+    "Create a public room": "创建一个公共聊天室",
+    "Create a private room": "创建一个私人聊天室",
+    "Topic (optional)": "主题（可选）",
+    "Make this room public": "将此聊天室设为公共的",
+    "Hide advanced": "隐藏高级",
+    "Show advanced": "显示高级",
+    "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "阻止别的 matrix 主服务器上的用户加入此聊天室（此设置之后不能更改！）",
+    "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。要再使用此版本并使用端对端加密，您需要登出再重新登录。",
+    "Confirm your account deactivation by using Single Sign On to prove your identity.": "通过单点登录证明您的身份并确认停用您的账户。",
+    "Are you sure you want to deactivate your account? This is irreversible.": "您确定要停用您的账号吗？此操作不可逆。",
+    "Confirm account deactivation": "确认账号停用",
+    "There was a problem communicating with the server. Please try again.": "联系服务器时出现问题。请重试。",
+    "Server did not require any authentication": "服务器不要求任何认证",
+    "Server did not return valid authentication information.": "服务器未返回有效认证信息。",
+    "View Servers in Room": "查看聊天室中的服务器",
+    "Verification Requests": "验证请求",
+    "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.": "验证此设备以将其标记为受信任的。信任此设备可让您和别的用户在使用端对端加密消息时更加放心。",
+    "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "验证此设备会将其标记为受信任的，而验证了您的用户将会信任此设备。",
+    "Integrations are disabled": "集成已禁用",
+    "Enable 'Manage Integrations' in Settings to do this.": "在设置中启用「管理集成」以执行此操作。",
+    "Integrations not allowed": "集成未被允许",
+    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "您的 %(brand)s 不允许您使用集成管理器来完成此操作。请联系管理员。",
+    "To continue, use Single Sign On to prove your identity.": "要继续，请使用单点登录证明您的身份。",
+    "Confirm to continue": "确认以继续",
+    "Click the button below to confirm your identity.": "点击下方按钮确认您的身份。",
+    "Failed to invite the following users to chat: %(csvUsers)s": "邀请以下用户加入聊天失败：%(csvUsers)s",
+    "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.": "我们不能邀请这些用户。请检查您想邀请的用户并重试。",
+    "Failed to find the following users": "寻找以下用户失败",
+    "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "下列用户可能不存在或无效，因此不能被邀请：%(csvNames)s",
+    "Recent Conversations": "最近对话",
+    "Suggestions": "建议",
+    "Recently Direct Messaged": "最近私聊",
+    "Direct Messages": "私聊",
+    "Start a conversation with someone using their name, username (like <userId/>) or email address.": "使用名字，用户名（像是 <userId/>）或邮件地址和某人开始对话。",
+    "Go": "前往",
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "使用名字，用户名（像是 <userId/>）或邮件地址邀请某人，或者<a>分享此聊天室</a>。",
+    "a new master key signature": "一个新的主密钥签名",
+    "a new cross-signing key signature": "一个新的交叉签名密钥的签名",
+    "a device cross-signing signature": "一个设备的交叉签名的签名",
+    "a key signature": "一个密钥签名",
+    "Upload completed": "上传完成",
+    "Cancelled signature upload": "已取消签名上传",
+    "Unable to upload": "无法上传",
+    "Signature upload success": "签名上传成功",
+    "Signature upload failed": "签名上传失败",
+    "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 会导致问题。",
+    "Confirm by comparing the following with the User Settings in your other session:": "通过比较下方内容和您别的会话中的用户设置来确认：",
+    "Confirm this user's session by comparing the following with their User Settings:": "通过比较下方内容和对方用户设置来确认此用户会话：",
+    "Session name": "会话名称",
+    "Session key": "会话密钥",
+    "If they don't match, the security of your communication may be compromised.": "如果它们不匹配，您通讯的安全性可能已受损。",
+    "Verify session": "验证会话",
+    "Your homeserver doesn't seem to support this feature.": "您的主服务器似乎不支持此功能。",
+    "Message edits": "消息编辑",
+    "Your account is not secure": "您的账户不安全",
+    "Your password": "您的密码",
+    "This session, or the other session": "此会话，或别的会话",
+    "The internet connection either session is using": "您会话使用的网络连接",
+    "We recommend you change your password and recovery key in Settings immediately": "我们推荐您立刻在设置中更改您的密码和恢复密钥",
+    "New session": "新会话",
+    "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.": "如果您没有登录进此会话，您的账户可能已受损。",
+    "This wasn't me": "这不是我",
+    "Use your account to sign in to the latest version of the app at <a />": "使用您的账户在 <a /> 登录此应用的最新版",
+    "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>.": "您已经登录且一切已就绪，但您也可以在 <a>element.io/get-started</a> 获取此应用在全平台上的最新版。",
+    "Go to Element": "前往 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> 了解更多",
+    "Please fill why you're reporting.": "请填写您为何做此报告。",
+    "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.": "举报此消息会将其唯一的「事件 ID」发送给您的主服务器的管理员。如果此聊天室中的消息被加密，您的主服务器管理员将不能阅读消息文本，也不能查看任何文件或图片。",
+    "Send report": "发送报告",
+    "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:": "更新此聊天室需要关闭此聊天室的当前实力并创建一个新的聊天室代替它。为了给聊天室成员最好的体验，我们会：",
+    "Automatically invite users": "自动邀请用户",
+    "Upgrade private room": "更新私人聊天室",
+    "Upgrade public room": "更新公共聊天室",
+    "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "更新聊天室是高级操作，通常建议在聊天室由于错误、缺失功能或安全漏洞而不稳定时使用。",
+    "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>。",
+    "You'll upgrade this room from <oldVersion /> to <newVersion />.": "您将把此聊天室从 <oldVersion /> 升级至 <newVersion />。",
+    "You're all caught up.": "全数阅毕。",
+    "Server isn't responding": "服务器未响应",
+    "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "您的服务器未响应您的一些请求。下方是一些最可能的原因。",
+    "The server (%(serverName)s) took too long to respond.": "服务器（%(serverName)s）花了太长时间响应。",
+    "Your firewall or anti-virus is blocking the request.": "您的防火墙或防病毒软件阻止了该请求。",
+    "A browser extension is preventing the request.": "一个浏览器扩展阻止了该请求。",
+    "The server is offline.": "该服务器为离线状态。",
+    "The server has denied your request.": "该服务器拒绝了您的请求。",
+    "Your area is experiencing difficulties connecting to the internet.": "您的区域难以连接上互联网。",
+    "A connection error occurred while trying to contact the server.": "尝试联系服务器时出现连接错误。",
+    "Recent changes that have not yet been received": "尚未被接受的最近更改",
+    "Sign out and remove encryption keys?": "登出并删除加密密钥？",
+    "This will allow you to return to your account after signing out, and sign in on other sessions.": "这允许您在登出后返回您的账户并在别的会话上登录。",
+    "Command Help": "命令帮助",
+    "To help us prevent this in future, please <a>send us logs</a>.": "要帮助我们防止其以后发生，请<a>给我们发送日志</a>。",
+    "Missing session data": "缺失会话数据",
+    "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "一些会话数据，包括加密消息密钥，已缺失。要修复此问题，登出并重新登录，然后从备份恢复密钥。",
+    "Your browser likely removed this data when running low on disk space.": "您的浏览器可能在磁盘空间不足时删除了此数据。",
+    "Integration Manager": "集成管理器",
+    "Find others by phone or email": "通过电话或邮箱寻找别人",
+    "Be found by phone or email": "通过电话或邮箱被寻找",
+    "Use bots, bridges, widgets and sticker packs": "使用机器人、桥接、小挂件和贴图集",
+    "Terms of Service": "服务协议",
+    "To continue you need to accept the terms of this service.": "要继续，您需要接受此服务协议。",
+    "Service": "服务",
+    "Summary": "总结",
+    "Document": "文档",
+    "Upload files (%(current)s of %(total)s)": "上传文件（%(total)s 中之 %(current)s）",
+    "Upload files": "上传文件",
+    "Upload all": "全部上传",
+    "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。",
+    "These files are <b>too large</b> to upload. The file size limit is %(limit)s.": "这些文件<b>过大</b>而不能上传。文件大小限制为 %(limit)s。",
+    "Some files are <b>too large</b> to be uploaded. The file size limit is %(limit)s.": "一些文件<b>过大</b>而不能上传。文件大小限制为 %(limit)s。",
+    "Upload %(count)s other files|other": "上传 %(count)s 个别的文件",
+    "Upload %(count)s other files|one": "上传 %(count)s 个别的文件",
+    "Cancel All": "全部取消",
+    "Upload Error": "上传错误",
+    "Verify other session": "验证别的会话",
+    "Verification Request": "验证请求",
+    "Wrong file type": "错误文件类型",
+    "Looks good!": "看着不错！",
+    "Wrong Recovery Key": "错误的恢复密钥",
+    "Invalid Recovery Key": "无效的恢复密钥",
+    "Security Phrase": "安全密码",
+    "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "无法访问秘密存储。请确认您输入了正确的恢复密码。",
+    "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "输入您的安全密码或<button>使用您的安全密钥</button>以继续。",
+    "Security Key": "安全密钥",
+    "Use your Security Key to continue.": "使用您的安全密钥以继续。",
+    "Restoring keys from backup": "从备份恢复密钥",
+    "Fetching keys from server...": "正在从服务器获取密钥...",
+    "%(completed)s of %(total)s keys restored": "%(total)s 个密钥中之 %(completed)s 个已恢复",
+    "Recovery key mismatch": "恢复密钥不匹配",
+    "Backup could not be decrypted with this recovery key: please verify that you entered the correct recovery key.": "备份不能被此恢复密钥解密：请确认您输入了正确的恢复密钥。",
+    "Incorrect recovery passphrase": "不正确的恢复密码",
+    "Backup could not be decrypted with this recovery passphrase: please verify that you entered the correct recovery passphrase.": "备份不能被此恢复密码解密：请确认您输入了正确的恢复密码。",
+    "Keys restored": "已恢复密钥",
+    "Successfully restored %(sessionCount)s keys": "成功恢复了 %(sessionCount)s 个密钥",
+    "Enter recovery passphrase": "输入恢复密码",
+    "Enter recovery key": "输入恢复密钥",
+    "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>警告</b>：您应该只从信任的计算机设置密钥备份。",
+    "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "如果您忘记了恢复密钥，您可以<button>设置新的恢复选项</button>",
+    "Address (optional)": "地址（可选）",
+    "Resend edit": "重新发送编辑",
+    "Resend %(unsentCount)s reaction(s)": "重新发送 %(unsentCount)s 个回应",
+    "Resend removal": "重新发送删除",
+    "Report Content": "举报内容",
+    "Notification settings": "通知设置",
+    "Help": "帮助",
+    "Reload": "重新加载",
+    "Take picture": "拍照",
+    "Remove for everyone": "为所有人删除",
+    "Remove for me": "为我删除",
+    "User Status": "用户状态",
+    "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 服务器。这允许您通过不同的主服务器上的现存 Matrix 账户使用 %(brand)s。",
+    "Confirm your identity by entering your account password below.": "在下方输入账户密码以确认您的身份。",
+    "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "在主服务器配置中缺少验证码公钥。请将此报告给您的主服务器管理员。",
+    "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>.": "输入您的 Element Matrix Services 主服务器的地址。它可能使用您自己的域名，也可能是 <a>element.io</a> 的子域名。",
+    "Enter password": "输入密码",
+    "Nice, strong password!": "不错，是个强密码！",
+    "Password is allowed, but unsafe": "密码允许但不安全",
+    "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "没有配置身份服务器因此您不能添加邮件地址以在将来重置您的密码。",
+    "Use an email address to recover your account": "使用邮件地址恢复您的账户",
+    "Enter email address (required on this homeserver)": "输入邮件地址（此主服务器上必须）",
+    "Doesn't look like a valid email address": "看起来不像有效的邮件地址",
+    "Passwords don't match": "密码不匹配",
+    "Other users can invite you to rooms using your contact details": "别的用户可以使用您的联系人信息邀请您加入聊天室",
+    "Enter phone number (required on this homeserver)": "输入电话号码（此主服务器上必须）",
+    "Doesn't look like a valid phone number": "看着不像一个有效的电话号码",
+    "Use lowercase letters, numbers, dashes and underscores only": "仅使用小写字母，数字，横杠和下划线",
+    "Enter username": "输入用户名",
+    "Create your Matrix account on <underlinedServerName />": "在 <underlinedServerName /> 上创建您的 Matrix 账户",
+    "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.": "设置邮箱以便恢复账户。您可以选择让现存联系人通过邮箱发现您。",
+    "Enter your custom homeserver URL <a>What does this mean?</a>": "设置您自定义的主服务器链接<a>这是什么意思？</a>",
+    "Enter your custom identity server URL <a>What does this mean?</a>": "输入您自定义的身份服务器链接<a>这是什么意思？</a>",
+    "Sign in to your Matrix account on <underlinedServerName />": "登录到您在 <underlinedServerName /> 上的 Matrix 账户",
+    "Sign in with SSO": "使用单点登录",
+    "No files visible in this room": "此聊天室中没有可见文件",
+    "Welcome to %(appName)s": "欢迎来到 %(appName)s",
+    "Liberate your communication": "解放您的交流",
+    "Send a Direct Message": "发送私聊",
+    "Explore Public Rooms": "探索公共聊天室",
+    "Create a Group Chat": "创建一个群聊",
+    "Explore rooms": "探索聊天室",
+    "Self-verification request": "自验证请求",
+    "%(creator)s created and configured the room.": "%(creator)s 创建并配置了此聊天室。",
+    "You’re all caught up": "全数阅毕",
+    "You have no visible notifications in this room.": "您在此聊天室内没有可见通知。",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "删除聊天室地址 %(alias)s 并将 %(name)s 从目录中移除吗？",
+    "delete the address.": "删除此地址。",
+    "Preview": "预览",
+    "View": "查看",
+    "Find a room…": "寻找聊天室…",
+    "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>。",
+    "Search rooms": "搜索聊天室",
+    "Switch to light mode": "切换到浅色模式",
+    "Switch to dark mode": "切换到深色模式",
+    "Switch theme": "切换主题",
+    "Security & privacy": "安全和隐私",
+    "All settings": "所有设置",
+    "Feedback": "反馈",
+    "User menu": "用户菜单",
+    "Session verified": "会话已验证",
+    "Your Matrix account on <underlinedServerName />": "您在 <underlinedServerName /> 上的 Matrix 账户",
+    "No identity server is configured: add one in server settings to reset your password.": "没有配置身份服务器：在服务器设置中添加一个以重设您的密码。",
+    "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.": "您已经登出了所有会话，并将不会收到推送通知。要重新启用通知，请在每个设备上重新登录。",
+    "Failed to get autodiscovery configuration from server": "从服务器获取自动发现配置时失败",
+    "Invalid base_url for m.homeserver": "m.homeserver 的 base_url 无效",
+    "Homeserver URL does not appear to be a valid Matrix homeserver": "主服务器链接不像是有效的 Matrix 主服务器",
+    "Invalid base_url for m.identity_server": "m.identity_server 的 base_url 无效",
+    "Identity server URL does not appear to be a valid identity server": "身份服务器链接不像是有效的身份服务器",
+    "This account has been deactivated.": "此账号已被停用。",
+    "Syncing...": "正在同步...",
+    "Signing In...": "正在登录...",
+    "If you've joined lots of rooms, this might take a while": "如果您加入了很多聊天室，可能会消耗一些时间",
+    "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "您的新账户（%(newAccountId)s）已注册，但您已经登录了一个不同的账户（%(loggedInUserId)s）。",
+    "Continue with previous account": "用之前的账户继续",
+    "<a>Log in</a> to your new account.": "<a>登录</a>到您的新账户。",
+    "You can now close this window or <a>log in</a> to your new account.": "您现在可以关闭此窗口或<a>登录</a>到您的新账户。",
+    "Registration Successful": "注册成功",
+    "Use Recovery Key or Passphrase": "使用恢复密钥或密码",
+    "Use Recovery Key": "使用恢复密钥",
+    "This requires the latest %(brand)s on your other devices:": "这需要您在别的设备上有最新版的 %(brand)s：",
+    "%(brand)s Web": "%(brand)s 网页版",
+    "%(brand)s Desktop": "%(brand)s 桌面版",
+    "%(brand)s iOS": "%(brand)s iOS",
+    "%(brand)s X for Android": "%(brand)s X for Android",
+    "or another cross-signing capable Matrix client": "或者别的可以交叉签名的 Matrix 客户端",
+    "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "您的新会话现已被验证。它可以访问您的加密消息，别的用户也会视其为受信任的。",
+    "Your new session is now verified. Other users will see it as trusted.": "您的新会话现已被验证。别的用户会视其为受信任的。",
+    "Without completing security on this session, it won’t have access to encrypted messages.": "若不在此会话中完成安全验证，它便不能访问加密消息。",
+    "Failed to re-authenticate due to a homeserver problem": "由于主服务器的问题，重新认证失败",
+    "Failed to re-authenticate": "重新认证失败",
+    "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.": "重新获得访问您账户的权限，并恢复存储在此会话中的加密密钥。没有这些密钥，您将不能在任何会话中阅读您的所有安全消息。",
+    "Enter your password to sign in and regain access to your account.": "输入您的密码以登录并重新获取访问您账户的权限。",
+    "Forgotten your password?": "忘记您的密码了吗？",
+    "Sign in and regain access to your account.": "请登录以重新获取访问您账户的权限。",
+    "You cannot sign in to your account. Please contact your homeserver admin for more information.": "您不能登录进您的账户。请联系您的主服务器管理员以获取更多信息。",
+    "You're signed out": "您已登出",
+    "Clear personal data": "清除个人信息",
+    "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.": "警告：您的个人信息（包括加密密钥）仍存储于此会话中。如果您不用再使用此会话或想登录进另一个账户，请清除它。",
+    "Command Autocomplete": "命令自动补全",
+    "Community Autocomplete": "社区自动补全",
+    "DuckDuckGo Results": "DuckDuckGo 结果",
+    "Emoji Autocomplete": "表情符号自动补全",
+    "Notification Autocomplete": "通知自动补全",
+    "Room Autocomplete": "聊天室自动补全",
+    "User Autocomplete": "用户自动补全",
+    "Confirm encryption setup": "确认加密设置",
+    "Click the button below to confirm setting up encryption.": "点击下方按钮以确认设置加密。",
+    "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "通过在您的服务器上备份加密密钥来防止丢失您对加密消息和数据的访问权。",
+    "Generate a Security Key": "生成一个安全密钥",
+    "We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "我们会生成一个安全密钥以便让您存储在安全的地方，比如密码管理器或保险箱里。",
+    "Enter a Security Phrase": "输入一个安全密码",
+    "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "使用一个只有您知道的密码，您也可以保存安全密钥以供备份使用。",
+    "Enter your account password to confirm the upgrade:": "输入您的账户密码以确认更新：",
+    "Restore your key backup to upgrade your encryption": "恢复您的密钥备份以更新您的加密方式",
+    "Restore": "恢复",
+    "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.": "更新此会话以允许其验证别的会话，以允许它们访问加密消息并将其对别的用户标记为受信任的。",
+    "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 recovery passphrase": "输入一个恢复密码",
+    "Great! This recovery passphrase looks strong enough.": "棒！这个恢复密码看着够强。",
+    "Use a different passphrase?": "使用不同的密码？",
+    "Enter your recovery passphrase a second time to confirm it.": "再次输入您的恢复密码以确认。",
+    "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.": "将您的安全密钥存储在安全的地方，像是密码管理器或保险箱里，它将被用来保护您的加密数据。",
+    "Copy": "复制",
+    "Unable to query secret storage status": "无法查询秘密存储状态",
+    "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "如果您现在取消，您可能会丢失加密的消息和数据，如果您丢失了登录信息的话。",
+    "You can also set up Secure Backup & manage your keys in Settings.": "您也可以在设置中设置安全备份并管理您的密钥。",
+    "Set up Secure backup": "设置安全备份",
+    "Upgrade your encryption": "更新您的加密方法",
+    "Set a Security Phrase": "设置一个安全密码",
+    "Confirm Security Phrase": "确认安全密码",
+    "Save your Security Key": "保存您的安全密钥",
+    "Unable to set up secret storage": "无法设置秘密存储",
+    "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "我们会在服务器上存储一份您的密钥的加密副本。用恢复密码来保护您的备份。",
+    "Set up with a recovery key": "用恢复密钥设置",
+    "Please enter your recovery passphrase a second time to confirm.": "请再输入您的恢复密码以确认。",
+    "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.": "您的恢复密钥是一张安全网——如果您忘记了恢复密码，则可以使用它来恢复您对加密消息的访问。",
+    "Keep a copy of it somewhere secure, like a password manager or even a safe.": "在安全的地方保存一份副本，像是密码管理器或者保险箱里。",
+    "Your recovery key": "您的恢复密钥",
+    "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "您的恢复密钥已被<b>复制到您的剪贴板</b>，将其粘贴至：",
+    "Your recovery key is in your <b>Downloads</b> folder.": "您的恢复密钥在您的<b>下载</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.": "若不设置安全消息恢复，您如果登出或使用另一个会话，则将不能恢复您的加密消息历史。",
+    "Secure your backup with a recovery passphrase": "用恢复密码保护您的备份",
+    "Make a copy of your recovery key": "制作一份您的恢复密钥的副本",
+    "Create key backup": "创建密钥备份",
+    "This session is encrypting history using the new recovery method.": "此会话正在使用新的恢复方法加密历史。",
+    "This session has detected that your recovery passphrase 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 disabled, messages from encrypted rooms won't appear in search results.": "如果被禁用，加密聊天室内的消息不会显示在搜索结果中。",
+    "Disable": "禁用",
+    "Not currently indexing messages for any room.": "现在没有为任何聊天室索引消息。",
+    "Currently indexing: %(currentRoom)s": "正在索引：%(currentRoom)s",
+    "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s 正在安全地在本地缓存加密消息以使其出现在搜索结果中：",
+    "Space used:": "已使用空间：",
+    "Indexed messages:": "已索引的消息：",
+    "Indexed rooms:": "已索引的聊天室：",
+    "%(doneRooms)s out of %(totalRooms)s": "%(totalRooms)s 中之 %(doneRooms)s",
+    "Navigation": "导航",
+    "Calls": "通话",
+    "Room List": "聊天室列表",
+    "Autocomplete": "自动补全",
+    "Alt": "Alt",
+    "Alt Gr": "Alt Gr",
+    "Shift": "Shift",
+    "Super": "Super",
+    "Ctrl": "Ctrl",
+    "New line": "换行",
+    "Jump to start/end of the composer": "跳转到编辑器的开始/结束",
+    "Cancel replying to a message": "取消回复消息",
+    "Scroll up/down in the timeline": "在时间线中向上/下滚动",
+    "Dismiss read marker and jump to bottom": "忽略已读标记并跳转到底部",
+    "Jump to oldest unread message": "跳转到最旧的未读消息",
+    "Upload a file": "上传文件",
+    "Jump to room search": "跳转到聊天室搜索",
+    "Select room from the room list": "从聊天室列表选择聊天室",
+    "Collapse room list section": "折叠聊天室列表段",
+    "Expand room list section": "展开聊天室列表段",
+    "Clear room list filter field": "清除聊天室过滤器字段",
+    "Close dialog or context menu": "关闭对话框或上下文菜单",
+    "Move autocomplete selection up/down": "上移/下移自动补全选项",
+    "Cancel autocomplete": "取消自动补全",
+    "Page Up": "Page Up",
+    "Page Down": "Page Down",
+    "Esc": "Esc",
+    "Enter": "Enter",
+    "Space": "Space",
+    "How fast should messages be downloaded.": "消息下载速度。",
+    "IRC display name width": "IRC 显示名称宽度",
+    "When rooms are upgraded": "聊天室升级时间"
 }
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index b2e6c35e71..b8fc2b43fb 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -10,7 +10,6 @@
     "%(senderName)s banned %(targetName)s.": "%(senderName)s 封鎖了 %(targetName)s.",
     "Ban": "封鎖",
     "Banned users": "被封鎖的用戶",
-    "Blacklisted": "已列入黑名單",
     "Call Timeout": "通話逾時",
     "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 URL 時，不能使用 HTTP 連線到家伺服器。請採用 HTTPS 或者<a>允許不安全的指令稿</a>。",
     "Change Password": "變更密碼",
@@ -19,7 +18,6 @@
     "Access Token:": "取用令牌：",
     "Admin": "管理者",
     "Advanced": "進階",
-    "Algorithm": "算法",
     "Always show message timestamps": "總是顯示訊息時間戳",
     "Authentication": "授權",
     "%(items)s and %(lastItem)s": "%(items)s 和 %(lastItem)s",
@@ -33,22 +31,16 @@
     "/ddg is not a command": "/ddg 不是一個命令",
     "Deactivate Account": "關閉帳號",
     "Decrypt %(text)s": "解密 %(text)s",
-    "Decryption error": "解密出錯",
     "Default": "預設",
-    "Device ID": "裝置識別碼",
-    "Direct chats": "私聊",
     "Disinvite": "取消邀請",
     "Displays action": "顯示操作",
     "Download %(text)s": "下載 %(text)s",
-    "Ed25519 fingerprint": "Ed25519指紋",
     "Email": "電子郵件",
     "Email address": "電子郵件地址",
     "Emoji": "顏文字",
     "%(senderName)s ended the call.": "%(senderName)s 結束了通話。.",
-    "End-to-end encryption information": "端到端加密資訊",
     "Error": "錯誤",
     "Error decrypting attachment": "解密附件時出錯",
-    "Event information": "事件資訊",
     "Existing Call": "現有通話",
     "Export E2E room keys": "導出聊天室的端到端加密密鑰",
     "Failed to ban user": "封鎖用戶失敗",
@@ -64,7 +56,6 @@
     "Failed to send email": "發送郵件失敗",
     "Failed to send request.": "傳送要求失敗。",
     "Failed to set display name": "設置暱稱失敗",
-    "Failed to toggle moderator status": "無法切換管理員權限",
     "Failed to unban": "解除封鎖失敗",
     "Failed to verify email address: make sure you clicked the link in the email": "電子郵件地址驗證失敗： 請確保你已點擊郵件中的連結",
     "Failure to create room": "建立聊天室失敗",
@@ -91,13 +82,11 @@
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s 把 %(targetName)s 踢出了聊天室。.",
     "Leave room": "離開聊天室",
     "Return to login screen": "返回到登入畫面",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot 未被允許向你推播通知 ── 請檢查您的瀏覽器設定",
-    "Riot was not given permission to send notifications - please try again": "Riot 未被允許向你推播通知 ── 請重試",
-    "riot-web version:": "riot-網頁版：",
+    "%(brand)s does not have permission to send you notifications - please check your browser settings": "%(brand)s 未被允許向你推播通知 ── 請檢查您的瀏覽器設定",
+    "%(brand)s was not given permission to send notifications - please try again": "%(brand)s 未被允許向你推播通知 ── 請重試",
     "Room %(roomId)s not visible": "聊天室 %(roomId)s 已隱藏",
     "Room Colour": "聊天室顏色",
     "Rooms": "聊天室",
-    "Scroll to bottom of page": "滾動到頁面底部",
     "Search": "搜尋",
     "Search failed": "搜索失敗",
     "Searches DuckDuckGo for results": "搜尋 DuckDuckGo",
@@ -118,7 +107,6 @@
     "Sign out": "登出",
     "%(count)s of your messages have not been sent.|other": "部分訊息未送出。",
     "Someone": "某人",
-    "Start a chat": "建立聊天",
     "Submit": "提交",
     "Success": "成功",
     "This email address is already in use": "這個電子郵件地址已被使用",
@@ -156,7 +144,6 @@
     "Anyone": "任何人",
     "Command error": "指令出錯",
     "Commands": "指令",
-    "device id: ": "裝置 ID： ",
     "Reason": "原因",
     "Register": "註冊",
     "Error decrypting audio": "解密音檔出錯",
@@ -167,7 +154,6 @@
     " (unsupported)": " (不支援)",
     "URL Previews": "網址預覽",
     "Drop file here to upload": "把文件放在這裡上傳",
-    "Removed or unknown message type": "已刪除或未知的信息類型",
     "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。你想繼續嗎？",
     "Close": "關閉",
     "Create new room": "建立新聊天室",
@@ -182,8 +168,7 @@
     "No Microphones detected": "未偵測到麥克風",
     "No Webcams detected": "未偵測到網路攝影機",
     "No media permissions": "沒有媒體權限",
-    "You may need to manually permit Riot to access your microphone/webcam": "您可能需要手動允許 Riot 存取您的麥克風／網路攝影機",
-    "Alias (optional)": "別名（選擇性）",
+    "You may need to manually permit %(brand)s to access your microphone/webcam": "您可能需要手動允許 %(brand)s 存取您的麥克風／網路攝影機",
     "Are you sure you want to leave the room '%(roomName)s'?": "您確定您要想要離開房間 '%(roomName)s' 嗎？",
     "Bans user with given id": "阻擋指定 ID 的使用者",
     "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>可被信任，而瀏覽器擴充套件也沒有阻擋請求。",
@@ -193,21 +178,16 @@
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s 已經移除了聊天室名稱。",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s 已經變更主題為「%(topic)s」。",
     "Changes your display nickname": "變更您的顯示暱稱",
-    "Claimed Ed25519 fingerprint key": "已索取 Ed25519 指紋金鑰",
     "Click to mute audio": "點選以靜音",
     "Click to mute video": "點選以讓視訊靜音",
     "click to reveal": "點選以顯示",
     "Click to unmute video": "點選以解除視訊靜音",
     "Click to unmute audio": "點選以解除靜音",
-    "Could not connect to the integration server": "無法連線到整合的伺服器",
-    "Curve25519 identity key": "Curve25519 辨識金鑰",
     "Custom": "自訂",
     "Custom level": "自訂等級",
     "Decline": "拒絕",
     "Deops user with given id": "取消指定 ID 使用者的管理員權限",
-    "Disable Notifications": "停用通知",
     "Drop File Here": "在此放置檔案",
-    "Enable Notifications": "啟用通知",
     "Enter passphrase": "輸入通關密語",
     "Error: Problem communicating with the given homeserver.": "錯誤：與指定的家伺服器有通訊問題。",
     "Export": "匯出",
@@ -226,12 +206,10 @@
     "Invites user with given id to current room": "邀請指定 ID 的使用者到目前的聊天室",
     "Sign in with": "登入使用",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "加入為<voiceText>語音</voiceText>或<videoText>視訊</videoText>。",
-    "Joins room with given alias": "以指定的別名加入聊天室",
     "Kick": "踢出",
     "Kicks user with given id": "踢出指定 ID 的使用者",
     "Labs": "實驗室",
     "Last seen": "上次檢視",
-    "Local addresses for this room:": "此房間的本機地址：",
     "Logout": "登出",
     "Low priority": "低優先度",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s 讓未來的聊天室歷史紀錄可見於所有聊天室成員，從他們被邀請開始。",
@@ -244,14 +222,11 @@
     "Missing user_id in request": "在要求中遺失使用者 ID",
     "Moderator": "仲裁者",
     "Name": "名稱",
-    "New address (e.g. #foo:%(localDomain)s)": "新地址（例如：#foo:%(localDomain)s）",
     "New passwords don't match": "新密碼不相符",
     "New passwords must match each other.": "新密碼必須互相符合。",
-    "none": "無",
     "not specified": "未指定",
     "(not supported by this browser)": "（不被此瀏覽器支援）",
     "<not supported>": "<不支援>",
-    "NOT verified": "未驗證",
     "No display name": "沒有顯示名稱",
     "No more results": "沒有更多結果",
     "No results": "沒有結果",
@@ -268,10 +243,8 @@
     "Privileged Users": "特別權限使用者",
     "Profile": "基本資料",
     "Public Chat": "公開聊天",
-    "Revoke Moderator": "撤回仲裁者",
     "%(targetName)s rejected the invitation.": "%(targetName)s 拒絕了邀請。",
     "Reject invitation": "拒絕邀請",
-    "Remote addresses for this room:": "此房間的遠端地址：",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s 移除了他的顯示名稱 (%(oldDisplayName)s)。",
     "%(senderName)s removed their profile picture.": "%(senderName)s 移除了他的基本資料圖片。",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s 請求了一次 VoIP 會議。",
@@ -280,7 +253,6 @@
     "%(roomName)s is not accessible at this time.": "%(roomName)s 此時無法存取。",
     "Save": "儲存",
     "Seen by %(userName)s at %(dateTime)s": "%(userName)s 在 %(dateTime)s 時看過",
-    "Send anyway": "無論如何都要傳送",
     "Start authentication": "開始認證",
     "The phone number entered looks invalid": "輸入的電話號碼看起來無效",
     "The remote side failed to pick up": "遠端未能接聽",
@@ -297,13 +269,9 @@
     "Unable to verify email address.": "無法驗證電子郵件。",
     "Unban": "解除禁止",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s 解除阻擋 %(targetName)s。",
-    "unencrypted": "未加密",
     "unknown caller": "不明來電",
-    "unknown device": "未知的裝置",
-    "Unknown room %(roomId)s": "未知的房間 %(roomId)s",
     "Unmute": "解除靜音",
     "Unnamed Room": "未命名的聊天室",
-    "Unrecognised room alias:": "無法辨識的聊天室別名：",
     "Uploading %(filename)s and %(count)s others|zero": "正在上傳 %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "正在上傳 %(filename)s 與另外 %(count)s 個",
     "Uploading %(filename)s and %(count)s others|other": "正在上傳 %(filename)s 與另外 %(count)s 個",
@@ -312,14 +280,10 @@
     "Upload file": "上傳檔案",
     "Upload new:": "上傳新的：",
     "Usage": "使用方法",
-    "Use compact timeline layout": "使用緊湊的時間軸佈局",
-    "User ID": "使用者 ID",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s（權限等級 %(powerLevelNumber)s）",
     "Username invalid: %(errMessage)s": "使用者名稱無效：%(errMessage)s",
     "Users": "使用者",
     "Verification Pending": "擱置的驗證",
-    "Verification": "驗證",
-    "verified": "已驗證",
     "Verified key": "已驗證的金鑰",
     "Video call": "視訊通話",
     "Voice call": "語音通話",
@@ -367,7 +331,6 @@
     "Upload an avatar:": "上傳大頭貼：",
     "This server does not support authentication with a phone number.": "這個伺服器不支援以電話號碼認證。",
     "An error occurred: %(error_string)s": "遇到錯誤：%(error_string)s",
-    "Make Moderator": "給予仲裁者",
     "There are no visible files in this room": "此房間中沒有可見的檔案",
     "Room": "房間",
     "Connectivity to the server has been lost.": "至伺服器的連線已遺失。",
@@ -380,7 +343,7 @@
     "Start automatically after system login": "在系統登入後自動開始",
     "Analytics": "分析",
     "Options": "選項",
-    "Riot collects anonymous analytics to allow us to improve the application.": "Riot 會收集匿名分析以讓我們可以改進此應用程式。",
+    "%(brand)s collects anonymous analytics to allow us to improve the application.": "%(brand)s 會收集匿名分析以讓我們可以改進此應用程式。",
     "Passphrases must match": "通關密語必須符合",
     "Passphrase must not be empty": "通關密語不能為空",
     "Export room keys": "匯出房間金鑰",
@@ -399,15 +362,9 @@
     "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.": "您確定您想要移除（刪除）此活動嗎？注意若您刪除房間名稱或主題變更，還是可以復原變更。",
     "Unknown error": "未知的錯誤",
     "Incorrect password": "不正確的密碼",
-    "To continue, please enter your password.": "要繼續，請輸入您的密碼。",
-    "I verify that the keys match": "我驗證金鑰相符",
     "Unable to restore session": "無法復原工作階段",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "若您先前使用過較新版本的 Riot，您的工作階段可能與此版本不相容。關閉此視窗並回到較新的版本。",
+    "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，您的工作階段可能與此版本不相容。關閉此視窗並回到較新的版本。",
     "Unknown Address": "未知的地址",
-    "Unblacklist": "解除黑名單",
-    "Blacklist": "黑名單",
-    "Unverify": "取消驗證",
-    "Verify...": "驗證...",
     "ex. @bob:example.com": "例如：@bob:example.com",
     "Add User": "新增使用者",
     "Please check your email to continue registration.": "請檢查您的電子郵件來繼續註冊。",
@@ -421,15 +378,11 @@
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "這將是您在家伺服器上的帳號名稱<span></span>，或是您可以挑選一個<a>不同的伺服器</a>。",
     "If you already have a Matrix account you can <a>log in</a> instead.": "若您已經有 Matrix 帳號，您可以<a>登入</a>。",
     "Your browser does not support the required cryptography extensions": "您的瀏覽器不支援需要的加密擴充",
-    "Not a valid Riot keyfile": "不是有效的 Riot 金鑰檔案",
+    "Not a valid %(brand)s keyfile": "不是有效的 %(brand)s 金鑰檔案",
     "Authentication check failed: incorrect password?": "認證檢查失敗：不正確的密碼？",
     "Do you want to set an email address?": "您想要設定電子郵件地址嗎？",
     "This will allow you to reset your password and receive notifications.": "這讓您可以重設您的密碼與接收通知。",
     "Skip": "略過",
-    "Start verification": "開始驗證",
-    "Share without verifying": "不驗證就分享",
-    "Ignore request": "忽略請求",
-    "Encryption key request": "加密金鑰請求",
     "Add a widget": "新增小工具",
     "Allow": "允許",
     "and %(count)s others...|other": "與其他 %(count)s 個……",
@@ -460,11 +413,6 @@
     "Failed to copy": "複製失敗",
     "Add rooms to this community": "新增聊天室到此社群",
     "Call Failed": "通話失敗",
-    "Review Devices": "審閱裝置",
-    "Call Anyway": "無論如何都通話",
-    "Answer Anyway": "無論如何都回覆",
-    "Call": "通話",
-    "Answer": "回覆",
     "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": "警告：任何您新增到社群內的人都可以被任何知道社群 ID 的人公開看見",
     "Invite new community members": "邀請新社群成員",
@@ -472,7 +420,6 @@
     "Which rooms would you like to add to this community?": "您想要新增哪個聊天室到此社群？",
     "Show these rooms to non-members on the community page and room list?": "在社群頁面與聊天室清單上顯示這些聊天室給非社群成員？",
     "Add rooms to the community": "新增聊天室到社群",
-    "Room name or alias": "聊天室名稱或別名",
     "Add to community": "新增到社群",
     "Failed to invite the following users to %(groupId)s:": "邀請下列使用者到 %(groupId)s 失敗：",
     "Failed to invite users to community": "邀請使用者到社群失敗",
@@ -503,11 +450,8 @@
     "Jump to read receipt": "跳到讀取回條",
     "Mention": "提及",
     "Invite": "邀請",
-    "User Options": "使用者選項",
     "Send an encrypted reply…": "傳送加密的回覆……",
-    "Send a reply (unencrypted)…": "傳送回覆（未加密）……",
     "Send an encrypted message…": "傳送加密的訊息……",
-    "Send a message (unencrypted)…": "傳送訊息（未加密）……",
     "Unpin Message": "取消釘選訊息",
     "Jump to message": "跳到訊息",
     "No pinned messages.": "沒有已釘選的訊息。",
@@ -540,8 +484,6 @@
     "New community ID (e.g. +foo:%(localDomain)s)": "新社群 ID（例子：+foo:%(localDomain)s）",
     "URL previews are enabled by default for participants in this room.": "此聊天室已預設對參與者啟用 URL 預覽。",
     "URL previews are disabled by default for participants in this room.": "此聊天室已預設對參與者停用 URL 預覽。",
-    "Message removed by %(userId)s": "訊息已被 %(userId)s 移除",
-    "Message removed": "訊息已移除",
     "An email has been sent to %(emailAddress)s": "電子郵件已傳送給 %(emailAddress)s",
     "A text message has been sent to %(msisdn)s": "文字訊息已傳送給 %(msisdn)s",
     "Remove from community": "從社群中移除",
@@ -662,7 +604,7 @@
     "Community %(groupId)s not found": "找不到社群 %(groupId)s",
     "Failed to load %(groupId)s": "載入 %(groupId)s 失敗",
     "Old cryptography data detected": "偵測到舊的加密資料",
-    "Data from an older version of Riot 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.": "偵測到來自舊版 Riot 的資料。這將會造成舊版的端到端加密失敗。在此版本中使用最近在舊版本交換的金鑰可能無法解密訊息。這也會造成與此版本的訊息交換失敗。若您遇到問題，請登出並重新登入。要保留訊息歷史，請匯出並重新匯入您的金鑰。",
+    "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 的資料。這將會造成舊版的端到端加密失敗。在此版本中使用最近在舊版本交換的金鑰可能無法解密訊息。這也會造成與此版本的訊息交換失敗。若您遇到問題，請登出並重新登入。要保留訊息歷史，請匯出並重新匯入您的金鑰。",
     "Your Communities": "您的社群",
     "Error whilst fetching joined communities": "擷取已加入的社群時發生錯誤",
     "Create a new community": "建立新社群",
@@ -672,8 +614,6 @@
     "%(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>。",
     "Warning": "警告",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "沒有其他人了！您想要<inviteText>邀請其他人</inviteText>或<nowarnText>停止關於空聊天室的警告嗎</nowarnText>？",
-    "Light theme": "亮色主題",
-    "Dark theme": "暗色主題",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "隱私對我們來說至關重要，所以我們不會收集任何私人或可辨識的資料供我們的分析使用。",
     "Learn more about how we use analytics.": "得知更多關於我們如何使用分析資料的資訊。",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "電子郵件已傳送至 %(emailAddress)s。您必須跟隨其中包含了連結，點按下面的連結。",
@@ -683,15 +623,14 @@
     "Stops ignoring a user, showing their messages going forward": "停止忽略使用者，顯示他們的訊息",
     "Notify the whole room": "通知整個聊天室",
     "Room Notification": "聊天室通知",
-    "The information being sent to us to help make Riot.im better includes:": "協助讓 Riot.im 變得更好的傳送給我們的資訊包含了：",
+    "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.": "這個頁面包含了可識別的資訊，如聊天室、使用者或群組 ID，這些資料會在傳到伺服器前被刪除。",
     "The platform you're on": "您使用的平臺是",
-    "The version of Riot.im": "Riot.im 的版本",
+    "The version of %(brand)s": "%(brand)s 版本",
     "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": "您的主伺服器 URL",
-    "Your identity server's URL": "您的驗證伺服器 URL",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
     "This room is not public. You will not be able to rejoin without an invite.": "這個聊天室並未公開。您在沒有邀請的情況下將無法重新加入。",
     "Community IDs cannot be empty.": "社群 ID 不能為空。",
@@ -700,7 +639,7 @@
     "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 到聊天室失敗",
-    "Did you know: you can use communities to filter your Riot.im experience!": "您知道嗎：您可以使用社群來強化您的 Riot.im 使用體驗！",
+    "Did you know: you can use communities to filter your %(brand)s experience!": "您知道嗎：您可以使用社群來強化您的 %(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.": "要設定過濾器，拖曳社群大頭貼到位於螢幕最左邊的過濾器面板。您可以在任何時候在過濾器面板中的大頭貼上點按以檢視與該社群關聯的聊天室與夥伴。",
     "Clear filter": "清除過濾器",
     "Key request sent.": "金鑰請求已傳送。",
@@ -721,8 +660,7 @@
     "Who can join this community?": "誰可以加入此社群？",
     "Everyone": "每個人",
     "Fetching third party location failed": "抓取第三方位置失敗",
-    "A new version of Riot is available.": "Riot 釋出了新版本。",
-    "I understand the risks and wish to continue": "我了解這些風險並願意繼續",
+    "I understand the risks and wish to continue": "我了解風險並希望繼續",
     "Send Account Data": "傳送帳號資料",
     "Advanced notification settings": "進階通知設定",
     "Uploading report": "上傳報告",
@@ -740,8 +678,6 @@
     "Send Custom Event": "傳送自訂事件",
     "All notifications are currently disabled for all targets.": "目前所有的通知功能已停用。",
     "Failed to send logs: ": "無法傳送除錯訊息： ",
-    "delete the alias.": "刪除別名。",
-    "To return to your account in future you need to <u>set a password</u>": "未來若需回來使用您的帳號，您需要 <u>設定密碼</u>",
     "Forget": "忘記",
     "You cannot delete this image. (%(code)s)": "你不能刪除這個圖片。(%(code)s)",
     "Cancel Sending": "取消傳送",
@@ -768,7 +704,6 @@
     "Noisy": "吵鬧",
     "Files": "檔案",
     "Collecting app version information": "收集應用程式版本資訊",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "刪除聊天室別名 %(alias)s 並從目錄移除 %(name)s？",
     "Enable notifications for this account": "本帳號啟用通知",
     "Invite to this community": "邀請至此社群",
     "Messages containing <span>keywords</span>": "訊息包含 <span>關鍵字</span>",
@@ -778,7 +713,7 @@
     "Forward Message": "轉寄訊息",
     "You have successfully set a password and an email address!": "您已經成功設定密碼與電子郵件地址！",
     "Remove %(name)s from the directory?": "自目錄中移除 %(name)s？",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot 使用了許多先進的瀏覽器功能，有些在你目前所用的瀏覽器上無法使用或僅為實驗中的功能。",
+    "%(brand)s uses many advanced browser features, some of which are not available or experimental in your current browser.": "%(brand)s 使用了許多先進的瀏覽器功能，有些在你目前所用的瀏覽器上無法使用或僅為實驗中的功能。",
     "Developer Tools": "開發者工具",
     "Preparing to send logs": "準備傳送除錯訊息",
     "Explore Account Data": "探索帳號資料",
@@ -823,13 +758,12 @@
     "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.": "除錯訊息包含應用程式的使用資料，包括您的使用者名稱、您所造訪的房間/群組的 ID 或別名、其他使用者的使用者名稱等，其中不包含訊息本身。",
     "Unhide Preview": "取消隱藏預覽",
     "Unable to join network": "無法加入網路",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "你也許不曾在其它 Riot 之外的客戶端設定它們。在 Riot 底下你無法調整它們但其仍然可用",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "可惜，您的瀏覽器 <b>無法</b> 執行 Riot.",
+    "Sorry, your browser is <b>not</b> able to run %(brand)s.": "可惜，您的瀏覽器 <b>無法</b> 執行 %(brand)s.",
     "Messages in group chats": "在群組聊天中的訊息",
     "Yesterday": "昨天",
     "Error encountered (%(errorDetail)s).": "遇到錯誤 (%(errorDetail)s)。",
     "Low Priority": "低優先度",
-    "Riot does not know how to join a room on this network": "Riot 不知道如何在此網路中加入聊天室",
+    "%(brand)s does not know how to join a room on this network": "%(brand)s 不知道如何在此網路中加入聊天室",
     "Set Password": "設定密碼",
     "Off": "關閉",
     "Mentions only": "僅提及",
@@ -847,11 +781,9 @@
     "Quote": "引用",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "您目前的瀏覽器，其應用程式的外觀和感覺可能完全不正確，有些或全部功能可以無法使用。如果您仍想要繼續嘗試，可以繼續，但必須自行承擔後果！",
     "Checking for an update...": "正在檢查更新...",
-    "There are advanced notifications which are not shown here": "有些進階的通知並未在此顯示",
     "Missing roomId.": "缺少聊天室ID。",
     "Every page you use in the app": "您在應用程式內使用的每一頁",
     "e.g. <CurrentPageURL>": "範例：<CurrentPageURL>",
-    "Your User Agent": "您的使用者代理字串",
     "Your device resolution": "您的裝置解析度",
     "Always show encryption icons": "總是顯示加密圖示",
     "Popout widget": "彈出式小工具",
@@ -866,9 +798,6 @@
     "Send analytics data": "傳送分析資料",
     "Muted Users": "已靜音的使用者",
     "e.g. %(exampleValue)s": "範例：%(exampleValue)s",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie (please see our <PolicyLink>Cookie Policy</PolicyLink>).": "請透過傳送<UsageDataLink>匿名使用資料</UsageDataLink>來協助改善 Riot.im。這將會使用 cookie（請參見我們的 <PolicyLink>Cookie 政策</PolicyLink>）。",
-    "Please help improve Riot.im by sending <UsageDataLink>anonymous usage data</UsageDataLink>. This will use a cookie.": "請透過傳送<UsageDataLink>匿名使用資料</UsageDataLink>來協助改善 Riot.im。這將會使用 cookie。",
-    "Yes, I want to help!": "是的，我想要協助！",
     "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>",
     "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 中的訊息可見度類似於電子郵件。我們忘記您的訊息代表您傳送過的訊息不會有任何新的或未註冊的使用者看到，但已註冊且已經看過這些訊息的使用者還是看得到他們的副本。",
@@ -912,9 +841,6 @@
     "Please <a>contact your service administrator</a> to continue using the service.": "請<a>聯絡您的服務管理員</a>以繼續使用服務。",
     "This homeserver has hit its Monthly Active User limit.": "這個主伺服器已經到達其每月活躍使用者限制。",
     "This homeserver has exceeded one of its resource limits.": "此主伺服器已經超過其中一項資源限制。",
-    "Please <a>contact your service administrator</a> to get this limit increased.": "請<a>聯絡您的服務管理員</a>以讓此限制增加。",
-    "This homeserver has hit its Monthly Active User limit so <b>some users will not be able to log in</b>.": "此家伺服器已經達到其每月活躍使用者限制所以<b>某些使用者將會無法登入</b>。",
-    "This homeserver has exceeded one of its resource limits so <b>some users will not be able to log in</b>.": "此家伺服器已超過其中一項資源限制所以<b>某些使用者可能會無法登入</b>。",
     "Upgrade Room Version": "更新聊天室版本",
     "Create a new room with the same name, description and avatar": "使用同樣的名稱、描述與大頭貼建立新聊天室",
     "Update any local room aliases to point to the new room": "更新任何本地聊天室別名以指向新的聊天室",
@@ -934,21 +860,13 @@
     "The room upgrade could not be completed": "聊天室升級可能不完整",
     "Upgrade this room to version %(version)s": "升級此聊天室到版本 %(version)s",
     "Forces the current outbound group session in an encrypted room to be discarded": "強制目前在已加密的聊天室中的外發群組工作階段丟棄",
-    "Registration Required": "需要註冊",
-    "You need to register to do this. Would you like to register now?": "您必須註冊以繼續。您想要現在註冊嗎？",
     "Unable to connect to Homeserver. Retrying...": "無法連線到主伺服器。正在重試……",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s 新增了 %(addedAddresses)s 為此聊天室的位置。",
-    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s 新增了 %(addedAddresses)s 為此聊天室的位置。",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s 移除了 %(removedAddresses)s 為此聊天室的位置。",
-    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s 移除了 %(removedAddresses)s 為此聊天室的位置。",
-    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s 新增了 %(addedAddresses)s 並移除了 %(removedAddresses)s 為此聊天室的位置。",
     "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s 為此聊天室設定了主要位置 %(address)s。",
     "%(senderName)s removed the main address for this room.": "%(senderName)s 移除了此聊天室的主要位置。",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "在遞交紀錄檔前，您必須<a>建立 GitHub 議題</a>以描述您的問題。",
-    "Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Riot 現在僅使用三分之一到五分之一的記憶體，僅在需要時才會載入其他使用者的資訊。請等待我們與伺服器重新同步！",
-    "Updating Riot": "正在更新 Riot",
-    "You've previously used Riot 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, Riot needs to resync your account.": "您之前曾在 %(host)s 上使用 Riot 並啟用成員列表的延遲載入。在此版本中延遲載入已停用。由於本機快取在這兩個設定間不相容，Riot 必須重新同步您的帳號。",
-    "If the other version of Riot is still open in another tab, please close it as using Riot on the same host with both lazy loading enabled and disabled simultaneously will cause issues.": "若其他分頁仍有不同版本的 Riot，請將其關閉，因為在同一個主機上同時啟用和停用延遲載入將會發生問題。",
+    "%(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 現在僅使用三分之一到五分之一的記憶體，僅在需要時才會載入其他使用者的資訊。請等待我們與伺服器重新同步！",
+    "Updating %(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.": "您之前曾在 %(host)s 上使用 %(brand)s 並啟用成員列表的延遲載入。在此版本中延遲載入已停用。由於本機快取在這兩個設定間不相容，%(brand)s 必須重新同步您的帳號。",
     "Incompatible local cache": "不相容的本機快取",
     "Clear cache and resync": "清除快取並重新同步",
     "Please review and accept the policies of this homeserver:": "請審閱並接受此家伺服器的政策：",
@@ -962,38 +880,26 @@
     "Backup version: ": "備份版本： ",
     "Algorithm: ": "演算法： ",
     "Please review and accept all of the homeserver's policies": "請審閱並接受家伺服器的所有政策",
-    "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 Riot to do this": "為了避免遺失您的聊天歷史，您必須在登出前匯出您的聊天室金鑰。您必須回到較新的 Riot 才能執行此動作",
-    "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ": "您先前在 %(host)s 上使用較新的 Riot 版本。要再次與此版本一同使用端到端加密，您將需要登出並再次登入。 ",
+    "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 才能執行此動作",
     "Incompatible Database": "不相容的資料庫",
     "Continue With Encryption Disabled": "在停用加密的情況下繼續",
-    "Enter a passphrase...": "輸入密碼……",
     "Next": "下一個",
     "That matches!": "符合！",
     "That doesn't match.": "不符合。",
     "Go back to set it again.": "回去重新設定它。",
-    "Repeat your passphrase...": "重覆您的密碼……",
-    "As a safety net, you can use it to restore your encrypted message history if you forget your Recovery Passphrase.": "做為安全網，您可以在忘記您的復原密碼時使用它來復原您的加密訊息歷史。",
-    "Your Recovery Key": "您的復原金鑰",
-    "Copy to clipboard": "複製到剪貼簿",
     "Download": "下載",
     "<b>Print it</b> and store it somewhere safe": "<b>列印它</b>並存放在安全的地方",
     "<b>Save it</b> on a USB key or backup drive": "<b>將它儲存</b>到 USB 金鑰或備份磁碟上",
     "<b>Copy it</b> to your personal cloud storage": "<b>將它複製</b> 到您的個人雲端儲存",
     "Set up Secure Message Recovery": "設定安全訊息復原",
-    "Keep it safe": "保持安全",
-    "Create Key Backup": "建立金鑰備份",
     "Unable to create key backup": "無法建立金鑰備份",
     "Retry": "重試",
     "Unable to load backup status": "無法載入備份狀態",
     "Unable to restore backup": "無法復原備份",
     "No backup found!": "找不到備份！",
-    "Backup Restored": "備份已復原",
     "Failed to decrypt %(failedCount)s sessions!": "解密 %(failedCount)s 工作階段失敗！",
-    "Restored %(sessionCount)s session keys": "%(sessionCount)s 工作階段金鑰已復原",
-    "Enter 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>": "如果您忘記您的復原密碼，您可以<button1>使用您的復原金鑰</button1>或<button2>設定新的復原選項</button2>",
-    "Enter Recovery Key": "輸入復原金鑰",
     "This looks like a valid recovery key!": "看起來是有效的復原金鑰！",
     "Not a valid recovery key": "不是有效的復原金鑰",
     "Access your secure message history and set up secure messaging by entering your recovery key.": "存取您的安全訊息歷史並趟過輸入您的復原金鑰來設定安全傳訊。",
@@ -1025,8 +931,6 @@
     "A word by itself is easy to guess": "單字本身很容易猜測",
     "Names and surnames by themselves are easy to guess": "姓名與姓氏本身很容易猜測",
     "Common names and surnames are easy to guess": "常見的名字與姓氏易於猜測",
-    "Great! This passphrase looks strong enough.": "很好！這個密碼看起來夠強了。",
-    "As a safety net, you can use it to restore your encrypted message history.": "做為安全網，您可以使用它來復原您已加密的訊息歷史。",
     "Failed to invite users to the room:": "邀請使用者到聊天室失敗：",
     "There was an error joining the room": "加入聊天室時發生錯誤",
     "You do not have permission to invite people to this room.": "您沒有權限邀請夥伴到此聊天室。",
@@ -1058,7 +962,6 @@
     "Unrecognised address": "無法識別的位置",
     "User %(user_id)s may or may not exist": "使用者 %(user_id)s 可能存在也可能不存在",
     "The following users may not exist": "以下的使用者可能不存在",
-    "Waiting for %(userId)s to confirm...": "正在等待 %(userId)s 確認……",
     "Prompt before sending invites to potentially invalid matrix IDs": "在傳送邀請給潛在的無效 matrix ID 前提示",
     "Unable to find profiles for the Matrix IDs listed below - would you like to invite them anyway?": "找不到下列 Matrix ID 的簡介，您無論如何都想邀請他們嗎？",
     "Invite anyway and never warn me again": "無論如何都要邀請，而且不要再警告我",
@@ -1114,9 +1017,9 @@
     "Theme": "主題",
     "Account management": "帳號管理",
     "Deactivating your account is a permanent action - be careful!": "停用您的帳號是永久動作，請小心！",
-    "For help with using Riot, click <a>here</a>.": "對於使用 Riot 的說明，點選<a>這裡</a>。",
-    "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "對於使用 Riot 的說明，點選<a>這裡</a>或是使用下面的按鈕開始與我們的機器人聊天。",
-    "Chat with Riot Bot": "與 Riot 機器人聊天",
+    "For help with using %(brand)s, click <a>here</a>.": "對於使用 %(brand)s 的說明，點選<a>這裡</a>。",
+    "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>或是使用下面的按鈕開始與我們的機器人聊天。",
+    "Chat with %(brand)s Bot": "與 %(brand)s 機器人聊天",
     "Help & About": "說明與關於",
     "Bug reporting": "錯誤回報",
     "FAQ": "FAQ",
@@ -1127,7 +1030,6 @@
     "Timeline": "時間軸",
     "Autocomplete delay (ms)": "自動完成延遲（毫秒）",
     "Roles & Permissions": "角色與權限",
-    "To link to this room, please add an alias.": "要連結到此聊天室，請新增別名。",
     "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "變更誰可以閱讀歷史紀錄只會套用於此聊天室中未來的訊息。既有歷史紀錄的可見程度將不會變更。",
     "Security & Privacy": "安全與隱私",
     "Encryption": "加密",
@@ -1144,21 +1046,14 @@
     "Room Name": "聊天室名稱",
     "Room Topic": "聊天室主題",
     "Join": "加入",
-    "Use Legacy Verification (for older clients)": "使用舊版驗證（供較舊的客戶端使用）",
-    "Verify by comparing a short text string.": "透過比較短字串驗證。",
-    "Begin Verifying": "開始驗證",
-    "Waiting for partner to accept...": "正在等待夥伴接受……",
-    "Use two-way text verification": "使用雙向文字驗證",
     "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "驗證此使用者以標記他們為受信任的。信任的使用者可以在使用端到端加密訊息時能更加放心。",
     "Waiting for partner to confirm...": "正在等待夥伴確認……",
     "Incoming Verification Request": "來到的驗證請求",
     "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>檢視既有的議題</existingIssuesLink>（並新增 a+1）或是如果您找不到的話，就<newIssueLink>建立新議題</newIssueLink>。",
     "Report bugs & give feedback": "回報臭蟲並給予回饋",
     "Go back": "返回",
-    "Backup could not be decrypted with this key: please verify that you entered the correct recovery key.": "備份無法使用此金鑰解密：請驗證您是否輸入正確的復原金鑰。",
     "Update status": "更新狀態",
     "Set status": "設定狀態",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "您可以透過指定不同的家伺服器 URL 來使用自訂的伺服器選項來登入其他 Matrix 伺服器。這讓您可以與既有的在不同家伺服器上 Matrix 帳號一同使用此應用程式。",
     "Your 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>.": "輸入您模組化伺服器的位置。它可能會使用您自己的域名或是 <a>modular.im</a> 的子網域。",
     "Server Name": "伺服器名稱",
@@ -1261,9 +1156,6 @@
     "Headphones": "耳機",
     "Folder": "資料夾",
     "Pin": "別針",
-    "Recovery Key Mismatch": "復原金鑰不符合",
-    "Incorrect Recovery Passphrase": "不正確的復原通關密語",
-    "Backup could not be decrypted with this passphrase: please verify that you entered the correct recovery passphrase.": "備份無法使用此通關密語解密：請驗證您是否輸入正確的復原通關密語。",
     "This homeserver would like to make sure you are not a robot.": "此家伺服器想要確保您不是機器人。",
     "Change": "變更",
     "Couldn't load page": "無法載入頁面",
@@ -1285,7 +1177,6 @@
     "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "安全地備份您的金鑰以避免遺失它們。<a>更多資訊。</a>",
     "Not now": "不是現在",
     "Don't ask me again": "不要再問我",
-    "Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "沒有出現東西？不是所有客戶端都支援互動式驗證。<button>使用傳統驗證方式</button>。",
     "I don't want my encrypted messages": "我不想要我的加密訊息",
     "Manually export keys": "手動匯出金鑰",
     "You'll lose access to your encrypted messages": "您將會失去對您的加密訊息的存取權",
@@ -1293,29 +1184,17 @@
     "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "如果您遇到臭蟲或是想要與我們分享一些回饋，請讓我們在 GitHub 上知道。",
     "<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>警告</b>：您應該只從信任的電腦設定金鑰備份。",
     "Hide": "隱藏",
-    "We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "我們將會在我們的伺服器上儲存一份加密過的您的金鑰副本。使用通關密語保護您的備份以保障其安全。",
     "For maximum security, this should be different from your account password.": "為了最強的安全性，這應該與您的帳號密碼不一樣。",
-    "Set up with a Recovery Key": "使用復原金鑰設定",
-    "Please enter your passphrase a second time to confirm.": "請再次輸入您的通關密語以確認。",
-    "Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "您的復原金鑰是安全網，如果您忘記您的通關密語的話，您還可以使用它來復原您對加密訊息的存取權。",
     "Your keys are being backed up (the first backup could take a few minutes).": "您的金鑰正在備份（第一次備份會花費數分鐘）。",
-    "Secure your backup with a passphrase": "使用通關密語保障您備份的安全",
-    "Confirm your passphrase": "確認您的通關密語",
-    "Recovery key": "復原金鑰",
     "Success!": "成功！",
     "Changes your display nickname in the current room only": "僅在目前的聊天室變更您的顯示暱稱",
     "%(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 停用鑑別能力。",
     "%(senderDisplayName)s enabled flair for %(newGroups)s and disabled flair for %(oldGroups)s in this room.": "%(senderDisplayName)s 為此聊天室中的 %(newGroups)s 啟用鑑別能力，並為 %(oldGroups)s 停用。",
     "Show read receipts sent by other users": "顯示從其他使用者傳送的讀取回條",
-    "Order rooms in the room list by most important first instead of most recent": "將聊天室清單中的聊天室以最重要而非最近的方式排序",
     "Scissors": "剪刀",
     "Error updating main address": "更新主要位置時發生錯誤",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "更新聊天室的主要位置時發生錯誤。可能是不被伺服器允許或是遇到暫時性的錯誤。",
-    "Error creating alias": "建立別名時發生錯誤",
-    "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "建立別名時發生錯誤。可能是不被伺服器允許或是遇到暫時性的錯誤。",
-    "Error removing alias": "移除別名時發生錯誤",
-    "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "移除別名時發生錯誤。其可能不再存在或是遇到暫時性的錯誤。",
     "Error updating flair": "更新鑑別能力時發生錯誤",
     "There was an error updating the flair for this room. The server may not allow it or a temporary error occurred.": "更新此聊天室的鑑別能力時發生錯誤。可能是伺服器不允許或遇到暫時性的錯誤。",
     "Room Settings - %(roomName)s": "聊天室設定 - %(roomName)s",
@@ -1351,7 +1230,7 @@
     "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>",
     "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> 以獲得最佳體驗。",
+    "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>。我們會在舊版聊天室中貼出到新聊天室的連結，聊天室成員必須點選此連結以加入新聊天室。",
     "Adds a custom widget by URL to the room": "透過 URL 新增自訂小工具到聊天室",
     "Please supply a https:// or http:// widget URL": "請提供 https:// 或 http:// 小工具 URL",
@@ -1369,8 +1248,8 @@
     "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 的小工具想要驗證您的身份。在您允許後，小工具就可以驗證您的使用者 ID，但不能像您一樣執行動作。",
     "Remember my selection for this widget": "記住我對這個小工具的選擇",
     "Deny": "拒絕",
-    "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot 從家伺服器取得協定清單失敗。家伺服器可能太舊了，所以不支援第三方網路。",
-    "Riot failed to get the public room list.": "Riot 取得公開聊天室清單失敗。",
+    "%(brand)s failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "%(brand)s 從家伺服器取得協定清單失敗。家伺服器可能太舊了，所以不支援第三方網路。",
+    "%(brand)s failed to get the public room list.": "%(brand)s 取得公開聊天室清單失敗。",
     "The homeserver may be unavailable or overloaded.": "家伺服器似乎不可用或超載。",
     "You have %(count)s unread notifications in a prior version of this room.|other": "您在此聊天室的先前版本有 %(count)s 個未讀的通知。",
     "You have %(count)s unread notifications in a prior version of this room.|one": "您在此聊天室的先前版本有 %(count)s 個未讀的通知。",
@@ -1398,7 +1277,6 @@
     "Upload %(count)s other files|one": "上傳 %(count)s 個其他檔案",
     "Cancel All": "取消全部",
     "Upload Error": "上傳錯誤",
-    "A conference call could not be started because the integrations server is not available": "因為沒有整合的伺服器，所以無法啟動會議通話",
     "The server does not support the room version specified.": "伺服器不支援指定的聊天室版本。",
     "Name or Matrix ID": "名稱或 Matrix ID",
     "Changes your avatar in this current room only": "僅在目前的聊天室中變更您的大頭貼",
@@ -1467,7 +1345,6 @@
     "Invalid base_url for m.identity_server": "無效的 m.identity_server base_url",
     "Identity server URL does not appear to be a valid identity server": "身份識別伺服器 URL 似乎不是有效的身份識別伺服器",
     "Low bandwidth mode": "低頻寬模式",
-    "Show recently visited rooms above the room list": "在聊天室清單上方顯示最近造訪的聊天室",
     "Uploaded sound": "已上傳的音效",
     "Sounds": "音效",
     "Notification sound": "通知音效",
@@ -1476,8 +1353,8 @@
     "Browse": "瀏覽",
     "Cannot reach homeserver": "無法連線至主伺服器",
     "Ensure you have a stable internet connection, or get in touch with the server admin": "請確定您有穩定的網路連線，或與伺服器管理員聯繫",
-    "Your Riot is misconfigured": "您的 Riot 沒有設定好",
-    "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.": "請要求您的 Riot 管理員檢查<a>您的設定</a>是否有不正確或重覆的項目。",
+    "Your %(brand)s is misconfigured": "您的 %(brand)s 沒有設定好",
+    "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.": "請要求您的 %(brand)s 管理員檢查<a>您的設定</a>是否有不正確或重覆的項目。",
     "Unexpected error resolving identity server configuration": "解析身分識別伺服器設定時發生未預期的錯誤",
     "Use lowercase letters, numbers, dashes and underscores only": "僅能使用小寫字母、數字、破折號與底線",
     "Cannot reach identity server": "無法連線至身分識別伺服器",
@@ -1615,10 +1492,10 @@
     "Code block": "程式碼區塊",
     "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)。您可以試著傳遞這份資訊給聊天室的管理員。",
     "This invite to %(roomName)s was sent to %(email)s which is not associated with your account": "這個 %(roomName)s 的邀請已傳送給與您帳號無關的 %(email)s",
-    "Link this email with your account in Settings to receive invites directly in Riot.": "在設定中連結此電子郵件與您的帳號以直接在 Riot 中接收邀請。",
+    "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": "此 %(roomName)s 的邀請已傳送給 %(email)s",
-    "Use an identity server in Settings to receive invites directly in Riot.": "在設定中使用身份識別伺服器以直接在 Riot 中接收邀請。",
-    "Share this email in Settings to receive invites directly in Riot.": "在設定中分享此電子郵件以直接在 Riot 中接收邀請。",
+    "Use an identity server in Settings to receive invites directly in %(brand)s.": "在設定中使用身份識別伺服器以直接在 %(brand)s 中接收邀請。",
+    "Share this email in Settings to receive invites directly in %(brand)s.": "在設定中分享此電子郵件以直接在 %(brand)s 中接收邀請。",
     "Please fill why you're reporting.": "請填寫為什麼您要回報。",
     "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.": "回報此訊息將會傳送其獨一無二的「活動 ID」給您家伺服器的管理員。如果此聊天室中的訊息已加密，您的家伺服器管理員將無法閱讀訊息文字或檢視任何檔案或圖片。",
@@ -1636,13 +1513,8 @@
     "Changes the avatar of the current room": "變更目前聊天室的大頭貼",
     "Read Marker lifetime (ms)": "讀取標記生命週期（毫秒）",
     "Read Marker off-screen lifetime (ms)": "畫面外讀取標記的生命週期（毫秒）",
-    "Room alias": "聊天室別名",
     "e.g. my-room": "例如：my-room",
-    "Please provide a room alias": "請提供聊天室別名",
-    "This alias is available to use": "此別名可用",
-    "This alias is already in use": "此別名已被使用",
     "Please enter a name for the room": "請輸入聊天室名稱",
-    "Set a room alias to easily share your room with other people.": "設定聊天室別名可以讓您的聊天室比較容易分享給其他人。",
     "This room is private, and can only be joined by invitation.": "此聊天室是私人聊天室，僅能透過邀請加入。",
     "Create a public room": "建立公開聊天室",
     "Create a private room": "建立私人聊天室",
@@ -1725,7 +1597,6 @@
     "Error adding ignored user/server": "新增要忽略的使用者／伺服器錯誤",
     "Something went wrong. Please try again or view your console for hints.": "有東西出問題了。請重試或檢視您的主控臺以取得更多資訊。",
     "Error subscribing to list": "訂閱清單發生錯誤",
-    "Please verify the room ID or alias and try again.": "請驗證聊天室 ID 或別名並再試一次。",
     "Error removing ignored user/server": "移除要忽略的使用者／伺服器發生錯誤",
     "Error unsubscribing from list": "從清單取消訂閱時發生錯誤",
     "Please try again or view your console for hints.": "請重試或檢視您的主控臺以取得更多資訊。",
@@ -1740,7 +1611,7 @@
     "View rules": "檢視規則",
     "You are currently subscribed to:": "您目前已訂閱：",
     "⚠ These settings are meant for advanced users.": "⚠ 這些設定適用於進階使用者。",
-    "Add users and servers you want to ignore here. Use asterisks to have Riot match any characters. For example, <code>@bot:*</code> would ignore all users that have the name 'bot' on any server.": "在此新增您想要忽略的使用者與伺服器。使用星號以讓 Riot 核對所有字元。舉例來說，<code>@bot:*</code> 將會忽略在任何伺服器上，所有有 'bot' 名稱的使用者。",
+    "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> 將會忽略在任何伺服器上，所有有 'bot' 名稱的使用者。",
     "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.": "忽略人們已透過封鎖清單完成，其中包含了誰要被封鎖的規則。訂閱封鎖清單代表被此清單封鎖的使用者／伺服器會對您隱藏。",
     "Personal ban list": "個人封鎖清單",
     "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.": "您的個人封鎖清單包含了您個人不想要看到的所有使用者／伺服器。在忽略您的第一個使用者／伺服器後，您的聊天室清單中會出現新的聊天室，其名為「我的封鎖清單」，留在這個聊天室裡面以讓封鎖清單生效。",
@@ -1749,7 +1620,6 @@
     "Subscribed lists": "已訂閱的清單",
     "Subscribing to a ban list will cause you to join it!": "訂閱封鎖清單會讓您加入它！",
     "If this isn't what you want, please use a different tool to ignore users.": "如果這不是您想要的，請使用不同的工具來忽略使用者。",
-    "Room ID or alias of ban list": "聊天室 ID 或封鎖清單的別名",
     "Subscribe": "訂閱",
     "You have ignored this user, so their message is hidden. <a>Show anyways.</a>": "您已經忽略了這個使用者，所以他們的訊息會隱藏。<a>無論如何都顯示。</a>",
     "Custom (%(level)s)": "自訂 (%(level)s)",
@@ -1765,14 +1635,13 @@
     "Your avatar URL": "您的大頭貼 URL",
     "Your user ID": "您的使用 ID",
     "Your theme": "您的佈景主題",
-    "Riot URL": "Riot URL",
+    "%(brand)s URL": "%(brand)s URL",
     "Room ID": "聊天室 ID",
     "Widget ID": "小工具 ID",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s & your Integration Manager.": "使用這個小工具可能會與 %(widgetDomain)s 以及您的整合管理員分享資料 <helpIcon />。",
     "Using this widget may share data <helpIcon /> with %(widgetDomain)s.": "使用這個小工具可能會與 %(widgetDomain)s 分享資料 <helpIcon /> 。",
     "Widget added by": "小工具新增由",
     "This widget may use cookies.": "這個小工具可能會使用 cookies。",
-    "Enable local event indexing and E2EE search (requires restart)": "啟用本機事件索引與端到端加密搜尋（需要重新啟動）",
     "Connecting to integration manager...": "正在連線到整合管理員……",
     "Cannot connect to integration manager": "無法連線到整合管理員",
     "The integration manager is offline or it cannot reach your homeserver.": "整合管理員已離線或無法存取您的家伺服器。",
@@ -1785,7 +1654,7 @@
     "Integrations are disabled": "整合已停用",
     "Enable 'Manage Integrations' in Settings to do this.": "在設定中啟用「管理整合」以執行此動作。",
     "Integrations not allowed": "不允許整合",
-    "Your Riot doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "您的 Riot 不允許您使用整合管理員來執行此動作。請聯絡管理員。",
+    "Your %(brand)s doesn't allow you to use an Integration Manager to do this. Please contact an admin.": "您的 %(brand)s 不允許您使用整合管理員來執行此動作。請聯絡管理員。",
     "Reload": "重新載入",
     "Take picture": "拍照",
     "Remove for everyone": "對所有人移除",
@@ -1793,7 +1662,6 @@
     "Decline (%(counter)s)": "拒絕 (%(counter)s)",
     "Manage integrations": "管理整合",
     "Verification Request": "驗證請求",
-    " (1/%(totalCount)s)": " (1/%(totalCount)s)",
     "Match system theme": "符合系統佈景主題",
     "%(senderName)s placed a voice call.": "%(senderName)s 撥打了語音通話。",
     "%(senderName)s placed a voice call. (not supported by this browser)": "%(senderName)s 撥打了語音通話。（不被此瀏覽器支援）",
@@ -1809,7 +1677,7 @@
     "Upgrade private room": "升級私密聊天室",
     "Upgrade public room": "升級公開聊天室",
     "Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.": "升級聊天室為進階動作，通常建議在聊天室因為臭蟲而不穩定、缺少功能或安全漏洞等才升級。",
-    "This usually only affects how the room is processed on the server. If you're having problems with your Riot, please <a>report a bug</a>.": "這通常僅影響如何在伺服器上處理聊天室的方式。如果您遇到與 Riot 相關的問題，請<a>回報臭蟲</a>。",
+    "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>。",
     "You'll upgrade this room from <oldVersion /> to <newVersion />.": "您將要把此聊天室從 <oldVersion /> 升級到 <newVersion />。",
     "Upgrade": "升級",
     "Notification settings": "通知設定",
@@ -1835,7 +1703,6 @@
     "%(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",
-    "Send cross-signing keys to homeserver": "將交叉簽章的金鑰傳送到家伺服器",
     "Cross-signing public keys:": "交叉簽章的公開金鑰：",
     "not found": "找不到",
     "Cross-signing private keys:": "交叉簽章的私密金鑰：",
@@ -1843,9 +1710,6 @@
     "Secret storage public key:": "秘密儲存空間公開金鑰：",
     "in account data": "在帳號資料中",
     "Cross-signing": "交叉簽章",
-    "Enter secret storage passphrase": "輸入秘密儲存空間密碼",
-    "Unable to access secret storage. Please verify that you entered the correct passphrase.": "無法存取秘密儲存空間。請驗證您是否輸入了正確的密碼。",
-    "<b>Warning</b>: You should only access secret storage from a trusted computer.": "<b>警告</b>：您應該僅從信任的電腦存取秘密儲存空間。",
     "Cross-signing and secret storage are enabled.": "已啟用交叉簽章與秘密儲存空間。",
     "Cross-signing and secret storage are not yet set up.": "尚未設定交叉簽章與秘密儲存空間。",
     "Bootstrap cross-signing and secret storage": "啟動交叉簽章與秘密儲存空間",
@@ -1857,19 +1721,11 @@
     "Hide verified sessions": "隱藏已驗證的工作階段",
     "%(count)s verified sessions|other": "%(count)s 個已驗證的工作階段",
     "%(count)s verified sessions|one": "1 個已驗證的工作階段",
-    "If you've forgotten your passphrase you can <button1>use your recovery key</button1> or <button2>set up new recovery options</button2>.": "如果您忘記您的密碼，您可以<button1>使用您的復原金鑰</button1>或<button2>設定新的復原選項</button2>。",
-    "Enter secret storage recovery key": "輸入秘密儲存空間復原金鑰",
-    "Unable to access secret storage. Please verify that you entered the correct recovery key.": "無法存取秘密儲存空間。請驗證您是否輸入了正確的復原金鑰。",
-    "If you've forgotten your recovery key you can <button>set up new recovery options</button>.": "如果您忘記您的復原金鑰，您可以<button>設定新的復原選項</button>。",
     "<b>Warning</b>: You should only set up key backup from a trusted computer.": "<b>警告</b>：您應該只從信任的電腦設定金鑰備份。",
     "If you've forgotten your recovery key you can <button>set up new recovery options</button>": "如果您忘記您的復原金鑰，您可以<button>設定新的復原選項</button>",
     "Set up with a recovery key": "設定復原金鑰",
-    "As a safety net, you can use it to restore your access to encrypted messages if you forget your passphrase.": "作為安全網，如果您忘記您的密碼的話，您可以使用它來恢復您對加密訊息的存取。",
-    "As a safety net, you can use it to restore your access to encrypted messages.": "作為安全網，您可以使用它來恢復您對加密訊息的存取。",
-    "Keep your recovery key somewhere very secure, like a password manager (or a safe).": "將您的復原金鑰保留在某個非常安全的地方，如密碼管理員（或保險櫃）中。",
     "Your recovery key has been <b>copied to your clipboard</b>, paste it to:": "您的復原金鑰已被<b>複製到您的剪貼簿</b>，請將其貼到：",
     "Your recovery key is in your <b>Downloads</b> folder.": "您的復原金鑰在您的<b>下載</b>資料夾中。",
-    "Storing secrets...": "正在儲存秘密……",
     "Unable to set up secret storage": "無法設定秘密儲存空間",
     "Close preview": "關閉預覽",
     "Language Dropdown": "語言下拉式選單",
@@ -1885,7 +1741,6 @@
     "Suggestions": "建議",
     "Failed to find the following users": "找不到以下使用者",
     "The following users might not exist or are invalid, and cannot be invited: %(csvNames)s": "以下使用者可能不存在或無效，且無法被邀請：%(csvNames)s",
-    "Show a presence dot next to DMs in the room list": "在聊天室清單中的直接訊息旁顯示上線狀態點",
     "Lock": "鎖定",
     "Restore": "還原",
     "a few seconds ago": "數秒前",
@@ -1904,8 +1759,6 @@
     "%(num)s days from now": "從現在開始 %(num)s 天",
     "Failed to invite the following users to chat: %(csvUsers)s": "邀請使用者加入聊天失敗：%(csvUsers)s",
     "We couldn't create your DM. Please check the users you want to invite and try again.": "我們無法建立您的直接對話。請檢查您想要邀請的使用者並再試一次。",
-    "Complete security": "完全安全",
-    "Verify this session to grant it access to encrypted messages.": "驗證此工作階段以取得對已加密訊息的存取權限。",
     "Start": "開始",
     "Session verified": "工作階段已驗證",
     "Your new session is now verified. It has access to your encrypted messages, and other users will see it as trusted.": "您的新工作階段已驗證。其對您的已加密訊息有存取權，其他使用者也將會看到其受信任。",
@@ -1916,7 +1769,6 @@
     "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.": "我們無法邀請那些使用者。請檢查您想要邀請的使用者並再試一次。",
     "Recently Direct Messaged": "最近傳送過直接訊息",
-    "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "如果您找不到某人，請詢問他們的使用者名稱（範例：@user:server.com）或<a>分享此聊天室</a>。",
     "Verify User": "驗證使用者",
     "For extra security, verify this user by checking a one-time code on both of your devices.": "為了提高安全性，請透過檢查您兩個裝置上的一次性代碼來驗證此使用者。",
     "Start Verification": "開始驗證",
@@ -1925,39 +1777,24 @@
     "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "您可以使用 <code>/help</code> 來列出可用的指令。您是要傳送此訊息嗎？",
     "Hint: Begin your message with <code>//</code> to start it with a slash.": "提示：以 <code>//</code> 開頭讓您的訊息傳送時可以用斜線開頭。",
     "Send as message": "以訊息傳送",
-    "%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room|other": "%(senderName)s 向此聊天室新增了 %(addedAddresses)s 與其他 %(count)s 個地址",
-    "%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room|other": "%(senderName)s 從此聊天室移除了 %(removedAddresses)s 與其他 %(count)s 個地址",
-    "%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room": "%(senderName)s 對此聊天室移除了 %(countRemoved)s 個並新增了 %(countAdded)s 地址到此聊天室",
-    "%(senderName)s turned on end-to-end encryption.": "%(senderName)s 開啟了端到端加密。",
-    "%(senderName)s turned on end-to-end encryption (unrecognised algorithm %(algorithm)s).": "%(senderName)s 開啟了端到端加密（無法識別的演算法 %(algorithm)s）。",
     "This room is end-to-end encrypted": "此聊天室已端到端加密",
     "Everyone in this room is verified": "此聊天室中每個人都已驗證",
     "Invite only": "僅邀請",
     "Send a reply…": "傳送回覆……",
     "Send a message…": "傳送訊息……",
     "Reject & Ignore user": "回絕並忽略使用者",
-    "If you can't find someone, ask them for their username, share your username (%(userId)s) or <a>profile link</a>.": "如果您找不到某人，請詢問他們以取得他們的使用者名稱，分享您的使用者名稱 (%(userId)s) 或<a>簡介連結</a>。",
     "Enter your account password to confirm the upgrade:": "輸入您的帳號密碼以確認升級：",
     "You'll need to authenticate with the server to confirm the upgrade.": "您必須透過伺服器驗證以確認升級。",
-    "Secure your encryption keys with a passphrase. For maximum security this should be different to your account password:": "使用通關密語保護您的加密金鑰。為了取得最強的安全性，此通關密語應與您的帳號密碼不同：",
-    "Enter a passphrase": "輸入通關密語",
-    "Enter your passphrase a second time to confirm it.": "輸入您的通關密語兩次以確認。",
-    "Verify other users in their profile.": "透過他們的簡介驗證其他使用者。",
     "Upgrade your encryption": "升級您的加密",
     "Set up encryption": "設定加密",
-    "Encryption upgraded": "加密已升級",
-    "Encryption setup complete": "加密設定完成",
-    "There are unknown sessions in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "聊天室中有未知的工作階段：如果您不驗證它們就繼續，就有可能讓人監聽的您的通話。",
     "Verify this session": "驗證此工作階段",
     "Encryption upgrade available": "已提供加密升級",
-    "Unverified session": "未驗證的工作階段",
     "Verifies a user, session, and pubkey tuple": "驗證使用者、工作階段與公開金鑰組合",
     "Unknown (user, session) pair:": "未知（使用者、工作階段）配對：",
     "Session already verified!": "工作階段已驗證！",
     "WARNING: Session already verified, but keys do NOT MATCH!": "警告：工作階段已驗證、但金鑰不符合！",
     "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」。這可能代表您的通訊已被攔截！",
     "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 收到的簽署金鑰。工作階段標記為已驗證。",
-    "Enable cross-signing to verify per-user instead of per-session (in development)": "啟用交叉簽章以驗證使用者而非工作階段（開發中）",
     "Never send encrypted messages to unverified sessions from this session": "不要從此工作階段傳送已加密的訊息給未驗證的工作階段",
     "Never send encrypted messages to unverified sessions in this room from this session": "不要從此工作階段傳送已加密的訊息給此聊天室中未驗證的工作階段",
     "Enable message search in encrypted rooms": "在已加密的聊天室中啟用訊息搜尋",
@@ -1965,7 +1802,6 @@
     "They match": "它們符合",
     "They don't match": "它們不符合",
     "To be secure, do this in person or use a trusted way to communicate.": "為了安全，請親自進行或使用可信的通訊方式。",
-    "Verify your other sessions easier": "更容易地驗證您其他的工作階段",
     "Review": "評論",
     "This bridge was provisioned by <user />.": "此橋接是由 <user /> 設定。",
     "Workspace: %(networkName)s": "工作空間：%(networkName)s",
@@ -1984,8 +1820,7 @@
     "Manage": "管理",
     "Securely cache encrypted messages locally for them to appear in search results.": "將加密的訊息安全地在本機快取以出現在顯示結果中。",
     "Enable": "啟用",
-    "Riot is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Riot Desktop with <nativeLink>search components added</nativeLink>.": "Riot 缺少某些在本機快取已加密訊習所需的元件。如果您想要實驗此功能，請<nativeLink>加入搜尋元件</nativeLink>並自行建構 Riot 桌面版。",
-    "Riot can't securely cache encrypted messages locally while running in a web browser. Use <riotLink>Riot Desktop</riotLink> for encrypted messages to appear in search results.": "Riot 無法在網路瀏覽器中安全地在本機快取已加密的訊息。使用 <riotLink>Riot 桌面版</riotLink>來讓已加密的訊息出現在搜尋結果中。",
+    "%(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 缺少某些在本機快取已加密訊習所需的元件。如果您想要實驗此功能，請<nativeLink>加入搜尋元件</nativeLink>並自行建構 %(brand)s 桌面版。",
     "This session is backing up your keys. ": "此工作階段正在備份您的金鑰。 ",
     "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>，但您已有既有的備份，您可以從那邊復原，或是稍後再做。",
     "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.": "在登出前，請先將此工作階段連線到金鑰備份以避免遺失任何可能僅在此工作階段中的金鑰。",
@@ -1999,7 +1834,6 @@
     "Backup has an <validity>invalid</validity> signature from <verify>unverified</verify> session <device></device>": "備份有從<verify>未驗證</verify>的工作階段 <device></device> 的<validity>無效</validity>簽章",
     "Backup is not signed by any of your sessions": "備份未被您的任何工作階段簽署",
     "This backup is trusted because it has been restored on this session": "此備份已受信任，因為它已在此工作階段上復原",
-    "Backup key stored in secret storage, but this feature is not enabled on this session. Please enable cross-signing in Labs to modify key backup state.": "備份金鑰已儲存在秘密儲存空間，但此功能未在此工作階段上啟用。請在實驗室中啟用簽章以修改金鑰備份狀態。",
     "Your keys are <b>not being backed up from this session</b>.": "您的金鑰<b>沒有從此工作階段備份</b>。",
     "Enable desktop notifications for this session": "為此工作階段啟用桌面通知",
     "Enable audible notifications for this session": "為此工作階段啟用聲音通知",
@@ -2007,26 +1841,19 @@
     "Session ID:": "工作階段 ID：",
     "Session key:": "工作階段金鑰：",
     "Message search": "訊息搜尋",
-    "Sessions": "工作階段",
     "A session's public name is visible to people you communicate with": "工作階段的公開名稱可被您通訊的夥伴看到",
     "This room is bridging messages to the following platforms. <a>Learn more.</a>": "此聊天室已橋接訊息到以下平臺。<a>取得更多詳細資訊。</a>",
     "This room isn’t bridging messages to any platforms. <a>Learn more.</a>": "此聊天室未橋接訊息到任何平臺。<a>取得更多詳細資訊。</a>",
     "Bridges": "橋接",
     "This user has not verified all of their sessions.": "此使用者尚未驗證他們的所有工作階段。",
-    "You have not verified this user. This user has verified all of their sessions.": "您尚未驗證此使用者。此使用者已驗證他們所有的工作階段。",
     "You have verified this user. This user has verified all of their sessions.": "您已驗證此使用者。此使用者已驗證他們所有的工作階段。",
     "Someone is using an unknown session": "某人正仔使用未知的工作階段",
-    "Some sessions for this user are not trusted": "此使用者的某些工作階段未受信任",
-    "All sessions for this user are trusted": "此使用者的所有工作階段皆受信任",
-    "Some sessions in this encrypted room are not trusted": "此已加密的聊天室中的某些工作階段未受信任",
-    "All sessions in this encrypted room are trusted": "在此已加密聊天室的所有工作階段都受信任",
     "Your key share request has been sent - please check your other sessions for key share requests.": "您的金鑰分享請求已傳送，請檢查您其他的工作階段以取得金鑰分享請求。",
     "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.": "金鑰分享請求已自動傳送到您其他的工作階段。如果您在您其他的工作階段上拒絕或忽略金鑰分享請求，點擊此處以再此請求此工作階段的金鑰。",
     "If your other sessions do not have the key for this message you will not be able to decrypt them.": "如果您的其他工作階段沒有此訊息的金鑰，您就無法解密它們。",
     "<requestLink>Re-request encryption keys</requestLink> from your other sessions.": "從您的其他工作階段<requestLink>重新請求加密金鑰</requestLink>。",
     "Encrypted by an unverified session": "已由未驗證的工作階段加密",
     "Encrypted by a deleted session": "被已刪除的工作階段加密",
-    "No sessions with registered encryption keys": "沒有已註冊加密金鑰的工作階段",
     "Waiting for %(displayName)s to accept…": "正在等待 %(displayName)s 接受……",
     "Your messages are secured and only you and the recipient have the unique keys to unlock them.": "您的訊息已受保護，只有您與收件人才有獨一無二的金鑰將其解鎖。",
     "Your messages are not secure": "您的訊息不安全",
@@ -2044,94 +1871,59 @@
     "If you can't scan the code above, verify by comparing unique emoji.": "如果您無法掃描上面的條碼，請透過比較獨一無二的表情符號驗證。",
     "You've successfully verified %(displayName)s!": "您已成功驗證 %(displayName)s！",
     "Got it": "好的",
-    "Verification timed out. Start verification again from their profile.": "驗證逾時。再次從他們的簡介中開始驗證。",
-    "%(displayName)s cancelled verification. Start verification again from their profile.": "%(displayName)s 已取消驗證。再次從他們的簡介中開始驗證。",
-    "You cancelled verification. Start verification again from their profile.": "您取消了驗證。再次從他們的簡介中開始驗證。",
     "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.": "將會永久清除此工作階段的所有資料。除發已備份金鑰，否則已加密的訊息將會遺失。",
     "Verify session": "驗證工作階段",
-    "To verify that this session can be trusted, please check that the key you see in User Settings on that device matches the key below:": "要驗證此工作階段是否可受信任，請檢查您在裝置上的使用者設定中看到的金鑰是否與下方的金鑰相符：",
-    "To verify that this session can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this session matches the key below:": "要驗證此工作階段是否可受信任，請透過其他方式（如面對面或電話）聯絡其所有人，並詢問他們在他們的使用者設定中看到的金鑰是否與下面的相同：",
     "Session name": "工作階段名稱",
     "Session key": "工作階段金鑰",
-    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this session and you probably want to press the blacklist button instead.": "如果其相符，請按下方的驗證按鈕。如果不相符，則表示可能有其他人正在攔截此工作階段，您可能會想要改按黑名單按鈕。",
     "Verifying this user will mark their session as trusted, and also mark your session as trusted to them.": "驗證此使用者將會把他們的工作階段標記為受信任，並同時為他們標記您的工作階段可受信任。",
-    "You added a new session '%(displayName)s', which is requesting encryption keys.": "您加入了一個新的工作階段「%(displayName)s」，其正在請求加密金鑰。",
-    "Your unverified session '%(displayName)s' is requesting encryption keys.": "您的未驗證工作階段「%(displayName)s」正在請求加密金鑰。",
-    "Loading session info...": "正在載入工作階段資訊……",
     "New session": "新工作階段",
     "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.": "如果您未登入此工作階段，您的帳號可能已被盜用。",
     "This wasn't me": "這不是我",
     "This will allow you to return to your account after signing out, and sign in on other sessions.": "退出後，您可以回到您的帳號，並登入其他工作階段。",
-    "You are currently blacklisting unverified sessions; to send messages to these sessions you must verify them.": "您目前正將未驗證的工作階段加入黑名單；要傳送訊息給這些作階段，您必須驗證它們。",
-    "We recommend you go through the verification process for each session to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "我們建議您對每個工作階段進行驗證流程以確認它們屬於其合法所有者，但如果您願意的話，您還是可以不經驗證就重新傳送訊息。",
-    "Room contains unknown sessions": "聊天室包含未知的工作階段",
-    "\"%(RoomName)s\" contains sessions that you haven't seen before.": "「%(RoomName)s」包含您以前沒看過的工作階段。",
-    "Unknown sessions": "未知的工作階段",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your passphrase.": "透過輸入您的通關密語來存取您的安全訊息歷史，以及用來驗證其他工作階段的交叉簽章身份。",
-    "Access your secure message history and your cross-signing identity for verifying other sessions by entering your recovery key.": "透過輸入您的復原金鑰來存取您的安全訊息歷史，以及用來驗證其他工作階段的交叉簽章身份。",
-    "Message not sent due to unknown sessions being present": "因為有未知的工作階段，所以並未傳送訊息",
-    "<showSessionsText>Show sessions</showSessionsText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showSessionsText>顯示工作階段</showSessionsText>，<sendAnywayText>無論如何都要傳送</sendAnywayText>或<cancelText>取消</cancelText>。",
     "Your new session is now verified. Other users will see it as trusted.": "您新的工作階段已驗證。其他使用者將會看到其已受信任。",
     "Without completing security on this session, it won’t have access to encrypted messages.": "如果在此工作階段中沒有完成安全性驗證，它將無法存取已加密的訊息。",
     "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.": "變更您的密碼將會重設您所有的工作階段上任何端到端加密金鑰，讓已加密的聊天歷史無法讀取。設定金鑰備份或在重設您的密碼前從其他工作階段匯出您的聊天室金鑰。",
     "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.": "您已登出所有工作階段，且將不會再收到推播通知。要重新啟用通知，請在每個裝置上重新登入。",
     "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.": "重新取得對您的帳號的存取權限，並復原此工作階段中的復原金鑰。沒有它們，您就無法在任何工作階段中閱讀您所有的安全訊息。",
     "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.": "警告：您的個人資料（包含加密金鑰）仍儲存在此工作階段中。如果您已不用此工作階段了，或是您想登入另一個帳號，就請將其清除。",
-    "Sender session information": "傳送者工作階段資訊",
     "Restore your key backup to upgrade your encryption": "復原您的金鑰備份以升級您的加密",
     "Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "升級此工作階段以允許驗證其他工作階段，給予它們存取加密訊息的權限，並為其他使用者標記它們為受信任。",
-    "Set up encryption on this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "在此工作階段上設定加密以使其可以驗證其他工作階段，給它們對已加密訊息的存取權，並將它們對其他使用者標記為受信任。",
-    "Back up my encryption keys, securing them with the same passphrase": "備份我的加密金鑰，使用相同的通關密語保護它們",
-    "This session can now verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.": "這個工作階段現在可以驗證其他工作階段，給它們對已加密訊息的存取權，並將它們對其他使用者標記為受信任。",
     "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.": "沒有設定安全訊息復原，如果您登出的或是用其他工作階段的話，您就無法復原您已加密的訊習歷史。",
     "This session is encrypting history using the new recovery method.": "此工作階段正在使用新的復原方法加密歷史。",
     "This session has detected that your recovery passphrase and key for Secure Messages have been removed.": "此工作階段已偵測到您的復原通關密語與安全訊息金鑰已被移除。",
-    "Keep secret storage passphrase in memory for this session": "此工作階段會將秘密儲存空間通關密語置於記憶體中",
-    "Confirm the emoji below are displayed on both devices, in the same order:": "確認以下顯示的表情符號以相同的順序顯示在兩個裝置上：",
-    "Verify this device by confirming the following number appears on its screen.": "透過確認以下顯示在螢幕上的數字來驗證此裝置。",
     "Mod": "模組",
     "Encryption enabled": "加密已啟用",
     "Messages in this room are end-to-end encrypted. Learn more & verify this user in their user profile.": "此聊天室中的訊息已端到端加密。了解更多資訊並在使用者的個人檔案中驗證使用者。",
     "Encryption not enabled": "加密未啟用",
     "The encryption used by this room isn't supported.": "不支援此聊天室使用的加密。",
     "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.": "驗證此裝置以標記其為受信任。",
-    "Show padlocks on invite only rooms": "在僅邀請的聊天室上顯示掛鎖",
     "Verifying this device will mark it as trusted, and users who have verified with you will trust this device.": "驗證此裝置將會將其標記為受信任，且已驗證您的使用者將會信任此裝置。",
     "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 disabled, messages from encrypted rooms won't appear in search results.": "若停用，從已加密的聊天室而來的訊息將不會出現在搜尋結果中。",
     "Disable": "停用",
-    "Not currently downloading messages for any room.": "目前未下載任何聊天室的訊息。",
-    "Downloading mesages for %(currentRoom)s.": "正在下載 %(currentRoom)s 的訊息。",
-    "Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot 正在安全地本機快取已加密的訊息以讓它們顯示在搜尋結果中：",
+    "%(brand)s is securely caching encrypted messages locally for them to appear in search results:": "%(brand)s 正在安全地本機快取已加密的訊息以讓它們顯示在搜尋結果中：",
     "Space used:": "已使用空間：",
     "Indexed messages:": "已索引的訊息：",
-    "Number of rooms:": "聊天室數量：",
     "Setting up keys": "設定金鑰",
     "How fast should messages be downloaded.": "訊息應多快下載一次。",
     "Verify yourself & others to keep your chats safe": "驗證您自己與其他以保證您的聊天安全",
     "You have not verified this user.": "您尚未驗證此使用者。",
     "Recovery key mismatch": "復原金鑰不相符",
     "Incorrect recovery passphrase": "錯誤的復原通關密語",
-    "Backup restored": "備份已復原",
     "Enter recovery passphrase": "輸入復原通關密語",
     "Enter recovery key": "輸入復原金鑰",
     "Confirm your identity by entering your account password below.": "透過在下方輸入您的帳號密碼來確認身份。",
     "Keep a copy of it somewhere secure, like a password manager or even a safe.": "將其副本保存在安全的地方，如密碼管理器或保險箱等。",
     "Your recovery key": "您的復原金鑰",
     "Copy": "副本",
-    "You can now verify your other devices, and other users to keep your chats safe.": "您現在可以驗證您的其他裝置與其他使用者以保護您的聊天安全。",
     "Make a copy of your recovery key": "複製您的復原金鑰",
-    "You're done!": "您已經完成了！",
     "Create key backup": "建立金鑰備份",
     "Message downloading sleep time(ms)": "訊息下載休眠時間（毫秒）",
-    "of ": "的 ",
     "Indexed rooms:": "已索引的聊天室：",
-    "%(crawlingRooms)s out of %(totalRooms)s": "%(totalRooms)s 中的 %(crawlingRooms)s",
     "If you cancel now, you won't complete verifying the other user.": "如果您現在取消，您將無法完成驗證其他使用者。",
     "If you cancel now, you won't complete verifying your other session.": "如果您現在取消，您將無法完成驗證您其他的工作階段。",
-    "If you cancel now, you won't complete your secret storage operation.": "如果您現在取消，您將無法完成驗證您的秘密儲存空間動作。",
     "Cancel entering passphrase?": "取消輸入通關密語？",
     "Show typing notifications": "顯示打字通知",
     "Reset cross-signing and secret storage": "重設交叉簽章與秘密儲存空間",
@@ -2146,18 +1938,13 @@
     "Not Trusted": "未受信任",
     "%(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.": "要求此使用者驗證他們的工作階段，或在下方手動驗證。",
-    "Manually Verify": "手動驗證",
     "Verify by scanning": "透過掃描來驗證",
-    "The version of Riot": "Riot 版本",
-    "Whether you're using Riot on a device where touch is the primary input mechanism": "您是否在以觸控為主要機制的裝置上使用 Riot",
-    "Whether you're using Riot as an installed Progressive Web App": "您是否使用 PWA 形式的 Riot",
+    "Whether you're using %(brand)s on a device where touch is the primary input mechanism": "您是否在以觸控為主要機制的裝置上使用 %(brand)s",
+    "Whether you're using %(brand)s as an installed Progressive Web App": "您是否使用 PWA 形式的 %(brand)s",
     "Your user agent": "您的使用者代理字串",
-    "The information being sent to us to help make Riot better includes:": "傳送給我們以協助改進 Riot 的資訊包含了：",
-    "The session you are trying to verify doesn't support scanning a QR code or emoji verification, which is what Riot supports. Try with a different client.": "您嘗試驗證的工作階段不支援 Riot 支援的掃描 QR code 或顏文字驗證。請用其他客戶端試試看。",
+    "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 支援的掃描 QR code 或顏文字驗證。請用其他客戶端試試看。",
     "You declined": "您拒絕了",
     "%(name)s declined": "%(name)s 拒絕了",
-    "accepting …": "正在接受……",
-    "declining …": "正在拒絕……",
     "Your homeserver does not support cross-signing.": "您的家伺服器不支援交叉簽章。",
     "Homeserver feature support:": "家伺服器功能支援：",
     "exists": "存在",
@@ -2181,7 +1968,6 @@
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "要回報與 Matrix 有關的安全性問題，請閱讀 Matrix.org <a>安全性揭露政策</a>。",
     "Mark all as read": "全部標示為已讀",
     "Not currently indexing messages for any room.": "目前未為任何聊天室編寫索引。",
-    "Currently indexing: %(currentRoom)s.": "目前正在製作索引：%(currentRoom)s。",
     "%(doneRooms)s out of %(totalRooms)s": "%(totalRooms)s 中的 %(doneRooms)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。",
@@ -2190,20 +1976,14 @@
     "%(senderName)s changed the alternative addresses for this room.": "%(senderName)s 為此聊天是變更了替代位置。",
     "%(senderName)s changed the main and alternative addresses for this room.": "%(senderName)s 為此聊天是變更了主要及替代位置。",
     "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "更新聊天室的替代位置時發生錯誤。伺服器可能不允許這麼做，或是昱到了暫時性的故障。",
-    "Alternative addresses for this room:": "此聊天是的替代位置：",
-    "This room has no alternative addresses": "此聊天室沒有替代位置",
-    "New address (e.g. #foo:domain)": "新位置（例如：#foo:domain）",
-    "Local addresses (unmoderated content)": "本機位置（未經審核的內容）",
     "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s.": "%(senderDisplayName)s 將聊天室名稱從 %(oldRoomName)s 變更為 %(newRoomName)s。",
     "%(senderName)s changed the addresses for this room.": "%(senderName)s 變更了此聊天室的位置。",
-    "You don't have permission to delete the alias.": "您沒有刪除別名的權限。",
     "Support adding custom themes": "支援新增自訂佈景主題",
     "Invalid theme schema.": "無效的佈景主題架構。",
     "Error downloading theme information.": "下載佈景主題資訊時發生錯誤。",
     "Theme added!": "已新增佈景主題！",
     "Custom theme URL": "自訂佈景主題 URL",
     "Add theme": "新增佈景主題",
-    "Review Sessions": "檢閱工作階段",
     "Scroll to most recent messages": "捲動到最新訊息",
     "Local address": "本機位置",
     "Published Addresses": "發佈的位置",
@@ -2213,9 +1993,6 @@
     "New published address (e.g. #alias:server)": "新的已發佈位置（例如：#alias:server）",
     "Local Addresses": "本機位置",
     "Set addresses for this room so users can find this room through your homeserver (%(localDomain)s)": "為此聊天室設定位置讓使用者可以透過您的家伺服器找到此聊天室 (%(localDomain)s)",
-    "Open an existing session & use it to verify this one, granting it access to encrypted messages.": "開啟既有的工作階段並使用它來驗證此工作階段，並授予其存取已加密訊息的權限。",
-    "Waiting…": "等待中……",
-    "If you can’t access one, <button>use your recovery key or passphrase.</button>": "如果您無法存取裝置，<button>使用您的復原金鑰或通關密語。</button>",
     "Enter a server name": "輸入伺服器名稱",
     "Looks good": "看起來不錯",
     "Can't find this server or its room list": "找不到此伺服器或其聊天室清單",
@@ -2236,10 +2013,9 @@
     "a new cross-signing key signature": "新的交叉簽署金鑰簽章",
     "a device cross-signing signature": "裝置交叉簽署簽章",
     "a key signature": "金鑰簽章",
-    "Riot encountered an error during upload of:": "Riot 在上傳以下內容時遇到錯誤：",
+    "%(brand)s encountered an error during upload of:": "%(brand)s 在上傳以下內容時遇到錯誤：",
     "Upload completed": "上傳完成",
     "Cancelled signature upload": "已取消簽章上傳",
-    "Unabled to upload": "無法上傳",
     "Signature upload success": "簽章上傳成功",
     "Signature upload failed": "簽章上傳失敗",
     "Navigation": "導航",
@@ -2254,7 +2030,6 @@
     "Toggle Bold": "切換粗體",
     "Toggle Italics": "切換斜體",
     "Toggle Quote": "切換引用",
-    "Toggle Markdown": "切換 Markdown",
     "New line": "新行",
     "Navigate recent messages to edit": "瀏覽最近的消息以進行編輯",
     "Jump to start/end of the composer": "跳到編輯區的開頭／結尾",
@@ -2288,16 +2063,11 @@
     "Previous/next unread room or DM": "上一下／下一個未讀聊天室或直接訊息",
     "Previous/next room or DM": "上一個／下一個聊天室或直接訊息",
     "Toggle right panel": "切換右側面板",
-    "Secret Storage key format:": "秘密儲存金鑰格式：",
-    "outdated": "太舊了",
-    "up to date": "已為最新",
     "Self signing private key:": "自行簽章私鑰：",
     "cached locally": "本機快取",
     "not found locally": "在本機找不到",
     "User signing private key:": "使用者簽章私鑰：",
-    "Unverified login. Was this you?": "未驗證的登入。是您嗎？",
     "Manually verify all remote sessions": "手動驗證所有遠端工作階段",
-    "Update your secure storage": "更新您的安全儲存空間",
     "Individually verify each session used by a user to mark it as trusted, not trusting cross-signed devices.": "單獨驗證使用者使用的每個工作階段以將其標記為受信任，而非信任交叉簽章的裝置。",
     "In encrypted rooms, your messages are secured and only you and the recipient have the unique keys to unlock them.": "在已加密的聊天室中，您的訊息相當安全，只有您與接收者有獨一無二的金鑰可以將其解鎖。",
     "Verify all users in a room to ensure it's secure.": "驗證所有在聊天室中的使用者以確保其安全。",
@@ -2361,32 +2131,20 @@
     "Failed to set topic": "設定主題失敗",
     "Command failed": "指令失敗",
     "Could not find user in room": "在聊天室中找不到使用者",
-    "Use an existing session to verify this one, granting it access to encrypted messages.": "使用既有的工作階段來驗證這個，授予其對加密訊息的存取權限。",
-    "Use your other device to continue…": "使用您其他的裝置繼續……",
     "Syncing...": "正在同步……",
     "Signing In...": "正在登入……",
     "If you've joined lots of rooms, this might take a while": "如果您已加入很多聊天室，這可能需要一點時間",
     "If you cancel now, you won't complete your operation.": "如果您現在取消，您將無法完成您的操作。",
-    "Enable cross-signing to verify per-user instead of per-session": "啟用交叉簽章可以使用者為單位進行驗證，而非驗證每個工作階段",
-    "Keep recovery passphrase in memory for this session": "在此工作階段中將復原通關密語保留在記憶體中",
     "Verify other session": "驗證其他工作階段",
     "Unable to access secret storage. Please verify that you entered the correct recovery passphrase.": "無法存取秘密儲存空間。請驗證您是否輸入正確的復原通關密語。",
-    "<b>Warning</b>: You should only do this on a trusted computer.": "<b>警告</b>：您應該只在信任的電腦上做這件事。",
-    "Access your secure message history and your cross-signing identity for verifying other sessions 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>。",
     "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 passphrase: please verify that you entered the correct recovery passphrase.": "備份無法使用此復原通關密語解密：請驗證您是否輸入正確的復原通關密語。",
-    "If you can’t access one, <button>use your recovery key or recovery passphrase.</button>": "如果您無法存取，<button>請使用您的復原金鑰或復原通關密語。</button>",
     "Great! This recovery passphrase looks strong enough.": "很好！這個復原通關密語看起來夠強。",
-    "Set a recovery passphrase to secure encrypted information and recover it if you log out. This should be different to your account password:": "設定復原通關密語以保護您的加密資訊並在您登出時復原它。且應該要與您的帳號密碼不同：",
     "Enter a recovery passphrase": "輸入復原通關密語",
-    "Back up encrypted message keys": "備份加密訊息金鑰",
     "Enter your recovery passphrase a second time to confirm it.": "再次輸入您的復原通關密語以確認。",
     "Confirm 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.": "您的復原金鑰是安全網 - 如果您忘記您的復原通關密語的話，您可以用它來恢復您對加密訊息的存取權。",
-    "Confirm recovery passphrase": "確認復原通關密語",
     "We'll store an encrypted copy of your keys on our server. Secure your backup with a recovery passphrase.": "我們將會在我們的伺服器上儲存一份您金鑰的加密副本。使用復原通關密語以保護您的備份。",
-    "Enter a recovery passphrase...": "輸入復原通關密語……",
     "Please enter your recovery passphrase a second time to confirm.": "請再次輸入您的復原通關密語以確認。",
     "Repeat your recovery passphrase...": "再次輸入您的復原通關密語……",
     "Secure your backup with a recovery passphrase": "使用復原通關密語保護您的備份",
@@ -2400,7 +2158,260 @@
     "Unable to query secret storage status": "無法查詢秘密儲存空間狀態",
     "Verify this login": "驗證此登入",
     "Confirm your identity by verifying this login from one of your other sessions, granting it access to encrypted messages.": "透過驗證這個從您的其他工作階段而來的登入來確認您的身份，並授予其對加密訊息的存取權限。",
-    "This requires the latest Riot on your other devices:": "這需要在您的其他裝置上使用最新的 Riot：",
+    "This requires the latest %(brand)s on your other devices:": "這需要在您的其他裝置上使用最新的 %(brand)s：",
     "or another cross-signing capable Matrix client": "或另一個有交叉簽章功能的 Matrix 客戶端",
-    "Use Recovery Passphrase or Key": "使用復原通關密語或金鑰"
+    "Where you’re logged in": "您登入的地方",
+    "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "在下方管理您工作階段的名稱與登入或<a>在您的使用者檔案中驗證它們</a>。",
+    "Review where you’re logged in": "審閱您的登入位置",
+    "New login. Was this you?": "新登入。這是您嗎？",
+    "Verify all your sessions to ensure your account & messages are safe": "驗證您所有的工作階段以確保您的帳號與訊息是安全的",
+    "Verify the new login accessing your account: %(name)s": "驗證正在存取您帳號的新登入：%(name)s",
+    "Restoring keys from backup": "從備份還原金鑰",
+    "Fetching keys from server...": "正在從伺服器擷取金鑰……",
+    "%(completed)s of %(total)s keys restored": "%(total)s 中的 %(completed)s 金鑰已復原",
+    "Keys restored": "金鑰已復原",
+    "Successfully restored %(sessionCount)s keys": "成功復原 %(sessionCount)s 金鑰",
+    "You signed in to a new session without verifying it:": "您已登入新的工作階段但未驗證：",
+    "Verify your other session using one of the options below.": "使用下方的其中一個選項來驗證您其他的工作階段。",
+    "Invite someone using their name, username (like <userId/>), email address or <a>share this room</a>.": "使用某人的名字、使用者名稱（如 <userId/>）、電子郵件地址或<a>分享此聊天室</a>來邀請他們。",
+    "Message deleted": "訊息已刪除",
+    "Message deleted by %(name)s": "訊息已被 %(name)s 刪除",
+    "Opens chat with the given user": "開啟與指定使用者的聊天",
+    "Sends a message to the given user": "傳送訊息給指定的使用者",
+    "Waiting for your other session to verify…": "正在等待您的其他工作階段進行驗證……",
+    "You've successfully verified your device!": "您已成功驗證您的裝置！",
+    "To continue, use Single Sign On to prove your identity.": "要繼續，使用單一登入系統來證明您的身份。",
+    "Confirm to continue": "確認以繼續",
+    "Click the button below to confirm your identity.": "點擊下方按鈕以確認您的身份。",
+    "Confirm encryption setup": "確認加密設定",
+    "Click the button below to confirm setting up encryption.": "點擊下方按鈕以確認設定加密。",
+    "QR Code": "QR Code",
+    "Dismiss read marker and jump to bottom": "取消讀取標記並跳至底部",
+    "Jump to oldest unread message": "跳至最舊的未讀訊息",
+    "Upload a file": "上傳檔案",
+    "IRC display name width": "IRC 顯示名稱寬度",
+    "Create room": "建立聊天室",
+    "Font scaling": "字型縮放",
+    "Font size": "字型大小",
+    "Size must be a number": "大小必須為數字",
+    "Custom font size can only be between %(min)s pt and %(max)s pt": "自訂字型大小僅能為 %(min)s 點至 %(max)s 點間",
+    "Use between %(min)s pt and %(max)s pt": "使用 %(min)s 點至 %(max)s 點間",
+    "Appearance": "外觀",
+    "Room name or address": "聊天室名稱或地址",
+    "Joins room with given address": "以給定的地址加入聊天室",
+    "Unrecognised room address:": "無法識別的聊天室地址：",
+    "Please verify the room ID or address and try again.": "請驗證聊天室 ID 或地址並再試一次。",
+    "Room ID or address of ban list": "聊天室 ID 或地址的封鎖清單",
+    "To link to this room, please add an address.": "要連結到此聊天室，請新增地址。",
+    "Error creating address": "建立地址錯誤",
+    "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "建立該地址時發生錯誤。伺服器可能不允許這麼做，或是有暫時性的問題。",
+    "You don't have permission to delete the address.": "您沒有刪除地址的權限。",
+    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "移除地址時發生錯誤。它可能已不存在或是有暫時性的問題。",
+    "Error removing address": "移除地址時發生錯誤",
+    "Categories": "分類",
+    "Room address": "聊天室地址",
+    "Please provide a room address": "請提供聊天室地址",
+    "This address is available to use": "此地址可用",
+    "This address is already in use": "此地址已被使用",
+    "Set a room address to easily share your room with other people.": "設定聊天室地址以輕鬆地與其他夥伴分享。",
+    "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。要再次與此版本一同使用端到端加密，您必須先登出再登入。",
+    "Address (optional)": "地址（選擇性）",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "刪除聊天室地址 %(alias)s 並從目錄移除 %(name)s？",
+    "delete the address.": "刪除地址。",
+    "Use a different passphrase?": "使用不同的通關密語？",
+    "Help us improve %(brand)s": "協助我們改善 %(brand)s",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "傳送<UsageDataLink>匿名使用資料</UsageDataLink>以協助我們改善 %(brand)s。這將會使用 <PolicyLink>cookie</PolicyLink>。",
+    "I want to help": "我想要協助",
+    "Your homeserver has exceeded its user limit.": "您的家伺服器已超過使用者限制。",
+    "Your homeserver has exceeded one of its resource limits.": "您的家伺服器已超過其中一種資源限制。",
+    "Contact your <a>server admin</a>.": "聯絡您的<a>伺服器管理員</a>。",
+    "Ok": "確定",
+    "Set password": "設定密碼",
+    "To return to your account in future you need to set a password": "要在日後取回您的帳號，您必須設定密碼",
+    "Restart": "重新啟動",
+    "Upgrade your %(brand)s": "升級您的 %(brand)s",
+    "A new version of %(brand)s is available!": "已有新版的 %(brand)s！",
+    "New version available. <a>Update now.</a>": "有可用的新版本。<a>立刻更新。</a>",
+    "Emoji picker": "顏文字挑選器",
+    "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.": "您的伺服器管理員已在私人聊天室與直接訊息中預設停用端到端加密。",
+    "People": "夥伴",
+    "Switch to light mode": "切換至淺色模式",
+    "Switch to dark mode": "切換至深色模式",
+    "Switch theme": "切換佈景主題",
+    "Security & privacy": "安全性與隱私權",
+    "All settings": "所有設定",
+    "Feedback": "回饋",
+    "No recently visited rooms": "沒有最近造訪過的聊天室",
+    "Sort by": "排序方式",
+    "Unread rooms": "未讀聊天室",
+    "Always show first": "一律先顯示",
+    "Show": "顯示",
+    "Message preview": "訊息預覽",
+    "List options": "列表選項",
+    "Show %(count)s more|other": "再顯示 %(count)s 個",
+    "Show %(count)s more|one": "再顯示 %(count)s 個",
+    "Leave Room": "離開聊天室",
+    "Room options": "聊天室選項",
+    "Activity": "活動",
+    "A-Z": "A-Z",
+    "Light": "淺色",
+    "Dark": "暗色",
+    "Customise your appearance": "自訂您的外觀",
+    "Appearance Settings only affect this %(brand)s session.": "外觀設定僅會影響此 %(brand)s 工作階段。",
+    "Looks good!": "看起來不錯！",
+    "Use Recovery Key or Passphrase": "使用復原金鑰或通關密語",
+    "Use Recovery Key": "使用復原金鑰",
+    "Use the improved room list (will refresh to apply changes)": "使用改進的聊天室清單（將會重新整理以套用變更）",
+    "Use custom size": "使用自訂大小",
+    "Hey you. You're the best!": "你是最棒的！",
+    "Message layout": "訊息佈局",
+    "Compact": "簡潔",
+    "Modern": "現代",
+    "Use a system font": "使用系統字型",
+    "System font name": "系統字型名稱",
+    "The authenticity of this encrypted message can't be guaranteed on this device.": "無法在此裝置上保證加密訊息的真實性。",
+    "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 離開了通話",
+    "Call ended": "通話結束",
+    "You started a call": "您開始了通話",
+    "%(senderName)s started a call": "%(senderName)s 開始了通話",
+    "Waiting for answer": "正在等待回應",
+    "%(senderName)s is calling": "%(senderName)s 正在通話",
+    "You created the room": "您建立了聊天室",
+    "%(senderName)s created the room": "%(senderName)s 建立了聊天室",
+    "You made the chat encrypted": "您讓聊天加密",
+    "%(senderName)s made the chat encrypted": "%(senderName)s 讓聊天加密",
+    "You made history visible to new members": "您讓歷史紀錄對新成員可見",
+    "%(senderName)s made history visible to new members": "%(senderName)s 讓歷史紀錄對新成員可見",
+    "You made history visible to anyone": "您讓歷史紀錄對所有人可見",
+    "%(senderName)s made history visible to anyone": "%(senderName)s 讓歷史紀錄對所有人可見",
+    "You made history visible to future members": "您讓歷史紀錄對未來成員可見",
+    "%(senderName)s made history visible to future members": "%(senderName)s 讓歷史紀錄對未來成員可見",
+    "You were invited": "您被邀請",
+    "%(targetName)s was invited": "%(targetName)s 被邀請",
+    "You left": "您離開",
+    "%(targetName)s left": "%(targetName)s 離開",
+    "You were kicked (%(reason)s)": "您被踢除（%(reason)s）",
+    "%(targetName)s was kicked (%(reason)s)": "%(targetName)s 被踢除（%(reason)s）",
+    "You were kicked": "您被踢除",
+    "%(targetName)s was kicked": "%(targetName)s 被踢除",
+    "You rejected the invite": "您回絕了邀請",
+    "%(targetName)s rejected the invite": "%(targetName)s 回絕了邀請",
+    "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）",
+    "You were banned": "您被封鎖",
+    "%(targetName)s was banned": "%(targetName)s 被封鎖",
+    "You joined": "您加入",
+    "%(targetName)s joined": "%(targetName)s 加入",
+    "You changed your name": "您變更了您的名稱",
+    "%(targetName)s changed their name": "%(targetName)s 變更了他們的名稱",
+    "You changed your avatar": "您變更了您的大頭貼",
+    "%(targetName)s changed their avatar": "%(targetName)s 變更了他們的大頭貼",
+    "%(senderName)s %(emote)s": "%(senderName)s %(emote)s",
+    "%(senderName)s: %(message)s": "%(senderName)s: %(message)s",
+    "You changed the room name": "您變更了聊天室名稱",
+    "%(senderName)s changed the room name": "%(senderName)s 變更了聊天室名稱",
+    "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
+    "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
+    "You uninvited %(targetName)s": "您取消邀請了 %(targetName)s",
+    "%(senderName)s uninvited %(targetName)s": "%(senderName)s 取消邀請了 %(targetName)s",
+    "You invited %(targetName)s": "您邀請了 %(targetName)s",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s 邀請了 %(targetName)s",
+    "You changed the room topic": "您變更了聊天室主題",
+    "%(senderName)s changed the room topic": "%(senderName)s 變更了聊天室主題",
+    "New spinner design": "新的微調器設計",
+    "Use a more compact ‘Modern’ layout": "使用更簡潔的「現代」佈局",
+    "Message deleted on %(date)s": "訊息刪除於 %(date)s",
+    "Wrong file type": "錯誤的檔案類型",
+    "Wrong Recovery Key": "錯誤的復原金鑰",
+    "Invalid Recovery Key": "無效的復原金鑰",
+    "Security Phrase": "安全密語",
+    "Enter your Security Phrase or <button>Use your Security Key</button> to continue.": "輸入您的安全密語或<button>使用您的安全金鑰</button>以繼續。",
+    "Security Key": "安全金鑰",
+    "Use your Security Key to continue.": "使用您的安全金鑰以繼續。",
+    "Safeguard against losing access to encrypted messages & data by backing up encryption keys on your server.": "透過備份您伺服器上的加密金鑰來防止失去對您已加密的訊息與資料的存取權。",
+    "Generate a Security Key": "生成加密金鑰",
+    "We’ll generate a Security Key for you to store somewhere safe, like a password manager or a safe.": "我們將會為您生成一把安全金鑰，供您存放在安全的地方，如密碼管理員或保險櫃等。",
+    "Enter a Security Phrase": "輸入安全密語",
+    "Use a secret phrase only you know, and optionally save a Security Key to use for backup.": "使用僅有您知道的祕密短語，並選擇性地儲存安全金鑰以供備用。",
+    "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.": "輸入僅有您知道的安全短語，其用於保護您的資料。安全起見，請勿重複使用您的帳號密碼。",
+    "Store your Security Key somewhere safe, like a password manager or a safe, as it’s used to safeguard your encrypted data.": "將您的安全金鑰存放在某個安全的地方，如密碼管理員或保險櫃，其用於保護您的加密資料。",
+    "If you cancel now, you may lose encrypted messages & data if you lose access to your logins.": "如果您現在取消，在您失去對您的登入的存取權時可能會遺失已加密的訊息與資料。",
+    "You can also set up Secure Backup & manage your keys in Settings.": "您也可以在設定中設定安全備份並管理您的金鑰。",
+    "Set up Secure backup": "設定安全備份",
+    "Set a Security Phrase": "設定安全密語",
+    "Confirm Security Phrase": "確認安全密語",
+    "Save your Security Key": "儲存您的安全金鑰",
+    "Are you sure you want to cancel entering passphrase?": "您確定您想要取消輸入通關密語嗎？",
+    "Use your account to sign in to the latest version": "使用您的帳號以登入到最新版本",
+    "We’re excited to announce Riot is now Element": "我們很高興地宣佈 Riot 現在變為 Element 了",
+    "Riot is now Element!": "Riot 現在變為 Element 了！",
+    "Learn More": "取得更多資訊",
+    "Enable advanced debugging for the room list": "啟用聊天室清單的進階除錯",
+    "Enable experimental, compact IRC style layout": "啟用實驗性、簡潔的 IRC 風格佈局",
+    "Unknown caller": "未知的來電者",
+    "Incoming voice call": "語音來電",
+    "Incoming video call": "視訊來電",
+    "Incoming call": "來電",
+    "%(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 桌面版</desktopLink>以讓加密訊息出現在搜尋結果中。",
+    "There are advanced notifications which are not shown here.": "有些進階通知未在此處顯示。",
+    "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 調整，但仍然適用。",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "設定您系統上安裝的字型名稱，%(brand)s 將會嘗試使用它。",
+    "%(brand)s version:": "%(brand)s 版本：",
+    "Make this room low priority": "將此聊天室設為較低優先程度",
+    "Low priority rooms show up at the bottom of your room list in a dedicated section at the bottom of your room list": "低優先程度的聊天室會顯示在您聊天室清單底部的專用區域中",
+    "Show rooms with unread messages first": "先顯示有未讀訊息的聊天室",
+    "Show previews of messages": "顯示訊息預覽",
+    "Use default": "使用預設值",
+    "Mentions & Keywords": "提及與關鍵字",
+    "Notification options": "通知選項",
+    "Favourited": "最愛",
+    "Forget Room": "忘記聊天室",
+    "This room is public": "此聊天室是公開的",
+    "Away": "離開",
+    "Edited at %(date)s": "編輯於 %(date)s",
+    "Click to view edits": "點擊以檢視編輯",
+    "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 可能會造成問題。",
+    "Use your account to sign in to the latest version of the app at <a />": "使用您的帳號以登入到最新版本的應用程式於 <a />",
+    "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>.": "您已登入並可在此處進行存取，但您可以在 <a>element.io/get-started</a> 取得所有平臺的最新版本的應用程式。",
+    "Go to Element": "到 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> 取得更多資訊",
+    "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.": "您可以透過指定不同的家伺服器 URL 來使用自訂伺服器選項以登入到其他 Matrix 伺服器。這讓您可以與既有的 Matrix 帳號在不同的家伺服器一起使用 %(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 服務家伺服器位置。它可能使用您的域名或 <a>element.io</a> 的子網域。",
+    "Search rooms": "搜尋聊天室",
+    "User menu": "使用者選單",
+    "%(brand)s Web": "%(brand)s 網頁版",
+    "%(brand)s Desktop": "%(brand)s 桌面版",
+    "%(brand)s iOS": "%(brand)s iOS",
+    "%(brand)s X for Android": "Android 的 %(brand)s X",
+    "Custom Tag": "自訂標籤",
+    "* %(senderName)s %(emote)s": "* %(senderName)s %(emote)s",
+    "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": "變更通知設定",
+    "Your server isn't responding to some <a>requests</a>.": "您的伺服器未回應某些<a>請求</a>。",
+    "You're all caught up.": "都處理好了。",
+    "Server isn't responding": "伺服器沒有回應",
+    "Your server isn't responding to some of your requests. Below are some of the most likely reasons.": "您的伺服器未對您的某些請求回應。下列是可能的原因。",
+    "The server (%(serverName)s) took too long to respond.": "伺服器 (%(serverName)s) 花了太長的時間來回應。",
+    "Your firewall or anti-virus is blocking the request.": "您的防火牆或防毒軟體阻擋了請求。",
+    "A browser extension is preventing the request.": "瀏覽器擴充套件阻擋了請求。",
+    "The server is offline.": "伺服器離線。",
+    "The server has denied your request.": "伺服器拒絕了您的請求。",
+    "Your area is experiencing difficulties connecting to the internet.": "您所在區域可能遇到一些網際網路連線的問題。",
+    "A connection error occurred while trying to contact the server.": "在試圖與伺服器溝通時遇到連線錯誤。",
+    "The server is not configured to indicate what the problem is (CORS).": "伺服器沒有設定好指示問題是什麼 (CORS)。",
+    "Recent changes that have not yet been received": "尚未收到最新變更",
+    "No files visible in this room": "在此聊天室中看不到檔案",
+    "Attach files from chat or just drag and drop them anywhere in a room.": "從聊天中附加檔案，或將其拖放到聊天室的任何地方。",
+    "You’re all caught up": "您都設定好了",
+    "You have no visible notifications in this room.": "您在此聊天室沒有可見的通知。",
+    "%(brand)s Android": "%(brand)s Android",
+    "Master private key:": "主控私鑰："
 }
diff --git a/src/indexing/BaseEventIndexManager.js b/src/indexing/BaseEventIndexManager.ts
similarity index 85%
rename from src/indexing/BaseEventIndexManager.js
rename to src/indexing/BaseEventIndexManager.ts
index f780c8e9ce..64cf01bd6e 100644
--- a/src/indexing/BaseEventIndexManager.js
+++ b/src/indexing/BaseEventIndexManager.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -14,14 +14,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// The following interfaces take their names and member names from seshat and the spec
+/* eslint-disable camelcase */
+
 export interface MatrixEvent {
     type: string;
     sender: string;
     content: {};
     event_id: string;
     origin_server_ts: number;
-    unsigned: ?{};
-    room_id: string;
+    unsigned?: {};
+    roomId: string;
 }
 
 export interface MatrixProfile {
@@ -59,7 +62,7 @@ export interface SearchArgs {
     before_limit: number;
     after_limit: number;
     order_by_recency: boolean;
-    room_id: ?string;
+    room_id?: string;
 }
 
 export interface EventAndProfile {
@@ -85,7 +88,7 @@ export interface IndexStats {
  *
  * Instances of this class are provided by the application.
  */
-export default class BaseEventIndexManager {
+export default abstract class BaseEventIndexManager {
     /**
      * Does our EventIndexManager support event indexing.
      *
@@ -119,7 +122,7 @@ export default class BaseEventIndexManager {
      * @return {Promise} A promise that will resolve when the was queued up for
      * addition.
      */
-    async addEventToIndex(ev: MatrixEvent, profile: MatrixProfile): Promise<> {
+    async addEventToIndex(ev: MatrixEvent, profile: MatrixProfile): Promise<void> {
         throw new Error("Unimplemented");
     }
 
@@ -134,6 +137,19 @@ export default class BaseEventIndexManager {
         throw new Error("Unimplemented");
     }
 
+    /**
+     * Check if the room with the given id is already indexed.
+     *
+     * @param {string} roomId The ID of the room which we want to check if it
+     * has been already indexed.
+     *
+     * @return {Promise<boolean>} Returns true if the index contains events for
+     * the given room, false otherwise.
+     */
+    isRoomIndexed(roomId: string): Promise<boolean> {
+        throw new Error("Unimplemented");
+    }
+
     /**
      * Get statistical information of the index.
      *
@@ -144,6 +160,29 @@ export default class BaseEventIndexManager {
         throw new Error("Unimplemented");
     }
 
+
+    /**
+     * Get the user version of the database.
+     * @return {Promise<number>} A promise that will resolve to the user stored
+     * version number.
+     */
+    async getUserVersion(): Promise<number> {
+        throw new Error("Unimplemented");
+    }
+
+    /**
+     * Set the user stored version to the given version number.
+     *
+     * @param {number} version The new version that should be stored in the
+     * database.
+     *
+     * @return {Promise<void>} A promise that will resolve once the new version
+     * is stored.
+     */
+    async setUserVersion(version: number): Promise<void> {
+        throw new Error("Unimplemented");
+    }
+
     /**
      * Commit the previously queued up events to the index.
      *
@@ -188,7 +227,7 @@ export default class BaseEventIndexManager {
         events: [EventAndProfile],
         checkpoint: CrawlerCheckpoint | null,
         oldCheckpoint: CrawlerCheckpoint | null,
-    ): Promise<bool> {
+    ): Promise<boolean> {
         throw new Error("Unimplemented");
     }
 
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index a6bbbb5f96..fa263a2a55 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -18,8 +18,9 @@ import PlatformPeg from "../PlatformPeg";
 import {MatrixClientPeg} from "../MatrixClientPeg";
 import {EventTimeline, RoomMember} from 'matrix-js-sdk';
 import {sleep} from "../utils/promise";
-import SettingsStore, {SettingLevel} from "../settings/SettingsStore";
+import SettingsStore from "../settings/SettingsStore";
 import {EventEmitter} from "events";
+import {SettingLevel} from "../settings/SettingLevel";
 
 /*
  * Event indexing class that wraps the platform specific event indexing.
@@ -42,9 +43,6 @@ export default class EventIndex extends EventEmitter {
     async init() {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
 
-        await indexManager.initEventIndex();
-        console.log("EventIndex: Successfully initialized the event index");
-
         this.crawlerCheckpoints = await indexManager.loadCheckpoints();
         console.log("EventIndex: Loaded checkpoints", this.crawlerCheckpoints);
 
@@ -62,6 +60,7 @@ export default class EventIndex extends EventEmitter {
         client.on('Event.decrypted', this.onEventDecrypted);
         client.on('Room.timelineReset', this.onTimelineReset);
         client.on('Room.redaction', this.onRedaction);
+        client.on('RoomState.events', this.onRoomStateEvent);
     }
 
     /**
@@ -76,6 +75,7 @@ export default class EventIndex extends EventEmitter {
         client.removeListener('Event.decrypted', this.onEventDecrypted);
         client.removeListener('Room.timelineReset', this.onTimelineReset);
         client.removeListener('Room.redaction', this.onRedaction);
+        client.removeListener('RoomState.events', this.onRoomStateEvent);
     }
 
     /**
@@ -102,9 +102,6 @@ export default class EventIndex extends EventEmitter {
             const timeline = room.getLiveTimeline();
             const token = timeline.getPaginationToken("b");
 
-            console.log("EventIndex: Got token for indexer",
-                        room.roomId, token);
-
             const backCheckpoint = {
                 roomId: room.roomId,
                 token: token,
@@ -148,7 +145,7 @@ export default class EventIndex extends EventEmitter {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
 
         if (prevState === "PREPARED" && state === "SYNCING") {
-            // If our indexer is empty we're most likely running Riot the
+            // If our indexer is empty we're most likely running Element the
             // first time with indexing support or running it with an
             // initial sync. Add checkpoints to crawl our encrypted rooms.
             const eventIndexWasEmpty = await indexManager.isEventIndexEmpty();
@@ -161,7 +158,6 @@ export default class EventIndex extends EventEmitter {
         if (prevState === "SYNCING" && state === "SYNCING") {
             // A sync was done, presumably we queued up some live events,
             // commit them now.
-            console.log("EventIndex: Committing events");
             await indexManager.commitLiveEvents();
             return;
         }
@@ -198,6 +194,15 @@ export default class EventIndex extends EventEmitter {
         }
     }
 
+    onRoomStateEvent = async (ev, state) => {
+        if (!MatrixClientPeg.get().isRoomEncrypted(state.roomId)) return;
+
+        if (ev.getType() === "m.room.encryption" && !await this.isRoomIndexed(state.roomId)) {
+            console.log("EventIndex: Adding a checkpoint for a newly encrypted room", state.roomId);
+            this.addRoomCheckpoint(state.roomId, true);
+        }
+    }
+
     /*
      * The Event.decrypted listener.
      *
@@ -238,26 +243,12 @@ export default class EventIndex extends EventEmitter {
      */
     onTimelineReset = async (room, timelineSet, resetAllTimelines) => {
         if (room === null) return;
-
-        const indexManager = PlatformPeg.get().getEventIndexingManager();
         if (!MatrixClientPeg.get().isRoomEncrypted(room.roomId)) return;
 
-        const timeline = room.getLiveTimeline();
-        const token = timeline.getPaginationToken("b");
+        console.log("EventIndex: Adding a checkpoint because of a limited timeline",
+            room.roomId);
 
-        const backwardsCheckpoint = {
-            roomId: room.roomId,
-            token: token,
-            fullCrawl: false,
-            direction: "b",
-        };
-
-        console.log("EventIndex: Added checkpoint because of a limited timeline",
-            backwardsCheckpoint);
-
-        await indexManager.addCrawlerCheckpoint(backwardsCheckpoint);
-
-        this.crawlerCheckpoints.push(backwardsCheckpoint);
+        this.addRoomCheckpoint(room.roomId, false);
     }
 
     /**
@@ -294,6 +285,33 @@ export default class EventIndex extends EventEmitter {
         return validEventType && validMsgType && hasContentValue;
     }
 
+    eventToJson(ev) {
+        const jsonEvent = ev.toJSON();
+        const e = ev.isEncrypted() ? jsonEvent.decrypted : jsonEvent;
+
+        if (ev.isEncrypted()) {
+            // Let us store some additional data so we can re-verify the event.
+            // The js-sdk checks if an event is encrypted using the algorithm,
+            // the sender key and ed25519 signing key are used to find the
+            // correct device that sent the event which allows us to check the
+            // verification state of the event, either directly or using cross
+            // signing.
+            e.curve25519Key = ev.getSenderKey();
+            e.ed25519Key = ev.getClaimedEd25519Key();
+            e.algorithm = ev.getWireContent().algorithm;
+            e.forwardingCurve25519KeyChain = ev.getForwardingCurve25519KeyChain();
+        } else {
+            // Make sure that unencrypted events don't contain any of that data,
+            // despite what the server might give to us.
+            delete e.curve25519Key;
+            delete e.ed25519Key;
+            delete e.algorithm;
+            delete e.forwardingCurve25519KeyChain;
+        }
+
+        return e;
+    }
+
     /**
      * Queue up live events to be added to the event index.
      *
@@ -304,15 +322,14 @@ export default class EventIndex extends EventEmitter {
 
         if (!this.isValidEvent(ev)) return;
 
-        const jsonEvent = ev.toJSON();
-        const e = ev.isEncrypted() ? jsonEvent.decrypted : jsonEvent;
+        const e = this.eventToJson(ev);
 
         const profile = {
             displayname: ev.sender.rawDisplayName,
             avatar_url: ev.sender.getMxcAvatarUrl(),
         };
 
-        indexManager.addEventToIndex(e, profile);
+        await indexManager.addEventToIndex(e, profile);
     }
 
     /**
@@ -323,6 +340,51 @@ export default class EventIndex extends EventEmitter {
         this.emit("changedCheckpoint", this.currentRoom());
     }
 
+    async addEventsFromLiveTimeline(timeline) {
+        const events = timeline.getEvents();
+
+        for (let i = 0; i < events.length; i++) {
+            const ev = events[i];
+            await this.addLiveEventToIndex(ev);
+        }
+    }
+
+    async addRoomCheckpoint(roomId, fullCrawl = false) {
+        const indexManager = PlatformPeg.get().getEventIndexingManager();
+        const client = MatrixClientPeg.get();
+        const room = client.getRoom(roomId);
+
+        if (!room) return;
+
+        const timeline = room.getLiveTimeline();
+        const token = timeline.getPaginationToken("b");
+
+        if (!token) {
+            // The room doesn't contain any tokens, meaning the live timeline
+            // contains all the events, add those to the index.
+            await this.addEventsFromLiveTimeline(timeline);
+            return;
+        }
+
+        const checkpoint = {
+            roomId: room.roomId,
+            token: token,
+            fullCrawl: fullCrawl,
+            direction: "b",
+        };
+
+        console.log("EventIndex: Adding checkpoint", checkpoint);
+
+        try {
+            await indexManager.addCrawlerCheckpoint(checkpoint);
+        } catch (e) {
+            console.log("EventIndex: Error adding new checkpoint for room",
+                        room.roomId, checkpoint, e);
+        }
+
+        this.crawlerCheckpoints.push(checkpoint);
+    }
+
     /**
      * The main crawler loop.
      *
@@ -336,8 +398,6 @@ export default class EventIndex extends EventEmitter {
     async crawlerFunc() {
         let cancelled = false;
 
-        console.log("EventIndex: Started crawler function");
-
         const client = MatrixClientPeg.get();
         const indexManager = PlatformPeg.get().getEventIndexingManager();
 
@@ -366,8 +426,6 @@ export default class EventIndex extends EventEmitter {
 
             await sleep(sleepTime);
 
-            console.log("EventIndex: Running the crawler loop.");
-
             if (cancelled) {
                 break;
             }
@@ -386,8 +444,6 @@ export default class EventIndex extends EventEmitter {
 
             idle = false;
 
-            console.log("EventIndex: crawling using checkpoint", checkpoint);
-
             // We have a checkpoint, let us fetch some messages, again, very
             // conservatively to not bother our homeserver too much.
             const eventMapper = client.getEventMapper({preventReEmit: true});
@@ -415,7 +471,7 @@ export default class EventIndex extends EventEmitter {
                     continue;
                 }
 
-                console.log("EventIndex: Error crawling events:", e);
+                console.log("EventIndex: Error crawling using checkpoint:", checkpoint, ",", e);
                 this.crawlerCheckpoints.push(checkpoint);
                 continue;
             }
@@ -477,9 +533,6 @@ export default class EventIndex extends EventEmitter {
             // decryption keys, do we want to retry this checkpoint at a later
             // stage?
             const filteredEvents = matrixEvents.filter(this.isValidEvent);
-            const undecryptableEvents = matrixEvents.filter((ev) => {
-                return ev.isDecryptionFailure();
-            });
 
             // Collect the redaction events so we can delete the redacted events
             // from the index.
@@ -490,8 +543,7 @@ export default class EventIndex extends EventEmitter {
             // Let us convert the events back into a format that EventIndex can
             // consume.
             const events = filteredEvents.map((ev) => {
-                const jsonEvent = ev.toJSON();
-                const e = ev.isEncrypted() ? jsonEvent.decrypted : jsonEvent;
+                const e = this.eventToJson(ev);
 
                 let profile = {};
                 if (e.sender in profiles) profile = profiles[e.sender];
@@ -502,32 +554,44 @@ export default class EventIndex extends EventEmitter {
                 return object;
             });
 
-            // Create a new checkpoint so we can continue crawling the room for
-            // messages.
-            const newCheckpoint = {
-                roomId: checkpoint.roomId,
-                token: res.end,
-                fullCrawl: checkpoint.fullCrawl,
-                direction: checkpoint.direction,
-            };
+            let newCheckpoint;
 
-            console.log(
-                "EventIndex: Crawled room",
-                client.getRoom(checkpoint.roomId).name,
-                "and fetched total", matrixEvents.length, "events of which",
-                events.length, "are being added,", redactionEvents.length,
-                "are redacted,", matrixEvents.length - events.length,
-                "are being skipped, undecryptable", undecryptableEvents.length,
-            );
+            // The token can be null for some reason. Don't create a checkpoint
+            // in that case since adding it to the db will fail.
+            if (res.end) {
+                // Create a new checkpoint so we can continue crawling the room
+                // for messages.
+                newCheckpoint = {
+                    roomId: checkpoint.roomId,
+                    token: res.end,
+                    fullCrawl: checkpoint.fullCrawl,
+                    direction: checkpoint.direction,
+                };
+            }
 
             try {
                 for (let i = 0; i < redactionEvents.length; i++) {
                     const ev = redactionEvents[i];
-                    await indexManager.deleteEvent(ev.getAssociatedId());
+                    const eventId = ev.getAssociatedId();
+
+                    if (eventId) {
+                        await indexManager.deleteEvent(eventId);
+                    } else {
+                        console.warn("EventIndex: Redaction event doesn't contain a valid associated event id", ev);
+                    }
                 }
 
                 const eventsAlreadyAdded = await indexManager.addHistoricEvents(
                     events, newCheckpoint, checkpoint);
+
+                // We didn't get a valid new checkpoint from the server, nothing
+                // to do here anymore.
+                if (!newCheckpoint) {
+                    console.log("EventIndex: The server didn't return a valid ",
+                                "new checkpoint, not continuing the crawl.", checkpoint);
+                    continue;
+                }
+
                 // If all events were already indexed we assume that we catched
                 // up with our index and don't need to crawl the room further.
                 // Let us delete the checkpoint in that case, otherwise push
@@ -552,8 +616,6 @@ export default class EventIndex extends EventEmitter {
         }
 
         this._crawler = null;
-
-        console.log("EventIndex: Stopping crawler function");
     }
 
     /**
@@ -811,6 +873,20 @@ export default class EventIndex extends EventEmitter {
         return indexManager.getStats();
     }
 
+    /**
+     * Check if the room with the given id is already indexed.
+     *
+     * @param {string} roomId The ID of the room which we want to check if it
+     * has been already indexed.
+     *
+     * @return {Promise<boolean>} Returns true if the index contains events for
+     * the given room, false otherwise.
+     */
+    async isRoomIndexed(roomId) {
+        const indexManager = PlatformPeg.get().getEventIndexingManager();
+        return indexManager.isRoomIndexed(roomId);
+    }
+
     /**
      * Get the room that we are currently crawling.
      *
diff --git a/src/indexing/EventIndexPeg.js b/src/indexing/EventIndexPeg.js
index ae4c14dafd..58e8430825 100644
--- a/src/indexing/EventIndexPeg.js
+++ b/src/indexing/EventIndexPeg.js
@@ -21,7 +21,10 @@ limitations under the License.
 
 import PlatformPeg from "../PlatformPeg";
 import EventIndex from "../indexing/EventIndex";
-import SettingsStore, {SettingLevel} from '../settings/SettingsStore';
+import SettingsStore from '../settings/SettingsStore';
+import {SettingLevel} from "../settings/SettingLevel";
+
+const INDEX_VERSION = 1;
 
 class EventIndexPeg {
     constructor() {
@@ -66,8 +69,25 @@ class EventIndexPeg {
      */
     async initEventIndex() {
         const index = new EventIndex();
+        const indexManager = PlatformPeg.get().getEventIndexingManager();
 
         try {
+            await indexManager.initEventIndex();
+
+            const userVersion = await indexManager.getUserVersion();
+            const eventIndexIsEmpty = await indexManager.isEventIndexEmpty();
+
+            if (eventIndexIsEmpty) {
+                await indexManager.setUserVersion(INDEX_VERSION);
+            } else if (userVersion === 0 && !eventIndexIsEmpty) {
+                await indexManager.closeEventIndex();
+                await this.deleteEventIndex();
+
+                await indexManager.initEventIndex();
+                await indexManager.setUserVersion(INDEX_VERSION);
+            }
+
+            console.log("EventIndex: Successfully initialized the event index");
             await index.init();
         } catch (e) {
             console.log("EventIndex: Error initializing the event index", e);
diff --git a/src/integrations/IntegrationManagerInstance.js b/src/integrations/IntegrationManagerInstance.ts
similarity index 82%
rename from src/integrations/IntegrationManagerInstance.js
rename to src/integrations/IntegrationManagerInstance.ts
index 3ffe1e5401..85748db3c2 100644
--- a/src/integrations/IntegrationManagerInstance.js
+++ b/src/integrations/IntegrationManagerInstance.ts
@@ -14,32 +14,34 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import type {Room} from "matrix-js-sdk/src/models/room";
+
 import ScalarAuthClient from "../ScalarAuthClient";
-import * as sdk from "../index";
 import {dialogTermsInteractionCallback, TermsNotSignedError} from "../Terms";
-import type {Room} from "matrix-js-sdk";
 import Modal from '../Modal';
 import url from 'url';
 import SettingsStore from "../settings/SettingsStore";
+import IntegrationManager from "../components/views/settings/IntegrationManager";
 import {IntegrationManagers} from "./IntegrationManagers";
 
-export const KIND_ACCOUNT = "account";
-export const KIND_CONFIG = "config";
-export const KIND_HOMESERVER = "homeserver";
+export enum Kind {
+    Account = "account",
+    Config = "config",
+    Homeserver = "homeserver",
+}
 
 export class IntegrationManagerInstance {
-    apiUrl: string;
-    uiUrl: string;
-    kind: string;
-    id: string; // only applicable in some cases
+    public readonly apiUrl: string;
+    public readonly uiUrl: string;
+    public readonly kind: string;
+    public readonly id: string; // only applicable in some cases
 
-    constructor(kind: string, apiUrl: string, uiUrl: string) {
+    // Per the spec: UI URL is optional.
+    constructor(kind: string, apiUrl: string, uiUrl: string = apiUrl, id?: string) {
         this.kind = kind;
         this.apiUrl = apiUrl;
         this.uiUrl = uiUrl;
-
-        // Per the spec: UI URL is optional.
-        if (!this.uiUrl) this.uiUrl = this.apiUrl;
+        this.id = id;
     }
 
     get name(): string {
@@ -51,19 +53,18 @@ export class IntegrationManagerInstance {
         const parsed = url.parse(this.apiUrl);
         parsed.pathname = '';
         parsed.path = '';
-        return parsed.format();
+        return url.format(parsed);
     }
 
     getScalarClient(): ScalarAuthClient {
         return new ScalarAuthClient(this.apiUrl, this.uiUrl);
     }
 
-    async open(room: Room = null, screen: string = null, integrationId: string = null): void {
+    async open(room: Room = null, screen: string = null, integrationId: string = null): Promise<void> {
         if (!SettingsStore.getValue("integrationProvisioning")) {
             return IntegrationManagers.sharedInstance().showDisabledDialog();
         }
 
-        const IntegrationManager = sdk.getComponent("views.settings.IntegrationManager");
         const dialog = Modal.createTrackedDialog(
             'Integration Manager', '', IntegrationManager,
             {loading: true}, 'mx_IntegrationManager',
diff --git a/src/integrations/IntegrationManagers.js b/src/integrations/IntegrationManagers.ts
similarity index 51%
rename from src/integrations/IntegrationManagers.js
rename to src/integrations/IntegrationManagers.ts
index 3ba1aab135..1791e92514 100644
--- a/src/integrations/IntegrationManagers.js
+++ b/src/integrations/IntegrationManagers.ts
@@ -14,112 +14,106 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import type {MatrixClient} from "matrix-js-sdk/src/client";
+import type {MatrixEvent} from "matrix-js-sdk/src/models/event";
+import type {Room} from "matrix-js-sdk/src/models/room";
+
 import SdkConfig from '../SdkConfig';
-import * as sdk from "../index";
 import Modal from '../Modal';
-import {IntegrationManagerInstance, KIND_ACCOUNT, KIND_CONFIG, KIND_HOMESERVER} from "./IntegrationManagerInstance";
-import type {MatrixClient, MatrixEvent, Room} from "matrix-js-sdk";
+import {IntegrationManagerInstance, Kind} from "./IntegrationManagerInstance";
+import IntegrationsImpossibleDialog from "../components/views/dialogs/IntegrationsImpossibleDialog";
+import TabbedIntegrationManagerDialog from "../components/views/dialogs/TabbedIntegrationManagerDialog";
+import IntegrationsDisabledDialog from "../components/views/dialogs/IntegrationsDisabledDialog";
 import WidgetUtils from "../utils/WidgetUtils";
 import {MatrixClientPeg} from "../MatrixClientPeg";
-import {AutoDiscovery} from "matrix-js-sdk";
 import SettingsStore from "../settings/SettingsStore";
+import url from 'url';
 
-const HS_MANAGERS_REFRESH_INTERVAL = 8 * 60 * 60 * 1000; // 8 hours
 const KIND_PREFERENCE = [
     // Ordered: first is most preferred, last is least preferred.
-    KIND_ACCOUNT,
-    KIND_HOMESERVER,
-    KIND_CONFIG,
+    Kind.Account,
+    Kind.Homeserver,
+    Kind.Config,
 ];
 
 export class IntegrationManagers {
-    static _instance;
+    private static instance;
 
-    static sharedInstance(): IntegrationManagers {
-        if (!IntegrationManagers._instance) {
-            IntegrationManagers._instance = new IntegrationManagers();
+    private managers: IntegrationManagerInstance[] = [];
+    private client: MatrixClient;
+    private primaryManager: IntegrationManagerInstance;
+
+    public static sharedInstance(): IntegrationManagers {
+        if (!IntegrationManagers.instance) {
+            IntegrationManagers.instance = new IntegrationManagers();
         }
-        return IntegrationManagers._instance;
+        return IntegrationManagers.instance;
     }
 
-    _managers: IntegrationManagerInstance[] = [];
-    _client: MatrixClient;
-    _wellknownRefreshTimerId: number = null;
-    _primaryManager: IntegrationManagerInstance;
-
     constructor() {
-        this._compileManagers();
+        this.compileManagers();
     }
 
     startWatching(): void {
         this.stopWatching();
-        this._client = MatrixClientPeg.get();
-        this._client.on("accountData", this._onAccountData);
-        this._compileManagers();
-        setInterval(() => this._setupHomeserverManagers(), HS_MANAGERS_REFRESH_INTERVAL);
+        this.client = MatrixClientPeg.get();
+        this.client.on("accountData", this.onAccountData);
+        this.client.on("WellKnown.client", this.setupHomeserverManagers);
+        this.compileManagers();
     }
 
     stopWatching(): void {
-        if (!this._client) return;
-        this._client.removeListener("accountData", this._onAccountData);
-        if (this._wellknownRefreshTimerId !== null) clearInterval(this._wellknownRefreshTimerId);
+        if (!this.client) return;
+        this.client.removeListener("accountData", this.onAccountData);
+        this.client.removeListener("WellKnown.client", this.setupHomeserverManagers);
     }
 
-    _compileManagers() {
-        this._managers = [];
-        this._setupConfiguredManager();
-        this._setupHomeserverManagers();
-        this._setupAccountManagers();
+    private compileManagers() {
+        this.managers = [];
+        this.setupConfiguredManager();
+        this.setupAccountManagers();
     }
 
-    _setupConfiguredManager() {
-        const apiUrl = SdkConfig.get()['integrations_rest_url'];
-        const uiUrl = SdkConfig.get()['integrations_ui_url'];
+    private setupConfiguredManager() {
+        const apiUrl: string = SdkConfig.get()['integrations_rest_url'];
+        const uiUrl: string = SdkConfig.get()['integrations_ui_url'];
 
         if (apiUrl && uiUrl) {
-            this._managers.push(new IntegrationManagerInstance(KIND_CONFIG, apiUrl, uiUrl));
-            this._primaryManager = null; // reset primary
+            this.managers.push(new IntegrationManagerInstance(Kind.Config, apiUrl, uiUrl));
+            this.primaryManager = null; // reset primary
         }
     }
 
-    async _setupHomeserverManagers() {
-        if (!MatrixClientPeg.get()) return;
-        try {
-            console.log("Updating homeserver-configured integration managers...");
-            const homeserverDomain = MatrixClientPeg.getHomeserverName();
-            const discoveryResponse = await AutoDiscovery.getRawClientConfig(homeserverDomain);
-            if (discoveryResponse && discoveryResponse['m.integrations']) {
-                let managers = discoveryResponse['m.integrations']['managers'];
-                if (!Array.isArray(managers)) managers = []; // make it an array so we can wipe the HS managers
+    private setupHomeserverManagers = async (discoveryResponse) => {
+        console.log("Updating homeserver-configured integration managers...");
+        if (discoveryResponse && discoveryResponse['m.integrations']) {
+            let managers = discoveryResponse['m.integrations']['managers'];
+            if (!Array.isArray(managers)) managers = []; // make it an array so we can wipe the HS managers
 
-                console.log(`Homeserver has ${managers.length} integration managers`);
+            console.log(`Homeserver has ${managers.length} integration managers`);
 
-                // Clear out any known managers for the homeserver
-                // TODO: Log out of the scalar clients
-                this._managers = this._managers.filter(m => m.kind !== KIND_HOMESERVER);
+            // Clear out any known managers for the homeserver
+            // TODO: Log out of the scalar clients
+            this.managers = this.managers.filter(m => m.kind !== Kind.Homeserver);
 
-                // Now add all the managers the homeserver wants us to have
-                for (const hsManager of managers) {
-                    if (!hsManager["api_url"]) continue;
-                    this._managers.push(new IntegrationManagerInstance(
-                        KIND_HOMESERVER,
-                        hsManager["api_url"],
-                        hsManager["ui_url"], // optional
-                    ));
-                }
-
-                this._primaryManager = null; // reset primary
-            } else {
-                console.log("Homeserver has no integration managers");
+            // Now add all the managers the homeserver wants us to have
+            for (const hsManager of managers) {
+                if (!hsManager["api_url"]) continue;
+                this.managers.push(new IntegrationManagerInstance(
+                    Kind.Homeserver,
+                    hsManager["api_url"],
+                    hsManager["ui_url"], // optional
+                ));
             }
-        } catch (e) {
-            console.error(e);
-            // Errors during discovery are non-fatal
-        }
-    }
 
-    _setupAccountManagers() {
-        if (!this._client || !this._client.getUserId()) return; // not logged in
+            this.primaryManager = null; // reset primary
+        } else {
+            console.log("Homeserver has no integration managers");
+        }
+    };
+
+    private setupAccountManagers() {
+        if (!this.client || !this.client.getUserId()) return; // not logged in
         const widgets = WidgetUtils.getIntegrationManagerWidgets();
         widgets.forEach(w => {
             const data = w.content['data'];
@@ -129,30 +123,34 @@ export class IntegrationManagers {
             const apiUrl = data['api_url'];
             if (!apiUrl || !uiUrl) return;
 
-            const manager = new IntegrationManagerInstance(KIND_ACCOUNT, apiUrl, uiUrl);
-            manager.id = w['id'] || w['state_key'] || '';
-            this._managers.push(manager);
+            const manager = new IntegrationManagerInstance(
+                Kind.Account,
+                apiUrl,
+                uiUrl,
+                w['id'] || w['state_key'] || '',
+            );
+            this.managers.push(manager);
         });
-        this._primaryManager = null; // reset primary
+        this.primaryManager = null; // reset primary
     }
 
-    _onAccountData = (ev: MatrixEvent): void => {
+    private onAccountData = (ev: MatrixEvent): void => {
         if (ev.getType() === 'm.widgets') {
-            this._compileManagers();
+            this.compileManagers();
         }
     };
 
     hasManager(): boolean {
-        return this._managers.length > 0;
+        return this.managers.length > 0;
     }
 
     getOrderedManagers(): IntegrationManagerInstance[] {
         const ordered = [];
         for (const kind of KIND_PREFERENCE) {
-            const managers = this._managers.filter(m => m.kind === kind);
+            const managers = this.managers.filter(m => m.kind === kind);
             if (!managers || !managers.length) continue;
 
-            if (kind === KIND_ACCOUNT) {
+            if (kind === Kind.Account) {
                 // Order by state_keys (IDs)
                 managers.sort((a, b) => a.id.localeCompare(b.id));
             }
@@ -164,17 +162,16 @@ export class IntegrationManagers {
 
     getPrimaryManager(): IntegrationManagerInstance {
         if (this.hasManager()) {
-            if (this._primaryManager) return this._primaryManager;
+            if (this.primaryManager) return this.primaryManager;
 
-            this._primaryManager = this.getOrderedManagers()[0];
-            return this._primaryManager;
+            this.primaryManager = this.getOrderedManagers()[0];
+            return this.primaryManager;
         } else {
             return null;
         }
     }
 
     openNoManagerDialog(): void {
-        const IntegrationsImpossibleDialog = sdk.getComponent("dialogs.IntegrationsImpossibleDialog");
         Modal.createTrackedDialog('Integrations impossible', '', IntegrationsImpossibleDialog);
     }
 
@@ -183,11 +180,10 @@ export class IntegrationManagers {
             return this.showDisabledDialog();
         }
 
-        if (this._managers.length === 0) {
+        if (this.managers.length === 0) {
             return this.openNoManagerDialog();
         }
 
-        const TabbedIntegrationManagerDialog = sdk.getComponent("views.dialogs.TabbedIntegrationManagerDialog");
         Modal.createTrackedDialog(
             'Tabbed Integration Manager', '', TabbedIntegrationManagerDialog,
             {room, screen, integrationId}, 'mx_TabbedIntegrationManagerDialog',
@@ -195,7 +191,6 @@ export class IntegrationManagers {
     }
 
     showDisabledDialog(): void {
-        const IntegrationsDisabledDialog = sdk.getComponent("dialogs.IntegrationsDisabledDialog");
         Modal.createTrackedDialog('Integrations disabled', '', IntegrationsDisabledDialog);
     }
 
@@ -214,15 +209,14 @@ export class IntegrationManagers {
      * @returns {Promise<IntegrationManagerInstance>} Resolves to an integration manager instance,
      * or null if none was found.
      */
-    async tryDiscoverManager(domainName: string): IntegrationManagerInstance {
+    async tryDiscoverManager(domainName: string): Promise<IntegrationManagerInstance> {
         console.log("Looking up integration manager via .well-known");
         if (domainName.startsWith("http:") || domainName.startsWith("https:")) {
             // trim off the scheme and just use the domain
-            const url = url.parse(domainName);
-            domainName = url.host;
+            domainName = url.parse(domainName).host;
         }
 
-        let wkConfig;
+        let wkConfig: object;
         try {
             const result = await fetch(`https://${domainName}/.well-known/matrix/integrations`);
             wkConfig = await result.json();
@@ -244,7 +238,7 @@ export class IntegrationManagers {
         }
 
         // All discovered managers are per-user managers
-        const manager = new IntegrationManagerInstance(KIND_ACCOUNT, widget["data"]["api_url"], widget["url"]);
+        const manager = new IntegrationManagerInstance(Kind.Account, widget["data"]["api_url"], widget["url"]);
         console.log("Got an integration manager (untested)");
 
         // We don't test the manager because the caller may need to do extra
@@ -256,4 +250,4 @@ export class IntegrationManagers {
 }
 
 // For debugging
-global.mxIntegrationManagers = IntegrationManagers;
+window.mxIntegrationManagers = IntegrationManagers;
diff --git a/src/languageHandler.js b/src/languageHandler.tsx
similarity index 86%
rename from src/languageHandler.js
rename to src/languageHandler.tsx
index 79a172015a..59edc8766c 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.tsx
@@ -1,7 +1,7 @@
 /*
 Copyright 2017 MTRNord and Cooperative EITA
 Copyright 2017 Vector Creations Ltd.
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,11 +20,13 @@ limitations under the License.
 import request from 'browser-request';
 import counterpart from 'counterpart';
 import React from 'react';
-import SettingsStore, {SettingLevel} from "./settings/SettingsStore";
+
+import SettingsStore from "./settings/SettingsStore";
 import PlatformPeg from "./PlatformPeg";
 
-// $webapp is a webpack resolve alias pointing to the output directory, see webpack config
+// @ts-ignore - $webapp is a webpack resolve alias pointing to the output directory, see webpack config
 import webpackLangJsonUrl from "$webapp/i18n/languages.json";
+import { SettingLevel } from "./settings/SettingLevel";
 
 const i18nFolder = 'i18n/';
 
@@ -37,28 +39,32 @@ counterpart.setSeparator('|');
 // Fall back to English
 counterpart.setFallbackLocale('en');
 
+interface ITranslatableError extends Error {
+    translatedMessage: string;
+}
+
 /**
  * Helper function to create an error which has an English message
  * with a translatedMessage property for use by the consumer.
  * @param {string} message Message to translate.
  * @returns {Error} The constructed error.
  */
-export function newTranslatableError(message) {
-    const error = new Error(message);
+export function newTranslatableError(message: string) {
+    const error = new Error(message) as ITranslatableError;
     error.translatedMessage = _t(message);
     return error;
 }
 
 // Function which only purpose is to mark that a string is translatable
 // Does not actually do anything. It's helpful for automatic extraction of translatable strings
-export function _td(s) {
+export function _td(s: string): string {
     return s;
 }
 
 // Wrapper for counterpart's translation function so that it handles nulls and undefineds properly
 // Takes the same arguments as counterpart.translate()
-function safeCounterpartTranslate(text, options) {
-    // Horrible hack to avoid https://github.com/vector-im/riot-web/issues/4191
+function safeCounterpartTranslate(text: string, options?: object) {
+    // Horrible hack to avoid https://github.com/vector-im/element-web/issues/4191
     // The interpolation library that counterpart uses does not support undefined/null
     // values and instead will throw an error. This is a problem since everywhere else
     // in JS land passing undefined/null will simply stringify instead, and when converting
@@ -89,6 +95,13 @@ function safeCounterpartTranslate(text, options) {
     return translated;
 }
 
+interface IVariables {
+    count?: number;
+    [key: string]: number | string;
+}
+
+type Tags = Record<string, (sub: 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".
@@ -105,7 +118,9 @@ function safeCounterpartTranslate(text, options) {
  *
  * @return a React <span> component if any non-strings were used in substitutions, otherwise a string
  */
-export function _t(text, variables, tags) {
+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 {
     // 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
@@ -141,23 +156,25 @@ export function _t(text, variables, tags) {
  *
  * @return a React <span> component if any non-strings were used in substitutions, otherwise a string
  */
-export function substitute(text, variables, tags) {
-    let result = text;
+export function substitute(text: string, variables?: IVariables): string;
+export function substitute(text: string, variables: IVariables, tags: Tags): string;
+export function substitute(text: string, variables?: IVariables, tags?: Tags): string | React.ReactNode {
+    let result: React.ReactNode | string = text;
 
     if (variables !== undefined) {
-        const regexpMapping = {};
+        const regexpMapping: IVariables = {};
         for (const variable in variables) {
             regexpMapping[`%\\(${variable}\\)s`] = variables[variable];
         }
-        result = replaceByRegexes(result, regexpMapping);
+        result = replaceByRegexes(result as string, regexpMapping);
     }
 
     if (tags !== undefined) {
-        const regexpMapping = {};
+        const regexpMapping: Tags = {};
         for (const tag in tags) {
             regexpMapping[`(<${tag}>(.*?)<\\/${tag}>|<${tag}>|<${tag}\\s*\\/>)`] = tags[tag];
         }
-        result = replaceByRegexes(result, regexpMapping);
+        result = replaceByRegexes(result as string, regexpMapping);
     }
 
     return result;
@@ -172,7 +189,9 @@ export function substitute(text, variables, tags) {
  *
  * @return a React <span> component if any non-strings were used in substitutions, otherwise a string
  */
-export function replaceByRegexes(text, mapping) {
+export function replaceByRegexes(text: string, mapping: IVariables): string;
+export function replaceByRegexes(text: string, mapping: Tags): React.ReactNode;
+export function replaceByRegexes(text: string, mapping: IVariables | Tags): string | React.ReactNode {
     // We initially store our output as an array of strings and objects (e.g. React components).
     // This will then be converted to a string or a <span> at the end
     const output = [text];
@@ -189,7 +208,7 @@ export function replaceByRegexes(text, mapping) {
         // and everything after the match. Insert all three into the output. We need to do this because we can insert objects.
         // Otherwise there would be no need for the splitting and we could do simple replacement.
         let matchFoundSomewhere = false; // If we don't find a match anywhere we want to log it
-        for (const outputIndex in output) {
+        for (let outputIndex = 0; outputIndex < output.length; outputIndex++) {
             const inputText = output[outputIndex];
             if (typeof inputText !== 'string') { // We might have inserted objects earlier, don't try to replace them
                 continue;
@@ -216,7 +235,7 @@ export function replaceByRegexes(text, mapping) {
                 let replaced;
                 // If substitution is a function, call it
                 if (mapping[regexpString] instanceof Function) {
-                    replaced = mapping[regexpString].apply(null, capturedGroups);
+                    replaced = (mapping as Tags)[regexpString].apply(null, capturedGroups);
                 } else {
                     replaced = mapping[regexpString];
                 }
@@ -276,12 +295,12 @@ export function replaceByRegexes(text, mapping) {
 
 // Allow overriding the text displayed when no translation exists
 // Currently only used in unit tests to avoid having to load
-// the translations in riot-web
-export function setMissingEntryGenerator(f) {
+// the translations in element-web
+export function setMissingEntryGenerator(f: (value: string) => void) {
     counterpart.setMissingEntryGenerator(f);
 }
 
-export function setLanguage(preferredLangs) {
+export function setLanguage(preferredLangs: string | string[]) {
     if (!Array.isArray(preferredLangs)) {
         preferredLangs = [preferredLangs];
     }
@@ -358,8 +377,8 @@ export function getLanguageFromBrowser() {
  * @param {string} language The input language string
  * @return {string[]} List of normalised languages
  */
-export function getNormalizedLanguageKeys(language) {
-    const languageKeys = [];
+export function getNormalizedLanguageKeys(language: string) {
+    const languageKeys: string[] = [];
     const normalizedLanguage = normalizeLanguageKey(language);
     const languageParts = normalizedLanguage.split('-');
     if (languageParts.length === 2 && languageParts[0] === languageParts[1]) {
@@ -380,7 +399,7 @@ export function getNormalizedLanguageKeys(language) {
  * @param {string} language The language string to be normalized
  * @returns {string} The normalized language string
  */
-export function normalizeLanguageKey(language) {
+export function normalizeLanguageKey(language: string) {
     return language.toLowerCase().replace("_", "-");
 }
 
@@ -396,7 +415,7 @@ export function getCurrentLanguage() {
  * @param {string[]} langs List of language codes to pick from
  * @returns {string} The most appropriate language code from langs
  */
-export function pickBestLanguage(langs) {
+export function pickBestLanguage(langs: string[]): string {
     const currentLang = getCurrentLanguage();
     const normalisedLangs = langs.map(normalizeLanguageKey);
 
@@ -408,13 +427,13 @@ export function pickBestLanguage(langs) {
 
     {
         // Failing that, a different dialect of the same language
-        const closeLangIndex = normalisedLangs.find((l) => l.substr(0, 2) === currentLang.substr(0, 2));
+        const closeLangIndex = normalisedLangs.findIndex((l) => l.substr(0, 2) === currentLang.substr(0, 2));
         if (closeLangIndex > -1) return langs[closeLangIndex];
     }
 
     {
         // Neither of those? Try an english variant.
-        const enIndex = normalisedLangs.find((l) => l.startsWith('en'));
+        const enIndex = normalisedLangs.findIndex((l) => l.startsWith('en'));
         if (enIndex > -1) return langs[enIndex];
     }
 
@@ -422,7 +441,7 @@ export function pickBestLanguage(langs) {
     return langs[0];
 }
 
-function getLangsJson() {
+function getLangsJson(): Promise<object> {
     return new Promise(async (resolve, reject) => {
         let url;
         if (typeof(webpackLangJsonUrl) === 'string') { // in Jest this 'url' isn't a URL, so just fall through
@@ -443,7 +462,7 @@ function getLangsJson() {
     });
 }
 
-function weblateToCounterpart(inTrs) {
+function weblateToCounterpart(inTrs: object): object {
     const outTrs = {};
 
     for (const key of Object.keys(inTrs)) {
@@ -463,7 +482,7 @@ function weblateToCounterpart(inTrs) {
     return outTrs;
 }
 
-function getLanguage(langPath) {
+function getLanguage(langPath: string): object {
     return new Promise((resolve, reject) => {
         request(
             { method: "GET", url: langPath },
diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js
index ee9f703136..77c62ce84d 100644
--- a/src/linkify-matrix.js
+++ b/src/linkify-matrix.js
@@ -44,7 +44,7 @@ function matrixLinkify(linkify) {
     const S_HASH = S_START.jump(TT.POUND);
     const S_HASH_NAME = new linkify.parser.State();
     const S_HASH_NAME_COLON = new linkify.parser.State();
-    const S_HASH_NAME_COLON_DOMAIN = new linkify.parser.State();
+    const S_HASH_NAME_COLON_DOMAIN = new linkify.parser.State(ROOMALIAS);
     const S_HASH_NAME_COLON_DOMAIN_DOT = new linkify.parser.State();
     const S_ROOMALIAS = new linkify.parser.State(ROOMALIAS);
     const S_ROOMALIAS_COLON = new linkify.parser.State();
@@ -92,7 +92,7 @@ function matrixLinkify(linkify) {
     const S_AT = S_START.jump(TT.AT);
     const S_AT_NAME = new linkify.parser.State();
     const S_AT_NAME_COLON = new linkify.parser.State();
-    const S_AT_NAME_COLON_DOMAIN = new linkify.parser.State();
+    const S_AT_NAME_COLON_DOMAIN = new linkify.parser.State(USERID);
     const S_AT_NAME_COLON_DOMAIN_DOT = new linkify.parser.State();
     const S_USERID = new linkify.parser.State(USERID);
     const S_USERID_COLON = new linkify.parser.State();
@@ -138,7 +138,7 @@ function matrixLinkify(linkify) {
     const S_PLUS = S_START.jump(TT.PLUS);
     const S_PLUS_NAME = new linkify.parser.State();
     const S_PLUS_NAME_COLON = new linkify.parser.State();
-    const S_PLUS_NAME_COLON_DOMAIN = new linkify.parser.State();
+    const S_PLUS_NAME_COLON_DOMAIN = new linkify.parser.State(GROUPID);
     const S_PLUS_NAME_COLON_DOMAIN_DOT = new linkify.parser.State();
     const S_GROUPID = new linkify.parser.State(GROUPID);
     const S_GROUPID_COLON = new linkify.parser.State();
diff --git a/src/mjolnir/Mjolnir.js b/src/mjolnir/Mjolnir.js
index 5836ffd57a..891438bbb9 100644
--- a/src/mjolnir/Mjolnir.js
+++ b/src/mjolnir/Mjolnir.js
@@ -16,9 +16,10 @@ limitations under the License.
 
 import {MatrixClientPeg} from "../MatrixClientPeg";
 import {ALL_RULE_TYPES, BanList} from "./BanList";
-import SettingsStore, {SettingLevel} from "../settings/SettingsStore";
+import SettingsStore from "../settings/SettingsStore";
 import {_t} from "../languageHandler";
-import dis from "../dispatcher";
+import dis from "../dispatcher/dispatcher";
+import {SettingLevel} from "../settings/SettingLevel";
 
 // TODO: Move this and related files to the js-sdk or something once finalized.
 
diff --git a/src/notifications/ContentRules.js b/src/notifications/ContentRules.ts
similarity index 69%
rename from src/notifications/ContentRules.js
rename to src/notifications/ContentRules.ts
index 8c285220c7..cd574e12b6 100644
--- a/src/notifications/ContentRules.js
+++ b/src/notifications/ContentRules.ts
@@ -1,6 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -15,9 +15,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
+import {PushRuleVectorState, State} from "./PushRuleVectorState";
+import {IExtendedPushRule, IRuleSets} from "./types";
 
-import {PushRuleVectorState} from "./PushRuleVectorState";
+export interface IContentRules {
+    vectorState: State;
+    rules: IExtendedPushRule[];
+    externalRules: IExtendedPushRule[];
+}
+
+export const SCOPE = "global";
+export const KIND = "content";
 
 export class ContentRules {
     /**
@@ -31,7 +39,7 @@ export class ContentRules {
      *   externalRules: a list of other keyword rules, with states other than
      *      vectorState
      */
-    static parseContentRules(rulesets) {
+    static parseContentRules(rulesets: IRuleSets): IContentRules {
         // first categorise the keyword rules in terms of their actions
         const contentRules = this._categoriseContentRules(rulesets);
 
@@ -51,59 +59,72 @@ export class ContentRules {
 
         if (contentRules.loud.length) {
             return {
-                vectorState: PushRuleVectorState.LOUD,
+                vectorState: State.Loud,
                 rules: contentRules.loud,
-                externalRules: [].concat(contentRules.loud_but_disabled, contentRules.on, contentRules.on_but_disabled, contentRules.other),
+                externalRules: [
+                    ...contentRules.loud_but_disabled,
+                    ...contentRules.on,
+                    ...contentRules.on_but_disabled,
+                    ...contentRules.other,
+                ],
             };
         } else if (contentRules.loud_but_disabled.length) {
             return {
-                vectorState: PushRuleVectorState.OFF,
+                vectorState: State.Off,
                 rules: contentRules.loud_but_disabled,
-                externalRules: [].concat(contentRules.on, contentRules.on_but_disabled, contentRules.other),
+                externalRules: [...contentRules.on, ...contentRules.on_but_disabled, ...contentRules.other],
             };
         } else if (contentRules.on.length) {
             return {
-                vectorState: PushRuleVectorState.ON,
+                vectorState: State.On,
                 rules: contentRules.on,
-                externalRules: [].concat(contentRules.on_but_disabled, contentRules.other),
+                externalRules: [...contentRules.on_but_disabled, ...contentRules.other],
             };
         } else if (contentRules.on_but_disabled.length) {
             return {
-                vectorState: PushRuleVectorState.OFF,
+                vectorState: State.Off,
                 rules: contentRules.on_but_disabled,
                 externalRules: contentRules.other,
             };
         } else {
             return {
-                vectorState: PushRuleVectorState.ON,
+                vectorState: State.On,
                 rules: [],
                 externalRules: contentRules.other,
             };
         }
     }
 
-    static _categoriseContentRules(rulesets) {
-        const contentRules = {on: [], on_but_disabled: [], loud: [], loud_but_disabled: [], other: []};
+    static _categoriseContentRules(rulesets: IRuleSets) {
+        const contentRules: Record<"on"|"on_but_disabled"|"loud"|"loud_but_disabled"|"other", IExtendedPushRule[]> = {
+            on: [],
+            on_but_disabled: [],
+            loud: [],
+            loud_but_disabled: [],
+            other: [],
+        };
+
         for (const kind in rulesets.global) {
             for (let i = 0; i < Object.keys(rulesets.global[kind]).length; ++i) {
                 const r = rulesets.global[kind][i];
 
                 // check it's not a default rule
-                if (r.rule_id[0] === '.' || kind !== 'content') {
+                if (r.rule_id[0] === '.' || kind !== "content") {
                     continue;
                 }
 
-                r.kind = kind; // is this needed? not sure
+                // this is needed as we are flattening an object of arrays into a single array
+                r.kind = kind;
 
                 switch (PushRuleVectorState.contentRuleVectorStateKind(r)) {
-                    case PushRuleVectorState.ON:
+                    case State.On:
                         if (r.enabled) {
                             contentRules.on.push(r);
                         } else {
                             contentRules.on_but_disabled.push(r);
                         }
                         break;
-                    case PushRuleVectorState.LOUD:
+                    case State.Loud:
                         if (r.enabled) {
                             contentRules.loud.push(r);
                         } else {
diff --git a/src/notifications/NotificationUtils.js b/src/notifications/NotificationUtils.ts
similarity index 80%
rename from src/notifications/NotificationUtils.js
rename to src/notifications/NotificationUtils.ts
index bf393da060..e3b7f66447 100644
--- a/src/notifications/NotificationUtils.js
+++ b/src/notifications/NotificationUtils.ts
@@ -1,6 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -15,7 +15,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
+import {Action, Actions} from "./types";
+
+interface IEncodedActions {
+    notify: boolean;
+    sound?: string;
+    highlight?: boolean;
+}
 
 export class NotificationUtils {
     // Encodes a dictionary of {
@@ -24,12 +30,12 @@ export class NotificationUtils {
     //   "highlight: true/false,
     // }
     // to a list of push actions.
-    static encodeActions(action) {
+    static encodeActions(action: IEncodedActions) {
         const notify = action.notify;
         const sound = action.sound;
         const highlight = action.highlight;
         if (notify) {
-            const actions = ["notify"];
+            const actions: Action[] = [Actions.Notify];
             if (sound) {
                 actions.push({"set_tweak": "sound", "value": sound});
             }
@@ -40,7 +46,7 @@ export class NotificationUtils {
             }
             return actions;
         } else {
-            return ["dont_notify"];
+            return [Actions.DontNotify];
         }
     }
 
@@ -50,18 +56,18 @@ export class NotificationUtils {
     //   "highlight: true/false,
     // }
     // If the actions couldn't be decoded then returns null.
-    static decodeActions(actions) {
+    static decodeActions(actions: Action[]): IEncodedActions {
         let notify = false;
         let sound = null;
         let highlight = false;
 
         for (let i = 0; i < actions.length; ++i) {
             const action = actions[i];
-            if (action === "notify") {
+            if (action === Actions.Notify) {
                 notify = true;
-            } else if (action === "dont_notify") {
+            } else if (action === Actions.DontNotify) {
                 notify = false;
-            } else if (typeof action === 'object') {
+            } else if (typeof action === "object") {
                 if (action.set_tweak === "sound") {
                     sound = action.value;
                 } else if (action.set_tweak === "highlight") {
@@ -81,7 +87,7 @@ export class NotificationUtils {
             highlight = true;
         }
 
-        const result = {notify: notify, highlight: highlight};
+        const result: IEncodedActions = { notify, highlight };
         if (sound !== null) {
             result.sound = sound;
         }
diff --git a/src/notifications/PushRuleVectorState.js b/src/notifications/PushRuleVectorState.ts
similarity index 69%
rename from src/notifications/PushRuleVectorState.js
rename to src/notifications/PushRuleVectorState.ts
index 263226ce1c..d33426cfc4 100644
--- a/src/notifications/PushRuleVectorState.js
+++ b/src/notifications/PushRuleVectorState.ts
@@ -1,6 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -15,43 +15,42 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
-
 import {StandardActions} from "./StandardActions";
 import {NotificationUtils} from "./NotificationUtils";
+import {IPushRule} from "./types";
+
+export enum State {
+    /** The push rule is disabled */
+    Off = "off",
+    /** The user will receive push notification for this rule */
+    On = "on",
+    /** The user will receive push notification for this rule with sound and
+     highlight if this is legitimate */
+    Loud = "loud",
+}
 
 export class PushRuleVectorState {
-    // Backwards compatibility (things should probably be using .states instead)
-    static OFF = "off";
-    static ON = "on";
-    static LOUD = "loud";
+    // Backwards compatibility (things should probably be using the enum above instead)
+    static OFF = State.Off;
+    static ON = State.On;
+    static LOUD = State.Loud;
 
     /**
      * Enum for state of a push rule as defined by the Vector UI.
      * @readonly
      * @enum {string}
      */
-    static states = {
-        /** The push rule is disabled */
-        OFF: PushRuleVectorState.OFF,
-
-        /** The user will receive push notification for this rule */
-        ON: PushRuleVectorState.ON,
-
-        /** The user will receive push notification for this rule with sound and
-         highlight if this is legitimate */
-        LOUD: PushRuleVectorState.LOUD,
-    };
+    static states = State;
 
     /**
      * Convert a PushRuleVectorState to a list of actions
      *
      * @return [object] list of push-rule actions
      */
-    static actionsFor(pushRuleVectorState) {
-        if (pushRuleVectorState === PushRuleVectorState.ON) {
+    static actionsFor(pushRuleVectorState: State) {
+        if (pushRuleVectorState === State.On) {
             return StandardActions.ACTION_NOTIFY;
-        } else if (pushRuleVectorState === PushRuleVectorState.LOUD) {
+        } else if (pushRuleVectorState === State.Loud) {
             return StandardActions.ACTION_HIGHLIGHT_DEFAULT_SOUND;
         }
     }
@@ -63,7 +62,7 @@ export class PushRuleVectorState {
      * category or in PushRuleVectorState.LOUD, regardless of its enabled
      * state. Returns null if it does not match these categories.
      */
-    static contentRuleVectorStateKind(rule) {
+    static contentRuleVectorStateKind(rule: IPushRule): State {
         const decoded = NotificationUtils.decodeActions(rule.actions);
 
         if (!decoded) {
@@ -81,10 +80,10 @@ export class PushRuleVectorState {
         let stateKind = null;
         switch (tweaks) {
             case 0:
-                stateKind = PushRuleVectorState.ON;
+                stateKind = State.On;
                 break;
             case 2:
-                stateKind = PushRuleVectorState.LOUD;
+                stateKind = State.Loud;
                 break;
         }
         return stateKind;
diff --git a/src/notifications/StandardActions.js b/src/notifications/StandardActions.ts
similarity index 98%
rename from src/notifications/StandardActions.js
rename to src/notifications/StandardActions.ts
index b54cea332a..c17010af9a 100644
--- a/src/notifications/StandardActions.js
+++ b/src/notifications/StandardActions.ts
@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
-
 import {NotificationUtils} from "./NotificationUtils";
 
 const encodeActions = NotificationUtils.encodeActions;
diff --git a/src/notifications/types.ts b/src/notifications/types.ts
new file mode 100644
index 0000000000..ea46552947
--- /dev/null
+++ b/src/notifications/types.ts
@@ -0,0 +1,114 @@
+/*
+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 NotificationSetting {
+    AllMessages = "all_messages", // .m.rule.message = notify
+    DirectMessagesMentionsKeywords = "dm_mentions_keywords", // .m.rule.message = mark_unread. This is the new default.
+    MentionsKeywordsOnly = "mentions_keywords", // .m.rule.message = mark_unread; .m.rule.room_one_to_one = mark_unread
+    Never = "never", // .m.rule.master = enabled (dont_notify)
+}
+
+export interface ISoundTweak {
+    // eslint-disable-next-line camelcase
+    set_tweak: "sound";
+    value: string;
+}
+export interface IHighlightTweak {
+    // eslint-disable-next-line camelcase
+    set_tweak: "highlight";
+    value?: boolean;
+}
+
+export type Tweak = ISoundTweak | IHighlightTweak;
+
+export enum Actions {
+    Notify = "notify",
+    DontNotify = "dont_notify", // no-op
+    Coalesce = "coalesce", // unused
+    MarkUnread = "mark_unread", // new
+}
+
+export type Action = Actions | Tweak;
+
+// Push rule kinds in descending priority order
+export enum Kind {
+    Override = "override",
+    ContentSpecific = "content",
+    RoomSpecific = "room",
+    SenderSpecific = "sender",
+    Underride = "underride",
+}
+
+export interface IEventMatchCondition {
+    kind: "event_match";
+    key: string;
+    pattern: string;
+}
+
+export interface IContainsDisplayNameCondition {
+    kind: "contains_display_name";
+}
+
+export interface IRoomMemberCountCondition {
+    kind: "room_member_count";
+    is: string;
+}
+
+export interface ISenderNotificationPermissionCondition {
+    kind: "sender_notification_permission";
+    key: string;
+}
+
+export type Condition =
+    IEventMatchCondition |
+    IContainsDisplayNameCondition |
+    IRoomMemberCountCondition |
+    ISenderNotificationPermissionCondition;
+
+export enum RuleIds {
+    MasterRule = ".m.rule.master", // The master rule (all notifications disabling)
+    MessageRule = ".m.rule.message",
+    EncryptedMessageRule = ".m.rule.encrypted",
+    RoomOneToOneRule = ".m.rule.room_one_to_one",
+    EncryptedRoomOneToOneRule = ".m.rule.room_one_to_one",
+}
+
+export interface IPushRule {
+    enabled: boolean;
+    // eslint-disable-next-line camelcase
+    rule_id: RuleIds | string;
+    actions: Action[];
+    default: boolean;
+    conditions?: Condition[]; // only applicable to `underride` and `override` rules
+    pattern?: string; // only applicable to `content` rules
+}
+
+// push rule extended with kind, used by ContentRules and js-sdk's pushprocessor
+export interface IExtendedPushRule extends IPushRule {
+    kind: Kind;
+}
+
+export interface IPushRuleSet {
+    override: IPushRule[];
+    content: IPushRule[];
+    room: IPushRule[];
+    sender: IPushRule[];
+    underride: IPushRule[];
+}
+
+export interface IRuleSets {
+    global: IPushRuleSet;
+}
diff --git a/src/phonenumber.js b/src/phonenumber.ts
similarity index 97%
rename from src/phonenumber.js
rename to src/phonenumber.ts
index 3b7e4ba4f1..6dd44a3c12 100644
--- a/src/phonenumber.js
+++ b/src/phonenumber.ts
@@ -25,10 +25,21 @@ const PHONE_NUMBER_REGEXP = /^[0-9 -.]+$/;
  *     a national-format number.
  * @return True if the number could be a valid phone number, otherwise false.
  */
-export function looksValid(phoneNumber) {
+export function looksValid(phoneNumber: string) {
     return PHONE_NUMBER_REGEXP.test(phoneNumber);
 }
 
+// Regional Indicator Symbol Letter A
+const UNICODE_BASE = 127462 - 'A'.charCodeAt(0);
+// Country code should be exactly 2 uppercase characters
+const COUNTRY_CODE_REGEX = /^[A-Z]{2}$/;
+
+export const getEmojiFlag = (countryCode: string) => {
+    if (!COUNTRY_CODE_REGEX.test(countryCode)) return '';
+    // Rip the country code out of the emoji and use that
+    return String.fromCodePoint(...countryCode.split('').map(l => UNICODE_BASE + l.charCodeAt(0)));
+};
+
 export const COUNTRIES = [
     {
         "iso2": "GB",
@@ -625,6 +636,11 @@ export const COUNTRIES = [
         "name": "Kiribati",
         "prefix": "686",
     },
+    {
+        "iso2": "XK",
+        "name": "Kosovo",
+        "prefix": "383",
+    },
     {
         "iso2": "KW",
         "name": "Kuwait",
diff --git a/src/rageshake/rageshake.js b/src/rageshake/rageshake.js
index a9d17e77c9..59ed5fa8b7 100644
--- a/src/rageshake/rageshake.js
+++ b/src/rageshake/rageshake.js
@@ -41,7 +41,7 @@ limitations under the License.
 const FLUSH_RATE_MS = 30 * 1000;
 
 // the length of log data we keep in indexeddb (and include in the reports)
-const MAX_LOG_SIZE = 1024 * 1024 * 1; // 1 MB
+const MAX_LOG_SIZE = 1024 * 1024 * 5; // 5 MB
 
 // A class which monkey-patches the global console and stores log lines.
 class ConsoleLogger {
diff --git a/src/rageshake/submit-rageshake.ts b/src/rageshake/submit-rageshake.ts
index 921f3fbf40..ae4e87ba03 100644
--- a/src/rageshake/submit-rageshake.ts
+++ b/src/rageshake/submit-rageshake.ts
@@ -21,10 +21,10 @@ import pako from 'pako';
 import {MatrixClientPeg} from '../MatrixClientPeg';
 import PlatformPeg from '../PlatformPeg';
 import { _t } from '../languageHandler';
+import Tar from "tar-js";
 
 import * as rageshake from './rageshake';
 
-
 // polyfill textencoder if necessary
 import * as TextEncodingUtf8 from 'text-encoding-utf-8';
 import SettingsStore from "../settings/SettingsStore";
@@ -40,27 +40,7 @@ interface IOpts {
     progressCallback?: (string) => void;
 }
 
-/**
- * Send a bug report.
- *
- * @param {string} bugReportEndpoint HTTP url to send the report to
- *
- * @param {object} opts optional dictionary of options
- *
- * @param {string} opts.userText Any additional user input.
- *
- * @param {boolean} opts.sendLogs True to send logs
- *
- * @param {function(string)} opts.progressCallback Callback to call with progress updates
- *
- * @return {Promise} Resolved when the bug report is sent.
- */
-export default async function sendBugReport(bugReportEndpoint: string, opts: IOpts) {
-    if (!bugReportEndpoint) {
-        throw new Error("No bug report endpoint has been set.");
-    }
-
-    opts = opts || {};
+async function collectBugReport(opts: IOpts = {}, gzipLogs = true) {
     const progressCallback = opts.progressCallback || (() => {});
 
     progressCallback(_t("Collecting app version information"));
@@ -92,7 +72,7 @@ export default async function sendBugReport(bugReportEndpoint: string, opts: IOp
 
     const body = new FormData();
     body.append('text', opts.userText || "User did not supply any additional text.");
-    body.append('app', 'riot-web');
+    body.append('app', 'element-web');
     body.append('version', version);
     body.append('user_agent', userAgent);
     body.append('installed_pwa', installedPWA);
@@ -101,15 +81,41 @@ export default async function sendBugReport(bugReportEndpoint: string, opts: IOp
     if (client) {
         body.append('user_id', client.credentials.userId);
         body.append('device_id', client.deviceId);
-    }
 
-    if (client.isCryptoEnabled()) {
-        const keys = [`ed25519:${client.getDeviceEd25519Key()}`];
-        if (client.getDeviceCurve25519Key) {
-            keys.push(`curve25519:${client.getDeviceCurve25519Key()}`);
+        if (client.isCryptoEnabled()) {
+            const keys = [`ed25519:${client.getDeviceEd25519Key()}`];
+            if (client.getDeviceCurve25519Key) {
+                keys.push(`curve25519:${client.getDeviceCurve25519Key()}`);
+            }
+            body.append('device_keys', keys.join(', '));
+            body.append('cross_signing_key', client.getCrossSigningId());
+
+            body.append('device_keys', keys.join(', '));
+
+            // add cross-signing status information
+            const crossSigning = client._crypto._crossSigningInfo;
+            const secretStorage = client._crypto._secretStorage;
+
+            body.append("cross_signing_key", crossSigning.getId());
+            body.append("cross_signing_pk_in_ssss",
+                String(!!(await crossSigning.isStoredInSecretStorage(secretStorage))));
+            body.append("ssss_key_in_account", String(!!(await secretStorage.hasKey())));
+
+            const pkCache = client.getCrossSigningCacheCallbacks();
+            body.append("master_pk_cached",
+                String(!!(pkCache && await pkCache.getCrossSigningKeyCache("master"))));
+            body.append("self_signing_pk_cached",
+                String(!!(pkCache && await pkCache.getCrossSigningKeyCache("self_signing"))));
+            body.append("user_signing_pk_cached",
+                String(!!(pkCache && await pkCache.getCrossSigningKeyCache("user_signing"))));
+
+            const sessionBackupKeyFromCache = await client._crypto.getSessionBackupPrivateKey();
+            body.append("session_backup_key_cached", String(!!sessionBackupKeyFromCache));
+            body.append("session_backup_key_well_formed", String(sessionBackupKeyFromCache instanceof Uint8Array));
+            body.append("cross_signing_supported_by_hs",
+                String(await client.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")));
+            body.append("cross_signing_ready", String(await client.isCrossSigningReady()));
         }
-        body.append('device_keys', keys.join(', '));
-        body.append('cross_signing_key', client.getCrossSigningId());
     }
 
     if (opts.label) {
@@ -117,10 +123,14 @@ export default async function sendBugReport(bugReportEndpoint: string, opts: IOp
     }
 
     // add labs options
-    const enabledLabs = SettingsStore.getLabsFeatures().filter(SettingsStore.isFeatureEnabled);
+    const enabledLabs = SettingsStore.getFeatureSettingNames().filter(f => SettingsStore.getValue(f));
     if (enabledLabs.length) {
         body.append('enabled_labs', enabledLabs.join(', '));
     }
+    // if low bandwidth mode is enabled, say so over rageshake, it causes many issues
+    if (SettingsStore.getValue("lowBandwidth")) {
+        body.append("lowBandwidth", "enabled");
+    }
 
     // add storage persistence/quota information
     if (navigator.storage && navigator.storage.persisted) {
@@ -157,19 +167,104 @@ export default async function sendBugReport(bugReportEndpoint: string, opts: IOp
         const logs = await rageshake.getLogsForReport();
         for (const entry of logs) {
             // encode as UTF-8
-            const buf = new TextEncoder().encode(entry.lines);
+            let buf = new TextEncoder().encode(entry.lines);
 
             // compress
-            const compressed = pako.gzip(buf);
+            if (gzipLogs) {
+                buf = pako.gzip(buf);
+            }
 
-            body.append('compressed-log', new Blob([compressed]), entry.id);
+            body.append('compressed-log', new Blob([buf]), entry.id);
         }
     }
 
-    progressCallback(_t("Uploading report"));
+    return body;
+}
+
+/**
+ * Send a bug report.
+ *
+ * @param {string} bugReportEndpoint HTTP url to send the report to
+ *
+ * @param {object} opts optional dictionary of options
+ *
+ * @param {string} opts.userText Any additional user input.
+ *
+ * @param {boolean} opts.sendLogs True to send logs
+ *
+ * @param {function(string)} opts.progressCallback Callback to call with progress updates
+ *
+ * @return {Promise} Resolved when the bug report is sent.
+ */
+export default async function sendBugReport(bugReportEndpoint: string, opts: IOpts = {}) {
+    if (!bugReportEndpoint) {
+        throw new Error("No bug report endpoint has been set.");
+    }
+
+    const progressCallback = opts.progressCallback || (() => {});
+    const body = await collectBugReport(opts);
+
+    progressCallback(_t("Uploading logs"));
     await _submitReport(bugReportEndpoint, body, progressCallback);
 }
 
+/**
+ * Downloads the files from a bug report. This is the same as sendBugReport,
+ * but instead causes the browser to download the files locally.
+ *
+ * @param {object} opts optional dictionary of options
+ *
+ * @param {string} opts.userText Any additional user input.
+ *
+ * @param {boolean} opts.sendLogs True to send logs
+ *
+ * @param {function(string)} opts.progressCallback Callback to call with progress updates
+ *
+ * @return {Promise} Resolved when the bug report is downloaded (or started).
+ */
+export async function downloadBugReport(opts: IOpts = {}) {
+    const progressCallback = opts.progressCallback || (() => {});
+    const body = await collectBugReport(opts, false);
+
+    progressCallback(_t("Downloading logs"));
+    let metadata = "";
+    const tape = new Tar();
+    let i = 0;
+    for (const [key, value] of body.entries()) {
+        if (key === 'compressed-log') {
+            await new Promise((resolve => {
+                const reader = new FileReader();
+                reader.addEventListener('loadend', ev => {
+                    tape.append(`log-${i++}.log`, new TextDecoder().decode(ev.target.result as ArrayBuffer));
+                    resolve();
+                });
+                reader.readAsArrayBuffer(value as Blob);
+            }));
+        } else {
+            metadata += `${key} = ${value}\n`;
+        }
+    }
+    tape.append('issue.txt', metadata);
+
+    // We have to create a new anchor to download if we want a filename. Otherwise we could
+    // just use window.open.
+    const dl = document.createElement('a');
+    dl.href = `data:application/octet-stream;base64,${btoa(uint8ToString(tape.out))}`;
+    dl.download = 'rageshake.tar';
+    document.body.appendChild(dl);
+    dl.click();
+    document.body.removeChild(dl);
+}
+
+// Source: https://github.com/beatgammit/tar-js/blob/master/examples/main.js
+function uint8ToString(buf: Buffer) {
+    let out = '';
+    for (let i = 0; i < buf.length; i += 1) {
+        out += String.fromCharCode(buf[i]);
+    }
+    return out;
+}
+
 function _submitReport(endpoint: string, body: FormData, progressCallback: (string) => void) {
     return new Promise((resolve, reject) => {
         const req = new XMLHttpRequest();
diff --git a/src/resizer/distributors/roomsublist.js b/src/resizer/distributors/roomsublist.js
deleted file mode 100644
index cc7875bfb0..0000000000
--- a/src/resizer/distributors/roomsublist.js
+++ /dev/null
@@ -1,132 +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 Sizer from "../sizer";
-import ResizeItem from "../item";
-
-class RoomSizer extends Sizer {
-    setItemSize(item, size) {
-        item.style.maxHeight = `${Math.round(size)}px`;
-        item.classList.add("resized-sized");
-    }
-
-    clearItemSize(item) {
-        item.style.maxHeight = null;
-        item.classList.remove("resized-sized");
-    }
-}
-
-class RoomSubListItem extends ResizeItem {
-    isCollapsed() {
-        return this.domNode.classList.contains("mx_RoomSubList_hidden");
-    }
-
-    maxSize() {
-        const header = this.domNode.querySelector(".mx_RoomSubList_labelContainer");
-        const scrollItem = this.domNode.querySelector(".mx_RoomSubList_scroll");
-        const headerHeight = this.sizer.getItemSize(header);
-        return headerHeight + (scrollItem ? scrollItem.scrollHeight : 0);
-    }
-
-    minSize() {
-        const isNotEmpty = this.domNode.classList.contains("mx_RoomSubList_nonEmpty");
-        return isNotEmpty ? 74 : 31; //size of header + 1? room tile (see room sub list css)
-    }
-
-    isSized() {
-        return this.domNode.classList.contains("resized-sized");
-    }
-}
-
-export default class RoomSubListDistributor {
-    static createItem(resizeHandle, resizer, sizer) {
-        return new RoomSubListItem(resizeHandle, resizer, sizer);
-    }
-
-    static createSizer(containerElement, vertical, reverse) {
-        return new RoomSizer(containerElement, vertical, reverse);
-    }
-
-    constructor(item) {
-        this.item = item;
-    }
-
-    _handleSize() {
-        return 1;
-    }
-
-    resize(size) {
-        //console.log("*** starting resize session with size", size);
-        let item = this.item;
-        while (item) {
-            const minSize = item.minSize();
-            if (item.isCollapsed()) {
-                item = item.previous();
-            } else if (size <= minSize) {
-                //console.log("  - resizing", item.id, "to min size", minSize);
-                item.setSize(minSize);
-                const remainder = minSize - size;
-                item = item.previous();
-                if (item) {
-                    size = item.size() - remainder - this._handleSize();
-                }
-            } else {
-                const maxSize = item.maxSize();
-                if (size > maxSize) {
-                    // console.log("  - resizing", item.id, "to maxSize", maxSize);
-                    item.setSize(maxSize);
-                    const remainder = size - maxSize;
-                    item = item.previous();
-                    if (item) {
-                        size = item.size() + remainder; // todo: handle size here?
-                    }
-                } else {
-                    //console.log("  - resizing", item.id, "to size", size);
-                    item.setSize(size);
-                    item = null;
-                    size = 0;
-                }
-            }
-        }
-        //console.log("*** ending resize session");
-    }
-
-    resizeFromContainerOffset(containerOffset) {
-        this.resize(containerOffset - this.item.offset());
-    }
-
-    start() {
-        // set all max-height props to the actual height.
-        let item = this.item.first();
-        const sizes = [];
-        while (item) {
-            if (!item.isCollapsed()) {
-                sizes.push(item.size());
-            } else {
-                sizes.push(100);
-            }
-            item = item.next();
-        }
-        item = this.item.first();
-        sizes.forEach((size) => {
-            item.setSize(size);
-            item = item.next();
-        });
-    }
-
-    finish() {
-    }
-}
diff --git a/src/resizer/distributors/roomsublist2.js b/src/resizer/distributors/roomsublist2.js
deleted file mode 100644
index a715087630..0000000000
--- a/src/resizer/distributors/roomsublist2.js
+++ /dev/null
@@ -1,332 +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 FixedDistributor from "./fixed";
-
-function clamp(height, min, max) {
-    if (height > max) return max;
-    if (height < min) return min;
-    return height;
-}
-
-export class Layout {
-    constructor(applyHeight, initialSizes, collapsedState, options) {
-        // callback to set height of section
-        this._applyHeight = applyHeight;
-        // list of {id, count} objects,
-        // determines sections and order of them
-        this._sections = [];
-        // stores collapsed by id
-        this._collapsedState = Object.assign({}, collapsedState);
-        // total available height to the layout
-        // (including resize handles, ...)
-        this._availableHeight = 0;
-        // heights stored by section section id
-        this._sectionHeights = Object.assign({}, initialSizes);
-        // in-progress heights, while dragging. Committed on mouse-up.
-        this._heights = [];
-        // use while manually resizing to cancel
-        // the resize for a given mouse position
-        // when the previous resize made the layout
-        // constrained
-        this._clampedOffset = 0;
-        // used while manually resizing, to clear
-        // _clampedOffset when the direction of resizing changes
-        this._lastOffset = 0;
-
-        this._allowWhitespace = options && options.allowWhitespace;
-        this._handleHeight = (options && options.handleHeight) || 0;
-    }
-
-    setAvailableHeight(newSize) {
-        this._availableHeight = newSize;
-        // needs more work
-        this._applyNewSize();
-    }
-
-    expandSection(id, height) {
-        this._collapsedState[id] = false;
-        this._applyNewSize();
-        this.openHandle(id).setHeight(height).finish();
-    }
-
-    collapseSection(id) {
-        this._collapsedState[id] = true;
-        this._applyNewSize();
-    }
-
-    update(sections, availableHeight, force = false) {
-        let heightChanged = false;
-
-        if (Number.isFinite(availableHeight) && availableHeight !== this._availableHeight) {
-            heightChanged = true;
-            this._availableHeight = availableHeight;
-        }
-
-        const sectionsChanged =
-            sections.length !== this._sections.length ||
-            sections.some((a, i) => {
-                const b = this._sections[i];
-                return a.id !== b.id || a.count !== b.count;
-            });
-
-        if (!heightChanged && !sectionsChanged && !force) {
-            return;
-        }
-
-        this._sections = sections;
-        const totalHeight = this._getAvailableHeight();
-        const defaultHeight = Math.floor(totalHeight / this._sections.length);
-        this._sections.forEach((section, i) => {
-            if (!this._sectionHeights[section.id]) {
-                this._sectionHeights[section.id] = clamp(
-                    defaultHeight,
-                    this._getMinHeight(i),
-                    this._getMaxHeight(i),
-                );
-            }
-        });
-        this._applyNewSize();
-    }
-
-    openHandle(id) {
-        const index = this._getSectionIndex(id);
-        return new Handle(this, index, this._sectionHeights[id]);
-    }
-
-    _getAvailableHeight() {
-        const nonCollapsedSectionCount = this._sections.reduce((count, section) => {
-            const collapsed = this._collapsedState[section.id];
-            return count + (collapsed ? 0 : 1);
-        }, 0);
-        return this._availableHeight - ((nonCollapsedSectionCount - 1) * this._handleHeight);
-    }
-
-    _applyNewSize() {
-        const newHeight = this._getAvailableHeight();
-        const currHeight = this._sections.reduce((sum, section) => {
-            return sum + this._sectionHeights[section.id];
-        }, 0);
-        const offset = newHeight - currHeight;
-        this._heights = this._sections.map((section) => this._sectionHeights[section.id]);
-        const sections = this._sections.map((_, i) => i);
-        this._applyOverflow(-offset, sections, true);
-        this._applyHeights();
-        this._commitHeights();
-    }
-
-    _getSectionIndex(id) {
-        return this._sections.findIndex((s) => s.id === id);
-    }
-
-    _getMaxHeight(i) {
-        const section = this._sections[i];
-        const collapsed = this._collapsedState[section.id];
-
-        if (collapsed) {
-            return this._sectionHeight(0);
-        } else if (!this._allowWhitespace) {
-            return this._sectionHeight(section.count);
-        } else {
-            return 100000;
-        }
-    }
-
-    _sectionHeight(count) {
-        return 36 + (count === 0 ? 0 : 4 + (count * 34));
-    }
-
-    _getMinHeight(i) {
-        const section = this._sections[i];
-        const collapsed = this._collapsedState[section.id];
-        const maxItems = collapsed ? 0 : 1;
-        return this._sectionHeight(Math.min(section.count, maxItems));
-    }
-
-    _applyOverflow(overflow, sections, blend) {
-        // take the given overflow amount, and applies it to the given sections.
-        // calls itself recursively until it has distributed all the overflow
-        // or run out of unclamped sections.
-
-        const unclampedSections = [];
-
-        let overflowPerSection = blend ? (overflow / sections.length) : overflow;
-        for (const i of sections) {
-            const newHeight = clamp(
-                this._heights[i] - overflowPerSection,
-                this._getMinHeight(i),
-                this._getMaxHeight(i),
-            );
-            if (newHeight == this._heights[i] - overflowPerSection) {
-                unclampedSections.push(i);
-            }
-            // when section is growing, overflow increases?
-            // 100 -= 200 - 300
-            // 100 -= -100
-            // 200
-            overflow -= this._heights[i] - newHeight;
-            this._heights[i] = newHeight;
-            if (!blend) {
-                overflowPerSection = overflow;
-                if (Math.abs(overflow) < 1.0) break;
-            }
-        }
-
-        if (Math.abs(overflow) > 1.0 && unclampedSections.length > 0) {
-            // we weren't able to distribute all the overflow so recurse and try again
-            overflow = this._applyOverflow(overflow, unclampedSections, blend);
-        }
-
-        return overflow;
-    }
-
-    _rebalanceAbove(sectionIndex, overflowAbove) {
-        if (Math.abs(overflowAbove) > 1.0) {
-            const sections = [];
-            for (let i = sectionIndex - 1; i >= 0; i--) {
-                sections.push(i);
-            }
-            overflowAbove = this._applyOverflow(overflowAbove, sections);
-        }
-        return overflowAbove;
-    }
-
-    _rebalanceBelow(sectionIndex, overflowBelow) {
-        if (Math.abs(overflowBelow) > 1.0) {
-            const sections = [];
-            for (let i = sectionIndex + 1; i < this._sections.length; i++) {
-                sections.push(i);
-            }
-            overflowBelow = this._applyOverflow(overflowBelow, sections);
-        }
-        return overflowBelow;
-    }
-
-    // @param offset the amount the sectionIndex is moved from what is stored in _sectionHeights, positive if downwards
-    // if we're constrained, return the offset we should be constrained at.
-    _relayout(sectionIndex = 0, offset = 0, constrained = false) {
-        this._heights = this._sections.map((section) => this._sectionHeights[section.id]);
-        // are these the amounts the items above/below shrank/grew and need to be relayouted?
-        let overflowAbove;
-        let overflowBelow;
-        const maxHeight = this._getMaxHeight(sectionIndex);
-        const minHeight = this._getMinHeight(sectionIndex);
-        // new height > max ?
-        if (this._heights[sectionIndex] + offset > maxHeight) {
-            // we're pulling downwards and constrained
-            // overflowAbove = minus how much are we above max height
-            overflowAbove = (maxHeight - this._heights[sectionIndex]) - offset;
-            overflowBelow = offset;
-        } else if (this._heights[sectionIndex] + offset < minHeight) { // new height < min?
-            // we're pulling upwards and constrained
-            overflowAbove = (minHeight - this._heights[sectionIndex]) - offset;
-            overflowBelow = offset;
-        } else {
-            overflowAbove = 0;
-            overflowBelow = offset;
-        }
-        this._heights[sectionIndex] = clamp(this._heights[sectionIndex] + offset, minHeight, maxHeight);
-
-        // these are reassigned the amount of overflow that could not be rebalanced
-        // meaning we dragged the handle too far and it can't follow the cursor anymore
-        overflowAbove = this._rebalanceAbove(sectionIndex, overflowAbove);
-        overflowBelow = this._rebalanceBelow(sectionIndex, overflowBelow);
-
-        if (!constrained) { // to avoid risk of infinite recursion
-            // clamp to avoid overflowing or underflowing the page
-            if (Math.abs(overflowAbove) > 1.0) {
-                // here we do the layout again with offset - the amount of space we took too much
-                this._relayout(sectionIndex, offset + overflowAbove, true);
-                return offset + overflowAbove;
-            }
-
-            if (Math.abs(overflowBelow) > 1.0) {
-                // here we do the layout again with offset - the amount of space we took too much
-                this._relayout(sectionIndex, offset - overflowBelow, true);
-                return offset - overflowBelow;
-            }
-        }
-
-        this._applyHeights();
-        return undefined;
-    }
-
-    _applyHeights() {
-        // apply the heights
-        for (let i = 0; i < this._sections.length; i++) {
-            const section = this._sections[i];
-            this._applyHeight(section.id, this._heights[i]);
-        }
-    }
-
-    _commitHeights() {
-        this._sections.forEach((section, i) => {
-            this._sectionHeights[section.id] = this._heights[i];
-        });
-    }
-
-    _setUncommittedSectionHeight(sectionIndex, offset) {
-        if (Math.sign(offset) != Math.sign(this._lastOffset)) {
-            this._clampedOffset = undefined;
-        }
-        if (this._clampedOffset !== undefined) {
-            if (offset < 0 && offset < this._clampedOffset) {
-                return;
-            }
-            if (offset > 0 && offset > this._clampedOffset) {
-                return;
-            }
-        }
-        this._clampedOffset = this._relayout(sectionIndex, offset);
-        this._lastOffset = offset;
-    }
-}
-
-class Handle {
-    constructor(layout, sectionIndex, height) {
-        this._layout = layout;
-        this._sectionIndex = sectionIndex;
-        this._initialHeight = height;
-    }
-
-    setHeight(height) {
-        this._layout._setUncommittedSectionHeight(
-            this._sectionIndex,
-            height - this._initialHeight,
-        );
-        return this;
-    }
-
-    finish() {
-        this._layout._commitHeights();
-        return this;
-    }
-}
-
-export class Distributor extends FixedDistributor {
-    constructor(item, cfg) {
-        super(item);
-        this._handle = cfg.getLayout().openHandle(item.id);
-    }
-
-    finish() {
-        this._handle.finish();
-    }
-
-    resize(height) {
-        this._handle.setHeight(height);
-    }
-}
diff --git a/src/resizer/index.js b/src/resizer/index.js
index 7c4b2bd493..1fd8f4da46 100644
--- a/src/resizer/index.js
+++ b/src/resizer/index.js
@@ -17,5 +17,4 @@ limitations under the License.
 
 export FixedDistributor from "./distributors/fixed";
 export CollapseDistributor from "./distributors/collapse";
-export RoomSubListDistributor from "./distributors/roomsublist";
 export Resizer from "./resizer";
diff --git a/src/settings/SettingLevel.ts b/src/settings/SettingLevel.ts
new file mode 100644
index 0000000000..e4703be1a9
--- /dev/null
+++ b/src/settings/SettingLevel.ts
@@ -0,0 +1,29 @@
+/*
+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.
+*/
+
+/**
+ * Represents the various setting levels supported by the SettingsStore.
+ */
+export enum SettingLevel {
+    // TODO: [TS] Follow naming convention
+    DEVICE = "device",
+    ROOM_DEVICE = "room-device",
+    ROOM_ACCOUNT = "room-account",
+    ACCOUNT = "account",
+    ROOM = "room",
+    CONFIG = "config",
+    DEFAULT = "default",
+}
diff --git a/src/settings/Settings.js b/src/settings/Settings.ts
similarity index 69%
rename from src/settings/Settings.js
rename to src/settings/Settings.ts
index 5c6d843349..3d18c14e16 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.ts
@@ -1,7 +1,6 @@
 /*
 Copyright 2017 Travis Ralston
-Copyright 2018, 2019 New Vector Ltd.
-Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
+Copyright 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.
@@ -16,11 +15,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixClient} from 'matrix-js-sdk';
+import { MatrixClient } from 'matrix-js-sdk/src/client';
 
-import {_td} from '../languageHandler';
+import { _td } from '../languageHandler';
 import {
-    AudioNotificationsEnabledController,
     NotificationBodyEnabledController,
     NotificationsEnabledController,
 } from "./controllers/NotificationControllers";
@@ -28,72 +26,95 @@ import CustomStatusController from "./controllers/CustomStatusController";
 import ThemeController from './controllers/ThemeController';
 import PushToMatrixClientController from './controllers/PushToMatrixClientController';
 import ReloadOnChangeController from "./controllers/ReloadOnChangeController";
-import {RIGHT_PANEL_PHASES} from "../stores/RightPanelStorePhases";
+import FontSizeController from './controllers/FontSizeController';
+import SystemFontController from './controllers/SystemFontController';
+import UseSystemFontController from './controllers/UseSystemFontController';
+import { SettingLevel } from "./SettingLevel";
+import SettingController from "./controllers/SettingController";
+import { RightPanelPhases } from "../stores/RightPanelStorePhases";
 
 // These are just a bunch of helper arrays to avoid copy/pasting a bunch of times
-const LEVELS_ROOM_SETTINGS = ['device', 'room-device', 'room-account', 'account', 'config'];
-const LEVELS_ROOM_OR_ACCOUNT = ['room-account', 'account'];
-const LEVELS_ROOM_SETTINGS_WITH_ROOM = ['device', 'room-device', 'room-account', 'account', 'config', 'room'];
-const LEVELS_ACCOUNT_SETTINGS = ['device', 'account', 'config'];
-const LEVELS_FEATURE = ['device', 'config'];
-const LEVELS_DEVICE_ONLY_SETTINGS = ['device'];
-const LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG = ['device', 'config'];
+const LEVELS_ROOM_SETTINGS = [
+    SettingLevel.DEVICE,
+    SettingLevel.ROOM_DEVICE,
+    SettingLevel.ROOM_ACCOUNT,
+    SettingLevel.ACCOUNT,
+    SettingLevel.CONFIG,
+];
+const LEVELS_ROOM_OR_ACCOUNT = [
+    SettingLevel.ROOM_ACCOUNT,
+    SettingLevel.ACCOUNT,
+];
+const LEVELS_ROOM_SETTINGS_WITH_ROOM = [
+    SettingLevel.DEVICE,
+    SettingLevel.ROOM_DEVICE,
+    SettingLevel.ROOM_ACCOUNT,
+    SettingLevel.ACCOUNT,
+    SettingLevel.CONFIG,
+    SettingLevel.ROOM,
+];
+const LEVELS_ACCOUNT_SETTINGS = [
+    SettingLevel.DEVICE,
+    SettingLevel.ACCOUNT,
+    SettingLevel.CONFIG,
+];
+const LEVELS_FEATURE = [
+    SettingLevel.DEVICE,
+    SettingLevel.CONFIG,
+];
+const LEVELS_DEVICE_ONLY_SETTINGS = [
+    SettingLevel.DEVICE,
+];
+const LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG = [
+    SettingLevel.DEVICE,
+    SettingLevel.CONFIG,
+];
 
-export const SETTINGS = {
-    // EXAMPLE SETTING:
-    // "my-setting": {
-    //     // Must be set to true for features. Default is 'false'.
-    //     isFeature: false,
-    //
-    //     // Display names are strongly recommended for clarity.
-    //     displayName: _td("Cool Name"),
-    //
-    //     // Display name can also be an object for different levels.
-    //     //displayName: {
-    //     //    "device": _td("Name for when the setting is used at 'device'"),
-    //     //    "room": _td("Name for when the setting is used at 'room'"),
-    //     //    "default": _td("The name for all other levels"),
-    //     //}
-    //
-    //     // The supported levels are required. Preferably, use the preset arrays
-    //     // at the top of this file to define this rather than a custom array.
-    //     supportedLevels: [
-    //         // The order does not matter.
-    //
-    //         "device",        // Affects the current device only
-    //         "room-device",   // Affects the current room on the current device
-    //         "room-account",  // Affects the current room for the current account
-    //         "account",       // Affects the current account
-    //         "room",          // Affects the current room (controlled by room admins)
-    //         "config",        // Affects the current application
-    //
-    //         // "default" is always supported and does not get listed here.
-    //     ],
-    //
-    //     // Required. Can be any data type. The value specified here should match
-    //     // the data being stored (ie: if a boolean is used, the setting should
-    //     // represent a boolean).
-    //     default: {
-    //         your: "value",
-    //     },
-    //
-    //     // Optional settings controller. See SettingsController for more information.
-    //     controller: new MySettingController(),
-    //
-    //     // Optional flag to make supportedLevels be respected as the order to handle
-    //     // settings. The first element is treated as "most preferred". The "default"
-    //     // level is always appended to the end.
-    //     supportedLevelsAreOrdered: false,
-    //
-    //     // Optional value to invert a boolean setting's value. The string given will
-    //     // be read as the setting's ID instead of the one provided as the key for the
-    //     // setting definition. By setting this, the returned value will automatically
-    //     // be inverted, except for when the default value is returned. Inversion will
-    //     // occur after the controller is asked for an override. This should be used by
-    //     // historical settings which we don't want existing user's values be wiped. Do
-    //     // not use this for new settings.
-    //     invertedSettingName: "my-negative-setting",
-    // },
+export interface ISetting {
+    // Must be set to true for features. Default is 'false'.
+    isFeature?: boolean;
+
+    // Display names are strongly recommended for clarity.
+    // Display name can also be an object for different levels.
+    displayName?: string | {
+        // @ts-ignore - TS wants the key to be a string, but we know better
+        [level: SettingLevel]: string;
+    };
+
+    // The supported levels are required. Preferably, use the preset arrays
+    // at the top of this file to define this rather than a custom array.
+    supportedLevels?: SettingLevel[];
+
+    // Required. Can be any data type. The value specified here should match
+    // the data being stored (ie: if a boolean is used, the setting should
+    // represent a boolean).
+    default: any;
+
+    // Optional settings controller. See SettingsController for more information.
+    controller?: SettingController;
+
+    // Optional flag to make supportedLevels be respected as the order to handle
+    // settings. The first element is treated as "most preferred". The "default"
+    // level is always appended to the end.
+    supportedLevelsAreOrdered?: boolean;
+
+    // Optional value to invert a boolean setting's value. The string given will
+    // be read as the setting's ID instead of the one provided as the key for the
+    // setting definition. By setting this, the returned value will automatically
+    // be inverted, except for when the default value is returned. Inversion will
+    // occur after the controller is asked for an override. This should be used by
+    // historical settings which we don't want existing user's values be wiped. Do
+    // not use this for new settings.
+    invertedSettingName?: string;
+}
+
+export const SETTINGS: {[setting: string]: ISetting} = {
+    "feature_new_spinner": {
+        isFeature: true,
+        displayName: _td("New spinner design"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
     "feature_pinning": {
         isFeature: true,
         displayName: _td("Message Pinning"),
@@ -137,36 +158,67 @@ export const SETTINGS = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
+    "feature_roomlist_preview_reactions_dms": {
+        isFeature: true,
+        displayName: _td("Show message previews for reactions in DMs"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
+    "feature_roomlist_preview_reactions_all": {
+        isFeature: true,
+        displayName: _td("Show message previews for reactions in all rooms"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
+    "advancedRoomListLogging": {
+        // TODO: Remove flag before launch: https://github.com/vector-im/element-web/issues/14231
+        displayName: _td("Enable advanced debugging for the room list"),
+        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
+        default: false,
+    },
     "mjolnirRooms": {
-        supportedLevels: ['account'],
+        supportedLevels: [SettingLevel.ACCOUNT],
         default: [],
     },
     "mjolnirPersonalRoom": {
-        supportedLevels: ['account'],
+        supportedLevels: [SettingLevel.ACCOUNT],
         default: null,
     },
-    "feature_cross_signing": {
-        // XXX: We shouldn't be using the feature prefix for non-feature settings. There is an exception
-        // for this case though as we're converting a feature to a setting for a temporary safety net.
-        displayName: _td("Enable cross-signing to verify per-user instead of per-session"),
-        supportedLevels: ['device', 'config'], // we shouldn't use LEVELS_FEATURE for non-features, so copy it here.
-        default: true,
-    },
     "feature_bridge_state": {
         isFeature: true,
         supportedLevels: LEVELS_FEATURE,
         displayName: _td("Show info about bridges in room settings"),
         default: false,
     },
+    "RoomList.backgroundImage": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        default: null,
+    },
+    "baseFontSize": {
+        displayName: _td("Font size"),
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        default: 10,
+        controller: new FontSizeController(),
+    },
+    "useCustomFontSize": {
+        displayName: _td("Use custom size"),
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        default: false,
+    },
     "MessageComposerInput.suggestEmoji": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Enable Emoji suggestions while typing'),
         default: true,
         invertedSettingName: 'MessageComposerInput.dontSuggestEmoji',
     },
+    // TODO: Wire up appropriately to UI (FTUE notifications)
+    "Notifications.alwaysShowBadgeCounts": {
+        supportedLevels: LEVELS_ROOM_OR_ACCOUNT,
+        default: false,
+    },
     "useCompactLayout": {
-        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        displayName: _td('Use compact timeline layout'),
+        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
+        displayName: _td('Use a more compact ‘Modern’ layout'),
         default: false,
     },
     "showRedactions": {
@@ -290,6 +342,18 @@ export const SETTINGS = {
         default: true,
         displayName: _td("Match system theme"),
     },
+    "useSystemFont": {
+        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
+        default: false,
+        displayName: _td("Use a system font"),
+        controller: new UseSystemFontController(),
+    },
+    "systemFont": {
+        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
+        default: "",
+        displayName: _td("System font name"),
+        controller: new SystemFontController(),
+    },
     "webRtcAllowPeerToPeer": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
         displayName: _td('Allow Peer-to-Peer for 1:1 calls'),
@@ -313,19 +377,25 @@ export const SETTINGS = {
         default: "en",
     },
     "breadcrumb_rooms": {
-        supportedLevels: ['account'],
+        // not really a setting
+        supportedLevels: [SettingLevel.ACCOUNT],
+        default: [],
+    },
+    "recent_emoji": {
+        // not really a setting
+        supportedLevels: [SettingLevel.ACCOUNT],
         default: [],
     },
     "room_directory_servers": {
-        supportedLevels: ['account'],
+        supportedLevels: [SettingLevel.ACCOUNT],
         default: [],
     },
     "integrationProvisioning": {
-        supportedLevels: ['account'],
+        supportedLevels: [SettingLevel.ACCOUNT],
         default: true,
     },
     "allowedWidgets": {
-        supportedLevels: ['room-account'],
+        supportedLevels: [SettingLevel.ROOM_ACCOUNT],
         default: {}, // none allowed
     },
     "analyticsOptIn": {
@@ -352,7 +422,7 @@ export const SETTINGS = {
     "blacklistUnverifiedDevices": {
         // We specifically want to have room-device > device so that users may set a device default
         // with a per-room override.
-        supportedLevels: ['room-device', 'device'],
+        supportedLevels: [SettingLevel.ROOM_DEVICE, SettingLevel.DEVICE],
         supportedLevelsAreOrdered: true,
         displayName: {
             "default": _td('Never send encrypted messages to unverified sessions from this session'),
@@ -370,7 +440,7 @@ export const SETTINGS = {
         default: true,
     },
     "urlPreviewsEnabled_e2ee": {
-        supportedLevels: ['room-device', 'room-account'],
+        supportedLevels: [SettingLevel.ROOM_DEVICE, SettingLevel.ROOM_ACCOUNT],
         displayName: {
             "room-account": _td("Enable URL previews for this room (only affects you)"),
         },
@@ -401,7 +471,6 @@ export const SETTINGS = {
     "audioNotificationsEnabled": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
         default: true,
-        controller: new AudioNotificationsEnabledController(),
     },
     "enableWidgetScreenshots": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
@@ -409,7 +478,7 @@ export const SETTINGS = {
         default: false,
     },
     "PinnedEvents.isOpen": {
-        supportedLevels: ['room-device'],
+        supportedLevels: [SettingLevel.ROOM_DEVICE],
         default: false,
     },
     "promptBeforeInviteUnknownUsers": {
@@ -429,11 +498,13 @@ export const SETTINGS = {
             deny: [],
         },
     },
+    // TODO: Remove setting: https://github.com/vector-im/element-web/issues/14373
     "RoomList.orderAlphabetically": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td("Order rooms by name"),
         default: false,
     },
+    // TODO: Remove setting: https://github.com/vector-im/element-web/issues/14373
     "RoomList.orderByImportance": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td("Show rooms with unread notifications first"),
@@ -486,22 +557,17 @@ export const SETTINGS = {
     },
     "lastRightPanelPhaseForRoom": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
-        default: RIGHT_PANEL_PHASES.RoomMemberInfo,
+        default: RightPanelPhases.RoomMemberInfo,
     },
     "lastRightPanelPhaseForGroup": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
-        default: RIGHT_PANEL_PHASES.GroupMemberList,
+        default: RightPanelPhases.GroupMemberList,
     },
     "enableEventIndexing": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
         displayName: _td("Enable message search in encrypted rooms"),
         default: true,
     },
-    "keepSecretStoragePassphraseForSession": {
-         supportedLevels: ['device', 'config'],
-         displayName: _td("Keep recovery passphrase in memory for this session"),
-         default: false,
-    },
     "crawlerSleepTime": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
         displayName: _td("How fast should messages be downloaded."),
@@ -519,4 +585,17 @@ export const SETTINGS = {
             MatrixClient.prototype.setCryptoTrustCrossSignedDevices, true,
         ),
     },
+    "ircDisplayNameWidth": {
+        // We specifically want to have room-device > device so that users may set a device default
+        // with a per-room override.
+        supportedLevels: [SettingLevel.ROOM_DEVICE, SettingLevel.DEVICE],
+        supportedLevelsAreOrdered: true,
+        displayName: _td("IRC display name width"),
+        default: 80,
+    },
+    "useIRCLayout": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td("Enable experimental, compact IRC style layout"),
+        default: false,
+    },
 };
diff --git a/src/settings/SettingsStore.js b/src/settings/SettingsStore.ts
similarity index 72%
rename from src/settings/SettingsStore.js
rename to src/settings/SettingsStore.ts
index 0122916bc3..9e146ad799 100644
--- a/src/settings/SettingsStore.js
+++ b/src/settings/SettingsStore.ts
@@ -1,6 +1,6 @@
 /*
 Copyright 2017 Travis Ralston
-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.
@@ -22,27 +22,13 @@ import RoomAccountSettingsHandler from "./handlers/RoomAccountSettingsHandler";
 import AccountSettingsHandler from "./handlers/AccountSettingsHandler";
 import RoomSettingsHandler from "./handlers/RoomSettingsHandler";
 import ConfigSettingsHandler from "./handlers/ConfigSettingsHandler";
-import {_t} from '../languageHandler';
-import SdkConfig from "../SdkConfig";
-import dis from '../dispatcher';
-import {SETTINGS} from "./Settings";
+import { _t } from '../languageHandler';
+import dis from '../dispatcher/dispatcher';
+import { ISetting, SETTINGS } from "./Settings";
 import LocalEchoWrapper from "./handlers/LocalEchoWrapper";
-import {WatchManager} from "./WatchManager";
-
-/**
- * Represents the various setting levels supported by the SettingsStore.
- */
-export const SettingLevel = {
-    // Note: This enum is not used in this class or in the Settings file
-    // This should always be used elsewhere in the project.
-    DEVICE: "device",
-    ROOM_DEVICE: "room-device",
-    ROOM_ACCOUNT: "room-account",
-    ACCOUNT: "account",
-    ROOM: "room",
-    CONFIG: "config",
-    DEFAULT: "default",
-};
+import { WatchManager } from "./WatchManager";
+import { SettingLevel } from "./SettingLevel";
+import SettingsHandler from "./handlers/SettingsHandler";
 
 const defaultWatchManager = new WatchManager();
 
@@ -61,13 +47,13 @@ for (const key of Object.keys(SETTINGS)) {
 }
 
 const LEVEL_HANDLERS = {
-    "device": new DeviceSettingsHandler(featureNames, defaultWatchManager),
-    "room-device": new RoomDeviceSettingsHandler(defaultWatchManager),
-    "room-account": new RoomAccountSettingsHandler(defaultWatchManager),
-    "account": new AccountSettingsHandler(defaultWatchManager),
-    "room": new RoomSettingsHandler(defaultWatchManager),
-    "config": new ConfigSettingsHandler(),
-    "default": new DefaultSettingsHandler(defaultSettings, invertedDefaultSettings),
+    [SettingLevel.DEVICE]: new DeviceSettingsHandler(featureNames, defaultWatchManager),
+    [SettingLevel.ROOM_DEVICE]: new RoomDeviceSettingsHandler(defaultWatchManager),
+    [SettingLevel.ROOM_ACCOUNT]: new RoomAccountSettingsHandler(defaultWatchManager),
+    [SettingLevel.ACCOUNT]: new AccountSettingsHandler(defaultWatchManager),
+    [SettingLevel.ROOM]: new RoomSettingsHandler(defaultWatchManager),
+    [SettingLevel.CONFIG]: new ConfigSettingsHandler(featureNames),
+    [SettingLevel.DEFAULT]: new DefaultSettingsHandler(defaultSettings, invertedDefaultSettings),
 };
 
 // Wrap all the handlers with local echo
@@ -76,20 +62,41 @@ for (const key of Object.keys(LEVEL_HANDLERS)) {
 }
 
 const LEVEL_ORDER = [
-    'device', 'room-device', 'room-account', 'account', 'room', 'config', 'default',
+    SettingLevel.DEVICE,
+    SettingLevel.ROOM_DEVICE,
+    SettingLevel.ROOM_ACCOUNT,
+    SettingLevel.ACCOUNT,
+    SettingLevel.ROOM,
+    SettingLevel.CONFIG,
+    SettingLevel.DEFAULT,
 ];
 
+export type CallbackFn = (
+    settingName: string,
+    roomId: string,
+    atLevel: SettingLevel,
+    newValAtLevel: any,
+    newVal: any,
+) => void;
+
+interface IHandlerMap {
+    // @ts-ignore - TS wants this to be a string key but we know better
+    [level: SettingLevel]: SettingsHandler;
+}
+
+export type LabsFeatureState = "labs" | "disable" | "enable" | string;
+
 /**
  * Controls and manages application settings by providing varying levels at which the
  * setting value may be specified. The levels are then used to determine what the setting
  * value should be given a set of circumstances. The levels, in priority order, are:
- * - "device"         - Values are determined by the current device
- * - "room-device"    - Values are determined by the current device for a particular room
- * - "room-account"   - Values are determined by the current account for a particular room
- * - "account"        - Values are determined by the current account
- * - "room"           - Values are determined by a particular room (by the room admins)
- * - "config"         - Values are determined by the config.json
- * - "default"        - Values are determined by the hardcoded defaults
+ * - SettingLevel.DEVICE         - Values are determined by the current device
+ * - SettingLevel.ROOM_DEVICE    - Values are determined by the current device for a particular room
+ * - SettingLevel.ROOM_ACCOUNT   - Values are determined by the current account for a particular room
+ * - SettingLevel.ACCOUNT        - Values are determined by the current account
+ * - SettingLevel.ROOM           - Values are determined by a particular room (by the room admins)
+ * - SettingLevel.CONFIG         - Values are determined by the config.json
+ * - SettingLevel.DEFAULT        - Values are determined by the hardcoded defaults
  *
  * Each level has a different method to storing the setting value. For implementation
  * specific details, please see the handlers. The "config" and "default" levels are
@@ -110,11 +117,19 @@ export default class SettingsStore {
     // We also maintain a list of monitors which are special watchers: they cause dispatches
     // when the setting changes. We track which rooms we're monitoring though to ensure we
     // don't duplicate updates on the bus.
-    static _watchers = {}; // { callbackRef => { callbackFn } }
-    static _monitors = {}; // { settingName => { roomId => callbackRef } }
+    private static watchers = {}; // { callbackRef => { callbackFn } }
+    private static monitors = {}; // { settingName => { roomId => callbackRef } }
 
     // Counter used for generation of watcher IDs
-    static _watcherCount = 1;
+    private static watcherCount = 1;
+
+    /**
+     * Gets all the feature-style setting names.
+     * @returns {string[]} The names of the feature settings.
+     */
+    public static getFeatureSettingNames(): string[] {
+        return Object.keys(SETTINGS).filter(n => SettingsStore.isFeature(n));
+    }
 
     /**
      * Watches for changes in a particular setting. This is done without any local echo
@@ -132,7 +147,7 @@ export default class SettingsStore {
      * if the change in value is worthwhile enough to react upon.
      * @returns {string} A reference to the watcher that was employed.
      */
-    static watchSetting(settingName, roomId, callbackFn) {
+    public static watchSetting(settingName: string, roomId: string, callbackFn: CallbackFn): string {
         const setting = SETTINGS[settingName];
         const originalSettingName = settingName;
         if (!setting) throw new Error(`${settingName} is not a setting`);
@@ -141,15 +156,14 @@ export default class SettingsStore {
             settingName = setting.invertedSettingName;
         }
 
-        const watcherId = `${new Date().getTime()}_${SettingsStore._watcherCount++}_${settingName}_${roomId}`;
+        const watcherId = `${new Date().getTime()}_${SettingsStore.watcherCount++}_${settingName}_${roomId}`;
 
         const localizedCallback = (changedInRoomId, atLevel, newValAtLevel) => {
             const newValue = SettingsStore.getValue(originalSettingName);
             callbackFn(originalSettingName, changedInRoomId, atLevel, newValAtLevel, newValue);
         };
 
-        console.log(`Starting watcher for ${settingName}@${roomId || '<null room>'} as ID ${watcherId}`);
-        SettingsStore._watchers[watcherId] = localizedCallback;
+        SettingsStore.watchers[watcherId] = localizedCallback;
         defaultWatchManager.watchSetting(settingName, roomId, localizedCallback);
 
         return watcherId;
@@ -161,15 +175,14 @@ export default class SettingsStore {
      * @param {string} watcherReference The watcher reference (received from #watchSetting)
      * to cancel.
      */
-    static unwatchSetting(watcherReference) {
-        if (!SettingsStore._watchers[watcherReference]) {
+    public static unwatchSetting(watcherReference: string) {
+        if (!SettingsStore.watchers[watcherReference]) {
             console.warn(`Ending non-existent watcher ID ${watcherReference}`);
             return;
         }
 
-        console.log(`Ending watcher ID ${watcherReference}`);
-        defaultWatchManager.unwatchSetting(SettingsStore._watchers[watcherReference]);
-        delete SettingsStore._watchers[watcherReference];
+        defaultWatchManager.unwatchSetting(SettingsStore.watchers[watcherReference]);
+        delete SettingsStore.watchers[watcherReference];
     }
 
     /**
@@ -180,11 +193,13 @@ export default class SettingsStore {
      * @param {string} settingName The setting name to monitor.
      * @param {String} roomId The room ID to monitor for changes in. Use null for all rooms.
      */
-    static monitorSetting(settingName, roomId) {
-        if (!this._monitors[settingName]) this._monitors[settingName] = {};
+    public static monitorSetting(settingName: string, roomId: string) {
+        roomId = roomId || null; // the thing wants null specifically to work, so appease it.
+
+        if (!this.monitors[settingName]) this.monitors[settingName] = {};
 
         const registerWatcher = () => {
-            this._monitors[settingName][roomId] = SettingsStore.watchSetting(
+            this.monitors[settingName][roomId] = SettingsStore.watchSetting(
                 settingName, roomId, (settingName, inRoomId, level, newValueAtLevel, newValue) => {
                     dis.dispatch({
                         action: 'setting_updated',
@@ -198,16 +213,16 @@ export default class SettingsStore {
             );
         };
 
-        const hasRoom = Object.keys(this._monitors[settingName]).find((r) => r === roomId || r === null);
+        const hasRoom = Object.keys(this.monitors[settingName]).find((r) => r === roomId || r === null);
         if (!hasRoom) {
             registerWatcher();
         } else {
             if (roomId === null) {
                 // Unregister all existing watchers and register the new one
-                for (const roomId of Object.keys(this._monitors[settingName])) {
-                    SettingsStore.unwatchSetting(this._monitors[settingName][roomId]);
+                for (const roomId of Object.keys(this.monitors[settingName])) {
+                    SettingsStore.unwatchSetting(this.monitors[settingName][roomId]);
                 }
-                this._monitors[settingName] = {};
+                this.monitors[settingName] = {};
                 registerWatcher();
             } // else a watcher is already registered for the room, so don't bother registering it again
         }
@@ -216,11 +231,11 @@ export default class SettingsStore {
     /**
      * Gets the translated display name for a given setting
      * @param {string} settingName The setting to look up.
-     * @param {"device"|"room-device"|"room-account"|"account"|"room"|"config"|"default"} atLevel
+     * @param {SettingLevel} atLevel
      * The level to get the display name for; Defaults to 'default'.
      * @return {String} The display name for the setting, or null if not found.
      */
-    static getDisplayName(settingName, atLevel = "default") {
+    public static getDisplayName(settingName: string, atLevel = SettingLevel.DEFAULT) {
         if (!SETTINGS[settingName] || !SETTINGS[settingName].displayName) return null;
 
         let displayName = SETTINGS[settingName].displayName;
@@ -229,20 +244,7 @@ export default class SettingsStore {
             else displayName = displayName["default"];
         }
 
-        return _t(displayName);
-    }
-
-    /**
-     * Returns a list of all available labs feature names
-     * @returns {string[]} The list of available feature names
-     */
-    static getLabsFeatures() {
-        const possibleFeatures = Object.keys(SETTINGS).filter((s) => SettingsStore.isFeature(s));
-
-        const enableLabs = SdkConfig.get()["enableLabs"];
-        if (enableLabs) return possibleFeatures;
-
-        return possibleFeatures.filter((s) => SettingsStore._getFeatureState(s) === "labs");
+        return _t(displayName as string);
     }
 
     /**
@@ -250,44 +252,11 @@ export default class SettingsStore {
      * @param {string} settingName The setting to look up.
      * @return {boolean} True if the setting is a feature.
      */
-    static isFeature(settingName) {
+    public static isFeature(settingName: string) {
         if (!SETTINGS[settingName]) return false;
         return SETTINGS[settingName].isFeature;
     }
 
-    /**
-     * Determines if a given feature is enabled. The feature given must be a known
-     * feature.
-     * @param {string} settingName The name of the setting that is a feature.
-     * @param {String} roomId The optional room ID to validate in, may be null.
-     * @return {boolean} True if the feature is enabled, false otherwise
-     */
-    static isFeatureEnabled(settingName, roomId = null) {
-        if (!SettingsStore.isFeature(settingName)) {
-            throw new Error("Setting " + settingName + " is not a feature");
-        }
-
-        return SettingsStore.getValue(settingName, roomId);
-    }
-
-    /**
-     * Sets a feature as enabled or disabled on the current device.
-     * @param {string} settingName The name of the setting.
-     * @param {boolean} value True to enable the feature, false otherwise.
-     * @returns {Promise} Resolves when the setting has been set.
-     */
-    static setFeatureEnabled(settingName, value) {
-        // Verify that the setting is actually a setting
-        if (!SETTINGS[settingName]) {
-            throw new Error("Setting '" + settingName + "' does not appear to be a setting.");
-        }
-        if (!SettingsStore.isFeature(settingName)) {
-            throw new Error("Setting " + settingName + " is not a feature");
-        }
-
-        return SettingsStore.setValue(settingName, null, "device", value);
-    }
-
     /**
      * Gets the value of a setting. The room ID is optional if the setting is not to
      * be applied to any particular room, otherwise it should be supplied.
@@ -296,7 +265,7 @@ export default class SettingsStore {
      * @param {boolean} excludeDefault True to disable using the default value.
      * @return {*} The value, or null if not found
      */
-    static getValue(settingName, roomId = null, excludeDefault = false) {
+    public static getValue(settingName: string, roomId: string = null, excludeDefault = false): any {
         // Verify that the setting is actually a setting
         if (!SETTINGS[settingName]) {
             throw new Error("Setting '" + settingName + "' does not appear to be a setting.");
@@ -310,7 +279,7 @@ export default class SettingsStore {
 
     /**
      * Gets a setting's value at a particular level, ignoring all levels that are more specific.
-     * @param {"device"|"room-device"|"room-account"|"account"|"room"|"config"|"default"} level The
+     * @param {SettingLevel|"config"|"default"} level The
      * level to look at.
      * @param {string} settingName The name of the setting to read.
      * @param {String} roomId The room ID to read the setting value in, may be null.
@@ -319,7 +288,13 @@ export default class SettingsStore {
      * @param {boolean} excludeDefault True to disable using the default value.
      * @return {*} The value, or null if not found.
      */
-    static getValueAt(level, settingName, roomId = null, explicit = false, excludeDefault = false) {
+    public static getValueAt(
+        level: SettingLevel,
+        settingName: string,
+        roomId: string = null,
+        explicit = false,
+        excludeDefault = false,
+    ): any {
         // Verify that the setting is actually a setting
         const setting = SETTINGS[settingName];
         if (!setting) {
@@ -327,19 +302,12 @@ export default class SettingsStore {
         }
 
         const levelOrder = (setting.supportedLevelsAreOrdered ? setting.supportedLevels : LEVEL_ORDER);
-        if (!levelOrder.includes("default")) levelOrder.push("default"); // always include default
+        if (!levelOrder.includes(SettingLevel.DEFAULT)) levelOrder.push(SettingLevel.DEFAULT); // always include default
 
         const minIndex = levelOrder.indexOf(level);
         if (minIndex === -1) throw new Error("Level " + level + " is not prioritized");
 
-        if (SettingsStore.isFeature(settingName)) {
-            const configValue = SettingsStore._getFeatureState(settingName);
-            if (configValue === "enable") return true;
-            if (configValue === "disable") return false;
-            // else let it fall through the default process
-        }
-
-        const handlers = SettingsStore._getHandlers(settingName);
+        const handlers = SettingsStore.getHandlers(settingName);
 
         // Check if we need to invert the setting at all. Do this after we get the setting
         // handlers though, otherwise we'll fail to read the value.
@@ -351,10 +319,10 @@ export default class SettingsStore {
         if (explicit) {
             const handler = handlers[level];
             if (!handler) {
-                return SettingsStore._getFinalValue(setting, level, roomId, null, null);
+                return SettingsStore.getFinalValue(setting, level, roomId, null, null);
             }
             const value = handler.getValue(settingName, roomId);
-            return SettingsStore._getFinalValue(setting, level, roomId, value, level);
+            return SettingsStore.getFinalValue(setting, level, roomId, value, level);
         }
 
         for (let i = minIndex; i < levelOrder.length; i++) {
@@ -364,13 +332,34 @@ export default class SettingsStore {
 
             const value = handler.getValue(settingName, roomId);
             if (value === null || value === undefined) continue;
-            return SettingsStore._getFinalValue(setting, level, roomId, value, levelOrder[i]);
+            return SettingsStore.getFinalValue(setting, level, roomId, value, levelOrder[i]);
         }
 
-        return SettingsStore._getFinalValue(setting, level, roomId, null, null);
+        return SettingsStore.getFinalValue(setting, level, roomId, null, null);
     }
 
-    static _getFinalValue(setting, level, roomId, calculatedValue, calculatedAtLevel) {
+    /**
+     * Gets the default value of a setting.
+     * @param {string} settingName The name of the setting to read the value of.
+     * @param {String} roomId The room ID to read the setting value in, may be null.
+     * @return {*} The default value
+     */
+    public static getDefaultValue(settingName: string): any {
+        // Verify that the setting is actually a setting
+        if (!SETTINGS[settingName]) {
+            throw new Error("Setting '" + settingName + "' does not appear to be a setting.");
+        }
+
+        return SETTINGS[settingName].default;
+    }
+
+    private static getFinalValue(
+        setting: ISetting,
+        level: SettingLevel,
+        roomId: string,
+        calculatedValue: any,
+        calculatedAtLevel: SettingLevel,
+    ): any {
         let resultingValue = calculatedValue;
 
         if (setting.controller) {
@@ -389,20 +378,21 @@ export default class SettingsStore {
      * to indicate that the level should no longer have an override.
      * @param {string} settingName The name of the setting to change.
      * @param {String} roomId The room ID to change the value in, may be null.
-     * @param {"device"|"room-device"|"room-account"|"account"|"room"} level The level
+     * @param {SettingLevel} level The level
      * to change the value at.
      * @param {*} value The new value of the setting, may be null.
      * @return {Promise} Resolves when the setting has been changed.
      */
+
     /* eslint-enable valid-jsdoc */
-    static async setValue(settingName, roomId, level, value) {
+    public static async setValue(settingName: string, roomId: string, level: SettingLevel, value: any): Promise<void> {
         // 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 handler = SettingsStore._getHandler(settingName, level);
+        const handler = SettingsStore.getHandler(settingName, level);
         if (!handler) {
             throw new Error("Setting " + settingName + " does not have a handler for " + level);
         }
@@ -434,28 +424,34 @@ export default class SettingsStore {
      * set for a particular room, otherwise it should be supplied.
      * @param {string} settingName The name of the setting to check.
      * @param {String} roomId The room ID to check in, may be null.
-     * @param {"device"|"room-device"|"room-account"|"account"|"room"} level The level to
+     * @param {SettingLevel} level The level to
      * check at.
      * @return {boolean} True if the user may set the setting, false otherwise.
      */
-    static canSetValue(settingName, roomId, level) {
+    public static canSetValue(settingName: string, roomId: string, level: SettingLevel): boolean {
         // Verify that the setting is actually a setting
         if (!SETTINGS[settingName]) {
             throw new Error("Setting '" + settingName + "' does not appear to be a setting.");
         }
 
-        const handler = SettingsStore._getHandler(settingName, level);
+        // When features are specified in the config.json, we force them as enabled or disabled.
+        if (SettingsStore.isFeature(settingName)) {
+            const configVal = SettingsStore.getValueAt(SettingLevel.CONFIG, settingName, roomId, true, true);
+            if (configVal === true || configVal === false) return false;
+        }
+
+        const handler = SettingsStore.getHandler(settingName, level);
         if (!handler) return false;
         return handler.canSetValue(settingName, roomId);
     }
 
     /**
      * Determines if the given level is supported on this device.
-     * @param {"device"|"room-device"|"room-account"|"account"|"room"} level The level
+     * @param {SettingLevel} level The level
      * to check the feasibility of.
      * @return {boolean} True if the level is supported, false otherwise.
      */
-    static isLevelSupported(level) {
+    public static isLevelSupported(level: SettingLevel): boolean {
         if (!LEVEL_HANDLERS[level]) return false;
         return LEVEL_HANDLERS[level].isSupported();
     }
@@ -467,7 +463,7 @@ export default class SettingsStore {
      * @param {string} realSettingName The setting name to try and read.
      * @param {string} roomId Optional room ID to test the setting in.
      */
-    static debugSetting(realSettingName, roomId) {
+    public static debugSetting(realSettingName: string, roomId: string) {
         console.log(`--- DEBUG ${realSettingName}`);
 
         // Note: we intentionally use JSON.stringify here to avoid the console masking the
@@ -555,13 +551,13 @@ export default class SettingsStore {
         console.log(`--- END DEBUG`);
     }
 
-    static _getHandler(settingName, level) {
-        const handlers = SettingsStore._getHandlers(settingName);
+    private static getHandler(settingName: string, level: SettingLevel): SettingsHandler {
+        const handlers = SettingsStore.getHandlers(settingName);
         if (!handlers[level]) return null;
         return handlers[level];
     }
 
-    static _getHandlers(settingName) {
+    private static getHandlers(settingName: string): IHandlerMap {
         if (!SETTINGS[settingName]) return {};
 
         const handlers = {};
@@ -575,25 +571,7 @@ export default class SettingsStore {
 
         return handlers;
     }
-
-    static _getFeatureState(settingName) {
-        const featuresConfig = SdkConfig.get()['features'];
-        const enableLabs = SdkConfig.get()['enableLabs']; // we'll honour the old flag
-
-        let featureState = enableLabs ? "labs" : "disable";
-        if (featuresConfig && featuresConfig[settingName] !== undefined) {
-            featureState = featuresConfig[settingName];
-        }
-
-        const allowedStates = ['enable', 'disable', 'labs'];
-        if (!allowedStates.includes(featureState)) {
-            console.warn("Feature state '" + featureState + "' is invalid for " + settingName);
-            featureState = "disable"; // to prevent accidental features.
-        }
-
-        return featureState;
-    }
 }
 
 // For debugging purposes
-global.mxSettingsStore = SettingsStore;
+window.mxSettingsStore = SettingsStore;
diff --git a/src/settings/WatchManager.js b/src/settings/WatchManager.js
deleted file mode 100644
index 472b13966f..0000000000
--- a/src/settings/WatchManager.js
+++ /dev/null
@@ -1,61 +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.
-*/
-
-/**
- * Generalized management class for dealing with watchers on a per-handler (per-level)
- * basis without duplicating code. Handlers are expected to push updates through this
- * class, which are then proxied outwards to any applicable watchers.
- */
-export class WatchManager {
-    _watchers = {}; // { settingName: { roomId: callbackFns[] } }
-
-    // Proxy for handlers to delegate changes to this manager
-    watchSetting(settingName, roomId, cb) {
-        if (!this._watchers[settingName]) this._watchers[settingName] = {};
-        if (!this._watchers[settingName][roomId]) this._watchers[settingName][roomId] = [];
-        this._watchers[settingName][roomId].push(cb);
-    }
-
-    // Proxy for handlers to delegate changes to this manager
-    unwatchSetting(cb) {
-        for (const settingName of Object.keys(this._watchers)) {
-            for (const roomId of Object.keys(this._watchers[settingName])) {
-                let idx;
-                while ((idx = this._watchers[settingName][roomId].indexOf(cb)) !== -1) {
-                    this._watchers[settingName][roomId].splice(idx, 1);
-                }
-            }
-        }
-    }
-
-    notifyUpdate(settingName, inRoomId, atLevel, newValueAtLevel) {
-        // Dev note: We could avoid raising changes for ultimately inconsequential changes, but
-        // we also don't have a reliable way to get the old value of a setting. Instead, we'll just
-        // let it fall through regardless and let the receiver dedupe if they want to.
-
-        if (!this._watchers[settingName]) return;
-
-        const roomWatchers = this._watchers[settingName];
-        const callbacks = [];
-
-        if (inRoomId !== null && roomWatchers[inRoomId]) callbacks.push(...roomWatchers[inRoomId]);
-        if (roomWatchers[null]) callbacks.push(...roomWatchers[null]);
-
-        for (const callback of callbacks) {
-            callback(inRoomId, atLevel, newValueAtLevel);
-        }
-    }
-}
diff --git a/src/settings/WatchManager.ts b/src/settings/WatchManager.ts
new file mode 100644
index 0000000000..d51439459c
--- /dev/null
+++ b/src/settings/WatchManager.ts
@@ -0,0 +1,81 @@
+/*
+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 { SettingLevel } from "./SettingLevel";
+
+export type CallbackFn = (changedInRoomId: string, atLevel: SettingLevel, newValAtLevel: any) => void;
+
+const IRRELEVANT_ROOM = Symbol("any room");
+
+interface RoomWatcherMap {
+    // @ts-ignore - TS wants string-only keys but we know better - https://github.com/Microsoft/TypeScript/issues/1863
+    [roomId: string | symbol]: CallbackFn[];
+}
+
+/**
+ * Generalized management class for dealing with watchers on a per-handler (per-level)
+ * basis without duplicating code. Handlers are expected to push updates through this
+ * class, which are then proxied outwards to any applicable watchers.
+ */
+export class WatchManager {
+    private watchers: {[settingName: string]: RoomWatcherMap} = {};
+
+    // Proxy for handlers to delegate changes to this manager
+    public watchSetting(settingName: string, roomId: string | null, cb: CallbackFn) {
+        if (!this.watchers[settingName]) this.watchers[settingName] = {};
+        if (!this.watchers[settingName][roomId]) this.watchers[settingName][roomId] = [];
+        this.watchers[settingName][roomId].push(cb);
+    }
+
+    // Proxy for handlers to delegate changes to this manager
+    public unwatchSetting(cb: CallbackFn) {
+        for (const settingName of Object.keys(this.watchers)) {
+            for (const roomId of Object.keys(this.watchers[settingName])) {
+                let idx;
+                while ((idx = this.watchers[settingName][roomId].indexOf(cb)) !== -1) {
+                    this.watchers[settingName][roomId].splice(idx, 1);
+                }
+            }
+        }
+    }
+
+    public notifyUpdate(settingName: string, inRoomId: string | null, atLevel: SettingLevel, newValueAtLevel: any) {
+        // Dev note: We could avoid raising changes for ultimately inconsequential changes, but
+        // we also don't have a reliable way to get the old value of a setting. Instead, we'll just
+        // let it fall through regardless and let the receiver dedupe if they want to.
+
+        if (!this.watchers[settingName]) return;
+
+        const roomWatchers = this.watchers[settingName];
+        const callbacks = [];
+
+        if (inRoomId !== null && roomWatchers[inRoomId]) {
+            callbacks.push(...roomWatchers[inRoomId]);
+        }
+
+        if (!inRoomId) {
+            // Fire updates to all the individual room watchers too, as they probably
+            // care about the change higher up.
+            callbacks.push(...Object.values(roomWatchers).reduce((r, a) => [...r, ...a], []));
+        } else if (roomWatchers[IRRELEVANT_ROOM]) {
+            callbacks.push(...roomWatchers[IRRELEVANT_ROOM]);
+        }
+
+        for (const callback of callbacks) {
+            callback(inRoomId, atLevel, newValueAtLevel);
+        }
+    }
+}
diff --git a/src/settings/controllers/CustomStatusController.js b/src/settings/controllers/CustomStatusController.ts
similarity index 80%
rename from src/settings/controllers/CustomStatusController.js
rename to src/settings/controllers/CustomStatusController.ts
index 0fc6619d92..c7dfad0b3b 100644
--- a/src/settings/controllers/CustomStatusController.js
+++ b/src/settings/controllers/CustomStatusController.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.
@@ -15,10 +15,11 @@ limitations under the License.
 */
 
 import SettingController from "./SettingController";
-import dis from "../../dispatcher";
+import dis from "../../dispatcher/dispatcher";
+import { SettingLevel } from "../SettingLevel";
 
 export default class CustomStatusController extends SettingController {
-    onChange(level, roomId, newValue) {
+    public onChange(level: SettingLevel, roomId: string, newValue: any) {
         // Dispatch setting change so that some components that are still visible when the
         // Settings page is open (such as RoomTiles) can reflect the change.
         dis.dispatch({
diff --git a/src/settings/controllers/FontSizeController.ts b/src/settings/controllers/FontSizeController.ts
new file mode 100644
index 0000000000..b86d596040
--- /dev/null
+++ b/src/settings/controllers/FontSizeController.ts
@@ -0,0 +1,35 @@
+/*
+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 SettingController from "./SettingController";
+import dis from "../../dispatcher/dispatcher";
+import { UpdateFontSizePayload } from "../../dispatcher/payloads/UpdateFontSizePayload";
+import { Action } from "../../dispatcher/actions";
+import { SettingLevel } from "../SettingLevel";
+
+export default class FontSizeController extends SettingController {
+    constructor() {
+        super();
+    }
+
+    public onChange(level: SettingLevel, roomId: string, newValue: any) {
+        // Dispatch font size change so that everything open responds to the change.
+        dis.dispatch<UpdateFontSizePayload>({
+            action: Action.UpdateFontSize,
+            size: newValue,
+        });
+    }
+}
diff --git a/src/settings/controllers/NotificationControllers.js b/src/settings/controllers/NotificationControllers.ts
similarity index 64%
rename from src/settings/controllers/NotificationControllers.js
rename to src/settings/controllers/NotificationControllers.ts
index 395da765a1..bf5971d02e 100644
--- a/src/settings/controllers/NotificationControllers.js
+++ b/src/settings/controllers/NotificationControllers.ts
@@ -1,5 +1,6 @@
 /*
 Copyright 2017 Travis Ralston
+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.
@@ -16,42 +17,51 @@ limitations under the License.
 
 import SettingController from "./SettingController";
 import {MatrixClientPeg} from '../../MatrixClientPeg';
+import { SettingLevel } from "../SettingLevel";
 
 // XXX: This feels wrong.
 import {PushProcessor} from "matrix-js-sdk/src/pushprocessor";
 
-function isMasterRuleEnabled() {
+// .m.rule.master being enabled means all events match that push rule
+// default action on this rule is dont_notify, but it could be something else
+function isPushNotifyDisabled(): boolean {
     // Return the value of the master push rule as a default
     const processor = new PushProcessor(MatrixClientPeg.get());
     const masterRule = processor.getPushRuleById(".m.rule.master");
 
     if (!masterRule) {
         console.warn("No master push rule! Notifications are disabled for this user.");
-        return false;
+        return true;
     }
 
-    // Why enabled == false means "enabled" is beyond me.
-    return !masterRule.enabled;
+    // If the rule is enabled then check it does not notify on everything
+    return masterRule.enabled && !masterRule.actions.includes("notify");
 }
 
-function getNotifier() {
+function getNotifier(): any { // TODO: [TS] Formal type that doesn't cause a cyclical reference.
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
     let Notifier = require('../../Notifier'); // avoids cyclical references
     if (Notifier.default) Notifier = Notifier.default; // correct for webpack require() weirdness
     return Notifier;
 }
 
 export class NotificationsEnabledController extends SettingController {
-    getValueOverride(level, roomId, calculatedValue, calculatedAtLevel) {
+    public getValueOverride(
+        level: SettingLevel,
+        roomId: string,
+        calculatedValue: any,
+        calculatedAtLevel: SettingLevel,
+    ): any {
         if (!getNotifier().isPossible()) return false;
 
         if (calculatedValue === null || calculatedAtLevel === "default") {
-            return isMasterRuleEnabled();
+            return !isPushNotifyDisabled();
         }
 
         return calculatedValue;
     }
 
-    onChange(level, roomId, newValue) {
+    public onChange(level: SettingLevel, roomId: string, newValue: any) {
         if (getNotifier().supportsDesktopNotifications()) {
             getNotifier().setEnabled(newValue);
         }
@@ -59,22 +69,13 @@ export class NotificationsEnabledController extends SettingController {
 }
 
 export class NotificationBodyEnabledController extends SettingController {
-    getValueOverride(level, roomId, calculatedValue) {
+    public getValueOverride(level: SettingLevel, roomId: string, calculatedValue: any): any {
         if (!getNotifier().isPossible()) return false;
 
         if (calculatedValue === null) {
-            return isMasterRuleEnabled();
+            return !isPushNotifyDisabled();
         }
 
         return calculatedValue;
     }
 }
-
-export class AudioNotificationsEnabledController extends SettingController {
-    getValueOverride(level, roomId, calculatedValue) {
-        if (!getNotifier().isPossible()) return false;
-
-        // Note: Audio notifications are *not* enabled by default.
-        return calculatedValue;
-    }
-}
diff --git a/src/settings/controllers/PushToMatrixClientController.js b/src/settings/controllers/PushToMatrixClientController.ts
similarity index 67%
rename from src/settings/controllers/PushToMatrixClientController.js
rename to src/settings/controllers/PushToMatrixClientController.ts
index b7c285227f..8fbf7eb34c 100644
--- a/src/settings/controllers/PushToMatrixClientController.js
+++ b/src/settings/controllers/PushToMatrixClientController.ts
@@ -15,23 +15,20 @@ limitations under the License.
 */
 
 import { MatrixClientPeg } from '../../MatrixClientPeg';
+import { SettingLevel } from "../SettingLevel";
+import SettingController from "./SettingController";
 
 /**
  * When the value changes, call a setter function on the matrix client with the new value
  */
-export default class PushToMatrixClientController {
-    constructor(setter, inverse) {
-        this._setter = setter;
-        this._inverse = inverse;
+export default class PushToMatrixClientController extends SettingController {
+    constructor(private setter: Function, private inverse: boolean) {
+        super();
     }
 
-    getValueOverride(level, roomId, calculatedValue, calculatedAtLevel) {
-        return null; // no override
-    }
-
-    onChange(level, roomId, newValue) {
+    public onChange(level: SettingLevel, roomId: string, newValue: any) {
         // XXX does this work? This surely isn't necessarily the effective value,
         // but it's what NotificationsEnabledController does...
-        this._setter.call(MatrixClientPeg.get(), this._inverse ? !newValue : newValue);
+        this.setter.call(MatrixClientPeg.get(), this.inverse ? !newValue : newValue);
     }
 }
diff --git a/src/settings/controllers/ReloadOnChangeController.js b/src/settings/controllers/ReloadOnChangeController.ts
similarity index 80%
rename from src/settings/controllers/ReloadOnChangeController.js
rename to src/settings/controllers/ReloadOnChangeController.ts
index eadaee89ca..12bc23ef6c 100644
--- a/src/settings/controllers/ReloadOnChangeController.js
+++ b/src/settings/controllers/ReloadOnChangeController.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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,9 +16,10 @@ limitations under the License.
 
 import SettingController from "./SettingController";
 import PlatformPeg from "../../PlatformPeg";
+import { SettingLevel } from "../SettingLevel";
 
 export default class ReloadOnChangeController extends SettingController {
-    onChange(level, roomId, newValue) {
+    public onChange(level: SettingLevel, roomId: string, newValue: any) {
         PlatformPeg.get().reload();
     }
 }
diff --git a/src/settings/controllers/SettingController.js b/src/settings/controllers/SettingController.ts
similarity index 79%
rename from src/settings/controllers/SettingController.js
rename to src/settings/controllers/SettingController.ts
index a7d0ccf21a..d90eba1e9e 100644
--- a/src/settings/controllers/SettingController.js
+++ b/src/settings/controllers/SettingController.ts
@@ -1,5 +1,6 @@
 /*
 Copyright 2017 Travis Ralston
+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,6 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import { SettingLevel } from "../SettingLevel";
+
 /**
  * Represents a controller for individual settings to alter the reading behaviour
  * based upon environmental conditions, or to react to changes and therefore update
@@ -22,7 +25,7 @@ limitations under the License.
  * This is not intended to replace the functionality of a SettingsHandler, it is only
  * intended to handle environmental factors for specific settings.
  */
-export default class SettingController {
+export default abstract class SettingController {
     /**
      * Gets the overridden value for the setting, if any. This must return null if the
      * value is not to be overridden, otherwise it must return the new value.
@@ -30,11 +33,16 @@ export default class SettingController {
      * @param {String} roomId The room ID, may be null.
      * @param {*} calculatedValue The value that the handlers think the setting should be,
      * may be null.
-     * @param {string} calculatedAtLevel The level for which the calculated value was
+     * @param {SettingLevel} calculatedAtLevel The level for which the calculated value was
      * calculated at. May be null.
      * @return {*} The value that should be used, or null if no override is applicable.
      */
-    getValueOverride(level, roomId, calculatedValue, calculatedAtLevel) {
+    public getValueOverride(
+        level: SettingLevel,
+        roomId: string,
+        calculatedValue: any,
+        calculatedAtLevel: SettingLevel,
+    ): any {
         return null; // no override
     }
 
@@ -44,7 +52,7 @@ export default class SettingController {
      * @param {String} roomId The room ID, may be null.
      * @param {*} newValue The new value for the setting, may be null.
      */
-    onChange(level, roomId, newValue) {
+    public onChange(level: SettingLevel, roomId: string, newValue: any) {
         // do nothing by default
     }
 }
diff --git a/src/settings/controllers/SystemFontController.ts b/src/settings/controllers/SystemFontController.ts
new file mode 100644
index 0000000000..f38dbdbbf6
--- /dev/null
+++ b/src/settings/controllers/SystemFontController.ts
@@ -0,0 +1,37 @@
+/*
+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 SettingController from "./SettingController";
+import SettingsStore from "../SettingsStore";
+import dis from "../../dispatcher/dispatcher";
+import { UpdateSystemFontPayload } from "../../dispatcher/payloads/UpdateSystemFontPayload";
+import { Action } from "../../dispatcher/actions";
+import { SettingLevel } from "../SettingLevel";
+
+export default class SystemFontController extends SettingController {
+    constructor() {
+        super();
+    }
+
+    public onChange(level: SettingLevel, roomId: string, newValue: any) {
+        // Dispatch font size change so that everything open responds to the change.
+        dis.dispatch<UpdateSystemFontPayload>({
+            action: Action.UpdateSystemFont,
+            useSystemFont: SettingsStore.getValue("useSystemFont"),
+            font: newValue,
+        });
+    }
+}
diff --git a/src/settings/controllers/ThemeController.js b/src/settings/controllers/ThemeController.ts
similarity index 79%
rename from src/settings/controllers/ThemeController.js
rename to src/settings/controllers/ThemeController.ts
index 4098a5ca3e..15dd64c901 100644
--- a/src/settings/controllers/ThemeController.js
+++ b/src/settings/controllers/ThemeController.ts
@@ -1,6 +1,6 @@
 /*
-Copyright 2019 New Vector Ltd
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
+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.
@@ -17,11 +17,17 @@ limitations under the License.
 
 import SettingController from "./SettingController";
 import {DEFAULT_THEME, enumerateThemes} from "../../theme";
+import { SettingLevel } from "../SettingLevel";
 
 export default class ThemeController extends SettingController {
-    static isLogin = false;
+    public static isLogin = false;
 
-    getValueOverride(level, roomId, calculatedValue, calculatedAtLevel) {
+    public getValueOverride(
+        level: SettingLevel,
+        roomId: string,
+        calculatedValue: any,
+        calculatedAtLevel: SettingLevel,
+    ): any {
         if (!calculatedValue) return null; // Don't override null themes
 
         if (ThemeController.isLogin) return 'light';
diff --git a/src/settings/controllers/UseSystemFontController.ts b/src/settings/controllers/UseSystemFontController.ts
new file mode 100644
index 0000000000..0b6acc590a
--- /dev/null
+++ b/src/settings/controllers/UseSystemFontController.ts
@@ -0,0 +1,37 @@
+/*
+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 SettingController from "./SettingController";
+import SettingsStore from "../SettingsStore";
+import dis from "../../dispatcher/dispatcher";
+import { UpdateSystemFontPayload } from "../../dispatcher/payloads/UpdateSystemFontPayload";
+import { Action } from "../../dispatcher/actions";
+import { SettingLevel } from "../SettingLevel";
+
+export default class UseSystemFontController extends SettingController {
+    constructor() {
+        super();
+    }
+
+    public onChange(level: SettingLevel, roomId: string, newValue: any) {
+        // Dispatch font size change so that everything open responds to the change.
+        dis.dispatch<UpdateSystemFontPayload>({
+            action: Action.UpdateSystemFont,
+            useSystemFont: newValue,
+            font: SettingsStore.getValue("systemFont"),
+        });
+    }
+}
diff --git a/src/settings/handlers/AccountSettingsHandler.js b/src/settings/handlers/AccountSettingsHandler.ts
similarity index 60%
rename from src/settings/handlers/AccountSettingsHandler.js
rename to src/settings/handlers/AccountSettingsHandler.ts
index fea2e92c62..d609fd3231 100644
--- a/src/settings/handlers/AccountSettingsHandler.js
+++ b/src/settings/handlers/AccountSettingsHandler.ts
@@ -1,6 +1,6 @@
 /*
 Copyright 2017 Travis Ralston
-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.
@@ -17,12 +17,16 @@ limitations under the License.
 
 import {MatrixClientPeg} from '../../MatrixClientPeg';
 import MatrixClientBackedSettingsHandler from "./MatrixClientBackedSettingsHandler";
-import {SettingLevel} from "../SettingsStore";
+import {objectClone, objectKeyChanges} from "../../utils/objects";
+import {SettingLevel} from "../SettingLevel";
+import { WatchManager } from "../WatchManager";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 
 const BREADCRUMBS_LEGACY_EVENT_TYPE = "im.vector.riot.breadcrumb_rooms";
 const BREADCRUMBS_EVENT_TYPE = "im.vector.setting.breadcrumbs";
 const BREADCRUMBS_EVENT_TYPES = [BREADCRUMBS_LEGACY_EVENT_TYPE, BREADCRUMBS_EVENT_TYPE];
-
+const RECENT_EMOJI_EVENT_TYPE = "io.element.recent_emoji";
 const INTEG_PROVISIONING_EVENT_TYPE = "im.vector.setting.integration_provisioning";
 
 /**
@@ -30,22 +34,19 @@ const INTEG_PROVISIONING_EVENT_TYPE = "im.vector.setting.integration_provisionin
  * This handler does not make use of the roomId parameter.
  */
 export default class AccountSettingsHandler extends MatrixClientBackedSettingsHandler {
-    constructor(watchManager) {
+    constructor(private watchers: WatchManager) {
         super();
-
-        this._watchers = watchManager;
-        this._onAccountData = this._onAccountData.bind(this);
     }
 
-    initMatrixClient(oldClient, newClient) {
+    public initMatrixClient(oldClient: MatrixClient, newClient: MatrixClient) {
         if (oldClient) {
-            oldClient.removeListener("accountData", this._onAccountData);
+            oldClient.removeListener("accountData", this.onAccountData);
         }
 
-        newClient.on("accountData", this._onAccountData);
+        newClient.on("accountData", this.onAccountData);
     }
 
-    _onAccountData(event) {
+    private onAccountData = (event: MatrixEvent, prevEvent: MatrixEvent) => {
         if (event.getType() === "org.matrix.preview_urls") {
             let val = event.getContent()['disable'];
             if (typeof(val) !== "boolean") {
@@ -54,25 +55,30 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
                 val = !val;
             }
 
-            this._watchers.notifyUpdate("urlPreviewsEnabled", null, SettingLevel.ACCOUNT, val);
+            this.watchers.notifyUpdate("urlPreviewsEnabled", null, SettingLevel.ACCOUNT, val);
         } else if (event.getType() === "im.vector.web.settings") {
-            // We can't really discern what changed, so trigger updates for everything
-            for (const settingName of Object.keys(event.getContent())) {
+            // Figure out what changed and fire those updates
+            const prevContent = prevEvent ? prevEvent.getContent() : {};
+            const changedSettings = objectKeyChanges<Record<string, any>>(prevContent, event.getContent());
+            for (const settingName of changedSettings) {
                 const val = event.getContent()[settingName];
-                this._watchers.notifyUpdate(settingName, null, SettingLevel.ACCOUNT, val);
+                this.watchers.notifyUpdate(settingName, null, SettingLevel.ACCOUNT, val);
             }
         } else if (BREADCRUMBS_EVENT_TYPES.includes(event.getType())) {
-            this._notifyBreadcrumbsUpdate(event);
+            this.notifyBreadcrumbsUpdate(event);
         } else if (event.getType() === INTEG_PROVISIONING_EVENT_TYPE) {
             const val = event.getContent()['enabled'];
-            this._watchers.notifyUpdate("integrationProvisioning", null, SettingLevel.ACCOUNT, val);
+            this.watchers.notifyUpdate("integrationProvisioning", null, SettingLevel.ACCOUNT, val);
+        } else if (event.getType() === RECENT_EMOJI_EVENT_TYPE) {
+            const val = event.getContent()['enabled'];
+            this.watchers.notifyUpdate("recent_emoji", null, SettingLevel.ACCOUNT, val);
         }
     }
 
-    getValue(settingName, roomId) {
+    public getValue(settingName: string, roomId: string): any {
         // Special case URL previews
         if (settingName === "urlPreviewsEnabled") {
-            const content = this._getSettings("org.matrix.preview_urls") || {};
+            const content = this.getSettings("org.matrix.preview_urls") || {};
 
             // Check to make sure that we actually got a boolean
             if (typeof(content['disable']) !== "boolean") return null;
@@ -81,9 +87,9 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
 
         // Special case for breadcrumbs
         if (settingName === "breadcrumb_rooms") {
-            let content = this._getSettings(BREADCRUMBS_EVENT_TYPE);
+            let content = this.getSettings(BREADCRUMBS_EVENT_TYPE);
             if (!content || !content['recent_rooms']) {
-                content = this._getSettings(BREADCRUMBS_LEGACY_EVENT_TYPE);
+                content = this.getSettings(BREADCRUMBS_LEGACY_EVENT_TYPE);
 
                 // This is a bit of a hack, but it makes things slightly easier
                 if (content) content['recent_rooms'] = content['rooms'];
@@ -92,13 +98,19 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
             return content && content['recent_rooms'] ? content['recent_rooms'] : [];
         }
 
+        // Special case recent emoji
+        if (settingName === "recent_emoji") {
+            const content = this.getSettings(RECENT_EMOJI_EVENT_TYPE);
+            return content ? content["recent_emoji"] : null;
+        }
+
         // Special case integration manager provisioning
         if (settingName === "integrationProvisioning") {
-            const content = this._getSettings(INTEG_PROVISIONING_EVENT_TYPE);
+            const content = this.getSettings(INTEG_PROVISIONING_EVENT_TYPE);
             return content ? content['enabled'] : null;
         }
 
-        const settings = this._getSettings() || {};
+        const settings = this.getSettings() || {};
         let preferredValue = settings[settingName];
 
         if (preferredValue === null || preferredValue === undefined) {
@@ -111,10 +123,10 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
         return preferredValue;
     }
 
-    setValue(settingName, roomId, newValue) {
+    public setValue(settingName: string, roomId: string, newValue: any): Promise<void> {
         // Special case URL previews
         if (settingName === "urlPreviewsEnabled") {
-            const content = this._getSettings("org.matrix.preview_urls") || {};
+            const content = this.getSettings("org.matrix.preview_urls") || {};
             content['disable'] = !newValue;
             return MatrixClientPeg.get().setAccountData("org.matrix.preview_urls", content);
         }
@@ -122,9 +134,9 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
         // Special case for breadcrumbs
         if (settingName === "breadcrumb_rooms") {
             // We read the value first just to make sure we preserve whatever random keys might be present.
-            let content = this._getSettings(BREADCRUMBS_EVENT_TYPE);
+            let content = this.getSettings(BREADCRUMBS_EVENT_TYPE);
             if (!content || !content['recent_rooms']) {
-                content = this._getSettings(BREADCRUMBS_LEGACY_EVENT_TYPE);
+                content = this.getSettings(BREADCRUMBS_LEGACY_EVENT_TYPE);
             }
             if (!content) content = {}; // If we still don't have content, make some
 
@@ -132,41 +144,48 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
             return MatrixClientPeg.get().setAccountData(BREADCRUMBS_EVENT_TYPE, content);
         }
 
+        // Special case recent emoji
+        if (settingName === "recent_emoji") {
+            const content = this.getSettings(RECENT_EMOJI_EVENT_TYPE) || {};
+            content["recent_emoji"] = newValue;
+            return MatrixClientPeg.get().setAccountData(RECENT_EMOJI_EVENT_TYPE, content);
+        }
+
         // Special case integration manager provisioning
         if (settingName === "integrationProvisioning") {
-            const content = this._getSettings(INTEG_PROVISIONING_EVENT_TYPE) || {};
+            const content = this.getSettings(INTEG_PROVISIONING_EVENT_TYPE) || {};
             content['enabled'] = newValue;
             return MatrixClientPeg.get().setAccountData(INTEG_PROVISIONING_EVENT_TYPE, content);
         }
 
-        const content = this._getSettings() || {};
+        const content = this.getSettings() || {};
         content[settingName] = newValue;
         return MatrixClientPeg.get().setAccountData("im.vector.web.settings", content);
     }
 
-    canSetValue(settingName, roomId) {
+    public canSetValue(settingName: string, roomId: string): boolean {
         return true; // It's their account, so they should be able to
     }
 
-    isSupported() {
+    public isSupported(): boolean {
         const cli = MatrixClientPeg.get();
         return cli !== undefined && cli !== null;
     }
 
-    _getSettings(eventType = "im.vector.web.settings") {
+    private getSettings(eventType = "im.vector.web.settings"): any { // TODO: [TS] Types on return
         const cli = MatrixClientPeg.get();
         if (!cli) return null;
 
         const event = cli.getAccountData(eventType);
         if (!event || !event.getContent()) return null;
-        return event.getContent();
+        return objectClone(event.getContent()); // clone to prevent mutation
     }
 
-    _notifyBreadcrumbsUpdate(event) {
+    private notifyBreadcrumbsUpdate(event: MatrixEvent) {
         let val = [];
         if (event.getType() === BREADCRUMBS_LEGACY_EVENT_TYPE) {
             // This seems fishy - try and get the event for the new rooms
-            const newType = this._getSettings(BREADCRUMBS_EVENT_TYPE);
+            const newType = this.getSettings(BREADCRUMBS_EVENT_TYPE);
             if (newType) val = newType['recent_rooms'];
             else val = event.getContent()['rooms'];
         } else if (event.getType() === BREADCRUMBS_EVENT_TYPE) {
@@ -174,6 +193,6 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
         } else {
             return; // for sanity, not because we expect to be here.
         }
-        this._watchers.notifyUpdate("breadcrumb_rooms", null, SettingLevel.ACCOUNT, val || []);
+        this.watchers.notifyUpdate("breadcrumb_rooms", null, SettingLevel.ACCOUNT, val || []);
     }
 }
diff --git a/src/settings/handlers/ConfigSettingsHandler.js b/src/settings/handlers/ConfigSettingsHandler.ts
similarity index 58%
rename from src/settings/handlers/ConfigSettingsHandler.js
rename to src/settings/handlers/ConfigSettingsHandler.ts
index 3b5b4b626e..791c655a0d 100644
--- a/src/settings/handlers/ConfigSettingsHandler.js
+++ b/src/settings/handlers/ConfigSettingsHandler.ts
@@ -1,6 +1,6 @@
 /*
 Copyright 2017 Travis Ralston
-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.
@@ -24,9 +24,24 @@ import {isNullOrUndefined} from "matrix-js-sdk/src/utils";
  * roomId parameter.
  */
 export default class ConfigSettingsHandler extends SettingsHandler {
-    getValue(settingName, roomId) {
+    public constructor(private featureNames: string[]) {
+        super();
+    }
+
+    public getValue(settingName: string, roomId: string): any {
         const config = SdkConfig.get() || {};
 
+        if (this.featureNames.includes(settingName)) {
+            const labsConfig = config["features"] || {};
+            const val = labsConfig[settingName];
+            if (isNullOrUndefined(val)) return null; // no definition at this level
+            if (val === true || val === false) return val; // new style: mapped as a boolean
+            if (val === "enable") return true; // backwards compat
+            if (val === "disable") return false; // backwards compat
+            if (val === "labs") return null; // backwards compat, no override
+            return null; // fallback in the case of invalid input
+        }
+
         // Special case themes
         if (settingName === "theme") {
             return config["default_theme"];
@@ -37,15 +52,15 @@ export default class ConfigSettingsHandler extends SettingsHandler {
         return settingsConfig[settingName];
     }
 
-    setValue(settingName, roomId, newValue) {
+    public async setValue(settingName: string, roomId: string, newValue: any): Promise<void> {
         throw new Error("Cannot change settings at the config level");
     }
 
-    canSetValue(settingName, roomId) {
+    public canSetValue(settingName: string, roomId: string): boolean {
         return false;
     }
 
-    isSupported() {
+    public isSupported(): boolean {
         return true; // SdkConfig is always there
     }
 }
diff --git a/src/settings/handlers/DefaultSettingsHandler.js b/src/settings/handlers/DefaultSettingsHandler.ts
similarity index 72%
rename from src/settings/handlers/DefaultSettingsHandler.js
rename to src/settings/handlers/DefaultSettingsHandler.ts
index 37bc5b2348..f54c7eafe1 100644
--- a/src/settings/handlers/DefaultSettingsHandler.js
+++ b/src/settings/handlers/DefaultSettingsHandler.ts
@@ -1,6 +1,6 @@
 /*
 Copyright 2017 Travis Ralston
-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.
@@ -27,29 +27,27 @@ export default class DefaultSettingsHandler extends SettingsHandler {
      * @param {object} defaults The default setting values, keyed by setting name.
      * @param {object} invertedDefaults The default inverted setting values, keyed by setting name.
      */
-    constructor(defaults, invertedDefaults) {
+    constructor(private defaults: Record<string, any>, private invertedDefaults: Record<string, any>) {
         super();
-        this._defaults = defaults;
-        this._invertedDefaults = invertedDefaults;
     }
 
-    getValue(settingName, roomId) {
-        let value = this._defaults[settingName];
+    public getValue(settingName: string, roomId: string): any {
+        let value = this.defaults[settingName];
         if (value === undefined) {
-            value = this._invertedDefaults[settingName];
+            value = this.invertedDefaults[settingName];
         }
         return value;
     }
 
-    setValue(settingName, roomId, newValue) {
+    public async setValue(settingName: string, roomId: string, newValue: any): Promise<void> {
         throw new Error("Cannot set values on the default level handler");
     }
 
-    canSetValue(settingName, roomId) {
+    public canSetValue(settingName: string, roomId: string) {
         return false;
     }
 
-    isSupported() {
+    public isSupported(): boolean {
         return true;
     }
 }
diff --git a/src/settings/handlers/DeviceSettingsHandler.js b/src/settings/handlers/DeviceSettingsHandler.ts
similarity index 71%
rename from src/settings/handlers/DeviceSettingsHandler.js
rename to src/settings/handlers/DeviceSettingsHandler.ts
index 44f89b9086..2096203598 100644
--- a/src/settings/handlers/DeviceSettingsHandler.js
+++ b/src/settings/handlers/DeviceSettingsHandler.ts
@@ -18,7 +18,8 @@ limitations under the License.
 
 import SettingsHandler from "./SettingsHandler";
 import {MatrixClientPeg} from "../../MatrixClientPeg";
-import {SettingLevel} from "../SettingsStore";
+import {SettingLevel} from "../SettingLevel";
+import { CallbackFn, WatchManager } from "../WatchManager";
 
 /**
  * Gets and sets settings at the "device" level for the current device.
@@ -29,17 +30,15 @@ export default class DeviceSettingsHandler extends SettingsHandler {
     /**
      * Creates a new device settings handler
      * @param {string[]} featureNames The names of known features.
-     * @param {WatchManager} watchManager The watch manager to notify updates to
+     * @param {WatchManager} watchers The watch manager to notify updates to
      */
-    constructor(featureNames, watchManager) {
+    constructor(private featureNames: string[], private watchers: WatchManager) {
         super();
-        this._featureNames = featureNames;
-        this._watchers = watchManager;
     }
 
-    getValue(settingName, roomId) {
-        if (this._featureNames.includes(settingName)) {
-            return this._readFeature(settingName);
+    public getValue(settingName: string, roomId: string): any {
+        if (this.featureNames.includes(settingName)) {
+            return this.readFeature(settingName);
         }
 
         // Special case notifications
@@ -68,28 +67,28 @@ export default class DeviceSettingsHandler extends SettingsHandler {
             return val['value'];
         }
 
-        const settings = this._getSettings() || {};
+        const settings = this.getSettings() || {};
         return settings[settingName];
     }
 
-    setValue(settingName, roomId, newValue) {
-        if (this._featureNames.includes(settingName)) {
-            this._writeFeature(settingName, newValue);
+    public setValue(settingName: string, roomId: string, newValue: any): Promise<void> {
+        if (this.featureNames.includes(settingName)) {
+            this.writeFeature(settingName, newValue);
             return Promise.resolve();
         }
 
         // Special case notifications
         if (settingName === "notificationsEnabled") {
             localStorage.setItem("notifications_enabled", newValue);
-            this._watchers.notifyUpdate(settingName, null, SettingLevel.DEVICE, newValue);
+            this.watchers.notifyUpdate(settingName, null, SettingLevel.DEVICE, newValue);
             return Promise.resolve();
         } else if (settingName === "notificationBodyEnabled") {
             localStorage.setItem("notifications_body_enabled", newValue);
-            this._watchers.notifyUpdate(settingName, null, SettingLevel.DEVICE, newValue);
+            this.watchers.notifyUpdate(settingName, null, SettingLevel.DEVICE, newValue);
             return Promise.resolve();
         } else if (settingName === "audioNotificationsEnabled") {
             localStorage.setItem("audio_notifications_enabled", newValue);
-            this._watchers.notifyUpdate(settingName, null, SettingLevel.DEVICE, newValue);
+            this.watchers.notifyUpdate(settingName, null, SettingLevel.DEVICE, newValue);
             return Promise.resolve();
         }
 
@@ -103,35 +102,35 @@ export default class DeviceSettingsHandler extends SettingsHandler {
             "lastRightPanelPhaseForGroup",
         ].includes(settingName)) {
             localStorage.setItem(`mx_${settingName}`, JSON.stringify({value: newValue}));
-            this._watchers.notifyUpdate(settingName, null, SettingLevel.DEVICE, newValue);
+            this.watchers.notifyUpdate(settingName, null, SettingLevel.DEVICE, newValue);
             return Promise.resolve();
         }
 
-        const settings = this._getSettings() || {};
+        const settings = this.getSettings() || {};
         settings[settingName] = newValue;
         localStorage.setItem("mx_local_settings", JSON.stringify(settings));
-        this._watchers.notifyUpdate(settingName, null, SettingLevel.DEVICE, newValue);
+        this.watchers.notifyUpdate(settingName, null, SettingLevel.DEVICE, newValue);
 
         return Promise.resolve();
     }
 
-    canSetValue(settingName, roomId) {
+    public canSetValue(settingName: string, roomId: string): boolean {
         return true; // It's their device, so they should be able to
     }
 
-    isSupported() {
+    public isSupported(): boolean {
         return localStorage !== undefined && localStorage !== null;
     }
 
-    watchSetting(settingName, roomId, cb) {
-        this._watchers.watchSetting(settingName, roomId, cb);
+    public watchSetting(settingName: string, roomId: string, cb: CallbackFn) {
+        this.watchers.watchSetting(settingName, roomId, cb);
     }
 
-    unwatchSetting(cb) {
-        this._watchers.unwatchSetting(cb);
+    public unwatchSetting(cb: CallbackFn) {
+        this.watchers.unwatchSetting(cb);
     }
 
-    _getSettings() {
+    private getSettings(): any { // TODO: [TS] Type return
         const value = localStorage.getItem("mx_local_settings");
         if (!value) return null;
         return JSON.parse(value);
@@ -140,7 +139,7 @@ export default class DeviceSettingsHandler extends SettingsHandler {
     // Note: features intentionally don't use the same key as settings to avoid conflicts
     // and to be backwards compatible.
 
-    _readFeature(featureName) {
+    private readFeature(featureName: string): boolean | null {
         if (MatrixClientPeg.get() && MatrixClientPeg.get().isGuest()) {
             // Guests should not have any labs features enabled.
             return false;
@@ -153,8 +152,8 @@ export default class DeviceSettingsHandler extends SettingsHandler {
         return null;
     }
 
-    _writeFeature(featureName, enabled) {
-        localStorage.setItem("mx_labs_feature_" + featureName, enabled);
-        this._watchers.notifyUpdate(featureName, null, SettingLevel.DEVICE, enabled);
+    private writeFeature(featureName: string, enabled: boolean | null) {
+        localStorage.setItem("mx_labs_feature_" + featureName, `${enabled}`);
+        this.watchers.notifyUpdate(featureName, null, SettingLevel.DEVICE, enabled);
     }
 }
diff --git a/src/settings/handlers/LocalEchoWrapper.js b/src/settings/handlers/LocalEchoWrapper.ts
similarity index 60%
rename from src/settings/handlers/LocalEchoWrapper.js
rename to src/settings/handlers/LocalEchoWrapper.ts
index 4cbe4891be..5cfcd27aed 100644
--- a/src/settings/handlers/LocalEchoWrapper.js
+++ b/src/settings/handlers/LocalEchoWrapper.ts
@@ -1,6 +1,6 @@
 /*
 Copyright 2017 Travis Ralston
-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.
@@ -23,47 +23,48 @@ import SettingsHandler from "./SettingsHandler";
  * handler as much as possible to ensure values are not stale.
  */
 export default class LocalEchoWrapper extends SettingsHandler {
+    private cache: {
+        [settingName: string]: {
+            [roomId: string]: any;
+        };
+    } = {};
+
     /**
      * Creates a new local echo wrapper
      * @param {SettingsHandler} handler The handler to wrap
      */
-    constructor(handler) {
+    constructor(private handler: SettingsHandler) {
         super();
-        this._handler = handler;
-        this._cache = {
-            // settingName: { roomId: value }
-        };
     }
 
-    getValue(settingName, roomId) {
+    public getValue(settingName: string, roomId: string): any {
         const cacheRoomId = roomId ? roomId : "UNDEFINED"; // avoid weird keys
-        const bySetting = this._cache[settingName];
+        const bySetting = this.cache[settingName];
         if (bySetting && bySetting.hasOwnProperty(cacheRoomId)) {
-            return bySetting[roomId];
+            return bySetting[cacheRoomId];
         }
 
-        return this._handler.getValue(settingName, roomId);
+        return this.handler.getValue(settingName, roomId);
     }
 
-    setValue(settingName, roomId, newValue) {
-        if (!this._cache[settingName]) this._cache[settingName] = {};
-        const bySetting = this._cache[settingName];
+    public setValue(settingName: string, roomId: string, newValue: any): Promise<void> {
+        if (!this.cache[settingName]) this.cache[settingName] = {};
+        const bySetting = this.cache[settingName];
 
         const cacheRoomId = roomId ? roomId : "UNDEFINED"; // avoid weird keys
         bySetting[cacheRoomId] = newValue;
 
-        const handlerPromise = this._handler.setValue(settingName, roomId, newValue);
+        const handlerPromise = this.handler.setValue(settingName, roomId, newValue);
         return Promise.resolve(handlerPromise).finally(() => {
             delete bySetting[cacheRoomId];
         });
     }
 
-
-    canSetValue(settingName, roomId) {
-        return this._handler.canSetValue(settingName, roomId);
+    public canSetValue(settingName: string, roomId: string): boolean {
+        return this.handler.canSetValue(settingName, roomId);
     }
 
-    isSupported() {
-        return this._handler.isSupported();
+    public isSupported(): boolean {
+        return this.handler.isSupported();
     }
 }
diff --git a/src/settings/handlers/MatrixClientBackedSettingsHandler.js b/src/settings/handlers/MatrixClientBackedSettingsHandler.ts
similarity index 64%
rename from src/settings/handlers/MatrixClientBackedSettingsHandler.js
rename to src/settings/handlers/MatrixClientBackedSettingsHandler.ts
index effe7ae9a7..76825d1335 100644
--- a/src/settings/handlers/MatrixClientBackedSettingsHandler.js
+++ b/src/settings/handlers/MatrixClientBackedSettingsHandler.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.
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import SettingsHandler from "./SettingsHandler";
+import { MatrixClient } from "matrix-js-sdk/src/client";
 
 // Dev note: This whole class exists in the event someone logs out and back in - we want
 // to make sure the right MatrixClient is listening for changes.
@@ -23,26 +24,30 @@ import SettingsHandler from "./SettingsHandler";
  * Represents the base class for settings handlers which need access to a MatrixClient.
  * This class performs no logic and should be overridden.
  */
-export default class MatrixClientBackedSettingsHandler extends SettingsHandler {
-    static _matrixClient;
-    static _instances = [];
+export default abstract class MatrixClientBackedSettingsHandler extends SettingsHandler {
+    private static _matrixClient: MatrixClient;
+    private static instances: MatrixClientBackedSettingsHandler[] = [];
 
-    static set matrixClient(client) {
+    public static set matrixClient(client: MatrixClient) {
         const oldClient = MatrixClientBackedSettingsHandler._matrixClient;
         MatrixClientBackedSettingsHandler._matrixClient = client;
 
-        for (const instance of MatrixClientBackedSettingsHandler._instances) {
+        for (const instance of MatrixClientBackedSettingsHandler.instances) {
             instance.initMatrixClient(oldClient, client);
         }
     }
 
-    constructor() {
+    protected constructor() {
         super();
 
-        MatrixClientBackedSettingsHandler._instances.push(this);
+        MatrixClientBackedSettingsHandler.instances.push(this);
     }
 
-    initMatrixClient() {
+    public get client(): MatrixClient {
+        return MatrixClientBackedSettingsHandler._matrixClient;
+    }
+
+    protected initMatrixClient(oldClient: MatrixClient, newClient: MatrixClient) {
         console.warn("initMatrixClient not overridden");
     }
 }
diff --git a/src/settings/handlers/RoomAccountSettingsHandler.js b/src/settings/handlers/RoomAccountSettingsHandler.ts
similarity index 59%
rename from src/settings/handlers/RoomAccountSettingsHandler.js
rename to src/settings/handlers/RoomAccountSettingsHandler.ts
index 1e9d3f7bed..53e29653f8 100644
--- a/src/settings/handlers/RoomAccountSettingsHandler.js
+++ b/src/settings/handlers/RoomAccountSettingsHandler.ts
@@ -1,6 +1,6 @@
 /*
 Copyright 2017 Travis Ralston
-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.
@@ -15,9 +15,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {MatrixClientPeg} from '../../MatrixClientPeg';
+import { MatrixClientPeg } from '../../MatrixClientPeg';
 import MatrixClientBackedSettingsHandler from "./MatrixClientBackedSettingsHandler";
-import {SettingLevel} from "../SettingsStore";
+import { objectClone, objectKeyChanges } from "../../utils/objects";
+import { SettingLevel } from "../SettingLevel";
+import { WatchManager } from "../WatchManager";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { Room } from "matrix-js-sdk/src/models/room";
 
 const ALLOWED_WIDGETS_EVENT_TYPE = "im.vector.setting.allowed_widgets";
 
@@ -25,22 +30,19 @@ const ALLOWED_WIDGETS_EVENT_TYPE = "im.vector.setting.allowed_widgets";
  * Gets and sets settings at the "room-account" level for the current user.
  */
 export default class RoomAccountSettingsHandler extends MatrixClientBackedSettingsHandler {
-    constructor(watchManager) {
+    constructor(private watchers: WatchManager) {
         super();
-
-        this._watchers = watchManager;
-        this._onAccountData = this._onAccountData.bind(this);
     }
 
-    initMatrixClient(oldClient, newClient) {
+    protected initMatrixClient(oldClient: MatrixClient, newClient: MatrixClient) {
         if (oldClient) {
-            oldClient.removeListener("Room.accountData", this._onAccountData);
+            oldClient.removeListener("Room.accountData", this.onAccountData);
         }
 
-        newClient.on("Room.accountData", this._onAccountData);
+        newClient.on("Room.accountData", this.onAccountData);
     }
 
-    _onAccountData(event, room) {
+    private onAccountData = (event: MatrixEvent, room: Room, prevEvent: MatrixEvent) => {
         const roomId = room.roomId;
 
         if (event.getType() === "org.matrix.room.preview_urls") {
@@ -51,27 +53,29 @@ export default class RoomAccountSettingsHandler extends MatrixClientBackedSettin
                 val = !val;
             }
 
-            this._watchers.notifyUpdate("urlPreviewsEnabled", roomId, SettingLevel.ROOM_ACCOUNT, val);
+            this.watchers.notifyUpdate("urlPreviewsEnabled", roomId, SettingLevel.ROOM_ACCOUNT, val);
         } else if (event.getType() === "org.matrix.room.color_scheme") {
-            this._watchers.notifyUpdate("roomColor", roomId, SettingLevel.ROOM_ACCOUNT, event.getContent());
+            this.watchers.notifyUpdate("roomColor", roomId, SettingLevel.ROOM_ACCOUNT, event.getContent());
         } else if (event.getType() === "im.vector.web.settings") {
-            // We can't really discern what changed, so trigger updates for everything
-            for (const settingName of Object.keys(event.getContent())) {
+            // Figure out what changed and fire those updates
+            const prevContent = prevEvent ? prevEvent.getContent() : {};
+            const changedSettings = objectKeyChanges<Record<string, any>>(prevContent, event.getContent());
+            for (const settingName of changedSettings) {
                 const val = event.getContent()[settingName];
-                this._watchers.notifyUpdate(settingName, roomId, SettingLevel.ROOM_ACCOUNT, val);
+                this.watchers.notifyUpdate(settingName, roomId, SettingLevel.ROOM_ACCOUNT, val);
             }
         } else if (event.getType() === ALLOWED_WIDGETS_EVENT_TYPE) {
-            this._watchers.notifyUpdate("allowedWidgets", roomId, SettingLevel.ROOM_ACCOUNT, event.getContent());
+            this.watchers.notifyUpdate("allowedWidgets", roomId, SettingLevel.ROOM_ACCOUNT, event.getContent());
         }
-    }
+    };
 
-    getValue(settingName, roomId) {
+    public getValue(settingName: string, roomId: string): any {
         // Special case URL previews
         if (settingName === "urlPreviewsEnabled") {
-            const content = this._getSettings(roomId, "org.matrix.room.preview_urls") || {};
+            const content = this.getSettings(roomId, "org.matrix.room.preview_urls") || {};
 
             // Check to make sure that we actually got a boolean
-            if (typeof(content['disable']) !== "boolean") return null;
+            if (typeof (content['disable']) !== "boolean") return null;
             return !content['disable'];
         }
 
@@ -80,22 +84,22 @@ export default class RoomAccountSettingsHandler extends MatrixClientBackedSettin
             // The event content should already be in an appropriate format, we just need
             // to get the right value.
             // don't fallback to {} because thats truthy and would imply there is an event specifying tint
-            return this._getSettings(roomId, "org.matrix.room.color_scheme");
+            return this.getSettings(roomId, "org.matrix.room.color_scheme");
         }
 
         // Special case allowed widgets
         if (settingName === "allowedWidgets") {
-            return this._getSettings(roomId, ALLOWED_WIDGETS_EVENT_TYPE);
+            return this.getSettings(roomId, ALLOWED_WIDGETS_EVENT_TYPE);
         }
 
-        const settings = this._getSettings(roomId) || {};
+        const settings = this.getSettings(roomId) || {};
         return settings[settingName];
     }
 
-    setValue(settingName, roomId, newValue) {
+    public setValue(settingName: string, roomId: string, newValue: any): Promise<void> {
         // Special case URL previews
         if (settingName === "urlPreviewsEnabled") {
-            const content = this._getSettings(roomId, "org.matrix.room.preview_urls") || {};
+            const content = this.getSettings(roomId, "org.matrix.room.preview_urls") || {};
             content['disable'] = !newValue;
             return MatrixClientPeg.get().setRoomAccountData(roomId, "org.matrix.room.preview_urls", content);
         }
@@ -111,29 +115,29 @@ export default class RoomAccountSettingsHandler extends MatrixClientBackedSettin
             return MatrixClientPeg.get().setRoomAccountData(roomId, ALLOWED_WIDGETS_EVENT_TYPE, newValue);
         }
 
-        const content = this._getSettings(roomId) || {};
+        const content = this.getSettings(roomId) || {};
         content[settingName] = newValue;
         return MatrixClientPeg.get().setRoomAccountData(roomId, "im.vector.web.settings", content);
     }
 
-    canSetValue(settingName, roomId) {
+    public canSetValue(settingName: string, roomId: string): boolean {
         const room = MatrixClientPeg.get().getRoom(roomId);
 
         // If they have the room, they can set their own account data
         return room !== undefined && room !== null;
     }
 
-    isSupported() {
+    public isSupported(): boolean {
         const cli = MatrixClientPeg.get();
         return cli !== undefined && cli !== null;
     }
 
-    _getSettings(roomId, eventType = "im.vector.web.settings") {
+    private getSettings(roomId: string, eventType = "im.vector.web.settings"): any { // TODO: [TS] Type return
         const room = MatrixClientPeg.get().getRoom(roomId);
         if (!room) return null;
 
         const event = room.getAccountData(eventType);
         if (!event || !event.getContent()) return null;
-        return event.getContent();
+        return objectClone(event.getContent()); // clone to prevent mutation
     }
 }
diff --git a/src/settings/handlers/RoomDeviceSettingsHandler.js b/src/settings/handlers/RoomDeviceSettingsHandler.ts
similarity index 66%
rename from src/settings/handlers/RoomDeviceSettingsHandler.js
rename to src/settings/handlers/RoomDeviceSettingsHandler.ts
index a9cf686c4c..2fcd58c27c 100644
--- a/src/settings/handlers/RoomDeviceSettingsHandler.js
+++ b/src/settings/handlers/RoomDeviceSettingsHandler.ts
@@ -1,6 +1,6 @@
 /*
 Copyright 2017 Travis Ralston
-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,71 +16,70 @@ limitations under the License.
 */
 
 import SettingsHandler from "./SettingsHandler";
-import {SettingLevel} from "../SettingsStore";
+import { SettingLevel } from "../SettingLevel";
+import { WatchManager } from "../WatchManager";
 
 /**
  * Gets and sets settings at the "room-device" level for the current device in a particular
  * room.
  */
 export default class RoomDeviceSettingsHandler extends SettingsHandler {
-    constructor(watchManager) {
+    constructor(private watchers: WatchManager) {
         super();
-
-        this._watchers = watchManager;
     }
 
-    getValue(settingName, roomId) {
+    public getValue(settingName: string, roomId: string): any {
         // Special case blacklist setting to use legacy values
         if (settingName === "blacklistUnverifiedDevices") {
-            const value = this._read("mx_local_settings");
+            const value = this.read("mx_local_settings");
             if (value && value['blacklistUnverifiedDevicesPerRoom']) {
                 return value['blacklistUnverifiedDevicesPerRoom'][roomId];
             }
         }
 
-        const value = this._read(this._getKey(settingName, roomId));
+        const value = this.read(this.getKey(settingName, roomId));
         if (value) return value.value;
         return null;
     }
 
-    setValue(settingName, roomId, newValue) {
+    public setValue(settingName: string, roomId: string, newValue: any): Promise<void> {
         // Special case blacklist setting for legacy structure
         if (settingName === "blacklistUnverifiedDevices") {
-            let value = this._read("mx_local_settings");
+            let value = this.read("mx_local_settings");
             if (!value) value = {};
             if (!value["blacklistUnverifiedDevicesPerRoom"]) value["blacklistUnverifiedDevicesPerRoom"] = {};
             value["blacklistUnverifiedDevicesPerRoom"][roomId] = newValue;
             localStorage.setItem("mx_local_settings", JSON.stringify(value));
-            this._watchers.notifyUpdate(settingName, roomId, SettingLevel.ROOM_DEVICE, newValue);
+            this.watchers.notifyUpdate(settingName, roomId, SettingLevel.ROOM_DEVICE, newValue);
             return Promise.resolve();
         }
 
         if (newValue === null) {
-            localStorage.removeItem(this._getKey(settingName, roomId));
+            localStorage.removeItem(this.getKey(settingName, roomId));
         } else {
             newValue = JSON.stringify({value: newValue});
-            localStorage.setItem(this._getKey(settingName, roomId), newValue);
+            localStorage.setItem(this.getKey(settingName, roomId), newValue);
         }
 
-        this._watchers.notifyUpdate(settingName, roomId, SettingLevel.ROOM_DEVICE, newValue);
+        this.watchers.notifyUpdate(settingName, roomId, SettingLevel.ROOM_DEVICE, newValue);
         return Promise.resolve();
     }
 
-    canSetValue(settingName, roomId) {
+    public canSetValue(settingName: string, roomId: string): boolean {
         return true; // It's their device, so they should be able to
     }
 
-    isSupported() {
+    public isSupported(): boolean {
         return localStorage !== undefined && localStorage !== null;
     }
 
-    _read(key) {
+    private read(key: string): any {
         const rawValue = localStorage.getItem(key);
         if (!rawValue) return null;
         return JSON.parse(rawValue);
     }
 
-    _getKey(settingName, roomId) {
+    private getKey(settingName: string, roomId: string): string {
         return "mx_setting_" + settingName + "_" + roomId;
     }
 }
diff --git a/src/settings/handlers/RoomSettingsHandler.js b/src/settings/handlers/RoomSettingsHandler.js
deleted file mode 100644
index 6407818450..0000000000
--- a/src/settings/handlers/RoomSettingsHandler.js
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-Copyright 2017 Travis Ralston
-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 {MatrixClientPeg} from '../../MatrixClientPeg';
-import MatrixClientBackedSettingsHandler from "./MatrixClientBackedSettingsHandler";
-import {SettingLevel} from "../SettingsStore";
-
-/**
- * Gets and sets settings at the "room" level.
- */
-export default class RoomSettingsHandler extends MatrixClientBackedSettingsHandler {
-    constructor(watchManager) {
-        super();
-
-        this._watchers = watchManager;
-        this._onEvent = this._onEvent.bind(this);
-    }
-
-    initMatrixClient(oldClient, newClient) {
-        if (oldClient) {
-            oldClient.removeListener("RoomState.events", this._onEvent);
-        }
-
-        newClient.on("RoomState.events", this._onEvent);
-    }
-
-    _onEvent(event) {
-        const roomId = event.getRoomId();
-
-        if (event.getType() === "org.matrix.room.preview_urls") {
-            let val = event.getContent()['disable'];
-            if (typeof (val) !== "boolean") {
-                val = null;
-            } else {
-                val = !val;
-            }
-
-            this._watchers.notifyUpdate("urlPreviewsEnabled", roomId, SettingLevel.ROOM, val);
-        } else if (event.getType() === "im.vector.web.settings") {
-            // We can't really discern what changed, so trigger updates for everything
-            for (const settingName of Object.keys(event.getContent())) {
-                this._watchers.notifyUpdate(settingName, roomId, SettingLevel.ROOM, event.getContent()[settingName]);
-            }
-        }
-    }
-
-    getValue(settingName, roomId) {
-        // Special case URL previews
-        if (settingName === "urlPreviewsEnabled") {
-            const content = this._getSettings(roomId, "org.matrix.room.preview_urls") || {};
-
-            // Check to make sure that we actually got a boolean
-            if (typeof(content['disable']) !== "boolean") return null;
-            return !content['disable'];
-        }
-
-        const settings = this._getSettings(roomId) || {};
-        return settings[settingName];
-    }
-
-    setValue(settingName, roomId, newValue) {
-        // Special case URL previews
-        if (settingName === "urlPreviewsEnabled") {
-            const content = this._getSettings(roomId, "org.matrix.room.preview_urls") || {};
-            content['disable'] = !newValue;
-            return MatrixClientPeg.get().sendStateEvent(roomId, "org.matrix.room.preview_urls", content);
-        }
-
-        const content = this._getSettings(roomId) || {};
-        content[settingName] = newValue;
-        return MatrixClientPeg.get().sendStateEvent(roomId, "im.vector.web.settings", content, "");
-    }
-
-    canSetValue(settingName, roomId) {
-        const cli = MatrixClientPeg.get();
-        const room = cli.getRoom(roomId);
-
-        let eventType = "im.vector.web.settings";
-        if (settingName === "urlPreviewsEnabled") eventType = "org.matrix.room.preview_urls";
-
-        if (!room) return false;
-        return room.currentState.maySendStateEvent(eventType, cli.getUserId());
-    }
-
-    isSupported() {
-        const cli = MatrixClientPeg.get();
-        return cli !== undefined && cli !== null;
-    }
-
-    _getSettings(roomId, eventType = "im.vector.web.settings") {
-        const room = MatrixClientPeg.get().getRoom(roomId);
-        if (!room) return null;
-
-        const event = room.currentState.getStateEvents(eventType, "");
-        if (!event || !event.getContent()) return null;
-        return event.getContent();
-    }
-}
diff --git a/src/settings/handlers/RoomSettingsHandler.ts b/src/settings/handlers/RoomSettingsHandler.ts
new file mode 100644
index 0000000000..3315e40a65
--- /dev/null
+++ b/src/settings/handlers/RoomSettingsHandler.ts
@@ -0,0 +1,127 @@
+/*
+Copyright 2017 Travis Ralston
+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 { MatrixClientPeg } from '../../MatrixClientPeg';
+import MatrixClientBackedSettingsHandler from "./MatrixClientBackedSettingsHandler";
+import { objectClone, objectKeyChanges } from "../../utils/objects";
+import { SettingLevel } from "../SettingLevel";
+import { WatchManager } from "../WatchManager";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { RoomState } from "matrix-js-sdk/src/models/room-state";
+
+/**
+ * Gets and sets settings at the "room" level.
+ */
+export default class RoomSettingsHandler extends MatrixClientBackedSettingsHandler {
+    constructor(private watchers: WatchManager) {
+        super();
+    }
+
+    protected initMatrixClient(oldClient: MatrixClient, newClient: MatrixClient) {
+        if (oldClient) {
+            oldClient.removeListener("RoomState.events", this.onEvent);
+        }
+
+        newClient.on("RoomState.events", this.onEvent);
+    }
+
+    private onEvent = (event: MatrixEvent, state: RoomState, prevEvent: MatrixEvent) => {
+        const roomId = event.getRoomId();
+        const room = this.client.getRoom(roomId);
+
+        // Note: in tests and during the encryption setup on initial load we might not have
+        // rooms in the store, so we just quietly ignore the problem. If we log it then we'll
+        // just end up spamming the logs a few thousand times. It is perfectly fine for us
+        // to ignore the problem as the app will not have loaded enough to care yet.
+        if (!room) return;
+
+        // ignore state updates which are not current
+        if (room && state !== room.currentState) return;
+
+        if (event.getType() === "org.matrix.room.preview_urls") {
+            let val = event.getContent()['disable'];
+            if (typeof (val) !== "boolean") {
+                val = null;
+            } else {
+                val = !val;
+            }
+
+            this.watchers.notifyUpdate("urlPreviewsEnabled", roomId, SettingLevel.ROOM, val);
+        } else if (event.getType() === "im.vector.web.settings") {
+            // Figure out what changed and fire those updates
+            const prevContent = prevEvent ? prevEvent.getContent() : {};
+            const changedSettings = objectKeyChanges<Record<string, any>>(prevContent, event.getContent());
+            for (const settingName of changedSettings) {
+                this.watchers.notifyUpdate(settingName, roomId, SettingLevel.ROOM,
+                    event.getContent()[settingName]);
+            }
+        }
+    };
+
+    public getValue(settingName: string, roomId: string): any {
+        // Special case URL previews
+        if (settingName === "urlPreviewsEnabled") {
+            const content = this.getSettings(roomId, "org.matrix.room.preview_urls") || {};
+
+            // Check to make sure that we actually got a boolean
+            if (typeof (content['disable']) !== "boolean") return null;
+            return !content['disable'];
+        }
+
+        const settings = this.getSettings(roomId) || {};
+        return settings[settingName];
+    }
+
+    public setValue(settingName: string, roomId: string, newValue: any): Promise<void> {
+        // Special case URL previews
+        if (settingName === "urlPreviewsEnabled") {
+            const content = this.getSettings(roomId, "org.matrix.room.preview_urls") || {};
+            content['disable'] = !newValue;
+            return MatrixClientPeg.get().sendStateEvent(roomId, "org.matrix.room.preview_urls", content);
+        }
+
+        const content = this.getSettings(roomId) || {};
+        content[settingName] = newValue;
+        return MatrixClientPeg.get().sendStateEvent(roomId, "im.vector.web.settings", content, "");
+    }
+
+    public canSetValue(settingName: string, roomId: string): boolean {
+        const cli = MatrixClientPeg.get();
+        const room = cli.getRoom(roomId);
+
+        let eventType = "im.vector.web.settings";
+        if (settingName === "urlPreviewsEnabled") eventType = "org.matrix.room.preview_urls";
+
+        if (!room) return false;
+        return room.currentState.maySendStateEvent(eventType, cli.getUserId());
+    }
+
+    public isSupported(): boolean {
+        const cli = MatrixClientPeg.get();
+        return cli !== undefined && cli !== null;
+    }
+
+    private getSettings(roomId: string, eventType = "im.vector.web.settings"): any {
+        const room = MatrixClientPeg.get().getRoom(roomId);
+        if (!room) return null;
+
+        const event = room.currentState.getStateEvents(eventType, "");
+        if (!event || !event.getContent()) return null;
+        return objectClone(event.getContent()); // clone to prevent mutation
+    }
+}
diff --git a/src/settings/handlers/SettingsHandler.js b/src/settings/handlers/SettingsHandler.ts
similarity index 82%
rename from src/settings/handlers/SettingsHandler.js
rename to src/settings/handlers/SettingsHandler.ts
index 7d987fc136..ca9a068fd3 100644
--- a/src/settings/handlers/SettingsHandler.js
+++ b/src/settings/handlers/SettingsHandler.ts
@@ -1,6 +1,6 @@
 /*
 Copyright 2017 Travis Ralston
-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.
@@ -19,7 +19,7 @@ limitations under the License.
  * Represents the base class for all level handlers. This class performs no logic
  * and should be overridden.
  */
-export default class SettingsHandler {
+export default abstract class SettingsHandler {
     /**
      * Gets the value for a particular setting at this level for a particular room.
      * If no room is applicable, the roomId may be null. The roomId may not be
@@ -28,10 +28,7 @@ export default class SettingsHandler {
      * @param {String} roomId The room ID to read from, may be null.
      * @returns {*} The setting value, or null if not found.
      */
-    getValue(settingName, roomId) {
-        console.error("Invalid operation: getValue was not overridden");
-        return null;
-    }
+    public abstract getValue(settingName: string, roomId: string): any;
 
     /**
      * Sets the value for a particular setting at this level for a particular room.
@@ -44,10 +41,7 @@ export default class SettingsHandler {
      * @param {*} newValue The new value for the setting, may be null.
      * @returns {Promise} Resolves when the setting has been saved.
      */
-    setValue(settingName, roomId, newValue) {
-        console.error("Invalid operation: setValue was not overridden");
-        return Promise.reject();
-    }
+    public abstract setValue(settingName: string, roomId: string, newValue: any): Promise<void>;
 
     /**
      * Determines if the current user is able to set the value of the given setting
@@ -56,15 +50,11 @@ export default class SettingsHandler {
      * @param {String} roomId The room ID to check in, may be null
      * @returns {boolean} True if the setting can be set by the user, false otherwise.
      */
-    canSetValue(settingName, roomId) {
-        return false;
-    }
+    public abstract canSetValue(settingName: string, roomId: string): boolean;
 
     /**
      * Determines if this level is supported on this device.
      * @returns {boolean} True if this level is supported on the current device.
      */
-    isSupported() {
-        return false;
-    }
+    public abstract isSupported(): boolean;
 }
diff --git a/src/settings/watchers/FontWatcher.ts b/src/settings/watchers/FontWatcher.ts
new file mode 100644
index 0000000000..6a17bf2aa3
--- /dev/null
+++ b/src/settings/watchers/FontWatcher.ts
@@ -0,0 +1,69 @@
+/*
+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 dis from '../../dispatcher/dispatcher';
+import SettingsStore from '../SettingsStore';
+import IWatcher from "./Watcher";
+import { toPx } from '../../utils/units';
+import { Action } from '../../dispatcher/actions';
+import { SettingLevel } from "../SettingLevel";
+
+export class FontWatcher implements IWatcher {
+    public static readonly MIN_SIZE = 8;
+    public static readonly MAX_SIZE = 15;
+    // Externally we tell the user the font is size 15. Internally we use 10.
+    public static readonly SIZE_DIFF = 5;
+
+    private dispatcherRef: string;
+
+    constructor() {
+        this.dispatcherRef = null;
+    }
+
+    public start() {
+        this.setRootFontSize(SettingsStore.getValue("baseFontSize"));
+        this.setSystemFont({
+            useSystemFont: SettingsStore.getValue("useSystemFont"),
+            font: SettingsStore.getValue("systemFont"),
+        });
+        this.dispatcherRef = dis.register(this.onAction);
+    }
+
+    public stop() {
+        dis.unregister(this.dispatcherRef);
+    }
+
+    private onAction = (payload) => {
+        if (payload.action === Action.UpdateFontSize) {
+            this.setRootFontSize(payload.size);
+        } else if (payload.action === Action.UpdateSystemFont) {
+            this.setSystemFont(payload);
+        }
+    };
+
+    private setRootFontSize = (size) => {
+        const fontSize = Math.max(Math.min(FontWatcher.MAX_SIZE, size), FontWatcher.MIN_SIZE);
+
+        if (fontSize !== size) {
+            SettingsStore.setValue("baseFontSize", null, SettingLevel.DEVICE, fontSize);
+        }
+        (<HTMLElement>document.querySelector(":root")).style.fontSize = toPx(fontSize);
+    };
+
+    private setSystemFont = ({useSystemFont, font}) => {
+        document.body.style.fontFamily = useSystemFont ? font : "";
+    };
+}
diff --git a/src/settings/watchers/ThemeWatcher.ts b/src/settings/watchers/ThemeWatcher.ts
new file mode 100644
index 0000000000..53d72c7849
--- /dev/null
+++ b/src/settings/watchers/ThemeWatcher.ts
@@ -0,0 +1,136 @@
+/*
+Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
+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 SettingsStore from '../SettingsStore';
+import dis from '../../dispatcher/dispatcher';
+import { Action } from '../../dispatcher/actions';
+import ThemeController from "../controllers/ThemeController";
+import { setTheme } from "../../theme";
+import { ActionPayload } from '../../dispatcher/payloads';
+import { SettingLevel } from "../SettingLevel";
+
+export default class ThemeWatcher {
+    private themeWatchRef: string;
+    private systemThemeWatchRef: string;
+    private dispatcherRef: string;
+
+    private preferDark: MediaQueryList;
+    private preferLight: MediaQueryList;
+
+    private currentTheme: string;
+
+    constructor() {
+        this.themeWatchRef = null;
+        this.systemThemeWatchRef = null;
+        this.dispatcherRef = null;
+
+        // we have both here as each may either match or not match, so by having both
+        // we can get the tristate of dark/light/unsupported
+        this.preferDark = (<any>global).matchMedia("(prefers-color-scheme: dark)");
+        this.preferLight = (<any>global).matchMedia("(prefers-color-scheme: light)");
+
+        this.currentTheme = this.getEffectiveTheme();
+    }
+
+    public start() {
+        this.themeWatchRef = SettingsStore.watchSetting("theme", null, this.onChange);
+        this.systemThemeWatchRef = SettingsStore.watchSetting("use_system_theme", null, this.onChange);
+        if (this.preferDark.addEventListener) {
+            this.preferDark.addEventListener('change', this.onChange);
+            this.preferLight.addEventListener('change', this.onChange);
+        }
+        this.dispatcherRef = dis.register(this.onAction);
+    }
+
+    public stop() {
+        if (this.preferDark.addEventListener) {
+            this.preferDark.removeEventListener('change', this.onChange);
+            this.preferLight.removeEventListener('change', this.onChange);
+        }
+        SettingsStore.unwatchSetting(this.systemThemeWatchRef);
+        SettingsStore.unwatchSetting(this.themeWatchRef);
+        dis.unregister(this.dispatcherRef);
+    }
+
+    private onChange = () => {
+        this.recheck();
+    };
+
+    private onAction = (payload: ActionPayload) => {
+        if (payload.action === Action.RecheckTheme) {
+            // XXX forceTheme
+            this.recheck(payload.forceTheme);
+        }
+    };
+
+    // XXX: forceTheme param added here as local echo appears to be unreliable
+    // https://github.com/vector-im/element-web/issues/11443
+    public recheck(forceTheme?: string) {
+        const oldTheme = this.currentTheme;
+        this.currentTheme = forceTheme === undefined ? this.getEffectiveTheme() : forceTheme;
+        if (oldTheme !== this.currentTheme) {
+            setTheme(this.currentTheme);
+        }
+    }
+
+    public getEffectiveTheme(): string {
+        // Dev note: Much of this logic is replicated in the AppearanceUserSettingsTab
+
+        // XXX: checking the isLight flag here makes checking it in the ThemeController
+        // itself completely redundant since we just override the result here and we're
+        // now effectively just using the ThemeController as a place to store the static
+        // variable. The system theme setting probably ought to have an equivalent
+        // controller that honours the same flag, although probablt better would be to
+        // have the theme logic in one place rather than split between however many
+        // different places.
+        if (ThemeController.isLogin) return 'light';
+
+        // If the user has specifically enabled the system matching option (excluding default),
+        // then use that over anything else. We pick the lowest possible level for the setting
+        // to ensure the ordering otherwise works.
+        const systemThemeExplicit = SettingsStore.getValueAt(
+            SettingLevel.DEVICE, "use_system_theme", null, false, true);
+        if (systemThemeExplicit) {
+            console.log("returning explicit system theme");
+            if (this.preferDark.matches) return 'dark';
+            if (this.preferLight.matches) return 'light';
+        }
+
+        // If the user has specifically enabled the theme (without the system matching option being
+        // enabled specifically and excluding the default), use that theme. We pick the lowest possible
+        // level for the setting to ensure the ordering otherwise works.
+        const themeExplicit = SettingsStore.getValueAt(
+            SettingLevel.DEVICE, "theme", null, false, true);
+        if (themeExplicit) {
+            console.log("returning explicit theme: " + themeExplicit);
+            return themeExplicit;
+        }
+
+        // If the user hasn't really made a preference in either direction, assume the defaults of the
+        // settings and use those.
+        if (SettingsStore.getValue('use_system_theme')) {
+            if (this.preferDark.matches) return 'dark';
+            if (this.preferLight.matches) return 'light';
+        }
+        console.log("returning theme value");
+        return SettingsStore.getValue('theme');
+    }
+
+    public isSystemThemeSupported() {
+        return this.preferDark.matches || this.preferLight.matches;
+    }
+}
diff --git a/src/settings/watchers/Watcher.ts b/src/settings/watchers/Watcher.ts
new file mode 100644
index 0000000000..031c2738fa
--- /dev/null
+++ b/src/settings/watchers/Watcher.ts
@@ -0,0 +1,20 @@
+/*
+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 default interface IWatcher {
+    start(): void;
+    stop(): void;
+}
diff --git a/src/stores/ActiveWidgetStore.js b/src/stores/ActiveWidgetStore.js
index c6f8dc69b7..bf9ae3586c 100644
--- a/src/stores/ActiveWidgetStore.js
+++ b/src/stores/ActiveWidgetStore.js
@@ -64,7 +64,7 @@ class ActiveWidgetStore extends EventEmitter {
         // Everything else relies on views listening for events and calling setters
         // on this class which is terrible. This store should just listen for events
         // and keep itself up to date.
-        // TODO: Enable support for m.widget event type (https://github.com/vector-im/riot-web/issues/13111)
+        // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
         if (ev.getType() !== 'im.vector.modular.widgets') return;
 
         if (ev.getStateKey() === this._persistentWidgetId) {
diff --git a/src/stores/AsyncStore.ts b/src/stores/AsyncStore.ts
new file mode 100644
index 0000000000..1f310f003c
--- /dev/null
+++ b/src/stores/AsyncStore.ts
@@ -0,0 +1,109 @@
+/*
+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 { EventEmitter } from 'events';
+import AwaitLock from 'await-lock';
+import { Dispatcher } from "flux";
+import { ActionPayload } from "../dispatcher/payloads";
+
+/**
+ * The event/channel to listen for in an AsyncStore.
+ */
+export const UPDATE_EVENT = "update";
+
+/**
+ * Represents a minimal store which works similar to Flux stores. Instead
+ * of everything needing to happen in a dispatch cycle, everything can
+ * happen async to that cycle.
+ *
+ * The store operates by using Object.assign() to mutate state - it sends the
+ * state objects (current and new) through the function onto a new empty
+ * object. Because of this, it is recommended to break out your state to be as
+ * safe as possible. The state mutations are also locked, preventing concurrent
+ * writes.
+ *
+ * All updates to the store happen on the UPDATE_EVENT event channel with the
+ * one argument being the instance of the store.
+ *
+ * To update the state, use updateState() and preferably await the result to
+ * help prevent lock conflicts.
+ */
+export abstract class AsyncStore<T extends Object> extends EventEmitter {
+    private storeState: Readonly<T>;
+    private lock = new AwaitLock();
+    private readonly dispatcherRef: string;
+
+    /**
+     * Creates a new AsyncStore using the given dispatcher.
+     * @param {Dispatcher<ActionPayload>} dispatcher The dispatcher to rely upon.
+     * @param {T} initialState The initial state for the store.
+     */
+    protected constructor(private dispatcher: Dispatcher<ActionPayload>, initialState: T = <T>{}) {
+        super();
+
+        this.dispatcherRef = dispatcher.register(this.onDispatch.bind(this));
+        this.storeState = initialState;
+    }
+
+    /**
+     * The current state of the store. Cannot be mutated.
+     */
+    protected get state(): T {
+        return this.storeState;
+    }
+
+    /**
+     * Stops the store's listening functions, such as the listener to the dispatcher.
+     */
+    protected stop() {
+        if (this.dispatcherRef) this.dispatcher.unregister(this.dispatcherRef);
+    }
+
+    /**
+     * Updates the state of the store.
+     * @param {T|*} newState The state to update in the store using Object.assign()
+     */
+    protected async updateState(newState: T | Object) {
+        await this.lock.acquireAsync();
+        try {
+            this.storeState = Object.freeze(Object.assign(<T>{}, this.storeState, newState));
+            this.emit(UPDATE_EVENT, this);
+        } finally {
+            await this.lock.release();
+        }
+    }
+
+    /**
+     * Resets the store's to the provided state or an empty object.
+     * @param {T|*} newState The new state of the store.
+     * @param {boolean} quiet If true, the function will not raise an UPDATE_EVENT.
+     */
+    protected async reset(newState: T | Object = null, quiet = false) {
+        await this.lock.acquireAsync();
+        try {
+            this.storeState = Object.freeze(<T>(newState || {}));
+            if (!quiet) this.emit(UPDATE_EVENT, this);
+        } finally {
+            await this.lock.release();
+        }
+    }
+
+    /**
+     * Called when the dispatcher broadcasts a dispatch event.
+     * @param {ActionPayload} payload The event being dispatched.
+     */
+    protected abstract onDispatch(payload: ActionPayload);
+}
diff --git a/src/stores/AsyncStoreWithClient.ts b/src/stores/AsyncStoreWithClient.ts
new file mode 100644
index 0000000000..1ed7c6a547
--- /dev/null
+++ b/src/stores/AsyncStoreWithClient.ts
@@ -0,0 +1,73 @@
+/*
+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 { MatrixClient } from "matrix-js-sdk/src/client";
+import { AsyncStore } from "./AsyncStore";
+import { ActionPayload } from "../dispatcher/payloads";
+import { Dispatcher } from "flux";
+import { MatrixClientPeg } from "../MatrixClientPeg";
+
+export abstract class AsyncStoreWithClient<T extends Object> extends AsyncStore<T> {
+    protected matrixClient: MatrixClient;
+
+    protected abstract async onAction(payload: ActionPayload);
+
+    protected constructor(dispatcher: Dispatcher<ActionPayload>, initialState: T = <T>{}) {
+        super(dispatcher, initialState);
+
+        if (MatrixClientPeg.get()) {
+            this.matrixClient = MatrixClientPeg.get();
+
+            // noinspection JSIgnoredPromiseFromCall
+            this.onReady();
+        }
+    }
+
+    protected async onReady() {
+        // Default implementation is to do nothing.
+    }
+
+    protected async onNotReady() {
+        // Default implementation is to do nothing.
+    }
+
+    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
new file mode 100644
index 0000000000..24906f678c
--- /dev/null
+++ b/src/stores/BreadcrumbsStore.ts
@@ -0,0 +1,175 @@
+/*
+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 { Room } from "matrix-js-sdk/src/models/room";
+import { ActionPayload } from "../dispatcher/payloads";
+import { AsyncStoreWithClient } from "./AsyncStoreWithClient";
+import defaultDispatcher from "../dispatcher/dispatcher";
+import { arrayHasDiff } from "../utils/arrays";
+import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
+import { SettingLevel } from "../settings/SettingLevel";
+
+const MAX_ROOMS = 20; // arbitrary
+const AUTOJOIN_WAIT_THRESHOLD_MS = 90000; // 90s, the time we wait for an autojoined room to show up
+
+interface IState {
+    enabled?: boolean;
+    rooms?: Room[];
+}
+
+export class BreadcrumbsStore extends AsyncStoreWithClient<IState> {
+    private static internalInstance = new BreadcrumbsStore();
+
+    private waitingRooms: { roomId: string, addedTs: number }[] = [];
+
+    private constructor() {
+        super(defaultDispatcher);
+
+        SettingsStore.monitorSetting("breadcrumb_rooms", null);
+        SettingsStore.monitorSetting("breadcrumbs", null);
+    }
+
+    public static get instance(): BreadcrumbsStore {
+        return BreadcrumbsStore.internalInstance;
+    }
+
+    public get rooms(): Room[] {
+        return this.state.rooms || [];
+    }
+
+    public get visible(): boolean {
+        return this.state.enabled && this.meetsRoomRequirement;
+    }
+
+    private get meetsRoomRequirement(): boolean {
+        return this.matrixClient && this.matrixClient.getVisibleRooms().length >= 20;
+    }
+
+    protected async onAction(payload: ActionPayload) {
+        if (!this.matrixClient) return;
+
+        if (payload.action === 'setting_updated') {
+            if (payload.settingName === 'breadcrumb_rooms') {
+                await this.updateRooms();
+            } else if (payload.settingName === 'breadcrumbs') {
+                await this.updateState({enabled: SettingsStore.getValue("breadcrumbs", null)});
+            }
+        } else if (payload.action === 'view_room') {
+            if (payload.auto_join && !this.matrixClient.getRoom(payload.room_id)) {
+                // Queue the room instead of pushing it immediately. We're probably just
+                // waiting for a room join to complete.
+                this.waitingRooms.push({roomId: payload.room_id, addedTs: Date.now()});
+            } else {
+                // The tests might not result in a valid room object.
+                const room = this.matrixClient.getRoom(payload.room_id);
+                if (room) await this.appendRoom(room);
+            }
+        }
+    }
+
+    protected async onReady() {
+        await this.updateRooms();
+        await this.updateState({enabled: SettingsStore.getValue("breadcrumbs", null)});
+
+        this.matrixClient.on("Room.myMembership", this.onMyMembership);
+        this.matrixClient.on("Room", this.onRoom);
+    }
+
+    protected async onNotReady() {
+        this.matrixClient.removeListener("Room.myMembership", this.onMyMembership);
+        this.matrixClient.removeListener("Room", this.onRoom);
+    }
+
+    private onMyMembership = async (room: Room) => {
+        // Only turn on breadcrumbs is the user hasn't explicitly turned it off again.
+        const settingValueRaw = SettingsStore.getValue("breadcrumbs", null, /*excludeDefault=*/true);
+        if (this.meetsRoomRequirement && isNullOrUndefined(settingValueRaw)) {
+            await SettingsStore.setValue("breadcrumbs", null, SettingLevel.ACCOUNT, true);
+        }
+    };
+
+    private onRoom = async (room: Room) => {
+        const waitingRoom = this.waitingRooms.find(r => r.roomId === room.roomId);
+        if (!waitingRoom) return;
+        this.waitingRooms.splice(this.waitingRooms.indexOf(waitingRoom), 1);
+
+        if ((Date.now() - waitingRoom.addedTs) > AUTOJOIN_WAIT_THRESHOLD_MS) return; // Too long ago.
+        await this.appendRoom(room);
+    };
+
+    private async updateRooms() {
+        let roomIds = SettingsStore.getValue("breadcrumb_rooms");
+        if (!roomIds || roomIds.length === 0) roomIds = [];
+
+        const rooms = roomIds.map(r => this.matrixClient.getRoom(r)).filter(r => !!r);
+        const currentRooms = this.state.rooms || [];
+        if (!arrayHasDiff(rooms, currentRooms)) return; // no change (probably echo)
+        await this.updateState({rooms});
+    }
+
+    private async appendRoom(room: Room) {
+        let updated = false;
+        const rooms = (this.state.rooms || []).slice(); // cheap clone
+
+        // If the room is upgraded, use that room instead. We'll also splice out
+        // any children of the room.
+        const history = this.matrixClient.getRoomUpgradeHistory(room.roomId);
+        if (history.length > 1) {
+            room = history[history.length - 1]; // Last room is most recent in history
+
+            // Take out any room that isn't the most recent room
+            for (let i = 0; i < history.length - 1; i++) {
+                const idx = rooms.findIndex(r => r.roomId === history[i].roomId);
+                if (idx !== -1) {
+                    rooms.splice(idx, 1);
+                    updated = true;
+                }
+            }
+        }
+
+        // Remove the existing room, if it is present
+        const existingIdx = rooms.findIndex(r => r.roomId === room.roomId);
+
+        // If we're focusing on the first room no-op
+        if (existingIdx !== 0) {
+            if (existingIdx !== -1) {
+                rooms.splice(existingIdx, 1);
+            }
+
+            // Splice the room to the start of the list
+            rooms.splice(0, 0, room);
+            updated = true;
+        }
+
+        if (rooms.length > MAX_ROOMS) {
+            // This looks weird, but it's saying to start at the MAX_ROOMS point in the
+            // list and delete everything after it.
+            rooms.splice(MAX_ROOMS, rooms.length - MAX_ROOMS);
+            updated = true;
+        }
+
+
+        if (updated) {
+            // Update the breadcrumbs
+            await this.updateState({rooms});
+            const roomIds = rooms.map(r => r.roomId);
+            if (roomIds.length > 0) {
+                await SettingsStore.setValue("breadcrumb_rooms", null, SettingLevel.ACCOUNT, roomIds);
+            }
+        }
+    }
+}
diff --git a/src/stores/CustomRoomTagStore.js b/src/stores/CustomRoomTagStore.js
index 909282c085..39177181b4 100644
--- a/src/stores/CustomRoomTagStore.js
+++ b/src/stores/CustomRoomTagStore.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2019 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -13,14 +14,15 @@ 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 dis from '../dispatcher';
-import * as RoomNotifs from '../RoomNotifs';
-import RoomListStore from './RoomListStore';
-import EventEmitter from 'events';
-import { throttle } from "lodash";
-import SettingsStore from "../settings/SettingsStore";
 
-const STANDARD_TAGS_REGEX = /^(m\.(favourite|lowpriority|server_notice)|im\.vector\.fake\.(invite|recent|direct|archived))$/;
+import dis from '../dispatcher/dispatcher';
+import EventEmitter from 'events';
+import {throttle} from "lodash";
+import SettingsStore from "../settings/SettingsStore";
+import RoomListStore, {LISTS_UPDATE_EVENT} from "./room-list/RoomListStore";
+import {RoomNotificationStateStore} from "./notifications/RoomNotificationStateStore";
+import {isCustomTag} from "./room-list/models";
+import {objectHasDiff} from "../utils/objects";
 
 function commonPrefix(a, b) {
     const len = Math.min(a.length, b.length);
@@ -60,9 +62,7 @@ class CustomRoomTagStore extends EventEmitter {
                 trailing: true,
             },
         );
-        this._roomListStoreToken = RoomListStore.addListener(() => {
-            this._setState({tags: this._getUpdatedTags()});
-        });
+        RoomListStore.instance.on(LISTS_UPDATE_EVENT, this._onListsUpdated);
         dis.register(payload => this._onDispatch(payload));
     }
 
@@ -85,8 +85,6 @@ class CustomRoomTagStore extends EventEmitter {
     }
 
     getSortedTags() {
-        const roomLists = RoomListStore.getRoomLists();
-
         const tagNames = Object.keys(this._state.tags).sort();
         const prefixes = tagNames.map((name, i) => {
             const isFirst = i === 0;
@@ -98,17 +96,23 @@ class CustomRoomTagStore extends EventEmitter {
             return longestPrefix;
         });
         return tagNames.map((name, i) => {
-            const notifs = RoomNotifs.aggregateNotificationCount(roomLists[name]);
-            let badge;
-            if (notifs.count !== 0) {
-                badge = notifs;
+            const notifs = RoomNotificationStateStore.instance.getListState(name);
+            let badgeNotifState;
+            if (notifs.hasUnreadCount) {
+                badgeNotifState = notifs;
             }
             const avatarLetter = name.substr(prefixes[i].length, 1);
             const selected = this._state.tags[name];
-            return {name, avatarLetter, badge, selected};
+            return {name, avatarLetter, badgeNotifState, selected};
         });
     }
 
+    _onListsUpdated = () => {
+        const newTags = this._getUpdatedTags();
+        if (!this._state.tags || objectHasDiff(this._state.tags, newTags)) {
+            this._setState({tags: newTags});
+        }
+    };
 
     _onDispatch(payload) {
         switch (payload.action) {
@@ -126,30 +130,23 @@ class CustomRoomTagStore extends EventEmitter {
             case 'on_logged_out': {
                 // we assume to always have a tags object in the state
                 this._state = {tags: {}};
-                if (this._roomListStoreToken) {
-                    this._roomListStoreToken.remove();
-                    this._roomListStoreToken = null;
-                }
+                RoomListStore.instance.off(LISTS_UPDATE_EVENT, this._onListsUpdated);
             }
             break;
         }
     }
 
     _getUpdatedTags() {
-        if (!SettingsStore.isFeatureEnabled("feature_custom_tags")) {
-            return;
+        if (!SettingsStore.getValue("feature_custom_tags")) {
+            return {}; // none
         }
 
-        const newTagNames = Object.keys(RoomListStore.getRoomLists())
-            .filter((tagName) => {
-                return !tagName.match(STANDARD_TAGS_REGEX);
-            }).sort();
+        const newTagNames = Object.keys(RoomListStore.instance.orderedLists).filter(t => isCustomTag(t)).sort();
         const prevTags = this._state && this._state.tags;
-        const newTags = newTagNames.reduce((newTags, tagName) => {
-            newTags[tagName] = (prevTags && prevTags[tagName]) || false;
-            return newTags;
+        return newTagNames.reduce((c, tagName) => {
+            c[tagName] = (prevTags && prevTags[tagName]) || false;
+            return c;
         }, {});
-        return newTags;
     }
 }
 
diff --git a/src/stores/GroupStore.js b/src/stores/GroupStore.js
index 6aad6aeaec..d4097184a1 100644
--- a/src/stores/GroupStore.js
+++ b/src/stores/GroupStore.js
@@ -18,6 +18,7 @@ import EventEmitter from 'events';
 import { groupMemberFromApiObject, groupRoomFromApiObject } from '../groups';
 import FlairStore from './FlairStore';
 import {MatrixClientPeg} from '../MatrixClientPeg';
+import dis from '../dispatcher/dispatcher';
 
 function parseMembersResponse(response) {
     return response.chunk.map((apiMember) => groupMemberFromApiObject(apiMember));
@@ -295,6 +296,11 @@ class GroupStore extends EventEmitter {
     }
 
     leaveGroup(groupId) {
+        // ensure the tag panel filter is cleared if the group was selected
+        dis.dispatch({
+            action: "deselect_tags",
+            tag: groupId,
+        });
         return MatrixClientPeg.get().leaveGroup(groupId)
             // The user should now not be able to access group settings
             .then(this._fetchResource.bind(this, this.STATE_KEY.Summary, groupId))
diff --git a/src/stores/LifecycleStore.js b/src/stores/LifecycleStore.js
index 904f29f7b3..a12bac7dd6 100644
--- a/src/stores/LifecycleStore.js
+++ b/src/stores/LifecycleStore.js
@@ -15,7 +15,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 dis from '../dispatcher';
+import dis from '../dispatcher/dispatcher';
 import {Store} from 'flux/utils';
 
 const INITIAL_STATE = {
diff --git a/src/stores/NonUrgentToastStore.ts b/src/stores/NonUrgentToastStore.ts
new file mode 100644
index 0000000000..72f896749c
--- /dev/null
+++ b/src/stores/NonUrgentToastStore.ts
@@ -0,0 +1,50 @@
+/*
+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 EventEmitter from "events";
+import { ComponentClass } from "../@types/common";
+import { UPDATE_EVENT } from "./AsyncStore";
+
+export type ToastReference = symbol;
+
+export default class NonUrgentToastStore extends EventEmitter {
+    private static _instance: NonUrgentToastStore;
+
+    private toasts = new Map<ToastReference, ComponentClass>();
+
+    public static get instance(): NonUrgentToastStore {
+        if (!NonUrgentToastStore._instance) {
+            NonUrgentToastStore._instance = new NonUrgentToastStore();
+        }
+        return NonUrgentToastStore._instance;
+    }
+
+    public get components(): ComponentClass[] {
+        return Array.from(this.toasts.values());
+    }
+
+    public addToast(c: ComponentClass): ToastReference {
+        const ref: ToastReference = Symbol();
+        this.toasts.set(ref, c);
+        this.emit(UPDATE_EVENT);
+        return ref;
+    }
+
+    public removeToast(ref: ToastReference) {
+        this.toasts.delete(ref);
+        this.emit(UPDATE_EVENT);
+    }
+}
diff --git a/src/stores/OwnProfileStore.ts b/src/stores/OwnProfileStore.ts
new file mode 100644
index 0000000000..1aa761e1c4
--- /dev/null
+++ b/src/stores/OwnProfileStore.ts
@@ -0,0 +1,120 @@
+/*
+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 { ActionPayload } from "../dispatcher/payloads";
+import { AsyncStoreWithClient } from "./AsyncStoreWithClient";
+import defaultDispatcher from "../dispatcher/dispatcher";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { User } from "matrix-js-sdk/src/models/user";
+import { throttle } from "lodash";
+import { MatrixClientPeg } from "../MatrixClientPeg";
+import { _t } from "../languageHandler";
+
+interface IState {
+    displayName?: string;
+    avatarUrl?: string;
+}
+
+export class OwnProfileStore extends AsyncStoreWithClient<IState> {
+    private static internalInstance = new OwnProfileStore();
+
+    private monitoredUser: User;
+
+    private constructor() {
+        super(defaultDispatcher, {});
+    }
+
+    public static get instance(): OwnProfileStore {
+        return OwnProfileStore.internalInstance;
+    }
+
+    /**
+     * Gets the display name for the user, or null if not present.
+     */
+    public get displayName(): string {
+        if (!this.matrixClient) return this.state.displayName || null;
+
+        if (this.matrixClient.isGuest()) {
+            return _t("Guest");
+        } else if (this.state.displayName) {
+            return this.state.displayName;
+        } else {
+            return this.matrixClient.getUserId();
+        }
+    }
+
+    /**
+     * Gets the MXC URI of the user's avatar, or null if not present.
+     */
+    public get avatarMxc(): string {
+        return this.state.avatarUrl || null;
+    }
+
+    /**
+     * Gets the user's avatar as an HTTP URL of the given size. If the user's
+     * avatar is not present, this returns null.
+     * @param size The size of the avatar
+     * @returns The HTTP URL of the user's avatar
+     */
+    public getHttpAvatarUrl(size: number): string {
+        if (!this.avatarMxc) return null;
+        return this.matrixClient.mxcUrlToHttp(this.avatarMxc, size, size);
+    }
+
+    protected async onNotReady() {
+        if (this.monitoredUser) {
+            this.monitoredUser.removeListener("User.displayName", this.onProfileUpdate);
+            this.monitoredUser.removeListener("User.avatarUrl", this.onProfileUpdate);
+        }
+        if (this.matrixClient) {
+            this.matrixClient.removeListener("RoomState.events", this.onStateEvents);
+        }
+        await this.reset({});
+    }
+
+    protected async onReady() {
+        const myUserId = this.matrixClient.getUserId();
+        this.monitoredUser = this.matrixClient.getUser(myUserId);
+        if (this.monitoredUser) {
+            this.monitoredUser.on("User.displayName", this.onProfileUpdate);
+            this.monitoredUser.on("User.avatarUrl", this.onProfileUpdate);
+        }
+
+        // We also have to listen for membership events for ourselves as the above User events
+        // are fired only with presence, which matrix.org (and many others) has disabled.
+        this.matrixClient.on("RoomState.events", this.onStateEvents);
+
+        await this.onProfileUpdate(); // trigger an initial update
+    }
+
+    protected async onAction(payload: ActionPayload) {
+        // we don't actually do anything here
+    }
+
+    private onProfileUpdate = async () => {
+        // We specifically do not use the User object we stored for profile info as it
+        // could easily be wrong (such as per-room instead of global profile).
+        const profileInfo = await this.matrixClient.getProfileInfo(this.matrixClient.getUserId());
+        await this.updateState({displayName: profileInfo.displayname, avatarUrl: profileInfo.avatar_url});
+    };
+
+    private onStateEvents = throttle(async (ev: MatrixEvent) => {
+        const myUserId = MatrixClientPeg.get().getUserId();
+        if (ev.getType() === 'm.room.member' && ev.getSender() === myUserId && ev.getStateKey() === myUserId) {
+            await this.onProfileUpdate();
+        }
+    }, 200, {trailing: true, leading: true});
+}
diff --git a/src/stores/RightPanelStore.js b/src/stores/RightPanelStore.ts
similarity index 56%
rename from src/stores/RightPanelStore.js
rename to src/stores/RightPanelStore.ts
index 8869d0be42..c1799978ad 100644
--- a/src/stores/RightPanelStore.js
+++ b/src/stores/RightPanelStore.ts
@@ -14,165 +14,182 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import dis from '../dispatcher';
+import dis from '../dispatcher/dispatcher';
 import {pendingVerificationRequestForUser} from '../verification';
 import {Store} from 'flux/utils';
-import SettingsStore, {SettingLevel} from "../settings/SettingsStore";
-import {RIGHT_PANEL_PHASES, RIGHT_PANEL_PHASES_NO_ARGS} from "./RightPanelStorePhases";
+import SettingsStore from "../settings/SettingsStore";
+import {RightPanelPhases, RIGHT_PANEL_PHASES_NO_ARGS} from "./RightPanelStorePhases";
+import {ActionPayload} from "../dispatcher/payloads";
+import {Action} from '../dispatcher/actions';
+import { SettingLevel } from "../settings/SettingLevel";
 
-const INITIAL_STATE = {
+interface RightPanelStoreState {
     // Whether or not to show the right panel at all. We split out rooms and groups
     // because they're different flows for the user to follow.
-    showRoomPanel: SettingsStore.getValue("showRightPanelInRoom"),
-    showGroupPanel: SettingsStore.getValue("showRightPanelInGroup"),
+    showRoomPanel: boolean;
+    showGroupPanel: boolean;
 
     // The last phase (screen) the right panel was showing
-    lastRoomPhase: SettingsStore.getValue("lastRightPanelPhaseForRoom"),
-    lastGroupPhase: SettingsStore.getValue("lastRightPanelPhaseForGroup"),
+    lastRoomPhase: RightPanelPhases;
+    lastGroupPhase: RightPanelPhases;
 
     // Extra information about the last phase
+    lastRoomPhaseParams: {[key: string]: any};
+}
+
+const INITIAL_STATE: RightPanelStoreState = {
+    showRoomPanel: SettingsStore.getValue("showRightPanelInRoom"),
+    showGroupPanel: SettingsStore.getValue("showRightPanelInGroup"),
+    lastRoomPhase: SettingsStore.getValue("lastRightPanelPhaseForRoom"),
+    lastGroupPhase: SettingsStore.getValue("lastRightPanelPhaseForGroup"),
     lastRoomPhaseParams: {},
 };
 
-const GROUP_PHASES = Object.keys(RIGHT_PANEL_PHASES).filter(k => k.startsWith("Group"));
+const GROUP_PHASES = [
+    RightPanelPhases.GroupMemberList,
+    RightPanelPhases.GroupRoomList,
+    RightPanelPhases.GroupRoomInfo,
+    RightPanelPhases.GroupMemberInfo,
+];
 
 const MEMBER_INFO_PHASES = [
-    RIGHT_PANEL_PHASES.RoomMemberInfo,
-    RIGHT_PANEL_PHASES.Room3pidMemberInfo,
-    RIGHT_PANEL_PHASES.EncryptionPanel,
+    RightPanelPhases.RoomMemberInfo,
+    RightPanelPhases.Room3pidMemberInfo,
+    RightPanelPhases.EncryptionPanel,
 ];
 
 /**
  * A class for tracking the state of the right panel between layouts and
  * sessions.
  */
-export default class RightPanelStore extends Store {
-    static _instance;
+export default class RightPanelStore extends Store<ActionPayload> {
+    private static instance: RightPanelStore;
+    private state: RightPanelStoreState;
 
     constructor() {
         super(dis);
 
         // Initialise state
-        this._state = INITIAL_STATE;
+        this.state = INITIAL_STATE;
     }
 
     get isOpenForRoom(): boolean {
-        return this._state.showRoomPanel;
+        return this.state.showRoomPanel;
     }
 
     get isOpenForGroup(): boolean {
-        return this._state.showGroupPanel;
+        return this.state.showGroupPanel;
     }
 
-    get roomPanelPhase(): string {
-        return this._state.lastRoomPhase;
+    get roomPanelPhase(): RightPanelPhases {
+        return this.state.lastRoomPhase;
     }
 
-    get groupPanelPhase(): string {
-        return this._state.lastGroupPhase;
+    get groupPanelPhase(): RightPanelPhases {
+        return this.state.lastGroupPhase;
     }
 
-    get visibleRoomPanelPhase(): string {
+    get visibleRoomPanelPhase(): RightPanelPhases {
         return this.isOpenForRoom ? this.roomPanelPhase : null;
     }
 
-    get visibleGroupPanelPhase(): string {
+    get visibleGroupPanelPhase(): RightPanelPhases {
         return this.isOpenForGroup ? this.groupPanelPhase : null;
     }
 
     get roomPanelPhaseParams(): any {
-        return this._state.lastRoomPhaseParams || {};
+        return this.state.lastRoomPhaseParams || {};
     }
 
-    _setState(newState) {
-        this._state = Object.assign(this._state, newState);
+    private setState(newState: Partial<RightPanelStoreState>) {
+        this.state = Object.assign(this.state, newState);
 
         SettingsStore.setValue(
             "showRightPanelInRoom",
             null,
             SettingLevel.DEVICE,
-            this._state.showRoomPanel,
+            this.state.showRoomPanel,
         );
         SettingsStore.setValue(
             "showRightPanelInGroup",
             null,
             SettingLevel.DEVICE,
-            this._state.showGroupPanel,
+            this.state.showGroupPanel,
         );
 
-        if (RIGHT_PANEL_PHASES_NO_ARGS.includes(this._state.lastRoomPhase)) {
+        if (RIGHT_PANEL_PHASES_NO_ARGS.includes(this.state.lastRoomPhase)) {
             SettingsStore.setValue(
                 "lastRightPanelPhaseForRoom",
                 null,
                 SettingLevel.DEVICE,
-                this._state.lastRoomPhase,
+                this.state.lastRoomPhase,
             );
         }
-        if (RIGHT_PANEL_PHASES_NO_ARGS.includes(this._state.lastGroupPhase)) {
+        if (RIGHT_PANEL_PHASES_NO_ARGS.includes(this.state.lastGroupPhase)) {
             SettingsStore.setValue(
                 "lastRightPanelPhaseForGroup",
                 null,
                 SettingLevel.DEVICE,
-                this._state.lastGroupPhase,
+                this.state.lastGroupPhase,
             );
         }
 
         this.__emitChange();
     }
 
-    __onDispatch(payload) {
+    __onDispatch(payload: ActionPayload) {
         switch (payload.action) {
             case 'view_room':
             case 'view_group':
                 // Reset to the member list if we're viewing member info
-                if (MEMBER_INFO_PHASES.includes(this._state.lastRoomPhase)) {
-                    this._setState({lastRoomPhase: RIGHT_PANEL_PHASES.RoomMemberList, lastRoomPhaseParams: {}});
+                if (MEMBER_INFO_PHASES.includes(this.state.lastRoomPhase)) {
+                    this.setState({lastRoomPhase: RightPanelPhases.RoomMemberList, lastRoomPhaseParams: {}});
                 }
 
                 // Do the same for groups
-                if (this._state.lastGroupPhase === RIGHT_PANEL_PHASES.GroupMemberInfo) {
-                    this._setState({lastGroupPhase: RIGHT_PANEL_PHASES.GroupMemberList});
+                if (this.state.lastGroupPhase === RightPanelPhases.GroupMemberInfo) {
+                    this.setState({lastGroupPhase: RightPanelPhases.GroupMemberList});
                 }
                 break;
 
-            case 'set_right_panel_phase': {
+            case Action.SetRightPanelPhase: {
                 let targetPhase = payload.phase;
                 let refireParams = payload.refireParams;
                 // redirect to EncryptionPanel if there is an ongoing verification request
-                if (targetPhase === RIGHT_PANEL_PHASES.RoomMemberInfo) {
+                if (targetPhase === RightPanelPhases.RoomMemberInfo && payload.refireParams) {
                     const {member} = payload.refireParams;
                     const pendingRequest = pendingVerificationRequestForUser(member);
                     if (pendingRequest) {
-                        targetPhase = RIGHT_PANEL_PHASES.EncryptionPanel;
+                        targetPhase = RightPanelPhases.EncryptionPanel;
                         refireParams = {
                             verificationRequest: pendingRequest,
                             member,
                         };
                     }
                 }
-                if (!RIGHT_PANEL_PHASES[targetPhase]) {
+                if (!RightPanelPhases[targetPhase]) {
                     console.warn(`Tried to switch right panel to unknown phase: ${targetPhase}`);
                     return;
                 }
 
                 if (GROUP_PHASES.includes(targetPhase)) {
-                    if (targetPhase === this._state.lastGroupPhase) {
-                        this._setState({
-                            showGroupPanel: !this._state.showGroupPanel,
+                    if (targetPhase === this.state.lastGroupPhase) {
+                        this.setState({
+                            showGroupPanel: !this.state.showGroupPanel,
                         });
                     } else {
-                        this._setState({
+                        this.setState({
                             lastGroupPhase: targetPhase,
                             showGroupPanel: true,
                         });
                     }
                 } else {
-                    if (targetPhase === this._state.lastRoomPhase && !refireParams) {
-                        this._setState({
-                            showRoomPanel: !this._state.showRoomPanel,
+                    if (targetPhase === this.state.lastRoomPhase && !refireParams) {
+                        this.setState({
+                            showRoomPanel: !this.state.showRoomPanel,
                         });
                     } else {
-                        this._setState({
+                        this.setState({
                             lastRoomPhase: targetPhase,
                             showRoomPanel: true,
                             lastRoomPhaseParams: refireParams || {},
@@ -182,27 +199,27 @@ export default class RightPanelStore extends Store {
 
                 // Let things like the member info panel actually open to the right member.
                 dis.dispatch({
-                    action: 'after_right_panel_phase_change',
+                    action: Action.AfterRightPanelPhaseChange,
                     phase: targetPhase,
                     ...(refireParams || {}),
                 });
                 break;
             }
 
-            case 'toggle_right_panel':
+            case Action.ToggleRightPanel:
                 if (payload.type === "room") {
-                    this._setState({ showRoomPanel: !this._state.showRoomPanel });
+                    this.setState({ showRoomPanel: !this.state.showRoomPanel });
                 } else { // group
-                    this._setState({ showGroupPanel: !this._state.showGroupPanel });
+                    this.setState({ showGroupPanel: !this.state.showGroupPanel });
                 }
                 break;
         }
     }
 
     static getSharedInstance(): RightPanelStore {
-        if (!RightPanelStore._instance) {
-            RightPanelStore._instance = new RightPanelStore();
+        if (!RightPanelStore.instance) {
+            RightPanelStore.instance = new RightPanelStore();
         }
-        return RightPanelStore._instance;
+        return RightPanelStore.instance;
     }
 }
diff --git a/src/stores/RightPanelStorePhases.js b/src/stores/RightPanelStorePhases.ts
similarity index 57%
rename from src/stores/RightPanelStorePhases.js
rename to src/stores/RightPanelStorePhases.ts
index d9af320233..9045b17193 100644
--- a/src/stores/RightPanelStorePhases.js
+++ b/src/stores/RightPanelStorePhases.ts
@@ -15,28 +15,28 @@ limitations under the License.
 */
 
 // These are in their own file because of circular imports being a problem.
-export const RIGHT_PANEL_PHASES = Object.freeze({
+export enum RightPanelPhases {
     // Room stuff
-    RoomMemberList: 'RoomMemberList',
-    FilePanel: 'FilePanel',
-    NotificationPanel: 'NotificationPanel',
-    RoomMemberInfo: 'RoomMemberInfo',
-    EncryptionPanel: 'EncryptionPanel',
+    RoomMemberList = 'RoomMemberList',
+    FilePanel = 'FilePanel',
+    NotificationPanel = 'NotificationPanel',
+    RoomMemberInfo = 'RoomMemberInfo',
+    EncryptionPanel = 'EncryptionPanel',
 
-    Room3pidMemberInfo: 'Room3pidMemberInfo',
+    Room3pidMemberInfo = 'Room3pidMemberInfo',
     // Group stuff
-    GroupMemberList: 'GroupMemberList',
-    GroupRoomList: 'GroupRoomList',
-    GroupRoomInfo: 'GroupRoomInfo',
-    GroupMemberInfo: 'GroupMemberInfo',
-});
+    GroupMemberList = 'GroupMemberList',
+    GroupRoomList = 'GroupRoomList',
+    GroupRoomInfo = 'GroupRoomInfo',
+    GroupMemberInfo = 'GroupMemberInfo',
+}
 
 // These are the phases that are safe to persist (the ones that don't require additional
 // arguments).
 export const RIGHT_PANEL_PHASES_NO_ARGS = [
-    RIGHT_PANEL_PHASES.NotificationPanel,
-    RIGHT_PANEL_PHASES.FilePanel,
-    RIGHT_PANEL_PHASES.RoomMemberList,
-    RIGHT_PANEL_PHASES.GroupMemberList,
-    RIGHT_PANEL_PHASES.GroupRoomList,
+    RightPanelPhases.NotificationPanel,
+    RightPanelPhases.FilePanel,
+    RightPanelPhases.RoomMemberList,
+    RightPanelPhases.GroupMemberList,
+    RightPanelPhases.GroupRoomList,
 ];
diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
deleted file mode 100644
index 89edc9a8ef..0000000000
--- a/src/stores/RoomListStore.js
+++ /dev/null
@@ -1,796 +0,0 @@
-/*
-Copyright 2018, 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 {Store} from 'flux/utils';
-import dis from '../dispatcher';
-import DMRoomMap from '../utils/DMRoomMap';
-import * as Unread from '../Unread';
-import SettingsStore from "../settings/SettingsStore";
-
-/*
-Room sorting algorithm:
-* Always prefer to have red > grey > bold > idle
-* The room being viewed should be sticky (not jump down to the idle list)
-* When switching to a new room, sort the last sticky room to the top of the idle list.
-
-The approach taken by the store is to generate an initial representation of all the
-tagged lists (accepting that it'll take a little bit longer to calculate) and make
-small changes to that over time. This results in quick changes to the room list while
-also having update operations feel more like popping/pushing to a stack.
- */
-
-const CATEGORY_RED = "red";     // Mentions in the room
-const CATEGORY_GREY = "grey";   // Unread notified messages (not mentions)
-const CATEGORY_BOLD = "bold";   // Unread messages (not notified, 'Mentions Only' rooms)
-const CATEGORY_IDLE = "idle";   // Nothing of interest
-
-export const TAG_DM = "im.vector.fake.direct";
-
-/**
- * Identifier for manual sorting behaviour: sort by the user defined order.
- * @type {string}
- */
-export const ALGO_MANUAL = "manual";
-
-/**
- * Identifier for alphabetic sorting behaviour: sort by the room name alphabetically first.
- * @type {string}
- */
-export const ALGO_ALPHABETIC = "alphabetic";
-
-/**
- * Identifier for classic sorting behaviour: sort by the most recent message first.
- * @type {string}
- */
-export const ALGO_RECENT = "recent";
-
-const CATEGORY_ORDER = [CATEGORY_RED, CATEGORY_GREY, CATEGORY_BOLD, CATEGORY_IDLE];
-
-const getListAlgorithm = (listKey, settingAlgorithm) => {
-    // apply manual sorting only to m.favourite, otherwise respect the global setting
-    // all the known tags are listed explicitly here to simplify future changes
-    switch (listKey) {
-        case "im.vector.fake.invite":
-        case "im.vector.fake.recent":
-        case "im.vector.fake.archived":
-        case "m.lowpriority":
-        case TAG_DM:
-            return settingAlgorithm;
-
-        case "m.favourite":
-        default: // custom-tags
-            return ALGO_MANUAL;
-    }
-};
-
-const knownLists = new Set([
-    "m.favourite",
-    "im.vector.fake.invite",
-    "im.vector.fake.recent",
-    "im.vector.fake.archived",
-    "m.lowpriority",
-    TAG_DM,
-]);
-
-/**
- * A class for storing application state for categorising rooms in
- * the RoomList.
- */
-class RoomListStore extends Store {
-    constructor() {
-        super(dis);
-
-        this._init();
-        this._getManualComparator = this._getManualComparator.bind(this);
-        this._recentsComparator = this._recentsComparator.bind(this);
-    }
-
-    /**
-     * Changes the sorting algorithm used by the RoomListStore.
-     * @param {string} algorithm The new algorithm to use. Should be one of the ALGO_* constants.
-     * @param {boolean} orderImportantFirst Whether to sort by categories of importance
-     */
-    updateSortingAlgorithm(algorithm, orderImportantFirst) {
-        // Dev note: We only have two algorithms at the moment, but it isn't impossible that we want
-        // multiple in the future. Also constants make things slightly clearer.
-        console.log("Updating room sorting algorithm: ", {algorithm, orderImportantFirst});
-        this._setState({algorithm, orderImportantFirst});
-
-        // Trigger a resort of the entire list to reflect the change in algorithm
-        this._generateInitialRoomLists();
-    }
-
-    _init() {
-        // Initialise state
-        const defaultLists = {
-            "m.server_notice": [/* { room: js-sdk room, category: string } */],
-            "im.vector.fake.invite": [],
-            "m.favourite": [],
-            "im.vector.fake.recent": [],
-            [TAG_DM]: [],
-            "m.lowpriority": [],
-            "im.vector.fake.archived": [],
-        };
-        this._state = {
-            // The rooms in these arrays are ordered according to either the
-            // 'recents' behaviour or 'manual' behaviour.
-            lists: defaultLists,
-            presentationLists: defaultLists, // like `lists`, but with arrays of rooms instead
-            ready: false,
-            stickyRoomId: null,
-            algorithm: ALGO_RECENT,
-            orderImportantFirst: false,
-        };
-
-        SettingsStore.monitorSetting('RoomList.orderAlphabetically', null);
-        SettingsStore.monitorSetting('RoomList.orderByImportance', null);
-        SettingsStore.monitorSetting('feature_custom_tags', null);
-    }
-
-    _setState(newState) {
-        // If we're changing the lists, transparently change the presentation lists (which
-        // is given to requesting components). This dramatically simplifies our code elsewhere
-        // while also ensuring we don't need to update all the calling components to support
-        // categories.
-        if (newState['lists']) {
-            const presentationLists = {};
-            for (const key of Object.keys(newState['lists'])) {
-                presentationLists[key] = newState['lists'][key].map((e) => e.room);
-            }
-            newState['presentationLists'] = presentationLists;
-        }
-        this._state = Object.assign(this._state, newState);
-        this.__emitChange();
-    }
-
-    __onDispatch(payload) {
-        const logicallyReady = this._matrixClient && this._state.ready;
-        switch (payload.action) {
-            case 'setting_updated': {
-                if (!logicallyReady) break;
-
-                switch (payload.settingName) {
-                    case "RoomList.orderAlphabetically":
-                        this.updateSortingAlgorithm(payload.newValue ? ALGO_ALPHABETIC : ALGO_RECENT,
-                            this._state.orderImportantFirst);
-                        break;
-                    case "RoomList.orderByImportance":
-                        this.updateSortingAlgorithm(this._state.algorithm, payload.newValue);
-                        break;
-                    case "feature_custom_tags":
-                        this._setState({tagsEnabled: payload.newValue});
-                        this._generateInitialRoomLists(); // Tags means we have to start from scratch
-                        break;
-                }
-            }
-            break;
-            // Initialise state after initial sync
-            case 'MatrixActions.sync': {
-                if (!(payload.prevState !== 'PREPARED' && payload.state === 'PREPARED')) {
-                    break;
-                }
-
-                // Always ensure that we set any state needed for settings here. It is possible that
-                // setting updates trigger on startup before we are ready to sync, so we want to make
-                // sure that the right state is in place before we actually react to those changes.
-
-                this._setState({tagsEnabled: SettingsStore.isFeatureEnabled("feature_custom_tags")});
-
-                this._matrixClient = payload.matrixClient;
-
-                const orderByImportance = SettingsStore.getValue("RoomList.orderByImportance");
-                const orderAlphabetically = SettingsStore.getValue("RoomList.orderAlphabetically");
-                this.updateSortingAlgorithm(orderAlphabetically ? ALGO_ALPHABETIC : ALGO_RECENT, orderByImportance);
-            }
-            break;
-            case 'MatrixActions.Room.receipt': {
-                if (!logicallyReady) break;
-
-                // First see if the receipt event is for our own user. If it was, trigger
-                // a room update (we probably read the room on a different device).
-                const myUserId = this._matrixClient.getUserId();
-                for (const eventId of Object.keys(payload.event.getContent())) {
-                    const receiptUsers = Object.keys(payload.event.getContent()[eventId]['m.read'] || {});
-                    if (receiptUsers.includes(myUserId)) {
-                        this._roomUpdateTriggered(payload.room.roomId);
-                        return;
-                    }
-                }
-            }
-            break;
-            case 'MatrixActions.Room.tags': {
-                if (!logicallyReady) break;
-                // TODO: Figure out which rooms changed in the tag and only change those.
-                // This is very blunt and wipes out the sticky room stuff
-                this._generateInitialRoomLists();
-            }
-            break;
-            case 'MatrixActions.Room.timeline': {
-                if (!logicallyReady ||
-                    !payload.isLiveEvent ||
-                    !payload.isLiveUnfilteredRoomTimelineEvent ||
-                    !this._eventTriggersRecentReorder(payload.event) ||
-                    this._state.algorithm !== ALGO_RECENT
-                ) {
-                    break;
-                }
-
-                this._roomUpdateTriggered(payload.event.getRoomId());
-            }
-            break;
-            // When an event is decrypted, it could mean we need to reorder the room
-            // list because we now know the type of the event.
-            case 'MatrixActions.Event.decrypted': {
-                if (!logicallyReady) break;
-
-                const roomId = payload.event.getRoomId();
-
-                // We may have decrypted an event without a roomId (e.g to_device)
-                if (!roomId) break;
-
-                const room = this._matrixClient.getRoom(roomId);
-
-                // We somehow decrypted an event for a room our client is unaware of
-                if (!room) break;
-
-                const liveTimeline = room.getLiveTimeline();
-                const eventTimeline = room.getTimelineForEvent(payload.event.getId());
-
-                // Either this event was not added to the live timeline (e.g. pagination)
-                // or it doesn't affect the ordering of the room list.
-                if (liveTimeline !== eventTimeline || !this._eventTriggersRecentReorder(payload.event)) {
-                    break;
-                }
-
-                this._roomUpdateTriggered(roomId);
-            }
-            break;
-            case 'MatrixActions.accountData': {
-                if (!logicallyReady) break;
-                if (payload.event_type !== 'm.direct') break;
-                // TODO: Figure out which rooms changed in the direct chat and only change those.
-                // This is very blunt and wipes out the sticky room stuff
-                this._generateInitialRoomLists();
-            }
-            break;
-            case 'MatrixActions.Room.myMembership': {
-                if (!logicallyReady) break;
-                this._roomUpdateTriggered(payload.room.roomId, true);
-            }
-            break;
-            // This could be a new room that we've been invited to, joined or created
-            // we won't get a RoomMember.membership for these cases if we're not already
-            // a member.
-            case 'MatrixActions.Room': {
-                if (!logicallyReady) break;
-                this._roomUpdateTriggered(payload.room.roomId, true);
-            }
-            break;
-            // TODO: Re-enable optimistic updates when we support dragging again
-            // case 'RoomListActions.tagRoom.pending': {
-            //     if (!logicallyReady) break;
-            //     // XXX: we only show one optimistic update at any one time.
-            //     // Ideally we should be making a list of in-flight requests
-            //     // that are backed by transaction IDs. Until the js-sdk
-            //     // supports this, we're stuck with only being able to use
-            //     // the most recent optimistic update.
-            //     console.log("!! Optimistic tag: ", payload);
-            // }
-            // break;
-            // case 'RoomListActions.tagRoom.failure': {
-            //     if (!logicallyReady) break;
-            //     // Reset state according to js-sdk
-            //     console.log("!! Optimistic tag failure: ", payload);
-            // }
-            // break;
-            case 'on_client_not_viable':
-            case 'on_logged_out': {
-                // Reset state without pushing an update to the view, which generally assumes that
-                // the matrix client isn't `null` and so causing a re-render will cause NPEs.
-                this._init();
-                this._matrixClient = null;
-            }
-            break;
-            case 'view_room': {
-                if (!logicallyReady) break;
-
-                // Note: it is important that we set a new stickyRoomId before setting the old room
-                // to IDLE. If we don't, the wrong room gets counted as sticky.
-                const currentStickyId = this._state.stickyRoomId;
-                this._setState({stickyRoomId: payload.room_id});
-                if (currentStickyId) {
-                    this._setRoomCategory(this._matrixClient.getRoom(currentStickyId), CATEGORY_IDLE);
-                }
-            }
-            break;
-        }
-    }
-
-    _roomUpdateTriggered(roomId, ignoreSticky) {
-        // We don't calculate categories for sticky rooms because we have a moderate
-        // interest in trying to maintain the category that they were last in before
-        // being artificially flagged as IDLE. Also, this reduces the amount of time
-        // we spend in _setRoomCategory ever so slightly.
-        if (this._state.stickyRoomId !== roomId || ignoreSticky) {
-            // Micro optimization: Only look up the room if we're confident we'll need it.
-            const room = this._matrixClient.getRoom(roomId);
-            if (!room) return;
-
-            const category = this._calculateCategory(room);
-            this._setRoomCategory(room, category);
-        }
-    }
-
-    _filterTags(tags) {
-        tags = tags ? Object.keys(tags) : [];
-        if (this._state.tagsEnabled) return tags;
-        return tags.filter((t) => knownLists.has(t));
-    }
-
-    _getRecommendedTagsForRoom(room) {
-        const tags = [];
-
-        const myMembership = room.getMyMembership();
-        if (myMembership === 'join' || myMembership === 'invite') {
-            // Stack the user's tags on top
-            tags.push(...this._filterTags(room.tags));
-
-            // Order matters here: The DMRoomMap updates before invites
-            // are accepted, so we check to see if the room is an invite
-            // first, then if it is a direct chat, and finally default
-            // to the "recents" list.
-            const dmRoomMap = DMRoomMap.shared();
-            if (myMembership === 'invite') {
-                tags.push("im.vector.fake.invite");
-            } else if (dmRoomMap.getUserIdForRoomId(room.roomId) && tags.length === 0) {
-                // We intentionally don't duplicate rooms in other tags into the people list
-                // as a feature.
-                tags.push(TAG_DM);
-            } else if (tags.length === 0) {
-                tags.push("im.vector.fake.recent");
-            }
-        } else if (myMembership) { // null-guard as null means it was peeked
-            tags.push("im.vector.fake.archived");
-        }
-
-
-        return tags;
-    }
-
-    _slotRoomIntoList(room, category, tag, existingEntries, newList, lastTimestampFn) {
-        const targetCategoryIndex = CATEGORY_ORDER.indexOf(category);
-
-        let categoryComparator = (a, b) => lastTimestampFn(a.room) >= lastTimestampFn(b.room);
-        const sortAlgorithm = getListAlgorithm(tag, this._state.algorithm);
-        if (sortAlgorithm === ALGO_RECENT) {
-            categoryComparator = (a, b) => this._recentsComparator(a, b, lastTimestampFn);
-        } else if (sortAlgorithm === ALGO_ALPHABETIC) {
-            categoryComparator = (a, b) => this._lexicographicalComparator(a, b);
-        }
-
-        // The slotting algorithm works by trying to position the room in the most relevant
-        // category of the list (red > grey > etc). To accomplish this, we need to consider
-        // a couple cases: the category existing in the list but having other rooms in it and
-        // the case of the category simply not existing and needing to be started. In order to
-        // do this efficiently, we only want to iterate over the list once and solve our sorting
-        // problem as we go.
-        //
-        // Firstly, we'll remove any existing entry that references the room we're trying to
-        // insert. We don't really want to consider the old entry and want to recreate it. We
-        // also exclude the sticky (currently active) room from the categorization logic and
-        // let it pass through wherever it resides in the list: it shouldn't be moving around
-        // the list too much, so we want to keep it where it is.
-        //
-        // The case of the category we want existing is easy to handle: once we hit the category,
-        // find the room that has a most recent event later than our own and insert just before
-        // that (making us the more recent room). If we end up hitting the next category before
-        // we can slot the room in, insert the room at the top of the category as a fallback. We
-        // do this to ensure that the room doesn't go too far down the list given it was previously
-        // considered important (in the case of going down in category) or is now more important
-        // (suddenly becoming red, for instance). The boundary tracking is how we end up achieving
-        // this, as described in the next paragraphs.
-        //
-        // The other case of the category not already existing is a bit more complicated. We track
-        // the boundaries of each category relative to the list we're currently building so that
-        // when we miss the category we can insert the room at the right spot. Most importantly, we
-        // can't assume that the end of the list being built is the right spot because of the last
-        // paragraph's requirement: the room should be put to the top of a category if the category
-        // runs out of places to put it.
-        //
-        // All told, our tracking looks something like this:
-        //
-        // ------ A <- Category boundary (start of red)
-        //  RED
-        //  RED
-        //  RED
-        // ------ B <- In this example, we have a grey room we want to insert.
-        //  BOLD
-        //  BOLD
-        // ------ C
-        //  IDLE
-        //  IDLE
-        // ------ D <- End of list
-        //
-        // Given that example, and our desire to insert a GREY room into the list, this iterates
-        // over the room list until it realizes that BOLD comes after GREY and we're no longer
-        // in the RED section. Because there's no rooms there, we simply insert there which is
-        // also a "category boundary". If we change the example to wanting to insert a BOLD room
-        // which can't be ordered by timestamp with the existing couple rooms, we would still make
-        // use of the boundary flag to insert at B before changing the boundary indicator to C.
-
-        let desiredCategoryBoundaryIndex = 0;
-        let foundBoundary = false;
-        let pushedEntry = false;
-
-        for (const entry of existingEntries) {
-            // We insert our own record as needed, so don't let the old one through.
-            if (entry.room.roomId === room.roomId) {
-                continue;
-            }
-
-            // if the list is a recent list, and the room appears in this list, and we're
-            // not looking at a sticky room (sticky rooms have unreliable categories), try
-            // to slot the new room in
-            if (entry.room.roomId !== this._state.stickyRoomId && !pushedEntry) {
-                const entryCategoryIndex = CATEGORY_ORDER.indexOf(entry.category);
-
-                // As per above, check if we're meeting that boundary we wanted to locate.
-                if (entryCategoryIndex >= targetCategoryIndex && !foundBoundary) {
-                    desiredCategoryBoundaryIndex = newList.length - 1;
-                    foundBoundary = true;
-                }
-
-                // If we've hit the top of a boundary beyond our target category, insert at the top of
-                // the grouping to ensure the room isn't slotted incorrectly. Otherwise, try to insert
-                // based on most recent timestamp.
-                const changedBoundary = entryCategoryIndex > targetCategoryIndex;
-                const currentCategory = entryCategoryIndex === targetCategoryIndex;
-                if (changedBoundary || (currentCategory && categoryComparator({room}, entry) <= 0)) {
-                    if (changedBoundary) {
-                        // If we changed a boundary, then we've gone too far - go to the top of the last
-                        // section instead.
-                        newList.splice(desiredCategoryBoundaryIndex, 0, {room, category});
-                    } else {
-                        // If we're ordering by timestamp, just insert normally
-                        newList.push({room, category});
-                    }
-                    pushedEntry = true;
-                }
-            }
-
-            // Fall through and clone the list.
-            newList.push(entry);
-        }
-
-        if (!pushedEntry && desiredCategoryBoundaryIndex >= 0) {
-            console.warn(`!! Room ${room.roomId} nearly lost: Ran off the end of ${tag}`);
-            console.warn(`!! Inserting at position ${desiredCategoryBoundaryIndex} with category ${category}`);
-            newList.splice(desiredCategoryBoundaryIndex, 0, {room, category});
-            pushedEntry = true;
-        }
-
-        return pushedEntry;
-    }
-
-    _setRoomCategory(room, category) {
-        if (!room) return; // This should only happen in tests
-
-        const listsClone = {};
-
-        // Micro optimization: Support lazily loading the last timestamp in a room
-        const timestampCache = {}; // {roomId => ts}
-        const lastTimestamp = (room) => {
-            if (!timestampCache[room.roomId]) {
-                timestampCache[room.roomId] = this._tsOfNewestEvent(room);
-            }
-            return timestampCache[room.roomId];
-        };
-        const targetTags = this._getRecommendedTagsForRoom(room);
-        const insertedIntoTags = [];
-
-        // We need to make sure all the tags (lists) are updated with the room's new position. We
-        // generally only get called here when there's a new room to insert or a room has potentially
-        // changed positions within the list.
-        //
-        // We do all our checks by iterating over the rooms in the existing lists, trying to insert
-        // our room where we can. As a guiding principle, we should be removing the room from all
-        // tags, and insert the room into targetTags. We should perform the deletion before the addition
-        // where possible to keep a consistent state. By the end of this, targetTags should be the
-        // same as insertedIntoTags.
-
-        for (const key of Object.keys(this._state.lists)) {
-            const shouldHaveRoom = targetTags.includes(key);
-
-            // Speed optimization: Don't do complicated math if we don't have to.
-            if (!shouldHaveRoom) {
-                listsClone[key] = this._state.lists[key].filter((e) => e.room.roomId !== room.roomId);
-            } else if (getListAlgorithm(key, this._state.algorithm) === ALGO_MANUAL) {
-                // Manually ordered tags are sorted later, so for now we'll just clone the tag
-                // and add our room if needed
-                listsClone[key] = this._state.lists[key].filter((e) => e.room.roomId !== room.roomId);
-                listsClone[key].push({room, category});
-                insertedIntoTags.push(key);
-            } else {
-                listsClone[key] = [];
-
-                const pushedEntry = this._slotRoomIntoList(
-                    room, category, key, this._state.lists[key], listsClone[key], lastTimestamp);
-
-                if (!pushedEntry) {
-                    // This should rarely happen: _slotRoomIntoList has several checks which attempt
-                    // to make sure that a room is not lost in the list. If we do lose the room though,
-                    // we shouldn't throw it on the floor and forget about it. Instead, we should insert
-                    // it somewhere. We'll insert it at the top for a couple reasons: 1) it is probably
-                    // an important room for the user and 2) if this does happen, we'd want a bug report.
-                    console.warn(`!! Room ${room.roomId} nearly lost: Failed to find a position`);
-                    console.warn(`!! Inserting at position 0 in the list and flagging as inserted`);
-                    console.warn("!! Additional info: ", {
-                       category,
-                       key,
-                       upToIndex: listsClone[key].length,
-                       expectedCount: this._state.lists[key].length,
-                    });
-                    listsClone[key].splice(0, 0, {room, category});
-                }
-                insertedIntoTags.push(key);
-            }
-        }
-
-        // Double check that we inserted the room in the right places.
-        // There should never be a discrepancy.
-        for (const targetTag of targetTags) {
-            let count = 0;
-            for (const insertedTag of insertedIntoTags) {
-                if (insertedTag === targetTag) count++;
-            }
-
-            if (count !== 1) {
-                console.warn(`!! Room ${room.roomId} inserted ${count} times to ${targetTag}`);
-            }
-
-            // This is a workaround for https://github.com/vector-im/riot-web/issues/11303
-            // The logging is to try and identify what happened exactly.
-            if (count === 0) {
-                // Something went very badly wrong - try to recover the room.
-                // We don't bother checking how the target list is ordered - we're expecting
-                // to just insert it.
-                console.warn(`!! Recovering ${room.roomId} for tag ${targetTag} at position 0`);
-                if (!listsClone[targetTag]) {
-                    console.warn(`!! List for tag ${targetTag} does not exist - creating`);
-                    listsClone[targetTag] = [];
-                }
-                listsClone[targetTag].splice(0, 0, {room, category});
-            }
-        }
-
-        // Sort the favourites before we set the clone
-        for (const tag of Object.keys(listsClone)) {
-            if (getListAlgorithm(tag, this._state.algorithm) !== ALGO_MANUAL) continue; // skip recents (pre-sorted)
-            listsClone[tag].sort(this._getManualComparator(tag));
-        }
-
-        this._setState({lists: listsClone});
-    }
-
-    _generateInitialRoomLists() {
-        // Log something to show that we're throwing away the old results. This is for the inevitable
-        // question of "why is 100% of my CPU going towards Riot?" - a quick look at the logs would reveal
-        // that something is wrong with the RoomListStore.
-        console.log("Generating initial room lists");
-
-        const lists = {
-            "m.server_notice": [],
-            "im.vector.fake.invite": [],
-            "m.favourite": [],
-            "im.vector.fake.recent": [],
-            [TAG_DM]: [],
-            "m.lowpriority": [],
-            "im.vector.fake.archived": [],
-        };
-
-        const dmRoomMap = DMRoomMap.shared();
-
-        this._matrixClient.getRooms().forEach((room) => {
-            const myUserId = this._matrixClient.getUserId();
-            const membership = room.getMyMembership();
-            const me = room.getMember(myUserId);
-
-            if (membership === "invite") {
-                lists["im.vector.fake.invite"].push({room, category: CATEGORY_RED});
-            } else if (membership === "join" || membership === "ban" || (me && me.isKicked())) {
-                // Used to split rooms via tags
-                let tagNames = Object.keys(room.tags);
-
-                // ignore any m. tag names we don't know about
-                tagNames = tagNames.filter((t) => {
-                    // Speed optimization: Avoid hitting the SettingsStore at all costs by making it the
-                    // last condition possible.
-                    return lists[t] !== undefined || (!t.startsWith('m.') && this._state.tagsEnabled);
-                });
-
-                if (tagNames.length) {
-                    for (let i = 0; i < tagNames.length; i++) {
-                        const tagName = tagNames[i];
-                        lists[tagName] = lists[tagName] || [];
-
-                        // Default to an arbitrary category for tags which aren't ordered by recents
-                        let category = CATEGORY_IDLE;
-                        if (getListAlgorithm(tagName, this._state.algorithm) !== ALGO_MANUAL) {
-                            category = this._calculateCategory(room);
-                        }
-                        lists[tagName].push({room, category});
-                    }
-                } else if (dmRoomMap.getUserIdForRoomId(room.roomId)) {
-                    // "Direct Message" rooms (that we're still in and that aren't otherwise tagged)
-                    lists[TAG_DM].push({room, category: this._calculateCategory(room)});
-                } else {
-                    lists["im.vector.fake.recent"].push({room, category: this._calculateCategory(room)});
-                }
-            } else if (membership === "leave") {
-                // The category of these rooms is not super important, so deprioritize it to the lowest
-                // possible value.
-                lists["im.vector.fake.archived"].push({room, category: CATEGORY_IDLE});
-            }
-        });
-
-        // We use this cache in the recents comparator because _tsOfNewestEvent can take a while. This
-        // cache only needs to survive the sort operation below and should not be implemented outside
-        // of this function, otherwise the room lists will almost certainly be out of date and wrong.
-        const latestEventTsCache = {}; // roomId => timestamp
-        const tsOfNewestEventFn = (room) => {
-            if (!room) return Number.MAX_SAFE_INTEGER; // Should only happen in tests
-
-            if (latestEventTsCache[room.roomId]) {
-                return latestEventTsCache[room.roomId];
-            }
-
-            const ts = this._tsOfNewestEvent(room);
-            latestEventTsCache[room.roomId] = ts;
-            return ts;
-        };
-
-        Object.keys(lists).forEach((listKey) => {
-            let comparator;
-            switch (getListAlgorithm(listKey, this._state.algorithm)) {
-                case ALGO_RECENT:
-                    comparator = (entryA, entryB) => this._recentsComparator(entryA, entryB, tsOfNewestEventFn);
-                    break;
-                case ALGO_ALPHABETIC:
-                    comparator = this._lexicographicalComparator;
-                    break;
-                case ALGO_MANUAL:
-                default:
-                    comparator = this._getManualComparator(listKey);
-                    break;
-            }
-
-            if (this._state.orderImportantFirst) {
-                lists[listKey].sort((entryA, entryB) => {
-                    if (entryA.category !== entryB.category) {
-                        const idxA = CATEGORY_ORDER.indexOf(entryA.category);
-                        const idxB = CATEGORY_ORDER.indexOf(entryB.category);
-                        if (idxA > idxB) return 1;
-                        if (idxA < idxB) return -1;
-                        return 0; // Technically not possible
-                    }
-                    return comparator(entryA, entryB);
-                });
-            } else {
-                // skip the category comparison even though it should no-op when orderImportantFirst disabled
-                lists[listKey].sort(comparator);
-            }
-        });
-
-        this._setState({
-            lists,
-            ready: true, // Ready to receive updates to ordering
-        });
-    }
-
-    _eventTriggersRecentReorder(ev) {
-        return ev.getTs() && (
-            Unread.eventTriggersUnreadCount(ev) ||
-            ev.getSender() === this._matrixClient.credentials.userId
-        );
-    }
-
-    _tsOfNewestEvent(room) {
-        // Apparently we can have rooms without timelines, at least under testing
-        // environments. Just return MAX_INT when this happens.
-        if (!room || !room.timeline) return Number.MAX_SAFE_INTEGER;
-
-        for (let i = room.timeline.length - 1; i >= 0; --i) {
-            const ev = room.timeline[i];
-            if (this._eventTriggersRecentReorder(ev)) {
-                return ev.getTs();
-            }
-        }
-
-        // we might only have events that don't trigger the unread indicator,
-        // in which case use the oldest event even if normally it wouldn't count.
-        // This is better than just assuming the last event was forever ago.
-        if (room.timeline.length && room.timeline[0].getTs()) {
-            return room.timeline[0].getTs();
-        } else {
-            return Number.MAX_SAFE_INTEGER;
-        }
-    }
-
-    _calculateCategory(room) {
-        if (!this._state.orderImportantFirst) {
-            // Effectively disable the categorization of rooms if we're supposed to
-            // be sorting by more recent messages first. This triggers the timestamp
-            // comparison bit of _setRoomCategory and _recentsComparator instead of
-            // the category ordering.
-            return CATEGORY_IDLE;
-        }
-
-        const mentions = room.getUnreadNotificationCount("highlight") > 0;
-        if (mentions) return CATEGORY_RED;
-
-        let unread = room.getUnreadNotificationCount() > 0;
-        if (unread) return CATEGORY_GREY;
-
-        unread = Unread.doesRoomHaveUnreadMessages(room);
-        if (unread) return CATEGORY_BOLD;
-
-        return CATEGORY_IDLE;
-    }
-
-    _recentsComparator(entryA, entryB, tsOfNewestEventFn) {
-        const timestampA = tsOfNewestEventFn(entryA.room);
-        const timestampB = tsOfNewestEventFn(entryB.room);
-        return timestampB - timestampA;
-    }
-
-    _lexicographicalComparator(entryA, entryB) {
-        return entryA.room.name.localeCompare(entryB.room.name);
-    }
-
-    _getManualComparator(tagName, optimisticRequest) {
-        return (entryA, entryB) => {
-            const roomA = entryA.room;
-            const roomB = entryB.room;
-
-            let metaA = roomA.tags[tagName];
-            let metaB = roomB.tags[tagName];
-
-            if (optimisticRequest && roomA === optimisticRequest.room) metaA = optimisticRequest.metaData;
-            if (optimisticRequest && roomB === optimisticRequest.room) metaB = optimisticRequest.metaData;
-
-            // Make sure the room tag has an order element, if not set it to be the bottom
-            const a = metaA ? Number(metaA.order) : undefined;
-            const b = metaB ? Number(metaB.order) : undefined;
-
-            // Order undefined room tag orders to the bottom
-            if (a === undefined && b !== undefined) {
-                return 1;
-            } else if (a !== undefined && b === undefined) {
-                return -1;
-            }
-
-            return a === b ? this._lexicographicalComparator(entryA, entryB) : (a > b ? 1 : -1);
-        };
-    }
-
-    getRoomLists() {
-        return this._state.presentationLists;
-    }
-}
-
-if (global.singletonRoomListStore === undefined) {
-    global.singletonRoomListStore = new RoomListStore();
-}
-export default global.singletonRoomListStore;
diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.tsx
similarity index 73%
rename from src/stores/RoomViewStore.js
rename to src/stores/RoomViewStore.tsx
index 841734dfb7..a0f0fb8f68 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.tsx
@@ -15,13 +15,17 @@ 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 dis from '../dispatcher';
+
+import React from "react";
 import {Store} from 'flux/utils';
+
+import dis from '../dispatcher/dispatcher';
 import {MatrixClientPeg} from '../MatrixClientPeg';
 import * as sdk from '../index';
 import Modal from '../Modal';
 import { _t } from '../languageHandler';
 import { getCachedRoomIDForAlias, storeRoomAliasInCache } from '../RoomAliasCache';
+import {ActionPayload} from "../dispatcher/payloads";
 
 const INITIAL_STATE = {
     // Whether we're joining the currently viewed room (see isJoining())
@@ -33,6 +37,7 @@ const INITIAL_STATE = {
 
     // The event to scroll to when the room is first viewed
     initialEventId: null,
+    initialEventPixelOffset: null,
     // Whether to highlight the initial event
     isInitialEventHighlighted: false,
 
@@ -46,7 +51,10 @@ const INITIAL_STATE = {
     forwardingEvent: null,
 
     quotingEvent: null,
-    matrixClientIsReady: false,
+
+    replyingToEvent: null,
+
+    shouldPeek: false,
 };
 
 /**
@@ -54,24 +62,20 @@ const INITIAL_STATE = {
 *  with a subset of the js-sdk.
  *  ```
  */
-class RoomViewStore extends Store {
+class RoomViewStore extends Store<ActionPayload> {
+    private state = INITIAL_STATE; // initialize state
+
     constructor() {
         super(dis);
-
-        // Initialise state
-        this._state = INITIAL_STATE;
-        if (MatrixClientPeg.get()) {
-            this._state.matrixClientIsReady = MatrixClientPeg.get().isInitialSyncComplete();
-        }
     }
 
-    _setState(newState) {
+    setState(newState: Partial<typeof INITIAL_STATE>) {
         // If values haven't changed, there's nothing to do.
         // This only tries a shallow comparison, so unchanged objects will slip
         // through, but that's probably okay for now.
         let stateChanged = false;
         for (const key of Object.keys(newState)) {
-            if (this._state[key] !== newState[key]) {
+            if (this.state[key] !== newState[key]) {
                 stateChanged = true;
                 break;
             }
@@ -80,7 +84,7 @@ class RoomViewStore extends Store {
             return;
         }
 
-        this._state = Object.assign(this._state, newState);
+        this.state = Object.assign(this.state, newState);
         this.__emitChange();
     }
 
@@ -93,59 +97,63 @@ class RoomViewStore extends Store {
             //      - event_offset: 100
             //      - highlighted:  true
             case 'view_room':
-                this._viewRoom(payload);
+                this.viewRoom(payload);
                 break;
+            // for these events blank out the roomId as we are no longer in the RoomView
+            case 'view_create_group':
+            case 'view_welcome_page':
+            case 'view_home_page':
             case 'view_my_groups':
             case 'view_group':
-                this._setState({
+                this.setState({
                     roomId: null,
                     roomAlias: null,
                 });
                 break;
             case 'view_room_error':
-                this._viewRoomError(payload);
+                this.viewRoomError(payload);
                 break;
             case 'will_join':
-                this._setState({
+                this.setState({
                     joining: true,
                 });
                 break;
             case 'cancel_join':
-                this._setState({
+                this.setState({
                     joining: false,
                 });
                 break;
             // join_room:
             //      - opts: options for joinRoom
             case 'join_room':
-                this._joinRoom(payload);
+                this.joinRoom(payload);
                 break;
             case 'join_room_error':
-                this._joinRoomError(payload);
+                this.joinRoomError(payload);
                 break;
             case 'join_room_ready':
-                this._setState({ shouldPeek: false });
+                this.setState({ shouldPeek: false });
                 break;
             case 'on_client_not_viable':
             case 'on_logged_out':
                 this.reset();
                 break;
             case 'forward_event':
-                this._setState({
+                this.setState({
                     forwardingEvent: payload.event,
                 });
                 break;
             case 'reply_to_event':
                 // If currently viewed room does not match the room in which we wish to reply then change rooms
                 // this can happen when performing a search across all rooms
-                if (payload.event && payload.event.getRoomId() !== this._state.roomId) {
+                if (payload.event && payload.event.getRoomId() !== this.state.roomId) {
                     dis.dispatch({
                         action: 'view_room',
                         room_id: payload.event.getRoomId(),
                         replyingToEvent: payload.event,
                     });
                 } else {
-                    this._setState({
+                    this.setState({
                         replyingToEvent: payload.event,
                     });
                 }
@@ -153,19 +161,14 @@ class RoomViewStore extends Store {
             case 'open_room_settings': {
                 const RoomSettingsDialog = sdk.getComponent("dialogs.RoomSettingsDialog");
                 Modal.createTrackedDialog('Room settings', '', RoomSettingsDialog, {
-                    roomId: payload.room_id || this._state.roomId,
+                    roomId: payload.room_id || this.state.roomId,
                 }, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
                 break;
             }
-            case 'sync_state':
-                this._setState({
-                    matrixClientIsReady: MatrixClientPeg.get() && MatrixClientPeg.get().isInitialSyncComplete(),
-                });
-                break;
         }
     }
 
-    async _viewRoom(payload) {
+    private async viewRoom(payload: ActionPayload) {
         if (payload.room_id) {
             const newState = {
                 roomId: payload.room_id,
@@ -190,18 +193,18 @@ class RoomViewStore extends Store {
                 newState.replyingToEvent = payload.replyingToEvent;
             }
 
-            if (this._state.forwardingEvent) {
+            if (this.state.forwardingEvent) {
                 dis.dispatch({
                     action: 'send_event',
                     room_id: newState.roomId,
-                    event: this._state.forwardingEvent,
+                    event: this.state.forwardingEvent,
                 });
             }
 
-            this._setState(newState);
+            this.setState(newState);
 
             if (payload.auto_join) {
-                this._joinRoom(payload);
+                this.joinRoom(payload);
             }
         } else if (payload.room_alias) {
             // Try the room alias to room ID navigation cache first to avoid
@@ -210,7 +213,7 @@ class RoomViewStore extends Store {
             if (!roomId) {
                 // Room alias cache miss, so let's ask the homeserver. Resolve the alias
                 // and then do a second dispatch with the room ID acquired.
-                this._setState({
+                this.setState({
                     roomId: null,
                     initialEventId: null,
                     initialEventPixelOffset: null,
@@ -224,6 +227,7 @@ class RoomViewStore extends Store {
                     storeRoomAliasInCache(payload.room_alias, result.room_id);
                     roomId = result.room_id;
                 } catch (err) {
+                    console.error("RVS failed to get room id for alias: ", err);
                     dis.dispatch({
                         action: 'view_room_error',
                         room_id: null,
@@ -246,8 +250,8 @@ class RoomViewStore extends Store {
         }
     }
 
-    _viewRoomError(payload) {
-        this._setState({
+    private viewRoomError(payload: ActionPayload) {
+        this.setState({
             roomId: payload.room_id,
             roomAlias: payload.room_alias,
             roomLoading: false,
@@ -255,12 +259,12 @@ class RoomViewStore extends Store {
         });
     }
 
-    _joinRoom(payload) {
-        this._setState({
+    private joinRoom(payload: ActionPayload) {
+        this.setState({
             joining: true,
         });
         MatrixClientPeg.get().joinRoom(
-            this._state.roomAlias || this._state.roomId, payload.opts,
+            this.state.roomAlias || this.state.roomId, payload.opts,
         ).then(() => {
             // 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
@@ -272,16 +276,25 @@ class RoomViewStore extends Store {
                 err: err,
             });
             let msg = err.message ? err.message : JSON.stringify(err);
-            // XXX: We are relying on the error message returned by browsers here.
-            // This isn't great, but it does generalize the error being shown to users.
-            if (msg && msg.startsWith("CORS request rejected")) {
+            console.log("Failed to join room:", msg);
+            if (err.name === "ConnectionError") {
                 msg = _t("There was an error joining the room");
-            }
-            if (err.errcode === 'M_INCOMPATIBLE_ROOM_VERSION') {
+            } else if (err.errcode === 'M_INCOMPATIBLE_ROOM_VERSION') {
                 msg = <div>
                     {_t("Sorry, your homeserver is too old to participate in this room.")}<br />
                     {_t("Please contact your homeserver administrator.")}
                 </div>;
+            } else if (err.httpStatus === 404) {
+                const invitingUserId = this.getInvitingUserId(this.state.roomId);
+                // only provide a better error message for invites
+                if (invitingUserId) {
+                    // if the inviting user is on the same HS, there can only be one cause: they left.
+                    if (invitingUserId.endsWith(`:${MatrixClientPeg.get().getDomain()}`)) {
+                        msg = _t("The person who invited you already left the room.");
+                    } else {
+                        msg = _t("The person who invited you already left the room, or their server is offline.");
+                    }
+                }
             }
             const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Failed to join room', '', ErrorDialog, {
@@ -291,45 +304,55 @@ class RoomViewStore extends Store {
         });
     }
 
-    _joinRoomError(payload) {
-        this._setState({
+    private getInvitingUserId(roomId: string): string {
+        const cli = MatrixClientPeg.get();
+        const room = cli.getRoom(roomId);
+        if (room && room.getMyMembership() === "invite") {
+            const myMember = room.getMember(cli.getUserId());
+            const inviteEvent = myMember ? myMember.events.member : null;
+            return inviteEvent && inviteEvent.getSender();
+        }
+    }
+
+    private joinRoomError(payload: ActionPayload) {
+        this.setState({
             joining: false,
             joinError: payload.err,
         });
     }
 
-    reset() {
-        this._state = Object.assign({}, INITIAL_STATE);
+    public reset() {
+        this.state = Object.assign({}, INITIAL_STATE);
     }
 
     // The room ID of the room currently being viewed
-    getRoomId() {
-        return this._state.roomId;
+    public getRoomId() {
+        return this.state.roomId;
     }
 
     // The event to scroll to when the room is first viewed
-    getInitialEventId() {
-        return this._state.initialEventId;
+    public getInitialEventId() {
+        return this.state.initialEventId;
     }
 
     // Whether to highlight the initial event
-    isInitialEventHighlighted() {
-        return this._state.isInitialEventHighlighted;
+    public isInitialEventHighlighted() {
+        return this.state.isInitialEventHighlighted;
     }
 
     // The room alias of the room (or null if not originally specified in view_room)
-    getRoomAlias() {
-        return this._state.roomAlias;
+    public getRoomAlias() {
+        return this.state.roomAlias;
     }
 
     // Whether the current room is loading (true whilst resolving an alias)
-    isRoomLoading() {
-        return this._state.roomLoading;
+    public isRoomLoading() {
+        return this.state.roomLoading;
     }
 
     // Any error that has occurred during loading
-    getRoomLoadError() {
-        return this._state.roomLoadError;
+    public getRoomLoadError() {
+        return this.state.roomLoadError;
     }
 
     // True if we're expecting the user to be joined to the room currently being
@@ -355,27 +378,27 @@ class RoomViewStore extends Store {
     //         // show join prompt
     //     }
     // }
-    isJoining() {
-        return this._state.joining;
+    public isJoining() {
+        return this.state.joining;
     }
 
     // Any error that has occurred during joining
-    getJoinError() {
-        return this._state.joinError;
+    public getJoinError() {
+        return this.state.joinError;
     }
 
     // The mxEvent if one is about to be forwarded
-    getForwardingEvent() {
-        return this._state.forwardingEvent;
+    public getForwardingEvent() {
+        return this.state.forwardingEvent;
     }
 
     // The mxEvent if one is currently being replied to/quoted
-    getQuotingEvent() {
-        return this._state.replyingToEvent;
+    public getQuotingEvent() {
+        return this.state.replyingToEvent;
     }
 
-    shouldPeek() {
-        return this._state.shouldPeek && this._state.matrixClientIsReady;
+    public shouldPeek() {
+        return this.state.shouldPeek;
     }
 }
 
diff --git a/src/stores/SessionStore.js b/src/stores/SessionStore.js
index f38bc046d0..096811940c 100644
--- a/src/stores/SessionStore.js
+++ b/src/stores/SessionStore.js
@@ -14,7 +14,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 dis from '../dispatcher';
+import dis from '../dispatcher/dispatcher';
 import {Store} from 'flux/utils';
 
 const INITIAL_STATE = {
diff --git a/src/stores/SetupEncryptionStore.js b/src/stores/SetupEncryptionStore.js
index cbbbefb129..63b8c428eb 100644
--- a/src/stores/SetupEncryptionStore.js
+++ b/src/stores/SetupEncryptionStore.js
@@ -17,6 +17,7 @@ limitations under the License.
 import EventEmitter from 'events';
 import { MatrixClientPeg } from '../MatrixClientPeg';
 import { accessSecretStorage, AccessCancelledError } from '../CrossSigningManager';
+import { PHASE_DONE as VERIF_PHASE_DONE } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 
 export const PHASE_INTRO = 0;
 export const PHASE_BUSY = 1;
@@ -35,10 +36,28 @@ export class SetupEncryptionStore extends EventEmitter {
             return;
         }
         this._started = true;
-        this.phase = PHASE_INTRO;
+        this.phase = PHASE_BUSY;
         this.verificationRequest = null;
         this.backupInfo = null;
-        MatrixClientPeg.get().on("crypto.verification.request", this.onVerificationRequest);
+
+        // ID of the key that the secrets we want are encrypted with
+        this.keyId = null;
+        // Descriptor of the key that the secrets we want are encrypted with
+        this.keyInfo = null;
+
+        const cli = MatrixClientPeg.get();
+        cli.on("crypto.verification.request", this.onVerificationRequest);
+        cli.on('userTrustStatusChanged', this._onUserTrustStatusChanged);
+
+        const requestsInProgress = cli.getVerificationRequestsToDeviceInProgress(cli.getUserId());
+        if (requestsInProgress.length) {
+            // If there are multiple, we take the most recent. Equally if the user sends another request from
+            // another device after this screen has been shown, we'll switch to the new one, so this
+            // generally doesn't support multiple requests.
+            this._setActiveVerificationRequest(requestsInProgress[requestsInProgress.length - 1]);
+        }
+
+        this.fetchKeyInfo();
     }
 
     stop() {
@@ -51,9 +70,25 @@ export class SetupEncryptionStore extends EventEmitter {
         }
         if (MatrixClientPeg.get()) {
             MatrixClientPeg.get().removeListener("crypto.verification.request", this.onVerificationRequest);
+            MatrixClientPeg.get().removeListener('userTrustStatusChanged', this._onUserTrustStatusChanged);
         }
     }
 
+    async fetchKeyInfo() {
+        const keys = await MatrixClientPeg.get().isSecretStored('m.cross_signing.master', false);
+        if (keys === null || Object.keys(keys).length === 0) {
+            this.keyId = null;
+            this.keyInfo = null;
+        } else {
+            // If the secret is stored under more than one key, we just pick an arbitrary one
+            this.keyId = Object.keys(keys)[0];
+            this.keyInfo = keys[this.keyId];
+        }
+
+        this.phase = PHASE_INTRO;
+        this.emit("update");
+    }
+
     async usePassPhrase() {
         this.phase = PHASE_BUSY;
         this.emit("update");
@@ -102,23 +137,33 @@ export class SetupEncryptionStore extends EventEmitter {
         }
     }
 
-    onVerificationRequest = async (request) => {
-        if (request.otherUserId !== MatrixClientPeg.get().getUserId()) return;
-
-        if (this.verificationRequest) {
-            this.verificationRequest.off("change", this.onVerificationRequestChange);
+    _onUserTrustStatusChanged = async (userId) => {
+        if (userId !== MatrixClientPeg.get().getUserId()) return;
+        const crossSigningReady = await MatrixClientPeg.get().isCrossSigningReady();
+        if (crossSigningReady) {
+            this.phase = PHASE_DONE;
+            this.emit("update");
         }
-        this.verificationRequest = request;
-        await request.accept();
-        request.on("change", this.onVerificationRequestChange);
-        this.emit("update");
     }
 
-    onVerificationRequestChange = () => {
+    onVerificationRequest = (request) => {
+        this._setActiveVerificationRequest(request);
+    }
+
+    onVerificationRequestChange = async () => {
         if (this.verificationRequest.cancelled) {
             this.verificationRequest.off("change", this.onVerificationRequestChange);
             this.verificationRequest = null;
             this.emit("update");
+        } else if (this.verificationRequest.phase === VERIF_PHASE_DONE) {
+            this.verificationRequest.off("change", this.onVerificationRequestChange);
+            this.verificationRequest = null;
+            // At this point, the verification has finished, we just need to wait for
+            // cross signing to be ready to use, so wait for the user trust status to
+            // change (or change to DONE if it's already ready).
+            const crossSigningReady = await MatrixClientPeg.get().isCrossSigningReady();
+            this.phase = crossSigningReady ? PHASE_DONE : PHASE_BUSY;
+            this.emit("update");
         }
     }
 
@@ -143,4 +188,16 @@ export class SetupEncryptionStore extends EventEmitter {
         // async - ask other clients for keys, if necessary
         MatrixClientPeg.get()._crypto.cancelAndResendAllOutgoingKeyRequests();
     }
+
+    async _setActiveVerificationRequest(request) {
+        if (request.otherUserId !== MatrixClientPeg.get().getUserId()) return;
+
+        if (this.verificationRequest) {
+            this.verificationRequest.off("change", this.onVerificationRequestChange);
+        }
+        this.verificationRequest = request;
+        await request.accept();
+        request.on("change", this.onVerificationRequestChange);
+        this.emit("update");
+    }
 }
diff --git a/src/stores/TagOrderStore.js b/src/stores/TagOrderStore.js
index 6d03a2b289..2acf531d86 100644
--- a/src/stores/TagOrderStore.js
+++ b/src/stores/TagOrderStore.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import {Store} from 'flux/utils';
-import dis from '../dispatcher';
+import dis from '../dispatcher/dispatcher';
 import GroupStore from './GroupStore';
 import Analytics from '../Analytics';
 import * as RoomNotifs from "../RoomNotifs";
@@ -168,9 +168,16 @@ class TagOrderStore extends Store {
             }
             break;
             case 'deselect_tags':
-                this._setState({
-                    selectedTags: [],
-                });
+                if (payload.tag) {
+                    // if a tag is passed, only deselect that tag
+                    this._setState({
+                        selectedTags: this._state.selectedTags.filter(tag => tag !== payload.tag),
+                    });
+                } else {
+                    this._setState({
+                        selectedTags: [],
+                    });
+                }
                 Analytics.trackEvent('FilterStore', 'deselect_tags');
             break;
             case 'on_client_not_viable':
diff --git a/src/stores/ToastStore.js b/src/stores/ToastStore.js
deleted file mode 100644
index 8901736739..0000000000
--- a/src/stores/ToastStore.js
+++ /dev/null
@@ -1,73 +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 EventEmitter from 'events';
-
-/**
- * Holds the active toasts
- */
-export default class ToastStore extends EventEmitter {
-    static PRIORITY_REALTIME = 0;
-    static PRIORITY_DEFAULT = 1;
-    static PRIORITY_LOW = 2;
-
-    static sharedInstance() {
-        if (!global.mx_ToastStore) global.mx_ToastStore = new ToastStore();
-        return global.mx_ToastStore;
-    }
-
-    constructor() {
-        super();
-        this._dispatcherRef = null;
-        this._toasts = [];
-    }
-
-    reset() {
-        this._toasts = [];
-    }
-
-    /**
-     * Add or replace a toast
-     * If a toast with the same toastKey already exists, the given toast will replace it
-     * Toasts are always added underneath any toasts of the same priority, so existing
-     * toasts stay at the top unless a higher priority one arrives (better to not change the
-     * toast unless necessary).
-     *
-     * @param {boject} newToast The new toast
-     */
-    addOrReplaceToast(newToast) {
-        if (newToast.priority === undefined) newToast.priority = ToastStore.PRIORITY_DEFAULT;
-
-        const oldIndex = this._toasts.findIndex(t => t.key === newToast.key);
-        if (oldIndex === -1) {
-            let newIndex = this._toasts.length;
-            while (newIndex > 0 && this._toasts[newIndex - 1].priority > newToast.priority) --newIndex;
-            this._toasts.splice(newIndex, 0, newToast);
-        } else {
-            this._toasts[oldIndex] = newToast;
-        }
-        this.emit('update');
-    }
-
-    dismissToast(key) {
-        this._toasts = this._toasts.filter(t => t.key !== key);
-        this.emit('update');
-    }
-
-    getToasts() {
-        return this._toasts;
-    }
-}
diff --git a/src/stores/ToastStore.ts b/src/stores/ToastStore.ts
new file mode 100644
index 0000000000..038aebc7c9
--- /dev/null
+++ b/src/stores/ToastStore.ts
@@ -0,0 +1,94 @@
+/*
+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 EventEmitter from "events";
+import React from "react";
+import { ComponentClass } from "../@types/common";
+
+export interface IToast<C extends ComponentClass> {
+    key: string;
+    // higher priority number will be shown on top of lower priority
+    priority: number;
+    title: string;
+    icon?: string;
+    component: C;
+    props?: Omit<React.ComponentProps<C>, "toastKey">; // toastKey is injected by ToastContainer
+}
+
+/**
+ * Holds the active toasts
+ */
+export default class ToastStore extends EventEmitter {
+    private toasts: IToast<any>[] = [];
+    // The count of toasts which have been seen & dealt with in this stack
+    // where the count resets when the stack of toasts clears.
+    private countSeen = 0;
+
+    static sharedInstance() {
+        if (!window.mxToastStore) window.mxToastStore = new ToastStore();
+        return window.mxToastStore;
+    }
+
+    reset() {
+        this.toasts = [];
+        this.countSeen = 0;
+    }
+
+    /**
+     * Add or replace a toast
+     * If a toast with the same toastKey already exists, the given toast will replace it
+     * Toasts are always added underneath any toasts of the same priority, so existing
+     * toasts stay at the top unless a higher priority one arrives (better to not change the
+     * toast unless necessary).
+     *
+     * @param {object} newToast The new toast
+     */
+    addOrReplaceToast<C extends ComponentClass>(newToast: IToast<C>) {
+        const oldIndex = this.toasts.findIndex(t => t.key === newToast.key);
+        if (oldIndex === -1) {
+            let newIndex = this.toasts.length;
+            while (newIndex > 0 && this.toasts[newIndex - 1].priority < newToast.priority) --newIndex;
+            this.toasts.splice(newIndex, 0, newToast);
+        } else {
+            this.toasts[oldIndex] = newToast;
+        }
+        this.emit('update');
+    }
+
+    dismissToast(key) {
+        if (this.toasts[0] && this.toasts[0].key === key) {
+            this.countSeen++;
+        }
+
+        const length = this.toasts.length;
+        this.toasts = this.toasts.filter(t => t.key !== key);
+        if (length !== this.toasts.length) {
+            if (this.toasts.length === 0) {
+                this.countSeen = 0;
+            }
+
+            this.emit('update');
+        }
+    }
+
+    getToasts() {
+        return this.toasts;
+    }
+
+    getCountSeen() {
+        return this.countSeen;
+    }
+}
diff --git a/src/stores/local-echo/EchoChamber.ts b/src/stores/local-echo/EchoChamber.ts
new file mode 100644
index 0000000000..f61e521728
--- /dev/null
+++ b/src/stores/local-echo/EchoChamber.ts
@@ -0,0 +1,31 @@
+/*
+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 { RoomEchoChamber } from "./RoomEchoChamber";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { EchoStore } from "./EchoStore";
+
+/**
+ * Semantic access to local echo
+ */
+export class EchoChamber {
+    private constructor() {
+    }
+
+    public static forRoom(room: Room): RoomEchoChamber {
+        return EchoStore.instance.getOrCreateChamberForRoom(room);
+    }
+}
diff --git a/src/stores/local-echo/EchoContext.ts b/src/stores/local-echo/EchoContext.ts
new file mode 100644
index 0000000000..55d6e8020a
--- /dev/null
+++ b/src/stores/local-echo/EchoContext.ts
@@ -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 { EchoTransaction, RunFn, TransactionStatus } from "./EchoTransaction";
+import { arrayFastClone } from "../../utils/arrays";
+import { IDestroyable } from "../../utils/IDestroyable";
+import { Whenable } from "../../utils/Whenable";
+
+export enum ContextTransactionState {
+    NotStarted,
+    PendingErrors,
+    AllSuccessful
+}
+
+export abstract class EchoContext extends Whenable<ContextTransactionState> implements IDestroyable {
+    private _transactions: EchoTransaction[] = [];
+    private _state = ContextTransactionState.NotStarted;
+
+    public get transactions(): EchoTransaction[] {
+        return arrayFastClone(this._transactions);
+    }
+
+    public get state(): ContextTransactionState {
+        return this._state;
+    }
+
+    public get firstFailedTime(): Date {
+        const failedTxn = this.transactions.find(t => t.didPreviouslyFail || t.status === TransactionStatus.Error);
+        if (failedTxn) return failedTxn.startTime;
+        return null;
+    }
+
+    public disownTransaction(txn: EchoTransaction) {
+        const idx = this._transactions.indexOf(txn);
+        if (idx >= 0) this._transactions.splice(idx, 1);
+        txn.destroy();
+        this.checkTransactions();
+    }
+
+    public beginTransaction(auditName: string, runFn: RunFn): EchoTransaction {
+        const txn = new EchoTransaction(auditName, runFn);
+        this._transactions.push(txn);
+        txn.whenAnything(this.checkTransactions);
+
+        // We have no intent to call the transaction again if it succeeds (in fact, it'll
+        // be really angry at us if we do), so call that the end of the road for the events.
+        txn.when(TransactionStatus.Success, () => txn.destroy());
+
+        return txn;
+    }
+
+    private checkTransactions = () => {
+        let status = ContextTransactionState.AllSuccessful;
+        for (const txn of this.transactions) {
+            if (txn.status === TransactionStatus.Error || txn.didPreviouslyFail) {
+                status = ContextTransactionState.PendingErrors;
+                break;
+            } else if (txn.status === TransactionStatus.Pending) {
+                status = ContextTransactionState.NotStarted;
+                // no break as we might hit something which broke
+            }
+        }
+        this._state = status;
+        this.notifyCondition(status);
+    };
+
+    public destroy() {
+        for (const txn of this.transactions) {
+            txn.destroy();
+        }
+        this._transactions = [];
+        super.destroy();
+    }
+}
diff --git a/src/stores/local-echo/EchoStore.ts b/src/stores/local-echo/EchoStore.ts
new file mode 100644
index 0000000000..76e90be45e
--- /dev/null
+++ b/src/stores/local-echo/EchoStore.ts
@@ -0,0 +1,104 @@
+/*
+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 { GenericEchoChamber } from "./GenericEchoChamber";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { RoomEchoChamber } from "./RoomEchoChamber";
+import { RoomEchoContext } from "./RoomEchoContext";
+import { AsyncStoreWithClient } from "../AsyncStoreWithClient";
+import defaultDispatcher from "../../dispatcher/dispatcher";
+import { ActionPayload } from "../../dispatcher/payloads";
+import { ContextTransactionState, EchoContext } from "./EchoContext";
+import NonUrgentToastStore, { ToastReference } from "../NonUrgentToastStore";
+import NonUrgentEchoFailureToast from "../../components/views/toasts/NonUrgentEchoFailureToast";
+
+interface IState {
+    toastRef: ToastReference;
+}
+
+type ContextKey = string;
+
+const roomContextKey = (room: Room): ContextKey => `room-${room.roomId}`;
+
+export class EchoStore extends AsyncStoreWithClient<IState> {
+    private static _instance: EchoStore;
+
+    private caches = new Map<ContextKey, GenericEchoChamber<any, any, any>>();
+
+    constructor() {
+        super(defaultDispatcher);
+    }
+
+    public static get instance(): EchoStore {
+        if (!EchoStore._instance) {
+            EchoStore._instance = new EchoStore();
+        }
+        return EchoStore._instance;
+    }
+
+    public get contexts(): EchoContext[] {
+        return Array.from(this.caches.values()).map(e => e.context);
+    }
+
+    public getOrCreateChamberForRoom(room: Room): RoomEchoChamber {
+        if (this.caches.has(roomContextKey(room))) {
+            return this.caches.get(roomContextKey(room)) as RoomEchoChamber;
+        }
+
+        const context = new RoomEchoContext(room);
+        context.whenAnything(() => this.checkContexts());
+
+        const echo = new RoomEchoChamber(context);
+        echo.setClient(this.matrixClient);
+        this.caches.set(roomContextKey(room), echo);
+
+        return echo;
+    }
+
+    private async checkContexts() {
+        let hasOrHadError = false;
+        for (const echo of this.caches.values()) {
+            hasOrHadError = echo.context.state === ContextTransactionState.PendingErrors;
+            if (hasOrHadError) break;
+        }
+
+        if (hasOrHadError && !this.state.toastRef) {
+            const ref = NonUrgentToastStore.instance.addToast(NonUrgentEchoFailureToast);
+            await this.updateState({toastRef: ref});
+        } else if (!hasOrHadError && this.state.toastRef) {
+            NonUrgentToastStore.instance.removeToast(this.state.toastRef);
+            await this.updateState({toastRef: null});
+        }
+    }
+
+    protected async onReady(): Promise<any> {
+        if (!this.caches) return; // can only happen during initialization
+        for (const echo of this.caches.values()) {
+            echo.setClient(this.matrixClient);
+        }
+    }
+
+    protected async onNotReady(): Promise<any> {
+        for (const echo of this.caches.values()) {
+            echo.setClient(null);
+        }
+    }
+
+    protected async onAction(payload: ActionPayload): Promise<any> {
+        // We have nothing to actually listen for
+        return Promise.resolve();
+    }
+}
diff --git a/src/stores/local-echo/EchoTransaction.ts b/src/stores/local-echo/EchoTransaction.ts
new file mode 100644
index 0000000000..2e372136d0
--- /dev/null
+++ b/src/stores/local-echo/EchoTransaction.ts
@@ -0,0 +1,72 @@
+/*
+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 { Whenable } from "../../utils/Whenable";
+
+export type RunFn = () => Promise<void>;
+
+export enum TransactionStatus {
+    Pending,
+    Success,
+    Error,
+}
+
+export class EchoTransaction extends Whenable<TransactionStatus> {
+    private _status = TransactionStatus.Pending;
+    private didFail = false;
+
+    public readonly startTime = new Date();
+
+    public constructor(
+        public readonly auditName,
+        public runFn: RunFn,
+    ) {
+        super();
+    }
+
+    public get didPreviouslyFail(): boolean {
+        return this.didFail;
+    }
+
+    public get status(): TransactionStatus {
+        return this._status;
+    }
+
+    public run() {
+        if (this.status === TransactionStatus.Success) {
+            throw new Error("Cannot re-run a successful echo transaction");
+        }
+        this.setStatus(TransactionStatus.Pending);
+        this.runFn()
+            .then(() => this.setStatus(TransactionStatus.Success))
+            .catch(() => this.setStatus(TransactionStatus.Error));
+    }
+
+    public cancel() {
+        // Success basically means "done"
+        this.setStatus(TransactionStatus.Success);
+    }
+
+    private setStatus(status: TransactionStatus) {
+        this._status = status;
+        if (status === TransactionStatus.Error) {
+            this.didFail = true;
+        } else if (status === TransactionStatus.Success) {
+            this.didFail = false;
+        }
+        this.notifyCondition(status);
+    }
+}
diff --git a/src/stores/local-echo/GenericEchoChamber.ts b/src/stores/local-echo/GenericEchoChamber.ts
new file mode 100644
index 0000000000..7a2173f702
--- /dev/null
+++ b/src/stores/local-echo/GenericEchoChamber.ts
@@ -0,0 +1,91 @@
+/*
+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 { EchoContext } from "./EchoContext";
+import { EchoTransaction, RunFn, TransactionStatus } from "./EchoTransaction";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import { EventEmitter } from "events";
+
+export async function implicitlyReverted() {
+    // do nothing :D
+}
+
+export const PROPERTY_UPDATED = "property_updated";
+
+export abstract class GenericEchoChamber<C extends EchoContext, K, V> extends EventEmitter {
+    private cache = new Map<K, {txn: EchoTransaction, val: V}>();
+    protected matrixClient: MatrixClient;
+
+    protected constructor(public readonly context: C, private lookupFn: (key: K) => V) {
+        super();
+    }
+
+    public setClient(client: MatrixClient) {
+        const oldClient = this.matrixClient;
+        this.matrixClient = client;
+        this.onClientChanged(oldClient, client);
+    }
+
+    protected abstract onClientChanged(oldClient: MatrixClient, newClient: MatrixClient);
+
+    /**
+     * Gets a value. If the key is in flight, the cached value will be returned. If
+     * the key is not in flight then the lookupFn provided to this class will be
+     * called instead.
+     * @param key The key to look up.
+     * @returns The value for the key.
+     */
+    public getValue(key: K): V {
+        return this.cache.has(key) ? this.cache.get(key).val : this.lookupFn(key);
+    }
+
+    private cacheVal(key: K, val: V, txn: EchoTransaction) {
+        this.cache.set(key, {txn, val});
+        this.emit(PROPERTY_UPDATED, key);
+    }
+
+    private decacheKey(key: K) {
+        if (this.cache.has(key)) {
+            this.context.disownTransaction(this.cache.get(key).txn);
+            this.cache.delete(key);
+            this.emit(PROPERTY_UPDATED, key);
+        }
+    }
+
+    protected markEchoReceived(key: K) {
+        if (this.cache.has(key)) {
+            const txn = this.cache.get(key).txn;
+            this.context.disownTransaction(txn);
+            txn.cancel();
+        }
+        this.decacheKey(key);
+    }
+
+    public setValue(auditName: string, key: K, targetVal: V, runFn: RunFn, revertFn: RunFn) {
+        // Cancel any pending transactions for the same key
+        if (this.cache.has(key)) {
+            this.cache.get(key).txn.cancel();
+        }
+
+        const ctxn = this.context.beginTransaction(auditName, runFn);
+        this.cacheVal(key, targetVal, ctxn); // set the cache now as it won't be updated by the .when() ladder below.
+
+        ctxn.when(TransactionStatus.Pending, () => this.cacheVal(key, targetVal, ctxn))
+            .when(TransactionStatus.Error, () => revertFn());
+
+        ctxn.run();
+    }
+}
diff --git a/src/stores/local-echo/RoomEchoChamber.ts b/src/stores/local-echo/RoomEchoChamber.ts
new file mode 100644
index 0000000000..e113f68c32
--- /dev/null
+++ b/src/stores/local-echo/RoomEchoChamber.ts
@@ -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.
+*/
+
+import { GenericEchoChamber, implicitlyReverted, PROPERTY_UPDATED } from "./GenericEchoChamber";
+import { getRoomNotifsState, setRoomNotifsState } from "../../RoomNotifs";
+import { RoomEchoContext } from "./RoomEchoContext";
+import { _t } from "../../languageHandler";
+import { Volume } from "../../RoomNotifsTypes";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+
+export type CachedRoomValues = Volume;
+
+export enum CachedRoomKey {
+    NotificationVolume,
+}
+
+export class RoomEchoChamber extends GenericEchoChamber<RoomEchoContext, CachedRoomKey, CachedRoomValues> {
+    private properties = new Map<CachedRoomKey, CachedRoomValues>();
+
+    public constructor(context: RoomEchoContext) {
+        super(context, (k) => this.properties.get(k));
+    }
+
+    protected onClientChanged(oldClient, newClient) {
+        this.properties.clear();
+        if (oldClient) {
+            oldClient.removeListener("accountData", this.onAccountData);
+        }
+        if (newClient) {
+            // Register the listeners first
+            newClient.on("accountData", this.onAccountData);
+
+            // Then populate the properties map
+            this.updateNotificationVolume();
+        }
+    }
+
+    private onAccountData = (event: MatrixEvent) => {
+        if (event.getType() === "m.push_rules") {
+            const currentVolume = this.properties.get(CachedRoomKey.NotificationVolume) as Volume;
+            const newVolume = getRoomNotifsState(this.context.room.roomId) as Volume;
+            if (currentVolume !== newVolume) {
+                this.updateNotificationVolume();
+            }
+        }
+    };
+
+    private updateNotificationVolume() {
+        this.properties.set(CachedRoomKey.NotificationVolume, getRoomNotifsState(this.context.room.roomId));
+        this.markEchoReceived(CachedRoomKey.NotificationVolume);
+        this.emit(PROPERTY_UPDATED, CachedRoomKey.NotificationVolume);
+    }
+
+    // ---- helpers below here ----
+
+    public get notificationVolume(): Volume {
+        return this.getValue(CachedRoomKey.NotificationVolume);
+    }
+
+    public set notificationVolume(v: Volume) {
+        this.setValue(_t("Change notification settings"), CachedRoomKey.NotificationVolume, v, async () => {
+            return setRoomNotifsState(this.context.room.roomId, v);
+        }, implicitlyReverted);
+    }
+}
diff --git a/src/stores/local-echo/RoomEchoContext.ts b/src/stores/local-echo/RoomEchoContext.ts
new file mode 100644
index 0000000000..4105f728c3
--- /dev/null
+++ b/src/stores/local-echo/RoomEchoContext.ts
@@ -0,0 +1,24 @@
+/*
+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 { EchoContext } from "./EchoContext";
+import { Room } from "matrix-js-sdk/src/models/room";
+
+export class RoomEchoContext extends EchoContext {
+    constructor(public readonly room: Room) {
+        super();
+    }
+}
diff --git a/src/stores/notifications/ListNotificationState.ts b/src/stores/notifications/ListNotificationState.ts
new file mode 100644
index 0000000000..6c67dbdd08
--- /dev/null
+++ b/src/stores/notifications/ListNotificationState.ts
@@ -0,0 +1,101 @@
+/*
+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 { NotificationColor } from "./NotificationColor";
+import { TagID } from "../room-list/models";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { arrayDiff } from "../../utils/arrays";
+import { RoomNotificationState } from "./RoomNotificationState";
+import { NOTIFICATION_STATE_UPDATE, NotificationState } from "./NotificationState";
+
+export type FetchRoomFn = (room: Room) => RoomNotificationState;
+
+export class ListNotificationState extends NotificationState {
+    private rooms: Room[] = [];
+    private states: { [roomId: string]: RoomNotificationState } = {};
+
+    constructor(private byTileCount = false, private tagId: TagID, private getRoomFn: FetchRoomFn) {
+        super();
+    }
+
+    public get symbol(): string {
+        return null; // This notification state doesn't support symbols
+    }
+
+    public setRooms(rooms: Room[]) {
+        // If we're only concerned about the tile count, don't bother setting up listeners.
+        if (this.byTileCount) {
+            this.rooms = rooms;
+            this.calculateTotalState();
+            return;
+        }
+
+        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 getForRoom(room: Room) {
+        const state = this.states[room.roomId];
+        if (!state) throw new Error("Unknown room for notification state");
+        return state;
+    }
+
+    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();
+
+        if (this.byTileCount) {
+            this._color = NotificationColor.Red;
+            this._count = this.rooms.length;
+        } else {
+            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/notifications/NotificationColor.ts b/src/stores/notifications/NotificationColor.ts
new file mode 100644
index 0000000000..b12f2b7c00
--- /dev/null
+++ b/src/stores/notifications/NotificationColor.ts
@@ -0,0 +1,24 @@
+/*
+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 NotificationColor {
+    // Inverted (None -> Red) because we do integer comparisons on this
+    None, // nothing special
+    // TODO: Remove bold with notifications: https://github.com/vector-im/element-web/issues/14227
+    Bold, // no badge, show as unread
+    Grey, // unread notified messages
+    Red,  // unread pings
+}
diff --git a/src/stores/notifications/NotificationState.ts b/src/stores/notifications/NotificationState.ts
new file mode 100644
index 0000000000..c8ef0ba859
--- /dev/null
+++ b/src/stores/notifications/NotificationState.ts
@@ -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 { EventEmitter } from "events";
+import { NotificationColor } from "./NotificationColor";
+import { IDestroyable } from "../../utils/IDestroyable";
+
+export const NOTIFICATION_STATE_UPDATE = "update";
+
+export abstract class NotificationState extends EventEmitter implements IDestroyable {
+    protected _symbol: string;
+    protected _count: number;
+    protected _color: NotificationColor;
+
+    public get symbol(): string {
+        return this._symbol;
+    }
+
+    public get count(): number {
+        return this._count;
+    }
+
+    public get color(): NotificationColor {
+        return this._color;
+    }
+
+    public get isIdle(): boolean {
+        return this.color <= NotificationColor.None;
+    }
+
+    public get isUnread(): boolean {
+        return this.color >= NotificationColor.Bold;
+    }
+
+    public get hasUnreadCount(): boolean {
+        return this.color >= NotificationColor.Grey && (!!this.count || !!this.symbol);
+    }
+
+    public get hasMentions(): boolean {
+        return this.color >= NotificationColor.Red;
+    }
+
+    protected emitIfUpdated(snapshot: NotificationStateSnapshot) {
+        if (snapshot.isDifferentFrom(this)) {
+            this.emit(NOTIFICATION_STATE_UPDATE);
+        }
+    }
+
+    protected snapshot(): NotificationStateSnapshot {
+        return new NotificationStateSnapshot(this);
+    }
+
+    public destroy(): void {
+        this.removeAllListeners(NOTIFICATION_STATE_UPDATE);
+    }
+}
+
+export class NotificationStateSnapshot {
+    private readonly symbol: string;
+    private readonly count: number;
+    private readonly color: NotificationColor;
+
+    constructor(state: NotificationState) {
+        this.symbol = state.symbol;
+        this.count = state.count;
+        this.color = state.color;
+    }
+
+    public isDifferentFrom(other: NotificationState): boolean {
+        const before = {count: this.count, symbol: this.symbol, color: this.color};
+        const after = {count: other.count, symbol: other.symbol, color: other.color};
+        return JSON.stringify(before) !== JSON.stringify(after);
+    }
+}
diff --git a/src/stores/notifications/RoomNotificationState.ts b/src/stores/notifications/RoomNotificationState.ts
new file mode 100644
index 0000000000..3fadbe7d7a
--- /dev/null
+++ b/src/stores/notifications/RoomNotificationState.ts
@@ -0,0 +1,131 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { NotificationColor } from "./NotificationColor";
+import { IDestroyable } from "../../utils/IDestroyable";
+import { MatrixClientPeg } from "../../MatrixClientPeg";
+import { EffectiveMembership, getEffectiveMembership } from "../../utils/membership";
+import { readReceiptChangeIsFor } from "../../utils/read-receipts";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { Room } from "matrix-js-sdk/src/models/room";
+import * as RoomNotifs from '../../RoomNotifs';
+import * as Unread from '../../Unread';
+import { NotificationState } from "./NotificationState";
+
+export class RoomNotificationState extends NotificationState implements IDestroyable {
+    constructor(public readonly room: Room) {
+        super();
+        this.room.on("Room.receipt", this.handleReadReceipt);
+        this.room.on("Room.timeline", this.handleRoomEventUpdate);
+        this.room.on("Room.redaction", this.handleRoomEventUpdate);
+        this.room.on("Room.myMembership", this.handleMembershipUpdate);
+        MatrixClientPeg.get().on("Event.decrypted", this.handleRoomEventUpdate);
+        MatrixClientPeg.get().on("accountData", this.handleAccountDataUpdate);
+        this.updateNotificationState();
+    }
+
+    private get roomIsInvite(): boolean {
+        return getEffectiveMembership(this.room.getMyMembership()) === EffectiveMembership.Invite;
+    }
+
+    public destroy(): void {
+        super.destroy();
+        this.room.removeListener("Room.receipt", this.handleReadReceipt);
+        this.room.removeListener("Room.timeline", this.handleRoomEventUpdate);
+        this.room.removeListener("Room.redaction", this.handleRoomEventUpdate);
+        this.room.removeListener("Room.myMembership", this.handleMembershipUpdate);
+        if (MatrixClientPeg.get()) {
+            MatrixClientPeg.get().removeListener("Event.decrypted", this.handleRoomEventUpdate);
+            MatrixClientPeg.get().removeListener("accountData", this.handleAccountDataUpdate);
+        }
+    }
+
+    private handleReadReceipt = (event: MatrixEvent, room: Room) => {
+        if (!readReceiptChangeIsFor(event, MatrixClientPeg.get())) return; // not our own - ignore
+        if (room.roomId !== this.room.roomId) return; // not for us - ignore
+        this.updateNotificationState();
+    };
+
+    private handleMembershipUpdate = () => {
+        this.updateNotificationState();
+    };
+
+    private handleRoomEventUpdate = (event: MatrixEvent) => {
+        const roomId = event.getRoomId();
+
+        if (roomId !== this.room.roomId) return; // ignore - not for us
+        this.updateNotificationState();
+    };
+
+    private handleAccountDataUpdate = (ev: MatrixEvent) => {
+        if (ev.getType() === "m.push_rules") {
+            this.updateNotificationState();
+        }
+    };
+
+    private updateNotificationState() {
+        const snapshot = this.snapshot();
+
+        if (RoomNotifs.getRoomNotifsState(this.room.roomId) === RoomNotifs.MUTE) {
+            // When muted we suppress all notification states, even if we have context on them.
+            this._color = NotificationColor.None;
+            this._symbol = null;
+            this._count = 0;
+        } else if (this.roomIsInvite) {
+            this._color = NotificationColor.Red;
+            this._symbol = "!";
+            this._count = 1; // not used, technically
+        } else {
+            const redNotifs = RoomNotifs.getUnreadNotificationCount(this.room, 'highlight');
+            const greyNotifs = RoomNotifs.getUnreadNotificationCount(this.room, 'total');
+
+            // For a 'true count' we pick the grey notifications first because they include the
+            // red notifications. If we don't have a grey count for some reason we use the red
+            // count. If that count is broken for some reason, assume zero. This avoids us showing
+            // a badge for 'NaN' (which formats as 'NaNB' for NaN Billion).
+            const trueCount = greyNotifs ? greyNotifs : (redNotifs ? redNotifs : 0);
+
+            // Note: we only set the symbol if we have an actual count. We don't want to show
+            // zero on badges.
+
+            if (redNotifs > 0) {
+                this._color = NotificationColor.Red;
+                this._count = trueCount;
+                this._symbol = null; // symbol calculated by component
+            } else if (greyNotifs > 0) {
+                this._color = NotificationColor.Grey;
+                this._count = trueCount;
+                this._symbol = null; // symbol calculated by component
+            } else {
+                // We don't have any notified messages, but we might have unread messages. Let's
+                // find out.
+                const hasUnread = Unread.doesRoomHaveUnreadMessages(this.room);
+                if (hasUnread) {
+                    this._color = NotificationColor.Bold;
+                } else {
+                    this._color = NotificationColor.None;
+                }
+
+                // no symbol or count for this state
+                this._count = 0;
+                this._symbol = null;
+            }
+        }
+
+        // finally, publish an update if needed
+        this.emitIfUpdated(snapshot);
+    }
+}
diff --git a/src/stores/notifications/RoomNotificationStateStore.ts b/src/stores/notifications/RoomNotificationStateStore.ts
new file mode 100644
index 0000000000..8b5da674f5
--- /dev/null
+++ b/src/stores/notifications/RoomNotificationStateStore.ts
@@ -0,0 +1,103 @@
+/*
+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 { ActionPayload } from "../../dispatcher/payloads";
+import { AsyncStoreWithClient } from "../AsyncStoreWithClient";
+import defaultDispatcher from "../../dispatcher/dispatcher";
+import { DefaultTagID, TagID } from "../room-list/models";
+import { FetchRoomFn, ListNotificationState } from "./ListNotificationState";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { RoomNotificationState } from "./RoomNotificationState";
+import { SummarizedNotificationState } from "./SummarizedNotificationState";
+
+interface IState {}
+
+export class RoomNotificationStateStore extends AsyncStoreWithClient<IState> {
+    private static internalInstance = new RoomNotificationStateStore();
+
+    private roomMap = new Map<Room, RoomNotificationState>();
+    private listMap = new Map<TagID, ListNotificationState>();
+
+    private constructor() {
+        super(defaultDispatcher, {});
+    }
+
+    /**
+     * Gets a snapshot of notification state for all visible rooms. The number of states recorded
+     * on the SummarizedNotificationState is equivalent to rooms.
+     */
+    public get globalState(): SummarizedNotificationState {
+        // If we're not ready yet, just return an empty state
+        if (!this.matrixClient) return new SummarizedNotificationState();
+
+        // Only count visible rooms to not torment the user with notification counts in rooms they can't see.
+        // This will include highlights from the previous version of the room internally
+        const globalState = new SummarizedNotificationState();
+        for (const room of this.matrixClient.getVisibleRooms()) {
+            globalState.add(this.getRoomState(room));
+        }
+        return globalState;
+    }
+
+    /**
+     * Gets an instance of the list state class for the given tag.
+     * @param tagId The tag to get the notification state for.
+     * @returns The notification state for the tag.
+     */
+    public getListState(tagId: TagID): ListNotificationState {
+        if (this.listMap.has(tagId)) {
+            return this.listMap.get(tagId);
+        }
+
+        // TODO: Update if/when invites move out of the room list.
+        const useTileCount = tagId === DefaultTagID.Invite;
+        const getRoomFn: FetchRoomFn = (room: Room) => {
+            return this.getRoomState(room);
+        };
+        const state = new ListNotificationState(useTileCount, tagId, getRoomFn);
+        this.listMap.set(tagId, state);
+        return state;
+    }
+
+    /**
+     * Gets a copy of the notification state for a room. The consumer should not
+     * attempt to destroy the returned state as it may be shared with other
+     * consumers.
+     * @param room The room to get the notification state for.
+     * @returns The room's notification state.
+     */
+    public getRoomState(room: Room): RoomNotificationState {
+        if (!this.roomMap.has(room)) {
+            this.roomMap.set(room, new RoomNotificationState(room));
+        }
+        return this.roomMap.get(room);
+    }
+
+    public static get instance(): RoomNotificationStateStore {
+        return RoomNotificationStateStore.internalInstance;
+    }
+
+    protected async onNotReady(): Promise<any> {
+        for (const roomState of this.roomMap.values()) {
+            roomState.destroy();
+        }
+    }
+
+    // We don't need this, but our contract says we do.
+    protected async onAction(payload: ActionPayload) {
+        return Promise.resolve();
+    }
+}
diff --git a/src/stores/notifications/StaticNotificationState.ts b/src/stores/notifications/StaticNotificationState.ts
new file mode 100644
index 0000000000..0392ed3716
--- /dev/null
+++ b/src/stores/notifications/StaticNotificationState.ts
@@ -0,0 +1,35 @@
+/*
+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 { NotificationColor } from "./NotificationColor";
+import { NotificationState } from "./NotificationState";
+
+export class StaticNotificationState extends NotificationState {
+    constructor(symbol: string, count: number, color: NotificationColor) {
+        super();
+        this._symbol = symbol;
+        this._count = count;
+        this._color = color;
+    }
+
+    public static forCount(count: number, color: NotificationColor): StaticNotificationState {
+        return new StaticNotificationState(null, count, color);
+    }
+
+    public static forSymbol(symbol: string, color: NotificationColor): StaticNotificationState {
+        return new StaticNotificationState(symbol, 0, color);
+    }
+}
diff --git a/src/stores/notifications/SummarizedNotificationState.ts b/src/stores/notifications/SummarizedNotificationState.ts
new file mode 100644
index 0000000000..372da74f36
--- /dev/null
+++ b/src/stores/notifications/SummarizedNotificationState.ts
@@ -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.
+*/
+
+import { NotificationColor } from "./NotificationColor";
+import { NotificationState } from "./NotificationState";
+
+/**
+ * Summarizes a number of states into a unique snapshot. To populate, call
+ * the add() function with the notification states to be included.
+ *
+ * Useful for community notification counts, global notification counts, etc.
+ */
+export class SummarizedNotificationState extends NotificationState {
+    private totalStatesWithUnread = 0;
+
+    constructor() {
+        super();
+        this._symbol = null;
+        this._count = 0;
+        this._color = NotificationColor.None;
+    }
+
+    public get numUnreadStates(): number {
+        return this.totalStatesWithUnread;
+    }
+
+    /**
+     * Append a notification state to this snapshot, taking the loudest NotificationColor
+     * of the two. By default this will not adopt the symbol of the other notification
+     * state to prevent the count from being lost in typical usage.
+     * @param other The other notification state to append.
+     * @param includeSymbol If true, the notification state's symbol will be taken if one
+     * is present.
+     */
+    public add(other: NotificationState, includeSymbol = false) {
+        if (other.symbol && includeSymbol) {
+            this._symbol = other.symbol;
+        }
+        if (other.count) {
+            this._count += other.count;
+        }
+        if (other.color > this.color) {
+            this._color = other.color;
+        }
+        if (other.hasUnreadCount) {
+            this.totalStatesWithUnread++;
+        }
+    }
+}
diff --git a/src/stores/room-list/ListLayout.ts b/src/stores/room-list/ListLayout.ts
new file mode 100644
index 0000000000..caf2e92bd1
--- /dev/null
+++ b/src/stores/room-list/ListLayout.ts
@@ -0,0 +1,119 @@
+/*
+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 { TagID } from "./models";
+
+const TILE_HEIGHT_PX = 44;
+
+interface ISerializedListLayout {
+    numTiles: number;
+    showPreviews: boolean;
+    collapsed: boolean;
+}
+
+export class ListLayout {
+    private _n = 0;
+    private _previews = false;
+    private _collapsed = false;
+
+    constructor(public readonly tagId: TagID) {
+        const serialized = localStorage.getItem(this.key);
+        if (serialized) {
+            // We don't use the setters as they cause writes.
+            const parsed = <ISerializedListLayout>JSON.parse(serialized);
+            this._n = parsed.numTiles;
+            this._previews = parsed.showPreviews;
+            this._collapsed = parsed.collapsed;
+        }
+    }
+
+    public get isCollapsed(): boolean {
+        return this._collapsed;
+    }
+
+    public set isCollapsed(v: boolean) {
+        this._collapsed = v;
+        this.save();
+    }
+
+    public get showPreviews(): boolean {
+        return this._previews;
+    }
+
+    public set showPreviews(v: boolean) {
+        this._previews = v;
+        this.save();
+    }
+
+    public get tileHeight(): number {
+        return TILE_HEIGHT_PX;
+    }
+
+    private get key(): string {
+        return `mx_sublist_layout_${this.tagId}_boxed`;
+    }
+
+    public get visibleTiles(): number {
+        if (this._n === 0) return this.defaultVisibleTiles;
+        return Math.max(this._n, this.minVisibleTiles);
+    }
+
+    public set visibleTiles(v: number) {
+        this._n = v;
+        this.save();
+    }
+
+    public get minVisibleTiles(): number {
+        return 1;
+    }
+
+    public get defaultVisibleTiles(): number {
+        // This number is what "feels right", and mostly subject to design's opinion.
+        return 5;
+    }
+
+    public tilesWithPadding(n: number, paddingPx: number): number {
+        return this.pixelsToTiles(this.tilesToPixelsWithPadding(n, paddingPx));
+    }
+
+    public tilesToPixelsWithPadding(n: number, paddingPx: number): number {
+        return this.tilesToPixels(n) + paddingPx;
+    }
+
+    public tilesToPixels(n: number): number {
+        return n * this.tileHeight;
+    }
+
+    public pixelsToTiles(px: number): number {
+        return px / this.tileHeight;
+    }
+
+    public reset() {
+        localStorage.removeItem(this.key);
+    }
+
+    private save() {
+        localStorage.setItem(this.key, JSON.stringify(this.serialize()));
+    }
+
+    private serialize(): ISerializedListLayout {
+        return {
+            numTiles: this.visibleTiles,
+            showPreviews: this.showPreviews,
+            collapsed: this.isCollapsed,
+        };
+    }
+}
diff --git a/src/stores/room-list/MessagePreviewStore.ts b/src/stores/room-list/MessagePreviewStore.ts
new file mode 100644
index 0000000000..2803f0a23e
--- /dev/null
+++ b/src/stores/room-list/MessagePreviewStore.ts
@@ -0,0 +1,173 @@
+/*
+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 { ActionPayload } from "../../dispatcher/payloads";
+import { AsyncStoreWithClient } from "../AsyncStoreWithClient";
+import defaultDispatcher from "../../dispatcher/dispatcher";
+import { MessageEventPreview } from "./previews/MessageEventPreview";
+import { TagID } from "./models";
+import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
+import { CallInviteEventPreview } from "./previews/CallInviteEventPreview";
+import { CallAnswerEventPreview } from "./previews/CallAnswerEventPreview";
+import { CallHangupEvent } from "./previews/CallHangupEvent";
+import { StickerEventPreview } from "./previews/StickerEventPreview";
+import { ReactionEventPreview } from "./previews/ReactionEventPreview";
+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 PREVIEWS = {
+    'm.room.message': {
+        isState: false,
+        previewer: new MessageEventPreview(),
+    },
+    'm.call.invite': {
+        isState: false,
+        previewer: new CallInviteEventPreview(),
+    },
+    'm.call.answer': {
+        isState: false,
+        previewer: new CallAnswerEventPreview(),
+    },
+    'm.call.hangup': {
+        isState: false,
+        previewer: new CallHangupEvent(),
+    },
+    'm.sticker': {
+        isState: false,
+        previewer: new StickerEventPreview(),
+    },
+    'm.reaction': {
+        isState: false,
+        previewer: new ReactionEventPreview(),
+    },
+};
+
+// The maximum number of events we're willing to look back on to get a preview.
+const MAX_EVENTS_BACKWARDS = 50;
+
+// type merging ftw
+type TAG_ANY = "im.vector.any";
+const TAG_ANY: TAG_ANY = "im.vector.any";
+
+interface IState {
+    // Empty because we don't actually use the state
+}
+
+export class MessagePreviewStore extends AsyncStoreWithClient<IState> {
+    private static internalInstance = new MessagePreviewStore();
+
+    // null indicates the preview is empty / irrelevant
+    private previews = new Map<string, Map<TagID|TAG_ANY, string|null>>();
+
+    private constructor() {
+        super(defaultDispatcher, {});
+    }
+
+    public static get instance(): MessagePreviewStore {
+        return MessagePreviewStore.internalInstance;
+    }
+
+    /**
+     * Gets the pre-translated preview for a given room
+     * @param room The room to get the preview for.
+     * @param inTagId The tag ID in which the room resides
+     * @returns The preview, or null if none present.
+     */
+    public getPreviewForRoom(room: Room, inTagId: TagID): string {
+        if (!room) return null; // invalid room, just return nothing
+
+        if (!this.previews.has(room.roomId)) this.generatePreview(room, inTagId);
+
+        const previews = this.previews.get(room.roomId);
+        if (!previews) return null;
+
+        if (!previews.has(inTagId)) {
+            return previews.get(TAG_ANY);
+        }
+        return previews.get(inTagId);
+    }
+
+    private generatePreview(room: Room, tagId?: TagID) {
+        const events = room.timeline;
+        if (!events) return; // should only happen in tests
+
+        let map = this.previews.get(room.roomId);
+        if (!map) {
+            map = new Map<TagID | TAG_ANY, string | null>();
+            this.previews.set(room.roomId, map);
+        }
+
+        // Set the tags so we know what to generate
+        if (!map.has(TAG_ANY)) map.set(TAG_ANY, null);
+        if (tagId && !map.has(tagId)) map.set(tagId, null);
+
+        let changed = false;
+        for (let i = events.length - 1; i >= 0; i--) {
+            if (i === events.length - MAX_EVENTS_BACKWARDS) return; // limit reached
+
+            const event = events[i];
+            const previewDef = PREVIEWS[event.getType()];
+            if (!previewDef) continue;
+            if (previewDef.isState && isNullOrUndefined(event.getStateKey())) continue;
+
+            const anyPreview = previewDef.previewer.getTextFor(event, null);
+            if (!anyPreview) continue; // not previewable for some reason
+
+            changed = changed || anyPreview !== map.get(TAG_ANY);
+            map.set(TAG_ANY, anyPreview);
+
+            const tagsToGenerate = Array.from(map.keys()).filter(t => t !== TAG_ANY); // we did the any tag above
+            for (const genTagId of tagsToGenerate) {
+                const realTagId: TagID = genTagId === TAG_ANY ? null : genTagId;
+                const preview = previewDef.previewer.getTextFor(event, realTagId);
+                if (preview === anyPreview) {
+                    changed = changed || anyPreview !== map.get(genTagId);
+                    map.delete(genTagId);
+                } else {
+                    changed = changed || preview !== map.get(genTagId);
+                    map.set(genTagId, preview);
+                }
+            }
+
+            if (changed) {
+                // 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);
+            }
+            return; // we're done
+        }
+
+        // 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);
+    }
+
+    protected async onAction(payload: ActionPayload) {
+        if (!this.matrixClient) return;
+
+        if (payload.action === 'MatrixActions.Room.timeline' || payload.action === 'MatrixActions.Event.decrypted') {
+            const event = payload.event; // TODO: Type out the dispatcher
+            if (!this.previews.has(event.getRoomId())) return; // not important
+            this.generatePreview(this.matrixClient.getRoom(event.getRoomId()), TAG_ANY);
+        }
+    }
+}
diff --git a/src/stores/room-list/RoomListLayoutStore.ts b/src/stores/room-list/RoomListLayoutStore.ts
new file mode 100644
index 0000000000..1443448a64
--- /dev/null
+++ b/src/stores/room-list/RoomListLayoutStore.ts
@@ -0,0 +1,73 @@
+/*
+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 { TagID } from "./models";
+import { ListLayout } from "./ListLayout";
+import { AsyncStoreWithClient } from "../AsyncStoreWithClient";
+import defaultDispatcher from "../../dispatcher/dispatcher";
+import { ActionPayload } from "../../dispatcher/payloads";
+
+interface IState {}
+
+export default class RoomListLayoutStore extends AsyncStoreWithClient<IState> {
+    private static internalInstance: RoomListLayoutStore;
+
+    private readonly layoutMap = new Map<TagID, ListLayout>();
+
+    constructor() {
+        super(defaultDispatcher);
+    }
+
+    public static get instance(): RoomListLayoutStore {
+        if (!RoomListLayoutStore.internalInstance) {
+            RoomListLayoutStore.internalInstance = new RoomListLayoutStore();
+        }
+        return RoomListLayoutStore.internalInstance;
+    }
+
+    public ensureLayoutExists(tagId: TagID) {
+        if (!this.layoutMap.has(tagId)) {
+            this.layoutMap.set(tagId, new ListLayout(tagId));
+        }
+    }
+
+    public getLayoutFor(tagId: TagID): ListLayout {
+        if (!this.layoutMap.has(tagId)) {
+            this.layoutMap.set(tagId, new ListLayout(tagId));
+        }
+        return this.layoutMap.get(tagId);
+    }
+
+    // Note: this primarily exists for debugging, and isn't really intended to be used by anything.
+    public async resetLayouts() {
+        console.warn("Resetting layouts for room list");
+        for (const layout of this.layoutMap.values()) {
+            layout.reset();
+        }
+    }
+
+    protected async onNotReady(): Promise<any> {
+        // On logout, clear the map.
+        this.layoutMap.clear();
+    }
+
+    // We don't need this function, but our contract says we do
+    protected async onAction(payload: ActionPayload): Promise<any> {
+        return Promise.resolve();
+    }
+}
+
+window.mxRoomListLayoutStore = RoomListLayoutStore.instance;
diff --git a/src/stores/room-list/RoomListStore.ts b/src/stores/room-list/RoomListStore.ts
new file mode 100644
index 0000000000..0f3138fe9e
--- /dev/null
+++ b/src/stores/room-list/RoomListStore.ts
@@ -0,0 +1,643 @@
+/*
+Copyright 2018, 2019 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+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 SettingsStore from "../../settings/SettingsStore";
+import { DefaultTagID, isCustomTag, OrderedDefaultTagIDs, RoomUpdateCause, TagID } from "./models";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { IListOrderingMap, ITagMap, ITagSortingMap, ListAlgorithm, SortAlgorithm } from "./algorithms/models";
+import { ActionPayload } from "../../dispatcher/payloads";
+import defaultDispatcher from "../../dispatcher/dispatcher";
+import { readReceiptChangeIsFor } from "../../utils/read-receipts";
+import { FILTER_CHANGED, IFilterCondition } from "./filters/IFilterCondition";
+import { TagWatcher } from "./TagWatcher";
+import RoomViewStore from "../RoomViewStore";
+import { Algorithm, LIST_UPDATED_EVENT } from "./algorithms/Algorithm";
+import { EffectiveMembership, getEffectiveMembership } from "../../utils/membership";
+import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
+import RoomListLayoutStore from "./RoomListLayoutStore";
+import { MarkedExecution } from "../../utils/MarkedExecution";
+import { AsyncStoreWithClient } from "../AsyncStoreWithClient";
+import { NameFilterCondition } from "./filters/NameFilterCondition";
+import { RoomNotificationStateStore } from "../notifications/RoomNotificationStateStore";
+
+interface IState {
+    tagsEnabled?: boolean;
+}
+
+/**
+ * The event/channel which is called when the room lists have been changed. Raised
+ * with one argument: the instance of the store.
+ */
+export const LISTS_UPDATE_EVENT = "lists_update";
+
+export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
+    /**
+     * Set to true if you're running tests on the store. Should not be touched in
+     * any other environment.
+     */
+    public static TEST_MODE = false;
+
+    private initialListsGenerated = false;
+    private algorithm = new Algorithm();
+    private filterConditions: IFilterCondition[] = [];
+    private tagWatcher = new TagWatcher(this);
+    private updateFn = new MarkedExecution(() => {
+        for (const tagId of Object.keys(this.unfilteredLists)) {
+            RoomNotificationStateStore.instance.getListState(tagId).setRooms(this.unfilteredLists[tagId]);
+        }
+        this.emit(LISTS_UPDATE_EVENT);
+    });
+
+    private readonly watchedSettings = [
+        'feature_custom_tags',
+        'advancedRoomListLogging', // TODO: Remove watch: https://github.com/vector-im/element-web/issues/14602
+    ];
+
+    constructor() {
+        super(defaultDispatcher);
+
+        this.checkLoggingEnabled();
+        for (const settingName of this.watchedSettings) SettingsStore.monitorSetting(settingName, null);
+        RoomViewStore.addListener(() => this.handleRVSUpdate({}));
+        this.algorithm.on(LIST_UPDATED_EVENT, this.onAlgorithmListUpdated);
+        this.algorithm.on(FILTER_CHANGED, this.onAlgorithmFilterUpdated);
+    }
+
+    public get unfilteredLists(): ITagMap {
+        if (!this.algorithm) return {}; // No tags yet.
+        return this.algorithm.getUnfilteredRooms();
+    }
+
+    public get orderedLists(): ITagMap {
+        if (!this.algorithm) return {}; // No tags yet.
+        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.algorithm.off(LIST_UPDATED_EVENT, this.onAlgorithmListUpdated);
+        this.algorithm.off(FILTER_CHANGED, this.onAlgorithmListUpdated);
+        this.algorithm = new Algorithm();
+        this.algorithm.on(LIST_UPDATED_EVENT, this.onAlgorithmListUpdated);
+        this.algorithm.on(FILTER_CHANGED, this.onAlgorithmListUpdated);
+
+        // Reset state without causing updates as the client will have been destroyed
+        // and downstream code will throw NPE errors.
+        await this.reset(null, true);
+    }
+
+    // Public for test usage. Do not call this.
+    public async makeReady(forcedClient?: MatrixClient) {
+        if (forcedClient) {
+            super.matrixClient = forcedClient;
+        }
+
+        this.checkLoggingEnabled();
+
+        // Update any settings here, as some may have happened before we were logically ready.
+        // Update any settings here, as some may have happened before we were logically ready.
+        console.log("Regenerating room lists: Startup");
+        await this.readAndCacheSettingsFromStore();
+        await this.regenerateAllLists({trigger: false});
+        await this.handleRVSUpdate({trigger: false}); // fake an RVS update to adjust sticky room, if needed
+
+        this.updateFn.mark(); // we almost certainly want to trigger an update.
+        this.updateFn.trigger();
+    }
+
+    private checkLoggingEnabled() {
+        if (SettingsStore.getValue("advancedRoomListLogging")) {
+            console.warn("Advanced room list logging is enabled");
+        }
+    }
+
+    private async readAndCacheSettingsFromStore() {
+        const tagsEnabled = SettingsStore.getValue("feature_custom_tags");
+        await this.updateState({
+            tagsEnabled,
+        });
+        await this.updateAlgorithmInstances();
+    }
+
+    /**
+     * Handles suspected RoomViewStore changes.
+     * @param trigger Set to false to prevent a list update from being sent. Should only
+     * be used if the calling code will manually trigger the update.
+     */
+    private async handleRVSUpdate({trigger = true}) {
+        if (!this.matrixClient) return; // We assume there won't be RVS updates without a client
+
+        const activeRoomId = RoomViewStore.getRoomId();
+        if (!activeRoomId && this.algorithm.stickyRoom) {
+            await this.algorithm.setStickyRoom(null);
+        } else if (activeRoomId) {
+            const activeRoom = this.matrixClient.getRoom(activeRoomId);
+            if (!activeRoom) {
+                console.warn(`${activeRoomId} is current in RVS but missing from client - clearing sticky room`);
+                await this.algorithm.setStickyRoom(null);
+            } else if (activeRoom !== this.algorithm.stickyRoom) {
+                if (SettingsStore.getValue("advancedRoomListLogging")) {
+                    // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+                    console.log(`Changing sticky room to ${activeRoomId}`);
+                }
+                await this.algorithm.setStickyRoom(activeRoom);
+            }
+        }
+
+        if (trigger) this.updateFn.trigger();
+    }
+
+    protected async onReady(): Promise<any> {
+        await this.makeReady();
+    }
+
+    protected async onNotReady(): Promise<any> {
+        await this.resetStore();
+    }
+
+    protected async onAction(payload: ActionPayload) {
+        // If we're not remotely ready, don't even bother scheduling the dispatch handling.
+        // This is repeated in the handler just in case things change between a decision here and
+        // when the timer fires.
+        const logicallyReady = this.matrixClient && this.initialListsGenerated;
+        if (!logicallyReady) return;
+
+        // When we're running tests we can't reliably use setImmediate out of timing concerns.
+        // As such, we use a more synchronous model.
+        if (RoomListStoreClass.TEST_MODE) {
+            await this.onDispatchAsync(payload);
+            return;
+        }
+
+        // We do this to intentionally break out of the current event loop task, allowing
+        // us to instead wait for a more convenient time to run our updates.
+        setImmediate(() => this.onDispatchAsync(payload));
+    }
+
+    protected async onDispatchAsync(payload: ActionPayload) {
+        // Everything here requires a MatrixClient or some sort of logical readiness.
+        const logicallyReady = this.matrixClient && this.initialListsGenerated;
+        if (!logicallyReady) return;
+
+        if (payload.action === 'setting_updated') {
+            if (this.watchedSettings.includes(payload.settingName)) {
+                // TODO: Remove with https://github.com/vector-im/element-web/issues/14602
+                if (payload.settingName === "advancedRoomListLogging") {
+                    // Log when the setting changes so we know when it was turned on in the rageshake
+                    const enabled = SettingsStore.getValue("advancedRoomListLogging");
+                    console.warn("Advanced room list logging is enabled? " + enabled);
+                    return;
+                }
+
+                console.log("Regenerating room lists: Settings changed");
+                await this.readAndCacheSettingsFromStore();
+
+                await this.regenerateAllLists({trigger: false}); // regenerate the lists now
+                this.updateFn.trigger();
+            }
+        }
+
+        if (!this.algorithm) {
+            // This shouldn't happen because `initialListsGenerated` implies we have an algorithm.
+            throw new Error("Room list store has no algorithm to process dispatcher update with");
+        }
+
+        if (payload.action === 'MatrixActions.Room.receipt') {
+            // First see if the receipt event is for our own user. If it was, trigger
+            // a room update (we probably read the room on a different device).
+            if (readReceiptChangeIsFor(payload.event, this.matrixClient)) {
+                const room = payload.room;
+                if (!room) {
+                    console.warn(`Own read receipt was in unknown room ${room.roomId}`);
+                    return;
+                }
+                if (SettingsStore.getValue("advancedRoomListLogging")) {
+                    // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+                    console.log(`[RoomListDebug] Got own read receipt in ${room.roomId}`);
+                }
+                await this.handleRoomUpdate(room, RoomUpdateCause.ReadReceipt);
+                this.updateFn.trigger();
+                return;
+            }
+        } else if (payload.action === 'MatrixActions.Room.tags') {
+            const roomPayload = (<any>payload); // TODO: Type out the dispatcher types
+            if (SettingsStore.getValue("advancedRoomListLogging")) {
+                // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+                console.log(`[RoomListDebug] Got tag change in ${roomPayload.room.roomId}`);
+            }
+            await this.handleRoomUpdate(roomPayload.room, RoomUpdateCause.PossibleTagChange);
+            this.updateFn.trigger();
+        } else if (payload.action === 'MatrixActions.Room.timeline') {
+            const eventPayload = (<any>payload); // TODO: Type out the dispatcher types
+
+            // Ignore non-live events (backfill)
+            if (!eventPayload.isLiveEvent || !payload.isLiveUnfilteredRoomTimelineEvent) return;
+
+            const roomId = eventPayload.event.getRoomId();
+            const room = this.matrixClient.getRoom(roomId);
+            const tryUpdate = async (updatedRoom: Room) => {
+                if (SettingsStore.getValue("advancedRoomListLogging")) {
+                    // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+                    console.log(`[RoomListDebug] Live timeline event ${eventPayload.event.getId()}` +
+                        ` in ${updatedRoom.roomId}`);
+                }
+                if (eventPayload.event.getType() === 'm.room.tombstone' && eventPayload.event.getStateKey() === '') {
+                    if (SettingsStore.getValue("advancedRoomListLogging")) {
+                        // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+                        console.log(`[RoomListDebug] Got tombstone event - trying to remove now-dead room`);
+                    }
+                    const newRoom = this.matrixClient.getRoom(eventPayload.event.getContent()['replacement_room']);
+                    if (newRoom) {
+                        // If we have the new room, then the new room check will have seen the predecessor
+                        // and did the required updates, so do nothing here.
+                        return;
+                    }
+                }
+                await this.handleRoomUpdate(updatedRoom, RoomUpdateCause.Timeline);
+                this.updateFn.trigger();
+            };
+            if (!room) {
+                console.warn(`Live timeline event ${eventPayload.event.getId()} received without associated room`);
+                console.warn(`Queuing failed room update for retry as a result.`);
+                setTimeout(async () => {
+                    const updatedRoom = this.matrixClient.getRoom(roomId);
+                    await tryUpdate(updatedRoom);
+                }, 100); // 100ms should be enough for the room to show up
+                return;
+            } else {
+                await tryUpdate(room);
+            }
+        } else if (payload.action === 'MatrixActions.Event.decrypted') {
+            const eventPayload = (<any>payload); // TODO: Type out the dispatcher types
+            const roomId = eventPayload.event.getRoomId();
+            const room = this.matrixClient.getRoom(roomId);
+            if (!room) {
+                console.warn(`Event ${eventPayload.event.getId()} was decrypted in an unknown room ${roomId}`);
+                return;
+            }
+            if (SettingsStore.getValue("advancedRoomListLogging")) {
+                // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+                console.log(`[RoomListDebug] Decrypted timeline event ${eventPayload.event.getId()} in ${roomId}`);
+            }
+            await this.handleRoomUpdate(room, RoomUpdateCause.Timeline);
+            this.updateFn.trigger();
+        } else if (payload.action === 'MatrixActions.accountData' && payload.event_type === 'm.direct') {
+            const eventPayload = (<any>payload); // TODO: Type out the dispatcher types
+            if (SettingsStore.getValue("advancedRoomListLogging")) {
+                // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+                console.log(`[RoomListDebug] Received updated DM map`);
+            }
+            const dmMap = eventPayload.event.getContent();
+            for (const userId of Object.keys(dmMap)) {
+                const roomIds = dmMap[userId];
+                for (const roomId of roomIds) {
+                    const room = this.matrixClient.getRoom(roomId);
+                    if (!room) {
+                        console.warn(`${roomId} was found in DMs but the room is not in the store`);
+                        continue;
+                    }
+
+                    // We expect this RoomUpdateCause to no-op if there's no change, and we don't expect
+                    // the user to have hundreds of rooms to update in one event. As such, we just hammer
+                    // away at updates until the problem is solved. If we were expecting more than a couple
+                    // of rooms to be updated at once, we would consider batching the rooms up.
+                    await this.handleRoomUpdate(room, RoomUpdateCause.PossibleTagChange);
+                }
+            }
+            this.updateFn.trigger();
+        } else if (payload.action === 'MatrixActions.Room.myMembership') {
+            const membershipPayload = (<any>payload); // TODO: Type out the dispatcher types
+            const oldMembership = getEffectiveMembership(membershipPayload.oldMembership);
+            const newMembership = getEffectiveMembership(membershipPayload.membership);
+            if (oldMembership !== EffectiveMembership.Join && newMembership === EffectiveMembership.Join) {
+                if (SettingsStore.getValue("advancedRoomListLogging")) {
+                    // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+                    console.log(`[RoomListDebug] Handling new room ${membershipPayload.room.roomId}`);
+                }
+
+                // If we're joining an upgraded room, we'll want to make sure we don't proliferate
+                // the dead room in the list.
+                const createEvent = membershipPayload.room.currentState.getStateEvents("m.room.create", "");
+                if (createEvent && createEvent.getContent()['predecessor']) {
+                    if (SettingsStore.getValue("advancedRoomListLogging")) {
+                        // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+                        console.log(`[RoomListDebug] Room has a predecessor`);
+                    }
+                    const prevRoom = this.matrixClient.getRoom(createEvent.getContent()['predecessor']['room_id']);
+                    if (prevRoom) {
+                        const isSticky = this.algorithm.stickyRoom === prevRoom;
+                        if (isSticky) {
+                            if (SettingsStore.getValue("advancedRoomListLogging")) {
+                                // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+                                console.log(`[RoomListDebug] Clearing sticky room due to room upgrade`);
+                            }
+                            await this.algorithm.setStickyRoom(null);
+                        }
+
+                        // Note: we hit the algorithm instead of our handleRoomUpdate() function to
+                        // avoid redundant updates.
+                        if (SettingsStore.getValue("advancedRoomListLogging")) {
+                            // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+                            console.log(`[RoomListDebug] Removing previous room from room list`);
+                        }
+                        await this.algorithm.handleRoomUpdate(prevRoom, RoomUpdateCause.RoomRemoved);
+                    }
+                }
+
+                if (SettingsStore.getValue("advancedRoomListLogging")) {
+                    // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+                    console.log(`[RoomListDebug] Adding new room to room list`);
+                }
+                await this.handleRoomUpdate(membershipPayload.room, RoomUpdateCause.NewRoom);
+                this.updateFn.trigger();
+                return;
+            }
+
+            if (oldMembership !== EffectiveMembership.Invite && newMembership === EffectiveMembership.Invite) {
+                if (SettingsStore.getValue("advancedRoomListLogging")) {
+                    // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+                    console.log(`[RoomListDebug] Handling invite to ${membershipPayload.room.roomId}`);
+                }
+                await this.handleRoomUpdate(membershipPayload.room, RoomUpdateCause.NewRoom);
+                this.updateFn.trigger();
+                return;
+            }
+
+            // If it's not a join, it's transitioning into a different list (possibly historical)
+            if (oldMembership !== newMembership) {
+                if (SettingsStore.getValue("advancedRoomListLogging")) {
+                    // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+                    console.log(`[RoomListDebug] Handling membership change in ${membershipPayload.room.roomId}`);
+                }
+                await this.handleRoomUpdate(membershipPayload.room, RoomUpdateCause.PossibleTagChange);
+                this.updateFn.trigger();
+                return;
+            }
+        }
+    }
+
+    private async handleRoomUpdate(room: Room, cause: RoomUpdateCause): Promise<any> {
+        const shouldUpdate = await this.algorithm.handleRoomUpdate(room, cause);
+        if (shouldUpdate) {
+            if (SettingsStore.getValue("advancedRoomListLogging")) {
+                // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+                console.log(`[DEBUG] Room "${room.name}" (${room.roomId}) triggered by ${cause} requires list update`);
+            }
+            this.updateFn.mark();
+        }
+    }
+
+    public async setTagSorting(tagId: TagID, sort: SortAlgorithm) {
+        await this.setAndPersistTagSorting(tagId, sort);
+        this.updateFn.trigger();
+    }
+
+    private async setAndPersistTagSorting(tagId: TagID, sort: SortAlgorithm) {
+        await this.algorithm.setTagSorting(tagId, sort);
+        // TODO: Per-account? https://github.com/vector-im/element-web/issues/14114
+        localStorage.setItem(`mx_tagSort_${tagId}`, sort);
+    }
+
+    public getTagSorting(tagId: TagID): SortAlgorithm {
+        return this.algorithm.getTagSorting(tagId);
+    }
+
+    // noinspection JSMethodCanBeStatic
+    private getStoredTagSorting(tagId: TagID): SortAlgorithm {
+        // TODO: Per-account? https://github.com/vector-im/element-web/issues/14114
+        return <SortAlgorithm>localStorage.getItem(`mx_tagSort_${tagId}`);
+    }
+
+    // logic must match calculateListOrder
+    private calculateTagSorting(tagId: TagID): SortAlgorithm {
+        const isDefaultRecent = tagId === DefaultTagID.Invite || tagId === DefaultTagID.DM;
+        const defaultSort = isDefaultRecent ? SortAlgorithm.Recent : SortAlgorithm.Alphabetic;
+        const settingAlphabetical = SettingsStore.getValue("RoomList.orderAlphabetically", null, true);
+        const definedSort = this.getTagSorting(tagId);
+        const storedSort = this.getStoredTagSorting(tagId);
+
+        // We use the following order to determine which of the 4 flags to use:
+        // Stored > Settings > Defined > Default
+
+        let tagSort = defaultSort;
+        if (storedSort) {
+            tagSort = storedSort;
+        } else if (!isNullOrUndefined(settingAlphabetical)) {
+            tagSort = settingAlphabetical ? SortAlgorithm.Alphabetic : SortAlgorithm.Recent;
+        } else if (definedSort) {
+            tagSort = definedSort;
+        } // else default (already set)
+
+        return tagSort;
+    }
+
+    public async setListOrder(tagId: TagID, order: ListAlgorithm) {
+        await this.setAndPersistListOrder(tagId, order);
+        this.updateFn.trigger();
+    }
+
+    private async setAndPersistListOrder(tagId: TagID, order: ListAlgorithm) {
+        await this.algorithm.setListOrdering(tagId, order);
+        // TODO: Per-account? https://github.com/vector-im/element-web/issues/14114
+        localStorage.setItem(`mx_listOrder_${tagId}`, order);
+    }
+
+    public getListOrder(tagId: TagID): ListAlgorithm {
+        return this.algorithm.getListOrdering(tagId);
+    }
+
+    // noinspection JSMethodCanBeStatic
+    private getStoredListOrder(tagId: TagID): ListAlgorithm {
+        // TODO: Per-account? https://github.com/vector-im/element-web/issues/14114
+        return <ListAlgorithm>localStorage.getItem(`mx_listOrder_${tagId}`);
+    }
+
+    // logic must match calculateTagSorting
+    private calculateListOrder(tagId: TagID): ListAlgorithm {
+        const defaultOrder = ListAlgorithm.Natural;
+        const settingImportance = SettingsStore.getValue("RoomList.orderByImportance", null, true);
+        const definedOrder = this.getListOrder(tagId);
+        const storedOrder = this.getStoredListOrder(tagId);
+
+        // We use the following order to determine which of the 4 flags to use:
+        // Stored > Settings > Defined > Default
+
+        let listOrder = defaultOrder;
+        if (storedOrder) {
+            listOrder = storedOrder;
+        } else if (!isNullOrUndefined(settingImportance)) {
+            listOrder = settingImportance ? ListAlgorithm.Importance : ListAlgorithm.Natural;
+        } else if (definedOrder) {
+            listOrder = definedOrder;
+        } // else default (already set)
+
+        return listOrder;
+    }
+
+    private async updateAlgorithmInstances() {
+        // We'll require an update, so mark for one. Marking now also prevents the calls
+        // to setTagSorting and setListOrder from causing triggers.
+        this.updateFn.mark();
+
+        for (const tag of Object.keys(this.orderedLists)) {
+            const definedSort = this.getTagSorting(tag);
+            const definedOrder = this.getListOrder(tag);
+
+            const tagSort = this.calculateTagSorting(tag);
+            const listOrder = this.calculateListOrder(tag);
+
+            if (tagSort !== definedSort) {
+                await this.setAndPersistTagSorting(tag, tagSort);
+            }
+            if (listOrder !== definedOrder) {
+                await this.setAndPersistListOrder(tag, listOrder);
+            }
+        }
+    }
+
+    private onAlgorithmListUpdated = () => {
+        if (SettingsStore.getValue("advancedRoomListLogging")) {
+            // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+            console.log("Underlying algorithm has triggered a list update - marking");
+        }
+        this.updateFn.mark();
+    };
+
+    private onAlgorithmFilterUpdated = () => {
+        // The filter can happen off-cycle, so trigger an update. The filter will have
+        // already caused a mark.
+        this.updateFn.trigger();
+    };
+
+    /**
+     * Regenerates the room whole room list, discarding any previous results.
+     *
+     * Note: This is only exposed externally for the tests. Do not call this from within
+     * the app.
+     * @param trigger Set to false to prevent a list update from being sent. Should only
+     * be used if the calling code will manually trigger the update.
+     */
+    public async regenerateAllLists({trigger = true}) {
+        console.warn("Regenerating all room lists");
+
+        const rooms = this.matrixClient.getVisibleRooms();
+        const customTags = new Set<TagID>();
+        if (this.state.tagsEnabled) {
+            for (const room of rooms) {
+                if (!room.tags) continue;
+                const tags = Object.keys(room.tags).filter(t => isCustomTag(t));
+                tags.forEach(t => customTags.add(t));
+            }
+        }
+
+        const sorts: ITagSortingMap = {};
+        const orders: IListOrderingMap = {};
+        const allTags = [...OrderedDefaultTagIDs, ...Array.from(customTags)];
+        for (const tagId of allTags) {
+            sorts[tagId] = this.calculateTagSorting(tagId);
+            orders[tagId] = this.calculateListOrder(tagId);
+
+            RoomListLayoutStore.instance.ensureLayoutExists(tagId);
+        }
+
+        await this.algorithm.populateTags(sorts, orders);
+        await this.algorithm.setKnownRooms(rooms);
+
+        this.initialListsGenerated = true;
+
+        if (trigger) this.updateFn.trigger();
+    }
+
+    public addFilter(filter: IFilterCondition): void {
+        if (SettingsStore.getValue("advancedRoomListLogging")) {
+            // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+            console.log("Adding filter condition:", filter);
+        }
+        this.filterConditions.push(filter);
+        if (this.algorithm) {
+            this.algorithm.addFilterCondition(filter);
+        }
+        this.updateFn.trigger();
+    }
+
+    public removeFilter(filter: IFilterCondition): void {
+        if (SettingsStore.getValue("advancedRoomListLogging")) {
+            // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+            console.log("Removing filter condition:", filter);
+        }
+        const idx = this.filterConditions.indexOf(filter);
+        if (idx >= 0) {
+            this.filterConditions.splice(idx, 1);
+
+            if (this.algorithm) {
+                this.algorithm.removeFilterCondition(filter);
+            }
+        }
+        this.updateFn.trigger();
+    }
+
+    /**
+     * Gets the first (and ideally only) name filter condition. If one isn't present,
+     * this returns null.
+     * @returns The first name filter condition, or null if none.
+     */
+    public getFirstNameFilterCondition(): NameFilterCondition | null {
+        for (const filter of this.filterConditions) {
+            if (filter instanceof NameFilterCondition) {
+                return filter;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Gets the tags for a room identified by the store. The returned set
+     * should never be empty, and will contain DefaultTagID.Untagged if
+     * the store is not aware of any tags.
+     * @param room The room to get the tags for.
+     * @returns The tags for the room.
+     */
+    public getTagsForRoom(room: Room): TagID[] {
+        const algorithmTags = this.algorithm.getTagsForRoom(room);
+        if (!algorithmTags) return [DefaultTagID.Untagged];
+        return algorithmTags;
+    }
+}
+
+export default class RoomListStore {
+    private static internalInstance: RoomListStoreClass;
+
+    public static get instance(): RoomListStoreClass {
+        if (!RoomListStore.internalInstance) {
+            RoomListStore.internalInstance = new RoomListStoreClass();
+        }
+
+        return RoomListStore.internalInstance;
+    }
+}
+
+window.mxRoomListStore = RoomListStore.instance;
diff --git a/src/stores/room-list/TagWatcher.ts b/src/stores/room-list/TagWatcher.ts
new file mode 100644
index 0000000000..dc445d10ba
--- /dev/null
+++ b/src/stores/room-list/TagWatcher.ts
@@ -0,0 +1,81 @@
+/*
+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 { RoomListStoreClass } from "./RoomListStore";
+import TagOrderStore from "../TagOrderStore";
+import { CommunityFilterCondition } from "./filters/CommunityFilterCondition";
+import { arrayDiff, arrayHasDiff } from "../../utils/arrays";
+
+/**
+ * Watches for changes in groups to manage filters on the provided RoomListStore
+ */
+export class TagWatcher {
+    private filters = new Map<string, CommunityFilterCondition>();
+
+    constructor(private store: RoomListStoreClass) {
+        TagOrderStore.addListener(this.onTagsUpdated);
+    }
+
+    private onTagsUpdated = () => {
+        const lastTags = Array.from(this.filters.keys());
+        const newTags = TagOrderStore.getSelectedTags();
+
+        if (arrayHasDiff(lastTags, newTags)) {
+            // Selected tags changed, do some filtering
+
+            if (!this.store.matrixClient) {
+                console.warn("Tag update without an associated matrix client - ignoring");
+                return;
+            }
+
+            const newFilters = new Map<string, CommunityFilterCondition>();
+            const filterableTags = newTags.filter(t => t.startsWith("+"));
+
+            for (const tag of filterableTags) {
+                const group = this.store.matrixClient.getGroup(tag);
+                if (!group) {
+                    console.warn(`Group selected with no group object available: ${tag}`);
+                    continue;
+                }
+
+                let filter = this.filters.get(tag);
+                if (!filter) {
+                    filter = new CommunityFilterCondition(group);
+                }
+                newFilters.set(tag, filter);
+            }
+
+            // Update the room list store's filters
+            const diff = arrayDiff(lastTags, newTags);
+            for (const tag of diff.added) {
+                const filter = newFilters.get(tag);
+                if (!filter) continue;
+
+                this.store.addFilter(filter);
+            }
+            for (const tag of diff.removed) {
+                // TODO: Remove this check when custom tags are supported (as we shouldn't be losing filters)
+                const filter = this.filters.get(tag);
+                if (!filter) continue;
+
+                this.store.removeFilter(filter);
+                filter.destroy();
+            }
+
+            this.filters = newFilters;
+        }
+    };
+}
diff --git a/src/stores/room-list/algorithms/Algorithm.ts b/src/stores/room-list/algorithms/Algorithm.ts
new file mode 100644
index 0000000000..439141edb4
--- /dev/null
+++ b/src/stores/room-list/algorithms/Algorithm.ts
@@ -0,0 +1,851 @@
+/*
+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 { isNullOrUndefined } from "matrix-js-sdk/src/utils";
+import DMRoomMap from "../../../utils/DMRoomMap";
+import { EventEmitter } from "events";
+import { arrayDiff, arrayHasDiff, ArrayUtil } from "../../../utils/arrays";
+import { getEnumValues } from "../../../utils/enums";
+import { DefaultTagID, RoomUpdateCause, TagID } from "../models";
+import {
+    IListOrderingMap,
+    IOrderingAlgorithmMap,
+    ITagMap,
+    ITagSortingMap,
+    ListAlgorithm,
+    SortAlgorithm,
+} from "./models";
+import { FILTER_CHANGED, FilterPriority, IFilterCondition } from "../filters/IFilterCondition";
+import { EffectiveMembership, getEffectiveMembership, splitRoomsByMembership } from "../../../utils/membership";
+import { OrderingAlgorithm } from "./list-ordering/OrderingAlgorithm";
+import { getListAlgorithmInstance } from "./list-ordering";
+import SettingsStore from "../../../settings/SettingsStore";
+
+/**
+ * Fired when the Algorithm has determined a list has been updated.
+ */
+export const LIST_UPDATED_EVENT = "list_updated_event";
+
+// These are the causes which require a room to be known in order for us to handle them. If
+// a cause in this list is raised and we don't know about the room, we don't handle the update.
+//
+// Note: these typically happen when a new room is coming in, such as the user creating or
+// joining the room. For these cases, we need to know about the room prior to handling it otherwise
+// we'll make bad assumptions.
+const CAUSES_REQUIRING_ROOM = [
+    RoomUpdateCause.Timeline,
+    RoomUpdateCause.ReadReceipt,
+];
+
+interface IStickyRoom {
+    room: Room;
+    position: number;
+    tag: TagID;
+}
+
+/**
+ * Represents a list ordering algorithm. This class will take care of tag
+ * management (which rooms go in which tags) and ask the implementation to
+ * deal with ordering mechanics.
+ */
+export class Algorithm extends EventEmitter {
+    private _cachedRooms: ITagMap = {};
+    private _cachedStickyRooms: ITagMap = {}; // a clone of the _cachedRooms, with the sticky room
+    private filteredRooms: ITagMap = {};
+    private _stickyRoom: IStickyRoom = null;
+    private _lastStickyRoom: IStickyRoom = null; // only not-null when changing the sticky room
+    private sortAlgorithms: ITagSortingMap;
+    private listAlgorithms: IListOrderingMap;
+    private algorithms: IOrderingAlgorithmMap;
+    private rooms: Room[] = [];
+    private roomIdsToTags: {
+        [roomId: string]: TagID[];
+    } = {};
+    private allowedByFilter: Map<IFilterCondition, Room[]> = new Map<IFilterCondition, Room[]>();
+    private allowedRoomsByFilters: Set<Room> = new Set<Room>();
+
+    public constructor() {
+        super();
+    }
+
+    public get stickyRoom(): Room {
+        return this._stickyRoom ? this._stickyRoom.room : null;
+    }
+
+    protected get hasFilters(): boolean {
+        return this.allowedByFilter.size > 0;
+    }
+
+    protected set cachedRooms(val: ITagMap) {
+        this._cachedRooms = val;
+        this.recalculateFilteredRooms();
+        this.recalculateStickyRoom();
+    }
+
+    protected get cachedRooms(): ITagMap {
+        // 🐉 Here be dragons.
+        // Note: this is used by the underlying algorithm classes, so don't make it return
+        // the sticky room cache. If it ends up returning the sticky room cache, we end up
+        // corrupting our caches and confusing them.
+        return this._cachedRooms;
+    }
+
+    /**
+     * Awaitable version of the sticky room setter.
+     * @param val The new room to sticky.
+     */
+    public async setStickyRoom(val: Room) {
+        await this.updateStickyRoom(val);
+    }
+
+    public getTagSorting(tagId: TagID): SortAlgorithm {
+        if (!this.sortAlgorithms) return null;
+        return this.sortAlgorithms[tagId];
+    }
+
+    public async setTagSorting(tagId: TagID, sort: SortAlgorithm) {
+        if (!tagId) throw new Error("Tag ID must be defined");
+        if (!sort) throw new Error("Algorithm must be defined");
+        this.sortAlgorithms[tagId] = sort;
+
+        const algorithm: OrderingAlgorithm = this.algorithms[tagId];
+        await algorithm.setSortAlgorithm(sort);
+        this._cachedRooms[tagId] = algorithm.orderedRooms;
+        this.recalculateFilteredRoomsForTag(tagId); // update filter to re-sort the list
+        this.recalculateStickyRoom(tagId); // update sticky room to make sure it appears if needed
+    }
+
+    public getListOrdering(tagId: TagID): ListAlgorithm {
+        if (!this.listAlgorithms) return null;
+        return this.listAlgorithms[tagId];
+    }
+
+    public async setListOrdering(tagId: TagID, order: ListAlgorithm) {
+        if (!tagId) throw new Error("Tag ID must be defined");
+        if (!order) throw new Error("Algorithm must be defined");
+        this.listAlgorithms[tagId] = order;
+
+        const algorithm = getListAlgorithmInstance(order, tagId, this.sortAlgorithms[tagId]);
+        this.algorithms[tagId] = algorithm;
+
+        await algorithm.setRooms(this._cachedRooms[tagId]);
+        this._cachedRooms[tagId] = algorithm.orderedRooms;
+        this.recalculateFilteredRoomsForTag(tagId); // update filter to re-sort the list
+        this.recalculateStickyRoom(tagId); // update sticky room to make sure it appears if needed
+    }
+
+    public addFilterCondition(filterCondition: IFilterCondition): void {
+        // Populate the cache of the new filter
+        this.allowedByFilter.set(filterCondition, this.rooms.filter(r => filterCondition.isVisible(r)));
+        this.recalculateFilteredRooms();
+        filterCondition.on(FILTER_CHANGED, this.handleFilterChange.bind(this));
+    }
+
+    public removeFilterCondition(filterCondition: IFilterCondition): void {
+        filterCondition.off(FILTER_CHANGED, this.handleFilterChange.bind(this));
+        if (this.allowedByFilter.has(filterCondition)) {
+            this.allowedByFilter.delete(filterCondition);
+            this.recalculateFilteredRooms();
+
+            // If we removed the last filter, tell consumers that we've "updated" our filtered
+            // view. This will trick them into getting the complete room list.
+            if (!this.hasFilters) {
+                this.emit(LIST_UPDATED_EVENT);
+            }
+        }
+    }
+
+    private async handleFilterChange() {
+        await this.recalculateFilteredRooms();
+
+        // re-emit the update so the list store can fire an off-cycle update if needed
+        this.emit(FILTER_CHANGED);
+    }
+
+    private async updateStickyRoom(val: Room) {
+        try {
+            return await this.doUpdateStickyRoom(val);
+        } finally {
+            this._lastStickyRoom = null; // clear to indicate we're done changing
+        }
+    }
+
+    private async doUpdateStickyRoom(val: Room) {
+        // Note throughout: We need async so we can wait for handleRoomUpdate() to do its thing,
+        // otherwise we risk duplicating rooms.
+
+        // 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>{};
+
+        // It's possible to have no selected room. In that case, clear the sticky room
+        if (!val) {
+            if (this._stickyRoom) {
+                const stickyRoom = this._stickyRoom.room;
+                this._stickyRoom = null; // clear before we go to update the algorithm
+
+                // Lie to the algorithm and re-add the room to the algorithm
+                await this.handleRoomUpdate(stickyRoom, RoomUpdateCause.NewRoom);
+                return;
+            }
+            return;
+        }
+
+        // When we do have a room though, we expect to be able to find it
+        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
+        // means we'll be off by 1 when the user is switching rooms. This leads to visual jumping
+        // when the user is moving south in the list (not north, because of math).
+        const tagList = this.getOrderedRoomsWithoutSticky()[tag] || []; // can be null if filtering
+        let position = tagList.indexOf(val);
+
+        // We do want to see if a tag change happened though - if this did happen then we'll want
+        // to force the position to zero (top) to ensure we can properly handle it.
+        const wasSticky = this._lastStickyRoom.room ? this._lastStickyRoom.room.roomId === val.roomId : false;
+        if (this._lastStickyRoom.tag && tag !== this._lastStickyRoom.tag && wasSticky && position < 0) {
+            console.warn(`Sticky room ${val.roomId} changed tags during sticky room handling`);
+            position = 0;
+        }
+
+        // Sanity check the position to make sure the room is qualified for being sticky
+        if (position < 0) throw new Error(`${val.roomId} does not appear to be known and cannot be sticky`);
+
+        // 🐉 Here be dragons.
+        // Before we can go through with lying to the underlying algorithm about a room
+        // we need to ensure that when we do we're ready for the inevitable sticky room
+        // update we'll receive. To prepare for that, we first remove the sticky room and
+        // recalculate the state ourselves so that when the underlying algorithm calls for
+        // the same thing it no-ops. After we're done calling the algorithm, we'll issue
+        // a new update for ourselves.
+        const lastStickyRoom = this._stickyRoom;
+        this._stickyRoom = null; // clear before we update the algorithm
+        this.recalculateStickyRoom();
+
+        // When we do have the room, re-add the old room (if needed) to the algorithm
+        // and remove the sticky room from the algorithm. This is so the underlying
+        // algorithm doesn't try and confuse itself with the sticky room concept.
+        // We don't add the new room if the sticky room isn't changing because that's
+        // an easy way to cause duplication. We have to do room ID checks instead of
+        // referential checks as the references can differ through the lifecycle.
+        if (lastStickyRoom && lastStickyRoom.room && lastStickyRoom.room.roomId !== val.roomId) {
+            // Lie to the algorithm and re-add the room to the algorithm
+            await this.handleRoomUpdate(lastStickyRoom.room, RoomUpdateCause.NewRoom);
+        }
+        // Lie to the algorithm and remove the room from it's field of view
+        await this.handleRoomUpdate(val, RoomUpdateCause.RoomRemoved);
+
+        // Check for tag & position changes while we're here. We also check the room to ensure
+        // it is still the same room.
+        if (this._stickyRoom) {
+            if (this._stickyRoom.room !== val) {
+                // Check the room IDs just in case
+                if (this._stickyRoom.room.roomId === val.roomId) {
+                    console.warn("Sticky room changed references");
+                } else {
+                    throw new Error("Sticky room changed while the sticky room was changing");
+                }
+            }
+
+            console.warn(`Sticky room changed tag & position from ${tag} / ${position} `
+                + `to ${this._stickyRoom.tag} / ${this._stickyRoom.position}`);
+
+            tag = this._stickyRoom.tag;
+            position = this._stickyRoom.position;
+        }
+
+        // Now that we're done lying to the algorithm, we need to update our position
+        // marker only if the user is moving further down the same list. If they're switching
+        // lists, or moving upwards, the position marker will splice in just fine but if
+        // they went downwards in the same list we'll be off by 1 due to the shifting rooms.
+        if (lastStickyRoom && lastStickyRoom.tag === tag && lastStickyRoom.position <= position) {
+            position++;
+        }
+
+        this._stickyRoom = {
+            room: val,
+            position: position,
+            tag: tag,
+        };
+
+        // We update the filtered rooms just in case, as otherwise users will end up visiting
+        // a room while filtering and it'll disappear. We don't update the filter earlier in
+        // this function simply because we don't have to.
+        this.recalculateFilteredRoomsForTag(tag);
+        if (lastStickyRoom && lastStickyRoom.tag !== tag) this.recalculateFilteredRoomsForTag(lastStickyRoom.tag);
+        this.recalculateStickyRoom();
+
+        // Finally, trigger an update
+        this.emit(LIST_UPDATED_EVENT);
+    }
+
+    protected recalculateFilteredRooms() {
+        if (!this.hasFilters) {
+            return;
+        }
+
+        console.warn("Recalculating filtered room list");
+        const filters = Array.from(this.allowedByFilter.keys());
+        const orderedFilters = new ArrayUtil(filters)
+            .groupBy(f => f.relativePriority)
+            .orderBy(getEnumValues(FilterPriority))
+            .value;
+        const newMap: ITagMap = {};
+        for (const tagId of Object.keys(this.cachedRooms)) {
+            // Cheaply clone the rooms so we can more easily do operations on the list.
+            // We optimize our lookups by trying to reduce sample size as much as possible
+            // to the rooms we know will be deduped by the Set.
+            const rooms = this.cachedRooms[tagId].map(r => r); // cheap clone
+            this.tryInsertStickyRoomToFilterSet(rooms, tagId);
+            let remainingRooms = rooms.map(r => r);
+            let allowedRoomsInThisTag = [];
+            let lastFilterPriority = orderedFilters[0].relativePriority;
+            for (const filter of orderedFilters) {
+                if (filter.relativePriority !== lastFilterPriority) {
+                    // Every time the filter changes priority, we want more specific filtering.
+                    // To accomplish that, reset the variables to make it look like the process
+                    // has started over, but using the filtered rooms as the seed.
+                    remainingRooms = allowedRoomsInThisTag;
+                    allowedRoomsInThisTag = [];
+                    lastFilterPriority = filter.relativePriority;
+                }
+                const filteredRooms = remainingRooms.filter(r => filter.isVisible(r));
+                for (const room of filteredRooms) {
+                    const idx = remainingRooms.indexOf(room);
+                    if (idx >= 0) remainingRooms.splice(idx, 1);
+                    allowedRoomsInThisTag.push(room);
+                }
+            }
+            newMap[tagId] = allowedRoomsInThisTag;
+
+            if (SettingsStore.getValue("advancedRoomListLogging")) {
+                // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+                console.log(`[DEBUG] ${newMap[tagId].length}/${rooms.length} rooms filtered into ${tagId}`);
+            }
+        }
+
+        const allowedRooms = Object.values(newMap).reduce((rv, v) => { rv.push(...v); return rv; }, <Room[]>[]);
+        this.allowedRoomsByFilters = new Set(allowedRooms);
+        this.filteredRooms = newMap;
+        this.emit(LIST_UPDATED_EVENT);
+    }
+
+    protected recalculateFilteredRoomsForTag(tagId: TagID): void {
+        if (!this.hasFilters) return; // don't bother doing work if there's nothing to do
+
+        if (SettingsStore.getValue("advancedRoomListLogging")) {
+            // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+            console.log(`Recalculating filtered rooms for ${tagId}`);
+        }
+        delete this.filteredRooms[tagId];
+        const rooms = this.cachedRooms[tagId].map(r => r); // cheap clone
+        this.tryInsertStickyRoomToFilterSet(rooms, tagId);
+        const filteredRooms = rooms.filter(r => this.allowedRoomsByFilters.has(r));
+        if (filteredRooms.length > 0) {
+            this.filteredRooms[tagId] = filteredRooms;
+        }
+
+        if (SettingsStore.getValue("advancedRoomListLogging")) {
+            // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+            console.log(`[DEBUG] ${filteredRooms.length}/${rooms.length} rooms filtered into ${tagId}`);
+        }
+    }
+
+    protected tryInsertStickyRoomToFilterSet(rooms: Room[], tagId: TagID) {
+        if (!this._stickyRoom || !this._stickyRoom.room || this._stickyRoom.tag !== tagId) return;
+
+        const position = this._stickyRoom.position;
+        if (position >= rooms.length) {
+            rooms.push(this._stickyRoom.room);
+        } else {
+            rooms.splice(position, 0, this._stickyRoom.room);
+        }
+    }
+
+    /**
+     * Recalculate the sticky room position. If this is being called in relation to
+     * a specific tag being updated, it should be given to this function to optimize
+     * the call.
+     * @param updatedTag The tag that was updated, if possible.
+     */
+    protected recalculateStickyRoom(updatedTag: TagID = null): void {
+        // 🐉 Here be dragons.
+        // This function does far too much for what it should, and is called by many places.
+        // Not only is this responsible for ensuring the sticky room is held in place at all
+        // times, it is also responsible for ensuring our clone of the cachedRooms is up to
+        // date. If either of these desyncs, we see weird behaviour like duplicated rooms,
+        // outdated lists, and other nonsensical issues that aren't necessarily obvious.
+
+        if (!this._stickyRoom) {
+            // If there's no sticky room, just do nothing useful.
+            if (!!this._cachedStickyRooms) {
+                // Clear the cache if we won't be needing it
+                this._cachedStickyRooms = null;
+                this.emit(LIST_UPDATED_EVENT);
+            }
+            return;
+        }
+
+        if (!this._cachedStickyRooms || !updatedTag) {
+            if (SettingsStore.getValue("advancedRoomListLogging")) {
+                // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+                console.log(`Generating clone of cached rooms for sticky room handling`);
+            }
+            const stickiedTagMap: ITagMap = {};
+            for (const tagId of Object.keys(this.cachedRooms)) {
+                stickiedTagMap[tagId] = this.cachedRooms[tagId].map(r => r); // shallow clone
+            }
+            this._cachedStickyRooms = stickiedTagMap;
+        }
+
+        if (updatedTag) {
+            // Update the tag indicated by the caller, if possible. This is mostly to ensure
+            // our cache is up to date.
+            if (SettingsStore.getValue("advancedRoomListLogging")) {
+                // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+                console.log(`Replacing cached sticky rooms for ${updatedTag}`);
+            }
+            this._cachedStickyRooms[updatedTag] = this.cachedRooms[updatedTag].map(r => r); // shallow clone
+        }
+
+        // Now try to insert the sticky room, if we need to.
+        // We need to if there's no updated tag (we regenned the whole cache) or if the tag
+        // we might have updated from the cache is also our sticky room.
+        const sticky = this._stickyRoom;
+        if (!updatedTag || updatedTag === sticky.tag) {
+            if (SettingsStore.getValue("advancedRoomListLogging")) {
+                // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+                console.log(
+                    `Inserting sticky room ${sticky.room.roomId} at position ${sticky.position} in ${sticky.tag}`,
+                );
+            }
+            this._cachedStickyRooms[sticky.tag].splice(sticky.position, 0, sticky.room);
+        }
+
+        // Finally, trigger an update
+        this.emit(LIST_UPDATED_EVENT);
+    }
+
+    /**
+     * Asks the Algorithm to regenerate all lists, using the tags given
+     * as reference for which lists to generate and which way to generate
+     * them.
+     * @param {ITagSortingMap} tagSortingMap The tags to generate.
+     * @param {IListOrderingMap} listOrderingMap The ordering of those tags.
+     * @returns {Promise<*>} A promise which resolves when complete.
+     */
+    public async populateTags(tagSortingMap: ITagSortingMap, listOrderingMap: IListOrderingMap): Promise<any> {
+        if (!tagSortingMap) throw new Error(`Sorting map cannot be null or empty`);
+        if (!listOrderingMap) throw new Error(`Ordering ma cannot be null or empty`);
+        if (arrayHasDiff(Object.keys(tagSortingMap), Object.keys(listOrderingMap))) {
+            throw new Error(`Both maps must contain the exact same tags`);
+        }
+        this.sortAlgorithms = tagSortingMap;
+        this.listAlgorithms = listOrderingMap;
+        this.algorithms = {};
+        for (const tag of Object.keys(tagSortingMap)) {
+            this.algorithms[tag] = getListAlgorithmInstance(this.listAlgorithms[tag], tag, this.sortAlgorithms[tag]);
+        }
+        return this.setKnownRooms(this.rooms);
+    }
+
+    /**
+     * Gets an ordered set of rooms for the all known tags, filtered.
+     * @returns {ITagMap} The cached list of rooms, ordered,
+     * for each tag. May be empty, but never null/undefined.
+     */
+    public getOrderedRooms(): ITagMap {
+        if (!this.hasFilters) {
+            return this._cachedStickyRooms || this.cachedRooms;
+        }
+        return this.filteredRooms;
+    }
+
+    public getUnfilteredRooms(): ITagMap {
+        return this._cachedStickyRooms || this.cachedRooms;
+    }
+
+    /**
+     * This returns the same as getOrderedRooms(), but without the sticky room
+     * map as it causes issues for sticky room handling (see sticky room handling
+     * for more information).
+     * @returns {ITagMap} The cached list of rooms, ordered,
+     * for each tag. May be empty, but never null/undefined.
+     */
+    private getOrderedRoomsWithoutSticky(): ITagMap {
+        if (!this.hasFilters) {
+            return this.cachedRooms;
+        }
+        return this.filteredRooms;
+    }
+
+    /**
+     * Seeds the Algorithm with a set of rooms. The algorithm will discard all
+     * previously known information and instead use these rooms instead.
+     * @param {Room[]} rooms The rooms to force the algorithm to use.
+     * @returns {Promise<*>} A promise which resolves when complete.
+     */
+    public async setKnownRooms(rooms: Room[]): Promise<any> {
+        if (isNullOrUndefined(rooms)) throw new Error(`Array of rooms cannot be null`);
+        if (!this.sortAlgorithms) throw new Error(`Cannot set known rooms without a tag sorting map`);
+
+        console.warn("Resetting known rooms, initiating regeneration");
+
+        // Before we go any further we need to clear (but remember) the sticky room to
+        // avoid accidentally duplicating it in the list.
+        const oldStickyRoom = this._stickyRoom;
+        await this.updateStickyRoom(null);
+
+        this.rooms = rooms;
+
+        const newTags: ITagMap = {};
+        for (const tagId in this.sortAlgorithms) {
+            // noinspection JSUnfilteredForInLoop
+            newTags[tagId] = [];
+        }
+
+        // If we can avoid doing work, do so.
+        if (!rooms.length) {
+            await this.generateFreshTags(newTags); // just in case it wants to do something
+            this.cachedRooms = newTags;
+            return;
+        }
+
+        // Split out the easy rooms first (leave and invite)
+        const memberships = splitRoomsByMembership(rooms);
+        for (const room of memberships[EffectiveMembership.Invite]) {
+            newTags[DefaultTagID.Invite].push(room);
+        }
+        for (const room of memberships[EffectiveMembership.Leave]) {
+            newTags[DefaultTagID.Archived].push(room);
+        }
+
+        // Now process all the joined rooms. This is a bit more complicated
+        for (const room of memberships[EffectiveMembership.Join]) {
+            const tags = this.getTagsOfJoinedRoom(room);
+
+            let inTag = false;
+            if (tags.length > 0) {
+                for (const tag of tags) {
+                    if (!isNullOrUndefined(newTags[tag])) {
+                        newTags[tag].push(room);
+                        inTag = true;
+                    }
+                }
+            }
+
+            if (!inTag) {
+                if (DMRoomMap.shared().getUserIdForRoomId(room.roomId)) {
+                    newTags[DefaultTagID.DM].push(room);
+                } else {
+                    newTags[DefaultTagID.Untagged].push(room);
+                }
+            }
+        }
+
+        await this.generateFreshTags(newTags);
+
+        this.cachedRooms = newTags;
+        this.updateTagsFromCache();
+        this.recalculateFilteredRooms();
+
+        // Now that we've finished generation, we need to update the sticky room to what
+        // it was. It's entirely possible that it changed lists though, so if it did then
+        // we also have to update the position of it.
+        if (oldStickyRoom && oldStickyRoom.room) {
+            await this.updateStickyRoom(oldStickyRoom.room);
+            if (this._stickyRoom && this._stickyRoom.room) { // just in case the update doesn't go according to plan
+                if (this._stickyRoom.tag !== oldStickyRoom.tag) {
+                    // We put the sticky room at the top of the list to treat it as an obvious tag change.
+                    this._stickyRoom.position = 0;
+                    this.recalculateStickyRoom(this._stickyRoom.tag);
+                }
+            }
+        }
+    }
+
+    public getTagsForRoom(room: Room): TagID[] {
+        const tags: TagID[] = [];
+
+        const membership = getEffectiveMembership(room.getMyMembership());
+        if (membership === EffectiveMembership.Invite) {
+            tags.push(DefaultTagID.Invite);
+        } else if (membership === EffectiveMembership.Leave) {
+            tags.push(DefaultTagID.Archived);
+        } else {
+            tags.push(...this.getTagsOfJoinedRoom(room));
+        }
+
+        if (!tags.length) tags.push(DefaultTagID.Untagged);
+
+        return tags;
+    }
+
+    private getTagsOfJoinedRoom(room: Room): TagID[] {
+        let tags = Object.keys(room.tags || {});
+
+        if (tags.length === 0) {
+            // Check to see if it's a DM if it isn't anything else
+            if (DMRoomMap.shared().getUserIdForRoomId(room.roomId)) {
+                tags = [DefaultTagID.DM];
+            }
+        }
+
+        return tags;
+    }
+
+    /**
+     * Updates the roomsToTags map
+     */
+    private updateTagsFromCache() {
+        const newMap = {};
+
+        const tags = Object.keys(this.cachedRooms);
+        for (const tagId of tags) {
+            const rooms = this.cachedRooms[tagId];
+            for (const room of rooms) {
+                if (!newMap[room.roomId]) newMap[room.roomId] = [];
+                newMap[room.roomId].push(tagId);
+            }
+        }
+
+        this.roomIdsToTags = newMap;
+    }
+
+    /**
+     * Called when the Algorithm believes a complete regeneration of the existing
+     * lists is needed.
+     * @param {ITagMap} updatedTagMap The tag map which needs populating. Each tag
+     * will already have the rooms which belong to it - they just need ordering. Must
+     * be mutated in place.
+     * @returns {Promise<*>} A promise which resolves when complete.
+     */
+    private async generateFreshTags(updatedTagMap: ITagMap): Promise<any> {
+        if (!this.algorithms) throw new Error("Not ready: no algorithms to determine tags from");
+
+        for (const tag of Object.keys(updatedTagMap)) {
+            const algorithm: OrderingAlgorithm = this.algorithms[tag];
+            if (!algorithm) throw new Error(`No algorithm for ${tag}`);
+
+            await algorithm.setRooms(updatedTagMap[tag]);
+            updatedTagMap[tag] = algorithm.orderedRooms;
+        }
+    }
+
+    /**
+     * Asks the Algorithm to update its knowledge of a room. For example, when
+     * a user tags a room, joins/creates a room, or leaves a room the Algorithm
+     * should be told that the room's info might have changed. The Algorithm
+     * may no-op this request if no changes are required.
+     * @param {Room} room The room which might have affected sorting.
+     * @param {RoomUpdateCause} cause The reason for the update being triggered.
+     * @returns {Promise<boolean>} A promise which resolve to true or false
+     * depending on whether or not getOrderedRooms() should be called after
+     * processing.
+     */
+    public async handleRoomUpdate(room: Room, cause: RoomUpdateCause): Promise<boolean> {
+        if (SettingsStore.getValue("advancedRoomListLogging")) {
+            // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+            console.log(`Handle room update for ${room.roomId} called with cause ${cause}`);
+        }
+        if (!this.algorithms) throw new Error("Not ready: no algorithms to determine tags from");
+
+        // Note: check the isSticky against the room ID just in case the reference is wrong
+        const isSticky = this._stickyRoom && this._stickyRoom.room && this._stickyRoom.room.roomId === room.roomId;
+        if (cause === RoomUpdateCause.NewRoom) {
+            const isForLastSticky = this._lastStickyRoom && this._lastStickyRoom.room === room;
+            const roomTags = this.roomIdsToTags[room.roomId];
+            const hasTags = roomTags && roomTags.length > 0;
+
+            // Don't change the cause if the last sticky room is being re-added. If we fail to
+            // pass the cause through as NewRoom, we'll fail to lie to the algorithm and thus
+            // lose the room.
+            if (hasTags && !isForLastSticky) {
+                console.warn(`${room.roomId} is reportedly new but is already known - assuming TagChange instead`);
+                cause = RoomUpdateCause.PossibleTagChange;
+            }
+
+            // Check to see if the room is known first
+            let knownRoomRef = this.rooms.includes(room);
+            if (hasTags && !knownRoomRef) {
+                console.warn(`${room.roomId} might be a reference change - attempting to update reference`);
+                this.rooms = this.rooms.map(r => r.roomId === room.roomId ? room : r);
+                knownRoomRef = this.rooms.includes(room);
+                if (!knownRoomRef) {
+                    console.warn(`${room.roomId} is still not referenced. It may be sticky.`);
+                }
+            }
+
+            // If we have tags for a room and don't have the room referenced, something went horribly
+            // wrong - the reference should have been updated above.
+            if (hasTags && !knownRoomRef && !isSticky) {
+                throw new Error(`${room.roomId} is missing from room array but is known - trying to find duplicate`);
+            }
+
+            // Like above, update the reference to the sticky room if we need to
+            if (hasTags && isSticky) {
+                // Go directly in and set the sticky room's new reference, being careful not
+                // to trigger a sticky room update ourselves.
+                this._stickyRoom.room = room;
+            }
+
+            // If after all that we're still a NewRoom update, add the room if applicable.
+            // We don't do this for the sticky room (because it causes duplication issues)
+            // or if we know about the reference (as it should be replaced).
+            if (cause === RoomUpdateCause.NewRoom && !isSticky && !knownRoomRef) {
+                this.rooms.push(room);
+            }
+        }
+
+        let didTagChange = false;
+        if (cause === RoomUpdateCause.PossibleTagChange) {
+            const oldTags = this.roomIdsToTags[room.roomId] || [];
+            const newTags = this.getTagsForRoom(room);
+            const diff = arrayDiff(oldTags, newTags);
+            if (diff.removed.length > 0 || diff.added.length > 0) {
+                for (const rmTag of diff.removed) {
+                    if (SettingsStore.getValue("advancedRoomListLogging")) {
+                        // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+                        console.log(`Removing ${room.roomId} from ${rmTag}`);
+                    }
+                    const algorithm: OrderingAlgorithm = this.algorithms[rmTag];
+                    if (!algorithm) throw new Error(`No algorithm for ${rmTag}`);
+                    await algorithm.handleRoomUpdate(room, RoomUpdateCause.RoomRemoved);
+                    this._cachedRooms[rmTag] = algorithm.orderedRooms;
+                    this.recalculateFilteredRoomsForTag(rmTag); // update filter to re-sort the list
+                    this.recalculateStickyRoom(rmTag); // update sticky room to make sure it moves if needed
+                }
+                for (const addTag of diff.added) {
+                    if (SettingsStore.getValue("advancedRoomListLogging")) {
+                        // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+                        console.log(`Adding ${room.roomId} to ${addTag}`);
+                    }
+                    const algorithm: OrderingAlgorithm = this.algorithms[addTag];
+                    if (!algorithm) throw new Error(`No algorithm for ${addTag}`);
+                    await algorithm.handleRoomUpdate(room, RoomUpdateCause.NewRoom);
+                    this._cachedRooms[addTag] = algorithm.orderedRooms;
+                }
+
+                // Update the tag map so we don't regen it in a moment
+                this.roomIdsToTags[room.roomId] = newTags;
+
+                if (SettingsStore.getValue("advancedRoomListLogging")) {
+                    // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+                    console.log(`Changing update cause for ${room.roomId} to Timeline to sort rooms`);
+                }
+                cause = RoomUpdateCause.Timeline;
+                didTagChange = true;
+            } else {
+                if (SettingsStore.getValue("advancedRoomListLogging")) {
+                    // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+                    console.log(`Received no-op update for ${room.roomId} - changing to Timeline update`);
+                }
+                cause = RoomUpdateCause.Timeline;
+            }
+
+            if (didTagChange && isSticky) {
+                // Manually update the tag for the sticky room without triggering a sticky room
+                // update. The update will be handled implicitly by the sticky room handling and
+                // requires no changes on our part, if we're in the middle of a sticky room change.
+                if (this._lastStickyRoom) {
+                    this._stickyRoom = {
+                        room,
+                        tag: this.roomIdsToTags[room.roomId][0],
+                        position: 0, // right at the top as it changed tags
+                    };
+                } else {
+                    // We have to clear the lock as the sticky room change will trigger updates.
+                    await this.setStickyRoom(room);
+                }
+            }
+        }
+
+        // If the update is for a room change which might be the sticky room, prevent it. We
+        // need to make sure that the causes (NewRoom and RoomRemoved) are still triggered though
+        // as the sticky room relies on this.
+        if (cause !== RoomUpdateCause.NewRoom && cause !== RoomUpdateCause.RoomRemoved) {
+            if (this.stickyRoom === room) {
+                if (SettingsStore.getValue("advancedRoomListLogging")) {
+                    // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+                    console.warn(`[RoomListDebug] Received ${cause} update for sticky room ${room.roomId} - ignoring`);
+                }
+                return false;
+            }
+        }
+
+        if (!this.roomIdsToTags[room.roomId]) {
+            if (CAUSES_REQUIRING_ROOM.includes(cause)) {
+                if (SettingsStore.getValue("advancedRoomListLogging")) {
+                    // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+                    console.warn(`Skipping tag update for ${room.roomId} because we don't know about the room`);
+                }
+                return false;
+            }
+
+            if (SettingsStore.getValue("advancedRoomListLogging")) {
+                // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+                console.log(`[RoomListDebug] Updating tags for room ${room.roomId} (${room.name})`);
+            }
+
+            // Get the tags for the room and populate the cache
+            const roomTags = this.getTagsForRoom(room).filter(t => !isNullOrUndefined(this.cachedRooms[t]));
+
+            // "This should never happen" condition - we specify DefaultTagID.Untagged in getTagsForRoom(),
+            // which means we should *always* have a tag to go off of.
+            if (!roomTags.length) throw new Error(`Tags cannot be determined for ${room.roomId}`);
+
+            this.roomIdsToTags[room.roomId] = roomTags;
+
+            if (SettingsStore.getValue("advancedRoomListLogging")) {
+                // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+                console.log(`[RoomListDebug] Updated tags for ${room.roomId}:`, roomTags);
+            }
+        }
+
+        if (SettingsStore.getValue("advancedRoomListLogging")) {
+            // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+            console.log(`[RoomListDebug] Reached algorithmic handling for ${room.roomId} and cause ${cause}`);
+        }
+
+        const tags = this.roomIdsToTags[room.roomId];
+        if (!tags) {
+            console.warn(`No tags known for "${room.name}" (${room.roomId})`);
+            return false;
+        }
+
+        let changed = didTagChange;
+        for (const tag of tags) {
+            const algorithm: OrderingAlgorithm = this.algorithms[tag];
+            if (!algorithm) throw new Error(`No algorithm for ${tag}`);
+
+            await algorithm.handleRoomUpdate(room, cause);
+            this._cachedRooms[tag] = algorithm.orderedRooms;
+
+            // Flag that we've done something
+            this.recalculateFilteredRoomsForTag(tag); // update filter to re-sort the list
+            this.recalculateStickyRoom(tag); // update sticky room to make sure it appears if needed
+            changed = true;
+        }
+
+        if (SettingsStore.getValue("advancedRoomListLogging")) {
+            // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
+            console.log(`[RoomListDebug] Finished handling ${room.roomId} with cause ${cause} (changed=${changed})`);
+        }
+        return changed;
+    }
+}
diff --git a/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts b/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts
new file mode 100644
index 0000000000..80bdf74afb
--- /dev/null
+++ b/src/stores/room-list/algorithms/list-ordering/ImportanceAlgorithm.ts
@@ -0,0 +1,277 @@
+/*
+Copyright 2018, 2019 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+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 { RoomUpdateCause, TagID } from "../../models";
+import { SortAlgorithm } from "../models";
+import { sortRoomsWithAlgorithm } from "../tag-sorting";
+import { OrderingAlgorithm } from "./OrderingAlgorithm";
+import { NotificationColor } from "../../../notifications/NotificationColor";
+import { RoomNotificationStateStore } from "../../../notifications/RoomNotificationStateStore";
+
+interface ICategorizedRoomMap {
+    // @ts-ignore - TS wants this to be a string, but we know better
+    [category: NotificationColor]: Room[];
+}
+
+interface ICategoryIndex {
+    // @ts-ignore - TS wants this to be a string, but we know better
+    [category: NotificationColor]: number; // integer
+}
+
+// Caution: changing this means you'll need to update a bunch of assumptions and
+// comments! Check the usage of Category carefully to figure out what needs changing
+// if you're going to change this array's order.
+const CATEGORY_ORDER = [
+    NotificationColor.Red,
+    NotificationColor.Grey,
+    NotificationColor.Bold,
+    NotificationColor.None, // idle
+];
+
+/**
+ * An implementation of the "importance" algorithm for room list sorting. Where
+ * the tag sorting algorithm does not interfere, rooms will be ordered into
+ * categories of varying importance to the user. Alphabetical sorting does not
+ * interfere with this algorithm, however manual ordering does.
+ *
+ * The importance of a room is defined by the kind of notifications, if any, are
+ * present on the room. These are classified internally as Red, Grey, Bold, and
+ * Idle. Red rooms have mentions, grey have unread messages, bold is a less noisy
+ * version of grey, and idle means all activity has been seen by the user.
+ *
+ * The algorithm works by monitoring all room changes, including new messages in
+ * tracked rooms, to determine if it needs a new category or different placement
+ * within the same category. For more information, see the comments contained
+ * within the class.
+ */
+export class ImportanceAlgorithm extends OrderingAlgorithm {
+    // This tracks the category for the tag it represents by tracking the index of
+    // each category within the list, where zero is the top of the list. This then
+    // tracks when rooms change categories and splices the orderedRooms array as
+    // needed, preventing many ordering operations.
+
+    private indices: ICategoryIndex = {};
+
+    public constructor(tagId: TagID, initialSortingAlgorithm: SortAlgorithm) {
+        super(tagId, initialSortingAlgorithm);
+    }
+
+    // noinspection JSMethodCanBeStatic
+    private categorizeRooms(rooms: Room[]): ICategorizedRoomMap {
+        const map: ICategorizedRoomMap = {
+            [NotificationColor.Red]: [],
+            [NotificationColor.Grey]: [],
+            [NotificationColor.Bold]: [],
+            [NotificationColor.None]: [],
+        };
+        for (const room of rooms) {
+            const category = this.getRoomCategory(room);
+            map[category].push(room);
+        }
+        return map;
+    }
+
+    // noinspection JSMethodCanBeStatic
+    private getRoomCategory(room: Room): NotificationColor {
+        // It's fine for us to call this a lot because it's cached, and we shouldn't be
+        // wasting anything by doing so as the store holds single references
+        const state = RoomNotificationStateStore.instance.getRoomState(room);
+        return state.color;
+    }
+
+    public async setRooms(rooms: Room[]): Promise<any> {
+        if (this.sortingAlgorithm === SortAlgorithm.Manual) {
+            this.cachedOrderedRooms = await sortRoomsWithAlgorithm(rooms, this.tagId, this.sortingAlgorithm);
+        } else {
+            // Every other sorting type affects the categories, not the whole tag.
+            const categorized = this.categorizeRooms(rooms);
+            for (const category of Object.keys(categorized)) {
+                const roomsToOrder = categorized[category];
+                categorized[category] = await sortRoomsWithAlgorithm(roomsToOrder, this.tagId, this.sortingAlgorithm);
+            }
+
+            const newlyOrganized: Room[] = [];
+            const newIndices: ICategoryIndex = {};
+
+            for (const category of CATEGORY_ORDER) {
+                newIndices[category] = newlyOrganized.length;
+                newlyOrganized.push(...categorized[category]);
+            }
+
+            this.indices = newIndices;
+            this.cachedOrderedRooms = newlyOrganized;
+        }
+    }
+
+    private async handleSplice(room: Room, cause: RoomUpdateCause): Promise<boolean> {
+        if (cause === RoomUpdateCause.NewRoom) {
+            const category = this.getRoomCategory(room);
+            this.alterCategoryPositionBy(category, 1, this.indices);
+            this.cachedOrderedRooms.splice(this.indices[category], 0, room); // splice in the new room (pre-adjusted)
+            await this.sortCategory(category);
+        } else if (cause === RoomUpdateCause.RoomRemoved) {
+            const roomIdx = this.getRoomIndex(room);
+            if (roomIdx === -1) {
+                console.warn(`Tried to remove unknown room from ${this.tagId}: ${room.roomId}`);
+                return false; // no change
+            }
+            const oldCategory = this.getCategoryFromIndices(roomIdx, this.indices);
+            this.alterCategoryPositionBy(oldCategory, -1, this.indices);
+            this.cachedOrderedRooms.splice(roomIdx, 1); // remove the room
+        } else {
+            throw new Error(`Unhandled splice: ${cause}`);
+        }
+
+        // changes have been made if we made it here, so say so
+        return true;
+    }
+
+    public async handleRoomUpdate(room: Room, cause: RoomUpdateCause): Promise<boolean> {
+        try {
+            await this.updateLock.acquireAsync();
+
+            if (cause === RoomUpdateCause.NewRoom || cause === RoomUpdateCause.RoomRemoved) {
+                return this.handleSplice(room, cause);
+            }
+
+            if (cause !== RoomUpdateCause.Timeline && cause !== RoomUpdateCause.ReadReceipt) {
+                throw new Error(`Unsupported update cause: ${cause}`);
+            }
+
+            const category = this.getRoomCategory(room);
+            if (this.sortingAlgorithm === SortAlgorithm.Manual) {
+                return; // Nothing to do here.
+            }
+
+            const roomIdx = this.getRoomIndex(room);
+            if (roomIdx === -1) {
+                throw new Error(`Room ${room.roomId} has no index in ${this.tagId}`);
+            }
+
+            // Try to avoid doing array operations if we don't have to: only move rooms within
+            // the categories if we're jumping categories
+            const oldCategory = this.getCategoryFromIndices(roomIdx, this.indices);
+            if (oldCategory !== category) {
+                // Move the room and update the indices
+                this.moveRoomIndexes(1, oldCategory, category, this.indices);
+                this.cachedOrderedRooms.splice(roomIdx, 1); // splice out the old index (fixed position)
+                this.cachedOrderedRooms.splice(this.indices[category], 0, room); // splice in the new room (pre-adjusted)
+                // Note: if moveRoomIndexes() is called after the splice then the insert operation
+                // will happen in the wrong place. Because we would have already adjusted the index
+                // for the category, we don't need to determine how the room is moving in the list.
+                // If we instead tried to insert before updating the indices, we'd have to determine
+                // whether the room was moving later (towards IDLE) or earlier (towards RED) from its
+                // current position, as it'll affect the category's start index after we remove the
+                // room from the array.
+            }
+
+            // Sort the category now that we've dumped the room in
+            await this.sortCategory(category);
+
+            return true; // change made
+        } finally {
+            await this.updateLock.release();
+        }
+    }
+
+    private async sortCategory(category: NotificationColor) {
+        // This should be relatively quick because the room is usually inserted at the top of the
+        // category, and most popular sorting algorithms will deal with trying to keep the active
+        // room at the top/start of the category. For the few algorithms that will have to move the
+        // thing quite far (alphabetic with a Z room for example), the list should already be sorted
+        // well enough that it can rip through the array and slot the changed room in quickly.
+        const nextCategoryStartIdx = category === CATEGORY_ORDER[CATEGORY_ORDER.length - 1]
+            ? Number.MAX_SAFE_INTEGER
+            : this.indices[CATEGORY_ORDER[CATEGORY_ORDER.indexOf(category) + 1]];
+        const startIdx = this.indices[category];
+        const numSort = nextCategoryStartIdx - startIdx; // splice() returns up to the max, so MAX_SAFE_INT is fine
+        const unsortedSlice = this.cachedOrderedRooms.splice(startIdx, numSort);
+        const sorted = await sortRoomsWithAlgorithm(unsortedSlice, this.tagId, this.sortingAlgorithm);
+        this.cachedOrderedRooms.splice(startIdx, 0, ...sorted);
+    }
+
+    // noinspection JSMethodCanBeStatic
+    private getCategoryFromIndices(index: number, indices: ICategoryIndex): NotificationColor {
+        for (let i = 0; i < CATEGORY_ORDER.length; i++) {
+            const category = CATEGORY_ORDER[i];
+            const isLast = i === (CATEGORY_ORDER.length - 1);
+            const startIdx = indices[category];
+            const endIdx = isLast ? Number.MAX_SAFE_INTEGER : indices[CATEGORY_ORDER[i + 1]];
+            if (index >= startIdx && index < endIdx) {
+                return category;
+            }
+        }
+
+        // "Should never happen" disclaimer goes here
+        throw new Error("Programming error: somehow you've ended up with an index that isn't in a category");
+    }
+
+    // noinspection JSMethodCanBeStatic
+    private moveRoomIndexes(
+        nRooms: number,
+        fromCategory: NotificationColor,
+        toCategory: NotificationColor,
+        indices: ICategoryIndex,
+    ) {
+        // We have to update the index of the category *after* the from/toCategory variables
+        // in order to update the indices correctly. Because the room is moving from/to those
+        // categories, the next category's index will change - not the category we're modifying.
+        // We also need to update subsequent categories as they'll all shift by nRooms, so we
+        // loop over the order to achieve that.
+
+        this.alterCategoryPositionBy(fromCategory, -nRooms, indices);
+        this.alterCategoryPositionBy(toCategory, +nRooms, indices);
+    }
+
+    private alterCategoryPositionBy(category: NotificationColor, n: number, indices: ICategoryIndex) {
+        // Note: when we alter a category's index, we actually have to modify the ones following
+        // the target and not the target itself.
+
+        // XXX: If this ever actually gets more than one room passed to it, it'll need more index
+        // handling. For instance, if 45 rooms are removed from the middle of a 50 room list, the
+        // index for the categories will be way off.
+
+        const nextOrderIndex = CATEGORY_ORDER.indexOf(category) + 1;
+        if (n > 0) {
+            for (let i = nextOrderIndex; i < CATEGORY_ORDER.length; i++) {
+                const nextCategory = CATEGORY_ORDER[i];
+                indices[nextCategory] += Math.abs(n);
+            }
+        } else if (n < 0) {
+            for (let i = nextOrderIndex; i < CATEGORY_ORDER.length; i++) {
+                const nextCategory = CATEGORY_ORDER[i];
+                indices[nextCategory] -= Math.abs(n);
+            }
+        }
+
+        // Do a quick check to see if we've completely broken the index
+        for (let i = 1; i <= CATEGORY_ORDER.length; i++) {
+            const lastCat = CATEGORY_ORDER[i - 1];
+            const thisCat = CATEGORY_ORDER[i];
+
+            if (indices[lastCat] > indices[thisCat]) {
+                // "should never happen" disclaimer goes here
+                console.warn(
+                    `!! Room list index corruption: ${lastCat} (i:${indices[lastCat]}) is greater ` +
+                    `than ${thisCat} (i:${indices[thisCat]}) - category indices are likely desynced from reality`);
+
+                // TODO: Regenerate index when this happens: https://github.com/vector-im/element-web/issues/14234
+            }
+        }
+    }
+}
diff --git a/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts b/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts
new file mode 100644
index 0000000000..cc2a28d892
--- /dev/null
+++ b/src/stores/room-list/algorithms/list-ordering/NaturalAlgorithm.ts
@@ -0,0 +1,70 @@
+/*
+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 { SortAlgorithm } from "../models";
+import { sortRoomsWithAlgorithm } from "../tag-sorting";
+import { OrderingAlgorithm } from "./OrderingAlgorithm";
+import { RoomUpdateCause, TagID } from "../../models";
+import { Room } from "matrix-js-sdk/src/models/room";
+
+/**
+ * Uses the natural tag sorting algorithm order to determine tag ordering. No
+ * additional behavioural changes are present.
+ */
+export class NaturalAlgorithm extends OrderingAlgorithm {
+    public constructor(tagId: TagID, initialSortingAlgorithm: SortAlgorithm) {
+        super(tagId, initialSortingAlgorithm);
+    }
+
+    public async setRooms(rooms: Room[]): Promise<any> {
+        this.cachedOrderedRooms = await sortRoomsWithAlgorithm(rooms, this.tagId, this.sortingAlgorithm);
+    }
+
+    public async handleRoomUpdate(room, cause): Promise<boolean> {
+        try {
+            await this.updateLock.acquireAsync();
+
+            const isSplice = cause === RoomUpdateCause.NewRoom || cause === RoomUpdateCause.RoomRemoved;
+            const isInPlace = cause === RoomUpdateCause.Timeline || cause === RoomUpdateCause.ReadReceipt;
+            if (!isSplice && !isInPlace) {
+                throw new Error(`Unsupported update cause: ${cause}`);
+            }
+
+            if (cause === RoomUpdateCause.NewRoom) {
+                this.cachedOrderedRooms.push(room);
+            } else if (cause === RoomUpdateCause.RoomRemoved) {
+                const idx = this.getRoomIndex(room);
+                if (idx >= 0) {
+                    this.cachedOrderedRooms.splice(idx, 1);
+                } else {
+                    console.warn(`Tried to remove unknown room from ${this.tagId}: ${room.roomId}`);
+                }
+            }
+
+            // TODO: Optimize this to avoid useless operations: https://github.com/vector-im/element-web/issues/14457
+            // For example, we can skip updates to alphabetic (sometimes) and manually ordered tags
+            this.cachedOrderedRooms = await sortRoomsWithAlgorithm(
+                this.cachedOrderedRooms,
+                this.tagId,
+                this.sortingAlgorithm,
+            );
+
+            return true;
+        } finally {
+            await this.updateLock.release();
+        }
+    }
+}
diff --git a/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts b/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts
new file mode 100644
index 0000000000..c47a35523c
--- /dev/null
+++ b/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts
@@ -0,0 +1,82 @@
+/*
+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 { RoomUpdateCause, TagID } from "../../models";
+import { SortAlgorithm } from "../models";
+import AwaitLock from "await-lock";
+
+/**
+ * Represents a list ordering algorithm. Subclasses should populate the
+ * `cachedOrderedRooms` field.
+ */
+export abstract class OrderingAlgorithm {
+    protected cachedOrderedRooms: Room[];
+    protected sortingAlgorithm: SortAlgorithm;
+    protected readonly updateLock = new AwaitLock();
+
+    protected constructor(protected tagId: TagID, initialSortingAlgorithm: SortAlgorithm) {
+        // noinspection JSIgnoredPromiseFromCall
+        this.setSortAlgorithm(initialSortingAlgorithm); // we use the setter for validation
+    }
+
+    /**
+     * The rooms as ordered by the algorithm.
+     */
+    public get orderedRooms(): Room[] {
+        return this.cachedOrderedRooms || [];
+    }
+
+    /**
+     * Sets the sorting algorithm to use within the list.
+     * @param newAlgorithm The new algorithm. Must be defined.
+     * @returns Resolves when complete.
+     */
+    public async setSortAlgorithm(newAlgorithm: SortAlgorithm) {
+        if (!newAlgorithm) throw new Error("A sorting algorithm must be defined");
+        this.sortingAlgorithm = newAlgorithm;
+
+        // Force regeneration of the rooms
+        await this.setRooms(this.orderedRooms);
+    }
+
+    /**
+     * Sets the rooms the algorithm should be handling, implying a reconstruction
+     * of the ordering.
+     * @param rooms The rooms to use going forward.
+     * @returns Resolves when complete.
+     */
+    public abstract setRooms(rooms: Room[]): Promise<any>;
+
+    /**
+     * Handle a room update. The Algorithm will only call this for causes which
+     * the list ordering algorithm can handle within the same tag. For example,
+     * tag changes will not be sent here.
+     * @param room The room where the update happened.
+     * @param cause The cause of the update.
+     * @returns True if the update requires the Algorithm to update the presentation layers.
+     */
+    public abstract handleRoomUpdate(room: Room, cause: RoomUpdateCause): Promise<boolean>;
+
+    protected getRoomIndex(room: Room): number {
+        let roomIdx = this.cachedOrderedRooms.indexOf(room);
+        if (roomIdx === -1) { // can only happen if the js-sdk's store goes sideways.
+            console.warn(`Degrading performance to find missing room in "${this.tagId}": ${room.roomId}`);
+            roomIdx = this.cachedOrderedRooms.findIndex(r => r.roomId === room.roomId);
+        }
+        return roomIdx;
+    }
+}
diff --git a/src/stores/room-list/algorithms/list-ordering/index.ts b/src/stores/room-list/algorithms/list-ordering/index.ts
new file mode 100644
index 0000000000..c002dac421
--- /dev/null
+++ b/src/stores/room-list/algorithms/list-ordering/index.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 { ImportanceAlgorithm } from "./ImportanceAlgorithm";
+import { ListAlgorithm, SortAlgorithm } from "../models";
+import { NaturalAlgorithm } from "./NaturalAlgorithm";
+import { TagID } from "../../models";
+import { OrderingAlgorithm } from "./OrderingAlgorithm";
+
+interface AlgorithmFactory {
+    (tagId: TagID, initialSortingAlgorithm: SortAlgorithm): OrderingAlgorithm;
+}
+
+const ALGORITHM_FACTORIES: { [algorithm in ListAlgorithm]: AlgorithmFactory } = {
+    [ListAlgorithm.Natural]: (tagId, initSort) => new NaturalAlgorithm(tagId, initSort),
+    [ListAlgorithm.Importance]: (tagId, initSort) => new ImportanceAlgorithm(tagId, initSort),
+};
+
+/**
+ * Gets an instance of the defined algorithm
+ * @param {ListAlgorithm} algorithm The algorithm to get an instance of.
+ * @param {TagID} tagId The tag the algorithm is for.
+ * @param {SortAlgorithm} initSort The initial sorting algorithm for the ordering algorithm.
+ * @returns {Algorithm} The algorithm instance.
+ */
+export function getListAlgorithmInstance(
+    algorithm: ListAlgorithm,
+    tagId: TagID,
+    initSort: SortAlgorithm,
+): OrderingAlgorithm {
+    if (!ALGORITHM_FACTORIES[algorithm]) {
+        throw new Error(`${algorithm} is not a known algorithm`);
+    }
+
+    return ALGORITHM_FACTORIES[algorithm](tagId, initSort);
+}
diff --git a/src/stores/room-list/algorithms/models.ts b/src/stores/room-list/algorithms/models.ts
new file mode 100644
index 0000000000..943d833b67
--- /dev/null
+++ b/src/stores/room-list/algorithms/models.ts
@@ -0,0 +1,53 @@
+/*
+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 { TagID } from "../models";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { OrderingAlgorithm } from "./list-ordering/OrderingAlgorithm";
+
+export enum SortAlgorithm {
+    Manual = "MANUAL",
+    Alphabetic = "ALPHABETIC",
+    Recent = "RECENT",
+}
+
+export enum ListAlgorithm {
+    // Orders Red > Grey > Bold > Idle
+    Importance = "IMPORTANCE",
+
+    // Orders however the SortAlgorithm decides
+    Natural = "NATURAL",
+}
+
+export interface ITagSortingMap {
+    // @ts-ignore - TypeScript really wants this to be [tagId: string] but we know better.
+    [tagId: TagID]: SortAlgorithm;
+}
+
+export interface IListOrderingMap {
+    // @ts-ignore - TypeScript really wants this to be [tagId: string] but we know better.
+    [tagId: TagID]: ListAlgorithm;
+}
+
+export interface IOrderingAlgorithmMap {
+    // @ts-ignore - TypeScript really wants this to be [tagId: string] but we know better.
+    [tagId: TagID]: OrderingAlgorithm;
+}
+
+export interface ITagMap {
+    // @ts-ignore - TypeScript really wants this to be [tagId: string] but we know better.
+    [tagId: TagID]: Room[];
+}
diff --git a/src/stores/room-list/algorithms/tag-sorting/AlphabeticAlgorithm.ts b/src/stores/room-list/algorithms/tag-sorting/AlphabeticAlgorithm.ts
new file mode 100644
index 0000000000..d909fb6288
--- /dev/null
+++ b/src/stores/room-list/algorithms/tag-sorting/AlphabeticAlgorithm.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.
+*/
+
+import { Room } from "matrix-js-sdk/src/models/room";
+import { TagID } from "../../models";
+import { IAlgorithm } from "./IAlgorithm";
+
+/**
+ * Sorts rooms according to the browser's determination of alphabetic.
+ */
+export class AlphabeticAlgorithm implements IAlgorithm {
+    public async sortRooms(rooms: Room[], tagId: TagID): Promise<Room[]> {
+        return rooms.sort((a, b) => {
+            return a.name.localeCompare(b.name);
+        });
+    }
+}
diff --git a/src/stores/room-list/algorithms/tag-sorting/IAlgorithm.ts b/src/stores/room-list/algorithms/tag-sorting/IAlgorithm.ts
new file mode 100644
index 0000000000..6c22ee0c9c
--- /dev/null
+++ b/src/stores/room-list/algorithms/tag-sorting/IAlgorithm.ts
@@ -0,0 +1,31 @@
+/*
+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 { TagID } from "../../models";
+
+/**
+ * Represents a tag sorting algorithm.
+ */
+export interface IAlgorithm {
+    /**
+     * Sorts the given rooms according to the sorting rules of the algorithm.
+     * @param {Room[]} rooms The rooms to sort.
+     * @param {TagID} tagId The tag ID in which the rooms are being sorted.
+     * @returns {Promise<Room[]>} Resolves to the sorted rooms.
+     */
+    sortRooms(rooms: Room[], tagId: TagID): Promise<Room[]>;
+}
diff --git a/src/stores/room-list/algorithms/tag-sorting/ManualAlgorithm.ts b/src/stores/room-list/algorithms/tag-sorting/ManualAlgorithm.ts
new file mode 100644
index 0000000000..b8c0357633
--- /dev/null
+++ b/src/stores/room-list/algorithms/tag-sorting/ManualAlgorithm.ts
@@ -0,0 +1,31 @@
+/*
+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 { TagID } from "../../models";
+import { IAlgorithm } from "./IAlgorithm";
+
+/**
+ * Sorts rooms according to the tag's `order` property on the room.
+ */
+export class ManualAlgorithm implements IAlgorithm {
+    public async sortRooms(rooms: Room[], tagId: TagID): Promise<Room[]> {
+        const getOrderProp = (r: Room) => r.tags[tagId].order || 0;
+        return rooms.sort((a, b) => {
+            return getOrderProp(a) - getOrderProp(b);
+        });
+    }
+}
diff --git a/src/stores/room-list/algorithms/tag-sorting/RecentAlgorithm.ts b/src/stores/room-list/algorithms/tag-sorting/RecentAlgorithm.ts
new file mode 100644
index 0000000000..7c8c879cf6
--- /dev/null
+++ b/src/stores/room-list/algorithms/tag-sorting/RecentAlgorithm.ts
@@ -0,0 +1,99 @@
+/*
+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 { TagID } from "../../models";
+import { IAlgorithm } from "./IAlgorithm";
+import { MatrixClientPeg } from "../../../../MatrixClientPeg";
+import * as Unread from "../../../../Unread";
+import { EffectiveMembership, getEffectiveMembership } from "../../../../utils/membership";
+
+/**
+ * Sorts rooms according to the last event's timestamp in each room that seems
+ * useful to the user.
+ */
+export class RecentAlgorithm implements IAlgorithm {
+    public async sortRooms(rooms: Room[], tagId: TagID): Promise<Room[]> {
+        // We cache the timestamp lookup to avoid iterating forever on the timeline
+        // of events. This cache only survives a single sort though.
+        // We wouldn't need this if `.sort()` didn't constantly try and compare all
+        // of the rooms to each other.
+
+        // TODO: We could probably improve the sorting algorithm here by finding changes.
+        // See https://github.com/vector-im/element-web/issues/14459
+        // For example, if we spent a little bit of time to determine which elements have
+        // actually changed (probably needs to be done higher up?) then we could do an
+        // insertion sort or similar on the limited set of changes.
+
+        // TODO: Don't assume we're using the same client as the peg
+        // See https://github.com/vector-im/element-web/issues/14458
+        let myUserId = '';
+        if (MatrixClientPeg.get()) {
+            myUserId = MatrixClientPeg.get().getUserId();
+        }
+
+        const tsCache: { [roomId: string]: number } = {};
+        const getLastTs = (r: Room) => {
+            if (tsCache[r.roomId]) {
+                return tsCache[r.roomId];
+            }
+
+            const ts = (() => {
+                // Apparently we can have rooms without timelines, at least under testing
+                // environments. Just return MAX_INT when this happens.
+                if (!r || !r.timeline) {
+                    return Number.MAX_SAFE_INTEGER;
+                }
+
+                // If the room hasn't been joined yet, it probably won't have a timeline to
+                // parse. We'll still fall back to the timeline if this fails, but chances
+                // are we'll at least have our own membership event to go off of.
+                const effectiveMembership = getEffectiveMembership(r.getMyMembership());
+                if (effectiveMembership !== EffectiveMembership.Join) {
+                    const membershipEvent = r.currentState.getStateEvents("m.room.member", myUserId);
+                    if (membershipEvent && !Array.isArray(membershipEvent)) {
+                        return membershipEvent.getTs();
+                    }
+                }
+
+                for (let i = r.timeline.length - 1; i >= 0; --i) {
+                    const ev = r.timeline[i];
+                    if (!ev.getTs()) continue; // skip events that don't have timestamps (tests only?)
+
+                    if (ev.getSender() === myUserId || Unread.eventTriggersUnreadCount(ev)) {
+                        return ev.getTs();
+                    }
+                }
+
+                // we might only have events that don't trigger the unread indicator,
+                // in which case use the oldest event even if normally it wouldn't count.
+                // This is better than just assuming the last event was forever ago.
+                if (r.timeline.length && r.timeline[0].getTs()) {
+                    return r.timeline[0].getTs();
+                } else {
+                    return Number.MAX_SAFE_INTEGER;
+                }
+            })();
+
+            tsCache[r.roomId] = ts;
+            return ts;
+        };
+
+        return rooms.sort((a, b) => {
+            return getLastTs(b) - getLastTs(a);
+        });
+    }
+}
diff --git a/src/stores/room-list/algorithms/tag-sorting/index.ts b/src/stores/room-list/algorithms/tag-sorting/index.ts
new file mode 100644
index 0000000000..c22865f5ba
--- /dev/null
+++ b/src/stores/room-list/algorithms/tag-sorting/index.ts
@@ -0,0 +1,53 @@
+/*
+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 { SortAlgorithm } from "../models";
+import { ManualAlgorithm } from "./ManualAlgorithm";
+import { IAlgorithm } from "./IAlgorithm";
+import { TagID } from "../../models";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { RecentAlgorithm } from "./RecentAlgorithm";
+import { AlphabeticAlgorithm } from "./AlphabeticAlgorithm";
+
+const ALGORITHM_INSTANCES: { [algorithm in SortAlgorithm]: IAlgorithm } = {
+    [SortAlgorithm.Recent]: new RecentAlgorithm(),
+    [SortAlgorithm.Alphabetic]: new AlphabeticAlgorithm(),
+    [SortAlgorithm.Manual]: new ManualAlgorithm(),
+};
+
+/**
+ * Gets an instance of the defined algorithm
+ * @param {SortAlgorithm} algorithm The algorithm to get an instance of.
+ * @returns {IAlgorithm} The algorithm instance.
+ */
+export function getSortingAlgorithmInstance(algorithm: SortAlgorithm): IAlgorithm {
+    if (!ALGORITHM_INSTANCES[algorithm]) {
+        throw new Error(`${algorithm} is not a known algorithm`);
+    }
+
+    return ALGORITHM_INSTANCES[algorithm];
+}
+
+/**
+ * Sorts rooms in a given tag according to the algorithm given.
+ * @param {Room[]} rooms The rooms to sort.
+ * @param {TagID} tagId The tag in which the sorting is occurring.
+ * @param {SortAlgorithm} algorithm The algorithm to use for sorting.
+ * @returns {Promise<Room[]>} Resolves to the sorted rooms.
+ */
+export function sortRoomsWithAlgorithm(rooms: Room[], tagId: TagID, algorithm: SortAlgorithm): Promise<Room[]> {
+    return getSortingAlgorithmInstance(algorithm).sortRooms(rooms, tagId);
+}
diff --git a/src/stores/room-list/filters/CommunityFilterCondition.ts b/src/stores/room-list/filters/CommunityFilterCondition.ts
new file mode 100644
index 0000000000..924a85e86a
--- /dev/null
+++ b/src/stores/room-list/filters/CommunityFilterCondition.ts
@@ -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 { Room } from "matrix-js-sdk/src/models/room";
+import { FILTER_CHANGED, FilterPriority, IFilterCondition } from "./IFilterCondition";
+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";
+
+/**
+ * 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[] = [];
+
+    constructor(private community: Group) {
+        super();
+        GroupStore.on("update", this.onStoreUpdate);
+
+        // noinspection JSIgnoredPromiseFromCall
+        this.onStoreUpdate(); // trigger a false update to seed the store
+    }
+
+    public get relativePriority(): FilterPriority {
+        // Lowest priority so we can coarsely find rooms.
+        return FilterPriority.Lowest;
+    }
+
+    public isVisible(room: Room): boolean {
+        return this.roomIds.includes(room.roomId) ||
+            this.userIds.includes(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);
+
+        const beforeUserIds = this.userIds;
+        this.userIds = (await GroupStore.getGroupMembers(this.community.groupId)).map(u => u.userId);
+
+        if (arrayHasDiff(beforeRoomIds, this.roomIds) || arrayHasDiff(beforeUserIds, this.userIds)) {
+            this.emit(FILTER_CHANGED);
+        }
+    };
+
+    public destroy(): void {
+        GroupStore.off("update", this.onStoreUpdate);
+    }
+}
diff --git a/src/stores/room-list/filters/IFilterCondition.ts b/src/stores/room-list/filters/IFilterCondition.ts
new file mode 100644
index 0000000000..3b054eaece
--- /dev/null
+++ b/src/stores/room-list/filters/IFilterCondition.ts
@@ -0,0 +1,54 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { Room } from "matrix-js-sdk/src/models/room";
+import { EventEmitter } from "events";
+
+export const FILTER_CHANGED = "filter_changed";
+
+export enum FilterPriority {
+    Lowest,
+    // in the middle would be Low, Normal, and High if we had a need
+    Highest,
+}
+
+/**
+ * A filter condition for the room list, determining if a room
+ * should be shown or not.
+ *
+ * All filter conditions are expected to be stable executions,
+ * meaning that given the same input the same answer will be
+ * returned (thus allowing caching). As such, filter conditions
+ * can, but shouldn't, do heavier logic and not worry about being
+ * called constantly by the room list. When the condition changes
+ * such that different inputs lead to different answers (such
+ * as a change in the user's input), this emits FILTER_CHANGED.
+ */
+export interface IFilterCondition extends EventEmitter {
+    /**
+     * The relative priority that this filter should be applied with.
+     * Lower priorities get applied first.
+     */
+    relativePriority: FilterPriority;
+
+    /**
+     * Determines if a given room should be visible under this
+     * condition.
+     * @param room The room to check.
+     * @returns True if the room should be visible.
+     */
+    isVisible(room: Room): boolean;
+}
diff --git a/src/stores/room-list/filters/NameFilterCondition.ts b/src/stores/room-list/filters/NameFilterCondition.ts
new file mode 100644
index 0000000000..88edaecfb6
--- /dev/null
+++ b/src/stores/room-list/filters/NameFilterCondition.ts
@@ -0,0 +1,77 @@
+/*
+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 { FILTER_CHANGED, FilterPriority, IFilterCondition } from "./IFilterCondition";
+import { EventEmitter } from "events";
+import { removeHiddenChars } from "matrix-js-sdk/src/utils";
+import { throttle } from "lodash";
+
+/**
+ * A filter condition for the room list which reveals rooms of a particular
+ * name, or associated name (like a room alias).
+ */
+export class NameFilterCondition extends EventEmitter implements IFilterCondition {
+    private _search = "";
+
+    constructor() {
+        super();
+    }
+
+    public get relativePriority(): FilterPriority {
+        // We want this one to be at the highest priority so it can search within other filters.
+        return FilterPriority.Highest;
+    }
+
+    public get search(): string {
+        return this._search;
+    }
+
+    public set search(val: string) {
+        this._search = val;
+        this.callUpdate();
+    }
+
+    private callUpdate = throttle(() => {
+        this.emit(FILTER_CHANGED);
+    }, 200, {trailing: true, leading: true});
+
+    public isVisible(room: Room): boolean {
+        const lcFilter = this.search.toLowerCase();
+        if (this.search[0] === '#') {
+            // Try and find rooms by alias
+            if (room.getCanonicalAlias() && room.getCanonicalAlias().toLowerCase().startsWith(lcFilter)) {
+                return true;
+            }
+            if (room.getAltAliases().some(a => a.toLowerCase().startsWith(lcFilter))) {
+                return true;
+            }
+        }
+
+        if (!room.name) return false; // should realistically not happen: the js-sdk always calculates a name
+
+        return this.matches(room.name);
+    }
+
+    public matches(val: string): boolean {
+        // Note: we have to match the filter with the removeHiddenChars() room name because the
+        // function strips spaces and other characters (M becomes RN for example, in lowercase).
+        // We also doubly convert to lowercase to work around oddities of the library.
+        const noSecretsFilter = removeHiddenChars(this.search.toLowerCase()).toLowerCase();
+        const noSecretsName = removeHiddenChars(val.toLowerCase()).toLowerCase();
+        return noSecretsName.includes(noSecretsFilter);
+    }
+}
diff --git a/src/stores/room-list/models.ts b/src/stores/room-list/models.ts
new file mode 100644
index 0000000000..7d3902f552
--- /dev/null
+++ b/src/stores/room-list/models.ts
@@ -0,0 +1,51 @@
+/*
+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 { isEnumValue } from "../../utils/enums";
+
+export enum DefaultTagID {
+    Invite = "im.vector.fake.invite",
+    Untagged = "im.vector.fake.recent", // legacy: used to just be 'recent rooms' but now it's all untagged rooms
+    Archived = "im.vector.fake.archived",
+    LowPriority = "m.lowpriority",
+    Favourite = "m.favourite",
+    DM = "im.vector.fake.direct",
+    ServerNotice = "m.server_notice",
+}
+
+export const OrderedDefaultTagIDs = [
+    DefaultTagID.Invite,
+    DefaultTagID.Favourite,
+    DefaultTagID.DM,
+    DefaultTagID.Untagged,
+    DefaultTagID.LowPriority,
+    DefaultTagID.ServerNotice,
+    DefaultTagID.Archived,
+];
+
+export type TagID = string | DefaultTagID;
+
+export function isCustomTag(tagId: TagID): boolean {
+    return !isEnumValue(DefaultTagID, tagId);
+}
+
+export enum RoomUpdateCause {
+    Timeline = "TIMELINE",
+    PossibleTagChange = "POSSIBLE_TAG_CHANGE",
+    ReadReceipt = "READ_RECEIPT",
+    NewRoom = "NEW_ROOM",
+    RoomRemoved = "ROOM_REMOVED",
+}
diff --git a/src/stores/room-list/previews/CallAnswerEventPreview.ts b/src/stores/room-list/previews/CallAnswerEventPreview.ts
new file mode 100644
index 0000000000..b7207307e2
--- /dev/null
+++ b/src/stores/room-list/previews/CallAnswerEventPreview.ts
@@ -0,0 +1,35 @@
+/*
+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 { IPreview } from "./IPreview";
+import { TagID } from "../models";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { getSenderName, isSelf, shouldPrefixMessagesIn } from "./utils";
+import { _t } from "../../../languageHandler";
+
+export class CallAnswerEventPreview implements IPreview {
+    public getTextFor(event: MatrixEvent, tagId?: TagID): string {
+        if (shouldPrefixMessagesIn(event.getRoomId(), tagId)) {
+            if (isSelf(event)) {
+                return _t("You joined the call");
+            } else {
+                return _t("%(senderName)s joined the call", {senderName: getSenderName(event)});
+            }
+        } else {
+            return _t("Call in progress");
+        }
+    }
+}
diff --git a/src/stores/room-list/previews/CallHangupEvent.ts b/src/stores/room-list/previews/CallHangupEvent.ts
new file mode 100644
index 0000000000..adc7d1aac8
--- /dev/null
+++ b/src/stores/room-list/previews/CallHangupEvent.ts
@@ -0,0 +1,35 @@
+/*
+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 { IPreview } from "./IPreview";
+import { TagID } from "../models";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { getSenderName, isSelf, shouldPrefixMessagesIn } from "./utils";
+import { _t } from "../../../languageHandler";
+
+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");
+            } else {
+                return _t("%(senderName)s left the call", {senderName: getSenderName(event)});
+            }
+        } else {
+            return _t("Call ended");
+        }
+    }
+}
diff --git a/src/stores/room-list/previews/CallInviteEventPreview.ts b/src/stores/room-list/previews/CallInviteEventPreview.ts
new file mode 100644
index 0000000000..47486e3701
--- /dev/null
+++ b/src/stores/room-list/previews/CallInviteEventPreview.ts
@@ -0,0 +1,39 @@
+/*
+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 { IPreview } from "./IPreview";
+import { TagID } from "../models";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { getSenderName, isSelf, shouldPrefixMessagesIn } from "./utils";
+import { _t } from "../../../languageHandler";
+
+export class CallInviteEventPreview implements IPreview {
+    public getTextFor(event: MatrixEvent, tagId?: TagID): string {
+        if (shouldPrefixMessagesIn(event.getRoomId(), tagId)) {
+            if (isSelf(event)) {
+                return _t("You started a call");
+            } else {
+                return _t("%(senderName)s started a call", {senderName: getSenderName(event)});
+            }
+        } else {
+            if (isSelf(event)) {
+                return _t("Waiting for answer");
+            } else {
+                return _t("%(senderName)s is calling", {senderName: getSenderName(event)});
+            }
+        }
+    }
+}
diff --git a/src/stores/room-list/previews/IPreview.ts b/src/stores/room-list/previews/IPreview.ts
new file mode 100644
index 0000000000..fe69637543
--- /dev/null
+++ b/src/stores/room-list/previews/IPreview.ts
@@ -0,0 +1,31 @@
+/*
+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 { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { TagID } from "../models";
+
+/**
+ * Represents an event preview.
+ */
+export interface IPreview {
+    /**
+     * Gets the text which represents the event as a preview.
+     * @param event The event to preview.
+     * @param tagId Optional. The tag where the room the event was sent in resides.
+     * @returns The preview.
+     */
+    getTextFor(event: MatrixEvent, tagId?: TagID): string | null;
+}
diff --git a/src/stores/room-list/previews/MessageEventPreview.ts b/src/stores/room-list/previews/MessageEventPreview.ts
new file mode 100644
index 0000000000..deed7dcf2c
--- /dev/null
+++ b/src/stores/room-list/previews/MessageEventPreview.ts
@@ -0,0 +1,71 @@
+/*
+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 { IPreview } from "./IPreview";
+import { TagID } from "../models";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { _t } from "../../../languageHandler";
+import { getSenderName, isSelf, shouldPrefixMessagesIn } from "./utils";
+import ReplyThread from "../../../components/views/elements/ReplyThread";
+import { sanitizedHtmlNodeInnerText } from "../../../HtmlUtils";
+
+export class MessageEventPreview implements IPreview {
+    public getTextFor(event: MatrixEvent, tagId?: TagID): string {
+        let eventContent = event.getContent();
+
+        if (event.isRelation("m.replace")) {
+            // It's an edit, generate the preview on the new text
+            eventContent = event.getContent()['m.new_content'];
+        }
+
+        if (!eventContent || !eventContent['body']) return null; // invalid for our purposes
+
+        let body = (eventContent['body'] || '').trim();
+        const msgtype = eventContent['msgtype'];
+        if (!body || !msgtype) return null; // invalid event, no preview
+
+        const hasHtml = eventContent.format === "org.matrix.custom.html" && eventContent.formatted_body;
+        if (hasHtml) {
+            body = eventContent.formatted_body;
+        }
+
+        // XXX: Newer relations have a getRelation() function which is not compatible with replies.
+        const mRelatesTo = event.getWireContent()['m.relates_to'];
+        if (mRelatesTo && mRelatesTo['m.in_reply_to']) {
+            // If this is a reply, get the real reply and use that
+            if (hasHtml) {
+                body = (ReplyThread.stripHTMLReply(body) || '').trim();
+            } else {
+                body = (ReplyThread.stripPlainReply(body) || '').trim();
+            }
+            if (!body) return null; // invalid event, no preview
+        }
+
+        if (hasHtml) {
+            body = sanitizedHtmlNodeInnerText(body);
+        }
+
+        if (msgtype === 'm.emote') {
+            return _t("* %(senderName)s %(emote)s", {senderName: getSenderName(event), emote: body});
+        }
+
+        if (isSelf(event) || !shouldPrefixMessagesIn(event.getRoomId(), tagId)) {
+            return body;
+        } else {
+            return _t("%(senderName)s: %(message)s", {senderName: getSenderName(event), message: body});
+        }
+    }
+}
diff --git a/src/stores/room-list/previews/ReactionEventPreview.ts b/src/stores/room-list/previews/ReactionEventPreview.ts
new file mode 100644
index 0000000000..95cdc01c66
--- /dev/null
+++ b/src/stores/room-list/previews/ReactionEventPreview.ts
@@ -0,0 +1,44 @@
+/*
+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 { IPreview } from "./IPreview";
+import { TagID } from "../models";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { getSenderName, isSelf, shouldPrefixMessagesIn } from "./utils";
+import { _t } from "../../../languageHandler";
+import SettingsStore from "../../../settings/SettingsStore";
+import DMRoomMap from "../../../utils/DMRoomMap";
+
+export class ReactionEventPreview implements IPreview {
+    public getTextFor(event: MatrixEvent, tagId?: TagID): string {
+        const showDms = SettingsStore.getValue("feature_roomlist_preview_reactions_dms");
+        const showAll = SettingsStore.getValue("feature_roomlist_preview_reactions_all");
+
+        if (!showAll && (!showDms || DMRoomMap.shared().getUserIdForRoomId(event.getRoomId()))) return null;
+
+        const relation = event.getRelation();
+        if (!relation) return null; // invalid reaction (probably redacted)
+
+        const reaction = relation.key;
+        if (!reaction) return null; // invalid reaction (unknown format)
+
+        if (isSelf(event) || !shouldPrefixMessagesIn(event.getRoomId(), tagId)) {
+            return reaction;
+        } else {
+            return _t("%(senderName)s: %(reaction)s", {senderName: getSenderName(event), reaction});
+        }
+    }
+}
diff --git a/src/stores/room-list/previews/StickerEventPreview.ts b/src/stores/room-list/previews/StickerEventPreview.ts
new file mode 100644
index 0000000000..f8263a4a45
--- /dev/null
+++ b/src/stores/room-list/previews/StickerEventPreview.ts
@@ -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 { IPreview } from "./IPreview";
+import { TagID } from "../models";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { getSenderName, isSelf, shouldPrefixMessagesIn } from "./utils";
+import { _t } from "../../../languageHandler";
+
+export class StickerEventPreview implements IPreview {
+    public getTextFor(event: MatrixEvent, tagId?: TagID): string {
+        const stickerName = event.getContent()['body'];
+        if (!stickerName) return null;
+
+        if (isSelf(event) || !shouldPrefixMessagesIn(event.getRoomId(), tagId)) {
+            return stickerName;
+        } else {
+            return _t("%(senderName)s: %(stickerName)s", {senderName: getSenderName(event), stickerName});
+        }
+    }
+}
diff --git a/src/stores/room-list/previews/utils.ts b/src/stores/room-list/previews/utils.ts
new file mode 100644
index 0000000000..ebbecd7bbd
--- /dev/null
+++ b/src/stores/room-list/previews/utils.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 { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
+import { DefaultTagID, TagID } from "../models";
+
+export function isSelf(event: MatrixEvent): boolean {
+    const selfUserId = MatrixClientPeg.get().getUserId();
+    if (event.getType() === 'm.room.member') {
+        return event.getStateKey() === selfUserId;
+    }
+    return event.getSender() === selfUserId;
+}
+
+export function isSelfTarget(event: MatrixEvent): boolean {
+    const selfUserId = MatrixClientPeg.get().getUserId();
+    return event.getStateKey() === selfUserId;
+}
+
+export function shouldPrefixMessagesIn(roomId: string, tagId: TagID): boolean {
+    if (tagId !== DefaultTagID.DM) return true;
+
+    // We don't prefix anything in 1:1s
+    const room = MatrixClientPeg.get().getRoom(roomId);
+    if (!room) return true;
+    return room.currentState.getJoinedMemberCount() !== 2;
+}
+
+export function getSenderName(event: MatrixEvent): string {
+    return event.sender ? event.sender.name : event.getSender();
+}
+
+export function getTargetName(event: MatrixEvent): string {
+    return event.target ? event.target.name : event.getStateKey();
+}
diff --git a/src/theme.js b/src/theme.js
index ab5974f207..a413ae74af 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -19,119 +19,13 @@ import {_t} from "./languageHandler";
 
 export const DEFAULT_THEME = "light";
 import Tinter from "./Tinter";
-import dis from "./dispatcher";
-import SettingsStore, {SettingLevel} from "./settings/SettingsStore";
-import ThemeController from "./settings/controllers/ThemeController";
-
-export class ThemeWatcher {
-    static _instance = null;
-
-    constructor() {
-        this._themeWatchRef = null;
-        this._systemThemeWatchRef = null;
-        this._dispatcherRef = null;
-
-        // we have both here as each may either match or not match, so by having both
-        // we can get the tristate of dark/light/unsupported
-        this._preferDark = global.matchMedia("(prefers-color-scheme: dark)");
-        this._preferLight = global.matchMedia("(prefers-color-scheme: light)");
-
-        this._currentTheme = this.getEffectiveTheme();
-    }
-
-    start() {
-        this._themeWatchRef = SettingsStore.watchSetting("theme", null, this._onChange);
-        this._systemThemeWatchRef = SettingsStore.watchSetting("use_system_theme", null, this._onChange);
-        if (this._preferDark.addEventListener) {
-            this._preferDark.addEventListener('change', this._onChange);
-            this._preferLight.addEventListener('change', this._onChange);
-        }
-        this._dispatcherRef = dis.register(this._onAction);
-    }
-
-    stop() {
-        if (this._preferDark.addEventListener) {
-            this._preferDark.removeEventListener('change', this._onChange);
-            this._preferLight.removeEventListener('change', this._onChange);
-        }
-        SettingsStore.unwatchSetting(this._systemThemeWatchRef);
-        SettingsStore.unwatchSetting(this._themeWatchRef);
-        dis.unregister(this._dispatcherRef);
-    }
-
-    _onChange = () => {
-        this.recheck();
-    };
-
-    _onAction = (payload) => {
-        if (payload.action === 'recheck_theme') {
-            // XXX forceTheme
-            this.recheck(payload.forceTheme);
-        }
-    };
-
-    // XXX: forceTheme param added here as local echo appears to be unreliable
-    // https://github.com/vector-im/riot-web/issues/11443
-    recheck(forceTheme) {
-        const oldTheme = this._currentTheme;
-        this._currentTheme = forceTheme === undefined ? this.getEffectiveTheme() : forceTheme;
-        if (oldTheme !== this._currentTheme) {
-            setTheme(this._currentTheme);
-        }
-    }
-
-    getEffectiveTheme() {
-        // Dev note: Much of this logic is replicated in the GeneralUserSettingsTab
-
-        // XXX: checking the isLight flag here makes checking it in the ThemeController
-        // itself completely redundant since we just override the result here and we're
-        // now effectively just using the ThemeController as a place to store the static
-        // variable. The system theme setting probably ought to have an equivalent
-        // controller that honours the same flag, although probablt better would be to
-        // have the theme logic in one place rather than split between however many
-        // different places.
-        if (ThemeController.isLogin) return 'light';
-
-        // If the user has specifically enabled the system matching option (excluding default),
-        // then use that over anything else. We pick the lowest possible level for the setting
-        // to ensure the ordering otherwise works.
-        const systemThemeExplicit = SettingsStore.getValueAt(
-            SettingLevel.DEVICE, "use_system_theme", null, false, true);
-        if (systemThemeExplicit) {
-            console.log("returning explicit system theme");
-            if (this._preferDark.matches) return 'dark';
-            if (this._preferLight.matches) return 'light';
-        }
-
-        // If the user has specifically enabled the theme (without the system matching option being
-        // enabled specifically and excluding the default), use that theme. We pick the lowest possible
-        // level for the setting to ensure the ordering otherwise works.
-        const themeExplicit = SettingsStore.getValueAt(
-            SettingLevel.DEVICE, "theme", null, false, true);
-        if (themeExplicit) {
-            console.log("returning explicit theme: " + themeExplicit);
-            return themeExplicit;
-        }
-
-        // If the user hasn't really made a preference in either direction, assume the defaults of the
-        // settings and use those.
-        if (SettingsStore.getValue('use_system_theme')) {
-            if (this._preferDark.matches) return 'dark';
-            if (this._preferLight.matches) return 'light';
-        }
-        console.log("returning theme value");
-        return SettingsStore.getValue('theme');
-    }
-
-    isSystemThemeSupported() {
-        return this._preferDark.matches || this._preferLight.matches;
-    }
-}
+import SettingsStore from "./settings/SettingsStore";
+import ThemeWatcher from "./settings/watchers/ThemeWatcher";
 
 export function enumerateThemes() {
     const BUILTIN_THEMES = {
-        "light": _t("Light theme"),
-        "dark": _t("Dark theme"),
+        "light": _t("Light"),
+        "dark": _t("Dark"),
     };
     const customThemes = SettingsStore.getValue("custom_themes");
     const customThemeNames = {};
@@ -141,11 +35,67 @@ export function enumerateThemes() {
     return Object.assign({}, customThemeNames, BUILTIN_THEMES);
 }
 
+function clearCustomTheme() {
+    // remove all css variables, we assume these are there because of the custom theme
+    const inlineStyleProps = Object.values(document.body.style);
+    for (const prop of inlineStyleProps) {
+        if (prop.startsWith("--")) {
+            document.body.style.removeProperty(prop);
+        }
+    }
+    const customFontFaceStyle = document.querySelector("head > style[title='custom-theme-font-faces']");
+    if (customFontFaceStyle) {
+        customFontFaceStyle.remove();
+    }
+}
+
+const allowedFontFaceProps = [
+    "font-display",
+    "font-family",
+    "font-stretch",
+    "font-style",
+    "font-weight",
+    "font-variant",
+    "font-feature-settings",
+    "font-variation-settings",
+    "src",
+    "unicode-range",
+];
+
+function generateCustomFontFaceCSS(faces) {
+    return faces.map(face => {
+        const src = face.src && face.src.map(srcElement => {
+            let format;
+            if (srcElement.format) {
+                format = `format("${srcElement.format}")`;
+            }
+            if (srcElement.url) {
+                return `url("${srcElement.url}") ${format}`;
+            } else if (srcElement.local) {
+                return `local("${srcElement.local}") ${format}`;
+            }
+            return "";
+        }).join(", ");
+        const props = Object.keys(face).filter(prop => allowedFontFaceProps.includes(prop));
+        const body = props.map(prop => {
+            let value;
+            if (prop === "src") {
+                value = src;
+            } else if (prop === "font-family") {
+                value = `"${face[prop]}"`;
+            } else {
+                value = face[prop];
+            }
+            return `${prop}: ${value}`;
+        }).join(";");
+        return `@font-face {${body}}`;
+    }).join("\n");
+}
 
 function setCustomThemeVars(customTheme) {
     const {style} = document.body;
 
-    function setCSSVariable(name, hexColor, doPct = true) {
+    function setCSSColorVariable(name, hexColor, doPct = true) {
         style.setProperty(`--${name}`, hexColor);
         if (doPct) {
             // uses #rrggbbaa to define the color with alpha values at 0%, 15% and 50%
@@ -159,16 +109,33 @@ function setCustomThemeVars(customTheme) {
         for (const [name, value] of Object.entries(customTheme.colors)) {
             if (Array.isArray(value)) {
                 for (let i = 0; i < value.length; i += 1) {
-                    setCSSVariable(`${name}_${i}`, value[i], false);
+                    setCSSColorVariable(`${name}_${i}`, value[i], false);
                 }
             } else {
-                setCSSVariable(name, value);
+                setCSSColorVariable(name, value);
             }
         }
     }
+    if (customTheme.fonts) {
+        const {fonts} = customTheme;
+        if (fonts.faces) {
+            const css = generateCustomFontFaceCSS(fonts.faces);
+            const style = document.createElement("style");
+            style.setAttribute("title", "custom-theme-font-faces");
+            style.setAttribute("type", "text/css");
+            style.appendChild(document.createTextNode(css));
+            document.head.appendChild(style);
+        }
+        if (fonts.general) {
+            style.setProperty("--font-family", fonts.general);
+        }
+        if (fonts.monospace) {
+            style.setProperty("--font-family-monospace", fonts.monospace);
+        }
+    }
 }
 
-function getCustomTheme(themeName) {
+export function getCustomTheme(themeName) {
     // set css variables
     const customThemes = SettingsStore.getValue("custom_themes");
     if (!customThemes) {
@@ -194,6 +161,7 @@ export async function setTheme(theme) {
         const themeWatcher = new ThemeWatcher();
         theme = themeWatcher.getEffectiveTheme();
     }
+    clearCustomTheme();
     let stylesheetName = theme;
     if (theme.startsWith("custom-")) {
         const customTheme = getCustomTheme(theme.substr(7));
@@ -234,7 +202,7 @@ export async function setTheme(theme) {
     return new Promise((resolve) => {
         const switchTheme = function() {
             // we re-enable our theme here just in case we raced with another
-            // theme set request as per https://github.com/vector-im/riot-web/issues/5601.
+            // theme set request as per https://github.com/vector-im/element-web/issues/5601.
             // We could alternatively lock or similar to stop the race, but
             // this is probably good enough for now.
             styleElements[stylesheetName].disabled = false;
@@ -242,6 +210,10 @@ export async function setTheme(theme) {
                 if (a == styleElements[stylesheetName]) return;
                 a.disabled = true;
             });
+            const bodyStyles = global.getComputedStyle(document.body);
+            if (bodyStyles.backgroundColor) {
+                document.querySelector('meta[name="theme-color"]').content = bodyStyles.backgroundColor;
+            }
             Tinter.setTheme(theme);
             resolve();
         };
diff --git a/src/toasts/AnalyticsToast.tsx b/src/toasts/AnalyticsToast.tsx
new file mode 100644
index 0000000000..e0eda5fa48
--- /dev/null
+++ b/src/toasts/AnalyticsToast.tsx
@@ -0,0 +1,79 @@
+/*
+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 { _t } from "../languageHandler";
+import SdkConfig from "../SdkConfig";
+import dis from "../dispatcher/dispatcher";
+import Analytics from "../Analytics";
+import AccessibleButton from "../components/views/elements/AccessibleButton";
+import GenericToast from "../components/views/toasts/GenericToast";
+import ToastStore from "../stores/ToastStore";
+
+const onAccept = () => {
+    dis.dispatch({
+        action: 'accept_cookies',
+    });
+};
+
+const onReject = () => {
+    dis.dispatch({
+        action: "reject_cookies",
+    });
+};
+
+const onUsageDataClicked = () => {
+    Analytics.showDetailsModal();
+};
+
+const TOAST_KEY = "analytics";
+
+export const showToast = (policyUrl?: string) => {
+    const brand = SdkConfig.get().brand;
+    ToastStore.sharedInstance().addOrReplaceToast({
+        key: TOAST_KEY,
+        title: _t("Help us improve %(brand)s", { brand }),
+        props: {
+            description: _t(
+                "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. " +
+                "This will use a <PolicyLink>cookie</PolicyLink>.",
+                {
+                    brand,
+                },
+                {
+                    "UsageDataLink": (sub) => (
+                        <AccessibleButton kind="link" onClick={onUsageDataClicked}>{ sub }</AccessibleButton>
+                    ),
+                    // XXX: We need to link to the page that explains our cookies
+                    "PolicyLink": (sub) => policyUrl ? (
+                        <a target="_blank" href={policyUrl}>{ sub }</a>
+                    ) : sub,
+                },
+            ),
+            acceptLabel: _t("I want to help"),
+            onAccept,
+            rejectLabel: _t("No"),
+            onReject,
+        },
+        component: GenericToast,
+        priority: 10,
+    });
+};
+
+export const hideToast = () => {
+    ToastStore.sharedInstance().dismissToast(TOAST_KEY);
+};
diff --git a/src/toasts/BulkUnverifiedSessionsToast.ts b/src/toasts/BulkUnverifiedSessionsToast.ts
new file mode 100644
index 0000000000..41717e0804
--- /dev/null
+++ b/src/toasts/BulkUnverifiedSessionsToast.ts
@@ -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 { _t } from '../languageHandler';
+import dis from "../dispatcher/dispatcher";
+import { MatrixClientPeg } from '../MatrixClientPeg';
+import DeviceListener from '../DeviceListener';
+import GenericToast from "../components/views/toasts/GenericToast";
+import ToastStore from "../stores/ToastStore";
+
+const TOAST_KEY = "reviewsessions";
+
+export const showToast = (deviceIds: Set<string>) => {
+    const onAccept = () => {
+        DeviceListener.sharedInstance().dismissUnverifiedSessions(deviceIds);
+
+        dis.dispatch({
+            action: 'view_user_info',
+            userId: MatrixClientPeg.get().getUserId(),
+        });
+    };
+
+    const onReject = () => {
+        DeviceListener.sharedInstance().dismissUnverifiedSessions(deviceIds);
+    };
+
+    ToastStore.sharedInstance().addOrReplaceToast({
+        key: TOAST_KEY,
+        title: _t("Review where you’re logged in"),
+        icon: "verification_warning",
+        props: {
+            description: _t("Verify all your sessions to ensure your account & messages are safe"),
+            acceptLabel: _t("Review"),
+            onAccept,
+            rejectLabel: _t("Later"),
+            onReject,
+        },
+        component: GenericToast,
+        priority: 50,
+    });
+};
+
+export const hideToast = () => {
+    ToastStore.sharedInstance().dismissToast(TOAST_KEY);
+};
diff --git a/src/toasts/DesktopNotificationsToast.ts b/src/toasts/DesktopNotificationsToast.ts
new file mode 100644
index 0000000000..413e82e20b
--- /dev/null
+++ b/src/toasts/DesktopNotificationsToast.ts
@@ -0,0 +1,50 @@
+/*
+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 { _t } from "../languageHandler";
+import Notifier from "../Notifier";
+import GenericToast from "../components/views/toasts/GenericToast";
+import ToastStore from "../stores/ToastStore";
+
+const onAccept = () => {
+    Notifier.setEnabled(true);
+};
+
+const onReject = () => {
+    Notifier.setToolbarHidden(true);
+};
+
+const TOAST_KEY = "desktopnotifications";
+
+export const showToast = () => {
+    ToastStore.sharedInstance().addOrReplaceToast({
+        key: TOAST_KEY,
+        title: _t("Notifications"),
+        props: {
+            description: _t("You are not receiving desktop notifications"),
+            acceptLabel: _t("Enable them now"),
+            onAccept,
+            rejectLabel: _t("Close"),
+            onReject,
+        },
+        component: GenericToast,
+        priority: 30,
+    });
+};
+
+export const hideToast = () => {
+    ToastStore.sharedInstance().dismissToast(TOAST_KEY);
+};
diff --git a/src/toasts/ServerLimitToast.tsx b/src/toasts/ServerLimitToast.tsx
new file mode 100644
index 0000000000..d35140be3d
--- /dev/null
+++ b/src/toasts/ServerLimitToast.tsx
@@ -0,0 +1,50 @@
+/*
+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 { _t, _td } from "../languageHandler";
+import GenericToast from "../components/views/toasts/GenericToast";
+import ToastStore from "../stores/ToastStore";
+import {messageForResourceLimitError} from "../utils/ErrorUtils";
+
+const TOAST_KEY = "serverlimit";
+
+export const showToast = (limitType: string, 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."),
+    });
+    const contactText = messageForResourceLimitError(limitType, adminContact, {
+        '': _td("Contact your <a>server admin</a>."),
+    });
+
+    ToastStore.sharedInstance().addOrReplaceToast({
+        key: TOAST_KEY,
+        title: _t("Warning"),
+        props: {
+            description: <React.Fragment>{errorText} {contactText}</React.Fragment>,
+            acceptLabel: _t("Ok"),
+            onAccept: hideToast,
+        },
+        component: GenericToast,
+        priority: 70,
+    });
+};
+
+export const hideToast = () => {
+    ToastStore.sharedInstance().dismissToast(TOAST_KEY);
+};
diff --git a/src/toasts/SetPasswordToast.ts b/src/toasts/SetPasswordToast.ts
new file mode 100644
index 0000000000..88cc317978
--- /dev/null
+++ b/src/toasts/SetPasswordToast.ts
@@ -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.
+*/
+
+import { _t } from "../languageHandler";
+import Modal from "../Modal";
+import SetPasswordDialog from "../components/views/dialogs/SetPasswordDialog";
+import GenericToast from "../components/views/toasts/GenericToast";
+import ToastStore from "../stores/ToastStore";
+
+const onAccept = () => {
+    Modal.createTrackedDialog('Set Password Dialog', 'Password Nag Bar', SetPasswordDialog);
+};
+
+const TOAST_KEY = "setpassword";
+
+export const showToast = () => {
+    ToastStore.sharedInstance().addOrReplaceToast({
+        key: TOAST_KEY,
+        title: _t("Set password"),
+        props: {
+            description: _t("To return to your account in future you need to set a password"),
+            acceptLabel: _t("Set Password"),
+            onAccept,
+            rejectLabel: _t("Later"),
+            onReject: hideToast, // it'll return on reload
+        },
+        component: GenericToast,
+        priority: 60,
+    });
+};
+
+export const hideToast = () => {
+    ToastStore.sharedInstance().dismissToast(TOAST_KEY);
+};
diff --git a/src/toasts/SetupEncryptionToast.ts b/src/toasts/SetupEncryptionToast.ts
new file mode 100644
index 0000000000..d35bbf1c88
--- /dev/null
+++ b/src/toasts/SetupEncryptionToast.ts
@@ -0,0 +1,106 @@
+/*
+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 Modal from "../Modal";
+import * as sdk from "../index";
+import { _t } from "../languageHandler";
+import DeviceListener from "../DeviceListener";
+import SetupEncryptionDialog from "../components/views/dialogs/SetupEncryptionDialog";
+import { accessSecretStorage } from "../CrossSigningManager";
+import ToastStore from "../stores/ToastStore";
+import GenericToast from "../components/views/toasts/GenericToast";
+
+const TOAST_KEY = "setupencryption";
+
+const getTitle = (kind: Kind) => {
+    switch (kind) {
+        case Kind.SET_UP_ENCRYPTION:
+            return _t("Set up encryption");
+        case Kind.UPGRADE_ENCRYPTION:
+            return _t("Encryption upgrade available");
+        case Kind.VERIFY_THIS_SESSION:
+            return _t("Verify this session");
+    }
+};
+
+const getSetupCaption = (kind: Kind) => {
+    switch (kind) {
+        case Kind.SET_UP_ENCRYPTION:
+            return _t("Set up");
+        case Kind.UPGRADE_ENCRYPTION:
+            return _t("Upgrade");
+        case Kind.VERIFY_THIS_SESSION:
+            return _t("Verify");
+    }
+};
+
+const getDescription = (kind: Kind) => {
+    switch (kind) {
+        case Kind.SET_UP_ENCRYPTION:
+        case Kind.UPGRADE_ENCRYPTION:
+            return _t("Verify yourself & others to keep your chats safe");
+        case Kind.VERIFY_THIS_SESSION:
+            return _t("Other users may not trust it");
+    }
+};
+
+export enum Kind {
+    SET_UP_ENCRYPTION = "set_up_encryption",
+    UPGRADE_ENCRYPTION = "upgrade_encryption",
+    VERIFY_THIS_SESSION = "verify_this_session",
+}
+
+const onReject = () => {
+    DeviceListener.sharedInstance().dismissEncryptionSetup();
+};
+
+export const showToast = (kind: Kind) => {
+    const onAccept = async () => {
+        if (kind === Kind.VERIFY_THIS_SESSION) {
+            Modal.createTrackedDialog("Verify session", "Verify session", SetupEncryptionDialog,
+                {}, null, /* priority = */ false, /* static = */ true);
+        } else {
+            const Spinner = sdk.getComponent("elements.Spinner");
+            const modal = Modal.createDialog(
+                Spinner, null, "mx_Dialog_spinner", /* priority */ false, /* static */ true,
+            );
+            try {
+                await accessSecretStorage();
+            } finally {
+                modal.close();
+            }
+        }
+    };
+
+    ToastStore.sharedInstance().addOrReplaceToast({
+        key: TOAST_KEY,
+        title: getTitle(kind),
+        icon: "verification_warning",
+        props: {
+            description: getDescription(kind),
+            acceptLabel: getSetupCaption(kind),
+            onAccept,
+            rejectLabel: _t("Later"),
+            onReject,
+        },
+        component: GenericToast,
+        priority: kind === Kind.VERIFY_THIS_SESSION ? 95 : 40,
+    });
+};
+
+export const hideToast = () => {
+    ToastStore.sharedInstance().dismissToast(TOAST_KEY);
+};
diff --git a/src/toasts/UnverifiedSessionToast.ts b/src/toasts/UnverifiedSessionToast.ts
new file mode 100644
index 0000000000..9dedd2b137
--- /dev/null
+++ b/src/toasts/UnverifiedSessionToast.ts
@@ -0,0 +1,70 @@
+/*
+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 { _t } from '../languageHandler';
+import { MatrixClientPeg } from '../MatrixClientPeg';
+import Modal from '../Modal';
+import DeviceListener from '../DeviceListener';
+import NewSessionReviewDialog from '../components/views/dialogs/NewSessionReviewDialog';
+import ToastStore from "../stores/ToastStore";
+import GenericToast from "../components/views/toasts/GenericToast";
+
+function toastKey(deviceId: string) {
+    return "unverified_session_" + deviceId;
+}
+
+export const showToast = (deviceId: string) => {
+    const cli = MatrixClientPeg.get();
+
+    const onAccept = () => {
+        Modal.createTrackedDialog('New Session Review', 'Starting dialog', NewSessionReviewDialog, {
+            userId: cli.getUserId(),
+            device: cli.getStoredDevice(cli.getUserId(), deviceId),
+            onFinished: (r) => {
+                if (!r) {
+                    /* This'll come back false if the user clicks "this wasn't me" and saw a warning dialog */
+                    DeviceListener.sharedInstance().dismissUnverifiedSessions([deviceId]);
+                }
+            },
+        }, null, /* priority = */ false, /* static = */ true);
+    };
+
+    const onReject = () => {
+        DeviceListener.sharedInstance().dismissUnverifiedSessions([deviceId]);
+    };
+
+    const device = cli.getStoredDevice(cli.getUserId(), deviceId);
+
+    ToastStore.sharedInstance().addOrReplaceToast({
+        key: toastKey(deviceId),
+        title: _t("New login. Was this you?"),
+        icon: "verification_warning",
+        props: {
+            description: _t(
+                "Verify the new login accessing your account: %(name)s", { name: device.getDisplayName()}),
+            acceptLabel: _t("Verify"),
+            onAccept,
+            rejectLabel: _t("Later"),
+            onReject,
+        },
+        component: GenericToast,
+        priority: 80,
+    });
+};
+
+export const hideToast = (deviceId: string) => {
+    ToastStore.sharedInstance().dismissToast(toastKey(deviceId));
+};
diff --git a/src/toasts/UpdateToast.tsx b/src/toasts/UpdateToast.tsx
new file mode 100644
index 0000000000..dfd06cf3a0
--- /dev/null
+++ b/src/toasts/UpdateToast.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 React from "react";
+
+import { _t } from "../languageHandler";
+import SdkConfig from "../SdkConfig";
+import GenericToast from "../components/views/toasts/GenericToast";
+import ToastStore from "../stores/ToastStore";
+import QuestionDialog from "../components/views/dialogs/QuestionDialog";
+import ChangelogDialog from "../components/views/dialogs/ChangelogDialog";
+import PlatformPeg from "../PlatformPeg";
+import Modal from "../Modal";
+
+const TOAST_KEY = "update";
+
+/*
+ * Check a version string is compatible with the Changelog
+ * dialog ([element-version]-react-[react-sdk-version]-js-[js-sdk-version])
+ */
+function checkVersion(ver) {
+    const parts = ver.split('-');
+    return parts.length === 5 && parts[1] === 'react' && parts[3] === 'js';
+}
+
+function installUpdate() {
+    PlatformPeg.get().installUpdate();
+}
+
+export const showToast = (version: string, newVersion: string, releaseNotes?: string) => {
+    function onReject() {
+        PlatformPeg.get().deferUpdate(newVersion);
+    }
+
+    let onAccept;
+    let acceptLabel = _t("What's new?");
+    if (releaseNotes) {
+        onAccept = () => {
+            Modal.createTrackedDialog('Display release notes', '', QuestionDialog, {
+                title: _t("What's New"),
+                description: <pre>{releaseNotes}</pre>,
+                button: _t("Update"),
+                onFinished: (update) => {
+                    if (update && PlatformPeg.get()) {
+                        PlatformPeg.get().installUpdate();
+                    }
+                },
+            });
+        };
+    } else if (checkVersion(version) && checkVersion(newVersion)) {
+        onAccept = () => {
+            Modal.createTrackedDialog('Display Changelog', '', ChangelogDialog, {
+                version,
+                newVersion,
+                onFinished: (update) => {
+                    if (update && PlatformPeg.get()) {
+                        PlatformPeg.get().installUpdate();
+                    }
+                },
+            });
+        };
+    } else {
+        onAccept = installUpdate;
+        acceptLabel = _t("Restart");
+    }
+
+    const brand = SdkConfig.get().brand;
+    ToastStore.sharedInstance().addOrReplaceToast({
+        key: TOAST_KEY,
+        title: _t("Upgrade your %(brand)s", { brand }),
+        props: {
+            description: _t("A new version of %(brand)s is available!", { brand }),
+            acceptLabel,
+            onAccept,
+            rejectLabel: _t("Later"),
+            onReject,
+        },
+        component: GenericToast,
+        priority: 20,
+    });
+};
+
+export const hideToast = () => {
+    ToastStore.sharedInstance().dismissToast(TOAST_KEY);
+};
diff --git a/src/usercontent/index.html b/src/usercontent/index.html
index 90a0fe7c16..9abbdb5289 100644
--- a/src/usercontent/index.html
+++ b/src/usercontent/index.html
@@ -2,9 +2,9 @@
 <head>
     <!--
     Hello! If you're reading this, perhaps you're wondering what this
-    file is doing and why your Riot is using it.
-    In short, this allows Riot to isolate potentially unsafe encrypted
-    attachments into their own origin, away from your Riot.
+    file is doing and why your Element is using it.
+    In short, this allows Element to isolate potentially unsafe encrypted
+    attachments into their own origin, away from your Element.
     Stay curious!
     -->
 </head>
diff --git a/src/utils/AutoDiscoveryUtils.js b/src/utils/AutoDiscoveryUtils.js
index 328aa9c776..94aa0c3544 100644
--- a/src/utils/AutoDiscoveryUtils.js
+++ b/src/utils/AutoDiscoveryUtils.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2019 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -70,13 +70,17 @@ export default class AutoDiscoveryUtils {
         let title = _t("Cannot reach homeserver");
         let body = _t("Ensure you have a stable internet connection, or get in touch with the server admin");
         if (!AutoDiscoveryUtils.isLivelinessError(err)) {
-            title = _t("Your Riot is misconfigured");
+            const brand = SdkConfig.get().brand;
+            title = _t("Your %(brand)s is misconfigured", { brand });
             body = _t(
-                "Ask your Riot admin to check <a>your config</a> for incorrect or duplicate entries.",
-                {}, {
+                "Ask your %(brand)s admin to check <a>your config</a> for incorrect or duplicate entries.",
+                {
+                    brand,
+                },
+                {
                     a: (sub) => {
                         return <a
-                            href="https://github.com/vector-im/riot-web/blob/master/docs/config.md"
+                            href="https://github.com/vector-im/element-web/blob/master/docs/config.md"
                             target="_blank"
                             rel="noreferrer noopener"
                         >{sub}</a>;
@@ -199,7 +203,7 @@ export default class AutoDiscoveryUtils {
         // Note: In the cases where we rely on the default IS from the config (namely
         // lack of identity server provided by the discovery method), we intentionally do not
         // validate it. This has already been validated and this helps some off-the-grid usage
-        // of Riot.
+        // of Element.
         let preferredIdentityUrl = defaultConfig && defaultConfig['isUrl'];
         if (isResult && isResult.state === AutoDiscovery.SUCCESS) {
             preferredIdentityUrl = isResult["base_url"];
diff --git a/src/utils/DecryptFile.js b/src/utils/DecryptFile.js
index f5a1b0aa62..dcdc2f9fdb 100644
--- a/src/utils/DecryptFile.js
+++ b/src/utils/DecryptFile.js
@@ -28,7 +28,7 @@ import {MatrixClientPeg} from '../MatrixClientPeg';
 // called createObjectURL(), and so if the content contains any scripting then it
 // will pose a XSS vulnerability when the browser renders it.  This is particularly
 // bad if the user right-clicks the URI and pastes it into a new window or tab,
-// as the blob will then execute with access to Riot's full JS environment(!)
+// as the blob will then execute with access to Element's full JS environment(!)
 //
 // See https://github.com/matrix-org/matrix-react-sdk/pull/1820#issuecomment-385210647
 // for details.
diff --git a/src/utils/EventUtils.js b/src/utils/EventUtils.js
index ac7ac8c9ec..6558a11ed4 100644
--- a/src/utils/EventUtils.js
+++ b/src/utils/EventUtils.js
@@ -31,7 +31,7 @@ export function isContentActionable(mxEvent) {
     // status is SENT before remote-echo, null after
     const isSent = !eventStatus || eventStatus === EventStatus.SENT;
 
-    if (isSent) {
+    if (isSent && !mxEvent.isRedacted()) {
         if (mxEvent.getType() === 'm.room.message') {
             const content = mxEvent.getContent();
             if (content.msgtype && content.msgtype !== 'm.bad.encrypted' && content.hasOwnProperty('body')) {
diff --git a/src/utils/FormattingUtils.js b/src/utils/FormattingUtils.ts
similarity index 71%
rename from src/utils/FormattingUtils.js
rename to src/utils/FormattingUtils.ts
index b932214530..52f8bfcfa2 100644
--- a/src/utils/FormattingUtils.js
+++ b/src/utils/FormattingUtils.ts
@@ -1,6 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -21,29 +21,29 @@ import { _t } from '../languageHandler';
  * formats numbers to fit into ~3 characters, suitable for badge counts
  * e.g: 999, 9.9K, 99K, 0.9M, 9.9M, 99M, 0.9B, 9.9B
  */
-export function formatCount(count) {
-   if (count < 1000) return count;
-   if (count < 10000) return (count / 1000).toFixed(1) + "K";
-   if (count < 100000) return (count / 1000).toFixed(0) + "K";
-   if (count < 10000000) return (count / 1000000).toFixed(1) + "M";
-   if (count < 100000000) return (count / 1000000).toFixed(0) + "M";
-   return (count / 1000000000).toFixed(1) + "B"; // 10B is enough for anyone, right? :S
+export function formatCount(count: number): string {
+    if (count < 1000) return count.toString();
+    if (count < 10000) return (count / 1000).toFixed(1) + "K";
+    if (count < 100000) return (count / 1000).toFixed(0) + "K";
+    if (count < 10000000) return (count / 1000000).toFixed(1) + "M";
+    if (count < 100000000) return (count / 1000000).toFixed(0) + "M";
+    return (count / 1000000000).toFixed(1) + "B"; // 10B is enough for anyone, right? :S
 }
 
 /**
  * Format a count showing the whole number but making it a bit more readable.
  * e.g: 1000 => 1,000
  */
-export function formatCountLong(count) {
+export function formatCountLong(count: number): string {
     const formatter = new Intl.NumberFormat();
-    return formatter.format(count)
+    return formatter.format(count);
 }
 
 /**
  * format a size in bytes into a human readable form
  * e.g: 1024 -> 1.00 KB
  */
-export function formatBytes(bytes, decimals = 2) {
+export function formatBytes(bytes: number, decimals = 2): string {
     if (bytes === 0) return '0 Bytes';
 
     const k = 1024;
@@ -62,7 +62,7 @@ export function formatBytes(bytes, decimals = 2) {
  *
  * @return {string}
  */
-export function formatCryptoKey(key) {
+export function formatCryptoKey(key: string): string {
     return key.match(/.{1,4}/g).join(" ");
 }
 /**
@@ -72,7 +72,7 @@ export function formatCryptoKey(key) {
  *
  * @return {number}
  */
-export function hashCode(str) {
+export function hashCode(str: string): number {
     let hash = 0;
     let i;
     let chr;
@@ -87,7 +87,7 @@ export function hashCode(str) {
     return Math.abs(hash);
 }
 
-export function getUserNameColorClass(userId) {
+export function getUserNameColorClass(userId: string): string {
     const colorNumber = (hashCode(userId) % 8) + 1;
     return `mx_Username_color${colorNumber}`;
 }
@@ -103,7 +103,7 @@ export function getUserNameColorClass(userId) {
  * @returns {string} a string constructed by joining `items` with a comma
  * between each item, but with the last item appended as " and [lastItem]".
  */
-export function formatCommaSeparatedList(items, itemLimit) {
+export function formatCommaSeparatedList(items: string[], itemLimit?: number): string {
     const remaining = itemLimit === undefined ? 0 : Math.max(
         items.length - itemLimit, 0,
     );
@@ -119,3 +119,14 @@ export function formatCommaSeparatedList(items, itemLimit) {
         return _t("%(items)s and %(lastItem)s", { items: items.join(', '), lastItem: lastItem });
     }
 }
+
+/**
+ * Formats a number into a 'minimal' badge count (9, 98, 99+).
+ * @param count The number to convert
+ * @returns The badge count, stringified.
+ */
+export function formatMinimalBadgeCount(count: number): string {
+    // we specifically go from "98" to "99+"
+    if (count < 99) return count.toString();
+    return "99+";
+}
diff --git a/res/css/views/messages/_ReactionsRowButtonTooltip.scss b/src/utils/IDestroyable.ts
similarity index 82%
rename from res/css/views/messages/_ReactionsRowButtonTooltip.scss
rename to src/utils/IDestroyable.ts
index cf4219fcec..f58fffb299 100644
--- a/res/css/views/messages/_ReactionsRowButtonTooltip.scss
+++ b/src/utils/IDestroyable.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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,6 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_ReactionsRowButtonTooltip_reactedWith {
-    opacity: 0.7;
+export interface IDestroyable {
+    destroy(): void;
 }
diff --git a/src/utils/MarkedExecution.ts b/src/utils/MarkedExecution.ts
new file mode 100644
index 0000000000..b0b8fdf63d
--- /dev/null
+++ b/src/utils/MarkedExecution.ts
@@ -0,0 +1,56 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/**
+ * A utility to ensure that a function is only called once triggered with
+ * a mark applied. Multiple marks can be applied to the function, however
+ * the function will only be called once upon trigger().
+ *
+ * The function starts unmarked.
+ */
+export class MarkedExecution {
+    private marked = false;
+
+    /**
+     * Creates a MarkedExecution for the provided function.
+     * @param fn The function to be called upon trigger if marked.
+     */
+    constructor(private fn: () => void) {
+    }
+
+    /**
+     * Resets the mark without calling the function.
+     */
+    public reset() {
+        this.marked = false;
+    }
+
+    /**
+     * Marks the function to be called upon trigger().
+     */
+    public mark() {
+        this.marked = true;
+    }
+
+    /**
+     * If marked, the function will be called, otherwise this does nothing.
+     */
+    public trigger() {
+        if (!this.marked) return;
+        this.reset(); // reset first just in case the fn() causes a trigger()
+        this.fn();
+    }
+}
diff --git a/src/utils/MegolmExportEncryption.js b/src/utils/MegolmExportEncryption.js
index bc9af8db78..cde20a0eb2 100644
--- a/src/utils/MegolmExportEncryption.js
+++ b/src/utils/MegolmExportEncryption.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2017 Vector Creations 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.
@@ -28,7 +29,7 @@ if (!TextDecoder) {
 }
 
 import { _t } from '../languageHandler';
-
+import SdkConfig from '../SdkConfig';
 
 const subtleCrypto = window.crypto.subtle || window.crypto.webkitSubtle;
 
@@ -61,23 +62,24 @@ function cryptoFailMsg() {
  */
 export async function decryptMegolmKeyFile(data, password) {
     const body = unpackMegolmKeyFile(data);
+    const brand = SdkConfig.get().brand;
 
     // check we have a version byte
     if (body.length < 1) {
         throw friendlyError('Invalid file: too short',
-            _t('Not a valid Riot keyfile'));
+            _t('Not a valid %(brand)s keyfile', { brand }));
     }
 
     const version = body[0];
     if (version !== 1) {
         throw friendlyError('Unsupported version',
-            _t('Not a valid Riot keyfile'));
+            _t('Not a valid %(brand)s keyfile', { brand }));
     }
 
     const ciphertextLength = body.length-(1+16+16+4+32);
     if (ciphertextLength < 0) {
         throw friendlyError('Invalid file: too short',
-            _t('Not a valid Riot keyfile'));
+            _t('Not a valid %(brand)s keyfile', { brand }));
     }
 
     const salt = body.subarray(1, 1+16);
diff --git a/src/utils/MessageDiffUtils.js b/src/utils/MessageDiffUtils.js
index de0d8fdc89..7398173fdd 100644
--- a/src/utils/MessageDiffUtils.js
+++ b/src/utils/MessageDiffUtils.js
@@ -77,8 +77,6 @@ function findRefNodes(root, route, isAddition) {
     const end = isAddition ? route.length - 1 : route.length;
     for (let i = 0; i < end; ++i) {
         refParentNode = refNode;
-        // Lists don't have appropriate child nodes we can use.
-        if (!refNode.childNodes[route[i]]) continue;
         refNode = refNode.childNodes[route[i]];
     }
     return {refNode, refParentNode};
@@ -190,10 +188,11 @@ function renderDifferenceInDOM(originalRootNode, diff, diffMathPatch) {
             break;
         }
         case "addTextElement": {
-            if (diff.value !== "\n") {
-                const insNode = wrapInsertion(stringAsTextNode(diff.value));
-                insertBefore(refParentNode, refNode, insNode);
-            }
+            // XXX: sometimes diffDOM says insert a newline when there shouldn't be one
+            // but we must insert the node anyway so that we don't break the route child IDs.
+            // See https://github.com/fiduswriter/diffDOM/issues/100
+            const insNode = wrapInsertion(stringAsTextNode(diff.value !== "\n" ? diff.value : ""));
+            insertBefore(refParentNode, refNode, insNode);
             break;
         }
         // e.g. when changing a the href of a link,
diff --git a/src/utils/PasswordScorer.js b/src/utils/PasswordScorer.ts
similarity index 98%
rename from src/utils/PasswordScorer.js
rename to src/utils/PasswordScorer.ts
index 9d89942bf5..d8f3b0fb96 100644
--- a/src/utils/PasswordScorer.js
+++ b/src/utils/PasswordScorer.ts
@@ -63,7 +63,7 @@ _td("Short keyboard patterns are easy to guess");
  * @param {string} password Password to score
  * @returns {object} Score result with `score` and `feedback` properties
  */
-export function scorePassword(password) {
+export function scorePassword(password: string) {
     if (password.length === 0) return null;
 
     const userInputs = ZXCVBN_USER_INPUTS.slice();
diff --git a/src/utils/ResizeNotifier.js b/src/utils/ResizeNotifier.js
index 35ec1a0269..5467716576 100644
--- a/src/utils/ResizeNotifier.js
+++ b/src/utils/ResizeNotifier.js
@@ -15,9 +15,13 @@ limitations under the License.
 */
 
 /**
- * Fires when the middle panel has been resized.
+ * Fires when the middle panel has been resized (throttled).
  * @event module:utils~ResizeNotifier#"middlePanelResized"
  */
+/**
+ * Fires when the middle panel has been resized by a pixel.
+ * @event module:utils~ResizeNotifier#"middlePanelResizedNoisy"
+ */
 import { EventEmitter } from "events";
 import { throttle } from "lodash";
 
@@ -29,20 +33,28 @@ export default class ResizeNotifier extends EventEmitter {
         this._throttledMiddlePanel = throttle(() => this.emit("middlePanelResized"), 200);
     }
 
-    notifyBannersChanged() {
-        this.emit("leftPanelResized");
-        this.emit("middlePanelResized");
+    _noisyMiddlePanel() {
+        this.emit("middlePanelResizedNoisy");
+    }
+
+    _updateMiddlePanel() {
+        this._throttledMiddlePanel();
+        this._noisyMiddlePanel();
     }
 
     // can be called in quick succession
     notifyLeftHandleResized() {
         // don't emit event for own region
-        this._throttledMiddlePanel();
+        this._updateMiddlePanel();
     }
 
     // can be called in quick succession
     notifyRightHandleResized() {
-        this._throttledMiddlePanel();
+        this._updateMiddlePanel();
+    }
+
+    notifyTimelineHeightChanged() {
+        this._updateMiddlePanel();
     }
 
     // can be called in quick succession
@@ -53,7 +65,7 @@ export default class ResizeNotifier extends EventEmitter {
         // taller than the available space
         this.emit("leftPanelResized");
 
-        this._throttledMiddlePanel();
+        this._updateMiddlePanel();
     }
 }
 
diff --git a/src/utils/ShieldUtils.ts b/src/utils/ShieldUtils.ts
index adaa961a00..878ed3959c 100644
--- a/src/utils/ShieldUtils.ts
+++ b/src/utils/ShieldUtils.ts
@@ -10,7 +10,7 @@ interface Client {
     getStoredDevicesForUser: (userId: string) => [{ deviceId: string }];
     checkDeviceTrust: (userId: string, deviceId: string) => {
         isVerified: () => boolean
-    }
+    };
 }
 
 interface Room {
@@ -27,7 +27,7 @@ export async function shieldStatusForRoom(client: Client, room: Room): Promise<s
     members.filter((userId) => userId !== client.getUserId())
         .forEach((userId) => {
             (client.checkUserTrust(userId).isCrossSigningVerified() ?
-            verified : unverified).push(userId);
+                verified : unverified).push(userId);
         });
 
     /* Alarm if any unverified users were verified before. */
diff --git a/src/utils/Whenable.ts b/src/utils/Whenable.ts
new file mode 100644
index 0000000000..49f2571965
--- /dev/null
+++ b/src/utils/Whenable.ts
@@ -0,0 +1,86 @@
+/*
+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 { IDestroyable } from "./IDestroyable";
+import { arrayFastClone } from "./arrays";
+
+export type WhenFn<T> = (w: Whenable<T>) => void;
+
+/**
+ * Whenables are a cheap way to have Observable patterns mixed with typical
+ * usage of Promises, without having to tear down listeners or calls. Whenables
+ * are intended to be used when a condition will be met multiple times and
+ * the consumer needs to know *when* that happens.
+ */
+export abstract class Whenable<T> implements IDestroyable {
+    private listeners: {condition: T | null, fn: WhenFn<T>}[] = [];
+
+    /**
+     * Sets up a call to `fn` *when* the `condition` is met.
+     * @param condition The condition to match.
+     * @param fn The function to call.
+     * @returns This.
+     */
+    public when(condition: T, fn: WhenFn<T>): Whenable<T> {
+        this.listeners.push({condition, fn});
+        return this;
+    }
+
+    /**
+     * Sets up a call to `fn` *when* any of the `conditions` are met.
+     * @param conditions The conditions to match.
+     * @param fn The function to call.
+     * @returns This.
+     */
+    public whenAnyOf(conditions: T[], fn: WhenFn<T>): Whenable<T> {
+        for (const condition of conditions) {
+            this.when(condition, fn);
+        }
+        return this;
+    }
+
+    /**
+     * Sets up a call to `fn` *when* any condition is met.
+     * @param fn The function to call.
+     * @returns This.
+     */
+    public whenAnything(fn: WhenFn<T>): Whenable<T> {
+        this.listeners.push({condition: null, fn});
+        return this;
+    }
+
+    /**
+     * Notifies all the listeners of a given condition.
+     * @param condition The new condition that has been met.
+     */
+    protected notifyCondition(condition: T) {
+        const listeners = arrayFastClone(this.listeners); // clone just in case the handler modifies us
+        for (const listener of listeners) {
+            if (listener.condition === null || listener.condition === condition) {
+                try {
+                    listener.fn(this);
+                } catch (e) {
+                    console.error(`Error calling whenable listener for ${condition}:`, e);
+                }
+            }
+        }
+    }
+
+    public destroy() {
+        this.listeners = [];
+    }
+}
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index ad4c02887e..645953210d 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -18,7 +18,7 @@ limitations under the License.
 
 import {MatrixClientPeg} from '../MatrixClientPeg';
 import SdkConfig from "../SdkConfig";
-import dis from '../dispatcher';
+import dis from '../dispatcher/dispatcher';
 import * as url from "url";
 import WidgetEchoStore from '../stores/WidgetEchoStore';
 
@@ -31,6 +31,7 @@ import {IntegrationManagers} from "../integrations/IntegrationManagers";
 import {Capability} from "../widgets/WidgetApi";
 import {Room} from "matrix-js-sdk/src/models/room";
 import {WidgetType} from "../widgets/WidgetType";
+import {objectClone} from "./objects";
 
 export default class WidgetUtils {
     /* Returns true if user is able to send state events to modify widgets in this room
@@ -68,7 +69,7 @@ export default class WidgetUtils {
             return false;
         }
 
-        // TODO: Enable support for m.widget event type (https://github.com/vector-im/riot-web/issues/13111)
+        // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
         return room.currentState.maySendStateEvent('im.vector.modular.widgets', me);
     }
 
@@ -184,7 +185,7 @@ export default class WidgetUtils {
             }
 
             const room = MatrixClientPeg.get().getRoom(roomId);
-            // TODO: Enable support for m.widget event type (https://github.com/vector-im/riot-web/issues/13111)
+            // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
             const startingWidgetEvents = room.currentState.getStateEvents('im.vector.modular.widgets');
             if (eventsInIntendedState(startingWidgetEvents)) {
                 resolve();
@@ -194,7 +195,7 @@ export default class WidgetUtils {
             function onRoomStateEvents(ev) {
                 if (ev.getRoomId() !== roomId) return;
 
-                // TODO: Enable support for m.widget event type (https://github.com/vector-im/riot-web/issues/13111)
+                // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
                 const currentWidgetEvents = room.currentState.getStateEvents('im.vector.modular.widgets');
 
                 if (eventsInIntendedState(currentWidgetEvents)) {
@@ -222,7 +223,7 @@ export default class WidgetUtils {
         const client = MatrixClientPeg.get();
         // Get the current widgets and clone them before we modify them, otherwise
         // we'll modify the content of the old event.
-        const userWidgets = JSON.parse(JSON.stringify(WidgetUtils.getUserWidgets()));
+        const userWidgets = objectClone(WidgetUtils.getUserWidgets());
 
         // Delete existing widget with ID
         try {
@@ -262,8 +263,8 @@ export default class WidgetUtils {
 
         if (addingWidget) {
             content = {
-                // TODO: Enable support for m.widget event type (https://github.com/vector-im/riot-web/issues/13111)
-                // For now we'll send the legacy event type for compatibility with older apps/riots
+                // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
+                // For now we'll send the legacy event type for compatibility with older apps/elements
                 type: widgetType.legacy,
                 url: widgetUrl,
                 name: widgetName,
@@ -276,7 +277,7 @@ export default class WidgetUtils {
         WidgetEchoStore.setRoomWidgetEcho(roomId, widgetId, content);
 
         const client = MatrixClientPeg.get();
-        // TODO: Enable support for m.widget event type (https://github.com/vector-im/riot-web/issues/13111)
+        // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
         return client.sendStateEvent(roomId, "im.vector.modular.widgets", content, widgetId).then(() => {
             return WidgetUtils.waitForRoomWidget(widgetId, roomId, addingWidget);
         }).finally(() => {
@@ -290,7 +291,7 @@ export default class WidgetUtils {
      * @return {[object]} Array containing current / active room widgets
      */
     static getRoomWidgets(room: Room) {
-        // TODO: Enable support for m.widget event type (https://github.com/vector-im/riot-web/issues/13111)
+        // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
         const appsStateEvents = room.currentState.getStateEvents('im.vector.modular.widgets');
         if (!appsStateEvents) {
             return [];
@@ -421,6 +422,7 @@ export default class WidgetUtils {
         if (WidgetType.JITSI.matches(appType)) {
             capWhitelist.push(Capability.AlwaysOnScreen);
         }
+        capWhitelist.push(Capability.ReceiveTerminate);
 
         return capWhitelist;
     }
@@ -464,7 +466,7 @@ export default class WidgetUtils {
             // safe to send.
             // We'll end up using a local render URL when we see a Jitsi widget anyways, so this is
             // really just for backwards compatibility and to appease the spec.
-            baseUrl = "https://riot.im/app/";
+            baseUrl = "https://app.element.io/";
         }
         const url = new URL("jitsi.html#" + queryString, baseUrl); // this strips hash fragment from baseUrl
         return url.href;
diff --git a/src/utils/arrays.ts b/src/utils/arrays.ts
new file mode 100644
index 0000000000..fa5515878f
--- /dev/null
+++ b/src/utils/arrays.ts
@@ -0,0 +1,159 @@
+/*
+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.
+*/
+
+/**
+ * Clones an array as fast as possible, retaining references of the array's values.
+ * @param a The array to clone. Must be defined.
+ * @returns A copy of the array.
+ */
+export function arrayFastClone(a: any[]): any[] {
+    return a.slice(0, a.length);
+}
+
+/**
+ * Determines if the two arrays are different either in length, contents,
+ * or order of those contents.
+ * @param a The first array. Must be defined.
+ * @param b The second array. Must be defined.
+ * @returns True if they are different, false otherwise.
+ */
+export function arrayHasOrderChange(a: any[], b: any[]): boolean {
+    if (a.length === b.length) {
+        for (let i = 0; i < a.length; i++) {
+            if (a[i] !== b[i]) return true;
+        }
+        return false;
+    } else {
+        return true; // like arrayHasDiff, a difference in length is a natural change
+    }
+}
+
+/**
+ * Determines if two arrays are different through a shallow comparison.
+ * @param a The first array. Must be defined.
+ * @param b The second array. Must be defined.
+ * @returns True if they are different, false otherwise.
+ */
+export function arrayHasDiff(a: any[], b: any[]): boolean {
+    if (a.length === b.length) {
+        // When the lengths are equal, check to see if either array is missing
+        // an element from the other.
+        if (b.some(i => !a.includes(i))) return true;
+        if (a.some(i => !b.includes(i))) return true;
+
+        // if all the keys are common, say so
+        return false;
+    } else {
+        return true; // different lengths means they are naturally diverged
+    }
+}
+
+/**
+ * Performs a diff on two arrays. The result is what is different with the
+ * first array (`added` in the returned object means objects in B that aren't
+ * in A). Shallow comparisons are used to perform the diff.
+ * @param a The first array. Must be defined.
+ * @param b The second array. Must be defined.
+ * @returns The diff between the arrays.
+ */
+export function arrayDiff<T>(a: T[], b: T[]): { added: T[], removed: T[] } {
+    return {
+        added: b.filter(i => !a.includes(i)),
+        removed: a.filter(i => !b.includes(i)),
+    };
+}
+
+/**
+ * Returns the union of two arrays.
+ * @param a The first array. Must be defined.
+ * @param b The second array. Must be defined.
+ * @returns The union of the arrays.
+ */
+export function arrayUnion<T>(a: T[], b: T[]): T[] {
+    return a.filter(i => b.includes(i));
+}
+
+/**
+ * Merges arrays, deduping contents using a Set.
+ * @param a The arrays to merge.
+ * @returns The merged array.
+ */
+export function arrayMerge<T>(...a: T[][]): T[] {
+    return Array.from(a.reduce((c, v) => {
+        v.forEach(i => c.add(i));
+        return c;
+    }, new Set<T>()));
+}
+
+/**
+ * Helper functions to perform LINQ-like queries on arrays.
+ */
+export class ArrayUtil<T> {
+    /**
+     * Create a new array helper.
+     * @param a The array to help. Can be modified in-place.
+     */
+    constructor(private a: T[]) {
+    }
+
+    /**
+     * The value of this array, after all appropriate alterations.
+     */
+    public get value(): T[] {
+        return this.a;
+    }
+
+    /**
+     * Groups an array by keys.
+     * @param fn The key-finding function.
+     * @returns This.
+     */
+    public groupBy<K>(fn: (a: T) => K): GroupedArray<K, T> {
+        const obj = this.a.reduce((rv: Map<K, T[]>, val: T) => {
+            const k = fn(val);
+            if (!rv.has(k)) rv.set(k, []);
+            rv.get(k).push(val);
+            return rv;
+        }, new Map<K, T[]>());
+        return new GroupedArray(obj);
+    }
+}
+
+/**
+ * Helper functions to perform LINQ-like queries on groups (maps).
+ */
+export class GroupedArray<K, T> {
+    /**
+     * Creates a new group helper.
+     * @param val The group to help. Can be modified in-place.
+     */
+    constructor(private val: Map<K, T[]>) {
+    }
+
+    /**
+     * Orders the grouping into an array using the provided key order.
+     * @param keyOrder The key order.
+     * @returns An array helper of the result.
+     */
+    public orderBy(keyOrder: K[]): ArrayUtil<T> {
+        const a: T[] = [];
+        for (const k of keyOrder) {
+            if (!this.val.has(k)) continue;
+            a.push(...this.val.get(k));
+        }
+        return new ArrayUtil(a);
+    }
+}
diff --git a/src/utils/enums.ts b/src/utils/enums.ts
new file mode 100644
index 0000000000..f7f4787896
--- /dev/null
+++ b/src/utils/enums.ts
@@ -0,0 +1,37 @@
+/*
+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.
+*/
+
+/**
+ * Get the values for an enum.
+ * @param e The enum.
+ * @returns The enum values.
+ */
+export function getEnumValues<T>(e: any): T[] {
+    const keys = Object.keys(e);
+    return keys
+        .filter(k => ['string', 'number'].includes(typeof(e[k])))
+        .map(k => e[k]);
+}
+
+/**
+ * Determines if a given value is a valid value for the provided enum.
+ * @param e The enum to check against.
+ * @param val The value to search for.
+ * @returns True if the enum contains the value.
+ */
+export function isEnumValue<T>(e: T, val: string | number): boolean {
+    return getEnumValues(e).includes(val);
+}
diff --git a/src/utils/maps.ts b/src/utils/maps.ts
new file mode 100644
index 0000000000..96832094f0
--- /dev/null
+++ b/src/utils/maps.ts
@@ -0,0 +1,46 @@
+/*
+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 { arrayDiff, arrayMerge, arrayUnion } from "./arrays";
+
+/**
+ * Determines the keys added, changed, and removed between two Maps.
+ * For changes, simple triple equal comparisons are done, not in-depth tree checking.
+ * @param a The first Map. Must be defined.
+ * @param b The second Map. Must be defined.
+ * @returns The difference between the keys of each Map.
+ */
+export function mapDiff<K, V>(a: Map<K, V>, b: Map<K, V>): { changed: K[], added: K[], removed: K[] } {
+    const aKeys = [...a.keys()];
+    const bKeys = [...b.keys()];
+    const keyDiff = arrayDiff(aKeys, bKeys);
+    const possibleChanges = arrayUnion(aKeys, bKeys);
+    const changes = possibleChanges.filter(k => a.get(k) !== b.get(k));
+
+    return {changed: changes, added: keyDiff.added, removed: keyDiff.removed};
+}
+
+/**
+ * Gets all the key changes (added, removed, or value difference) between two Maps.
+ * Triple equals is used to compare values, not in-depth tree checking.
+ * @param a The first Map. Must be defined.
+ * @param b The second Map. Must be defined.
+ * @returns The keys which have been added, removed, or changed between the two Maps.
+ */
+export function mapKeyChanges<K, V>(a: Map<K, V>, b: Map<K, V>): K[] {
+    const diff = mapDiff(a, b);
+    return arrayMerge(diff.removed, diff.added, diff.changed);
+}
diff --git a/src/utils/membership.ts b/src/utils/membership.ts
new file mode 100644
index 0000000000..9534623d62
--- /dev/null
+++ b/src/utils/membership.ts
@@ -0,0 +1,72 @@
+/*
+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";
+
+/**
+ * Approximation of a membership status for a given room.
+ */
+export enum EffectiveMembership {
+    /**
+     * The user is effectively joined to the room. For example, actually joined
+     * or knocking on the room (when that becomes possible).
+     */
+    Join = "JOIN",
+
+    /**
+     * The user is effectively invited to the room. Currently this is a direct map
+     * to the invite membership as no other membership states are effectively
+     * invites.
+     */
+    Invite = "INVITE",
+
+    /**
+     * The user is effectively no longer in the room. For example, kicked,
+     * banned, or voluntarily left.
+     */
+    Leave = "LEAVE",
+}
+
+export interface MembershipSplit {
+    // @ts-ignore - TS wants this to be a string key, but we know better.
+    [state: EffectiveMembership]: Room[];
+}
+
+export function splitRoomsByMembership(rooms: Room[]): MembershipSplit {
+    const split: MembershipSplit = {
+        [EffectiveMembership.Invite]: [],
+        [EffectiveMembership.Join]: [],
+        [EffectiveMembership.Leave]: [],
+    };
+
+    for (const room of rooms) {
+        split[getEffectiveMembership(room.getMyMembership())].push(room);
+    }
+
+    return split;
+}
+
+export function getEffectiveMembership(membership: string): EffectiveMembership {
+    if (membership === 'invite') {
+        return EffectiveMembership.Invite;
+    } else if (membership === 'join') {
+        // TODO: Include knocks? Update docs as needed in the enum. https://github.com/vector-im/element-web/issues/14237
+        return EffectiveMembership.Join;
+    } else {
+        // Probably a leave, kick, or ban
+        return EffectiveMembership.Leave;
+    }
+}
diff --git a/src/utils/objects.ts b/src/utils/objects.ts
new file mode 100644
index 0000000000..bc74ab9ee0
--- /dev/null
+++ b/src/utils/objects.ts
@@ -0,0 +1,140 @@
+/*
+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 { arrayDiff, arrayHasDiff, arrayMerge, arrayUnion } from "./arrays";
+
+type ObjectExcluding<O extends {}, P extends (keyof O)[]> = {[k in Exclude<keyof O, P[number]>]: O[k]};
+
+/**
+ * Gets a new object which represents the provided object, excluding some properties.
+ * @param a The object to strip properties of. Must be defined.
+ * @param props The property names to remove.
+ * @returns The new object without the provided properties.
+ */
+export function objectExcluding<O extends {}, P extends Array<keyof O>>(a: O, props: P): ObjectExcluding<O, P> {
+    // We use a Map to avoid hammering the `delete` keyword, which is slow and painful.
+    const tempMap = new Map<keyof O, any>(Object.entries(a) as [keyof O, any][]);
+    for (const prop of props) {
+        tempMap.delete(prop);
+    }
+
+    // Convert the map to an object again
+    return Array.from(tempMap.entries()).reduce((c, [k, v]) => {
+        c[k] = v;
+        return c;
+    }, {} as O);
+}
+
+/**
+ * Gets a new object which represents the provided object, with only some properties
+ * included.
+ * @param a The object to clone properties of. Must be defined.
+ * @param props The property names to keep.
+ * @returns The new object with only the provided properties.
+ */
+export function objectWithOnly<O extends {}, P extends Array<keyof O>>(a: O, props: P): {[k in P[number]]: O[k]} {
+    const existingProps = Object.keys(a) as (keyof O)[];
+    const diff = arrayDiff(existingProps, props);
+    if (diff.removed.length === 0) {
+        return objectShallowClone(a);
+    } else {
+        return objectExcluding(a, diff.removed) as {[k in P[number]]: O[k]};
+    }
+}
+
+/**
+ * Clones an object to a caller-controlled depth. When a propertyCloner is supplied, the
+ * object's properties will be passed through it with the return value used as the new
+ * object's type. This is intended to be used to deep clone a reference, but without
+ * having to deep clone the entire object. This function is safe to call recursively within
+ * the propertyCloner.
+ * @param a The object to clone. Must be defined.
+ * @param propertyCloner The function to clone the properties of the object with, optionally.
+ * First argument is the property key with the second being the current value.
+ * @returns A cloned object.
+ */
+export function objectShallowClone<O extends {}>(a: O, propertyCloner?: (k: keyof O, v: O[keyof O]) => any): O {
+    const newObj = {} as O;
+    for (const [k, v] of Object.entries(a) as [keyof O, O[keyof O]][]) {
+        newObj[k] = v;
+        if (propertyCloner) {
+            newObj[k] = propertyCloner(k, v);
+        }
+    }
+    return newObj;
+}
+
+/**
+ * Determines if any keys were added, removed, or changed between two objects.
+ * For changes, simple triple equal comparisons are done, not in-depth
+ * tree checking.
+ * @param a The first object. Must be defined.
+ * @param b The second object. Must be defined.
+ * @returns True if there's a difference between the objects, false otherwise
+ */
+export function objectHasDiff<O extends {}>(a: O, b: O): boolean {
+    const aKeys = Object.keys(a);
+    const bKeys = Object.keys(b);
+    if (arrayHasDiff(aKeys, bKeys)) return true;
+
+    const possibleChanges = arrayUnion(aKeys, bKeys);
+    return possibleChanges.some(k => a[k] !== b[k]);
+}
+
+type Diff<K> = { changed: K[], added: K[], removed: K[] };
+
+/**
+ * Determines the keys added, changed, and removed between two objects.
+ * For changes, simple triple equal comparisons are done, not in-depth
+ * tree checking.
+ * @param a The first object. Must be defined.
+ * @param b The second object. Must be defined.
+ * @returns The difference between the keys of each object.
+ */
+export function objectDiff<O extends {}>(a: O, b: O): Diff<keyof O> {
+    const aKeys = Object.keys(a) as (keyof O)[];
+    const bKeys = Object.keys(b) as (keyof O)[];
+    const keyDiff = arrayDiff(aKeys, bKeys);
+    const possibleChanges = arrayUnion(aKeys, bKeys);
+    const changes = possibleChanges.filter(k => a[k] !== b[k]);
+
+    return {changed: changes, added: keyDiff.added, removed: keyDiff.removed};
+}
+
+/**
+ * Gets all the key changes (added, removed, or value difference) between
+ * two objects. Triple equals is used to compare values, not in-depth tree
+ * checking.
+ * @param a The first object. Must be defined.
+ * @param b The second object. Must be defined.
+ * @returns The keys which have been added, removed, or changed between the
+ * two objects.
+ */
+export function objectKeyChanges<O extends {}>(a: O, b: O): (keyof O)[] {
+    const diff = objectDiff(a, b);
+    return arrayMerge(diff.removed, diff.added, diff.changed);
+}
+
+/**
+ * Clones an object by running it through JSON parsing. Note that this
+ * will destroy any complicated object types which do not translate to
+ * JSON.
+ * @param obj The object to clone.
+ * @returns The cloned object
+ */
+export function objectClone<O extends {}>(obj: O): O {
+    return JSON.parse(JSON.stringify(obj));
+}
diff --git a/src/utils/pillify.js b/src/utils/pillify.js
index f708ab7770..432771592a 100644
--- a/src/utils/pillify.js
+++ b/src/utils/pillify.js
@@ -111,7 +111,7 @@ export function pillifyLinks(nodes, mxEvent, pills) {
                             type={Pill.TYPE_AT_ROOM_MENTION}
                             inMessage={true}
                             room={room}
-                            shouldShowPillAvatar={true}
+                            shouldShowPillAvatar={shouldShowPillAvatar}
                         />;
 
                         ReactDOM.render(pill, pillContainer);
@@ -139,7 +139,7 @@ export function pillifyLinks(nodes, mxEvent, pills) {
  * It's critical to call this after pillifyLinks, otherwise
  * Pills will leak, leaking entire DOM trees via the event
  * emitter on BaseAvatar as per
- * https://github.com/vector-im/riot-web/issues/12417
+ * https://github.com/vector-im/element-web/issues/12417
  *
  * @param {Node[]} pills - array of pill containers whose React
  *   components should be unmounted.
diff --git a/src/utils/presence.ts b/src/utils/presence.ts
new file mode 100644
index 0000000000..f2c208265e
--- /dev/null
+++ b/src/utils/presence.ts
@@ -0,0 +1,26 @@
+/*
+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 { MatrixClientPeg } from "../MatrixClientPeg";
+import SdkConfig from "../SdkConfig";
+
+export function isPresenceEnabled() {
+    const hsUrl = MatrixClientPeg.get().baseUrl;
+    const urls = SdkConfig.get()['enable_presence_by_hs_url'];
+    if (!urls) return true;
+    if (urls[hsUrl] || urls[hsUrl] === undefined) return true;
+    return false;
+}
diff --git a/src/utils/promise.ts b/src/utils/promise.ts
index c5c1cb9a56..d3ae2c3d1b 100644
--- a/src/utils/promise.ts
+++ b/src/utils/promise.ts
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Returns a promise which resolves with a given value after the given number of ms
-export function sleep<T>(ms: number, value: T): Promise<T> {
+export function sleep<T>(ms: number, value?: T): Promise<T> {
     return new Promise((resolve => { setTimeout(resolve, ms, value); }));
 }
 
diff --git a/src/utils/read-receipts.ts b/src/utils/read-receipts.ts
new file mode 100644
index 0000000000..f05c3cc5f2
--- /dev/null
+++ b/src/utils/read-receipts.ts
@@ -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 { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+
+/**
+ * Determines if a read receipt update event includes the client's own user.
+ * @param event The event to check.
+ * @param client The client to check against.
+ * @returns True if the read receipt update includes the client, false otherwise.
+ */
+export function readReceiptChangeIsFor(event: MatrixEvent, client: MatrixClient): boolean {
+    const myUserId = client.getUserId();
+    for (const eventId of Object.keys(event.getContent())) {
+        const receiptUsers = Object.keys(event.getContent()[eventId]['m.read'] || {});
+        if (receiptUsers.includes(myUserId)) {
+            return true;
+        }
+    }
+}
diff --git a/res/css/views/dialogs/_DeviceVerifyDialog.scss b/src/utils/units.ts
similarity index 64%
rename from res/css/views/dialogs/_DeviceVerifyDialog.scss
rename to src/utils/units.ts
index 1997e0c21d..03775f4c21 100644
--- a/res/css/views/dialogs/_DeviceVerifyDialog.scss
+++ b/src/utils/units.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 New Vector Ltd.
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,16 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_DeviceVerifyDialog_cryptoSection ul {
-    display: table;
+/* Simple utils for formatting style values
+ */
+
+// converts a pixel value to rem.
+export function toRem(pixelValue: number): string {
+    return pixelValue / 10 + "rem";
 }
 
-.mx_DeviceVerifyDialog_cryptoSection li {
-    display: table-row;
-}
-
-.mx_DeviceVerifyDialog_cryptoSection label,
-.mx_DeviceVerifyDialog_cryptoSection span {
-    display: table-cell;
-    padding-right: 1em;
+export function toPx(pixelValue: number): string {
+    return pixelValue + "px";
 }
diff --git a/src/verification.js b/src/verification.js
index d7287552dd..36fb8b0e4f 100644
--- a/src/verification.js
+++ b/src/verification.js
@@ -15,19 +15,19 @@ limitations under the License.
 */
 
 import {MatrixClientPeg} from './MatrixClientPeg';
-import dis from "./dispatcher";
+import dis from "./dispatcher/dispatcher";
 import Modal from './Modal';
 import * as sdk from './index';
 import { _t } from './languageHandler';
-import {RIGHT_PANEL_PHASES} from "./stores/RightPanelStorePhases";
+import {RightPanelPhases} from "./stores/RightPanelStorePhases";
 import {findDMForUser} from './createRoom';
 import {accessSecretStorage} from './CrossSigningManager';
-import SettingsStore from './settings/SettingsStore';
 import {verificationMethods} from 'matrix-js-sdk/src/crypto';
+import {Action} from './dispatcher/actions';
 
 async function enable4SIfNeeded() {
     const cli = MatrixClientPeg.get();
-    if (!cli.isCryptoEnabled() || !SettingsStore.getValue("feature_cross_signing")) {
+    if (!cli.isCryptoEnabled()) {
         return false;
     }
     const usk = cli.getCrossSigningId("user_signing");
@@ -43,14 +43,26 @@ function UntrustedDeviceDialog(props) {
     const {device, user, onFinished} = props;
     const BaseDialog = sdk.getComponent("dialogs.BaseDialog");
     const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
+    let askToVerifyText;
+    let newSessionText;
+
+    if (MatrixClientPeg.get().getUserId() === user.userId) {
+        newSessionText = _t("You signed in to a new session without verifying it:");
+        askToVerifyText = _t("Verify your other session using one of the options below.");
+    } else {
+        newSessionText = _t("%(name)s (%(userId)s) signed in to a new session without verifying it:",
+            {name: user.displayName, userId: user.userId});
+        askToVerifyText = _t("Ask this user to verify their session, or manually verify it below.");
+    }
+
     return <BaseDialog
         onFinished={onFinished}
         headerImage={require("../res/img/e2e/warning.svg")}
         title={_t("Not Trusted")}>
         <div className="mx_Dialog_content" id='mx_Dialog_content'>
-            <p>{_t("%(name)s (%(userId)s) signed in to a new session without verifying it:", {name: user.displayName, userId: user.userId})}</p>
+            <p>{newSessionText}</p>
             <p>{device.getDisplayName()} ({device.deviceId})</p>
-            <p>{_t("Ask this user to verify their session, or manually verify it below.")}</p>
+            <p>{askToVerifyText}</p>
         </div>
         <div className='mx_Dialog_buttons'>
             <AccessibleButton element="button" kind="secondary" onClick={() => onFinished("legacy")}>{_t("Manually Verify by Text")}</AccessibleButton>
@@ -80,8 +92,8 @@ export async function verifyDevice(user, device) {
                     verificationMethods.SAS,
                 );
                 dis.dispatch({
-                    action: "set_right_panel_phase",
-                    phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+                    action: Action.SetRightPanelPhase,
+                    phase: RightPanelPhases.EncryptionPanel,
                     refireParams: {member: user, verificationRequestPromise},
                 });
             } else if (action === "legacy") {
@@ -109,8 +121,8 @@ export async function legacyVerifyUser(user) {
     }
     const verificationRequestPromise = cli.requestVerification(user.userId);
     dis.dispatch({
-        action: "set_right_panel_phase",
-        phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+        action: Action.SetRightPanelPhase,
+        phase: RightPanelPhases.EncryptionPanel,
         refireParams: {member: user, verificationRequestPromise},
     });
 }
@@ -121,8 +133,8 @@ export async function verifyUser(user) {
     }
     const existingRequest = pendingVerificationRequestForUser(user);
     dis.dispatch({
-        action: "set_right_panel_phase",
-        phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+        action: Action.SetRightPanelPhase,
+        phase: RightPanelPhases.EncryptionPanel,
         refireParams: {
             member: user,
             verificationRequest: existingRequest,
diff --git a/src/widgets/Jitsi.ts b/src/widgets/Jitsi.ts
index 15df4953aa..a52f8182aa 100644
--- a/src/widgets/Jitsi.ts
+++ b/src/widgets/Jitsi.ts
@@ -16,10 +16,8 @@ limitations under the License.
 
 import SdkConfig from "../SdkConfig";
 import {MatrixClientPeg} from "../MatrixClientPeg";
-import {AutoDiscovery} from "matrix-js-sdk/src/autodiscovery";
 
 const JITSI_WK_PROPERTY = "im.vector.riot.jitsi";
-const JITSI_WK_CHECK_INTERVAL = 2 * 60 * 60 * 1000; // 2 hours, arbitrarily selected
 
 export interface JitsiWidgetData {
     conferenceId: string;
@@ -36,39 +34,27 @@ export class Jitsi {
         return this.domain || 'jitsi.riot.im';
     }
 
-    constructor() {
-        // We rely on the first call to be an .update() instead of doing one here. Doing one
-        // here could result in duplicate calls to the homeserver.
-
-        // Start a timer to update the server info regularly
-        setInterval(() => this.update(), JITSI_WK_CHECK_INTERVAL);
+    public start() {
+        const cli = MatrixClientPeg.get();
+        cli.on("WellKnown.client", this.update);
+        // call update initially in case we missed the first WellKnown.client event and for if no well-known present
+        this.update(cli.getClientWellKnown());
     }
 
-    public async update(): Promise<any> {
+    private update = async (discoveryResponse): Promise<any> => {
         // Start with a default of the config's domain
         let domain = (SdkConfig.get()['jitsi'] || {})['preferredDomain'] || 'jitsi.riot.im';
 
-        // Now request the .well-known config to see if it changed
-        if (MatrixClientPeg.get()) {
-            try {
-                console.log("Attempting to get Jitsi conference information from homeserver");
-
-                const homeserverDomain = MatrixClientPeg.getHomeserverName();
-                const discoveryResponse = await AutoDiscovery.getRawClientConfig(homeserverDomain);
-                if (discoveryResponse && discoveryResponse[JITSI_WK_PROPERTY]) {
-                    const wkPreferredDomain = discoveryResponse[JITSI_WK_PROPERTY]['preferredDomain'];
-                    if (wkPreferredDomain) domain = wkPreferredDomain;
-                }
-            } catch (e) {
-                // These are non-fatal errors
-                console.error(e);
-            }
+        console.log("Attempting to get Jitsi conference information from homeserver");
+        if (discoveryResponse && discoveryResponse[JITSI_WK_PROPERTY]) {
+            const wkPreferredDomain = discoveryResponse[JITSI_WK_PROPERTY]['preferredDomain'];
+            if (wkPreferredDomain) domain = wkPreferredDomain;
         }
 
         // Put the result into memory for us to use later
         this.domain = domain;
         console.log("Jitsi conference domain:", this.preferredDomain);
-    }
+    };
 
     /**
      * Parses the given URL into the data needed for a Jitsi widget, if the widget
diff --git a/src/widgets/WidgetApi.ts b/src/widgets/WidgetApi.ts
index 05237d258f..15603e9437 100644
--- a/src/widgets/WidgetApi.ts
+++ b/src/widgets/WidgetApi.ts
@@ -18,11 +18,14 @@ limitations under the License.
 // https://github.com/turt2live/matrix-dimension/blob/4f92d560266635e5a3c824606215b84e8c0b19f5/web/app/shared/services/scalar/scalar-widget.api.ts
 
 import { randomString } from "matrix-js-sdk/src/randomstring";
+import { EventEmitter } from "events";
+import { objectClone } from "../utils/objects";
 
 export enum Capability {
     Screenshot = "m.capability.screenshot",
     Sticker = "m.sticker",
     AlwaysOnScreen = "m.always_on_screen",
+    ReceiveTerminate = "im.vector.receive_terminate",
 }
 
 export enum KnownWidgetActions {
@@ -34,6 +37,7 @@ export enum KnownWidgetActions {
     ReceiveOpenIDCredentials = "openid_credentials",
     SetAlwaysOnScreen = "set_always_on_screen",
     ClientReady = "im.vector.ready",
+    Terminate = "im.vector.terminate",
 }
 
 export type WidgetAction = KnownWidgetActions | string;
@@ -61,9 +65,14 @@ export interface FromWidgetRequest extends WidgetRequest {
 }
 
 /**
- * Handles Riot <--> Widget interactions for embedded/standalone widgets.
+ * Handles Element <--> Widget interactions for embedded/standalone widgets.
+ *
+ * Emitted events:
+ * - terminate(wait): client requested the widget to terminate.
+ *   Call the argument 'wait(promise)' to postpone the finalization until
+ *   the given promise resolves.
  */
-export class WidgetApi {
+export class WidgetApi extends EventEmitter {
     private origin: string;
     private inFlightRequests: { [requestId: string]: (reply: FromWidgetRequest) => void } = {};
     private readyPromise: Promise<any>;
@@ -75,6 +84,8 @@ export class WidgetApi {
     public expectingExplicitReady = false;
 
     constructor(currentUrl: string, private widgetId: string, private requestedCapabilities: string[]) {
+        super();
+
         this.origin = new URL(currentUrl).origin;
 
         this.readyPromise = new Promise<any>(resolve => this.readyPromiseResolve = resolve);
@@ -98,6 +109,17 @@ export class WidgetApi {
 
                     // Automatically acknowledge so we can move on
                     this.replyToRequest(<ToWidgetRequest>payload, {});
+                } else if (payload.action === KnownWidgetActions.Terminate) {
+                    // Finalization needs to be async, so postpone with a promise
+                    let finalizePromise = Promise.resolve();
+                    const wait = (promise) => {
+                        finalizePromise = finalizePromise.then(() => promise);
+                    };
+                    this.emit('terminate', wait);
+                    Promise.resolve(finalizePromise).then(() => {
+                        // Acknowledge that we're shut down now
+                        this.replyToRequest(<ToWidgetRequest>payload, {});
+                    });
                 } else {
                     console.warn(`[WidgetAPI] Got unexpected action: ${payload.action}`);
                 }
@@ -119,7 +141,7 @@ export class WidgetApi {
     private replyToRequest(payload: ToWidgetRequest, reply: any) {
         if (!window.parent) return;
 
-        const request = JSON.parse(JSON.stringify(payload));
+        const request: ToWidgetRequest & {response?: any} = objectClone(payload);
         request.response = reply;
 
         window.parent.postMessage(request, this.origin);
diff --git a/test/autocomplete/QueryMatcher-test.js b/test/autocomplete/QueryMatcher-test.js
index 03f28eb984..2d0e10563b 100644
--- a/test/autocomplete/QueryMatcher-test.js
+++ b/test/autocomplete/QueryMatcher-test.js
@@ -81,7 +81,34 @@ describe('QueryMatcher', function() {
         expect(reverseResults[1].name).toBe('Victoria');
     });
 
-    it('Returns results with search string in same place in insertion order', function() {
+    it('Returns results with search string in same place according to key index', function() {
+        const objects = [
+            { name: "a", first: "hit", second: "miss", third: "miss" },
+            { name: "b", first: "miss", second: "hit", third: "miss" },
+            { name: "c", first: "miss", second: "miss", third: "hit" },
+        ];
+        const qm = new QueryMatcher(objects, {keys: ["second", "first", "third"]});
+        const results = qm.match('hit');
+
+        expect(results.length).toBe(3);
+        expect(results[0].name).toBe('b');
+        expect(results[1].name).toBe('a');
+        expect(results[2].name).toBe('c');
+
+
+        qm.setObjects(objects.slice().reverse());
+
+        const reverseResults = qm.match('hit');
+
+        // should still be in the same order: key index
+        // takes precedence over input order
+        expect(reverseResults.length).toBe(3);
+        expect(reverseResults[0].name).toBe('b');
+        expect(reverseResults[1].name).toBe('a');
+        expect(reverseResults[2].name).toBe('c');
+    });
+
+    it('Returns results with search string in same place and key in same place in insertion order', function() {
         const qm = new QueryMatcher(OBJECTS, {keys: ["name"]});
         const results = qm.match('Mel');
 
@@ -132,9 +159,9 @@ describe('QueryMatcher', function() {
 
         const results = qm.match('Emma');
         expect(results.length).toBe(3);
-        expect(results[0].name).toBe('Mel B');
-        expect(results[1].name).toBe('Mel C');
-        expect(results[2].name).toBe('Emma');
+        expect(results[0].name).toBe('Emma');
+        expect(results[1].name).toBe('Mel B');
+        expect(results[2].name).toBe('Mel C');
     });
 
     it('Matches words only by default', function() {
diff --git a/test/components/views/dialogs/AccessSecretStorageDialog-test.js b/test/components/views/dialogs/AccessSecretStorageDialog-test.js
index c754a4b607..5a8dcbf763 100644
--- a/test/components/views/dialogs/AccessSecretStorageDialog-test.js
+++ b/test/components/views/dialogs/AccessSecretStorageDialog-test.js
@@ -40,19 +40,20 @@ describe("AccessSecretStorageDialog", function() {
         testInstance.getInstance()._onRecoveryKeyNext(e);
     });
 
-    it("Considers a valid key to be valid", function() {
+    it("Considers a valid key to be valid", async function() {
         const testInstance = TestRenderer.create(
             <AccessSecretStorageDialog
               checkPrivateKey={() => true}
             />,
         );
-        const v = "asfd";
+        const v = "asdf";
         const e = { target: { value: v } };
         stubClient();
-        MatrixClientPeg.get().isValidRecoveryKey = function(k) {
-            return k == v;
-        };
+        MatrixClientPeg.get().keyBackupKeyFromRecoveryKey = () => 'a raw key';
+        MatrixClientPeg.get().checkSecretStorageKey = () => true;
         testInstance.getInstance()._onRecoveryKeyChange(e);
+        // force a validation now because it debounces
+        await testInstance.getInstance()._validateRecoveryKey();
         const { recoveryKeyValid } = testInstance.getInstance().state;
         expect(recoveryKeyValid).toBe(true);
     });
@@ -65,17 +66,21 @@ describe("AccessSecretStorageDialog", function() {
         );
         const e = { target: { value: "a" } };
         stubClient();
-        MatrixClientPeg.get().isValidRecoveryKey = () => true;
+        MatrixClientPeg.get().keyBackupKeyFromRecoveryKey = () => {
+            throw new Error("that's no key");
+        };
         testInstance.getInstance()._onRecoveryKeyChange(e);
-        await testInstance.getInstance()._onRecoveryKeyNext({ preventDefault: () => {} });
-        const { keyMatches } = testInstance.getInstance().state;
-        expect(keyMatches).toBe(false);
+        // force a validation now because it debounces
+        await testInstance.getInstance()._validateRecoveryKey();
+
+        const { recoveryKeyValid, recoveryKeyCorrect } = testInstance.getInstance().state;
+        expect(recoveryKeyValid).toBe(false);
+        expect(recoveryKeyCorrect).toBe(false);
         const notification = testInstance.root.findByProps({
-            className: "mx_AccessSecretStorageDialog_keyStatus",
+            className: "mx_AccessSecretStorageDialog_recoveryKeyFeedback " +
+                "mx_AccessSecretStorageDialog_recoveryKeyFeedback_invalid",
         });
-        expect(notification.props.children).toEqual(
-            ["\uD83D\uDC4E ", "Unable to access secret storage. Please verify that you " +
-                     "entered the correct recovery key."]);
+        expect(notification.props.children).toEqual("Invalid Recovery Key");
         done();
     });
 
diff --git a/test/components/views/messages/TextualBody-test.js b/test/components/views/messages/TextualBody-test.js
index 59671327ce..07cd51edbd 100644
--- a/test/components/views/messages/TextualBody-test.js
+++ b/test/components/views/messages/TextualBody-test.js
@@ -206,8 +206,7 @@ describe("<TextualBody />", () => {
                 'Hey <span>' +
                 '<a class="mx_Pill mx_UserPill" title="@user:server">' +
                 '<img class="mx_BaseAvatar mx_BaseAvatar_image" src="mxc://avatar.url/image.png" ' +
-                'style="width: 1.0666666666666667rem; height: 1.0666666666666667rem;" ' +
-                'title="@member:domain.bla" alt="" aria-hidden="true">Member</a>' +
+                'style="width: 16px; height: 16px;" title="@member:domain.bla" alt="" aria-hidden="true">Member</a>' +
                 '</span></span>');
         });
     });
diff --git a/test/components/views/rooms/RoomList-test.js b/test/components/views/rooms/RoomList-test.js
index 8dc4647920..c2cad431f4 100644
--- a/test/components/views/rooms/RoomList-test.js
+++ b/test/components/views/rooms/RoomList-test.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import ReactTestUtils from 'react-dom/test-utils';
 import ReactDOM from 'react-dom';
-import lolex from 'lolex';
 
 import * as TestUtils from '../../../test-utils';
 
@@ -9,17 +8,24 @@ import {MatrixClientPeg} from '../../../../src/MatrixClientPeg';
 import sdk from '../../../skinned-sdk';
 import { DragDropContext } from 'react-beautiful-dnd';
 
-import dis from '../../../../src/dispatcher';
+import dis from '../../../../src/dispatcher/dispatcher';
 import DMRoomMap from '../../../../src/utils/DMRoomMap.js';
 import GroupStore from '../../../../src/stores/GroupStore.js';
 
 import { MatrixClient, Room, RoomMember } from 'matrix-js-sdk';
-import {TAG_DM} from "../../../../src/stores/RoomListStore";
+import {DefaultTagID} from "../../../../src/stores/room-list/models";
+import RoomListStore, { LISTS_UPDATE_EVENT, RoomListStoreClass } from "../../../../src/stores/room-list/RoomListStore";
+import RoomListLayoutStore from "../../../../src/stores/room-list/RoomListLayoutStore";
 
 function generateRoomId() {
     return '!' + Math.random().toString().slice(2, 10) + ':domain';
 }
 
+function waitForRoomListStoreUpdate() {
+    return new Promise((resolve) => {
+        RoomListStore.instance.once(LISTS_UPDATE_EVENT, () => resolve());
+    });
+}
 
 describe('RoomList', () => {
     function createRoom(opts) {
@@ -34,7 +40,6 @@ describe('RoomList', () => {
     let client = null;
     let root = null;
     const myUserId = '@me:domain';
-    let clock = null;
 
     const movingRoomId = '!someroomid';
     let movingRoom;
@@ -43,15 +48,15 @@ describe('RoomList', () => {
     let myMember;
     let myOtherMember;
 
-    beforeEach(function() {
+    beforeEach(async function(done) {
+        RoomListStoreClass.TEST_MODE = true;
+
         TestUtils.stubClient();
         client = MatrixClientPeg.get();
         client.credentials = {userId: myUserId};
         //revert this to prototype method as the test-utils monkey-patches this to return a hardcoded value
         client.getUserId = MatrixClient.prototype.getUserId;
 
-        clock = lolex.install();
-
         DMRoomMap.makeShared();
 
         parentDiv = document.createElement('div');
@@ -61,7 +66,7 @@ describe('RoomList', () => {
         const WrappedRoomList = TestUtils.wrapInMatrixClientContext(RoomList);
         root = ReactDOM.render(
             <DragDropContext>
-                <WrappedRoomList searchFilter="" />
+                <WrappedRoomList searchFilter="" onResize={() => {}} />
             </DragDropContext>
         , parentDiv);
         ReactTestUtils.findRenderedComponentWithType(root, RoomList);
@@ -102,22 +107,28 @@ describe('RoomList', () => {
         });
 
         client.getRoom = (roomId) => roomMap[roomId];
+
+        // Now that everything has been set up, prepare and update the store
+        await RoomListStore.instance.makeReady(client);
+
+        done();
     });
 
-    afterEach((done) => {
+    afterEach(async (done) => {
         if (parentDiv) {
             ReactDOM.unmountComponentAtNode(parentDiv);
             parentDiv.remove();
             parentDiv = null;
         }
 
-        clock.uninstall();
+        await RoomListLayoutStore.instance.resetLayouts();
+        await RoomListStore.instance.resetStore();
 
         done();
     });
 
     function expectRoomInSubList(room, subListTest) {
-        const RoomSubList = sdk.getComponent('structures.RoomSubList');
+        const RoomSubList = sdk.getComponent('views.rooms.RoomSublist');
         const RoomTile = sdk.getComponent('views.rooms.RoomTile');
 
         const subLists = ReactTestUtils.scryRenderedComponentsWithType(root, RoomSubList);
@@ -140,20 +151,20 @@ describe('RoomList', () => {
         expect(expectedRoomTile.props.room).toBe(room);
     }
 
-    function expectCorrectMove(oldTag, newTag) {
-        const getTagSubListTest = (tag) => {
-            if (tag === undefined) return (s) => s.props.label.endsWith('Rooms');
-            return (s) => s.props.tagName === tag;
+    function expectCorrectMove(oldTagId, newTagId) {
+        const getTagSubListTest = (tagId) => {
+            return (s) => s.props.tagId === tagId;
         };
 
         // Default to finding the destination sublist with newTag
-        const destSubListTest = getTagSubListTest(newTag);
-        const srcSubListTest = getTagSubListTest(oldTag);
+        const destSubListTest = getTagSubListTest(newTagId);
+        const srcSubListTest = getTagSubListTest(oldTagId);
 
         // Set up the room that will be moved such that it has the correct state for a room in
-        // the section for oldTag
-        if (['m.favourite', 'm.lowpriority'].includes(oldTag)) movingRoom.tags = {[oldTag]: {}};
-        if (oldTag === TAG_DM) {
+        // the section for oldTagId
+        if (oldTagId === DefaultTagID.Favourite || oldTagId === DefaultTagID.LowPriority) {
+            movingRoom.tags = {[oldTagId]: {}};
+        } else if (oldTagId === DefaultTagID.DM) {
             // Mock inverse m.direct
             DMRoomMap.shared().roomToUser = {
                 [movingRoom.roomId]: '@someotheruser:domain',
@@ -162,17 +173,12 @@ describe('RoomList', () => {
 
         dis.dispatch({action: 'MatrixActions.sync', prevState: null, state: 'PREPARED', matrixClient: client});
 
-        clock.runAll();
-
         expectRoomInSubList(movingRoom, srcSubListTest);
 
         dis.dispatch({action: 'RoomListActions.tagRoom.pending', request: {
-            oldTag, newTag, room: movingRoom,
+            oldTagId, newTagId, room: movingRoom,
         }});
 
-        // Run all setTimeouts for dispatches and room list rate limiting
-        clock.runAll();
-
         expectRoomInSubList(movingRoom, destSubListTest);
     }
 
@@ -180,7 +186,7 @@ describe('RoomList', () => {
         // TODO: Re-enable dragging tests when we support dragging again.
         describe.skip('does correct optimistic update when dragging from', () => {
             it('rooms to people', () => {
-                expectCorrectMove(undefined, TAG_DM);
+                expectCorrectMove(undefined, DefaultTagID.DM);
             });
 
             it('rooms to favourites', () => {
@@ -195,15 +201,15 @@ describe('RoomList', () => {
             // Whe running the app live, it updates when some other event occurs (likely the
             // m.direct arriving) that these tests do not fire.
             xit('people to rooms', () => {
-                expectCorrectMove(TAG_DM, undefined);
+                expectCorrectMove(DefaultTagID.DM, undefined);
             });
 
             it('people to favourites', () => {
-                expectCorrectMove(TAG_DM, 'm.favourite');
+                expectCorrectMove(DefaultTagID.DM, 'm.favourite');
             });
 
             it('people to lowpriority', () => {
-                expectCorrectMove(TAG_DM, 'm.lowpriority');
+                expectCorrectMove(DefaultTagID.DM, 'm.lowpriority');
             });
 
             it('low priority to rooms', () => {
@@ -211,7 +217,7 @@ describe('RoomList', () => {
             });
 
             it('low priority to people', () => {
-                expectCorrectMove('m.lowpriority', TAG_DM);
+                expectCorrectMove('m.lowpriority', DefaultTagID.DM);
             });
 
             it('low priority to low priority', () => {
@@ -223,7 +229,7 @@ describe('RoomList', () => {
             });
 
             it('favourites to people', () => {
-                expectCorrectMove('m.favourite', TAG_DM);
+                expectCorrectMove('m.favourite', DefaultTagID.DM);
             });
 
             it('favourites to low priority', () => {
@@ -269,6 +275,12 @@ describe('RoomList', () => {
             };
             GroupStore._notifyListeners();
 
+            // We also have to mock the client's getGroup function for the room list to filter it.
+            // It's not smart enough to tell the difference between a real group and a template though.
+            client.getGroup = (groupId) => {
+                return {groupId};
+            };
+
             // Select tag
             dis.dispatch({action: 'select_tag', tag: '+group:domain'}, true);
         }
@@ -277,17 +289,14 @@ describe('RoomList', () => {
             setupSelectedTag();
         });
 
-        it('displays the correct rooms when the groups rooms are changed', () => {
+        it('displays the correct rooms when the groups rooms are changed', async () => {
             GroupStore.getGroupRooms = (groupId) => {
                 return [movingRoom, otherRoom];
             };
             GroupStore._notifyListeners();
 
-            // Run through RoomList debouncing
-            clock.runAll();
-
-            // By default, the test will
-            expectRoomInSubList(otherRoom, (s) => s.props.label.endsWith('Rooms'));
+            await waitForRoomListStoreUpdate();
+            expectRoomInSubList(otherRoom, (s) => s.props.tagId === DefaultTagID.Untagged);
         });
 
         itDoesCorrectOptimisticUpdatesForDraggedRoomTiles();
diff --git a/test/components/views/rooms/RoomSettings-test.js b/test/components/views/rooms/RoomSettings-test.js
index b3790b2507..3b4989ccab 100644
--- a/test/components/views/rooms/RoomSettings-test.js
+++ b/test/components/views/rooms/RoomSettings-test.js
@@ -177,7 +177,7 @@ describe.skip('RoomSettings', () => {
                         'm.room.history_visibility': 50,
                         'm.room.power_levels': 50,
                         'm.room.topic': 50,
-                        // TODO: Enable support for m.widget event type (https://github.com/vector-im/riot-web/issues/13111)
+                        // TODO: Enable support for m.widget event type (https://github.com/vector-im/element-web/issues/13111)
                         'im.vector.modular.widgets': 50,
                     },
                 },
diff --git a/test/editor/deserialize-test.js b/test/editor/deserialize-test.js
index 2bd5d7e4c6..112ac7d02b 100644
--- a/test/editor/deserialize-test.js
+++ b/test/editor/deserialize-test.js
@@ -204,7 +204,7 @@ describe('editor/deserialize', function() {
             expect(parts[3]).toStrictEqual({type: "newline", text: "\n"});
             expect(parts[4]).toStrictEqual({type: "plain", text: "```"});
         });
-        // failing likely because of https://github.com/vector-im/riot-web/issues/10316
+        // failing likely because of https://github.com/vector-im/element-web/issues/10316
         xit('code block with no trailing text and no newlines', function() {
             const html = "<pre><code>0xDEADBEEF</code></pre>";
             const parts = normalize(parseEvent(htmlMessage(html), createPartCreator()));
diff --git a/test/editor/model-test.js b/test/editor/model-test.js
index 2a3584d508..2df9fdd573 100644
--- a/test/editor/model-test.js
+++ b/test/editor/model-test.js
@@ -281,5 +281,38 @@ describe('editor/model', function() {
             expect(model.parts[0].type).toBe("plain");
             expect(model.parts[0].text).toBe("try #define");
         });
+
+        it('insert room pill without splitting at the colon', () => {
+            const renderer = createRenderer();
+            const pc = createPartCreator([{resourceId: "#room:server"}]);
+            const model = new EditorModel([], pc, renderer);
+
+            model.update("#roo", "insertText", {offset: 4, atNodeEnd: true});
+
+            expect(renderer.count).toBe(1);
+            expect(model.parts.length).toBe(1);
+            expect(model.parts[0].type).toBe("pill-candidate");
+            expect(model.parts[0].text).toBe("#roo");
+
+            model.update("#room:s", "insertText", {offset: 7, atNodeEnd: true});
+
+            expect(renderer.count).toBe(2);
+            expect(model.parts.length).toBe(1);
+            expect(model.parts[0].type).toBe("pill-candidate");
+            expect(model.parts[0].text).toBe("#room:s");
+        });
+
+        it('allow typing e-mail addresses without splitting at the @', () => {
+            const renderer = createRenderer();
+            const pc = createPartCreator([{resourceId: "@alice", label: "Alice"}]);
+            const model = new EditorModel([], pc, renderer);
+
+            model.update("foo@a", "insertText", {offset: 5, atNodeEnd: true});
+
+            expect(renderer.count).toBe(1);
+            expect(model.parts.length).toBe(1);
+            expect(model.parts[0].type).toBe("plain");
+            expect(model.parts[0].text).toBe("foo@a");
+        });
     });
 });
diff --git a/test/editor/serialize-test.js b/test/editor/serialize-test.js
index bd26ae91bb..f0d577ea21 100644
--- a/test/editor/serialize-test.js
+++ b/test/editor/serialize-test.js
@@ -61,4 +61,16 @@ describe('editor/serialize', function() {
         const html = htmlSerializeIfNeeded(model, {});
         expect(html).toBe("<a href=\"https://matrix.to/#/@user:server\">Displayname]</a>");
     });
+    it('escaped markdown should not retain backslashes', function() {
+        const pc = createPartCreator();
+        const model = new EditorModel([pc.plain('\\*hello\\* world')]);
+        const html = htmlSerializeIfNeeded(model, {});
+        expect(html).toBe('*hello* world');
+    });
+    it('escaped markdown should convert HTML entities', function() {
+        const pc = createPartCreator();
+        const model = new EditorModel([pc.plain('\\*hello\\* world < hey world!')]);
+        const html = htmlSerializeIfNeeded(model, {});
+        expect(html).toBe('*hello* world &lt; hey world!');
+    });
 });
diff --git a/test/end-to-end-tests/install.sh b/test/end-to-end-tests/install.sh
index 937ef1f5eb..bbe7a24c9b 100755
--- a/test/end-to-end-tests/install.sh
+++ b/test/end-to-end-tests/install.sh
@@ -2,6 +2,6 @@
 # run with PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true sh install.sh if chrome is already installed
 set -e
 ./synapse/install.sh
-# local testing doesn't need a Riot fetched from master,
+# local testing doesn't need a Element fetched from master,
 # so not installing that by default
 yarn install
diff --git a/test/end-to-end-tests/riot/config-template/config.json b/test/end-to-end-tests/riot/config-template/config.json
index 6277e567fc..b647d0bec8 100644
--- a/test/end-to-end-tests/riot/config-template/config.json
+++ b/test/end-to-end-tests/riot/config-template/config.json
@@ -5,14 +5,11 @@
     "disable_guests": false,
     "disable_login_language_selector": false,
     "disable_3pid_login": false,
-    "brand": "Riot",
+    "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",
-    "features": {
-        "feature_groups": "labs",
-        "feature_pinning": "labs"
-    },
+    "showLabsSettings": true,
     "default_federate": true,
     "welcomePageUrl": "home.html",
     "default_theme": "light",
diff --git a/test/end-to-end-tests/src/scenario.js b/test/end-to-end-tests/src/scenario.js
index f575fb392e..2191d630ac 100644
--- a/test/end-to-end-tests/src/scenario.js
+++ b/test/end-to-end-tests/src/scenario.js
@@ -17,6 +17,7 @@ limitations under the License.
 
 const {range} = require('./util');
 const signup = require('./usecases/signup');
+const toastScenarios = require('./scenarios/toast');
 const roomDirectoryScenarios = require('./scenarios/directory');
 const lazyLoadingScenarios = require('./scenarios/lazy-loading');
 const e2eEncryptionScenarios = require('./scenarios/e2e-encryption');
@@ -37,6 +38,7 @@ module.exports = async function scenario(createSession, restCreator) {
     const alice = await createUser("alice");
     const bob = await createUser("bob");
 
+    await toastScenarios(alice, bob);
     await roomDirectoryScenarios(alice, bob);
     await e2eEncryptionScenarios(alice, bob);
     console.log("create REST users:");
diff --git a/test/end-to-end-tests/src/scenarios/toast.js b/test/end-to-end-tests/src/scenarios/toast.js
new file mode 100644
index 0000000000..8b23dbcabc
--- /dev/null
+++ b/test/end-to-end-tests/src/scenarios/toast.js
@@ -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.
+*/
+
+const {assertNoToasts, acceptToast, rejectToast} = require("../usecases/toasts");
+
+module.exports = async function toastScenarios(alice, bob) {
+    console.log(" checking and clearing toasts:");
+
+    alice.log.startGroup(`clears toasts`);
+    alice.log.step(`reject desktop notifications toast`);
+    await rejectToast(alice, "Notifications");
+    alice.log.done();
+
+    alice.log.step(`accepts analytics toast`);
+    await acceptToast(alice, "Help us improve Element");
+    alice.log.done();
+
+    alice.log.step(`checks no remaining toasts`);
+    await assertNoToasts(alice);
+    alice.log.done();
+    alice.log.endGroup();
+
+    bob.log.startGroup(`clears toasts`);
+    bob.log.step(`reject desktop notifications toast`);
+    await rejectToast(bob, "Notifications");
+    bob.log.done();
+
+    bob.log.step(`reject analytics toast`);
+    await rejectToast(bob, "Help us improve Element");
+    bob.log.done();
+
+    bob.log.step(`checks no remaining toasts`);
+    await assertNoToasts(bob);
+    bob.log.done();
+    bob.log.endGroup();
+};
diff --git a/test/end-to-end-tests/src/session.js b/test/end-to-end-tests/src/session.js
index 55c2ed440c..907ee2fb8e 100644
--- a/test/end-to-end-tests/src/session.js
+++ b/test/end-to-end-tests/src/session.js
@@ -122,8 +122,8 @@ module.exports = class RiotSession {
         await input.type(text);
     }
 
-    query(selector, timeout = DEFAULT_TIMEOUT) {
-        return this.page.waitForSelector(selector, {visible: true, timeout});
+    query(selector, timeout = DEFAULT_TIMEOUT, hidden = false) {
+        return this.page.waitForSelector(selector, {visible: true, timeout, hidden});
     }
 
     async queryAll(selector) {
diff --git a/test/end-to-end-tests/src/usecases/accept-invite.js b/test/end-to-end-tests/src/usecases/accept-invite.js
index 3f208cc1fc..d7c024ac4b 100644
--- a/test/end-to-end-tests/src/usecases/accept-invite.js
+++ b/test/end-to-end-tests/src/usecases/accept-invite.js
@@ -15,10 +15,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+const {findSublist} = require("./create-room");
+
 module.exports = async function acceptInvite(session, name) {
     session.log.step(`accepts "${name}" invite`);
-    //TODO: brittle selector
-    const invitesHandles = await session.queryAll('.mx_RoomTile_name.mx_RoomTile_invite');
+    const inviteSublist = await findSublist(session, "invites");
+    const invitesHandles = await inviteSublist.$$(".mx_RoomTile_name");
     const invitesWithText = await Promise.all(invitesHandles.map(async (inviteHandle) => {
         const text = await session.innerText(inviteHandle);
         return {inviteHandle, text};
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 7e219fd159..e05edbc051 100644
--- a/test/end-to-end-tests/src/usecases/create-room.js
+++ b/test/end-to-end-tests/src/usecases/create-room.js
@@ -16,23 +16,32 @@ limitations under the License.
 */
 
 async function openRoomDirectory(session) {
-    const roomDirectoryButton = await session.query('.mx_LeftPanel_explore .mx_AccessibleButton');
+    const roomDirectoryButton = await session.query('.mx_LeftPanel_exploreButton');
     await roomDirectoryButton.click();
 }
 
+async function findSublist(session, name) {
+    const sublists = await session.queryAll('.mx_RoomSublist');
+    for (const sublist of sublists) {
+        const header = await sublist.$('.mx_RoomSublist_headerText');
+        const headerText = await session.innerText(header);
+        if (headerText.toLowerCase().includes(name.toLowerCase())) {
+            return sublist;
+        }
+    }
+    throw new Error(`could not find room list section that contains '${name}' in header`);
+}
+
 async function createRoom(session, roomName, encrypted=false) {
     session.log.step(`creates room "${roomName}"`);
 
-    const roomListHeaders = await session.queryAll('.mx_RoomSubList_labelContainer');
-    const roomListHeaderLabels = await Promise.all(roomListHeaders.map(h => session.innerText(h)));
-    const roomsIndex = roomListHeaderLabels.findIndex(l => l.toLowerCase().includes("rooms"));
-    if (roomsIndex === -1) {
-        throw new Error("could not find room list section that contains 'rooms' in header");
-    }
-    const roomsHeader = roomListHeaders[roomsIndex];
-    const addRoomButton = await roomsHeader.$(".mx_RoomSubList_addRoom");
+    const roomsSublist = await findSublist(session, "rooms");
+    const addRoomButton = await roomsSublist.$(".mx_RoomSublist_auxButton");
     await addRoomButton.click();
 
+    const createRoomButton = await session.query('.mx_AccessibleButton[aria-label="Create new room"]');
+    await createRoomButton.click();
+
     const roomNameInput = await session.query('.mx_CreateRoomDialog_name input');
     await session.replaceInputText(roomNameInput, roomName);
 
@@ -51,14 +60,8 @@ async function createRoom(session, roomName, encrypted=false) {
 async function createDm(session, invitees) {
     session.log.step(`creates DM with ${JSON.stringify(invitees)}`);
 
-    const roomListHeaders = await session.queryAll('.mx_RoomSubList_labelContainer');
-    const roomListHeaderLabels = await Promise.all(roomListHeaders.map(h => session.innerText(h)));
-    const dmsIndex = roomListHeaderLabels.findIndex(l => l.toLowerCase().includes('direct messages'));
-    if (dmsIndex === -1) {
-        throw new Error("could not find room list section that contains 'direct messages' in header");
-    }
-    const dmsHeader = roomListHeaders[dmsIndex];
-    const startChatButton = await dmsHeader.$(".mx_RoomSubList_addRoom");
+    const dmsSublist = await findSublist(session, "people");
+    const startChatButton = await dmsSublist.$(".mx_RoomSublist_auxButton");
     await startChatButton.click();
 
     const inviteesEditor = await session.query('.mx_InviteDialog_editor textarea');
@@ -83,4 +86,4 @@ async function createDm(session, invitees) {
     session.log.done();
 }
 
-module.exports = {openRoomDirectory, createRoom, createDm};
+module.exports = {openRoomDirectory, findSublist, createRoom, createDm};
diff --git a/test/end-to-end-tests/src/usecases/dialog.js b/test/end-to-end-tests/src/usecases/dialog.js
index d4ae97dff9..15ac50bb18 100644
--- a/test/end-to-end-tests/src/usecases/dialog.js
+++ b/test/end-to-end-tests/src/usecases/dialog.js
@@ -20,7 +20,7 @@ const assert = require('assert');
 async function assertDialog(session, expectedTitle) {
     const titleElement = await session.query(".mx_Dialog .mx_Dialog_title");
     const dialogHeader = await session.innerText(titleElement);
-    assert(dialogHeader, expectedTitle);
+    assert.equal(dialogHeader, expectedTitle);
 }
 
 async function acceptDialog(session, expectedTitle) {
diff --git a/test/end-to-end-tests/src/usecases/room-settings.js b/test/end-to-end-tests/src/usecases/room-settings.js
index b705463965..11e2f52c6e 100644
--- a/test/end-to-end-tests/src/usecases/room-settings.js
+++ b/test/end-to-end-tests/src/usecases/room-settings.js
@@ -45,7 +45,7 @@ async function findTabs(session) {
     /// XXX delay is needed here, possibly because the header is being rerendered
     /// click doesn't do anything otherwise
     await session.delay(1000);
-    const settingsButton = await session.query(".mx_RoomHeader .mx_AccessibleButton[title=Settings]");
+    const settingsButton = await session.query(".mx_RoomHeader .mx_AccessibleButton[aria-label=Settings]");
     await settingsButton.click();
 
     //find tabs
@@ -162,7 +162,7 @@ async function changeRoomSettings(session, settings) {
 
     if (settings.visibility) {
         session.log.step(`sets visibility to ${settings.visibility}`);
-        const radios = await session.queryAll(".mx_RoomSettingsDialog input[type=radio]");
+        const radios = await session.queryAll(".mx_RoomSettingsDialog label");
         assert.equal(radios.length, 7);
         const inviteOnly = radios[0];
         const publicNoGuests = radios[1];
diff --git a/test/end-to-end-tests/src/usecases/signup.js b/test/end-to-end-tests/src/usecases/signup.js
index aa9f6b7efa..fd41ef1a71 100644
--- a/test/end-to-end-tests/src/usecases/signup.js
+++ b/test/end-to-end-tests/src/usecases/signup.js
@@ -79,20 +79,8 @@ module.exports = async function signup(session, username, password, homeserver)
     const acceptButton = await session.query('.mx_InteractiveAuthEntryComponents_termsSubmit');
     await acceptButton.click();
 
-    //plow through cross-signing setup by entering arbitrary details
-    //TODO: It's probably important for the tests to know the passphrase
-    const xsigningPassphrase = 'a7eaXcjpa9!Yl7#V^h$B^%dovHUVX'; // https://xkcd.com/221/
-    let passphraseField = await session.query('.mx_CreateSecretStorageDialog_passPhraseField input');
-    await session.replaceInputText(passphraseField, xsigningPassphrase);
-    await session.delay(1000); // give it a second to analyze our passphrase for security
-    let xsignContButton = await session.query('.mx_CreateSecretStorageDialog .mx_Dialog_buttons .mx_Dialog_primary');
-    await xsignContButton.click();
-
-    //repeat passphrase entry
-    passphraseField = await session.query('.mx_CreateSecretStorageDialog_passPhraseField input');
-    await session.replaceInputText(passphraseField, xsigningPassphrase);
-    await session.delay(1000); // give it a second to analyze our passphrase for security
-    xsignContButton = await session.query('.mx_CreateSecretStorageDialog .mx_Dialog_buttons .mx_Dialog_primary');
+    // Continue with the default (generate a security key)
+    const xsignContButton = await session.query('.mx_CreateSecretStorageDialog .mx_Dialog_buttons .mx_Dialog_primary');
     await xsignContButton.click();
 
     //ignore the recovery key
@@ -101,13 +89,11 @@ module.exports = async function signup(session, username, password, homeserver)
     await copyButton.click();
 
     //acknowledge that we copied the recovery key to a safe place
-    const copyContinueButton = await session.query('.mx_CreateSecretStorageDialog .mx_Dialog_primary');
+    const copyContinueButton = await session.query(
+        '.mx_CreateSecretStorageDialog .mx_Dialog_buttons .mx_Dialog_primary',
+    );
     await copyContinueButton.click();
 
-    //acknowledge that we're done cross-signing setup and our keys are safe
-    const doneOkButton = await session.query('.mx_CreateSecretStorageDialog .mx_Dialog_primary');
-    await doneOkButton.click();
-
     //wait for registration to finish so the hash gets set
     //onhashchange better?
 
diff --git a/test/end-to-end-tests/src/usecases/toasts.js b/test/end-to-end-tests/src/usecases/toasts.js
new file mode 100644
index 0000000000..db78352f2b
--- /dev/null
+++ b/test/end-to-end-tests/src/usecases/toasts.js
@@ -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.
+*/
+
+const assert = require('assert');
+
+async function assertNoToasts(session) {
+    try {
+        await session.query('.mx_Toast_toast', 1000, true);
+    } catch (e) {
+        const h2Element = await session.query('.mx_Toast_title h2', 1000);
+        const toastTitle = await session.innerText(h2Element);
+        throw new Error(`"${toastTitle}" toast found when none expected`);
+    }
+}
+
+async function assertToast(session, expectedTitle) {
+    const h2Element = await session.query('.mx_Toast_title h2');
+    const toastTitle = await session.innerText(h2Element);
+    assert.equal(toastTitle, expectedTitle);
+}
+
+async function acceptToast(session, expectedTitle) {
+    await assertToast(session, expectedTitle);
+    const btn = await session.query('.mx_Toast_buttons .mx_AccessibleButton_kind_primary');
+    await btn.click();
+}
+
+async function rejectToast(session, expectedTitle) {
+    await assertToast(session, expectedTitle);
+    const btn = await session.query('.mx_Toast_buttons .mx_AccessibleButton_kind_danger');
+    await btn.click();
+}
+
+module.exports = {assertNoToasts, assertToast, acceptToast, rejectToast};
diff --git a/test/end-to-end-tests/yarn.lock b/test/end-to-end-tests/yarn.lock
index c26dde0f97..2f4d9979fb 100644
--- a/test/end-to-end-tests/yarn.lock
+++ b/test/end-to-end-tests/yarn.lock
@@ -425,9 +425,9 @@ jsprim@^1.2.2:
     verror "1.10.0"
 
 lodash@^4.15.0, lodash@^4.17.11:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+  version "4.17.19"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
+  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
 
 mime-db@~1.38.0:
   version "1.38.0"
diff --git a/test/skinned-sdk.js b/test/skinned-sdk.js
index bc13d78815..876a188cc0 100644
--- a/test/skinned-sdk.js
+++ b/test/skinned-sdk.js
@@ -16,7 +16,6 @@ const components = {};
 components['structures.LeftPanel'] = stubComponent();
 components['structures.RightPanel'] = stubComponent();
 components['structures.RoomDirectory'] = stubComponent();
-components['views.globals.MatrixToolbar'] = stubComponent();
 components['views.globals.GuestWarningBar'] = stubComponent();
 components['views.globals.NewVersionBar'] = stubComponent();
 components['views.elements.Spinner'] = stubComponent({displayName: 'Spinner'});
diff --git a/test/test-utils.js b/test/test-utils.js
index d7aa9d5de9..2d7c1bd62c 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -2,7 +2,7 @@
 
 import React from 'react';
 import {MatrixClientPeg as peg} from '../src/MatrixClientPeg';
-import dis from '../src/dispatcher';
+import dis from '../src/dispatcher/dispatcher';
 import {makeType} from "../src/utils/TypeUtils";
 import {ValidatedServerConfig} from "../src/utils/AutoDiscoveryUtils";
 import ShallowRenderer from 'react-test-renderer/shallow';
diff --git a/tsconfig.json b/tsconfig.json
index b87f640734..b139e8e8d1 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,7 +14,14 @@
     "jsx": "react",
     "types": [
       "node",
-      "react"
+      "react",
+      "flux",
+      "react-transition-group"
+    ],
+    "lib": [
+      "es2019",
+      "dom",
+      "dom.iterable"
     ]
   },
   "include": [
diff --git a/tslint.json b/tslint.json
deleted file mode 100644
index fc234117fc..0000000000
--- a/tslint.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "rules": {
-    "class-name": false,
-    "comment-format": [
-      true
-    ],
-    "curly": false,
-    "eofline": false,
-    "forin": false,
-    "indent": [
-      true,
-      "spaces"
-    ],
-    "label-position": true,
-    "max-line-length": false,
-    "member-access": false,
-    "member-ordering": [
-      true,
-      "static-after-instance",
-      "variables-before-functions"
-    ],
-    "no-arg": true,
-    "no-bitwise": false,
-    "no-console": false,
-    "no-construct": true,
-    "no-debugger": true,
-    "no-duplicate-variable": true,
-    "no-empty": false,
-    "no-eval": true,
-    "no-inferrable-types": true,
-    "no-shadowed-variable": true,
-    "no-string-literal": false,
-    "no-switch-case-fall-through": true,
-    "no-trailing-whitespace": true,
-    "no-unused-expression": true,
-    "no-use-before-declare": false,
-    "no-var-keyword": true,
-    "object-literal-sort-keys": false,
-    "one-line": [
-      true,
-      "check-open-brace",
-      "check-catch",
-      "check-else",
-      "check-whitespace"
-    ],
-    "quotemark": false,
-    "radix": true,
-    "semicolon": [
-      "always"
-    ],
-    "triple-equals": [],
-    "typedef-whitespace": [
-      true,
-      {
-        "call-signature": "nospace",
-        "index-signature": "nospace",
-        "parameter": "nospace",
-        "property-declaration": "nospace",
-        "variable-declaration": "nospace"
-      }
-    ],
-    "variable-name": false,
-    "whitespace": [
-      true,
-      "check-branch",
-      "check-decl",
-      "check-operator",
-      "check-separator",
-      "check-type"
-    ]
-  }
-}
diff --git a/yarn.lock b/yarn.lock
index a47752b1f3..9ee9374945 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,51 +2,65 @@
 # yarn lockfile v1
 
 
-"@babel/cli@^7.7.5":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.8.4.tgz#505fb053721a98777b2b175323ea4f090b7d3c1c"
-  integrity sha512-XXLgAm6LBbaNxaGhMAznXXaxtCWfuv6PIDJ9Alsy9JYTOh+j2jJz+L/162kkfU1j/pTSxK1xGmlwI4pdIMkoag==
+"@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==
   dependencies:
     commander "^4.0.1"
     convert-source-map "^1.1.0"
     fs-readdir-recursive "^1.1.0"
     glob "^7.0.0"
-    lodash "^4.17.13"
+    lodash "^4.17.19"
     make-dir "^2.1.0"
     slash "^2.0.0"
     source-map "^0.5.0"
   optionalDependencies:
     chokidar "^2.1.8"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.5.5", "@babel/code-frame@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
-  integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
+"@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.8.3"
+    "@babel/highlight" "^7.10.3"
 
-"@babel/compat-data@^7.8.6", "@babel/compat-data@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.0.tgz#04815556fc90b0c174abd2c0c1bb966faa036a6c"
-  integrity sha512-zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g==
+"@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:
-    browserslist "^4.9.1"
+    "@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==
+  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/core@>=7.2.2", "@babel/core@^7.1.0", "@babel/core@^7.7.5":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz#ac977b538b77e132ff706f3b8a4dbad09c03c56e"
-  integrity sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==
+"@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.8.3"
-    "@babel/generator" "^7.9.0"
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helpers" "^7.9.0"
-    "@babel/parser" "^7.9.0"
-    "@babel/template" "^7.8.6"
-    "@babel/traverse" "^7.9.0"
-    "@babel/types" "^7.9.0"
+    "@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"
@@ -56,338 +70,537 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.4.0", "@babel/generator@^7.8.3", "@babel/generator@^7.9.0", "@babel/generator@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.5.tgz#27f0917741acc41e6eaaced6d68f96c3fa9afaf9"
-  integrity sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==
+"@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==
   dependencies:
-    "@babel/types" "^7.9.5"
+    "@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"
+    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/helper-annotate-as-pure@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz#60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee"
-  integrity sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==
+"@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.8.3"
+    "@babel/types" "^7.10.5"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz#c84097a427a061ac56a1c30ebf54b7b22d241503"
-  integrity sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==
+"@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==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.11.0"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
 
-"@babel/helper-builder-react-jsx-experimental@^7.9.0":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.9.5.tgz#0b4b3e04e6123f03b404ca4dfd6528fe6bb92fe3"
-  integrity sha512-HAagjAC93tk748jcXpZ7oYRZH485RCq/+yEv9SIWezHRPv9moZArTnkUNciUNzvwHUABmiWKlcxJvMcu59UwTg==
+"@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/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/types" "^7.9.5"
+    "@babel/types" "^7.10.1"
 
-"@babel/helper-builder-react-jsx@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.9.0.tgz#16bf391990b57732700a3278d4d9a81231ea8d32"
-  integrity sha512-weiIo4gaoGgnhff54GQ3P5wsUQmnSwpkvU0r6ZHq6TzoSzKy4JxHEgnxNytaKbov2a9z/CVNyzliuCOUPEX3Jw==
+"@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/helper-annotate-as-pure" "^7.8.3"
-    "@babel/types" "^7.9.0"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-compilation-targets@^7.8.7":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz#dac1eea159c0e4bd46e309b5a1b04a66b53c1dde"
-  integrity sha512-4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz#bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3"
+  integrity sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==
   dependencies:
-    "@babel/compat-data" "^7.8.6"
-    browserslist "^4.9.1"
+    "@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==
+  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"
     semver "^5.5.0"
 
-"@babel/helper-create-class-features-plugin@^7.8.3":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.5.tgz#79753d44017806b481017f24b02fd4113c7106ea"
-  integrity sha512-IipaxGaQmW4TfWoXdqjY0TzoXQ1HRS0kPpEgvjosb3u7Uedcq297xFqDQiCcQtRRwzIMif+N1MLVI8C5a4/PAA==
+"@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==
   dependencies:
-    "@babel/helper-function-name" "^7.9.5"
-    "@babel/helper-member-expression-to-functions" "^7.8.3"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.6"
-    "@babel/helper-split-export-declaration" "^7.8.3"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-member-expression-to-functions" "^7.10.5"
+    "@babel/helper-optimise-call-expression" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.10.4"
 
-"@babel/helper-create-regexp-features-plugin@^7.8.3", "@babel/helper-create-regexp-features-plugin@^7.8.8":
-  version "7.8.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz#5d84180b588f560b7864efaeea89243e58312087"
-  integrity sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==
+"@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.8.3"
-    "@babel/helper-regex" "^7.8.3"
+    "@babel/helper-annotate-as-pure" "^7.10.1"
+    "@babel/helper-regex" "^7.10.1"
     regexpu-core "^4.7.0"
 
-"@babel/helper-define-map@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz#a0655cad5451c3760b726eba875f1cd8faa02c15"
-  integrity sha512-PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g==
+"@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==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-regex" "^7.10.4"
+    regexpu-core "^4.7.0"
+
+"@babel/helper-define-map@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz#b53c10db78a640800152692b13393147acb9bb30"
+  integrity sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==
+  dependencies:
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/types" "^7.10.5"
+    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==
+  dependencies:
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
+
+"@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==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.10.1"
+    "@babel/template" "^7.10.1"
+    "@babel/types" "^7.10.1"
+
+"@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==
+  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/helper-hoist-variables@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz#d49b001d1d5a68ca5e6604dda01a6297f7c9381e"
+  integrity sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==
+  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==
+  dependencies:
+    "@babel/types" "^7.10.1"
+
+"@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==
+  dependencies:
+    "@babel/types" "^7.10.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==
+  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-explode-assignable-expression@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz#a728dc5b4e89e30fc2dfc7d04fa28a930653f982"
-  integrity sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==
+"@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/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@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-function-name@^7.8.3", "@babel/helper-function-name@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c"
-  integrity sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==
+"@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==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.9.5"
+    "@babel/types" "^7.10.1"
 
-"@babel/helper-get-function-arity@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5"
-  integrity sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==
+"@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.8.3"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-hoist-variables@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz#1dbe9b6b55d78c9b4183fc8cdc6e30ceb83b7134"
-  integrity sha512-ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg==
-  dependencies:
-    "@babel/types" "^7.8.3"
+"@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-member-expression-to-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz#659b710498ea6c1d9907e0c73f206eee7dadc24c"
-  integrity sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==
-  dependencies:
-    "@babel/types" "^7.8.3"
+"@babel/helper-plugin-utils@^7.10.4":
+  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-module-imports@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498"
-  integrity sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==
-  dependencies:
-    "@babel/types" "^7.8.3"
-
-"@babel/helper-module-transforms@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5"
-  integrity sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==
-  dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.6"
-    "@babel/helper-simple-access" "^7.8.3"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/template" "^7.8.6"
-    "@babel/types" "^7.9.0"
-    lodash "^4.17.13"
-
-"@babel/helper-optimise-call-expression@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz#7ed071813d09c75298ef4f208956006b6111ecb9"
-  integrity sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==
-  dependencies:
-    "@babel/types" "^7.8.3"
-
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
-  integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==
-
-"@babel/helper-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz#139772607d51b93f23effe72105b319d2a4c6965"
-  integrity sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==
+"@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-remap-async-to-generator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz#273c600d8b9bf5006142c1e35887d555c12edd86"
-  integrity sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==
+"@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:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-wrap-function" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    lodash "^4.17.19"
 
-"@babel/helper-replace-supers@^7.8.3", "@babel/helper-replace-supers@^7.8.6":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz#5ada744fd5ad73203bf1d67459a27dcba67effc8"
-  integrity sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==
+"@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==
   dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.8.3"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/traverse" "^7.8.6"
-    "@babel/types" "^7.8.6"
+    "@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/helper-simple-access@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz#7f8109928b4dab4654076986af575231deb639ae"
-  integrity sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==
+"@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==
   dependencies:
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@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-split-export-declaration@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9"
-  integrity sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==
+"@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==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@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/helper-validator-identifier@^7.9.0", "@babel/helper-validator-identifier@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
-  integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==
-
-"@babel/helper-wrap-function@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz#9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"
-  integrity sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==
+"@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==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/template" "^7.10.1"
+    "@babel/types" "^7.10.1"
 
-"@babel/helpers@^7.9.0":
-  version "7.9.2"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.2.tgz#b42a81a811f1e7313b88cba8adc66b3d9ae6c09f"
-  integrity sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==
+"@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==
   dependencies:
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.9.0"
-    "@babel/types" "^7.9.0"
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
-"@babel/highlight@^7.8.3":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079"
-  integrity sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==
+"@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/helper-validator-identifier" "^7.9.0"
+    "@babel/types" "^7.10.1"
+
+"@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-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==
+  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==
+  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/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0":
-  version "7.9.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz#68a35e6b0319bbc014465be43828300113f2f2e8"
-  integrity sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==
-
-"@babel/plugin-proposal-async-generator-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz#bad329c670b382589721b27540c7d288601c6e6f"
-  integrity sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw==
+"@babel/highlight@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
+  integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-remap-async-to-generator" "^7.8.3"
+    "@babel/helper-validator-identifier" "^7.10.4"
+    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.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/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==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-remap-async-to-generator" "^7.10.4"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
 
-"@babel/plugin-proposal-class-properties@^7.7.4":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz#5e06654af5cd04b608915aada9b2a6788004464e"
-  integrity sha512-EqFhbo7IosdgPgZggHaNObkmO1kNUe3slaKu54d5OWvy+p9QIKOzK1GAEpAIsZtWVtPXUHSMcT4smvDrCfY4AA==
+"@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==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-create-class-features-plugin" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-proposal-decorators@^7.7.4":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.8.3.tgz#2156860ab65c5abf068c3f67042184041066543e"
-  integrity sha512-e3RvdvS4qPJVTe288DlXjwKflpfy1hr0j5dz5WpIYYeP7vQZg2WfAEIp8k5/Lwis/m5REXEteIz6rrcDtXXG7w==
+"@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==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-decorators" "^7.8.3"
+    "@babel/helper-create-class-features-plugin" "^7.10.5"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-decorators" "^7.10.4"
 
-"@babel/plugin-proposal-dynamic-import@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz#38c4fe555744826e97e2ae930b0fb4cc07e66054"
-  integrity sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
 
-"@babel/plugin-proposal-export-default-from@^7.7.4":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.8.3.tgz#4cb7c2fdeaed490b60d9bfd3dc8a20f81f9c2e7c"
-  integrity sha512-PYtv2S2OdCdp7GSPDg5ndGZFm9DmWFvuLoS5nBxZCgOBggluLnhTScspJxng96alHQzPyrrHxvC9/w4bFuspeA==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-export-default-from" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-export-default-from" "^7.10.4"
 
-"@babel/plugin-proposal-json-strings@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz#da5216b238a98b58a1e05d6852104b10f9a70d6b"
-  integrity sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz#e4572253fdeed65cddeecfdab3f928afeb2fd5d2"
-  integrity sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
 
-"@babel/plugin-proposal-numeric-separator@^7.7.4", "@babel/plugin-proposal-numeric-separator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz#5d6769409699ec9b3b68684cd8116cedff93bad8"
-  integrity sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.7.4", "@babel/plugin-proposal-object-rest-spread@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.5.tgz#3fd65911306d8746014ec0d0cf78f0e39a149116"
-  integrity sha512-VP2oXvAf7KCYTthbUHwBlewbl1Iq059f6seJGsxMizaCdgHIeczOr7FBqELhSqfkIl04Fi8okzWzl63UKbQmmg==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-transform-parameters" "^7.9.5"
+    "@babel/plugin-transform-parameters" "^7.10.4"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz#9dee96ab1650eed88646ae9734ca167ac4a9c5c9"
-  integrity sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
-"@babel/plugin-proposal-optional-chaining@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz#31db16b154c39d6b8a645292472b98394c292a58"
-  integrity sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3":
-  version "7.8.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz#ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"
-  integrity sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==
+"@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==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.8"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-create-class-features-plugin" "^7.10.4"
+    "@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==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+    "@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":
   version "7.8.4"
@@ -396,12 +609,19 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-decorators@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.8.3.tgz#8d2c15a9f1af624b0025f961682a9d53d3001bda"
-  integrity sha512-8Hg4dNNT9/LcA1zQlfwuKR8BUc/if7Q7NkTam9sGTcJphLwpf2g4S42uhspQrIrR+dpzE0dtTqBVFoHl8GtnnQ==
+"@babel/plugin-syntax-class-properties@^7.10.4":
+  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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@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==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-dynamic-import@^7.8.0":
   version "7.8.3"
@@ -410,19 +630,19 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-export-default-from@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.8.3.tgz#f1e55ce850091442af4ba9c2550106035b29d678"
-  integrity sha512-a1qnnsr73KLNIQcQlcQ4ZHxqqfBKM6iNQZW2OMTyxNbA2WC7SHWHtGVpFzWtQAuS2pspkWVzdEBXXx8Ik0Za4w==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-flow@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.8.3.tgz#f2c883bd61a6316f2c89380ae5122f923ba4527f"
-  integrity sha512-innAx3bUbA0KSYj2E2MNFSn9hiCeowOFLxlsuhXzw8hMQnzkDomUr9QCD7E9VF60NmnG1sNTuuv6Qf4f8INYsg==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-json-strings@^7.8.0":
   version "7.8.3"
@@ -431,12 +651,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.8.3.tgz#521b06c83c40480f1e58b4fd33b92eceb1d6ea94"
-  integrity sha512-WxdW9xyLgBdefoo0Ynn3MRSkhe5tFVxxKNVdnZSh318WrG2e2jH+E9wd/++JsqcLJZPfz87njQJ8j2Upjm0M0A==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0":
   version "7.8.3"
@@ -445,12 +665,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-numeric-separator@^7.8.0", "@babel/plugin-syntax-numeric-separator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f"
-  integrity sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==
+"@babel/plugin-syntax-numeric-separator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
+  integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@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":
   version "7.8.3"
@@ -473,415 +693,441 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-top-level-await@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz#3acdece695e6b13aaf57fc291d1a800950c71391"
-  integrity sha512-kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-typescript@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.8.3.tgz#c1f659dda97711a569cef75275f7e15dcaa6cabc"
-  integrity sha512-GO1MQ/SGGGoiEXY0e0bSpHimJvxqB7lktLLIq2pv8xG7WZ8IMEle74jIe1FhprHBWjwjZtXHkycDLZXIWM5Wfg==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-arrow-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz#82776c2ed0cd9e1a49956daeb896024c9473b8b6"
-  integrity sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-async-to-generator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz#4308fad0d9409d71eafb9b1a6ee35f9d64b64086"
-  integrity sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==
+"@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==
   dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-remap-async-to-generator" "^7.8.3"
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-remap-async-to-generator" "^7.10.4"
 
-"@babel/plugin-transform-block-scoped-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz#437eec5b799b5852072084b3ae5ef66e8349e8a3"
-  integrity sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-block-scoping@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz#97d35dab66857a437c166358b91d09050c868f3a"
-  integrity sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    lodash "^4.17.13"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-classes@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz#800597ddb8aefc2c293ed27459c1fcc935a26c2c"
-  integrity sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg==
+"@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==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-define-map" "^7.8.3"
-    "@babel/helper-function-name" "^7.9.5"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.6"
-    "@babel/helper-split-export-declaration" "^7.8.3"
+    "@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-split-export-declaration" "^7.10.4"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz#96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b"
-  integrity sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-destructuring@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz#72c97cf5f38604aea3abf3b935b0e17b1db76a50"
-  integrity sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz#c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"
-  integrity sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==
+"@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==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-duplicate-keys@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz#8d12df309aa537f272899c565ea1768e286e21f1"
-  integrity sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ==
+"@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-plugin-utils" "^7.8.3"
+    "@babel/helper-create-regexp-features-plugin" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.1"
 
-"@babel/plugin-transform-exponentiation-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz#581a6d7f56970e06bf51560cd64f5e947b70d7b7"
-  integrity sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==
+"@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==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-flow-comments@^7.7.4":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-comments/-/plugin-transform-flow-comments-7.8.3.tgz#0a7e6c49224ac24271e4da25774da0600605ef2c"
-  integrity sha512-SEmbGPsaUig0x3QkB/Nai3Snk1sRxODBN2EGjdQqgBb5TMcbEejV2TtMGi2XiLmw9Cy/BvJX7CAnfJMctuyglg==
+"@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==
   dependencies:
-    "@babel/generator" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-flow" "^7.8.3"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-flow-strip-types@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.9.0.tgz#8a3538aa40434e000b8f44a3c5c9ac7229bd2392"
-  integrity sha512-7Qfg0lKQhEHs93FChxVLAvhBshOPQDtJUTVHr/ZwQNRccCm4O9D79r9tVSoV8iNwjP1YgfD+e/fgHcPkN1qEQg==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-flow" "^7.8.3"
+    "@babel/generator" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-flow" "^7.10.4"
 
-"@babel/plugin-transform-for-of@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz#0f260e27d3e29cd1bb3128da5e76c761aa6c108e"
-  integrity sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-flow" "^7.10.4"
 
-"@babel/plugin-transform-function-name@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz#279373cb27322aaad67c2683e776dfc47196ed8b"
-  integrity sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==
+"@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==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz#aef239823d91994ec7b68e55193525d76dbd5dc1"
-  integrity sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-member-expression-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz#963fed4b620ac7cbf6029c755424029fa3a40410"
-  integrity sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-modules-amd@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz#19755ee721912cf5bb04c07d50280af3484efef4"
-  integrity sha512-vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q==
+"@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==
   dependencies:
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    babel-plugin-dynamic-import-node "^2.3.0"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-modules-commonjs@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz#e3e72f4cbc9b4a260e30be0ea59bdf5a39748940"
-  integrity sha512-qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g==
+"@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==
   dependencies:
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-simple-access" "^7.8.3"
-    babel-plugin-dynamic-import-node "^2.3.0"
+    "@babel/helper-module-transforms" "^7.10.5"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-systemjs@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz#e9fd46a296fc91e009b64e07ddaa86d6f0edeb90"
-  integrity sha512-FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ==
+"@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==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.8.3"
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    babel-plugin-dynamic-import-node "^2.3.0"
+    "@babel/helper-module-transforms" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-simple-access" "^7.10.4"
+    babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-umd@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz#e909acae276fec280f9b821a5f38e1f08b480697"
-  integrity sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ==
+"@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==
   dependencies:
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-hoist-variables" "^7.10.4"
+    "@babel/helper-module-transforms" "^7.10.5"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz#a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c"
-  integrity sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==
+"@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==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-new-target@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz#60cc2ae66d85c95ab540eb34babb6434d4c70c43"
-  integrity sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
 
-"@babel/plugin-transform-object-super@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz#ebb6a1e7a86ffa96858bd6ac0102d65944261725"
-  integrity sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-parameters@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz#173b265746f5e15b2afe527eeda65b73623a0795"
-  integrity sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==
+"@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==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.10.4"
 
-"@babel/plugin-transform-property-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz#33194300d8539c1ed28c62ad5087ba3807b98263"
-  integrity sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==
+"@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-plugin-utils" "^7.8.3"
+    "@babel/helper-get-function-arity" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-react-display-name@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.8.3.tgz#70ded987c91609f78353dd76d2fb2a0bb991e8e5"
-  integrity sha512-3Jy/PCw8Fe6uBKtEgz3M82ljt+lTg+xJaM4og+eyu83qLT87ZUSckn0wy7r31jflURWLO83TW6Ylf7lyXj3m5A==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-react-jsx-development@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.9.0.tgz#3c2a130727caf00c2a293f0aed24520825dbf754"
-  integrity sha512-tK8hWKrQncVvrhvtOiPpKrQjfNX3DtkNLSX4ObuGcpS9p0QrGetKmlySIGR07y48Zft8WVgPakqd/bk46JrMSw==
+"@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==
   dependencies:
-    "@babel/helper-builder-react-jsx-experimental" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-jsx" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-react-jsx-self@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.9.0.tgz#f4f26a325820205239bb915bad8e06fcadabb49b"
-  integrity sha512-K2ObbWPKT7KUTAoyjCsFilOkEgMvFG+y0FqOl6Lezd0/13kMkkjHskVsZvblRPj1PHA44PrToaZANrryppzTvQ==
+"@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-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-jsx" "^7.8.3"
+    "@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-source@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.9.0.tgz#89ef93025240dd5d17d3122294a093e5e0183de0"
-  integrity sha512-K6m3LlSnTSfRkM6FcRk8saNEeaeyG5k7AVkBU2bZK3+1zdkSED3qNdsWrUgQBeTVD2Tp3VMmerxVO2yM5iITmw==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-jsx" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-jsx" "^7.10.4"
 
-"@babel/plugin-transform-react-jsx@^7.9.4":
-  version "7.9.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.9.4.tgz#86f576c8540bd06d0e95e0b61ea76d55f6cbd03f"
-  integrity sha512-Mjqf3pZBNLt854CK0C/kRuXAnE6H/bo7xYojP+WGtX8glDGSibcwnsWwhwoSuRg0+EBnxPC1ouVnuetUIlPSAw==
+"@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==
   dependencies:
-    "@babel/helper-builder-react-jsx" "^7.9.0"
-    "@babel/helper-builder-react-jsx-experimental" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-jsx" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-jsx" "^7.10.4"
 
-"@babel/plugin-transform-regenerator@^7.8.7":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz#5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"
-  integrity sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==
+"@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==
+  dependencies:
+    "@babel/helper-builder-react-jsx" "^7.10.4"
+    "@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-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==
+  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==
   dependencies:
     regenerator-transform "^0.14.2"
 
-"@babel/plugin-transform-reserved-words@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz#9a0635ac4e665d29b162837dd3cc50745dfdf1f5"
-  integrity sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-runtime@^7.8.3":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz#45468c0ae74cc13204e1d3b1f4ce6ee83258af0b"
-  integrity sha512-pUu9VSf3kI1OqbWINQ7MaugnitRss1z533436waNXp+0N3ur3zfut37sXiQMxkuCF4VUjwZucen/quskCh7NHw==
+"@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==
   dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
     resolve "^1.8.1"
     semver "^5.5.1"
 
-"@babel/plugin-transform-shorthand-properties@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz#28545216e023a832d4d3a1185ed492bcfeac08c8"
-  integrity sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-spread@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz#9c8ffe8170fdfb88b114ecb920b82fb6e95fe5e8"
-  integrity sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-sticky-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz#be7a1290f81dae767475452199e1f76d6175b100"
-  integrity sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==
+"@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.8.3"
-    "@babel/helper-regex" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-regex" "^7.10.4"
 
-"@babel/plugin-transform-template-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz#7bfa4732b455ea6a43130adc0ba767ec0e402a80"
-  integrity sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==
+"@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.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-typeof-symbol@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz#ede4062315ce0aaf8a657a920858f1a2f35fc412"
-  integrity sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-typescript@^7.9.0":
-  version "7.9.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.4.tgz#4bb4dde4f10bbf2d787fce9707fb09b483e33359"
-  integrity sha512-yeWeUkKx2auDbSxRe8MusAG+n4m9BFY/v+lPjmQDgOFX5qnySkUY5oXzkp6FwPdsYqnKay6lorXYdC0n3bZO7w==
+"@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.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-typescript" "^7.8.3"
+    "@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-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz#0cef36e3ba73e5c57273effb182f46b91a1ecaad"
-  integrity sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==
+"@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==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/preset-env@^7.7.6":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.5.tgz#8ddc76039bc45b774b19e2fc548f6807d8a8919f"
-  integrity sha512-eWGYeADTlPJH+wq1F0wNfPbVS1w1wtmMJiYk55Td5Yu28AsdR9AsC97sZ0Qq8fHqQuslVSIYSGJMcblr345GfQ==
+"@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==
   dependencies:
-    "@babel/compat-data" "^7.9.0"
-    "@babel/helper-compilation-targets" "^7.8.7"
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
-    "@babel/plugin-proposal-dynamic-import" "^7.8.3"
-    "@babel/plugin-proposal-json-strings" "^7.8.3"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-proposal-numeric-separator" "^7.8.3"
-    "@babel/plugin-proposal-object-rest-spread" "^7.9.5"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-proposal-optional-chaining" "^7.9.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.8.3"
+    "@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==
+  dependencies:
+    "@babel/compat-data" "^7.10.4"
+    "@babel/helper-compilation-targets" "^7.10.4"
+    "@babel/helper-module-imports" "^7.10.4"
+    "@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/plugin-syntax-async-generators" "^7.8.0"
+    "@babel/plugin-syntax-class-properties" "^7.10.4"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
-    "@babel/plugin-syntax-numeric-separator" "^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.8.3"
-    "@babel/plugin-transform-arrow-functions" "^7.8.3"
-    "@babel/plugin-transform-async-to-generator" "^7.8.3"
-    "@babel/plugin-transform-block-scoped-functions" "^7.8.3"
-    "@babel/plugin-transform-block-scoping" "^7.8.3"
-    "@babel/plugin-transform-classes" "^7.9.5"
-    "@babel/plugin-transform-computed-properties" "^7.8.3"
-    "@babel/plugin-transform-destructuring" "^7.9.5"
-    "@babel/plugin-transform-dotall-regex" "^7.8.3"
-    "@babel/plugin-transform-duplicate-keys" "^7.8.3"
-    "@babel/plugin-transform-exponentiation-operator" "^7.8.3"
-    "@babel/plugin-transform-for-of" "^7.9.0"
-    "@babel/plugin-transform-function-name" "^7.8.3"
-    "@babel/plugin-transform-literals" "^7.8.3"
-    "@babel/plugin-transform-member-expression-literals" "^7.8.3"
-    "@babel/plugin-transform-modules-amd" "^7.9.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.9.0"
-    "@babel/plugin-transform-modules-systemjs" "^7.9.0"
-    "@babel/plugin-transform-modules-umd" "^7.9.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
-    "@babel/plugin-transform-new-target" "^7.8.3"
-    "@babel/plugin-transform-object-super" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.9.5"
-    "@babel/plugin-transform-property-literals" "^7.8.3"
-    "@babel/plugin-transform-regenerator" "^7.8.7"
-    "@babel/plugin-transform-reserved-words" "^7.8.3"
-    "@babel/plugin-transform-shorthand-properties" "^7.8.3"
-    "@babel/plugin-transform-spread" "^7.8.3"
-    "@babel/plugin-transform-sticky-regex" "^7.8.3"
-    "@babel/plugin-transform-template-literals" "^7.8.3"
-    "@babel/plugin-transform-typeof-symbol" "^7.8.4"
-    "@babel/plugin-transform-unicode-regex" "^7.8.3"
+    "@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/preset-modules" "^0.1.3"
-    "@babel/types" "^7.9.5"
-    browserslist "^4.9.1"
+    "@babel/types" "^7.10.4"
+    browserslist "^4.12.0"
     core-js-compat "^3.6.2"
     invariant "^2.2.2"
     levenary "^1.1.1"
     semver "^5.5.0"
 
-"@babel/preset-flow@^7.7.4":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.9.0.tgz#fee847c3e090b0b2d9227c1949e4da1d1379280d"
-  integrity sha512-88uSmlshIrlmPkNkEcx3UpSZ6b8n0UGBq0/0ZMZCF/uxAW0XIAUuDHBhIOAh0pvweafH4RxOwi/H3rWhtqOYPA==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-transform-flow-strip-types" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-transform-flow-strip-types" "^7.10.4"
 
 "@babel/preset-modules@^0.1.3":
   version "0.1.3"
@@ -894,85 +1140,142 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/preset-react@^7.7.4":
-  version "7.9.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.9.4.tgz#c6c97693ac65b6b9c0b4f25b948a8f665463014d"
-  integrity sha512-AxylVB3FXeOTQXNXyiuAQJSvss62FEotbX2Pzx3K/7c+MKJMdSg6Ose6QYllkdCFA8EInCJVw7M/o5QbLuA4ZQ==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-transform-react-display-name" "^7.8.3"
-    "@babel/plugin-transform-react-jsx" "^7.9.4"
-    "@babel/plugin-transform-react-jsx-development" "^7.9.0"
-    "@babel/plugin-transform-react-jsx-self" "^7.9.0"
-    "@babel/plugin-transform-react-jsx-source" "^7.9.0"
+    "@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/preset-typescript@^7.7.4":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.9.0.tgz#87705a72b1f0d59df21c179f7c3d2ef4b16ce192"
-  integrity sha512-S4cueFnGrIbvYJgwsVFKdvOmpiL0XGw9MFW9D0vgRys5g36PBhZRL8NX8Gr2akz8XRtzq6HuDXPD/1nniagNUg==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-transform-typescript" "^7.9.0"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-transform-typescript" "^7.10.4"
 
-"@babel/register@^7.7.4":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.9.0.tgz#02464ede57548bddbb5e9f705d263b7c3f43d48b"
-  integrity sha512-Tv8Zyi2J2VRR8g7pC5gTeIN8Ihultbmk0ocyNz8H2nEZbmhp1N6q0A1UGsQbDvGP/sNinQKUHf3SqXwqjtFv4Q==
+"@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==
   dependencies:
     find-cache-dir "^2.0.0"
-    lodash "^4.17.13"
+    lodash "^4.17.19"
     make-dir "^2.1.0"
     pirates "^4.0.0"
     source-map-support "^0.5.16"
 
-"@babel/runtime-corejs3@^7.8.3":
-  version "7.9.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.9.2.tgz#26fe4aa77e9f1ecef9b776559bbb8e84d34284b7"
-  integrity sha512-HHxmgxbIzOfFlZ+tdeRKtaxWOMUoCG5Mu3wKeUmOxjYrwb3AAHgnmtCUbPPK11/raIWLIBK250t8E2BPO0p7jA==
-  dependencies:
-    core-js-pure "^3.0.0"
-    regenerator-runtime "^0.13.4"
-
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4":
-  version "7.9.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz#d90df0583a3a252f09aaa619665367bae518db06"
-  integrity sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.3", "@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==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.4.0", "@babel/template@^7.8.3", "@babel/template@^7.8.6":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
-  integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==
+"@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:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/parser" "^7.8.6"
-    "@babel/types" "^7.8.6"
+    regenerator-runtime "^0.13.4"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.6", "@babel/traverse@^7.9.0":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.5.tgz#6e7c56b44e2ac7011a948c21e283ddd9d9db97a2"
-  integrity sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==
+"@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.8.3"
-    "@babel/generator" "^7.9.5"
-    "@babel/helper-function-name" "^7.9.5"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/parser" "^7.9.0"
-    "@babel/types" "^7.9.5"
+    "@babel/code-frame" "^7.10.1"
+    "@babel/parser" "^7.10.1"
+    "@babel/types" "^7.10.1"
+
+"@babel/template@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278"
+  integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/parser" "^7.10.4"
+    "@babel/types" "^7.10.4"
+
+"@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==
+  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/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.5.tgz#89231f82915a8a566a703b3b20133f73da6b9444"
-  integrity sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==
+"@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/helper-validator-identifier" "^7.9.5"
+    "@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"
+    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==
+  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/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"
+
 "@cnakazawa/watch@^1.0.3":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a"
@@ -1142,12 +1445,24 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@peculiar/asn1-schema@^1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-1.0.5.tgz#aa5a2c51225d213d1d6a5499ada926da3f556ff5"
-  integrity sha512-rzzorGYnQNmVHleLvC8gJSbbdNYtg+EB9s075dHvwpxs10teXHYnRmTWhCVuWjbSVSofwdm7IYPtMTWTbcNUWA==
+"@peculiar/asn1-schema@^2.0.1":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.0.5.tgz#ba6c5a107eec16a23804d0176a3595837b53c0e9"
+  integrity sha512-VIKJjsgMkv+yyWx3C+D4xo6/NeCg0XFBgNlavtkxELijV+aKAq53du5KkOJbeZtm1nn9CinQKny2PqL8zCfpeA==
   dependencies:
+    "@types/asn1js" "^0.0.1"
     asn1js "^2.0.26"
+    pvtsutils "^1.0.10"
+    tslib "^1.11.1"
+
+"@peculiar/asn1-schema@^2.0.8":
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.0.8.tgz#bafb74388590f6ec3d53d1b2a4fdbe66d44224a4"
+  integrity sha512-D8ZqT61DdzuXfrILNvtdf7MUcTY2o9WHwmF0WgTKPEGNY5SDxNAjBY3enuwV9SXcSuCAwWac9c9v0vsswB1NIw==
+  dependencies:
+    "@types/asn1js" "^0.0.1"
+    asn1js "^2.0.26"
+    pvtsutils "^1.0.10"
     tslib "^1.11.1"
 
 "@peculiar/json-schema@^1.1.10":
@@ -1157,28 +1472,35 @@
   dependencies:
     tslib "^1.11.1"
 
-"@peculiar/webcrypto@^1.0.22":
-  version "1.0.27"
-  resolved "https://registry.yarnpkg.com/@peculiar/webcrypto/-/webcrypto-1.0.27.tgz#f32c58656267c8f8419a6b574322573a1b83a683"
-  integrity sha512-sERMakD19gNhwBVXGGoJjBfc28bDbd2YWaio7/x8jKtvwMKNuljM7ANQ6LzEkEvqFAyjf3bhBZktJ6UXy/0Plg==
+"@peculiar/webcrypto@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@peculiar/webcrypto/-/webcrypto-1.1.2.tgz#3114da877ddd9d2d0be10188371e15855aa71368"
+  integrity sha512-BkgD5iH2n3+Fdd/+xfhac8VbISo4MPvECPhK1kRpuYC7PnhxaJe2rpU7B4udvMeEL8lhJlvCWybo8Y7A29u/xQ==
   dependencies:
-    "@peculiar/asn1-schema" "^1.0.5"
+    "@peculiar/asn1-schema" "^2.0.8"
     "@peculiar/json-schema" "^1.1.10"
     pvtsutils "^1.0.10"
-    tslib "^1.11.1"
-    webcrypto-core "^1.0.19-next.0"
+    tslib "^2.0.0"
+    webcrypto-core "^1.1.2"
 
 "@sinonjs/commons@^1.7.0":
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.2.tgz#505f55c74e0272b43f6c52d81946bed7058fc0e2"
-  integrity sha512-+DUO6pnp3udV/v2VfUWgaY5BIE1IfT7lLfeDzPVeMT1XKkaAp9LgSI9x5RtrFQoZ9Oi0PgXQQHPaoKu7dCjVxw==
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.0.tgz#c8d68821a854c555bba172f3b06959a0039b236d"
+  integrity sha512-wEj54PfsZ5jGSwMX68G8ZXFawcSglQSXqCftWX3ec8MDUzQdHgcKvw97awHbY0efQEL5iKUOAmmVtoYgmrSG4Q==
   dependencies:
     type-detect "4.0.8"
 
+"@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=
+  dependencies:
+    "@types/pvutils" "*"
+
 "@types/babel__core@^7.1.0":
-  version "7.1.7"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.7.tgz#1dacad8840364a57c98d0dd4855c6dd3752c6b89"
-  integrity sha512-RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw==
+  version "7.1.8"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.8.tgz#057f725aca3641f49fc11c7a87a9de5ec588a5d7"
+  integrity sha512-KXBiQG2OXvaPWFPDS1rD8yV9vO0OuWIqAEqLsbfX0oU2REN5KuoMnZ1gClWcBhO5I3n6oTVAmrMufOvRqdmFTQ==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -1202,9 +1524,9 @@
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.0.10"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.10.tgz#d9a99f017317d9b3d1abc2ced45d3bca68df0daf"
-  integrity sha512-74fNdUGrWsgIB/V9kTO5FGHPWYY6Eqn+3Z7L6Hc4e/BxjYV7puvBqp5HwsVYYfLm6iURYBNCx4Ut37OF9yitCw==
+  version "7.0.12"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.12.tgz#22f49a028e69465390f87bb103ebd61bd086b8f5"
+  integrity sha512-t4CoEokHTfcyfb4hUaF9oOHu9RmmNWnm1CP0YmMqOOfClKascOmvlEM736vlqeScuGvBDsHkf8R2INd4DWreQA==
   dependencies:
     "@babel/types" "^7.3.0"
 
@@ -1213,24 +1535,46 @@
   resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.10.tgz#cc658ca319b6355399efc1f5b9e818f1a24bf999"
   integrity sha512-1UzDldn9GfYYEsWWnn/P4wkTlkZDH7lDb0wBMGbtIQc9zXEQq7FlKBdZUn6OBqD8sKZZ2RQO2mAjGpXiDGoRmQ==
 
-"@types/events@*":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
-  integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
+"@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/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/fbemitter@*":
+  version "2.0.32"
+  resolved "https://registry.yarnpkg.com/@types/fbemitter/-/fbemitter-2.0.32.tgz#8ed204da0f54e9c8eaec31b1eec91e25132d082c"
+  integrity sha1-jtIE2g9U6cjq7DGx7skeJRMtCCw=
+
+"@types/flux@^3.1.9":
+  version "3.1.9"
+  resolved "https://registry.yarnpkg.com/@types/flux/-/flux-3.1.9.tgz#ddfc9641ee2e2e6cb6cd730c6a48ef82e2076711"
+  integrity sha512-bSbDf4tTuN9wn3LTGPnH9wnSSLtR5rV7UPWFpM00NJ1pSTBwCzeZG07XsZ9lBkxwngrqjDtM97PLt5IuIdCQUA==
+  dependencies:
+    "@types/fbemitter" "*"
+    "@types/react" "*"
 
 "@types/glob@^7.1.1":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
-  integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.2.tgz#06ca26521353a545d94a0adc74f38a59d232c987"
+  integrity sha512-VgNIkxK+j7Nz5P7jvUZlRvhuPSmsEfS03b0alKcq5V/STUKAa3Plemsn5mrQUO7am6OErJ4rhGEGJbACclrtRA==
   dependencies:
-    "@types/events" "*"
     "@types/minimatch" "*"
     "@types/node" "*"
 
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
-  integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==
+  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-report@*":
   version "3.0.0"
@@ -1240,9 +1584,9 @@
     "@types/istanbul-lib-coverage" "*"
 
 "@types/istanbul-reports@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz#7a8cbf6a406f36c8add871625b278eaf0b0d255a"
-  integrity sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz#e875cc689e47bce549ec81f3df5e6f6f11cfaeb2"
+  integrity sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==
   dependencies:
     "@types/istanbul-lib-coverage" "*"
     "@types/istanbul-lib-report" "*"
@@ -1252,6 +1596,23 @@
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
   integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==
 
+"@types/json5@^0.0.29":
+  version "0.0.29"
+  resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
+  integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
+
+"@types/linkifyjs@^2.1.3":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@types/linkifyjs/-/linkifyjs-2.1.3.tgz#80195c3c88c5e75d9f660e3046ce4a42be2c2fa4"
+  integrity sha512-V3Xt9wgaOvDPXcpOy3dC8qXCxy3cs0Lr/Hqgd9Bi6m3sf/vpbpTtfmVR0LJklrqYEjaAmc7e3Xh/INT2rCAKjQ==
+  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/minimatch@*":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
@@ -1263,23 +1624,66 @@
   integrity sha512-jhMOZSS0UGYTS9pqvt6q3wtT3uvOSve5piTEmTMx3zzTuBLvSIMxSIBIc3d5lajVD5h4xc41AMZD2M5orN3PxA==
 
 "@types/node@*":
-  version "13.11.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.11.0.tgz#390ea202539c61c8fa6ba4428b57e05bc36dc47b"
-  integrity sha512-uM4mnmsIIPK/yeO+42F2RQhGUIs39K2RFmugcJANppXe6J1nvH87PvzPZYpza7Xhhs8Yn9yIAVdLZ84z61+0xQ==
+  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/pako@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@types/pako/-/pako-1.0.1.tgz#33b237f3c9aff44d0f82fe63acffa4a365ef4a61"
+  integrity sha512-GdZbRSJ3Cv5fiwT6I0SQ3ckeN2PWNqxd26W9Z2fCK1tGrrasGy4puvNFtnddqH9UJFMQYXxEuuB7B8UK+LLwSg==
 
 "@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/react@16.9":
-  version "16.9.32"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.32.tgz#f6368625b224604148d1ddf5920e4fefbd98d383"
-  integrity sha512-fmejdp0CTH00mOJmxUPPbWCEBWPvRIL4m8r0qD+BSDUqmutPyGQCHifzMpMzdvZwROdEdL78IuZItntFWgPXHQ==
+"@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==
+  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==
+  dependencies:
+    "@types/react" "*"
+
+"@types/react-transition-group@^4.4.0":
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.0.tgz#882839db465df1320e4753e6e9f70ca7e9b4d46d"
+  integrity sha512-/QfLHGpu+2fQOqQaXh8MG9q03bFENooTb/it4jr5kKaZlDQfWvjqWZg48AwzPVMBHlRuTRAY7hRHCEOXz5kV6w==
+  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==
   dependencies:
     "@types/prop-types" "*"
     csstype "^2.2.0"
 
+"@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==
+  dependencies:
+    htmlparser2 "^4.1.0"
+
 "@types/stack-utils@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
@@ -1312,35 +1716,122 @@
   integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==
 
 "@types/yargs@^13.0.0":
-  version "13.0.8"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.8.tgz#a38c22def2f1c2068f8971acb3ea734eb3c64a99"
-  integrity sha512-XAvHLwG7UQ+8M4caKIH0ZozIOYay5fQkAgyIXegXT9jPtdIGdhga+sUEdAr1CiG46aB+c64xQEYyEzlwWVTNzA==
+  version "13.0.9"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.9.tgz#44028e974343c7afcf3960f1a2b1099c39a7b5e1"
+  integrity sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/experimental-utils@^2.5.0":
-  version "2.27.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.27.0.tgz#801a952c10b58e486c9a0b36cf21e2aab1e9e01a"
-  integrity sha512-vOsYzjwJlY6E0NJRXPTeCGqjv5OHgRU1kzxHKWJVPjDYGbPgLudBXjIlc+OD1hDBZ4l1DLbOc5VjofKahsu9Jw==
+"@types/zxcvbn@^4.4.0":
+  version "4.4.0"
+  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==
+  dependencies:
+    "@typescript-eslint/experimental-utils" "3.4.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/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==
   dependencies:
     "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/typescript-estree" "2.27.0"
+    "@typescript-eslint/typescript-estree" "3.4.0"
     eslint-scope "^5.0.0"
     eslint-utils "^2.0.0"
 
-"@typescript-eslint/typescript-estree@2.27.0":
-  version "2.27.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.27.0.tgz#a288e54605412da8b81f1660b56c8b2e42966ce8"
-  integrity sha512-t2miCCJIb/FU8yArjAvxllxbTiyNqaXJag7UOpB5DVoM3+xnjeOngtqlJkLRnMtzaRcJhe3CIR9RmL40omubhg==
+"@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==
   dependencies:
     debug "^4.1.1"
     eslint-visitor-keys "^1.1.0"
     glob "^7.1.6"
     is-glob "^4.0.1"
     lodash "^4.17.15"
-    semver "^6.3.0"
+    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==
+  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"
+
 "@webassemblyjs/ast@1.9.0":
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"
@@ -1509,7 +2000,7 @@ acorn-globals@^4.1.0:
     acorn "^6.0.1"
     acorn-walk "^6.0.1"
 
-acorn-jsx@^5.0.0:
+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==
@@ -1524,11 +2015,16 @@ acorn@^5.5.3:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
   integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
 
-acorn@^6.0.1, acorn@^6.0.7, acorn@^6.2.1:
+acorn@^6.0.1, acorn@^6.4.1:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
   integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
 
+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==
+
 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"
@@ -1576,10 +2072,10 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
   integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
 
-ajv@^6.1.0, ajv@^6.10.2, ajv@^6.5.5, ajv@^6.9.1:
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7"
-  integrity sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==
+ajv@^6.1.0, 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==
   dependencies:
     fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
@@ -1591,11 +2087,23 @@ another-json@^0.2.0:
   resolved "https://registry.yarnpkg.com/another-json/-/another-json-0.2.0.tgz#b5f4019c973b6dd5c6506a2d93469cb6d32aeedc"
   integrity sha1-tfQBnJc7bdXGUGotk0acttMq7tw=
 
-ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
+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-escapes@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
 
+ansi-escapes@^4.2.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
+  integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==
+  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"
@@ -1611,6 +2119,11 @@ ansi-regex@^4.0.0, ansi-regex@^4.1.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
   integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
+ansi-regex@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+
 ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -1618,6 +2131,14 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
+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"
@@ -1676,7 +2197,7 @@ array-find-index@^1.0.1:
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
   integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
 
-array-includes@^3.0.3, array-includes@^3.1.1:
+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==
@@ -1718,6 +2239,15 @@ array.prototype.flat@^1.2.3:
     define-properties "^1.1.3"
     es-abstract "^1.17.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==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
+    function-bind "^1.1.1"
+
 arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
@@ -1802,17 +2332,22 @@ atob@^2.1.2:
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 autoprefixer@^9.0.0:
-  version "9.7.6"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.6.tgz#63ac5bbc0ce7934e6997207d5bb00d68fa8293a4"
-  integrity sha512-F7cYpbN7uVVhACZTeeIeealwdGM6wMtfWARVLTy5xmKtgVdBNJvbDRoCK3YO1orcs7gv/KwYlb3iXwu9Ug9BkQ==
+  version "9.8.0"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.0.tgz#68e2d2bef7ba4c3a65436f662d0a56a741e56511"
+  integrity sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A==
   dependencies:
-    browserslist "^4.11.1"
-    caniuse-lite "^1.0.30001039"
+    browserslist "^4.12.0"
+    caniuse-lite "^1.0.30001061"
     chalk "^2.4.2"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.27"
-    postcss-value-parser "^4.0.3"
+    postcss "^7.0.30"
+    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==
 
 aws-sign2@~0.7.0:
   version "0.7.0"
@@ -1820,11 +2355,11 @@ aws-sign2@~0.7.0:
   integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
 aws4@^1.8.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e"
-  integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.0.tgz#a17b3a8ea811060e74d47d306122400ad4497ae2"
+  integrity sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==
 
-babel-eslint@^10.0.3:
+babel-eslint@^10.0.1, babel-eslint@^10.1.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232"
   integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==
@@ -1849,10 +2384,10 @@ babel-jest@^24.9.0:
     chalk "^2.4.2"
     slash "^2.0.0"
 
-babel-plugin-dynamic-import-node@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f"
-  integrity sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==
+babel-plugin-dynamic-import-node@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
+  integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
   dependencies:
     object.assign "^4.1.0"
 
@@ -1958,15 +2493,20 @@ bluebird@^3.5.0, bluebird@^3.5.5:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-blueimp-canvas-to-blob@^3.5.0:
-  version "3.18.0"
-  resolved "https://registry.yarnpkg.com/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.18.0.tgz#15f67cd1469f0be4d90c4619a0499a76bb835f79"
-  integrity sha512-AkYW5KQ0kTMrmcXvSVi+2TsWDXVZwrJM3g4o7r2z6OA3IlMhlAnoBNWI1ow45jfRr/co7tNch4OdNyb3WU3Pxw==
+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==
 
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
-  version "4.11.8"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
-  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0:
+  version "4.11.9"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
+  integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
+
+bn.js@^5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.2.tgz#c9686902d3c9a27729f43ab10f9d79c2004da7b0"
+  integrity sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA==
 
 boolbase@~1.0.0:
   version "1.0.0"
@@ -2062,7 +2602,7 @@ browserify-des@^1.0.0:
     inherits "^2.0.1"
     safe-buffer "^5.1.2"
 
-browserify-rsa@^4.0.0:
+browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
   integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
@@ -2071,17 +2611,19 @@ browserify-rsa@^4.0.0:
     randombytes "^2.0.1"
 
 browserify-sign@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
-  integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.0.tgz#545d0b1b07e6b2c99211082bf1b12cce7a0b0e11"
+  integrity sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA==
   dependencies:
-    bn.js "^4.1.1"
-    browserify-rsa "^4.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.2"
-    elliptic "^6.0.0"
-    inherits "^2.0.1"
-    parse-asn1 "^5.0.0"
+    bn.js "^5.1.1"
+    browserify-rsa "^4.0.1"
+    create-hash "^1.2.0"
+    create-hmac "^1.1.7"
+    elliptic "^6.5.2"
+    inherits "^2.0.4"
+    parse-asn1 "^5.1.5"
+    readable-stream "^3.6.0"
+    safe-buffer "^5.2.0"
 
 browserify-zlib@^0.2.0:
   version "0.2.0"
@@ -2090,13 +2632,13 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.11.1, browserslist@^4.8.3, browserslist@^4.9.1:
-  version "4.11.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.11.1.tgz#92f855ee88d6e050e7e7311d987992014f1a1f1b"
-  integrity sha512-DCTr3kDrKEYNw6Jb9HFxVLQNaue8z+0ZfRBRjmCunKDEXEBajKDj2Y+Uelg+Pi29OnvaSGwjOsnRyNEkXzHg5g==
+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==
   dependencies:
-    caniuse-lite "^1.0.30001038"
-    electron-to-chromium "^1.3.390"
+    caniuse-lite "^1.0.30001043"
+    electron-to-chromium "^1.3.413"
     node-releases "^1.1.53"
     pkg-up "^2.0.0"
 
@@ -2152,18 +2694,13 @@ buffer@^4.3.0:
     isarray "^1.0.0"
 
 buffer@^5.4.3:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.5.0.tgz#9c3caa3d623c33dd1c7ef584b89b88bf9c9bc1ce"
-  integrity sha512-9FTEDjLjwoAkEwyMGDjYJQN2gfRgOKBKRfiglhvibGbpeeU/pQn1bJxQqm32OD/AIeEuHxU9roxXxg34Byp/Ww==
+  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==
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
 
-builtin-modules@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
-  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
-
 builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
@@ -2253,10 +2790,10 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@^1.0.30001038, caniuse-lite@^1.0.30001039:
-  version "1.0.30001039"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001039.tgz#b3814a1c38ffeb23567f8323500c09526a577bbe"
-  integrity sha512-SezbWCTT34eyFoWHgx8UWso7YtvtM7oosmFoXbCkdC6qJzRfBTeTgE9REtKtiuKXuMwWTZEvdnFNGAyVMorv8Q==
+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==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -2275,7 +2812,7 @@ ccount@^1.0.0:
   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.3.0, chalk@^2.4.1, chalk@^2.4.2:
+chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, 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==
@@ -2284,6 +2821,14 @@ chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
+chalk@^4.0.0, chalk@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
+  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 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"
@@ -2340,10 +2885,10 @@ chokidar@^2.1.8:
   optionalDependencies:
     fsevents "^1.2.7"
 
-chokidar@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.1.tgz#c84e5b3d18d9a4d77558fef466b1bf16bbeb3450"
-  integrity sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==
+chokidar@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.0.tgz#b30611423ce376357c765b9b8f904b9fba3c0be8"
+  integrity sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==
   dependencies:
     anymatch "~3.1.1"
     braces "~3.0.2"
@@ -2351,7 +2896,22 @@ chokidar@^3.3.1:
     is-binary-path "~2.1.0"
     is-glob "~4.0.1"
     normalize-path "~3.0.0"
-    readdirp "~3.3.0"
+    readdirp "~3.4.0"
+  optionalDependencies:
+    fsevents "~2.1.2"
+
+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==
+  dependencies:
+    anymatch "~3.1.1"
+    braces "~3.0.2"
+    glob-parent "~5.1.0"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.4.0"
   optionalDependencies:
     fsevents "~2.1.2"
 
@@ -2390,22 +2950,22 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-classnames@^2.1.2:
+classnames@^2.2.6:
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
   integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==
 
-cli-cursor@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
-  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
+cli-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
   dependencies:
-    restore-cursor "^2.0.0"
+    restore-cursor "^3.1.0"
 
-cli-width@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
-  integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
+cli-width@^3.0.0:
+  version "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"
@@ -2463,11 +3023,28 @@ color-convert@^1.9.0:
   dependencies:
     color-name "1.1.3"
 
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
+color-convert@~0.5.0:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz#bdb6c69ce660fadffe0b0007cc447e1b9f7282bd"
+  integrity sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=
+
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
 combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -2475,7 +3052,7 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.12.1, commander@^2.15.1, commander@^2.19.0, commander@^2.20.0:
+commander@^2.15.1, commander@^2.19.0, commander@^2.20.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==
@@ -2490,14 +3067,14 @@ commondir@^1.0.1:
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
   integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
-commonmark@^0.28.1:
-  version "0.28.1"
-  resolved "https://registry.yarnpkg.com/commonmark/-/commonmark-0.28.1.tgz#06eab8d52338b839fa1a2d75af0085eed1b1beae"
-  integrity sha1-Buq41SM4uDn6Gi11rwCF7tGxvq4=
+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==
   dependencies:
-    entities "~ 1.1.1"
-    mdurl "~ 1.0.1"
-    minimist "~ 1.2.0"
+    entities "~1.1.1"
+    mdurl "~1.0.1"
+    minimist "~1.2.0"
     string.prototype.repeat "^0.2.0"
 
 component-emitter@^1.2.1:
@@ -2520,7 +3097,7 @@ concat-stream@^1.5.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-concurrently@^4.0.1:
+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==
@@ -2545,6 +3122,11 @@ constants-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
   integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
 
+contains-path@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
+  integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=
+
 content-type@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
@@ -2575,18 +3157,13 @@ copy-descriptor@^0.1.0:
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 core-js-compat@^3.6.2:
-  version "3.6.4"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.4.tgz#938476569ebb6cda80d339bcf199fae4f16fff17"
-  integrity sha512-zAa3IZPvsJ0slViBQ2z+vgyyTuhd3MFn1rBQjZSKVEgB0UMYhUkCj9jJUVPgGTGqWvsBVmfnruXgTcNyTlEiSA==
+  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==
   dependencies:
-    browserslist "^4.8.3"
+    browserslist "^4.8.5"
     semver "7.0.0"
 
-core-js-pure@^3.0.0:
-  version "3.6.4"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.4.tgz#4bf1ba866e25814f149d4e9aaa08c36173506e3a"
-  integrity sha512-epIhRLkXdgv32xIUFaaAry2wdxZYBi6bgM7cB136dzzXXa+dFyRLTZeLUJxnd8ShrmyVXBub63n2NHo2JAt8Cw==
-
 core-js@^1.0.0:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
@@ -2612,7 +3189,7 @@ cosmiconfig@^5.0.0:
     js-yaml "^3.13.1"
     parse-json "^4.0.0"
 
-counterpart@^0.18.0:
+counterpart@^0.18.6:
   version "0.18.6"
   resolved "https://registry.yarnpkg.com/counterpart/-/counterpart-0.18.6.tgz#cf6b60d8ef99a4b44b8bf6445fa99b4bd1b2f9dd"
   integrity sha512-cAIDAYbC3x8S2DDbvFEJ4TzPtPYXma25/kfAkfmprNLlkPWeX4SdUp1c2xklfphqCU3HnDaivR4R3BrAYf5OMA==
@@ -2636,7 +3213,7 @@ create-ecdh@^4.0.0:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
 
-create-hash@^1.1.0, create-hash@^1.1.2:
+create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
   integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
@@ -2647,7 +3224,7 @@ create-hash@^1.1.0, create-hash@^1.1.2:
     ripemd160 "^2.0.1"
     sha.js "^2.4.0"
 
-create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
+create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
   integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
@@ -2659,7 +3236,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-create-react-class@^15.6.0:
+create-react-class@^15.6.3:
   version "15.6.3"
   resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.3.tgz#2d73237fb3f970ae6ebe011a9e66f46dbca80036"
   integrity sha512-M+/3Q6E6DLO6Yx3OwrWjwHBnvfXXYA7W+dFjt/ZDBemHO1DDZhsalX/NUtnTYclN6GfnBDRh4qRHjcDHmlJBJg==
@@ -2668,7 +3245,7 @@ create-react-class@^15.6.0:
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
-cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5:
+cross-spawn@^6.0.0, cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
   integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
@@ -2679,6 +3256,15 @@ cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+cross-spawn@^7.0.2:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
 crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
@@ -2716,6 +3302,11 @@ cssesc@^3.0.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
+cssfontparser@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/cssfontparser/-/cssfontparser-1.2.1.tgz#f4022fc8f9700c68029d542084afbaf425a3f3e3"
+  integrity sha1-9AIvyPlwDGgCnVQghK+69CWj8+M=
+
 cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
@@ -2728,7 +3319,7 @@ cssstyle@^1.0.0:
   dependencies:
     cssom "0.3.x"
 
-csstype@^2.2.0:
+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==
@@ -2778,7 +3369,7 @@ debug@3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@^2.2.0, debug@^2.3.3:
+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"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -2822,7 +3413,7 @@ deep-extend@^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, deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
@@ -2884,7 +3475,7 @@ detect-node@^2.0.4:
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
   integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
 
-diff-dom@^4.1.3:
+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==
@@ -2892,21 +3483,16 @@ diff-dom@^4.1.3:
     rollup-plugin-terser "^5.1.1"
     updates "^8.5.2"
 
-diff-match-patch@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.4.tgz#6ac4b55237463761c4daf0dc603eb869124744b1"
-  integrity sha512-Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg==
+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@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5"
   integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==
 
-diff@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
-  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
-
 diffie-hellman@^5.0.0:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
@@ -2933,6 +3519,14 @@ discontinuous-range@1.0.0:
   resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a"
   integrity sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=
 
+doctrine@1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
+  integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=
+  dependencies:
+    esutils "^2.0.2"
+    isarray "^1.0.0"
+
 doctrine@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
@@ -2947,6 +3541,14 @@ doctrine@^3.0.0:
   dependencies:
     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==
+  dependencies:
+    "@babel/runtime" "^7.8.7"
+    csstype "^2.6.7"
+
 dom-serializer@0, dom-serializer@^0.2.1:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
@@ -3016,9 +3618,9 @@ domutils@^1.5.1:
     domelementtype "1"
 
 domutils@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.0.0.tgz#15b8278e37bfa8468d157478c58c367718133c08"
-  integrity sha512-n5SelJ1axbO636c2yUtOGia/IcJtVtlhQbFiVDBZHKV5ReJO1ViX7sFEemtuyoAnBxk5meNSYgA8V4s0271efg==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.1.0.tgz#7ade3201af43703fde154952e3a868eb4b635f16"
+  integrity sha512-CD9M0Dm1iaHfQ1R/TI+z3/JWp/pgub0j4jIQKH89ARR4ATAV2nbaOQS5XxU9maJP5jHaPdDDQSEHuE2UmpUTKg==
   dependencies:
     dom-serializer "^0.2.1"
     domelementtype "^2.0.1"
@@ -3049,15 +3651,15 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-electron-to-chromium@^1.3.390:
-  version "1.3.398"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.398.tgz#4c01e29091bf39e578ac3f66c1f157d92fa5725d"
-  integrity sha512-BJjxuWLKFbM5axH3vES7HKMQgAknq9PZHBkMK/rEXUQG9i1Iw5R+6hGkm6GtsQSANjSUrh/a6m32nzCNDNo/+w==
+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==
 
-elliptic@^6.0.0:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762"
-  integrity sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==
+elliptic@^6.0.0, elliptic@^6.5.2:
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
+  integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
   dependencies:
     bn.js "^4.4.0"
     brorand "^1.0.1"
@@ -3077,20 +3679,15 @@ 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@^4.0.2:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-4.2.1.tgz#3d1f0c69ddbb2ca7b7014f5e34654190802a40df"
-  integrity sha512-O0vxoPMgVkRq/uII/gdAjz9RwNv6ClJrd3J9QCCRC4btZRmeut/qohC/Fi+NNXUcjY08RWNTvxSnq/vij8hvrw==
+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-regex@^3.0.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-3.2.1.tgz#122935958c9a49c96bb29ac69ccbbac0b2e7022d"
-  integrity sha512-VAX2Rc2U/alu5q6P2cET2alzC63o1Uarm6Ea/b3ab+KOzxZT4JKmB0tCU1sTZvfNKa16KMLCK2k7hJBHJq4vWQ==
-
-emojis-list@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
-  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
+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==
 
 emojis-list@^3.0.0:
   version "3.0.0"
@@ -3111,15 +3708,6 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
-  integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
-  dependencies:
-    graceful-fs "^4.1.2"
-    memory-fs "^0.4.0"
-    tapable "^1.0.0"
-
 enhanced-resolve@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz#2937e2b8066cd0fe7ce0990a98f0d71a35189f66"
@@ -3129,17 +3717,33 @@ enhanced-resolve@^4.1.0:
     memory-fs "^0.5.0"
     tapable "^1.0.0"
 
-entities@^1.1.1, "entities@~ 1.1.1", entities@~1.1.1:
+enhanced-resolve@^4.1.1:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126"
+  integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.5.0"
+    tapable "^1.0.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==
+  dependencies:
+    ansi-colors "^3.2.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:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz#68d6084cab1b079767540d80e56a39b423e4abf4"
-  integrity sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==
+  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.1:
+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==
@@ -3174,7 +3778,7 @@ enzyme-shallow-equal@^1.0.1:
     has "^1.0.3"
     object-is "^1.0.2"
 
-enzyme@^3.10.0:
+enzyme@^3.11.0:
   version "3.11.0"
   resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.11.0.tgz#71d680c580fe9349f6f5ac6c775bc3e6b7a79c28"
   integrity sha512-Dw8/Gs4vRjxY6/6i9wU0V+utmQO9kvh9XLnz3LIudviOnVYDEe2ec+0k+NQoMamn1VrjKgCUOWj5jG/5M5M0Qw==
@@ -3214,7 +3818,7 @@ errno@^0.1.3, errno@~0.1.7:
   dependencies:
     prr "~1.0.1"
 
-error-ex@^1.3.1:
+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"
   integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
@@ -3283,9 +3887,9 @@ escape-string-regexp@^1.0.5:
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
 escodegen@^1.9.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457"
-  integrity sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.2.tgz#14ab71bf5026c2aa08173afba22c6f3173284a84"
+  integrity sha512-InuOIiKk8wwuOFg6x9BQXbzjrQhtyXh46K9bqVTPzSo2FnyMBaYGBMC6PhQy7yxxil9vIedFBweQBMK74/7o8A==
   dependencies:
     esprima "^4.0.1"
     estraverse "^4.2.0"
@@ -3294,10 +3898,77 @@ escodegen@^1.9.1:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-config-google@^0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.7.1.tgz#5598f8498e9e078420f34b80495b8d959f651fb2"
-  integrity sha1-VZj4SY6eB4Qg80uASVuNlZ9lH7I=
+eslint-config-esnext@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-esnext/-/eslint-config-esnext-4.1.0.tgz#8695b858fcf40d28c1aedca181f700528c7b60c6"
+  integrity sha512-GhfVEXdqYKEIIj7j+Fw2SQdL9qyZMekgXfq6PyXM66cQw0B435ddjz3P3kxOBVihMRJ0xGYjosaveQz5Y6z0uA==
+  dependencies:
+    babel-eslint "^10.0.1"
+    eslint "^6.8.0"
+    eslint-plugin-babel "^5.2.1"
+    eslint-plugin-import "^2.14.0"
+
+eslint-config-google@^0.14.0:
+  version "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==
+  dependencies:
+    "@typescript-eslint/eslint-plugin" "^3.4.0"
+    "@typescript-eslint/parser" "^3.4.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-config-node@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-node/-/eslint-config-node-4.1.0.tgz#fc1f13946d83766d6b83b0e67699e2071a56f417"
+  integrity sha512-Wz17xV5O2WFG8fGdMYEBdbiL6TL7YNJSJvSX9V4sXQownewfYmoqlly7wxqLkOUv/57pq6LnnotMiQQrrPjCqQ==
+  dependencies:
+    eslint "^6.8.0"
+    eslint-config-esnext "^4.1.0"
+
+eslint-config-react-native@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-react-native/-/eslint-config-react-native-4.1.0.tgz#63e9401c7fac146804785f609e7df8f15b3e04eb"
+  integrity sha512-kNND+cs+ztawH7wgajf/K6FfNshjlDsFDAkkFZF9HAXDgH1w1sNMIfTfwzufg0hOcSK7rbiL4qbG/gg/oR507Q==
+  dependencies:
+    eslint "^6.8.0"
+    eslint-config-esnext "^4.1.0"
+    eslint-plugin-react "^7.19.0"
+    eslint-plugin-react-native "^3.8.1"
+
+eslint-config-recommended@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-recommended/-/eslint-config-recommended-4.1.0.tgz#1adff90e0716d439be471d192977f233de171a46"
+  integrity sha512-2evA0SX1VqtyFiExmBI2WAO4XQCKlr7wmNELE8rcT5PyZY2ixsY881ofVZWKuI/dywpgLiES1gR/XUQcnVLRzQ==
+  dependencies:
+    eslint "^6.8.0"
+    eslint-config-esnext "^4.1.0"
+    eslint-config-node "^4.1.0"
+    eslint-config-react-native "^4.1.0"
+
+eslint-import-resolver-node@^0.3.3:
+  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==
+  dependencies:
+    debug "^2.6.9"
+    resolve "^1.13.1"
+
+eslint-module-utils@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6"
+  integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==
+  dependencies:
+    debug "^2.6.9"
+    pkg-dir "^2.0.0"
 
 eslint-plugin-babel@^5.2.1:
   version "5.3.0"
@@ -3306,42 +3977,72 @@ eslint-plugin-babel@^5.2.1:
   dependencies:
     eslint-rule-composer "^0.3.0"
 
-eslint-plugin-flowtype@^2.30.0:
+eslint-plugin-babel@^5.3.0, 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==
   dependencies:
     lodash "^4.17.10"
 
-eslint-plugin-jest@^23.0.4:
-  version "23.8.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.8.2.tgz#6f28b41c67ef635f803ebd9e168f6b73858eb8d4"
-  integrity sha512-xwbnvOsotSV27MtAe7s8uGWOori0nUsrXh2f1EnpmXua8sDfY6VZhHAhHg2sqK7HBNycRQExF074XSZ7DvfoFg==
+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==
   dependencies:
-    "@typescript-eslint/experimental-utils" "^2.5.0"
+    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-module-utils "^2.6.0"
+    has "^1.0.3"
+    minimatch "^3.0.4"
+    object.values "^1.1.1"
+    read-pkg-up "^2.0.0"
+    resolve "^1.17.0"
+    tsconfig-paths "^3.9.0"
 
-eslint-plugin-react-hooks@^2.0.1:
+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@^7.7.0:
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.19.0.tgz#6d08f9673628aa69c5559d33489e855d83551666"
-  integrity sha512-SPT8j72CGuAP+JFbT0sJHOB80TX/pu44gQ4vXH/cq+hQTiY2PuZ6IHkqXJV6x1b28GDdo1lbInjKUrrdUf0LOQ==
+eslint-plugin-react-native-globals@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-native-globals/-/eslint-plugin-react-native-globals-0.1.2.tgz#ee1348bc2ceb912303ce6bdbd22e2f045ea86ea2"
+  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==
+  dependencies:
+    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==
   dependencies:
     array-includes "^3.1.1"
+    array.prototype.flatmap "^1.2.3"
     doctrine "^2.1.0"
     has "^1.0.3"
-    jsx-ast-utils "^2.2.3"
-    object.entries "^1.1.1"
+    jsx-ast-utils "^2.4.1"
+    object.entries "^1.1.2"
     object.fromentries "^2.0.2"
     object.values "^1.1.1"
     prop-types "^15.7.2"
-    resolve "^1.15.1"
-    semver "^6.3.0"
+    resolve "^1.17.0"
     string.prototype.matchall "^4.0.2"
-    xregexp "^4.3.0"
 
 eslint-rule-composer@^0.3.0:
   version "0.3.0"
@@ -3356,15 +4057,15 @@ eslint-scope@^4.0.3:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-scope@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9"
-  integrity sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==
+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==
   dependencies:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-utils@^1.3.1:
+eslint-utils@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
   integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
@@ -3378,73 +4079,132 @@ eslint-utils@^2.0.0:
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
-eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
-  integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
+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==
+  dependencies:
+    eslint-visitor-keys "^1.1.0"
 
-eslint@^5.12.0:
-  version "5.16.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"
-  integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==
+eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
+  version "1.3.0"
+  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==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    ajv "^6.9.1"
+    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-utils "^2.1.0"
+    eslint-visitor-keys "^1.3.0"
+    espree "^7.2.0"
+    esquery "^1.2.0"
+    esutils "^2.0.2"
+    file-entry-cache "^5.0.1"
+    functional-red-black-tree "^1.0.1"
+    glob-parent "^5.0.0"
+    globals "^12.1.0"
+    ignore "^4.0.6"
+    import-fresh "^3.0.0"
+    imurmurhash "^0.1.4"
+    is-glob "^4.0.0"
+    js-yaml "^3.13.1"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.4.1"
+    lodash "^4.17.19"
+    minimatch "^3.0.4"
+    natural-compare "^1.4.0"
+    optionator "^0.9.1"
+    progress "^2.0.0"
+    regexpp "^3.1.0"
+    semver "^7.2.1"
+    strip-ansi "^6.0.0"
+    strip-json-comments "^3.1.0"
+    table "^5.2.3"
+    text-table "^0.2.0"
+    v8-compile-cache "^2.0.3"
+
+eslint@^6.8.0:
+  version "6.8.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
+  integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    ajv "^6.10.0"
     chalk "^2.1.0"
     cross-spawn "^6.0.5"
     debug "^4.0.1"
     doctrine "^3.0.0"
-    eslint-scope "^4.0.3"
-    eslint-utils "^1.3.1"
-    eslint-visitor-keys "^1.0.0"
-    espree "^5.0.1"
+    eslint-scope "^5.0.0"
+    eslint-utils "^1.4.3"
+    eslint-visitor-keys "^1.1.0"
+    espree "^6.1.2"
     esquery "^1.0.1"
     esutils "^2.0.2"
     file-entry-cache "^5.0.1"
     functional-red-black-tree "^1.0.1"
-    glob "^7.1.2"
-    globals "^11.7.0"
+    glob-parent "^5.0.0"
+    globals "^12.1.0"
     ignore "^4.0.6"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
-    inquirer "^6.2.2"
-    js-yaml "^3.13.0"
+    inquirer "^7.0.0"
+    is-glob "^4.0.0"
+    js-yaml "^3.13.1"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.3.0"
-    lodash "^4.17.11"
+    lodash "^4.17.14"
     minimatch "^3.0.4"
     mkdirp "^0.5.1"
     natural-compare "^1.4.0"
-    optionator "^0.8.2"
-    path-is-inside "^1.0.2"
+    optionator "^0.8.3"
     progress "^2.0.0"
     regexpp "^2.0.1"
-    semver "^5.5.1"
-    strip-ansi "^4.0.0"
-    strip-json-comments "^2.0.1"
+    semver "^6.1.2"
+    strip-ansi "^5.2.0"
+    strip-json-comments "^3.0.1"
     table "^5.2.3"
     text-table "^0.2.0"
+    v8-compile-cache "^2.0.3"
 
-espree@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a"
-  integrity sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==
+espree@^6.1.2:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a"
+  integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==
   dependencies:
-    acorn "^6.0.7"
-    acorn-jsx "^5.0.0"
-    eslint-visitor-keys "^1.0.0"
+    acorn "^7.1.1"
+    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==
+  dependencies:
+    acorn "^7.3.1"
+    acorn-jsx "^5.2.0"
+    eslint-visitor-keys "^1.3.0"
 
 esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.2.0.tgz#a010a519c0288f2530b3404124bfb5f02e9797fe"
-  integrity sha512-weltsSqdeWIX9G2qQZz7KlTRJdkkOCTPgLYJUz1Hacf48R4YOwGPHO3+ORfWedqJKbq5WQmsgK90n+pFLIKt/Q==
+esquery@^1.0.1, esquery@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
+  integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
   dependencies:
-    estraverse "^5.0.0"
+    estraverse "^5.1.0"
 
 esrecurse@^4.1.0:
   version "4.2.1"
@@ -3458,15 +4218,10 @@ estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
-estraverse@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.0.0.tgz#ac81750b482c11cca26e4b07e83ed8f75fbcdc22"
-  integrity sha512-j3acdrMzqrxmJTNj5dbr1YbjacrYgAxVMeF0gK16E3j494mOe7xygM/ZLIguEQ0ETwAg2hlJCtHRGav+y0Ny5A==
-
-estree-walker@^0.5.0:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.2.tgz#d3850be7529c9580d815600b53126515e146dd39"
-  integrity sha512-XpCnW/AE10ws/kDAs37cngSkvgIR8aN3G0MS85m7dUpuK2EREo9VJ00uvw6Dg/hXEpfsE1I1TvJOJr+Z+TL+ig==
+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"
@@ -3627,9 +4382,9 @@ extsprintf@^1.2.0:
   integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
 fast-deep-equal@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
-  integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
+  version "3.1.3"
+  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"
@@ -3648,11 +4403,16 @@ fast-json-stable-stringify@^2.0.0:
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fast-levenshtein@~2.0.6:
+fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
+fast-memoize@^2.5.1:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.5.2.tgz#79e3bb6a4ec867ea40ba0e7146816f6cdce9b57e"
+  integrity sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==
+
 fb-watchman@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
@@ -3694,10 +4454,10 @@ figgy-pudding@^3.5.1:
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
   integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
 
-figures@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
-  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
+figures@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
+  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
   dependencies:
     escape-string-regexp "^1.0.5"
 
@@ -3723,7 +4483,7 @@ file-loader@^3.0.1:
     loader-utils "^1.0.2"
     schema-utils "^1.0.0"
 
-file-saver@^1.3.3:
+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==
@@ -3733,10 +4493,10 @@ file-uri-to-path@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==
 
-filesize@3.5.6:
-  version "3.5.6"
-  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.6.tgz#5fd98f3eac94ec9516ef8ed5782fad84a01a0a1a"
-  integrity sha1-X9mPPqyU7JUW747VeC+thKAaCho=
+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==
 
 fill-range@^4.0.0:
   version "4.0.0"
@@ -3786,7 +4546,7 @@ find-up@^3.0.0:
   dependencies:
     locate-path "^3.0.0"
 
-findup-sync@3.0.0:
+findup-sync@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1"
   integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==
@@ -3810,11 +4570,6 @@ flatted@^2.0.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
   integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
 
-flow-parser@^0.57.3:
-  version "0.57.3"
-  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.57.3.tgz#b8d241a1b1cbae043afa7976e39f269988d8fe34"
-  integrity sha1-uNJBobHLrgQ6+nl2458mmYjY/jQ=
-
 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"
@@ -3832,12 +4587,12 @@ flux@2.1.1:
     fbjs "0.1.0-alpha.7"
     immutable "^3.7.4"
 
-focus-lock@^0.6.6:
-  version "0.6.6"
-  resolved "https://registry.yarnpkg.com/focus-lock/-/focus-lock-0.6.6.tgz#98119a755a38cfdbeda0280eaa77e307eee850c7"
-  integrity sha512-Dx69IXGCq1qsUExWuG+5wkiMqVM/zGx/reXSJSLogECwp3x6KeNQZ+NAetgxEFpnC41rD8U3+jRCW68+LNzdtw==
+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-visible@^5.0.2:
+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==
@@ -3902,17 +4657,17 @@ fs.realpath@^1.0.0:
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^1.2.7:
-  version "1.2.12"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.12.tgz#db7e0d8ec3b0b45724fd4d83d43554a8f1f0de5c"
-  integrity sha512-Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q==
+  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:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805"
-  integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
+  integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
 
 function-bind@^1.1.1:
   version "1.1.1"
@@ -3938,7 +4693,7 @@ functions-have-names@^1.2.0:
   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.2.0:
+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=
@@ -3982,7 +4737,7 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-gfm.css@^1.1.1:
+gfm.css@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/gfm.css/-/gfm.css-1.1.2.tgz#94acfa600672663b9dd0fd4b6ee5d11c8dbc161e"
   integrity sha512-KhK3rqxMj+UTLRxWnfUA5n8XZYMWfHrrcCxtWResYR2B3hWIqBM6v9FPGZSlVuX+ScLewizOvNkjYXuPs95ThQ==
@@ -3995,7 +4750,7 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-parent@~5.1.0:
+glob-parent@^5.0.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==
@@ -4012,7 +4767,7 @@ glob-to-regexp@^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.14:
+glob@^5.0.15:
   version "5.0.15"
   resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
   integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
@@ -4035,13 +4790,6 @@ glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-global-modules@2.0.0, global-modules@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
-  integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==
-  dependencies:
-    global-prefix "^3.0.0"
-
 global-modules@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
@@ -4051,6 +4799,13 @@ global-modules@^1.0.0:
     is-windows "^1.0.1"
     resolve-dir "^1.0.0"
 
+global-modules@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
+  integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==
+  dependencies:
+    global-prefix "^3.0.0"
+
 global-prefix@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
@@ -4071,11 +4826,18 @@ global-prefix@^3.0.0:
     kind-of "^6.0.2"
     which "^1.3.1"
 
-globals@^11.1.0, globals@^11.7.0:
+globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
+globals@^12.1.0:
+  version "12.4.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8"
+  integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==
+  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"
@@ -4103,9 +4865,9 @@ gonzales-pe@^4.2.3:
     minimist "^1.2.5"
 
 graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
-  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
+  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
 growly@^1.3.0:
   version "1.3.0"
@@ -4135,6 +4897,11 @@ has-flag@^3.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
+has-flag@^4.0.0:
+  version "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:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
@@ -4179,12 +4946,13 @@ has@^1.0.1, has@^1.0.3:
     function-bind "^1.1.1"
 
 hash-base@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
-  integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"
+  integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==
   dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
+    inherits "^2.0.4"
+    readable-stream "^3.6.0"
+    safe-buffer "^5.2.0"
 
 hash.js@^1.0.0, hash.js@^1.0.3:
   version "1.1.7"
@@ -4194,10 +4962,10 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
-highlight.js@^9.15.8:
-  version "9.18.1"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.1.tgz#ed21aa001fe6252bb10a3d76d47573c6539fe13c"
-  integrity sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg==
+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==
 
 hmac-drbg@^1.0.0:
   version "1.0.1"
@@ -4248,10 +5016,10 @@ html-encoding-sniffer@^1.0.2:
   dependencies:
     whatwg-encoding "^1.0.1"
 
-html-entities@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
-  integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
+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-escaper@^2.0.0:
   version "2.0.2"
@@ -4350,9 +5118,9 @@ ignore@^4.0.3, ignore@^4.0.6:
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
 ignore@^5.0.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"
-  integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==
+  version "5.1.8"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
+  integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
 
 immutable@^3.7.4:
   version "3.8.2"
@@ -4380,7 +5148,7 @@ import-lazy@^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-local@2.0.0, import-local@^2.0.0:
+import-local@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
   integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
@@ -4421,7 +5189,7 @@ 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.1, inherits@~2.0.3:
+inherits@2, inherits@^2.0.0, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, 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==
@@ -4441,23 +5209,23 @@ ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
   integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
 
-inquirer@^6.2.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
-  integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==
+inquirer@^7.0.0:
+  version "7.3.2"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.2.tgz#25245d2e32dc9f33dbe26eeaada231daa66e9c7c"
+  integrity sha512-DF4osh1FM6l0RJc5YWYhSDB6TawiBRlbV9Cox8MWlidU218Tb7fm3lQTULyUJDfJ0tjbzl0W4q651mrCCEM55w==
   dependencies:
-    ansi-escapes "^3.2.0"
-    chalk "^2.4.2"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
+    ansi-escapes "^4.2.1"
+    chalk "^4.1.0"
+    cli-cursor "^3.1.0"
+    cli-width "^3.0.0"
     external-editor "^3.0.3"
-    figures "^2.0.0"
-    lodash "^4.17.12"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rxjs "^6.4.0"
-    string-width "^2.1.0"
-    strip-ansi "^5.1.0"
+    figures "^3.0.0"
+    lodash "^4.17.16"
+    mute-stream "0.0.8"
+    run-async "^2.4.0"
+    rxjs "^6.6.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
     through "^2.3.6"
 
 internal-slot@^1.0.2:
@@ -4469,10 +5237,10 @@ internal-slot@^1.0.2:
     has "^1.0.3"
     side-channel "^1.0.2"
 
-interpret@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
-  integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==
+interpret@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
+  integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
 
 invariant@^2.2.2, invariant@^2.2.4:
   version "2.2.4"
@@ -4580,9 +5348,9 @@ is-buffer@^2.0.0:
   integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
 
 is-callable@^1.0.4, is-callable@^1.1.4, is-callable@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
-  integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb"
+  integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==
 
 is-ci@^2.0.0:
   version "2.0.0"
@@ -4771,17 +5539,12 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
-is-promise@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
-  integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
-
 is-regex@^1.0.3, is-regex@^1.0.4, is-regex@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
-  integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz#ece38e389e490df0dc21caea2bd596f987f767ff"
+  integrity sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==
   dependencies:
-    has "^1.0.3"
+    has-symbols "^1.0.1"
 
 is-regexp@^1.0.0:
   version "1.0.0"
@@ -4940,6 +5703,14 @@ istanbul-reports@^2.2.6:
   dependencies:
     html-escaper "^2.0.0"
 
+jest-canvas-mock@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/jest-canvas-mock/-/jest-canvas-mock-2.2.0.tgz#45fbc58589c6ce9df50dc90bd8adce747cbdada7"
+  integrity sha512-DcJdchb7eWFZkt6pvyceWWnu3lsp5QWbUeXiKgEMhwB3sMm5qHM1GQhDajvJgBeiYpgKcojbzZ53d/nz6tXvJw==
+  dependencies:
+    cssfontparser "^1.2.1"
+    parse-color "^1.0.0"
+
 jest-changed-files@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.9.0.tgz#08d8c15eb79a7fa3fc98269bc14b451ee82f8039"
@@ -5299,10 +6070,10 @@ jest@^24.9.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.13.0, js-yaml@^3.13.1:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
+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==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -5403,12 +6174,12 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
-jsx-ast-utils@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz#8a9364e402448a3ce7f14d357738310d9248054f"
-  integrity sha512-EdIHFMm+1BPynpKOpdPqiOsvnIrInRGJD7bzPZdPkjitQEqpdpUuFpq4T0npZFKTiB3RhWFdGN+oqOJIdhDhQA==
+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==
   dependencies:
-    array-includes "^3.0.3"
+    array-includes "^3.1.1"
     object.assign "^4.1.0"
 
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
@@ -5482,11 +6253,29 @@ levn@^0.3.0, levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-linkifyjs@^2.1.6:
+levn@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
+  dependencies:
+    prelude-ls "^1.2.1"
+    type-check "~0.4.0"
+
+linkifyjs@^2.1.9:
   version "2.1.9"
   resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-2.1.9.tgz#af06e45a2866ff06c4766582590d098a4d584702"
   integrity sha512-74ivurkK6WHvHFozVaGtQWV38FzBwSTGNmJolEgFp7QgR2bl6ArUWlvT4GcHKbPe1z3nWYi+VUdDZk16zDOVug==
 
+load-json-file@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
+  integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^2.2.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"
@@ -5502,16 +6291,7 @@ loader-runner@^2.4.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
   integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
 
-loader-utils@1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
-  integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^2.0.0"
-    json5 "^1.0.1"
-
-loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3:
+loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
   integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
@@ -5548,21 +6328,11 @@ lodash-es@^4.2.1:
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78"
   integrity sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==
 
-lodash.clonedeep@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
-
 lodash.escape@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98"
   integrity sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg=
 
-lodash.escaperegexp@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
-  integrity sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=
-
 lodash.flattendeep@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
@@ -5573,30 +6343,15 @@ lodash.isequal@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
   integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
 
-lodash.isplainobject@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
-  integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
-
-lodash.isstring@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
-  integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=
-
-lodash.mergewith@^4.6.2:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
-  integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
-
 lodash.sortby@^4.7.0:
   version "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.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.2.1:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+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==
 
 log-symbols@^2.0.0, log-symbols@^2.2.0:
   version "2.2.0"
@@ -5606,9 +6361,9 @@ log-symbols@^2.0.0, log-symbols@^2.2.0:
     chalk "^2.0.1"
 
 loglevel@^1.6.4:
-  version "1.6.7"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.7.tgz#b3e034233188c68b889f5b862415306f565e2c56"
-  integrity sha512-cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A==
+  version "1.6.8"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171"
+  integrity sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==
 
 lolex@^5.1.2:
   version "5.1.2"
@@ -5721,8 +6476,8 @@ mathml-tag-names@^2.0.1:
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "5.2.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/84637c6ebd442346623bce562b441e1093d40270"
+  version "8.1.0"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/64cdd73b93a475d10284977b69ef73138315b3be"
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"
@@ -5763,7 +6518,7 @@ mdast-util-compact@^1.0.0:
   dependencies:
     unist-util-visit "^1.1.0"
 
-"mdurl@~ 1.0.1":
+mdurl@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
   integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
@@ -5782,7 +6537,7 @@ memoize-one@^3.0.1:
   resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-3.1.1.tgz#ef609811e3bc28970eac2884eece64d167830d17"
   integrity sha512-YqVh744GsMlZu6xkhGslPSqSurOv6P+kLN2J3ysBZfagLcL5FdRK/0UpgLoL8hwjjEvvAVkjJZyFP+1T6p1vgA==
 
-memory-fs@^0.4.0, memory-fs@^0.4.1:
+memory-fs@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
   integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
@@ -5819,9 +6574,9 @@ merge-stream@^2.0.0:
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
 merge2@^1.2.3:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
-  integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
 micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
@@ -5850,24 +6605,19 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-mime-db@1.43.0:
-  version "1.43.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58"
-  integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==
+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-types@^2.1.12, mime-types@~2.1.19:
-  version "2.1.26"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06"
-  integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==
+  version "2.1.27"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
+  integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
   dependencies:
-    mime-db "1.43.0"
+    mime-db "1.44.0"
 
-mimic-fn@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
-  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
-
-mimic-fn@^2.0.0:
+mimic-fn@^2.0.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==
@@ -5902,7 +6652,7 @@ minimist@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.1.1, minimist@^1.2.0, minimist@^1.2.5, minimist@~1.2.0:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
@@ -5965,15 +6715,15 @@ ms@^2.0.0, ms@^2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-mute-stream@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
-  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
+mute-stream@0.0.8:
+  version "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.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
-  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
+  version "2.14.1"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01"
+  integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -5998,9 +6748,9 @@ natural-compare@^1.4.0:
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
 nearley@^2.7.10:
-  version "2.19.1"
-  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.19.1.tgz#4af4006e16645ff800e9f993c3af039857d9dbdc"
-  integrity sha512-xq47GIUGXxU9vQg7g/y1o1xuKnkO7ev4nRWqftmQrLkfnE/FjRqDaGOUakM8XHPn/6pW3bGjU2wgoJyId90rqg==
+  version "2.19.3"
+  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.19.3.tgz#ae3b040e27616b5348102c436d1719209476a5a1"
+  integrity sha512-FpAy1PmTsUpOtgxr23g4jRNvJHYzZEW2PixXeSzksLR/ykPfwKhAodc2+9wQhY+JneWLcvkDw6q7FJIsIdF/aQ==
   dependencies:
     commander "^2.19.0"
     moo "^0.5.0"
@@ -6086,9 +6836,9 @@ node-notifier@^5.4.2:
     which "^1.3.0"
 
 node-releases@^1.1.53:
-  version "1.1.53"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4"
-  integrity sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==
+  version "1.1.58"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.58.tgz#8ee20eef30fa60e52755fcc0942def5a734fe935"
+  integrity sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg==
 
 normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
   version "2.5.0"
@@ -6176,9 +6926,12 @@ object-inspect@^1.1.0, object-inspect@^1.7.0:
   integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
 
 object-is@^1.0.1, object-is@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.2.tgz#6b80eb84fe451498f65007982f035a5b445edec4"
-  integrity sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ==
+  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==
+  dependencies:
+    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:
   version "1.1.1"
@@ -6202,14 +6955,13 @@ object.assign@^4.1.0:
     has-symbols "^1.0.0"
     object-keys "^1.0.11"
 
-object.entries@^1.1.0, object.entries@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz#ee1cf04153de02bb093fec33683900f57ce5399b"
-  integrity sha512-ilqR7BgdyZetJutmDPfXCDffGa0/Yzl2ivVNpbx/g4UeWrCdRnFDUBrKJGLhGieRHDATnyZXWBeCb29k9CJysQ==
+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==
   dependencies:
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
+    es-abstract "^1.17.5"
     has "^1.0.3"
 
 object.fromentries@^2.0.2:
@@ -6254,14 +7006,14 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
-onetime@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
-  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
+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==
   dependencies:
-    mimic-fn "^1.0.0"
+    mimic-fn "^2.1.0"
 
-optionator@^0.8.1, optionator@^0.8.2:
+optionator@^0.8.1, optionator@^0.8.3:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
   integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
@@ -6273,12 +7025,24 @@ optionator@^0.8.1, optionator@^0.8.2:
     type-check "~0.3.2"
     word-wrap "~1.2.3"
 
+optionator@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
+  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+  dependencies:
+    deep-is "^0.1.3"
+    fast-levenshtein "^2.0.6"
+    levn "^0.4.1"
+    prelude-ls "^1.2.1"
+    type-check "^0.4.0"
+    word-wrap "^1.2.3"
+
 os-browserify@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
   integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
-os-locale@^3.0.0, os-locale@^3.1.0:
+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==
@@ -6364,7 +7128,7 @@ 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.5, pako@~1.0.5:
+pako@^1.0.11, pako@~1.0.5:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
   integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
@@ -6385,7 +7149,7 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-asn1@^5.0.0:
+parse-asn1@^5.0.0, parse-asn1@^5.1.5:
   version "5.1.5"
   resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz#003271343da58dc94cace494faef3d2147ecea0e"
   integrity sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==
@@ -6397,6 +7161,13 @@ parse-asn1@^5.0.0:
     pbkdf2 "^3.0.3"
     safe-buffer "^5.1.1"
 
+parse-color@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/parse-color/-/parse-color-1.0.0.tgz#7b748b95a83f03f16a94f535e52d7f3d94658619"
+  integrity sha1-e3SLlag/A/FqlPU15S1/PZRlhhk=
+  dependencies:
+    color-convert "~0.5.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"
@@ -6409,6 +7180,13 @@ parse-entities@^1.0.2, parse-entities@^1.1.0:
     is-decimal "^1.0.0"
     is-hexadecimal "^1.0.0"
 
+parse-json@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
+  dependencies:
+    error-ex "^1.2.0"
+
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
@@ -6469,21 +7247,28 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-is-inside@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
-
 path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
+path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
 path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
+path-type@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
+  integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
+  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"
@@ -6492,9 +7277,9 @@ path-type@^3.0.0:
     pify "^3.0.0"
 
 pbkdf2@^3.0.3:
-  version "3.0.17"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
-  integrity sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz#cb8724b0fada984596856d1a6ebafd3584654b94"
+  integrity sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==
   dependencies:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
@@ -6512,11 +7297,16 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-picomatch@^2.0.4, picomatch@^2.0.7:
+picomatch@^2.0.4, picomatch@^2.2.1:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
 
+pify@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
+
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
@@ -6534,6 +7324,13 @@ pirates@^4.0.0, pirates@^4.0.1:
   dependencies:
     node-modules-regexp "^1.0.0"
 
+pkg-dir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
+  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
+  dependencies:
+    find-up "^2.1.0"
+
 pkg-dir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
@@ -6640,11 +7437,11 @@ postcss-sass@^0.3.5:
     postcss "^7.0.1"
 
 postcss-scss@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-2.0.0.tgz#248b0a28af77ea7b32b1011aba0f738bda27dea1"
-  integrity sha512-um9zdGKaDZirMm+kZFKKVsnKPF7zF7qBAtIfTSnZXD1jZ0JNZIxdB6TxQOjCnlSzLRInVl2v3YdBh/M881C4ug==
+  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.0"
+    postcss "^7.0.6"
 
 postcss-selector-parser@^3.1.0:
   version "3.1.2"
@@ -6674,20 +7471,25 @@ postcss-value-parser@^3.3.0:
   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.0.2, postcss-value-parser@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz#651ff4593aa9eda8d5d0d66593a2417aeaeb325d"
-  integrity sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==
+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.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.7:
-  version "7.0.27"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz#cc67cdc6b0daa375105b7c424a85567345fc54d9"
-  integrity sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==
+postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, 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==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
+prelude-ls@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
+  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -6851,18 +7653,6 @@ pvutils@latest:
   resolved "https://registry.yarnpkg.com/pvutils/-/pvutils-1.0.17.tgz#ade3c74dfe7178944fe44806626bd2e249d996bf"
   integrity sha512-wLHYUQxWaXVQvKnwIDWFVKDJku9XDCvyhhxoq8dc5MFdIlRenyPI9eSfEtcvgHgD7FlvCyGAlWgOzRnZD99GZQ==
 
-qr.js@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/qr.js/-/qr.js-0.0.0.tgz#cace86386f59a0db8050fa90d9b6b0e88a1e364f"
-  integrity sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8=
-
-qrcode-react@^0.1.16:
-  version "0.1.16"
-  resolved "https://registry.yarnpkg.com/qrcode-react/-/qrcode-react-0.1.16.tgz#d064999d510ffc3e55a9ca3ffcf6c203c69f1517"
-  integrity sha512-FK+QCfFqCQMSxUE1byzglERJQkwKqXYvYMCS+/Ad2zACJOfoHkHHtRqsQQPji7lfb1y1qCXLvL+3eP1hAfg8Ng==
-  dependencies:
-    qr.js "0.0.0"
-
 qrcode@^1.4.4:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.4.4.tgz#f0c43568a7e7510a55efc3b88d9602f71963ea83"
@@ -6876,10 +7666,10 @@ qrcode@^1.4.4:
     pngjs "^3.3.0"
     yargs "^13.2.4"
 
-qs@^6.5.2, qs@^6.6.0:
-  version "6.9.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.3.tgz#bfadcd296c2d549f1dffa560619132c977f5008e"
-  integrity sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==
+qs@^6.5.2, 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.5.2:
   version "6.5.2"
@@ -6926,7 +7716,7 @@ randexp@0.4.6:
     discontinuous-range "1.0.0"
     ret "~0.1.10"
 
-randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
   integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
@@ -6951,6 +7741,13 @@ rc@1.2.8, rc@^1.2.8:
     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==
+  dependencies:
+    fast-memoize "^2.5.1"
+
 react-beautiful-dnd@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/react-beautiful-dnd/-/react-beautiful-dnd-4.0.1.tgz#3b0a49bf6be75af351176c904f012611dd292b81"
@@ -6974,7 +7771,7 @@ react-clientside-effect@^1.2.2:
   dependencies:
     "@babel/runtime" "^7.0.0"
 
-react-dom@^16.9.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==
@@ -6984,13 +7781,13 @@ react-dom@^16.9.0:
     prop-types "^15.6.2"
     scheduler "^0.19.1"
 
-react-focus-lock@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-2.2.1.tgz#1d12887416925dc53481914b7cedd39494a3b24a"
-  integrity sha512-47g0xYcCTZccdzKRGufepY8oZ3W1Qg+2hn6u9SHZ0zUB6uz/4K4xJe7yYFNZ1qT6m+2JDm82F6QgKeBTbjW4PQ==
+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==
   dependencies:
     "@babel/runtime" "^7.0.0"
-    focus-lock "^0.6.6"
+    focus-lock "^0.7.0"
     prop-types "^15.6.2"
     react-clientside-effect "^1.2.2"
     use-callback-ref "^1.2.1"
@@ -7028,7 +7825,7 @@ 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.9.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==
@@ -7038,7 +7835,17 @@ react-test-renderer@^16.0.0-0, react-test-renderer@^16.9.0:
     react-is "^16.8.6"
     scheduler "^0.19.1"
 
-react@^16.9.0:
+react-transition-group@^4.4.1:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz#63868f9325a38ea5ee9535d828327f85773345c9"
+  integrity sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+    dom-helpers "^5.0.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==
@@ -7047,6 +7854,14 @@ react@^16.9.0:
     object-assign "^4.1.1"
     prop-types "^15.6.2"
 
+read-pkg-up@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
+  integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
+  dependencies:
+    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"
@@ -7063,6 +7878,15 @@ read-pkg-up@^4.0.0:
     find-up "^3.0.0"
     read-pkg "^3.0.0"
 
+read-pkg@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
+  integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=
+  dependencies:
+    load-json-file "^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"
@@ -7094,7 +7918,7 @@ read-pkg@^4.0.1:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^3.1.1:
+readable-stream@^3.1.1, readable-stream@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -7112,12 +7936,12 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
-readdirp@~3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.3.0.tgz#984458d13a1e42e2e9f5841b129e162f369aff17"
-  integrity sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==
+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==
   dependencies:
-    picomatch "^2.0.7"
+    picomatch "^2.2.1"
 
 realpath-native@^1.1.0:
   version "1.1.0"
@@ -7162,9 +7986,9 @@ regenerate-unicode-properties@^8.2.0:
     regenerate "^1.4.0"
 
 regenerate@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
-  integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
+  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==
 
 regenerator-runtime@^0.11.0:
   version "0.11.1"
@@ -7205,6 +8029,11 @@ regexpp@^2.0.1:
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
   integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
 
+regexpp@^3.0.0, regexpp@^3.1.0:
+  version "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"
@@ -7226,9 +8055,9 @@ registry-auth-token@4.0.0:
     safe-buffer "^5.0.1"
 
 regjsgen@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c"
-  integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==
+  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"
@@ -7369,7 +8198,7 @@ reselect@^3.0.1:
   resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
   integrity sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=
 
-resize-observer-polyfill@^1.5.0:
+resize-observer-polyfill@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
   integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
@@ -7409,19 +8238,19 @@ resolve@1.1.7:
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
   integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.10.0, resolve@^1.12.0, resolve@^1.15.1, resolve@^1.3.2, resolve@^1.8.1:
-  version "1.15.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"
-  integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==
+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==
   dependencies:
     path-parse "^1.0.6"
 
-restore-cursor@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
-  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
+restore-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
   dependencies:
-    onetime "^2.0.0"
+    onetime "^5.1.0"
     signal-exit "^3.0.2"
 
 ret@~0.1.10:
@@ -7441,7 +8270,7 @@ rimraf@2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^2.4.3, rimraf@^2.5.4, rimraf@^2.6.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==
@@ -7487,12 +8316,10 @@ rsvp@^4.8.4:
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
   integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
 
-run-async@^2.2.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.0.tgz#e59054a5b86876cfae07f431d18cbaddc594f1e8"
-  integrity sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg==
-  dependencies:
-    is-promise "^2.1.0"
+run-async@^2.4.0:
+  version "2.4.1"
+  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"
@@ -7501,17 +8328,24 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rxjs@^6.4.0, rxjs@^6.5.2:
+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==
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
-  integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
+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.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, 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==
 
 safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
@@ -7545,21 +8379,15 @@ sane@^4.0.3:
     minimist "^1.1.1"
     walker "~1.0.5"
 
-sanitize-html@^1.18.4:
-  version "1.22.1"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.22.1.tgz#5b36c92ab27917ddd2775396815c2bc1a6268310"
-  integrity sha512-++IMC00KfMQc45UWZJlhWOlS9eMrME38sFG9GXfR+k6oBo9JXSYQgTOZCl9j3v/smFTRNT9XNwz5DseFdMY+2Q==
+sanitize-html@^1.27.1:
+  version "1.27.1"
+  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.27.1.tgz#ce147951aa3defba13448e2ca8a4e18d8f2e2cd7"
+  integrity sha512-C+N7E+7ikYaLHdb9lEkQaFOgmj+9ddZ311Ixs/QsBsoLD411/vdLweiFyGqrswUVgLqagOS5NCDxcEPH7trObQ==
   dependencies:
-    chalk "^2.4.1"
     htmlparser2 "^4.1.0"
-    lodash.clonedeep "^4.5.0"
-    lodash.escaperegexp "^4.1.2"
-    lodash.isplainobject "^4.0.6"
-    lodash.isstring "^4.0.1"
-    lodash.mergewith "^4.6.2"
+    lodash "^4.17.15"
     postcss "^7.0.27"
     srcset "^2.0.1"
-    xtend "^4.0.1"
 
 sax@^1.2.4:
   version "1.2.4"
@@ -7583,12 +8411,12 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
+"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
   version "5.7.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.2.0, semver@^6.3.0:
+semver@6.3.0, semver@^6.0.0, semver@^6.1.2, semver@^6.2.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
@@ -7598,11 +8426,23 @@ semver@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==
+
 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==
 
+serialize-javascript@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.1.0.tgz#8bf3a9170712664ef2561b44b691eafe399214ea"
+  integrity sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==
+  dependencies:
+    randombytes "^2.1.0"
+
 set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -7638,11 +8478,23 @@ shebang-command@^1.2.0:
   dependencies:
     shebang-regex "^1.0.0"
 
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
   integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
 shellwords@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
@@ -7736,7 +8588,7 @@ source-list-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
-source-map-loader@^0.2.3:
+source-map-loader@^0.2.4:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.2.4.tgz#c18b0dc6e23bf66f6792437557c569a11e072271"
   integrity sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==
@@ -7756,9 +8608,9 @@ source-map-resolve@^0.5.0:
     urix "^0.1.0"
 
 source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@~0.5.12:
-  version "0.5.16"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
-  integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
+  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==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -7784,22 +8636,22 @@ spawn-command@^0.0.2-1:
   integrity sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=
 
 spdx-correct@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
-  integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
+  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
 
 spdx-exceptions@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977"
-  integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
+  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
 
 spdx-expression-parse@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
-  integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
   dependencies:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
@@ -7939,7 +8791,7 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
+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==
@@ -7956,6 +8808,15 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
+string-width@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
+  integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.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"
@@ -7983,9 +8844,9 @@ string.prototype.trim@^1.2.1:
     function-bind "^1.1.1"
 
 string.prototype.trimend@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.0.tgz#ee497fd29768646d84be2c9b819e292439614373"
-  integrity sha512-EEJnGqa/xNfIg05SxiPSqRS7S9qwDhYts1TSLR1BQfYUfPe1stofgGKvwERK9+9yf+PpfBMlpBaCHucXGPQfUA==
+  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==
   dependencies:
     define-properties "^1.1.3"
     es-abstract "^1.17.5"
@@ -8009,9 +8870,9 @@ string.prototype.trimright@^2.1.1:
     string.prototype.trimend "^1.0.0"
 
 string.prototype.trimstart@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.0.tgz#afe596a7ce9de905496919406c9734845f01a2f2"
-  integrity sha512-iCP8g01NFYiiBOnwG1Xc3WZLyoo+RuBymwIlWncShXDDJYWN6DbnM3odslBJdgCdRlq94B5s63NWAZlcn2CS4w==
+  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"
@@ -8061,6 +8922,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
+strip-ansi@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+  dependencies:
+    ansi-regex "^5.0.0"
+
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
@@ -8076,7 +8944,17 @@ strip-indent@^2.0.0:
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
   integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=
 
-strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
+strip-json-comments@^3.0.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=
@@ -8091,23 +8969,23 @@ stylelint-config-recommended@^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-standard@^18.2.0:
+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==
   dependencies:
     stylelint-config-recommended "^2.2.0"
 
-stylelint-scss@^3.9.0:
-  version "3.16.0"
-  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-3.16.0.tgz#6928fe57bcfc924110d09847c1f720472a9b7bd6"
-  integrity sha512-dAWs/gagdPYO3VDdvgRv5drRBMcWI4E//z3AXPAY1qYkSdXCEVJtEW+R9JtinG0U2rcJIu5XWaVddPQeaaufzw==
+stylelint-scss@^3.18.0:
+  version "3.18.0"
+  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-3.18.0.tgz#8f06371c223909bf3f62e839548af1badeed31e9"
+  integrity sha512-LD7+hv/6/ApNGt7+nR/50ft7cezKP2HM5rI8avIdGaUWre3xlHfV4jKO/DRZhscfuN+Ewy9FMhcTq0CcS0C/SA==
   dependencies:
     lodash "^4.17.15"
     postcss-media-query-parser "^0.2.3"
     postcss-resolve-nested-selector "^0.1.1"
     postcss-selector-parser "^6.0.2"
-    postcss-value-parser "^4.0.2"
+    postcss-value-parser "^4.1.0"
 
 stylelint@^9.10.1:
   version "9.10.1"
@@ -8169,13 +9047,6 @@ sugarss@^2.0.0:
   dependencies:
     postcss "^7.0.2"
 
-supports-color@6.1.0, supports-color@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
-  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
-  dependencies:
-    has-flag "^3.0.0"
-
 supports-color@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
@@ -8190,6 +9061,20 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
+supports-color@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
+  dependencies:
+    has-flag "^3.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"
+
 svg-tags@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
@@ -8220,25 +9105,30 @@ tapable@^1.0.0, tapable@^1.1.3:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
+tar-js@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/tar-js/-/tar-js-0.3.0.tgz#6949aabfb0ba18bb1562ae51a439fd0f30183a17"
+  integrity sha1-aUmqv7C6GLsVYq5RpDn9DzAYOhc=
+
 terser-webpack-plugin@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"
-  integrity sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.4.tgz#2c63544347324baafa9a56baaddf1634c8abfc2f"
+  integrity sha512-U4mACBHIegmfoEe5fdongHESNJWqsGU+W0S/9+BmYGVQDw1+c2Ow05TpMhxjPK1sRb7cuYq1BPl1e5YHJMTCqA==
   dependencies:
     cacache "^12.0.2"
     find-cache-dir "^2.1.0"
     is-wsl "^1.1.0"
     schema-utils "^1.0.0"
-    serialize-javascript "^2.1.2"
+    serialize-javascript "^3.1.0"
     source-map "^0.6.1"
     terser "^4.1.2"
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
 terser@^4.1.2, terser@^4.6.2:
-  version "4.6.10"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.10.tgz#90f5bd069ff456ddbc9503b18e52f9c493d3b7c2"
-  integrity sha512-qbF/3UOo11Hggsbsqm2hPa6+L4w7bkr+09FNseEe8xrcVD3APGLFqE+Oz1ZKAxjYnFsj80rLOfgAtJ0LNJjtTA==
+  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"
@@ -8254,7 +9144,7 @@ test-exclude@^5.2.3:
     read-pkg-up "^4.0.0"
     require-main-filename "^2.0.0"
 
-text-encoding-utf-8@^1.0.1:
+text-encoding-utf-8@^1.0.2:
   version "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==
@@ -8388,36 +9278,25 @@ trough@^1.0.0:
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
   integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==
 
-tslib@^1.10.0, tslib@^1.11.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
-  integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
-
-tslint@^5.20.1:
-  version "5.20.1"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.20.1.tgz#e401e8aeda0152bc44dd07e614034f3f80c67b7d"
-  integrity sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==
+tsconfig-paths@^3.9.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b"
+  integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==
   dependencies:
-    "@babel/code-frame" "^7.0.0"
-    builtin-modules "^1.1.1"
-    chalk "^2.3.0"
-    commander "^2.12.1"
-    diff "^4.0.1"
-    glob "^7.1.1"
-    js-yaml "^3.13.1"
-    minimatch "^3.0.4"
-    mkdirp "^0.5.1"
-    resolve "^1.3.2"
-    semver "^5.3.0"
-    tslib "^1.8.0"
-    tsutils "^2.29.0"
+    "@types/json5" "^0.0.29"
+    json5 "^1.0.1"
+    minimist "^1.2.0"
+    strip-bom "^3.0.0"
 
-tsutils@^2.29.0:
-  version "2.29.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
-  integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
-  dependencies:
-    tslib "^1.8.1"
+tslib@^1.10.0, tslib@^1.11.1, tslib@^1.11.2, 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==
+
+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==
 
 tsutils@^3.17.1:
   version "3.17.1"
@@ -8443,6 +9322,13 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
   integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
+type-check@^0.4.0, type-check@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
+  dependencies:
+    prelude-ls "^1.2.1"
+
 type-check@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
@@ -8455,15 +9341,25 @@ type-detect@4.0.8:
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
 
+type-fest@^0.11.0:
+  version "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.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
+  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
+
 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.7.3:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
-  integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
+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==
 
 ua-parser-js@^0.7.18:
   version "0.7.21"
@@ -8479,9 +9375,9 @@ unherit@^1.0.4:
     xtend "^4.0.0"
 
 unhomoglyph@^1.0.2:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/unhomoglyph/-/unhomoglyph-1.0.5.tgz#a68c6244f0ec140bfe58293a1f66a9bd2a244343"
-  integrity sha512-rNAw2rGogjq4BVhsCX8K6qXrCcHmUaMCHETlUG0ujGZ3OHwnzJHwdMyzy3n/c9Y7lvlbckOd9nkW33grUVE3bg==
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/unhomoglyph/-/unhomoglyph-1.0.6.tgz#ea41f926d0fcf598e3b8bb2980c2ddac66b081d3"
+  integrity sha512-7uvcWI3hWshSADBu4JpnyYbTVc7YlhF5GDW/oPD5AxIxl34k4wXR3WDkPnzLxkN32LiTCTKMQLtKVZiwki3zGg==
 
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
@@ -8644,9 +9540,9 @@ url@^0.11.0:
     querystring "0.2.0"
 
 use-callback-ref@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.2.1.tgz#898759ccb9e14be6c7a860abafa3ffbd826c89bb"
-  integrity sha512-C3nvxh0ZpaOxs9RCnWwAJ+7bJPwQI8LHF71LzbQ3BvzH5XkdtlkMadqElGevg5bYBDFip4sAnD4m06zAKebg1w==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.2.4.tgz#d86d1577bfd0b955b6e04aaf5971025f406bea3c"
+  integrity sha512-rXpsyvOnqdScyied4Uglsp14qzag1JIemLeTWGKbwpotWht57hbP78aNT+Q4wdFKQfQibbUX4fb6Qb4y11aVOQ==
 
 use-sidecar@^1.0.1:
   version "1.0.2"
@@ -8695,10 +9591,10 @@ uuid@^3.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-v8-compile-cache@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe"
-  integrity sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==
+v8-compile-cache@^2.0.3, v8-compile-cache@^2.1.1:
+  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==
 
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
@@ -8764,7 +9660,7 @@ w3c-hr-time@^1.0.1:
   dependencies:
     browser-process-hrtime "^1.0.0"
 
-walk@^2.3.9:
+walk@^2.3.14:
   version "2.3.14"
   resolved "https://registry.yarnpkg.com/walk/-/walk-2.3.14.tgz#60ec8631cfd23276ae1e7363ce11d626452e1ef3"
   integrity sha512-5skcWAUmySj6hkBdH6B6+3ddMjVQYH5Qy9QGbPmN8kVmLteXk+yVXg+yfk1nbX30EYakahLrr8iPcCxJQSCBeg==
@@ -8778,47 +9674,56 @@ walker@^1.0.7, walker@~1.0.5:
   dependencies:
     makeerror "1.0.x"
 
-watchpack@^1.6.0:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.1.tgz#280da0a8718592174010c078c7585a74cd8cd0e2"
-  integrity sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==
+watchpack-chokidar2@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz#9948a1866cbbd6cb824dea13a7ed691f6c8ddff0"
+  integrity sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==
   dependencies:
     chokidar "^2.1.8"
+
+watchpack@^1.6.1:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.2.tgz#c02e4d4d49913c3e7e122c3325365af9d331e9aa"
+  integrity sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==
+  dependencies:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
+  optionalDependencies:
+    chokidar "^3.4.0"
+    watchpack-chokidar2 "^2.0.0"
 
-webcrypto-core@^1.0.19-next.0:
-  version "1.0.19"
-  resolved "https://registry.yarnpkg.com/webcrypto-core/-/webcrypto-core-1.0.19.tgz#521a0b082afecd914b8e968efb5dc381b8416c6f"
-  integrity sha512-6XHExtfMJrpkFDh9MiJ/y7ptX0dfZi0ogxFyelqxMu1eFowxivHfIp6DKzT+ZjU66xTuNfJkfkUk1bIB3tEOgA==
+webcrypto-core@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/webcrypto-core/-/webcrypto-core-1.1.2.tgz#c522a9e5596688f2b6bb19e2d336f68efa8bdd57"
+  integrity sha512-LxM/dTcXr/ZnwwKLox0tGEOIqvP7KIJ4Hk/fFPX20tr1EgqTmpEFZinmu4FzoGVbs6e4jI1priQKCDrOBD3L6w==
   dependencies:
-    "@peculiar/asn1-schema" "^1.0.5"
+    "@peculiar/asn1-schema" "^2.0.1"
     "@peculiar/json-schema" "^1.1.10"
     asn1js "^2.0.26"
     pvtsutils "^1.0.10"
-    tslib "^1.11.1"
+    tslib "^1.11.2"
 
 webidl-conversions@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
   integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
 
-webpack-cli@^3.1.1:
-  version "3.3.11"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.11.tgz#3bf21889bf597b5d82c38f215135a411edfdc631"
-  integrity sha512-dXlfuml7xvAFwYUPsrtQAA9e4DOe58gnzSxhgrO/ZM/gyXTBowrsYeubyN4mqGhYdpXMFNyQ6emjJS9M7OBd4g==
+webpack-cli@^3.3.12:
+  version "3.3.12"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.12.tgz#94e9ada081453cd0aa609c99e500012fd3ad2d4a"
+  integrity sha512-NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag==
   dependencies:
-    chalk "2.4.2"
-    cross-spawn "6.0.5"
-    enhanced-resolve "4.1.0"
-    findup-sync "3.0.0"
-    global-modules "2.0.0"
-    import-local "2.0.0"
-    interpret "1.2.0"
-    loader-utils "1.2.3"
-    supports-color "6.1.0"
-    v8-compile-cache "2.0.3"
-    yargs "13.2.4"
+    chalk "^2.4.2"
+    cross-spawn "^6.0.5"
+    enhanced-resolve "^4.1.1"
+    findup-sync "^3.0.0"
+    global-modules "^2.0.0"
+    import-local "^2.0.0"
+    interpret "^1.4.0"
+    loader-utils "^1.4.0"
+    supports-color "^6.1.0"
+    v8-compile-cache "^2.1.1"
+    yargs "^13.3.2"
 
 webpack-sources@^1.4.0, webpack-sources@^1.4.1:
   version "1.4.3"
@@ -8828,16 +9733,16 @@ webpack-sources@^1.4.0, webpack-sources@^1.4.1:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@^4.20.2:
-  version "4.42.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.42.1.tgz#ae707baf091f5ca3ef9c38b884287cfe8f1983ef"
-  integrity sha512-SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg==
+webpack@^4.43.0:
+  version "4.43.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.43.0.tgz#c48547b11d563224c561dad1172c8aa0b8a678e6"
+  integrity sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/helper-module-context" "1.9.0"
     "@webassemblyjs/wasm-edit" "1.9.0"
     "@webassemblyjs/wasm-parser" "1.9.0"
-    acorn "^6.2.1"
+    acorn "^6.4.1"
     ajv "^6.10.2"
     ajv-keywords "^3.4.1"
     chrome-trace-event "^1.0.2"
@@ -8854,13 +9759,13 @@ webpack@^4.20.2:
     schema-utils "^1.0.0"
     tapable "^1.1.3"
     terser-webpack-plugin "^1.4.3"
-    watchpack "^1.6.0"
+    watchpack "^1.6.1"
     webpack-sources "^1.4.1"
 
-what-input@^5.2.6:
-  version "5.2.7"
-  resolved "https://registry.yarnpkg.com/what-input/-/what-input-5.2.7.tgz#81afbb6b82882cff8c43fa7ff1054aa46f288ffa"
-  integrity sha512-ruCP2skyygi0ZHnMicHuZP7vXnJh8uJXs9R7RX488HlWigSdzngdmKo5Ti11Iatp1dnYp55VfioP/WevPaK+xQ==
+what-input@^5.2.10:
+  version "5.2.10"
+  resolved "https://registry.yarnpkg.com/what-input/-/what-input-5.2.10.tgz#f79f5b65cf95d75e55e6d580bb0a6b98174cad4e"
+  integrity sha512-7AQoIMGq7uU8esmKniOtZG3A+pzlwgeyFpkS3f/yzRbxknSL68tvn5gjE6bZ4OMFxCPjpaBd2udUTqlZ0HwrXQ==
 
 whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
   version "1.0.5"
@@ -8935,7 +9840,14 @@ which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1:
   dependencies:
     isexe "^2.0.0"
 
-word-wrap@~1.2.3:
+which@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
+word-wrap@^1.2.3, word-wrap@~1.2.3:
   version "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==
@@ -9002,13 +9914,6 @@ xml-name-validator@^3.0.0:
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
   integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
 
-xregexp@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.3.0.tgz#7e92e73d9174a99a59743f67a4ce879a04b5ae50"
-  integrity sha512-7jXDIFXh5yJ/orPn4SXjuVrWWoi4Cr8jfV1eHv9CixKSbU+jY4mxfrBwAuDvupPNKpMUY+FeIqsVw/JLT9+B8g==
-  dependencies:
-    "@babel/runtime-corejs3" "^7.8.3"
-
 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"
@@ -9039,7 +9944,7 @@ yargs-parser@^11.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^13.1.0, yargs-parser@^13.1.2:
+yargs-parser@^13.1.2:
   version "13.1.2"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
   integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
@@ -9047,23 +9952,6 @@ yargs-parser@^13.1.0, yargs-parser@^13.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs@13.2.4:
-  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83"
-  integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==
-  dependencies:
-    cliui "^5.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    os-locale "^3.1.0"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.1.0"
-
 yargs@^12.0.5:
   version "12.0.5"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
@@ -9082,7 +9970,7 @@ yargs@^12.0.5:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^11.1.1"
 
-yargs@^13.2.4, yargs@^13.3.0:
+yargs@^13.2.4, yargs@^13.3.0, yargs@^13.3.2:
   version "13.3.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
   integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==